From 15b5a609e1a60035b74aebfc70fafd8e118e4c3a Mon Sep 17 00:00:00 2001 From: Alex-TIMEHACK Date: Sun, 27 Aug 2017 17:27:52 +0100 Subject: This entire commit will be using the code lempamo wrote --- Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs | 10 ++++++---- .../Win98Apps/WinClassicWindowsExplorer.Designer.cs | 18 +++++++++--------- .../OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs | 2 ++ .../OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx | 9 --------- 4 files changed, 17 insertions(+), 22 deletions(-) diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs index bb385da..52ea334 100644 --- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs +++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs @@ -732,10 +732,11 @@ namespace Histacom2.OS.Win95.Win95Apps // Delete it fsfi.SubDirs.Remove(dir); + break; } } - File.WriteAllText(Path.Combine(CurrentDirectory, "_data.info"), JsonConvert.SerializeObject(fsfi)); + File.WriteAllText(Path.Combine(CurrentDirectory, "_data.info"), JsonConvert.SerializeObject(fsfi, Formatting.Indented)); } else { @@ -752,10 +753,11 @@ namespace Histacom2.OS.Win95.Win95Apps // Delete it fsfi.Files.Remove(file); + continue; } } - File.WriteAllText(Path.Combine(CurrentDirectory, "_data.info"), JsonConvert.SerializeObject(fsfi)); + File.WriteAllText(Path.Combine(CurrentDirectory, "_data.info"), JsonConvert.SerializeObject(fsfi, Formatting.Indented)); } @@ -828,7 +830,7 @@ namespace Histacom2.OS.Win95.Win95Apps foreach (THDirInfo dir in fsfi.SubDirs) { - if (dir.Name == mainView.FocusedItem.Tag.ToString()) + if (dir.Name == OldLabelText) { // Rename it THDirInfo oldDirInfo = dir; @@ -855,7 +857,7 @@ namespace Histacom2.OS.Win95.Win95Apps foreach (THFileInfo file in fsfi.Files) { - if (file.Name == mainView.FocusedItem.Tag.ToString()) + if (file.Name == OldLabelText) { // Rename it THFileInfo oldFileInfo = file; diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs index 958c602..25d29fd 100644 --- a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs +++ b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs @@ -29,7 +29,6 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - //System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WinClassicWindowsExplorer)); this.program = new System.Windows.Forms.Panel(); this.mainView = new System.Windows.Forms.ListView(); this.pnlInfo = new System.Windows.Forms.Panel(); @@ -137,6 +136,7 @@ // pictureBox1 // this.pictureBox1.BackColor = System.Drawing.Color.Transparent; + this.pictureBox1.Image = global::Histacom2.Properties.Resources.WinClassicFolderSmall; this.pictureBox1.Location = new System.Drawing.Point(15, 18); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(30, 30); @@ -157,8 +157,8 @@ // // pnlInfoContent // - this.pnlInfoContent.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + this.pnlInfoContent.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.pnlInfoContent.BackColor = System.Drawing.Color.Transparent; this.pnlInfoContent.Controls.Add(this.InfoDesc); @@ -280,7 +280,7 @@ // btnFolderClose // this.btnFolderClose.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(208)))), ((int)(((byte)(200))))); - //this.btnFolderClose.Image = ((System.Drawing.Image)(resources.GetObject("btnFolderClose.Image"))); + this.btnFolderClose.Image = global::Histacom2.Properties.Resources.XCross; this.btnFolderClose.Location = new System.Drawing.Point(172, 3); this.btnFolderClose.Name = "btnFolderClose"; this.btnFolderClose.Size = new System.Drawing.Size(21, 16); @@ -358,7 +358,7 @@ // // txtSave // - this.txtSave.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.txtSave.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.txtSave.Location = new System.Drawing.Point(60, 3); this.txtSave.Name = "txtSave"; @@ -397,7 +397,7 @@ this.TextDocumentToolStripMenuItem, this.BitmapImageToolStripMenuItem}); this.CreateShortcutToolStripMenuItem.Name = "CreateShortcutToolStripMenuItem"; - this.CreateShortcutToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.CreateShortcutToolStripMenuItem.Size = new System.Drawing.Size(117, 22); this.CreateShortcutToolStripMenuItem.Text = "New"; // // FolderToolStripMenuItem @@ -422,21 +422,21 @@ // DeleteToolStripMenuItem // this.DeleteToolStripMenuItem.Name = "DeleteToolStripMenuItem"; - this.DeleteToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.DeleteToolStripMenuItem.Size = new System.Drawing.Size(117, 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(152, 22); + this.RenameToolStripMenuItem.Size = new System.Drawing.Size(117, 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(152, 22); + this.CloseToolStripMenuItem.Size = new System.Drawing.Size(117, 22); this.CloseToolStripMenuItem.Text = "Close"; this.CloseToolStripMenuItem.Click += new System.EventHandler(this.CloseToolStripMenuItem_Click); // diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs index a5f8ba8..bff593e 100644 --- a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs +++ b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs @@ -787,6 +787,7 @@ namespace Histacom2.OS.Win95.Win95Apps // Delete it fsfi.SubDirs.Remove(dir); + continue; } } @@ -807,6 +808,7 @@ namespace Histacom2.OS.Win95.Win95Apps // Delete it fsfi.Files.Remove(file); + continue; } } diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx index 0975ed4..e1edd06 100644 --- a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx +++ b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx @@ -117,15 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - iVBORw0KGgoAAAANSUhEUgAAAAwAAAAJCAIAAACJ2loDAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xNkRpr/UAAABCSURBVChThYox - CgAwCAP9/8scHfqgklI0sUKDQ+6irfDv3Sc7SdtMDWKpA7MBKOIZwM8HpABFfDXauANH24wM84VvNpDG - mcWXeFkAAAAASUVORK5CYII= - - 17, 17 -- cgit v1.2.3