From eca20f542d9b604f95f060d92028c4fd4ee173a6 Mon Sep 17 00:00:00 2001 From: Alex-TIMEHACK Date: Sat, 22 Jul 2017 09:27:28 +0100 Subject: Made 95 explorer seperate from 98/2000/ME --- .../Win98/Win98Apps/WinClassicWindowsExplorer.resx | 123 +++++++++++++++++++++ 1 file changed, 123 insertions(+) create mode 100644 TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx (limited to 'TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx') diff --git a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx new file mode 100644 index 0000000..bb70361 --- /dev/null +++ b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file -- cgit v1.2.3 From f355abf45eef2b1a103c81df554426f848c53975 Mon Sep 17 00:00:00 2001 From: Alex-TIMEHACK Date: Sat, 22 Jul 2017 09:55:12 +0100 Subject: A lot of Work on the WinClassicExplorer --- .../Win95Apps/Win95WindowsExplorer.Designer.cs | 34 +---- .../WinClassicWindowsExplorer.Designer.cs | 170 +++++++++++++-------- .../Win98/Win98Apps/WinClassicWindowsExplorer.resx | 9 ++ TimeHACK.Main/Properties/Resources.resx | 6 +- ...nClassicGENERALApplicationToolBoxBackground.png | Bin 0 -> 458 bytes TimeHACK.Main/TimeHACK.Main.csproj | 1 + 6 files changed, 127 insertions(+), 93 deletions(-) create mode 100644 TimeHACK.Main/Resources/WinClassicGENERALApplicationToolBoxBackground.png (limited to 'TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx') diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs index 827cc74..19af4e5 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs @@ -46,9 +46,7 @@ this.CutCtrlXToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CopyCtrlCToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.PasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PasteShortcutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SellectAllCtrlAToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.InvertSelectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ToolbarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.StatusBarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -161,7 +159,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 @@ -192,21 +190,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); // @@ -217,9 +215,7 @@ this.CutCtrlXToolStripMenuItem, this.CopyCtrlCToolStripMenuItem, this.PasteToolStripMenuItem, - this.PasteShortcutToolStripMenuItem, - this.SellectAllCtrlAToolStripMenuItem, - this.InvertSelectionToolStripMenuItem}); + this.SellectAllCtrlAToolStripMenuItem}); this.EditToolStripMenuItem.Name = "EditToolStripMenuItem"; this.EditToolStripMenuItem.Size = new System.Drawing.Size(39, 20); this.EditToolStripMenuItem.Text = "Edit"; @@ -248,23 +244,11 @@ this.PasteToolStripMenuItem.Size = new System.Drawing.Size(197, 22); this.PasteToolStripMenuItem.Text = "Paste Ctrl+V"; // - // PasteShortcutToolStripMenuItem - // - this.PasteShortcutToolStripMenuItem.Name = "PasteShortcutToolStripMenuItem"; - this.PasteShortcutToolStripMenuItem.Size = new System.Drawing.Size(197, 22); - this.PasteShortcutToolStripMenuItem.Text = "Paste Shortcut"; - // // SellectAllCtrlAToolStripMenuItem // this.SellectAllCtrlAToolStripMenuItem.Name = "SellectAllCtrlAToolStripMenuItem"; this.SellectAllCtrlAToolStripMenuItem.Size = new System.Drawing.Size(197, 22); - this.SellectAllCtrlAToolStripMenuItem.Text = "Sellect All Ctrl+A"; - // - // InvertSelectionToolStripMenuItem - // - this.InvertSelectionToolStripMenuItem.Name = "InvertSelectionToolStripMenuItem"; - this.InvertSelectionToolStripMenuItem.Size = new System.Drawing.Size(197, 22); - this.InvertSelectionToolStripMenuItem.Text = "Invert Selection"; + this.SellectAllCtrlAToolStripMenuItem.Text = "Select All Ctrl+A"; // // ViewToolStripMenuItem // @@ -531,12 +515,12 @@ this.txtSave.Size = new System.Drawing.Size(542, 20); this.txtSave.TabIndex = 15; // - // WinClassicWindowsExplorer + // Win95WindowsExplorer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.program); - this.Name = "WinClassicWindowsExplorer"; + this.Name = "Win95WindowsExplorer"; this.Size = new System.Drawing.Size(704, 517); this.Load += new System.EventHandler(this.WinClassicWindowsExplorer_Load); this.program.ResumeLayout(false); @@ -568,9 +552,7 @@ internal System.Windows.Forms.ToolStripMenuItem CutCtrlXToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem CopyCtrlCToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem PasteToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem PasteShortcutToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem SellectAllCtrlAToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem InvertSelectionToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem ViewToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem ToolbarToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem StatusBarToolStripMenuItem; diff --git a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs index aff4742..c74b102 100644 --- a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs +++ b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs @@ -28,9 +28,8 @@ /// private void InitializeComponent() { + 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.diskView = new System.Windows.Forms.TreeView(); this.MenuStrip1 = new System.Windows.Forms.MenuStrip(); this.FileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CreateShortcutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -42,13 +41,10 @@ this.RenameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CloseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.EditToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.UndoCtrlZToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CutCtrlXToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CopyCtrlCToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.PasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PasteShortcutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SellectAllCtrlAToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.InvertSelectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ToolbarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.StatusBarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -76,6 +72,7 @@ this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.HelpToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.AboutWindows95ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mainView = new System.Windows.Forms.ListView(); this.toprightcorner = new System.Windows.Forms.Panel(); this.bottomrightcorner = new System.Windows.Forms.Panel(); this.bottomleftcorner = new System.Windows.Forms.Panel(); @@ -84,49 +81,38 @@ this.Button1 = new System.Windows.Forms.Button(); this.Label1 = new System.Windows.Forms.Label(); this.txtSave = new System.Windows.Forms.TextBox(); + this.pnlInfo = new System.Windows.Forms.Panel(); + this.pnlFolders = new System.Windows.Forms.Panel(); + this.pnlFoldersTop = new System.Windows.Forms.Panel(); + this.diskView = new System.Windows.Forms.TreeView(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.label2 = new System.Windows.Forms.Label(); this.program.SuspendLayout(); this.MenuStrip1.SuspendLayout(); this.pnlSave.SuspendLayout(); + this.pnlInfo.SuspendLayout(); + this.pnlFolders.SuspendLayout(); + this.pnlFoldersTop.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // // program // this.program.BackColor = System.Drawing.Color.Silver; this.program.Controls.Add(this.mainView); - this.program.Controls.Add(this.diskView); - this.program.Controls.Add(this.MenuStrip1); this.program.Controls.Add(this.toprightcorner); this.program.Controls.Add(this.bottomrightcorner); this.program.Controls.Add(this.bottomleftcorner); this.program.Controls.Add(this.topleftcorner); this.program.Controls.Add(this.pnlSave); + this.program.Controls.Add(this.pnlInfo); + this.program.Controls.Add(this.MenuStrip1); this.program.Dock = System.Windows.Forms.DockStyle.Fill; this.program.Location = new System.Drawing.Point(0, 0); this.program.Name = "program"; this.program.Size = new System.Drawing.Size(704, 517); this.program.TabIndex = 13; // - // mainView - // - this.mainView.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.mainView.Location = new System.Drawing.Point(215, 27); - this.mainView.Name = "mainView"; - this.mainView.Size = new System.Drawing.Size(486, 444); - this.mainView.TabIndex = 10; - this.mainView.UseCompatibleStateImageBehavior = false; - this.mainView.View = System.Windows.Forms.View.List; - this.mainView.DoubleClick += new System.EventHandler(this.mainView_DoubleClick); - // - // diskView - // - this.diskView.Location = new System.Drawing.Point(3, 27); - this.diskView.Name = "diskView"; - this.diskView.Size = new System.Drawing.Size(213, 444); - this.diskView.TabIndex = 13; - this.diskView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.diskView_AfterSelect); - // // MenuStrip1 // this.MenuStrip1.BackColor = System.Drawing.Color.Silver; @@ -161,7 +147,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 @@ -192,44 +178,35 @@ // 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); // // EditToolStripMenuItem // this.EditToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.UndoCtrlZToolStripMenuItem, this.CutCtrlXToolStripMenuItem, this.CopyCtrlCToolStripMenuItem, this.PasteToolStripMenuItem, - this.PasteShortcutToolStripMenuItem, - this.SellectAllCtrlAToolStripMenuItem, - this.InvertSelectionToolStripMenuItem}); + this.SellectAllCtrlAToolStripMenuItem}); this.EditToolStripMenuItem.Name = "EditToolStripMenuItem"; this.EditToolStripMenuItem.Size = new System.Drawing.Size(39, 20); this.EditToolStripMenuItem.Text = "Edit"; // - // UndoCtrlZToolStripMenuItem - // - this.UndoCtrlZToolStripMenuItem.Name = "UndoCtrlZToolStripMenuItem"; - this.UndoCtrlZToolStripMenuItem.Size = new System.Drawing.Size(197, 22); - this.UndoCtrlZToolStripMenuItem.Text = "Undo Ctrl+Z"; - // // CutCtrlXToolStripMenuItem // this.CutCtrlXToolStripMenuItem.Name = "CutCtrlXToolStripMenuItem"; @@ -248,23 +225,11 @@ this.PasteToolStripMenuItem.Size = new System.Drawing.Size(197, 22); this.PasteToolStripMenuItem.Text = "Paste Ctrl+V"; // - // PasteShortcutToolStripMenuItem - // - this.PasteShortcutToolStripMenuItem.Name = "PasteShortcutToolStripMenuItem"; - this.PasteShortcutToolStripMenuItem.Size = new System.Drawing.Size(197, 22); - this.PasteShortcutToolStripMenuItem.Text = "Paste Shortcut"; - // // SellectAllCtrlAToolStripMenuItem // this.SellectAllCtrlAToolStripMenuItem.Name = "SellectAllCtrlAToolStripMenuItem"; this.SellectAllCtrlAToolStripMenuItem.Size = new System.Drawing.Size(197, 22); - this.SellectAllCtrlAToolStripMenuItem.Text = "Sellect All Ctrl+A"; - // - // InvertSelectionToolStripMenuItem - // - this.InvertSelectionToolStripMenuItem.Name = "InvertSelectionToolStripMenuItem"; - this.InvertSelectionToolStripMenuItem.Size = new System.Drawing.Size(197, 22); - this.InvertSelectionToolStripMenuItem.Text = "Invert Selection"; + this.SellectAllCtrlAToolStripMenuItem.Text = "Select All Ctrl+A"; // // ViewToolStripMenuItem // @@ -458,6 +423,17 @@ this.AboutWindows95ToolStripMenuItem.Text = "About Windows 95"; this.AboutWindows95ToolStripMenuItem.Click += new System.EventHandler(this.AboutWindows95ToolStripMenuItem_Click); // + // mainView + // + this.mainView.Dock = System.Windows.Forms.DockStyle.Right; + this.mainView.Location = new System.Drawing.Point(403, 24); + this.mainView.Name = "mainView"; + this.mainView.Size = new System.Drawing.Size(301, 458); + this.mainView.TabIndex = 10; + this.mainView.UseCompatibleStateImageBehavior = false; + this.mainView.View = System.Windows.Forms.View.List; + this.mainView.DoubleClick += new System.EventHandler(this.mainView_DoubleClick); + // // toprightcorner // this.toprightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -495,17 +471,18 @@ 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.Dock = System.Windows.Forms.DockStyle.Bottom; + this.pnlSave.Location = new System.Drawing.Point(0, 482); this.pnlSave.Name = "pnlSave"; - this.pnlSave.Size = new System.Drawing.Size(850, 35); + this.pnlSave.Size = new System.Drawing.Size(704, 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.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button1.Location = new System.Drawing.Point(608, 1); + this.Button1.Location = new System.Drawing.Point(626, 3); this.Button1.Name = "Button1"; this.Button1.Size = new System.Drawing.Size(75, 23); this.Button1.TabIndex = 17; @@ -524,13 +501,71 @@ // // 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"; - this.txtSave.Size = new System.Drawing.Size(542, 20); + this.txtSave.Size = new System.Drawing.Size(560, 20); this.txtSave.TabIndex = 15; // + // pnlInfo + // + this.pnlInfo.Controls.Add(this.pnlFolders); + this.pnlInfo.Dock = System.Windows.Forms.DockStyle.Fill; + this.pnlInfo.Location = new System.Drawing.Point(0, 24); + this.pnlInfo.Name = "pnlInfo"; + this.pnlInfo.Size = new System.Drawing.Size(704, 493); + this.pnlInfo.TabIndex = 19; + // + // pnlFolders + // + this.pnlFolders.Controls.Add(this.pnlFoldersTop); + this.pnlFolders.Controls.Add(this.diskView); + this.pnlFolders.Dock = System.Windows.Forms.DockStyle.Left; + this.pnlFolders.Location = new System.Drawing.Point(0, 0); + this.pnlFolders.Name = "pnlFolders"; + this.pnlFolders.Size = new System.Drawing.Size(168, 493); + this.pnlFolders.TabIndex = 0; + // + // pnlFoldersTop + // + this.pnlFoldersTop.Controls.Add(this.label2); + this.pnlFoldersTop.Controls.Add(this.pictureBox1); + this.pnlFoldersTop.Dock = System.Windows.Forms.DockStyle.Top; + this.pnlFoldersTop.Location = new System.Drawing.Point(0, 0); + this.pnlFoldersTop.Name = "pnlFoldersTop"; + this.pnlFoldersTop.Size = new System.Drawing.Size(168, 22); + this.pnlFoldersTop.TabIndex = 20; + // + // diskView + // + this.diskView.Dock = System.Windows.Forms.DockStyle.Fill; + this.diskView.Location = new System.Drawing.Point(0, 0); + this.diskView.Name = "diskView"; + this.diskView.Size = new System.Drawing.Size(168, 493); + this.diskView.TabIndex = 13; + this.diskView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.diskView_AfterSelect); + // + // pictureBox1 + // + this.pictureBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(208)))), ((int)(((byte)(200))))); + this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Location = new System.Drawing.Point(144, 3); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(21, 16); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.pictureBox1.TabIndex = 20; + this.pictureBox1.TabStop = false; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(3, 3); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(41, 13); + this.label2.TabIndex = 1; + this.label2.Text = "Folders"; + // // WinClassicWindowsExplorer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -545,6 +580,11 @@ this.MenuStrip1.PerformLayout(); this.pnlSave.ResumeLayout(false); this.pnlSave.PerformLayout(); + this.pnlInfo.ResumeLayout(false); + this.pnlFolders.ResumeLayout(false); + this.pnlFoldersTop.ResumeLayout(false); + this.pnlFoldersTop.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); } @@ -564,13 +604,10 @@ internal System.Windows.Forms.ToolStripMenuItem RenameToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem CloseToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem EditToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem UndoCtrlZToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem CutCtrlXToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem CopyCtrlCToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem PasteToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem PasteShortcutToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem SellectAllCtrlAToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem InvertSelectionToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem ViewToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem ToolbarToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem StatusBarToolStripMenuItem; @@ -607,5 +644,10 @@ internal System.Windows.Forms.Button Button1; internal System.Windows.Forms.Label Label1; internal System.Windows.Forms.TextBox txtSave; + private System.Windows.Forms.Panel pnlInfo; + private System.Windows.Forms.Panel pnlFolders; + private System.Windows.Forms.Panel pnlFoldersTop; + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.Label label2; } } diff --git a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx index bb70361..4ab5a31 100644 --- a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx +++ b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx @@ -117,6 +117,15 @@ 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 diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx index 23942a7..4e158fb 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -435,9 +435,6 @@ ..\Resources\WinClassic\sliversilver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassic\WinClassicGENERALApplicationToolbarBackground.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\termFont.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -660,4 +657,7 @@ ..\Resources\WinClassic\WinClassicEndingsLocked.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassicGENERALApplicationToolBoxBackground.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/TimeHACK.Main/Resources/WinClassicGENERALApplicationToolBoxBackground.png b/TimeHACK.Main/Resources/WinClassicGENERALApplicationToolBoxBackground.png new file mode 100644 index 0000000..da677c5 Binary files /dev/null and b/TimeHACK.Main/Resources/WinClassicGENERALApplicationToolBoxBackground.png differ diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index e575aec..6f489b8 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -540,6 +540,7 @@ + -- cgit v1.2.3 From 294592d1bcb6886863fd1d9a4b21936e98cd7f46 Mon Sep 17 00:00:00 2001 From: Alex-TIMEHACK Date: Sat, 22 Jul 2017 10:17:11 +0100 Subject: Win98 Designer Finished! At least for me... --- TimeHACK.Engine/SaveSystem.cs | 8 +- TimeHACK.Engine/Theme.cs | 17 ++ .../Win95Apps/Win95WindowsExplorer.Designer.cs | 3 +- TimeHACK.Main/OS/Win98/Win98.cs | 3 +- .../AddressBook/WinClassicAddressBook.Designer.cs | 39 ++- .../WinClassicWindowsExplorer.Designer.cs | 334 +++++++++++---------- .../Win98/Win98Apps/WinClassicWindowsExplorer.cs | 15 + .../Win98/Win98Apps/WinClassicWindowsExplorer.resx | 2 +- TimeHACK.Main/Properties/Resources.Designer.cs | 20 ++ TimeHACK.Main/Properties/Resources.resx | 6 + ...nClassicGENERALApplicationToolBoxBackground.png | Bin 458 -> 309 bytes TimeHACK.Main/Resources/XCross.png | Bin 0 -> 210 bytes TimeHACK.Main/Resources/XCross_highlighted.png | Bin 0 -> 225 bytes TimeHACK.Main/TimeHACK.Main.csproj | 2 + 14 files changed, 257 insertions(+), 192 deletions(-) create mode 100644 TimeHACK.Main/Resources/XCross.png create mode 100644 TimeHACK.Main/Resources/XCross_highlighted.png (limited to 'TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx') diff --git a/TimeHACK.Engine/SaveSystem.cs b/TimeHACK.Engine/SaveSystem.cs index f8cc662..de34318 100644 --- a/TimeHACK.Engine/SaveSystem.cs +++ b/TimeHACK.Engine/SaveSystem.cs @@ -125,9 +125,7 @@ namespace TimeHACK.Engine } public static void NewGame() - { - //TODO: User must set a username....somehow - + { var save = new Save(); save.ExperiencedStories = new List(); if (DevMode == true) @@ -136,6 +134,7 @@ namespace TimeHACK.Engine { save.CurrentOS = "98"; save.ThemeName = "default98"; + currentTheme = new Default98Theme(); } else { @@ -258,6 +257,9 @@ namespace TimeHACK.Engine case "default95": currentTheme = new Default95Theme(); break; + case "default98": + currentTheme = new Default98Theme(); + break; case "dangeranimals": currentTheme = new DangerousCreaturesTheme(); break; diff --git a/TimeHACK.Engine/Theme.cs b/TimeHACK.Engine/Theme.cs index 89c913d..2b22072 100644 --- a/TimeHACK.Engine/Theme.cs +++ b/TimeHACK.Engine/Theme.cs @@ -40,6 +40,23 @@ namespace TimeHACK.Engine } } + public class Default98Theme : Theme + { + public Default98Theme() + { + startSound = Properties.Resources.Win95Start; + stopSound = Properties.Resources.Win95Stop; + + asteriskSound = Properties.Resources.CHORD; + critStopSound = Properties.Resources.CHORD; + progErrorSound = Properties.Resources.CHORD; + questionSound = Properties.Resources.CHORD; + + defaultWallpaper = null; + themeName = "default98"; + } + } + public class DangerousCreaturesTheme: Theme { public DangerousCreaturesTheme() diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs index 19af4e5..abdf2b8 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs @@ -127,7 +127,8 @@ // // MenuStrip1 // - this.MenuStrip1.BackColor = System.Drawing.Color.Silver; + this.MenuStrip1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(208)))), ((int)(((byte)(200))))); + this.MenuStrip1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.MenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.FileToolStripMenuItem, this.EditToolStripMenuItem, diff --git a/TimeHACK.Main/OS/Win98/Win98.cs b/TimeHACK.Main/OS/Win98/Win98.cs index 54415af..e3e7043 100644 --- a/TimeHACK.Main/OS/Win98/Win98.cs +++ b/TimeHACK.Main/OS/Win98/Win98.cs @@ -363,8 +363,7 @@ namespace TimeHACK.OS.Win98 { FileDialogBoxManager.IsInOpenDialog = false; FileDialogBoxManager.IsInSaveDialog = false; - Win95WindowsExplorer we = new Win95WindowsExplorer(); - WinClassic app = wm.StartWin95(we, "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true); + WinClassic app = wm.StartWin95(new WinClassicWindowsExplorer(), "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true); AddTaskBarItem(app, app.Tag.ToString(), "Windows Explorer", Properties.Resources.WinClassicFileExplorer); nonimportantapps.Add(app); diff --git a/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.Designer.cs b/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.Designer.cs index 41107e8..201d159 100644 --- a/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.Designer.cs +++ b/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.Designer.cs @@ -105,67 +105,67 @@ // newContactToolStripMenuItem // this.newContactToolStripMenuItem.Name = "newContactToolStripMenuItem"; - this.newContactToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.newContactToolStripMenuItem.Size = new System.Drawing.Size(150, 22); this.newContactToolStripMenuItem.Text = "New contact..."; this.newContactToolStripMenuItem.Click += new System.EventHandler(this.newContactToolStripMenuItem_Click); // // newFolderToolStripMenuItem // this.newFolderToolStripMenuItem.Name = "newFolderToolStripMenuItem"; - this.newFolderToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.newFolderToolStripMenuItem.Size = new System.Drawing.Size(150, 22); this.newFolderToolStripMenuItem.Text = "New folder..."; this.newFolderToolStripMenuItem.Click += new System.EventHandler(this.newFolderToolStripMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(147, 6); // // propertiesToolStripMenuItem // this.propertiesToolStripMenuItem.Name = "propertiesToolStripMenuItem"; - this.propertiesToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.propertiesToolStripMenuItem.Size = new System.Drawing.Size(150, 22); this.propertiesToolStripMenuItem.Text = "Properties"; this.propertiesToolStripMenuItem.Click += new System.EventHandler(this.propertiesToolStripMenuItem_Click); // // deleteToolStripMenuItem // this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem"; - this.deleteToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.deleteToolStripMenuItem.Size = new System.Drawing.Size(150, 22); this.deleteToolStripMenuItem.Text = "Delete"; this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(149, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(147, 6); // // importToolStripMenuItem // this.importToolStripMenuItem.Name = "importToolStripMenuItem"; - this.importToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.importToolStripMenuItem.Size = new System.Drawing.Size(150, 22); this.importToolStripMenuItem.Text = "Import..."; // // exportToolStripMenuItem // this.exportToolStripMenuItem.Name = "exportToolStripMenuItem"; - this.exportToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.exportToolStripMenuItem.Size = new System.Drawing.Size(150, 22); this.exportToolStripMenuItem.Text = "Export..."; // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(147, 6); // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(147, 6); // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(150, 22); this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // @@ -184,7 +184,7 @@ this.toolbarToolStripMenuItem.CheckOnClick = true; this.toolbarToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.toolbarToolStripMenuItem.Name = "toolbarToolStripMenuItem"; - this.toolbarToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.toolbarToolStripMenuItem.Size = new System.Drawing.Size(114, 22); this.toolbarToolStripMenuItem.Text = "Toolbar"; this.toolbarToolStripMenuItem.Click += new System.EventHandler(this.toolbarToolStripMenuItem_Click); // @@ -194,7 +194,7 @@ this.foldersToolStripMenuItem.CheckOnClick = true; this.foldersToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.foldersToolStripMenuItem.Name = "foldersToolStripMenuItem"; - this.foldersToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.foldersToolStripMenuItem.Size = new System.Drawing.Size(114, 22); this.foldersToolStripMenuItem.Text = "Folders"; this.foldersToolStripMenuItem.Click += new System.EventHandler(this.foldersToolStripMenuItem_Click); // @@ -213,25 +213,25 @@ this.dialToolStripMenuItem, this.internetToolStripMenuItem}); this.actionToolStripMenuItem.Name = "actionToolStripMenuItem"; - this.actionToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.actionToolStripMenuItem.Size = new System.Drawing.Size(109, 22); this.actionToolStripMenuItem.Text = "Action"; // // sendMailToolStripMenuItem // this.sendMailToolStripMenuItem.Name = "sendMailToolStripMenuItem"; - this.sendMailToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.sendMailToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.sendMailToolStripMenuItem.Text = "Send Mail"; // // dialToolStripMenuItem // this.dialToolStripMenuItem.Name = "dialToolStripMenuItem"; - this.dialToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.dialToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.dialToolStripMenuItem.Text = "Dial"; // // internetToolStripMenuItem // this.internetToolStripMenuItem.Name = "internetToolStripMenuItem"; - this.internetToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.internetToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.internetToolStripMenuItem.Text = "Internet Call"; // // helpToolStripMenuItem @@ -273,9 +273,8 @@ // // toolbar // - this.toolbar.BackColor = System.Drawing.Color.Silver; - this.toolbar.BackgroundImage = global::TimeHACK.Properties.Resources.WinClassicGENERALApplicationToolbarBackground; - this.toolbar.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.toolbar.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(208)))), ((int)(((byte)(200))))); + this.toolbar.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.toolbar.Controls.Add(this.toolProp); this.toolbar.Controls.Add(this.toolNew); this.toolbar.Controls.Add(this.toolDelete); diff --git a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs index c74b102..0e51ce7 100644 --- a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs +++ b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs @@ -30,6 +30,21 @@ { 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.toprightcorner = new System.Windows.Forms.Panel(); + 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.pnlInfo = new System.Windows.Forms.Panel(); + this.pnlFolders = new System.Windows.Forms.Panel(); + this.pnlFoldersTop = new System.Windows.Forms.Panel(); + this.label2 = new System.Windows.Forms.Label(); + this.btnFolderClose = new System.Windows.Forms.PictureBox(); + this.diskView = new System.Windows.Forms.TreeView(); this.MenuStrip1 = new System.Windows.Forms.MenuStrip(); this.FileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CreateShortcutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -72,28 +87,13 @@ this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.HelpToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.AboutWindows95ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mainView = new System.Windows.Forms.ListView(); - this.toprightcorner = new System.Windows.Forms.Panel(); - 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.pnlInfo = new System.Windows.Forms.Panel(); - this.pnlFolders = new System.Windows.Forms.Panel(); - this.pnlFoldersTop = new System.Windows.Forms.Panel(); - this.diskView = new System.Windows.Forms.TreeView(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.label2 = new System.Windows.Forms.Label(); this.program.SuspendLayout(); - this.MenuStrip1.SuspendLayout(); this.pnlSave.SuspendLayout(); this.pnlInfo.SuspendLayout(); this.pnlFolders.SuspendLayout(); this.pnlFoldersTop.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.btnFolderClose)).BeginInit(); + this.MenuStrip1.SuspendLayout(); this.SuspendLayout(); // // program @@ -113,9 +113,156 @@ this.program.Size = new System.Drawing.Size(704, 517); this.program.TabIndex = 13; // + // mainView + // + this.mainView.Dock = System.Windows.Forms.DockStyle.Right; + this.mainView.Location = new System.Drawing.Point(403, 24); + this.mainView.Name = "mainView"; + this.mainView.Size = new System.Drawing.Size(301, 458); + this.mainView.TabIndex = 10; + this.mainView.UseCompatibleStateImageBehavior = false; + this.mainView.View = System.Windows.Forms.View.List; + this.mainView.DoubleClick += new System.EventHandler(this.mainView_DoubleClick); + // + // toprightcorner + // + this.toprightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.toprightcorner.Location = new System.Drawing.Point(700, 0); + this.toprightcorner.Name = "toprightcorner"; + this.toprightcorner.Size = new System.Drawing.Size(4, 4); + this.toprightcorner.TabIndex = 6; + // + // bottomrightcorner + // + this.bottomrightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.bottomrightcorner.Cursor = System.Windows.Forms.Cursors.SizeNWSE; + this.bottomrightcorner.Location = new System.Drawing.Point(700, 513); + this.bottomrightcorner.Name = "bottomrightcorner"; + this.bottomrightcorner.Size = new System.Drawing.Size(4, 4); + this.bottomrightcorner.TabIndex = 4; + // + // bottomleftcorner + // + this.bottomleftcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.bottomleftcorner.Location = new System.Drawing.Point(0, 513); + this.bottomleftcorner.Name = "bottomleftcorner"; + this.bottomleftcorner.Size = new System.Drawing.Size(4, 4); + this.bottomleftcorner.TabIndex = 2; + // + // topleftcorner + // + this.topleftcorner.Location = new System.Drawing.Point(0, 0); + this.topleftcorner.Name = "topleftcorner"; + 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.Dock = System.Windows.Forms.DockStyle.Bottom; + this.pnlSave.Location = new System.Drawing.Point(0, 482); + this.pnlSave.Name = "pnlSave"; + this.pnlSave.Size = new System.Drawing.Size(704, 35); + this.pnlSave.TabIndex = 18; + this.pnlSave.Visible = false; + // + // Button1 + // + this.Button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.Button1.Location = new System.Drawing.Point(626, 3); + 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(560, 20); + this.txtSave.TabIndex = 15; + // + // pnlInfo + // + this.pnlInfo.Controls.Add(this.pnlFolders); + this.pnlInfo.Dock = System.Windows.Forms.DockStyle.Fill; + this.pnlInfo.Location = new System.Drawing.Point(0, 24); + this.pnlInfo.Name = "pnlInfo"; + this.pnlInfo.Size = new System.Drawing.Size(704, 493); + this.pnlInfo.TabIndex = 19; + // + // pnlFolders + // + this.pnlFolders.Controls.Add(this.pnlFoldersTop); + this.pnlFolders.Controls.Add(this.diskView); + this.pnlFolders.Dock = System.Windows.Forms.DockStyle.Left; + this.pnlFolders.Location = new System.Drawing.Point(0, 0); + this.pnlFolders.Name = "pnlFolders"; + this.pnlFolders.Size = new System.Drawing.Size(168, 493); + this.pnlFolders.TabIndex = 0; + // + // pnlFoldersTop + // + this.pnlFoldersTop.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(208)))), ((int)(((byte)(200))))); + this.pnlFoldersTop.Controls.Add(this.label2); + this.pnlFoldersTop.Controls.Add(this.btnFolderClose); + this.pnlFoldersTop.Dock = System.Windows.Forms.DockStyle.Top; + this.pnlFoldersTop.Location = new System.Drawing.Point(0, 0); + this.pnlFoldersTop.Name = "pnlFoldersTop"; + this.pnlFoldersTop.Size = new System.Drawing.Size(168, 22); + this.pnlFoldersTop.TabIndex = 20; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(3, 3); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(41, 13); + this.label2.TabIndex = 1; + this.label2.Text = "Folders"; + // + // 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.Location = new System.Drawing.Point(144, 3); + this.btnFolderClose.Name = "btnFolderClose"; + this.btnFolderClose.Size = new System.Drawing.Size(21, 16); + this.btnFolderClose.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.btnFolderClose.TabIndex = 20; + this.btnFolderClose.TabStop = false; + this.btnFolderClose.Click += new System.EventHandler(this.btnFolderClose_Click); + this.btnFolderClose.MouseEnter += new System.EventHandler(this.pictureBox1_MouseEnter); + this.btnFolderClose.MouseLeave += new System.EventHandler(this.btnFolderClose_MouseLeave); + // + // diskView + // + this.diskView.Dock = System.Windows.Forms.DockStyle.Fill; + this.diskView.Location = new System.Drawing.Point(0, 0); + this.diskView.Name = "diskView"; + this.diskView.Size = new System.Drawing.Size(168, 493); + this.diskView.TabIndex = 13; + this.diskView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.diskView_AfterSelect); + // // MenuStrip1 // - this.MenuStrip1.BackColor = System.Drawing.Color.Silver; + this.MenuStrip1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(208)))), ((int)(((byte)(200))))); this.MenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.FileToolStripMenuItem, this.EditToolStripMenuItem, @@ -423,149 +570,6 @@ this.AboutWindows95ToolStripMenuItem.Text = "About Windows 95"; this.AboutWindows95ToolStripMenuItem.Click += new System.EventHandler(this.AboutWindows95ToolStripMenuItem_Click); // - // mainView - // - this.mainView.Dock = System.Windows.Forms.DockStyle.Right; - this.mainView.Location = new System.Drawing.Point(403, 24); - this.mainView.Name = "mainView"; - this.mainView.Size = new System.Drawing.Size(301, 458); - this.mainView.TabIndex = 10; - this.mainView.UseCompatibleStateImageBehavior = false; - this.mainView.View = System.Windows.Forms.View.List; - this.mainView.DoubleClick += new System.EventHandler(this.mainView_DoubleClick); - // - // toprightcorner - // - this.toprightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.toprightcorner.Location = new System.Drawing.Point(700, 0); - this.toprightcorner.Name = "toprightcorner"; - this.toprightcorner.Size = new System.Drawing.Size(4, 4); - this.toprightcorner.TabIndex = 6; - // - // bottomrightcorner - // - this.bottomrightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.bottomrightcorner.Cursor = System.Windows.Forms.Cursors.SizeNWSE; - this.bottomrightcorner.Location = new System.Drawing.Point(700, 513); - this.bottomrightcorner.Name = "bottomrightcorner"; - this.bottomrightcorner.Size = new System.Drawing.Size(4, 4); - this.bottomrightcorner.TabIndex = 4; - // - // bottomleftcorner - // - this.bottomleftcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.bottomleftcorner.Location = new System.Drawing.Point(0, 513); - this.bottomleftcorner.Name = "bottomleftcorner"; - this.bottomleftcorner.Size = new System.Drawing.Size(4, 4); - this.bottomleftcorner.TabIndex = 2; - // - // topleftcorner - // - this.topleftcorner.Location = new System.Drawing.Point(0, 0); - this.topleftcorner.Name = "topleftcorner"; - 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.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pnlSave.Location = new System.Drawing.Point(0, 482); - this.pnlSave.Name = "pnlSave"; - this.pnlSave.Size = new System.Drawing.Size(704, 35); - this.pnlSave.TabIndex = 18; - this.pnlSave.Visible = false; - // - // Button1 - // - this.Button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button1.Location = new System.Drawing.Point(626, 3); - 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(560, 20); - this.txtSave.TabIndex = 15; - // - // pnlInfo - // - this.pnlInfo.Controls.Add(this.pnlFolders); - this.pnlInfo.Dock = System.Windows.Forms.DockStyle.Fill; - this.pnlInfo.Location = new System.Drawing.Point(0, 24); - this.pnlInfo.Name = "pnlInfo"; - this.pnlInfo.Size = new System.Drawing.Size(704, 493); - this.pnlInfo.TabIndex = 19; - // - // pnlFolders - // - this.pnlFolders.Controls.Add(this.pnlFoldersTop); - this.pnlFolders.Controls.Add(this.diskView); - this.pnlFolders.Dock = System.Windows.Forms.DockStyle.Left; - this.pnlFolders.Location = new System.Drawing.Point(0, 0); - this.pnlFolders.Name = "pnlFolders"; - this.pnlFolders.Size = new System.Drawing.Size(168, 493); - this.pnlFolders.TabIndex = 0; - // - // pnlFoldersTop - // - this.pnlFoldersTop.Controls.Add(this.label2); - this.pnlFoldersTop.Controls.Add(this.pictureBox1); - this.pnlFoldersTop.Dock = System.Windows.Forms.DockStyle.Top; - this.pnlFoldersTop.Location = new System.Drawing.Point(0, 0); - this.pnlFoldersTop.Name = "pnlFoldersTop"; - this.pnlFoldersTop.Size = new System.Drawing.Size(168, 22); - this.pnlFoldersTop.TabIndex = 20; - // - // diskView - // - this.diskView.Dock = System.Windows.Forms.DockStyle.Fill; - this.diskView.Location = new System.Drawing.Point(0, 0); - this.diskView.Name = "diskView"; - this.diskView.Size = new System.Drawing.Size(168, 493); - this.diskView.TabIndex = 13; - this.diskView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.diskView_AfterSelect); - // - // pictureBox1 - // - this.pictureBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(208)))), ((int)(((byte)(200))))); - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(144, 3); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(21, 16); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.pictureBox1.TabIndex = 20; - this.pictureBox1.TabStop = false; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(3, 3); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(41, 13); - this.label2.TabIndex = 1; - this.label2.Text = "Folders"; - // // WinClassicWindowsExplorer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -576,15 +580,15 @@ 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.pnlInfo.ResumeLayout(false); this.pnlFolders.ResumeLayout(false); this.pnlFoldersTop.ResumeLayout(false); this.pnlFoldersTop.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.btnFolderClose)).EndInit(); + this.MenuStrip1.ResumeLayout(false); + this.MenuStrip1.PerformLayout(); this.ResumeLayout(false); } @@ -647,7 +651,7 @@ private System.Windows.Forms.Panel pnlInfo; private System.Windows.Forms.Panel pnlFolders; private System.Windows.Forms.Panel pnlFoldersTop; - private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.PictureBox btnFolderClose; private System.Windows.Forms.Label label2; } } diff --git a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs index 0f030a4..ed376c9 100644 --- a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs +++ b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs @@ -795,5 +795,20 @@ namespace TimeHACK.OS.Win95.Win95Apps } return toReturn; } + + private void pictureBox1_MouseEnter(object sender, EventArgs e) + { + btnFolderClose.Image = Properties.Resources.XCross_highlighted; + } + + private void btnFolderClose_MouseLeave(object sender, EventArgs e) + { + btnFolderClose.Image = Properties.Resources.XCross; + } + + private void btnFolderClose_Click(object sender, EventArgs e) + { + pnlFolders.Hide(); + } } } diff --git a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx index 4ab5a31..521f476 100644 --- a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx +++ b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + iVBORw0KGgoAAAANSUhEUgAAAAwAAAAJCAIAAACJ2loDAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xNkRpr/UAAABCSURBVChThYox diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs index 7334f29..3603469 100644 --- a/TimeHACK.Main/Properties/Resources.Designer.cs +++ b/TimeHACK.Main/Properties/Resources.Designer.cs @@ -1360,5 +1360,25 @@ namespace TimeHACK.Properties { return ((byte[])(obj)); } } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap XCross { + get { + object obj = ResourceManager.GetObject("XCross", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap XCross_highlighted { + get { + object obj = ResourceManager.GetObject("XCross_highlighted", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx index 4e158fb..e8ffa48 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -660,4 +660,10 @@ ..\Resources\WinClassicGENERALApplicationToolBoxBackground.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\XCross.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\XCross_highlighted.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/TimeHACK.Main/Resources/WinClassicGENERALApplicationToolBoxBackground.png b/TimeHACK.Main/Resources/WinClassicGENERALApplicationToolBoxBackground.png index da677c5..17f28cd 100644 Binary files a/TimeHACK.Main/Resources/WinClassicGENERALApplicationToolBoxBackground.png and b/TimeHACK.Main/Resources/WinClassicGENERALApplicationToolBoxBackground.png differ diff --git a/TimeHACK.Main/Resources/XCross.png b/TimeHACK.Main/Resources/XCross.png new file mode 100644 index 0000000..cb3639a Binary files /dev/null and b/TimeHACK.Main/Resources/XCross.png differ diff --git a/TimeHACK.Main/Resources/XCross_highlighted.png b/TimeHACK.Main/Resources/XCross_highlighted.png new file mode 100644 index 0000000..d739087 Binary files /dev/null and b/TimeHACK.Main/Resources/XCross_highlighted.png differ diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index 6f489b8..fc48270 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -477,6 +477,8 @@ + + -- cgit v1.2.3 From cf4609d054ee554d7503c42322f9129f7423c4e4 Mon Sep 17 00:00:00 2001 From: Alex-TIMEHACK Date: Sat, 22 Jul 2017 16:40:49 +0100 Subject: Fixed bugs, added features --- .../Win95Apps/Win95WindowsExplorer.Designer.cs | 23 +- .../OS/Win95/Win95Apps/Win95WindowsExplorer.cs | 294 ++++++++++++++++----- .../OS/Win95/Win95Apps/Win95WindowsExplorer.resx | 6 + .../OS/Win95/Win95Apps/WinClassicNotepad.cs | 1 - TimeHACK.Main/OS/Win98/Win98.cs | 19 -- .../WinClassicWindowsExplorer.Designer.cs | 16 +- .../Win98/Win98Apps/WinClassicWindowsExplorer.cs | 278 ++++++++++++++----- .../Win98/Win98Apps/WinClassicWindowsExplorer.resx | 6 + TimeHACK.Main/Program.cs | 10 +- 9 files changed, 487 insertions(+), 166 deletions(-) (limited to 'TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx') diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs index 3483dd6..e8ea655 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); this.program = new System.Windows.Forms.Panel(); this.mainView = new System.Windows.Forms.ListView(); this.diskView = new System.Windows.Forms.TreeView(); @@ -42,7 +43,6 @@ this.RenameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CloseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.EditToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.UndoCtrlZToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CutCtrlXToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CopyCtrlCToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.PasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -60,6 +60,7 @@ 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(); @@ -189,7 +190,6 @@ // EditToolStripMenuItem // this.EditToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.UndoCtrlZToolStripMenuItem, this.CutCtrlXToolStripMenuItem, this.CopyCtrlCToolStripMenuItem, this.PasteToolStripMenuItem, @@ -198,35 +198,33 @@ this.EditToolStripMenuItem.Size = new System.Drawing.Size(39, 20); this.EditToolStripMenuItem.Text = "Edit"; // - // UndoCtrlZToolStripMenuItem - // - this.UndoCtrlZToolStripMenuItem.Name = "UndoCtrlZToolStripMenuItem"; - this.UndoCtrlZToolStripMenuItem.Size = new System.Drawing.Size(197, 22); - this.UndoCtrlZToolStripMenuItem.Text = "Undo Ctrl+Z"; - // // CutCtrlXToolStripMenuItem // this.CutCtrlXToolStripMenuItem.Name = "CutCtrlXToolStripMenuItem"; this.CutCtrlXToolStripMenuItem.Size = new System.Drawing.Size(197, 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.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.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.Text = "Select All Ctrl+A"; + this.SellectAllCtrlAToolStripMenuItem.Click += new System.EventHandler(this.SellectAllCtrlAToolStripMenuItem_Click); // // ViewToolStripMenuItem // @@ -239,7 +237,7 @@ // RefreshToolStripMenuItem // this.RefreshToolStripMenuItem.Name = "RefreshToolStripMenuItem"; - this.RefreshToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.RefreshToolStripMenuItem.Size = new System.Drawing.Size(113, 22); this.RefreshToolStripMenuItem.Text = "Refresh"; this.RefreshToolStripMenuItem.Click += new System.EventHandler(this.RefreshToolStripMenuItem_Click); // @@ -338,6 +336,11 @@ this.txtSave.Size = new System.Drawing.Size(542, 20); this.txtSave.TabIndex = 15; // + // refresh + // + this.refresh.Interval = 15000; + this.refresh.Tick += new System.EventHandler(this.refresh_Tick); + // // Win95WindowsExplorer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -371,7 +374,6 @@ internal System.Windows.Forms.ToolStripMenuItem RenameToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem CloseToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem EditToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem UndoCtrlZToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem CutCtrlXToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem CopyCtrlCToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem PasteToolStripMenuItem; @@ -390,5 +392,6 @@ internal System.Windows.Forms.Button Button1; internal System.Windows.Forms.Label Label1; internal System.Windows.Forms.TextBox txtSave; + private System.Windows.Forms.Timer refresh; } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.cs index e85b39f..44cf08f 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.cs @@ -24,6 +24,8 @@ namespace TimeHACK.OS.Win95.Win95Apps string ToReplaceWith = ProfileDirectory; string CurrentDirectory = ProfileMyComputerDirectory; string OldLabelText; + string CurrentCopyFile; + int fileType = 6; //string attemptedDirectory = ""; WindowManager wm = new WindowManager(); @@ -49,40 +51,12 @@ namespace TimeHACK.OS.Win95.Win95Apps program.BringToFront(); - int loc = 0; - TreeNode[] folders = new TreeNode[new DirectoryInfo(CurrentDirectory).GetDirectories().Length]; - foreach (DirectoryInfo folder in new DirectoryInfo(CurrentDirectory).GetDirectories()) - { - if (folder.GetDirectories().Length > 0) - { - string label = ReadDataFile(folder.FullName, false); - TreeNode[] tn = createSubDirNodes(folder); - folders[loc] = new TreeNode(label ?? folder.Name, 2, 3, tn); - folders[loc].Tag = folder.FullName; - } - else - { - string label = ReadDataFile(folder.FullName, false); - folders[loc] = new TreeNode(label ?? folder.Name, 2, 3); - folders[loc].Tag = folder.FullName; - } - loc++; - } - TreeNode[] mypcarray = new TreeNode[3]; - mypcarray[0] = new TreeNode("(C:)", 1, 1, folders); - mypcarray[1] = new TreeNode("Control Panel", 4, 4); - mypcarray[2] = new TreeNode("Printers", 5, 5); - TreeNode[] desktoparray = new TreeNode[3]; - desktoparray[0] = new TreeNode("My Computer", 6, 6, mypcarray); - desktoparray[1] = new TreeNode("Network Neighborhood", 7, 7); - desktoparray[2] = new TreeNode("Recycle Bin", 8, 8); - diskView.Nodes.Add(new TreeNode("Desktop", 0, 0, desktoparray)); - //diskView.Items.Add("My Computer", 0); Application.DoEvents(); RefreshAll(); + RefreshTreeNode(); if (FileDialogBoxManager.IsInOpenDialog) { @@ -133,13 +107,8 @@ namespace TimeHACK.OS.Win95.Win95Apps void RefreshAll() { try { - // Refresh the right listview this.mainView.Items.Clear(); - // For Each drive As string In My.Computer.FileSystem.GetDirectories(GameMain.MyDocuments & "\HistacomVB\" & GameMain.SaveProfile & "\HistacomVB\Folders") - // If GetPropetiesForDir(drive)(4) = "isMyDocuments" Then - // diskView.Items.Add("", 0) - // End If - //Next + foreach (string str in Directory.GetDirectories(CurrentDirectory)) { string label = ReadDataFile(str, false); @@ -196,6 +165,41 @@ namespace TimeHACK.OS.Win95.Win95Apps } } + void RefreshTreeNode() + { + // Refresh the TreeView + + diskView.Nodes.Clear(); + int loc = 0; + TreeNode[] folders = new TreeNode[new DirectoryInfo(ProfileMyComputerDirectory).GetDirectories().Length]; + foreach (DirectoryInfo folder in new DirectoryInfo(ProfileMyComputerDirectory).GetDirectories()) + { + if (folder.GetDirectories().Length > 0) + { + string label = ReadDataFile(folder.FullName, false); + TreeNode[] tn = createSubDirNodes(folder); + folders[loc] = new TreeNode(label ?? folder.Name, 2, 3, tn); + folders[loc].Tag = folder.FullName; + } + else + { + string label = ReadDataFile(folder.FullName, false); + folders[loc] = new TreeNode(label ?? folder.Name, 2, 3); + folders[loc].Tag = folder.FullName; + } + loc++; + } + TreeNode[] mypcarray = new TreeNode[3]; + mypcarray[0] = new TreeNode("(C:)", 1, 1, folders); + mypcarray[1] = new TreeNode("Control Panel", 4, 4); + mypcarray[2] = new TreeNode("Printers", 5, 5); + TreeNode[] desktoparray = new TreeNode[3]; + desktoparray[0] = new TreeNode("My Computer", 6, 6, mypcarray); + desktoparray[1] = new TreeNode("Network Neighborhood", 7, 7); + desktoparray[2] = new TreeNode("Recycle Bin", 8, 8); + diskView.Nodes.Add(new TreeNode("Desktop", 0, 0, desktoparray)); + } + void OpenFile(string fileDir) { try @@ -621,14 +625,19 @@ namespace TimeHACK.OS.Win95.Win95Apps private void FolderToolStripMenuItem_Click(object sender, EventArgs e) { - if (File.Exists(CurrentDirectory + "\\New Folder")) { + if (File.Exists(CurrentDirectory + "\\New Folder")) + { wm.StartInfobox95("Windows Explorer", "This directory already exists", Properties.Resources.Win95Info); - } else { - Directory.CreateDirectory(CurrentDirectory + "\\New Folder"); - SaveDirectoryInfo(CurrentDirectory + "\\New Folder", false, "New Folder", true); - + } + else + { + Directory.CreateDirectory(Path.Combine(CurrentDirectory, "New Folder")); + SaveDirectoryInfo(Path.Combine(CurrentDirectory, "New Folder"), false, "New Folder", true); + RefreshAll(); } + + RefreshTreeNode(); } private void Button1_Click(object sender, EventArgs e) @@ -638,7 +647,7 @@ namespace TimeHACK.OS.Win95.Win95Apps bool OpenFile = false; if (mainView.FocusedItem != null) { - if ((string)mainView.FocusedItem.Tag == "") + if (mainView.FocusedItem.Tag.ToString() == "") { // If it isn't a file GoToDir(Path.Combine(CurrentDirectory, mainView.FocusedItem.Tag.ToString())); } @@ -691,7 +700,8 @@ namespace TimeHACK.OS.Win95.Win95Apps { RefreshAll(); } - + + RefreshTreeNode(); } internal static bool FileOrDirectoryExists(string path) @@ -726,43 +736,55 @@ namespace TimeHACK.OS.Win95.Win95Apps private void mainView_AfterLabelEdit(object sender, LabelEditEventArgs e) { - string setText; - setText = mainView.FocusedItem.Text; - if (setText == "") - { - wm.StartInfobox95("Windows Explorer", "Please enter a new directory name", Properties.Resources.Win95Info); - } - else + try { - if (Directory.Exists(setText)) + string setText; + setText = e.Label; + if (setText == "") { - wm.StartInfobox95("Windows Explorer", "That directory already exists.", Properties.Resources.Win95Info); + wm.StartInfobox95("Windows Explorer", "Please enter a new directory name", Properties.Resources.Win95Info); } else { - if (File.Exists(setText)) + if (Directory.Exists(setText)) { - wm.StartInfobox95("Windows Explorer", "That file already exists.", Properties.Resources.Win95Info); - } else { - if (File.Exists(OldLabelText)) + wm.StartInfobox95("Windows Explorer", "That directory already exists.", Properties.Resources.Win95Info); + } + else + { + if (File.Exists(setText)) { - // It was a file + wm.StartInfobox95("Windows Explorer", "That file already exists.", Properties.Resources.Win95Info); + } + else + { + if (Directory.Exists(mainView.FocusedItem.ImageKey)) + { + // It was a directory - File.Copy(Path.Combine(CurrentDirectory, OldLabelText), Path.Combine(CurrentDirectory, setText)); - File.Delete(Path.Combine(CurrentDirectory, OldLabelText)); - - } else { - // It was a directory + Directory.Move(mainView.FocusedItem.ImageKey, Path.Combine(CurrentDirectory, setText)); - Directory.CreateDirectory(Path.Combine(CurrentDirectory, setText)); - //File.Copy(Path.Combine(CurrentDirectory, OldLabelText, "*"), Path.Combine(CurrentDirectory, setText)); - Directory.Delete(Path.Combine(CurrentDirectory, OldLabelText)); + File.Delete(Path.Combine(CurrentDirectory, setText, "_data.info")); + + SaveDirectoryInfo(Path.Combine(CurrentDirectory, setText), false, $"{setText}", true); + } + else + { + // It was a file + + File.Copy(mainView.FocusedItem.ImageKey, Path.Combine(CurrentDirectory, setText)); + File.Delete(mainView.FocusedItem.ImageKey); + } } + } - } + RefreshAll(); + RefreshTreeNode(); + } + catch + { } - RefreshAll(); } private TreeNode[] createSubDirNodes(DirectoryInfo folder) @@ -793,5 +815,145 @@ namespace TimeHACK.OS.Win95.Win95Apps { RefreshAll(); } + + private void CutCtrlXToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + if (mainView.FocusedItem != null && mainView.FocusedItem.ImageKey != "") + { + + // It is a directory + string oldLocation; + oldLocation = mainView.FocusedItem.ImageKey; + + CurrentCopyFile = Path.Combine(GameDirectory, "Data", Path.GetFileName(mainView.FocusedItem.ImageKey)); + + if (Directory.Exists(CurrentCopyFile)) Directory.Delete(CurrentCopyFile); + if (File.Exists(CurrentCopyFile)) File.Delete(CurrentCopyFile); + + Directory.Move(mainView.FocusedItem.ImageKey, Path.Combine(GameDirectory, "Data", Path.GetDirectoryName(mainView.FocusedItem.ImageKey))); + + + DirectoryCopy(CurrentCopyFile, oldLocation, true); + } + else if (mainView.FocusedItem != null) + { + // It is a file + + CurrentCopyFile = Path.Combine(GameDirectory, "Data", Path.GetFileName(mainView.FocusedItem.Tag.ToString())); + + if (Directory.Exists(CurrentCopyFile)) Directory.Delete(CurrentCopyFile); + if (File.Exists(CurrentCopyFile)) File.Delete(CurrentCopyFile); + + File.Move(mainView.FocusedItem.Tag.ToString(), Path.Combine(GameDirectory, "Data", Path.GetFileName(mainView.FocusedItem.Tag.ToString()))); + + + } + RefreshAll(); + } + catch + { + } + } + + private void CopyCtrlCToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + if (mainView.FocusedItem != null && mainView.FocusedItem.ImageKey != "") + { + // It is a directory + string oldLocation; + oldLocation = mainView.FocusedItem.ImageKey; + CurrentCopyFile = Path.Combine(GameDirectory, "Data", Path.GetFileName(mainView.FocusedItem.ImageKey)); + + if (Directory.Exists(CurrentCopyFile)) Directory.Delete(CurrentCopyFile); + if (File.Exists(CurrentCopyFile)) File.Delete(CurrentCopyFile); + + DirectoryCopy(CurrentCopyFile, oldLocation, true); + } + else if (mainView.FocusedItem != null) + { + // It is a file + + CurrentCopyFile = Path.Combine(GameDirectory, "Data", Path.GetFileName(mainView.FocusedItem.Tag.ToString())); + + if (Directory.Exists(CurrentCopyFile)) Directory.Delete(CurrentCopyFile); + if (File.Exists(CurrentCopyFile)) File.Delete(CurrentCopyFile); + + File.Copy(mainView.FocusedItem.Tag.ToString(), Path.Combine(GameDirectory, "Data", Path.GetFileName(mainView.FocusedItem.Tag.ToString()))); + + } + RefreshAll(); + } + catch + { + } + } + + private void PasteToolStripMenuItem_Click(object sender, EventArgs e) + { + if (Directory.Exists(CurrentCopyFile)) + { + // It is a directory + + DirectoryCopy(CurrentCopyFile, CurrentDirectory, true); + } + else if (File.Exists(CurrentCopyFile)) + { + // It is a file + + File.Copy(CurrentCopyFile, Path.Combine(CurrentDirectory, Path.GetFileName(CurrentCopyFile))); + } + RefreshAll(); + } + + private static void DirectoryCopy(string sourceDirName, string destDirName, bool copySubDirs) + { + // Get the subdirectories for the specified directory. + DirectoryInfo dir = new DirectoryInfo(sourceDirName); + + if (dir.Exists) + { + DirectoryInfo[] dirs = dir.GetDirectories(); + // If the destination directory doesn't exist, create it. + if (!Directory.Exists(destDirName)) + { + Directory.CreateDirectory(destDirName); + } + + // Get the files in the directory and copy them to the new location. + FileInfo[] files = dir.GetFiles(); + foreach (FileInfo file in files) + { + string temppath = Path.Combine(destDirName, file.Name); + file.CopyTo(temppath, false); + } + + // If copying subdirectories, copy them and their contents to new location. + if (copySubDirs) + { + foreach (DirectoryInfo subdir in dirs) + { + string temppath = Path.Combine(destDirName, subdir.Name); + DirectoryCopy(subdir.FullName, temppath, copySubDirs); + } + } + } + } + + private void refresh_Tick(object sender, EventArgs e) + { + RefreshAll(); + } + + private void SellectAllCtrlAToolStripMenuItem_Click(object sender, EventArgs e) + { + foreach (ListViewItem item in mainView.Items) + { + item.Selected = true; + } + } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.resx b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.resx index bb70361..e423ac1 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.resx @@ -120,4 +120,10 @@ 17, 17 + + 17, 17 + + + 132, 17 + \ No newline at end of file diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs index db49c53..3117d9c 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs @@ -111,7 +111,6 @@ namespace TimeHACK.OS.Win95.Win95Apps ActivateSaveFileDialog(".txt"); string selectedPath = Program.OpenFileExplorerAsDialogAndReturnGivenPath(); - MessageBox.Show(selectedPath); if (selectedPath != "") { File.WriteAllText(selectedPath, mainText.Text); diff --git a/TimeHACK.Main/OS/Win98/Win98.cs b/TimeHACK.Main/OS/Win98/Win98.cs index 5585e7d..2fe4e3c 100644 --- a/TimeHACK.Main/OS/Win98/Win98.cs +++ b/TimeHACK.Main/OS/Win98/Win98.cs @@ -110,25 +110,6 @@ namespace TimeHACK.OS.Win98 // Bring to this the front this.BringToFront(); - //Check if it is the first time - if (CurrentSave.FTime95 == false) - { - CurrentSave.FTime95 = true; - SaveSystem.SaveGame(); - WinClassicWelcome welcome = new WinClassicWelcome(); - WinClassic app = wm.StartWin95(welcome, "Welcome", null, false, false); - AddTaskBarItem(app, app.Tag.ToString(), "Welcome", null); - - nonimportantapps.Add(app); - nonimportantapps[nonimportantapps.Count - 1].BringToFront(); - nonimportantapps[nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing); - - - - app.BringToFront(); - - } - } private void fontLoad() diff --git a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs index a7e5bf1..16ee161 100644 --- a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs +++ b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs @@ -28,6 +28,7 @@ /// 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(); @@ -76,6 +77,7 @@ this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.HelpToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.AboutWindows95ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.refresh = new System.Windows.Forms.Timer(this.components); this.program.SuspendLayout(); this.pnlInfo.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); @@ -116,6 +118,7 @@ this.mainView.TabIndex = 10; this.mainView.UseCompatibleStateImageBehavior = false; this.mainView.View = System.Windows.Forms.View.List; + this.mainView.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.mainView_AfterLabelEdit); this.mainView.SelectedIndexChanged += new System.EventHandler(this.mainView_SelectedIndexChanged); this.mainView.DoubleClick += new System.EventHandler(this.mainView_DoubleClick); // @@ -462,24 +465,28 @@ this.CutCtrlXToolStripMenuItem.Name = "CutCtrlXToolStripMenuItem"; this.CutCtrlXToolStripMenuItem.Size = new System.Drawing.Size(197, 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.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.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.Text = "Select All Ctrl+A"; + this.SellectAllCtrlAToolStripMenuItem.Text = "Select All Ctrl+A"; + this.SellectAllCtrlAToolStripMenuItem.Click += new System.EventHandler(this.SellectAllCtrlAToolStripMenuItem_Click); // // ViewToolStripMenuItem // @@ -528,6 +535,12 @@ this.AboutWindows95ToolStripMenuItem.Text = "About Windows 95"; this.AboutWindows95ToolStripMenuItem.Click += new System.EventHandler(this.AboutWindows95ToolStripMenuItem_Click); // + // refresh + // + this.refresh.Enabled = true; + this.refresh.Interval = 15000; + this.refresh.Tick += new System.EventHandler(this.refresh_Tick); + // // WinClassicWindowsExplorer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -605,5 +618,6 @@ private System.Windows.Forms.Label txtInfoDescType; private System.Windows.Forms.Label txtInfoDescName; private System.Windows.Forms.Label txtInfoDescSize; + private System.Windows.Forms.Timer refresh; } } diff --git a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs index e97276d..35d8cd3 100644 --- a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs +++ b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs @@ -24,6 +24,7 @@ namespace TimeHACK.OS.Win95.Win95Apps string ToReplaceWith = ProfileDirectory; string CurrentDirectory = ProfileMyComputerDirectory; string OldLabelText; + string CurrentCopyFile; int fileType = 6; //string attemptedDirectory = ""; WindowManager wm = new WindowManager(); @@ -55,40 +56,11 @@ namespace TimeHACK.OS.Win95.Win95Apps program.BringToFront(); - int loc = 0; - TreeNode[] folders = new TreeNode[new DirectoryInfo(CurrentDirectory).GetDirectories().Length]; - foreach (DirectoryInfo folder in new DirectoryInfo(CurrentDirectory).GetDirectories()) - { - if (folder.GetDirectories().Length > 0) - { - string label = ReadDataFile(folder.FullName, false); - TreeNode[] tn = createSubDirNodes(folder); - folders[loc] = new TreeNode(label ?? folder.Name, 2, 3, tn); - folders[loc].Tag = folder.FullName; - } - else - { - string label = ReadDataFile(folder.FullName, false); - folders[loc] = new TreeNode(label ?? folder.Name, 2, 3); - folders[loc].Tag = folder.FullName; - } - loc++; - } - TreeNode[] mypcarray = new TreeNode[3]; - mypcarray[0] = new TreeNode("(C:)", 1, 1, folders); - mypcarray[1] = new TreeNode("Control Panel", 4, 4); - mypcarray[2] = new TreeNode("Printers", 5, 5); - TreeNode[] desktoparray = new TreeNode[3]; - desktoparray[0] = new TreeNode("My Computer", 6, 6, mypcarray); - desktoparray[1] = new TreeNode("Network Neighborhood", 7, 7); - desktoparray[2] = new TreeNode("Recycle Bin", 8, 8); - diskView.Nodes.Add(new TreeNode("Desktop", 0, 0, desktoparray)); - - //diskView.Items.Add("My Computer", 0); Application.DoEvents(); RefreshAll(); + RefreshTreeNode(); if (FileDialogBoxManager.IsInOpenDialog) { @@ -152,13 +124,8 @@ namespace TimeHACK.OS.Win95.Win95Apps void RefreshAll() { try { - // Refresh the right listview + this.mainView.Items.Clear(); - // For Each drive As string In My.Computer.FileSystem.GetDirectories(GameMain.MyDocuments & "\HistacomVB\" & GameMain.SaveProfile & "\HistacomVB\Folders") - // If GetPropetiesForDir(drive)(4) = "isMyDocuments" Then - // diskView.Items.Add("", 0) - // End If - //Next // Update the WebView @@ -233,6 +200,42 @@ namespace TimeHACK.OS.Win95.Win95Apps } } + void RefreshTreeNode() + { + // Refresh the TreeView + + diskView.Nodes.Clear(); + + int loc = 0; + TreeNode[] folders = new TreeNode[new DirectoryInfo(ProfileMyComputerDirectory).GetDirectories().Length]; + foreach (DirectoryInfo folder in new DirectoryInfo(ProfileMyComputerDirectory).GetDirectories()) + { + if (folder.GetDirectories().Length > 0) + { + string label = ReadDataFile(folder.FullName, false); + TreeNode[] tn = createSubDirNodes(folder); + folders[loc] = new TreeNode(label ?? folder.Name, 2, 3, tn); + folders[loc].Tag = folder.FullName; + } + else + { + string label = ReadDataFile(folder.FullName, false); + folders[loc] = new TreeNode(label ?? folder.Name, 2, 3); + folders[loc].Tag = folder.FullName; + } + loc++; + } + TreeNode[] mypcarray = new TreeNode[3]; + mypcarray[0] = new TreeNode("(C:)", 1, 1, folders); + mypcarray[1] = new TreeNode("Control Panel", 4, 4); + mypcarray[2] = new TreeNode("Printers", 5, 5); + TreeNode[] desktoparray = new TreeNode[3]; + desktoparray[0] = new TreeNode("My Computer", 6, 6, mypcarray); + desktoparray[1] = new TreeNode("Network Neighborhood", 7, 7); + desktoparray[2] = new TreeNode("Recycle Bin", 8, 8); + diskView.Nodes.Add(new TreeNode("Desktop", 0, 0, desktoparray)); + } + void OpenFile(string fileDir) { try @@ -669,11 +672,13 @@ namespace TimeHACK.OS.Win95.Win95Apps if (File.Exists(CurrentDirectory + "\\New Folder")) { wm.StartInfobox95("Windows Explorer", "This directory already exists", Properties.Resources.Win95Info); } else { - Directory.CreateDirectory(CurrentDirectory + "\\New Folder"); - SaveDirectoryInfo(CurrentDirectory + "\\New Folder", false, "New Folder", true); + Directory.CreateDirectory(Path.Combine(CurrentDirectory, "New Folder")); + SaveDirectoryInfo(Path.Combine(CurrentDirectory, "New Folder"), false, "New Folder", true); RefreshAll(); } + + RefreshTreeNode(); } private void Button1_Click(object sender, EventArgs e) @@ -721,16 +726,17 @@ namespace TimeHACK.OS.Win95.Win95Apps { try { - if (!FileOrDirectoryExists(Path.Combine(CurrentDirectory, mainView.FocusedItem.Text))) + if (!FileOrDirectoryExists(mainView.FocusedItem.ImageKey)) { wm.StartInfobox95("Windows Explorer", "This directory doesn't exist", Properties.Resources.Win95Info); } else { - if (Directory.Exists(Path.Combine(CurrentDirectory, mainView.FocusedItem.Text))) Directory.Delete(Path.Combine(CurrentDirectory, mainView.FocusedItem.Text), true); - else File.Delete(Path.Combine(CurrentDirectory, mainView.FocusedItem.Text)); + if (Directory.Exists(mainView.FocusedItem.ImageKey)) Directory.Delete(mainView.FocusedItem.ImageKey, true); + else File.Delete(mainView.FocusedItem.ImageKey); RefreshAll(); + RefreshTreeNode(); } } catch { @@ -770,48 +776,53 @@ namespace TimeHACK.OS.Win95.Win95Apps private void mainView_AfterLabelEdit(object sender, LabelEditEventArgs e) { - - string setText; - setText = mainView.FocusedItem.Text; - if (setText == "") - { - wm.StartInfobox95("Windows Explorer", "Please enter a new directory name", Properties.Resources.Win95Info); - } - else - { - if (Directory.Exists(setText)) + try { + string setText; + setText = e.Label; + if (setText == "") { - wm.StartInfobox95("Windows Explorer", "That directory already exists.", Properties.Resources.Win95Info); + wm.StartInfobox95("Windows Explorer", "Please enter a new directory name", Properties.Resources.Win95Info); } else { - if (File.Exists(setText)) + if (Directory.Exists(setText)) { - wm.StartInfobox95("Windows Explorer", "That file already exists.", Properties.Resources.Win95Info); + wm.StartInfobox95("Windows Explorer", "That directory already exists.", Properties.Resources.Win95Info); } else { - if (File.Exists(OldLabelText)) + if (File.Exists(setText)) { - // It was a file - - File.Copy(Path.Combine(CurrentDirectory, OldLabelText), Path.Combine(CurrentDirectory, setText)); - File.Delete(Path.Combine(CurrentDirectory, OldLabelText)); - + wm.StartInfobox95("Windows Explorer", "That file already exists.", Properties.Resources.Win95Info); } else { - // It was a directory + if (Directory.Exists(mainView.FocusedItem.ImageKey)) + { + // It was a directory + + Directory.Move(mainView.FocusedItem.ImageKey, Path.Combine(CurrentDirectory, setText)); - Directory.CreateDirectory(Path.Combine(CurrentDirectory, setText)); - //File.Copy(Path.Combine(CurrentDirectory, OldLabelText, "*"), Path.Combine(CurrentDirectory, setText)); - Directory.Delete(Path.Combine(CurrentDirectory, OldLabelText)); + File.Delete(Path.Combine(CurrentDirectory, setText, "_data.info")); + + SaveDirectoryInfo(Path.Combine(CurrentDirectory, setText), false, $"{setText}", true); + } + else + { + // It was a file + + File.Copy(mainView.FocusedItem.ImageKey, Path.Combine(CurrentDirectory, setText)); + File.Delete(mainView.FocusedItem.ImageKey); + } } - } + } } + RefreshAll(); + RefreshTreeNode(); + } catch { } - RefreshAll(); + } private TreeNode[] createSubDirNodes(DirectoryInfo folder) @@ -929,5 +940,140 @@ namespace TimeHACK.OS.Win95.Win95Apps } } } + + private void CutCtrlXToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + if (mainView.FocusedItem != null && mainView.FocusedItem.ImageKey != "") + { + + // It is a directory + string oldLocation; + oldLocation = mainView.FocusedItem.ImageKey; + + CurrentCopyFile = Path.Combine(GameDirectory, "Data", Path.GetFileName(mainView.FocusedItem.ImageKey)); + + if (Directory.Exists(CurrentCopyFile)) Directory.Delete(CurrentCopyFile); + if (File.Exists(CurrentCopyFile)) File.Delete(CurrentCopyFile); + + Directory.Move(mainView.FocusedItem.ImageKey, Path.Combine(GameDirectory, "Data", Path.GetDirectoryName(mainView.FocusedItem.ImageKey))); + + + DirectoryCopy(CurrentCopyFile, oldLocation, true); + } + else if (mainView.FocusedItem != null) + { + // It is a file + + CurrentCopyFile = Path.Combine(GameDirectory, "Data", Path.GetFileName(mainView.FocusedItem.Tag.ToString())); + + if (Directory.Exists(CurrentCopyFile)) Directory.Delete(CurrentCopyFile); + if (File.Exists(CurrentCopyFile)) File.Delete(CurrentCopyFile); + + File.Move(mainView.FocusedItem.Tag.ToString(), Path.Combine(GameDirectory, "Data", Path.GetFileName(mainView.FocusedItem.Tag.ToString()))); + + + } + RefreshAll(); + } catch { + } + } + + private void CopyCtrlCToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + if (mainView.FocusedItem != null && mainView.FocusedItem.ImageKey != "") + { + // It is a directory + string oldLocation; + oldLocation = mainView.FocusedItem.ImageKey; + CurrentCopyFile = Path.Combine(GameDirectory, "Data", Path.GetFileName(mainView.FocusedItem.ImageKey)); + + if (Directory.Exists(CurrentCopyFile)) Directory.Delete(CurrentCopyFile); + if (File.Exists(CurrentCopyFile)) File.Delete(CurrentCopyFile); + + DirectoryCopy(CurrentCopyFile, oldLocation, true); + } + else if (mainView.FocusedItem != null) + { + // It is a file + + CurrentCopyFile = Path.Combine(GameDirectory, "Data", Path.GetFileName(mainView.FocusedItem.Tag.ToString())); + + if (Directory.Exists(CurrentCopyFile)) Directory.Delete(CurrentCopyFile); + if (File.Exists(CurrentCopyFile)) File.Delete(CurrentCopyFile); + + File.Copy(mainView.FocusedItem.Tag.ToString(), Path.Combine(GameDirectory, "Data", Path.GetFileName(mainView.FocusedItem.Tag.ToString()))); + + + } + RefreshAll(); + } catch { + } + } + + private void PasteToolStripMenuItem_Click(object sender, EventArgs e) + { + if (Directory.Exists(CurrentCopyFile)) + { + // It is a directory + + DirectoryCopy(CurrentCopyFile, CurrentDirectory, true); + } else if (File.Exists(CurrentCopyFile)) { + // It is a file + + File.Copy(CurrentCopyFile, Path.Combine(CurrentDirectory, Path.GetFileName(CurrentCopyFile))); + } + RefreshAll(); + } + + private static void DirectoryCopy(string sourceDirName, string destDirName, bool copySubDirs) + { + // Get the subdirectories for the specified directory. + DirectoryInfo dir = new DirectoryInfo(sourceDirName); + + if (dir.Exists) + { + DirectoryInfo[] dirs = dir.GetDirectories(); + // If the destination directory doesn't exist, create it. + if (!Directory.Exists(destDirName)) + { + Directory.CreateDirectory(destDirName); + } + + // Get the files in the directory and copy them to the new location. + FileInfo[] files = dir.GetFiles(); + foreach (FileInfo file in files) + { + string temppath = Path.Combine(destDirName, file.Name); + file.CopyTo(temppath, false); + } + + // If copying subdirectories, copy them and their contents to new location. + if (copySubDirs) + { + foreach (DirectoryInfo subdir in dirs) + { + string temppath = Path.Combine(destDirName, subdir.Name); + DirectoryCopy(subdir.FullName, temppath, copySubDirs); + } + } + } + } + + private void refresh_Tick(object sender, EventArgs e) + { + RefreshAll(); + } + + private void SellectAllCtrlAToolStripMenuItem_Click(object sender, EventArgs e) + { + foreach (ListViewItem item in mainView.Items) + { + item.Selected = true; + } + } } } diff --git a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx index 521f476..d9ff80c 100644 --- a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx +++ b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + @@ -129,4 +132,7 @@ 17, 17 + + 132, 17 + \ No newline at end of file diff --git a/TimeHACK.Main/Program.cs b/TimeHACK.Main/Program.cs index 86f1a54..cba20d6 100644 --- a/TimeHACK.Main/Program.cs +++ b/TimeHACK.Main/Program.cs @@ -67,9 +67,13 @@ namespace TimeHACK public static string OpenFileExplorerAsDialogAndReturnGivenPath() { - Win95WindowsExplorer we = new Win95WindowsExplorer(); - - WinClassic app = wm.StartWin95(we, "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true, true); + if (SaveSystem.CurrentSave.CurrentOS == "95") + { + WinClassic app = wm.StartWin95(new Win95WindowsExplorer(), "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true, true); + } else { + WinClassic app = wm.StartWin95(new WinClassicWindowsExplorer(), "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true, true); + } + try { return WindowsExplorerReturnPath; -- cgit v1.2.3