folder renaming

4 files changed, 62 insertions, 65 deletions

diff --git a/TimeHACK.Engine/SaveSystem.cs b/TimeHACK.Engine/SaveSystem.cs
index 0b915f3..9646876 100644
--- a/TimeHACK.Engine/SaveSystem.cs
+++ b/TimeHACK.Engine/SaveSystem.cs
@@ -270,7 +270,7 @@ namespace TimeHACK.Engine
 
         public static void SaveDirectoryInfo(string parent, string dirname, bool isProtected, string label, bool allowback)
         {
-            if (Directory.Exists(Path.Combine(parent, dirname)) && Path.Combine(parent, dirname) != ProfileFileSystemDirectory) return;
+            if (File.Exists(Path.Combine(parent, dirname, "_data.info")) && Path.Combine(parent, dirname) != ProfileFileSystemDirectory) return;
             Directory.CreateDirectory(Path.Combine(parent, dirname));
 
             FileSystemFolderInfo info = new FileSystemFolderInfo();
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
index 8dda600..0be7813 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
@@ -152,7 +152,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
                     case "notopbar":
                         ((WinClassic)this.ParentForm).programtopbar.Hide();
                         receive.Play();
-                        break; // TODO: Finish WebChat 1998
+                        break;
                     case "filepoof":
                         label5.Hide();
                         button5.Hide();
@@ -205,7 +205,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
                         break;
                     case "notyper":
                         history.ReadOnly = true;
-                        break;
+                        break; // TODO: Add ending here
                     default:
                         if (msgsound) receive.Play();
                         break;
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs
index 7d300fb..de5c891 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs
@@ -93,7 +93,9 @@
             this.mainView.Size = new System.Drawing.Size(486, 444);
             this.mainView.TabIndex = 10;
             this.mainView.UseCompatibleStateImageBehavior = false;
+            this.mainView.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.mainView_AfterLabelEdit);
             this.mainView.DoubleClick += new System.EventHandler(this.mainView_DoubleClick);
+            this.mainView.MouseClick += new System.Windows.Forms.MouseEventHandler(this.mainView_MouseClick);
             // 
             // diskView
             // 
@@ -126,7 +128,7 @@
             this.RenameToolStripMenuItem,
             this.CloseToolStripMenuItem});
             this.FileToolStripMenuItem.Name = "FileToolStripMenuItem";
-            this.FileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
+            this.FileToolStripMenuItem.Size = new System.Drawing.Size(40, 20);
             this.FileToolStripMenuItem.Text = "File";
             // 
             // CreateShortcutToolStripMenuItem
@@ -137,52 +139,52 @@
             this.TextDocumentToolStripMenuItem,
             this.BitmapImageToolStripMenuItem});
             this.CreateShortcutToolStripMenuItem.Name = "CreateShortcutToolStripMenuItem";
-            this.CreateShortcutToolStripMenuItem.Size = new System.Drawing.Size(117, 22);
+            this.CreateShortcutToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
             this.CreateShortcutToolStripMenuItem.Text = "New";
             // 
             // FolderToolStripMenuItem
             // 
             this.FolderToolStripMenuItem.Name = "FolderToolStripMenuItem";
-            this.FolderToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
+            this.FolderToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
             this.FolderToolStripMenuItem.Text = "Folder";
             this.FolderToolStripMenuItem.Click += new System.EventHandler(this.FolderToolStripMenuItem_Click);
             // 
             // ShortcutToolStripMenuItem
             // 
             this.ShortcutToolStripMenuItem.Name = "ShortcutToolStripMenuItem";
-            this.ShortcutToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
+            this.ShortcutToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
             this.ShortcutToolStripMenuItem.Text = "Shortcut";
             // 
             // TextDocumentToolStripMenuItem
             // 
             this.TextDocumentToolStripMenuItem.Name = "TextDocumentToolStripMenuItem";
-            this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
+            this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
             this.TextDocumentToolStripMenuItem.Text = "Text Document";
             // 
             // BitmapImageToolStripMenuItem
             // 
             this.BitmapImageToolStripMenuItem.Name = "BitmapImageToolStripMenuItem";
-            this.BitmapImageToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
+            this.BitmapImageToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
             this.BitmapImageToolStripMenuItem.Text = "Bitmap Image";
             // 
             // DeleteToolStripMenuItem
             // 
             this.DeleteToolStripMenuItem.Name = "DeleteToolStripMenuItem";
-            this.DeleteToolStripMenuItem.Size = new System.Drawing.Size(117, 22);
+            this.DeleteToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
             this.DeleteToolStripMenuItem.Text = "Delete";
             this.DeleteToolStripMenuItem.Click += new System.EventHandler(this.DeleteToolStripMenuItem_Click);
             // 
             // RenameToolStripMenuItem
             // 
             this.RenameToolStripMenuItem.Name = "RenameToolStripMenuItem";
-            this.RenameToolStripMenuItem.Size = new System.Drawing.Size(117, 22);
+            this.RenameToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
             this.RenameToolStripMenuItem.Text = "Rename";
             this.RenameToolStripMenuItem.Click += new System.EventHandler(this.RenameToolStripMenuItem_Click);
             // 
             // CloseToolStripMenuItem
             // 
             this.CloseToolStripMenuItem.Name = "CloseToolStripMenuItem";
-            this.CloseToolStripMenuItem.Size = new System.Drawing.Size(117, 22);
+            this.CloseToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
             this.CloseToolStripMenuItem.Text = "Close";
             this.CloseToolStripMenuItem.Click += new System.EventHandler(this.CloseToolStripMenuItem_Click);
             // 
@@ -194,34 +196,34 @@
             this.PasteToolStripMenuItem,
             this.SellectAllCtrlAToolStripMenuItem});
             this.EditToolStripMenuItem.Name = "EditToolStripMenuItem";
-            this.EditToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
+            this.EditToolStripMenuItem.Size = new System.Drawing.Size(43, 20);
             this.EditToolStripMenuItem.Text = "Edit";
             // 
             // CutCtrlXToolStripMenuItem
             // 
             this.CutCtrlXToolStripMenuItem.Name = "CutCtrlXToolStripMenuItem";
-            this.CutCtrlXToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
+            this.CutCtrlXToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
             this.CutCtrlXToolStripMenuItem.Text = "Cut                       Ctrl+X";
             this.CutCtrlXToolStripMenuItem.Click += new System.EventHandler(this.CutCtrlXToolStripMenuItem_Click);
             // 
             // CopyCtrlCToolStripMenuItem
             // 
             this.CopyCtrlCToolStripMenuItem.Name = "CopyCtrlCToolStripMenuItem";
-            this.CopyCtrlCToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
+            this.CopyCtrlCToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
             this.CopyCtrlCToolStripMenuItem.Text = "Copy                    Ctrl+C";
             this.CopyCtrlCToolStripMenuItem.Click += new System.EventHandler(this.CopyCtrlCToolStripMenuItem_Click);
             // 
             // PasteToolStripMenuItem
             // 
             this.PasteToolStripMenuItem.Name = "PasteToolStripMenuItem";
-            this.PasteToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
+            this.PasteToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
             this.PasteToolStripMenuItem.Text = "Paste                    Ctrl+V";
             this.PasteToolStripMenuItem.Click += new System.EventHandler(this.PasteToolStripMenuItem_Click);
             // 
             // SellectAllCtrlAToolStripMenuItem
             // 
             this.SellectAllCtrlAToolStripMenuItem.Name = "SellectAllCtrlAToolStripMenuItem";
-            this.SellectAllCtrlAToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
+            this.SellectAllCtrlAToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
             this.SellectAllCtrlAToolStripMenuItem.Text = "Select All            Ctrl+A";
             this.SellectAllCtrlAToolStripMenuItem.Click += new System.EventHandler(this.SellectAllCtrlAToolStripMenuItem_Click);
             // 
@@ -230,13 +232,13 @@
             this.ViewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.RefreshToolStripMenuItem});
             this.ViewToolStripMenuItem.Name = "ViewToolStripMenuItem";
-            this.ViewToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
+            this.ViewToolStripMenuItem.Size = new System.Drawing.Size(47, 20);
             this.ViewToolStripMenuItem.Text = "View";
             // 
             // RefreshToolStripMenuItem
             // 
             this.RefreshToolStripMenuItem.Name = "RefreshToolStripMenuItem";
-            this.RefreshToolStripMenuItem.Size = new System.Drawing.Size(113, 22);
+            this.RefreshToolStripMenuItem.Size = new System.Drawing.Size(121, 22);
             this.RefreshToolStripMenuItem.Text = "Refresh";
             this.RefreshToolStripMenuItem.Click += new System.EventHandler(this.RefreshToolStripMenuItem_Click);
             // 
@@ -246,19 +248,19 @@
             this.HelpToolStripMenuItem1,
             this.AboutWindows95ToolStripMenuItem});
             this.HelpToolStripMenuItem.Name = "HelpToolStripMenuItem";
-            this.HelpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
+            this.HelpToolStripMenuItem.Size = new System.Drawing.Size(46, 20);
             this.HelpToolStripMenuItem.Text = "Help";
             // 
             // HelpToolStripMenuItem1
             // 
             this.HelpToolStripMenuItem1.Name = "HelpToolStripMenuItem1";
-            this.HelpToolStripMenuItem1.Size = new System.Drawing.Size(174, 22);
+            this.HelpToolStripMenuItem1.Size = new System.Drawing.Size(188, 22);
             this.HelpToolStripMenuItem1.Text = "Help Topics";
             // 
             // AboutWindows95ToolStripMenuItem
             // 
             this.AboutWindows95ToolStripMenuItem.Name = "AboutWindows95ToolStripMenuItem";
-            this.AboutWindows95ToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
+            this.AboutWindows95ToolStripMenuItem.Size = new System.Drawing.Size(188, 22);
             this.AboutWindows95ToolStripMenuItem.Text = "About Windows 95";
             this.AboutWindows95ToolStripMenuItem.Click += new System.EventHandler(this.AboutWindows95ToolStripMenuItem_Click);
             // 
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
index daa0ea8..9b6fd80 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
@@ -115,20 +115,15 @@ namespace TimeHACK.OS.Win95.Win95Apps
 
             if (returnYesIfProtected == true)
             {
-                if (toRead.IsProtected == true)
-                {
-                    return "yes";
-                }
-            }
-            else
-            {
-                return toRead.Label;
+                if (toRead.IsProtected == true) return "yes";
             }
+            else return toRead.Label;
             return Val;
         }
 
-        void RefreshAll() {
-            try {
+        private void RefreshAll()
+        {
+            //try {
                 this.mainView.Items.Clear();
 
                 foreach (string str in Directory.GetDirectories(CurrentDirectory))
@@ -136,6 +131,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
                     string label = ReadDataFile(str, false);
                     ListViewItem itm = this.mainView.Items.Add(label ?? Path.GetFileName(str));
                     itm.ImageIndex = 1;
+                    itm.Tag = str;
                 }
                 foreach (string str in Directory.GetFiles(CurrentDirectory))
                 {
@@ -169,13 +165,14 @@ namespace TimeHACK.OS.Win95.Win95Apps
                         if (item.Name == Path.GetFileName(str)) { itm.ImageIndex = item.FileIcon; break; }
                     }
                 }
+                /*
             } catch (Exception ex) {
                 //wm.StartInfobox95("Exploring - C:", "Error with the file explorer \n" + ex.Message, Properties.Resources.Win95Info); add illegal operation dialog here later
                 ((Form)this.TopLevelControl).Close();
-            }
+            }*/
         }
 
-        void RefreshTreeNode()
+        private void RefreshTreeNode()
         {
             // Refresh the TreeView
 
@@ -606,7 +603,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
         {
             try
             {
-                if (mainView.FocusedItem.Tag == null)
+                if (new DirectoryInfo((string)mainView.FocusedItem.Tag).Extension == null || new DirectoryInfo((string)mainView.FocusedItem.Tag).Extension == "")
                 { // If it isn't a file
                     GoToDir(Path.Combine(CurrentDirectory, mainView.FocusedItem.Text));
                 }
@@ -684,10 +681,12 @@ namespace TimeHACK.OS.Win95.Win95Apps
             }
             else
             {
-                Directory.CreateDirectory(Path.Combine(CurrentDirectory, "New Folder"));
                 SaveDirectoryInfo(CurrentDirectory, "New Folder", false, "New Folder", true);
 
                 RefreshAll();
+                OldLabelText = "New Folder";
+                mainView.LabelEdit = true;
+                mainView.FindItemWithText("New Folder").BeginEdit();
             }
 
             RefreshTreeNode();
@@ -779,47 +778,40 @@ namespace TimeHACK.OS.Win95.Win95Apps
 
         private void mainView_AfterLabelEdit(object sender, LabelEditEventArgs e)
         {
-
-            try
+            string setText;
+            setText = e.Label;
+            if (setText == "") wm.StartInfobox95("Windows Explorer", "Please enter a new directory name", InfoboxType.Info, InfoboxButtons.OK);
+            else
             {
-                string setText;
-                setText = e.Label;
-                if (setText == "") wm.StartInfobox95("Windows Explorer", "Please enter a new directory name", InfoboxType.Info, InfoboxButtons.OK);
+                if (Directory.Exists(setText)) wm.StartInfobox95("Windows Explorer", "That directory already exists.", InfoboxType.Info, InfoboxButtons.OK);
                 else
                 {
-                    if (Directory.Exists(setText)) wm.StartInfobox95("Windows Explorer", "That directory already exists.", InfoboxType.Info, InfoboxButtons.OK);
+                    if (File.Exists(setText)) wm.StartInfobox95("Windows Explorer", "That file already exists.", InfoboxType.Info, InfoboxButtons.OK);
                     else
                     {
-                        if (File.Exists(setText)) wm.StartInfobox95("Windows Explorer", "That file already exists.", InfoboxType.Info, InfoboxButtons.OK);
-                        else
+                        if (Directory.Exists((string)mainView.FocusedItem.Tag))
                         {
-                            if (Directory.Exists(mainView.FocusedItem.ImageKey))
-                            {
-                                // It was a directory
+                            // It was a directory
 
-                                Directory.Move(mainView.FocusedItem.ImageKey, Path.Combine(CurrentDirectory, setText));
+                            Directory.Move((string)mainView.FocusedItem.Tag, Path.Combine(CurrentDirectory, setText));
 
-                                File.Delete(Path.Combine(CurrentDirectory, setText, "_data.info"));
+                            File.Delete(Path.Combine(CurrentDirectory, setText, "_data.info"));
 
-                                SaveDirectoryInfo(CurrentDirectory, setText, false, $"{setText}", true);
-                            }
-                            else
-                            {
-                                // It was a file
-
-                                File.Copy(mainView.FocusedItem.ImageKey, Path.Combine(CurrentDirectory, setText));
-                                File.Delete(mainView.FocusedItem.ImageKey);
-                            }
+                            SaveDirectoryInfo(CurrentDirectory, setText, false, setText, true);
                         }
+                        else
+                        {
+                            // It was a file
 
+                            File.Copy((string)mainView.FocusedItem.Tag, Path.Combine(CurrentDirectory, setText));
+                            File.Delete((string)mainView.FocusedItem.Tag);
+                        }
                     }
+
                 }
-                RefreshAll();
-                RefreshTreeNode();
-            }
-            catch
-            {
             }
+            RefreshAll();
+            RefreshTreeNode();
         }
 
         private TreeNode[] createSubDirNodes(DirectoryInfo folder)
@@ -882,8 +874,6 @@ namespace TimeHACK.OS.Win95.Win95Apps
                     if (File.Exists(CurrentCopyFile)) File.Delete(CurrentCopyFile);
 
                     File.Move(mainView.FocusedItem.Tag.ToString(), Path.Combine(GameDirectory, "Data", Path.GetFileName(mainView.FocusedItem.Tag.ToString())));
-
-
                 }
                 RefreshAll();
             }
@@ -987,5 +977,10 @@ namespace TimeHACK.OS.Win95.Win95Apps
         {
             foreach (ListViewItem item in mainView.Items) item.Selected = true;
         }
+
+        private void mainView_MouseClick(object sender, MouseEventArgs e)
+        {
+
+        }
     }
 }