Some tweaks

1 files changed, 24 insertions, 65 deletions

diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
index 52ea334..eb24f7c 100644
--- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
@@ -222,6 +222,7 @@ namespace Histacom2.OS.Win95.Win95Apps
                     case 1:
                         WinClassicNotepad np = new WinClassicNotepad();
                         np.mainText.Text = FileDialogBoxManager.ReadTextFile(fileDir);
+                        np.CurrentFilePath = fileDir;
                         WinClassic app = wm.StartWin95(np, "Notepad", Properties.Resources.Win95IconNotepad, true, true);
 
                         Program.AddTaskbarItem(app, app.Tag.ToString(), "Notepad", Properties.Resources.Win95IconNotepad);
@@ -229,6 +230,7 @@ namespace Histacom2.OS.Win95.Win95Apps
                     case 2:
                         WinClassicWordPad wp = new WinClassicWordPad();
                         wp.mainText.LoadFile(fileDir);
+                        wp.CurrentFilePath = fileDir;
                         WinClassic app2 = wm.StartWin95(wp, "Wordpad", Properties.Resources.Win95IconWordpad, true, true);
 
                         Program.AddTaskbarItem(app2, app2.Tag.ToString(), "Wordpad", Properties.Resources.Win95IconWordpad);
@@ -664,7 +666,7 @@ namespace Histacom2.OS.Win95.Win95Apps
             }
             else
             {
-                SaveDirectoryInfo(CurrentDirectory, "New Folder", false, "New Folder", true);
+                SaveDirectoryInfo(CurrentDirectory, "New Folder", false, "New Folder", true, false);
 
                 RefreshAll();
                 OldLabelText = "New Folder";
@@ -723,20 +725,7 @@ namespace Histacom2.OS.Win95.Win95Apps
 
                         // Remove the directory now from the _data.info
 
-                        FileSystemFolderInfo fsfi = JsonConvert.DeserializeObject<FileSystemFolderInfo>(File.ReadAllText(Path.Combine(CurrentDirectory, "_data.info")));
-
-                        foreach (THDirInfo dir in fsfi.SubDirs)
-                        {
-                            if (dir.Name == mainView.FocusedItem.Text)
-                            {
-                                // Delete it
-
-                                fsfi.SubDirs.Remove(dir);
-                                break;
-                            }
-                        }
-
-                        File.WriteAllText(Path.Combine(CurrentDirectory, "_data.info"), JsonConvert.SerializeObject(fsfi, Formatting.Indented));
+                        SaveSystem.RemoveSubDirFromDirectory(CurrentDirectory, mainView.FocusedItem.Text);
                     }
                     else
                     {
@@ -744,20 +733,7 @@ namespace Histacom2.OS.Win95.Win95Apps
 
                         // Remove the file now from the _data.info
 
-                        FileSystemFolderInfo fsfi = JsonConvert.DeserializeObject<FileSystemFolderInfo>(File.ReadAllText(Path.Combine(CurrentDirectory, "_data.info")));
-
-                        foreach (THFileInfo file in fsfi.Files)
-                        {
-                            if (file.Name == mainView.FocusedItem.Text)
-                            {
-                                // Delete it
-
-                                fsfi.Files.Remove(file);
-                                continue;
-                            }
-                        }
-
-                        File.WriteAllText(Path.Combine(CurrentDirectory, "_data.info"), JsonConvert.SerializeObject(fsfi, Formatting.Indented));
+                        RemoveFileFromDirectory(CurrentDirectory, mainView.FocusedItem.Text);
                       
                     }
 
@@ -822,54 +798,22 @@ namespace Histacom2.OS.Win95.Win95Apps
                                 Directory.Move(Path.Combine(CurrentDirectory, OldLabelText), Path.Combine(CurrentDirectory, setText));
 
                                 File.Delete(Path.Combine(CurrentDirectory, setText, "_data.info"));
-                                SaveDirectoryInfo(CurrentDirectory, setText, false, setText, true);
+                                SaveDirectoryInfo(CurrentDirectory, setText, false, setText, true, true);
 
                                 // Rename the directory now in the _data.info
 
-                                FileSystemFolderInfo fsfi = JsonConvert.DeserializeObject<FileSystemFolderInfo>(File.ReadAllText(Path.Combine(CurrentDirectory, "_data.info")));
-
-                                foreach (THDirInfo dir in fsfi.SubDirs)
-                                {
-                                    if (dir.Name == OldLabelText)
-                                    {
-                                        // Rename it
-                                        THDirInfo oldDirInfo = dir;
-                                        oldDirInfo.Name = Path.Combine(CurrentDirectory, setText);
-
-                                        fsfi.SubDirs.Remove(dir);
-                                        fsfi.SubDirs.Add(oldDirInfo);
-                                    }
-                                }
-
-                                File.Delete(Path.Combine(CurrentDirectory, "_data.info"));
-                                File.WriteAllText(Path.Combine(CurrentDirectory, "_data.info"), JsonConvert.SerializeObject(fsfi));
+                                RenameDirectory(CurrentDirectory, OldLabelText, setText);
                             }
                             else
                             {
-                                // It was a file                                
+                                // It was a file                    
 
                                 File.Copy(Path.Combine(CurrentDirectory, OldLabelText), Path.Combine(CurrentDirectory, setText));
                                 File.Delete(Path.Combine(CurrentDirectory, OldLabelText));
 
                                 // Rename the file now in the _data.info
 
-                                FileSystemFolderInfo fsfi = JsonConvert.DeserializeObject<FileSystemFolderInfo>(File.ReadAllText(Path.Combine(CurrentDirectory, "_data.info")));
-
-                                foreach (THFileInfo file in fsfi.Files)
-                                {
-                                    if (file.Name == OldLabelText)
-                                    {
-                                        // Rename it
-                                        THFileInfo oldFileInfo = file;
-                                        oldFileInfo.Name = Path.Combine(CurrentDirectory, setText);
-
-                                        fsfi.Files.Remove(file);
-                                        fsfi.Files.Add(oldFileInfo);                                       
-                                    }
-                                }
-
-                                File.Delete(Path.Combine(CurrentDirectory, "_data.info"));
-                                File.WriteAllText(Path.Combine(CurrentDirectory, "_data.info"), JsonConvert.SerializeObject(fsfi));
+                                RenameFile(CurrentDirectory, OldLabelText, setText);
                             }
                         }
                     }
@@ -1045,7 +989,22 @@ namespace Histacom2.OS.Win95.Win95Apps
 
         private void TextDocumentToolStripMenuItem_Click(object sender, EventArgs e)
         {
+            if (File.Exists(CurrentDirectory + "\\New Text Document.txt"))
+            {
+                //wm.StartInfobox95("Windows Explorer", "This directory already exists", Properties.Resources.Win95Info);
+                //TODO: add making "New Folder (2)"
+            }
+            else
+            {
+                CreateWindowsFile(CurrentDirectory, "New Text Document.txt", "", 12, 0);
+
+                RefreshAll();
+                OldLabelText = "New Folder";
+                mainView.LabelEdit = true;
+                mainView.FindItemWithText("New Text Document.txt").BeginEdit();
+            }
 
+            RefreshTreeNode();
         }
     }
 }