From d1a0c6419bbaf87c9a5de06ba1c7e63a080e5c27 Mon Sep 17 00:00:00 2001 From: Alex-TIMEHACK Date: Sun, 27 Aug 2017 14:34:43 +0100 Subject: very little changes - but I need to reclone --- Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs | 1 - Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs | 5 ----- .../OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs | 10 +++++----- 3 files changed, 5 insertions(+), 11 deletions(-) (limited to 'Histacom2') diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs index fa51dc7..9e0d2e5 100644 --- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs +++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs @@ -94,7 +94,6 @@ 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 // diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs index e205283..59c81d7 100644 --- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs +++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs @@ -1034,11 +1034,6 @@ namespace Histacom2.OS.Win95.Win95Apps foreach (ListViewItem item in mainView.Items) item.Selected = true; } - private void mainView_MouseClick(object sender, MouseEventArgs e) - { - - } - private void TextDocumentToolStripMenuItem_Click(object sender, EventArgs e) { diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs index 335a7bc..958c602 100644 --- a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs +++ b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs @@ -29,7 +29,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WinClassicWindowsExplorer)); + //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(); @@ -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 = ((System.Drawing.Image)(resources.GetObject("btnFolderClose.Image"))); 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"; -- cgit v1.2.3 From a751c8fcac0aab40de9cf0539fff65791da51f34 Mon Sep 17 00:00:00 2001 From: Alex-TIMEHACK Date: Sun, 27 Aug 2017 15:48:28 +0100 Subject: Fixed up a few things --- Histacom2.Engine/FileDialogBoxManager.cs | 2 +- .../OS/Win95/Win95Apps/Win95WindowsExplorer.cs | 7 +++ .../Win95/Win95Apps/WinClassicWordPad.Designer.cs | 71 +++++++++------------- Histacom2/OS/Win95/Win95Apps/WinClassicWordPad.cs | 46 ++++++++++++++ 4 files changed, 83 insertions(+), 43 deletions(-) (limited to 'Histacom2') diff --git a/Histacom2.Engine/FileDialogBoxManager.cs b/Histacom2.Engine/FileDialogBoxManager.cs index c3a2372..161c393 100644 --- a/Histacom2.Engine/FileDialogBoxManager.cs +++ b/Histacom2.Engine/FileDialogBoxManager.cs @@ -46,7 +46,7 @@ namespace Histacom2.Engine THFileInfo info = new THFileInfo(); info.Name = Path.GetFileName(path); - info.FileIcon = 17; + info.FileIcon = 20; info.ByteSize = fileBytes; SaveSystem.CurrentSave.BytesLeft -= fileBytes; SaveSystem.UpdateDirectoryInfo(new FileInfo(path).Directory.FullName, info); diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs index 59c81d7..bb385da 100644 --- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs +++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs @@ -226,6 +226,13 @@ namespace Histacom2.OS.Win95.Win95Apps Program.AddTaskbarItem(app, app.Tag.ToString(), "Notepad", Properties.Resources.Win95IconNotepad); break; + case 2: + WinClassicWordPad wp = new WinClassicWordPad(); + wp.mainText.LoadFile(fileDir); + WinClassic app2 = wm.StartWin95(wp, "Wordpad", Properties.Resources.Win95IconWordpad, true, true); + + Program.AddTaskbarItem(app2, app2.Tag.ToString(), "Wordpad", Properties.Resources.Win95IconWordpad); + break; case 12: OpenApplication(FileDialogBoxManager.ReadTextFile(fileDir), fileDir); break; diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs index 44eb551..c393579 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs @@ -31,6 +31,9 @@ this.topmenu = new System.Windows.Forms.MenuStrip(); this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.openToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.sendToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -79,10 +82,6 @@ this.lblStatus = new System.Windows.Forms.Label(); this.pictureBox3 = new System.Windows.Forms.PictureBox(); this.pictureBox4 = new System.Windows.Forms.PictureBox(); - this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.openToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.topmenu.SuspendLayout(); this.pnlToolbar.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit(); @@ -119,7 +118,6 @@ this.saveToolStripMenuItem, this.saveAsToolStripMenuItem, this.toolStripSeparator1, - this.openToolStripMenuItem, this.sendToolStripMenuItem, this.exitToolStripMenuItem}); this.fileToolStripMenuItem.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F); @@ -134,6 +132,27 @@ this.newToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.newToolStripMenuItem.Text = "New"; // + // openToolStripMenuItem1 + // + this.openToolStripMenuItem1.Name = "openToolStripMenuItem1"; + this.openToolStripMenuItem1.Size = new System.Drawing.Size(152, 22); + this.openToolStripMenuItem1.Text = "Open..."; + this.openToolStripMenuItem1.Click += new System.EventHandler(this.openToolStripMenuItem1_Click); + // + // saveToolStripMenuItem + // + this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; + this.saveToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.saveToolStripMenuItem.Text = "Save..."; + this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); + // + // saveAsToolStripMenuItem + // + this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; + this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.saveAsToolStripMenuItem.Text = "Save As..."; + this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click); + // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; @@ -279,7 +298,7 @@ // this.bulletStyleToolStripMenuItem.CheckOnClick = true; this.bulletStyleToolStripMenuItem.Name = "bulletStyleToolStripMenuItem"; - this.bulletStyleToolStripMenuItem.Size = new System.Drawing.Size(131, 22); + this.bulletStyleToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.bulletStyleToolStripMenuItem.Text = "Bullet style"; // // helpToolStripMenuItem @@ -392,6 +411,7 @@ this.btnSave.Size = new System.Drawing.Size(23, 22); this.btnSave.TabIndex = 3; this.btnSave.UseVisualStyleBackColor = true; + this.btnSave.Click += new System.EventHandler(this.btnSave_Click); // // btnOpen // @@ -403,6 +423,7 @@ this.btnOpen.Size = new System.Drawing.Size(23, 22); this.btnOpen.TabIndex = 2; this.btnOpen.UseVisualStyleBackColor = true; + this.btnOpen.Click += new System.EventHandler(this.btnOpen_Click); // // btnPaste // @@ -447,6 +468,7 @@ this.btnNew.Size = new System.Drawing.Size(23, 22); this.btnNew.TabIndex = 1; this.btnNew.UseVisualStyleBackColor = true; + this.btnNew.Click += new System.EventHandler(this.btnNew_Click); // // pictureBox1 // @@ -613,40 +635,6 @@ this.pictureBox4.TabIndex = 6; this.pictureBox4.TabStop = false; // - // saveToolStripMenuItem - // - this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.saveToolStripMenuItem.Text = "Save..."; - this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); - // - // openToolStripMenuItem - // - this.openToolStripMenuItem.Name = "openToolStripMenuItem"; - this.openToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.openToolStripMenuItem.Text = "Open..."; - // - // saveAsToolStripMenuItem - // - this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; - this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.saveAsToolStripMenuItem.Text = "Save As..."; - this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click); - // - // openToolStripMenuItem1 - // - this.openToolStripMenuItem1.Name = "openToolStripMenuItem1"; - this.openToolStripMenuItem1.Size = new System.Drawing.Size(152, 22); - this.openToolStripMenuItem1.Text = "Open..."; - this.openToolStripMenuItem1.Click += new System.EventHandler(this.openToolStripMenuItem1_Click); - this.pictureBox5.BackgroundImage = global::Histacom2.Properties.Resources.ie4_vsplitter; - this.pictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.pictureBox5.Location = new System.Drawing.Point(297, 0); - this.pictureBox5.Name = "pictureBox5"; - this.pictureBox5.Size = new System.Drawing.Size(2, 28); - this.pictureBox5.TabIndex = 7; - this.pictureBox5.TabStop = false; - // // WinClassicWordPad // this.BackColor = System.Drawing.Color.Silver; @@ -687,7 +675,7 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripMenuItem sendToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem; - private System.Windows.Forms.RichTextBox mainText; + public System.Windows.Forms.RichTextBox mainText; private System.Windows.Forms.ToolStripMenuItem undoToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.ToolStripMenuItem cutToolStripMenuItem; @@ -729,7 +717,6 @@ private System.Windows.Forms.PictureBox pictureBox5; private System.Windows.Forms.ToolStripMenuItem saveAsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem openToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem openToolStripMenuItem1; } } diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicWordPad.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicWordPad.cs index 77d307b..05b5ec1 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicWordPad.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicWordPad.cs @@ -186,6 +186,7 @@ namespace Histacom2.OS.Win95.Win95Apps try { mainText.LoadFile(selectedPath); + CurrentFilePath = selectedPath; } catch { (new WindowManager()).StartInfobox95("Wordpad", "An error occured opening the file.", Engine.Template.InfoboxType.Error, Engine.Template.InfoboxButtons.OK); @@ -233,5 +234,50 @@ namespace Histacom2.OS.Win95.Win95Apps } catch (Exception ex) { MessageBox.Show(ex.Message); } } + + private void btnNew_Click(object sender, EventArgs e) + { + + } + + private void btnOpen_Click(object sender, EventArgs e) + { + try + { + ActivateOpenFileDialog(".rtf"); + string selectedPath = Program.OpenFileExplorerAsDialogAndReturnGivenPath(); + + if (selectedPath != null) + { + try + { + mainText.LoadFile(selectedPath); + } + catch + { + (new WindowManager()).StartInfobox95("Wordpad", "An error occured opening the file.", Engine.Template.InfoboxType.Error, Engine.Template.InfoboxButtons.OK); + } + + } + } + catch + { + } + } + + private void btnSave_Click(object sender, EventArgs e) + { + if (CurrentFilePath == "") + { + // We aren't in a file right now + + SaveAs(); + } + else + { + File.Delete(CurrentFilePath); + SaveRtfDocument(mainText, CurrentFilePath); + } + } } } \ No newline at end of file -- cgit v1.2.3 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(-) (limited to 'Histacom2') 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 From d31cd4fbce0d51ff2a51ccf40d11613163ed2a46 Mon Sep 17 00:00:00 2001 From: Alex-TIMEHACK Date: Sun, 27 Aug 2017 19:40:33 +0100 Subject: Some tweaks --- Histacom2.Engine/Histacom2.Engine.csproj | 1 + Histacom2.Engine/SaveSystem.cs | 104 ++++++++++++++---- Histacom2/GlobalPrograms/WinClassicNotepad.cs | 2 +- .../Win95Apps/Win95WindowsExplorer.Designer.cs | 121 +++++++++------------ .../OS/Win95/Win95Apps/Win95WindowsExplorer.cs | 89 ++++----------- Histacom2/OS/Win95/Win95Apps/WinClassicWordPad.cs | 2 +- .../Win98/Win98Apps/WinClassicWindowsExplorer.cs | 86 ++++----------- 7 files changed, 185 insertions(+), 220 deletions(-) (limited to 'Histacom2') diff --git a/Histacom2.Engine/Histacom2.Engine.csproj b/Histacom2.Engine/Histacom2.Engine.csproj index beb4aa2..37c4489 100644 --- a/Histacom2.Engine/Histacom2.Engine.csproj +++ b/Histacom2.Engine/Histacom2.Engine.csproj @@ -20,6 +20,7 @@ DEBUG;TRACE prompt 4 + x86 pdbonly diff --git a/Histacom2.Engine/SaveSystem.cs b/Histacom2.Engine/SaveSystem.cs index 5557dca..7da916b 100644 --- a/Histacom2.Engine/SaveSystem.cs +++ b/Histacom2.Engine/SaveSystem.cs @@ -207,10 +207,58 @@ namespace Histacom2.Engine public static void UpdateDirectoryInfo(string path, THFileInfo newfile) { - newfile.DOSName = newfile.Name.ToUpper().Replace("*", "").Replace("+", "").Replace(":", "").Replace(";", "").Replace(" ", ""); - if (newfile.DOSName.Contains(".")) + SetDOSName(ref newfile); + + if (File.ReadAllText(Path.Combine(path, "_data.info")).Contains(newfile.DOSName)) return; + FileSystemFolderInfo fsfi = JsonConvert.DeserializeObject(File.ReadAllText(Path.Combine(path, "_data.info"))); + fsfi.Files.Add(newfile); + fsfi.ByteSize += newfile.ByteSize; + + string toWrite = JsonConvert.SerializeObject(fsfi, Formatting.Indented); + + File.WriteAllText(Path.Combine(path, "_data.info"), toWrite); + } + + public static void RemoveFileFromDirectory(string path, string filename) + { + FileSystemFolderInfo fsfi = JsonConvert.DeserializeObject(File.ReadAllText(Path.Combine(path, "_data.info"))); + THFileInfo fi = fsfi.Files.Find((THFileInfo f) => { return f.Name == filename; }); + if (fi == null) return; + + fsfi.ByteSize -= fi.ByteSize; + CurrentSave.BytesLeft += fi.ByteSize; + + fsfi.Files.Remove(fi); + string toWrite = JsonConvert.SerializeObject(fsfi, Formatting.Indented); + + File.WriteAllText(Path.Combine(path, "_data.info"), toWrite); + } + + public static void RemoveSubDirFromDirectory(string path, string dirname) + { + FileSystemFolderInfo fsfi = JsonConvert.DeserializeObject(File.ReadAllText(Path.Combine(path, "_data.info"))); + THDirInfo di = fsfi.SubDirs.Find((THDirInfo f) => { return f.Name == dirname; }); + if (di == null) return; + + // Find the bytesize of the folder + + FileSystemFolderInfo dirfsfi = JsonConvert.DeserializeObject(File.ReadAllText(Path.Combine(path, "_data.info"))); + + fsfi.ByteSize -= dirfsfi.ByteSize; + CurrentSave.BytesLeft += dirfsfi.ByteSize; + + fsfi.SubDirs.Remove(di); + string toWrite = JsonConvert.SerializeObject(fsfi, Formatting.Indented); + + File.WriteAllText(Path.Combine(path, "_data.info"), toWrite); + } + + public static string SetDOSName(ref THFileInfo file) + { + file.DOSName = file.Name.ToUpper().Replace("*", "").Replace("+", "").Replace(":", "").Replace(";", "").Replace(" ", ""); + if (file.DOSName.Contains(".")) { - string[] dos = newfile.DOSName.Split('.'); + string[] dos = file.DOSName.Split('.'); if (dos.Count() > 2) { @@ -221,30 +269,45 @@ namespace Histacom2.Engine dos[1] = dos[1].Substring(0, 3); if (dos[0].Length > 8) dos[0] = dos[0].Substring(0, 6) + "~1"; - newfile.DOSName = dos[0] + "." + dos[1]; + file.DOSName = dos[0] + "." + dos[1]; } - else if (newfile.DOSName.Length > 8) newfile.DOSName = newfile.DOSName.Substring(0, 6) + "~1"; + else if (file.DOSName.Length > 8) file.DOSName = file.DOSName.Substring(0, 6) + "~1"; + return file.DOSName; + } - if (File.ReadAllText(Path.Combine(path, "_data.info")).Contains(newfile.DOSName)) return; + public static void RenameDirectory(string path, string dirname, string newname) + { FileSystemFolderInfo fsfi = JsonConvert.DeserializeObject(File.ReadAllText(Path.Combine(path, "_data.info"))); - fsfi.Files.Add(newfile); - fsfi.ByteSize += newfile.ByteSize; + THDirInfo di = fsfi.SubDirs.Find((THDirInfo f) => { return f.Name == dirname; }); + if (di == null) return; + + THDirInfo newDi = di; + + newDi.Name = newname; + THFileInfo tmpfi = new THFileInfo(); + newDi.DOSName = SetDOSName(ref tmpfi); + fsfi.SubDirs.Remove(di); + fsfi.SubDirs.Add(newDi); string toWrite = JsonConvert.SerializeObject(fsfi, Formatting.Indented); File.WriteAllText(Path.Combine(path, "_data.info"), toWrite); } - public static void RemoveFileFromDirectory(string path, string filename) + public static void RenameFile(string path, string filename, string newname) { FileSystemFolderInfo fsfi = JsonConvert.DeserializeObject(File.ReadAllText(Path.Combine(path, "_data.info"))); THFileInfo fi = fsfi.Files.Find((THFileInfo f) => { return f.Name == filename; }); if (fi == null) return; - fsfi.ByteSize -= fi.ByteSize; - CurrentSave.BytesLeft += fi.ByteSize; + THFileInfo newFi = fi; + newFi.Name = newname; + + THFileInfo tmpfi = new THFileInfo(); + newFi.DOSName = SetDOSName(ref tmpfi); fsfi.Files.Remove(fi); + fsfi.Files.Add(newFi); string toWrite = JsonConvert.SerializeObject(fsfi, Formatting.Indented); File.WriteAllText(Path.Combine(path, "_data.info"), toWrite); @@ -278,7 +341,7 @@ namespace Histacom2.Engine } } - public static void SaveDirectoryInfo(string parent, string dirname, bool isProtected, string label, bool allowback) + public static void SaveDirectoryInfo(string parent, string dirname, bool isProtected, string label, bool allowback, bool updateParent = true) { if (File.Exists(Path.Combine(parent, dirname, "_data.info")) && Path.Combine(parent, dirname) != ProfileFileSystemDirectory) return; Directory.CreateDirectory(Path.Combine(parent, dirname)); @@ -296,15 +359,18 @@ namespace Histacom2.Engine info.SubDirs = new List(256); info.ByteSize = 0; - if (parent != ProfileDirectory) + if (updateParent == true) { - FileSystemFolderInfo fsfi = JsonConvert.DeserializeObject(File.ReadAllText(Path.Combine(parent, "_data.info"))); - THDirInfo thd = new THDirInfo(); - thd.Name = info.Label; - thd.DOSName = info.DOSLabel; - fsfi.SubDirs.Add(thd); + if ((parent != ProfileDirectory)) + { + FileSystemFolderInfo fsfi = JsonConvert.DeserializeObject(File.ReadAllText(Path.Combine(parent, "_data.info"))); + THDirInfo thd = new THDirInfo(); + thd.Name = info.Label; + thd.DOSName = info.DOSLabel; + fsfi.SubDirs.Add(thd); - File.WriteAllText(Path.Combine(parent, "_data.info"), JsonConvert.SerializeObject(fsfi, Formatting.Indented)); + File.WriteAllText(Path.Combine(parent, "_data.info"), JsonConvert.SerializeObject(fsfi, Formatting.Indented)); + } } string toWrite = JsonConvert.SerializeObject(info, Formatting.Indented); diff --git a/Histacom2/GlobalPrograms/WinClassicNotepad.cs b/Histacom2/GlobalPrograms/WinClassicNotepad.cs index 331f0d5..72f1e41 100644 --- a/Histacom2/GlobalPrograms/WinClassicNotepad.cs +++ b/Histacom2/GlobalPrograms/WinClassicNotepad.cs @@ -15,7 +15,7 @@ namespace Histacom2.OS.Win95.Win95Apps { public partial class WinClassicNotepad : UserControl { - string CurrentFilePath = ""; + public string CurrentFilePath = ""; public WinClassicNotepad() { InitializeComponent(); diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs index e015eda..123e477 100644 --- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs +++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs @@ -30,6 +30,10 @@ { this.components = new System.ComponentModel.Container(); this.program = new System.Windows.Forms.Panel(); + this.pnlSave = new System.Windows.Forms.Panel(); + this.Button1 = new System.Windows.Forms.Button(); + this.Label1 = new System.Windows.Forms.Label(); + this.txtSave = new System.Windows.Forms.TextBox(); this.mainView = new System.Windows.Forms.ListView(); this.diskView = new System.Windows.Forms.TreeView(); this.MenuStrip1 = new System.Windows.Forms.MenuStrip(); @@ -37,7 +41,6 @@ this.CreateShortcutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.FolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.TextDocumentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.BitmapImageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.DeleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.RenameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CloseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -55,14 +58,10 @@ this.bottomrightcorner = new System.Windows.Forms.Panel(); this.bottomleftcorner = new System.Windows.Forms.Panel(); this.topleftcorner = new System.Windows.Forms.Panel(); - this.pnlSave = new System.Windows.Forms.Panel(); - this.Button1 = new System.Windows.Forms.Button(); - this.Label1 = new System.Windows.Forms.Label(); - this.txtSave = new System.Windows.Forms.TextBox(); this.refresh = new System.Windows.Forms.Timer(this.components); this.program.SuspendLayout(); - this.MenuStrip1.SuspendLayout(); this.pnlSave.SuspendLayout(); + this.MenuStrip1.SuspendLayout(); this.SuspendLayout(); // // program @@ -82,6 +81,47 @@ this.program.Size = new System.Drawing.Size(704, 517); this.program.TabIndex = 13; // + // pnlSave + // + this.pnlSave.Controls.Add(this.Button1); + this.pnlSave.Controls.Add(this.Label1); + this.pnlSave.Controls.Add(this.txtSave); + this.pnlSave.Location = new System.Drawing.Point(3, 474); + this.pnlSave.Name = "pnlSave"; + this.pnlSave.Size = new System.Drawing.Size(850, 35); + this.pnlSave.TabIndex = 18; + this.pnlSave.Visible = false; + // + // Button1 + // + this.Button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.Button1.Location = new System.Drawing.Point(608, 1); + this.Button1.Name = "Button1"; + this.Button1.Size = new System.Drawing.Size(75, 23); + this.Button1.TabIndex = 17; + this.Button1.Text = "Save"; + this.Button1.UseVisualStyleBackColor = true; + this.Button1.Click += new System.EventHandler(this.Button1_Click); + // + // Label1 + // + this.Label1.AutoSize = true; + this.Label1.Location = new System.Drawing.Point(3, 6); + this.Label1.Name = "Label1"; + this.Label1.Size = new System.Drawing.Size(57, 13); + this.Label1.TabIndex = 16; + this.Label1.Text = "File Name:"; + // + // txtSave + // + 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"; + this.txtSave.Size = new System.Drawing.Size(542, 20); + this.txtSave.TabIndex = 15; + // // mainView // this.mainView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -136,10 +176,9 @@ // this.CreateShortcutToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.FolderToolStripMenuItem, - this.TextDocumentToolStripMenuItem, - this.BitmapImageToolStripMenuItem}); + this.TextDocumentToolStripMenuItem}); this.CreateShortcutToolStripMenuItem.Name = "CreateShortcutToolStripMenuItem"; - this.CreateShortcutToolStripMenuItem.Size = new System.Drawing.Size(117, 22); + this.CreateShortcutToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.CreateShortcutToolStripMenuItem.Text = "New"; // // FolderToolStripMenuItem @@ -149,12 +188,6 @@ 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.Text = "Shortcut"; - // // TextDocumentToolStripMenuItem // this.TextDocumentToolStripMenuItem.Name = "TextDocumentToolStripMenuItem"; @@ -162,30 +195,24 @@ this.TextDocumentToolStripMenuItem.Text = "Text Document"; this.TextDocumentToolStripMenuItem.Click += new System.EventHandler(this.TextDocumentToolStripMenuItem_Click); // - // BitmapImageToolStripMenuItem - // - this.BitmapImageToolStripMenuItem.Name = "BitmapImageToolStripMenuItem"; - this.BitmapImageToolStripMenuItem.Size = new System.Drawing.Size(154, 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(152, 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(152, 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(152, 22); this.CloseToolStripMenuItem.Text = "Close"; this.CloseToolStripMenuItem.Click += new System.EventHandler(this.CloseToolStripMenuItem_Click); // @@ -297,47 +324,6 @@ this.topleftcorner.Size = new System.Drawing.Size(4, 4); this.topleftcorner.TabIndex = 1; // - // pnlSave - // - this.pnlSave.Controls.Add(this.Button1); - this.pnlSave.Controls.Add(this.Label1); - this.pnlSave.Controls.Add(this.txtSave); - this.pnlSave.Location = new System.Drawing.Point(3, 474); - this.pnlSave.Name = "pnlSave"; - this.pnlSave.Size = new System.Drawing.Size(850, 35); - this.pnlSave.TabIndex = 18; - this.pnlSave.Visible = false; - // - // Button1 - // - this.Button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button1.Location = new System.Drawing.Point(608, 1); - this.Button1.Name = "Button1"; - this.Button1.Size = new System.Drawing.Size(75, 23); - this.Button1.TabIndex = 17; - this.Button1.Text = "Save"; - this.Button1.UseVisualStyleBackColor = true; - this.Button1.Click += new System.EventHandler(this.Button1_Click); - // - // Label1 - // - this.Label1.AutoSize = true; - this.Label1.Location = new System.Drawing.Point(3, 6); - this.Label1.Name = "Label1"; - this.Label1.Size = new System.Drawing.Size(57, 13); - this.Label1.TabIndex = 16; - this.Label1.Text = "File Name:"; - // - // txtSave - // - 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"; - this.txtSave.Size = new System.Drawing.Size(542, 20); - this.txtSave.TabIndex = 15; - // // refresh // this.refresh.Interval = 15000; @@ -353,10 +339,10 @@ this.Load += new System.EventHandler(this.WinClassicWindowsExplorer_Load); this.program.ResumeLayout(false); this.program.PerformLayout(); - this.MenuStrip1.ResumeLayout(false); - this.MenuStrip1.PerformLayout(); this.pnlSave.ResumeLayout(false); this.pnlSave.PerformLayout(); + this.MenuStrip1.ResumeLayout(false); + this.MenuStrip1.PerformLayout(); this.ResumeLayout(false); } @@ -370,7 +356,6 @@ internal System.Windows.Forms.ToolStripMenuItem CreateShortcutToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem FolderToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem TextDocumentToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem BitmapImageToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem DeleteToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem RenameToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem CloseToolStripMenuItem; 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(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(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(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(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(); } } } diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicWordPad.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicWordPad.cs index 05b5ec1..91d9368 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicWordPad.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicWordPad.cs @@ -22,7 +22,7 @@ namespace Histacom2.OS.Win95.Win95Apps bool doItalic = false; bool doUnderline = false; - string CurrentFilePath = ""; + public string CurrentFilePath = ""; public WinClassicWordPad() { diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs index bff593e..9144c76 100644 --- a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs +++ b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs @@ -243,18 +243,28 @@ 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); + break; + 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); break; case 12: OpenApplication(FileDialogBoxManager.ReadTextFile(fileDir), fileDir); break; } - } catch { } - + catch + { + } + } void OpenApplication(string appname, string path) @@ -778,20 +788,7 @@ namespace Histacom2.OS.Win95.Win95Apps // Remove the directory now from the _data.info - FileSystemFolderInfo fsfi = JsonConvert.DeserializeObject(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); - continue; - } - } - - File.WriteAllText(Path.Combine(CurrentDirectory, "_data.info"), JsonConvert.SerializeObject(fsfi, Formatting.Indented)); + SaveSystem.RemoveSubDirFromDirectory(CurrentDirectory, mainView.FocusedItem.Text); } else { @@ -799,20 +796,7 @@ namespace Histacom2.OS.Win95.Win95Apps // Remove the file now from the _data.info - FileSystemFolderInfo fsfi = JsonConvert.DeserializeObject(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); } @@ -824,6 +808,8 @@ namespace Histacom2.OS.Win95.Win95Apps { RefreshAll(); } + + RefreshTreeNode(); } internal static bool FileOrDirectoryExists(string path) @@ -876,54 +862,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(File.ReadAllText(Path.Combine(CurrentDirectory, "_data.info"))); - - foreach (THDirInfo dir in fsfi.SubDirs) - { - if (dir.Name == mainView.FocusedItem.Tag.ToString()) - { - // 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, Formatting.Indented)); + 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(File.ReadAllText(Path.Combine(CurrentDirectory, "_data.info"))); - - foreach (THFileInfo file in fsfi.Files) - { - if (file.Name == mainView.FocusedItem.Tag.ToString()) - { - // 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, Formatting.Indented)); + RenameFile(CurrentDirectory, OldLabelText, setText); } } } -- cgit v1.2.3 From bae9adbb7a79d696f3834a5a36a6fd431b2bc463 Mon Sep 17 00:00:00 2001 From: Alex-TIMEHACK Date: Sun, 27 Aug 2017 20:09:23 +0100 Subject: Fixed the icons --- Histacom2/Properties/Resources.resx | 8 ++++---- Histacom2/Properties/Resources1.Designer.cs | 7 ++----- Histacom2/Resources/WinClassicRtfFile.png | Bin 458 -> 458 bytes Histacom2/Resources/WinClassicTextFile.png | Bin 352 -> 888 bytes 4 files changed, 6 insertions(+), 9 deletions(-) (limited to 'Histacom2') diff --git a/Histacom2/Properties/Resources.resx b/Histacom2/Properties/Resources.resx index 9331936..cd71880 100644 --- a/Histacom2/Properties/Resources.resx +++ b/Histacom2/Properties/Resources.resx @@ -822,9 +822,6 @@ ..\Resources\IE3\IE3_StopHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassicRtfFile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\WinClassicTextFile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1890,7 +1887,7 @@ } ] } - + ..\Resources\TitleScreen\CopyrightNotice.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1927,4 +1924,7 @@ ..\Resources\WinClassic\WinClassicWebchat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassicRtfFile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Histacom2/Properties/Resources1.Designer.cs b/Histacom2/Properties/Resources1.Designer.cs index 2a5653e..1d8d7ee 100644 --- a/Histacom2/Properties/Resources1.Designer.cs +++ b/Histacom2/Properties/Resources1.Designer.cs @@ -867,9 +867,7 @@ namespace Histacom2.Properties { /// "btn4txt": "", /// "btn4tag": "", /// "btn5txt": "", - /// "btn5tag": "" - /// }, - /// "inthe [rest of string was truncated]";. + /// "btn5tag": " [rest of string was truncated]";. /// public static string std_story { get { @@ -1040,8 +1038,7 @@ namespace Histacom2.Properties { /// "userchat": true /// }, /// { - /// "user": "SkyHigh", - /// [rest of string was truncated]";. + /// [rest of string was truncated]";. /// public static string webchat1998_convo { get { diff --git a/Histacom2/Resources/WinClassicRtfFile.png b/Histacom2/Resources/WinClassicRtfFile.png index c862152..ad714c6 100644 Binary files a/Histacom2/Resources/WinClassicRtfFile.png and b/Histacom2/Resources/WinClassicRtfFile.png differ diff --git a/Histacom2/Resources/WinClassicTextFile.png b/Histacom2/Resources/WinClassicTextFile.png index a8daaf8..7bfca4b 100644 Binary files a/Histacom2/Resources/WinClassicTextFile.png and b/Histacom2/Resources/WinClassicTextFile.png differ -- cgit v1.2.3 From 805a238822d3fdca7b75f63e622d93cba421755a Mon Sep 17 00:00:00 2001 From: Alex-TIMEHACK Date: Sun, 27 Aug 2017 20:27:21 +0100 Subject: FIXED ALL THE ICONS AGAIN --- Histacom2/GlobalPrograms/WinClassicNotepad.cs | 2 +- Histacom2/Histacom2.csproj | 1 + .../Win95Apps/Win95WindowsExplorer.Designer.cs | 8 ++++---- .../OS/Win95/Win95Apps/Win95WindowsExplorer.cs | 2 +- .../OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs | 2 +- Histacom2/Properties/Resources.resx | 6 +++--- Histacom2/Properties/Resources1.Designer.cs | 20 ++++++++++---------- Histacom2/Resources/WinClassicNotepad.png | Bin 0 -> 352 bytes 8 files changed, 21 insertions(+), 20 deletions(-) create mode 100644 Histacom2/Resources/WinClassicNotepad.png (limited to 'Histacom2') diff --git a/Histacom2/GlobalPrograms/WinClassicNotepad.cs b/Histacom2/GlobalPrograms/WinClassicNotepad.cs index 72f1e41..e1a4019 100644 --- a/Histacom2/GlobalPrograms/WinClassicNotepad.cs +++ b/Histacom2/GlobalPrograms/WinClassicNotepad.cs @@ -37,7 +37,7 @@ namespace Histacom2.OS.Win95.Win95Apps private void aboutNotepadToolStripMenuItem_Click(object sender, EventArgs e) { WindowManager wm = new WindowManager(); - wm.StartAboutBox95("Notepad", "Microsoft Notepad", Properties.Resources.WinClassicNotepadBig); + wm.StartAboutBox95("Notepad", "Microsoft Notepad", Properties.Resources.WinClassicNotepad); } private void wordWrapToolStripMenuItem_Click(object sender, EventArgs e) diff --git a/Histacom2/Histacom2.csproj b/Histacom2/Histacom2.csproj index be8df37..46750d2 100644 --- a/Histacom2/Histacom2.csproj +++ b/Histacom2/Histacom2.csproj @@ -636,6 +636,7 @@ + diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs index 123e477..e16d79b 100644 --- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs +++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs @@ -178,7 +178,7 @@ this.FolderToolStripMenuItem, this.TextDocumentToolStripMenuItem}); 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 @@ -198,21 +198,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/Win95/Win95Apps/Win95WindowsExplorer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs index eb24f7c..07f9e57 100644 --- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs +++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs @@ -65,7 +65,7 @@ namespace Histacom2.OS.Win95.Win95Apps Properties.Resources.WinClassicFolder, Properties.Resources.WinClassicApp, // 10 Properties.Resources.WinClassicSetup, - Properties.Resources.WinClassicTextFile, + Properties.Resources.WinClassicNotepad, Properties.Resources.WinClassicCalcBig, Properties.Resources.WinClassicNotepadBig, Properties.Resources.WinClassicRegedit, // 15 diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs index 9144c76..8fbe14c 100644 --- a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs +++ b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs @@ -70,7 +70,7 @@ namespace Histacom2.OS.Win95.Win95Apps Properties.Resources.WinClassicFolder, Properties.Resources.WinClassicApp, // 10 Properties.Resources.WinClassicSetup, - Properties.Resources.WinClassicTextFile, + Properties.Resources.WinClassicNotepad, Properties.Resources.WinClassicCalcBig, Properties.Resources.WinClassicNotepadBig, Properties.Resources.WinClassicRegedit, // 15 diff --git a/Histacom2/Properties/Resources.resx b/Histacom2/Properties/Resources.resx index cd71880..6c51cf6 100644 --- a/Histacom2/Properties/Resources.resx +++ b/Histacom2/Properties/Resources.resx @@ -822,9 +822,6 @@ ..\Resources\IE3\IE3_StopHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassicTextFile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - { "messages": [ @@ -1924,6 +1921,9 @@ ..\Resources\WinClassic\WinClassicWebchat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassicNotepad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\WinClassicRtfFile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/Histacom2/Properties/Resources1.Designer.cs b/Histacom2/Properties/Resources1.Designer.cs index 1d8d7ee..3ef5f6c 100644 --- a/Histacom2/Properties/Resources1.Designer.cs +++ b/Histacom2/Properties/Resources1.Designer.cs @@ -1703,6 +1703,16 @@ namespace Histacom2.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap WinClassicNotepad { + get { + object obj = ResourceManager.GetObject("WinClassicNotepad", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -1873,16 +1883,6 @@ namespace Histacom2.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap WinClassicTextFile { - get { - object obj = ResourceManager.GetObject("WinClassicTextFile", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/Histacom2/Resources/WinClassicNotepad.png b/Histacom2/Resources/WinClassicNotepad.png new file mode 100644 index 0000000..937d8ca Binary files /dev/null and b/Histacom2/Resources/WinClassicNotepad.png differ -- cgit v1.2.3