From 93702450a4d0a1830807e985acccc616f3bf1b62 Mon Sep 17 00:00:00 2001 From: lempamo Date: Mon, 31 Jul 2017 11:08:49 -0400 Subject: fixed up taskbar things --- TimeHACK.Main/OS/Win95/Win95.Designer.cs | 8 ++- TimeHACK.Main/OS/Win95/Win95.cs | 28 ++++------ TimeHACK.Main/OS/Win95/Win95.resx | 61 +++++++++------------ TimeHACK.Main/OS/Win95/Win95TaskBarItem.cs | 7 ++- TimeHACK.Main/OS/Win98/Win98.cs | 4 +- TimeHACK.Main/Properties/Resources.Designer.cs | 4 +- TimeHACK.Main/Properties/Resources.resx | 6 +- .../MSDOSPromptToolStripMenuItem1.Image.png | Bin 0 -> 281 bytes TimeHACK.Main/TimeHACK.Main.csproj | 1 + 9 files changed, 57 insertions(+), 62 deletions(-) create mode 100644 TimeHACK.Main/Resources/MSDOSPromptToolStripMenuItem1.Image.png diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs index 934a349..bf83440 100644 --- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs @@ -174,7 +174,6 @@ namespace TimeHACK.OS.Win95 this.taskbartime.Size = new System.Drawing.Size(26, 13); this.taskbartime.TabIndex = 2; this.taskbartime.Text = "time"; - this.taskbartime.Click += new System.EventHandler(this.taskbartime_Click); // // taskbarItems // @@ -804,18 +803,20 @@ namespace TimeHACK.OS.Win95 // this.ControlPanelToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.ControlPanelToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ControlPanelToolStripMenuItem.BackgroundImage"))); + this.ControlPanelToolStripMenuItem.Image = global::TimeHACK.Properties.Resources.Win95ControlPanelIcon; this.ControlPanelToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ControlPanelToolStripMenuItem.Name = "ControlPanelToolStripMenuItem"; - this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(146, 22); + this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.ControlPanelToolStripMenuItem.Text = "Control Panel"; // // PrintersToolStripMenuItem // this.PrintersToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.PrintersToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("PrintersToolStripMenuItem.BackgroundImage"))); + this.PrintersToolStripMenuItem.Image = global::TimeHACK.Properties.Resources.Win95PrintersFolder; this.PrintersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PrintersToolStripMenuItem.Name = "PrintersToolStripMenuItem"; - this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(146, 22); + this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.PrintersToolStripMenuItem.Text = "Printers"; this.PrintersToolStripMenuItem.Click += new System.EventHandler(this.infoboxTestToolStripMenuItem_Click); // @@ -1049,6 +1050,7 @@ namespace TimeHACK.OS.Win95 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.Teal; + this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.ClientSize = new System.Drawing.Size(640, 480); this.Controls.Add(this.taskbar); this.Controls.Add(this.startmenu); diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index 5d02b16..7e4938a 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -129,14 +129,14 @@ namespace TimeHACK.OS.Win95 // Update the Desktop icons - DesktopController.RefreshDesktopIcons(new ListViewItem[] { new System.Windows.Forms.ListViewItem("My Computer", 0), - new System.Windows.Forms.ListViewItem("Network Neighborhood", 5), - new System.Windows.Forms.ListViewItem("Inbox", 3), - new System.Windows.Forms.ListViewItem("Recycle Bin", 7), - new System.Windows.Forms.ListViewItem("Internet Explorer", 2), - new System.Windows.Forms.ListViewItem("Online Services", 1), - new System.Windows.Forms.ListViewItem("Set Up The Microsoft Network", 4), - new System.Windows.Forms.ListViewItem("Outlook Express", 6) }, ref desktopicons, Path.Combine(ProfileWindowsDirectory, "Desktop")); + DesktopController.RefreshDesktopIcons(new ListViewItem[] { new ListViewItem("My Computer", 0), + new ListViewItem("Network Neighborhood", 5), + new ListViewItem("Inbox", 3), + new ListViewItem("Recycle Bin", 7), + new ListViewItem("Internet Explorer", 2), + new ListViewItem("Online Services", 1), + new ListViewItem("Set Up The Microsoft Network", 4), + new ListViewItem("Outlook Express", 6) }, ref desktopicons, Path.Combine(ProfileWindowsDirectory, "Desktop")); } private void fontLoad() @@ -172,12 +172,6 @@ namespace TimeHACK.OS.Win95 #endregion //Region - // Give Year Code - NYI - private void taskbartime_Click(object sender, EventArgs e) - { - - } - // Set the Clock private void clockTimer_Tick(object sender, EventArgs e) { @@ -441,9 +435,9 @@ namespace TimeHACK.OS.Win95 private void MSDOSPromptToolStripMenuItem1_Click (object sender, EventArgs e) { WinClassicTerminal msdos = new WinClassicTerminal(false); - WinClassic app = wm.StartWin95(msdos, "MS-DOS Prompt", Properties.Resources.MS_DOS, true, true, false); + WinClassic app = wm.StartWin95(msdos, "MS-DOS Prompt", Properties.Resources.MSDOSPromptToolStripMenuItem1_Image, true, true, false); - AddTaskBarItem(app, app.Tag.ToString(), "MS-DOS Prompt", Properties.Resources.MS_DOS); + AddTaskBarItem(app, app.Tag.ToString(), "MS-DOS Prompt", Properties.Resources.MSDOSPromptToolStripMenuItem1_Image); app.BringToFront(); startmenu.Hide(); } @@ -575,7 +569,7 @@ namespace TimeHACK.OS.Win95 private void MinsweeperToolStripMenuItem_Click(object sender, EventArgs e) { WinClassic app = wm.StartWin95(new WinClassicMinesweeper(), "Minesweeper", Properties.Resources.WinClassicMinesweeper, false, false); - AddTaskBarItem(app, app.Tag.ToString(), "Calculator", Properties.Resources.WinClassicCalc); + AddTaskBarItem(app, app.Tag.ToString(), "Minesweeper", Properties.Resources.WinClassicMinesweeper); nonimportantapps.Add(app); nonimportantapps[nonimportantapps.Count - 1].BringToFront(); diff --git a/TimeHACK.Main/OS/Win95/Win95.resx b/TimeHACK.Main/OS/Win95/Win95.resx index 8678679..a9883bf 100644 --- a/TimeHACK.Main/OS/Win95/Win95.resx +++ b/TimeHACK.Main/OS/Win95/Win95.resx @@ -117,13 +117,17 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - - - 17, 17 - + + 17, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + 4AAABIQCQUtXaBsAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAALRJREFUOE+N @@ -270,14 +274,9 @@ QmCC - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN - upcBf0zA6+7r8QAxA9170IEPm6l7PWu9A1CLwNaVpSfWNEKLWCECDnkvAdFtMgBDLeHFaNaXEpQu22B9 - NsFA96i2yQlo00wejQG9VfuSCQ0IXAFAVAb468AVwJB3AHpsBFKn2uYkemh9hllezf4KcDKwtqkBpX5j - Dyj5DRIeDDh3wD3c5AYkh2QwOMYPtAJqglssjE8AAAAASUVORK5CYII= - + + + ..\..\Resources\MSDOSPromptToolStripMenuItem1.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -329,13 +328,6 @@ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= @@ -366,18 +358,18 @@ 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - + 153, 17 - - + + 263, 17 - + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABC - fgAAAk1TRnQBSQFMAgEBDAIAAQIBAAECASABAAEgAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABgAMA + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABE + fgAAAk1TRnQBSQFMAgEBDAIAAQIBBAECASABAAEgAQAE/wEhARAI/wFCAU0BNgcAATYDAAEoAwABgAMA AYADAAEBAQABIAcAAQH/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AGQAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMA @@ -915,18 +907,19 @@ AQcEAAHwAQEB4AEDAfADAAH+AgABBwQAAfACAAEDAfgCAAEBAf4CAAEHBAAB+AIAAQcB+AIAAQEB/gIA AQcEAAH8AgABBwH8AgABAwH+AgABBwMAAQEB/gIAAQ4B/AIAAQMB/gIAAQcBgAEAA/8CAAEeAfwCAAEH Af4CAAEHAcABAQP/AcABAAF+AfwCAAEPAf4CAAEHAeABAwP/AfgBAQH+AfwCAAEfAf8CAAEHAfABBwT/ - AeEC/AIAAT8B/wGAAQABBwb/AfwBeQH/AgAC/wHAAQABDwf/AQMB/wHEAQMB/ws= + AeEC/AIAAT8B/wGAAQABBwb/AfwBeQH/AgAC/wHAAQABDwf/AQMB/wHEAQMB/xYACw== - + 401, 8 - - + + 580, 17 - - + + + 63 - + AAABAAUAEBAAAAAAIABoBAAAVgAAACAgAAAAACAAqBAAAL4EAAAwMAAAAAAgAKglAABmFQAAQEAAAAAA diff --git a/TimeHACK.Main/OS/Win95/Win95TaskBarItem.cs b/TimeHACK.Main/OS/Win95/Win95TaskBarItem.cs index b463a83..06c2030 100644 --- a/TimeHACK.Main/OS/Win95/Win95TaskBarItem.cs +++ b/TimeHACK.Main/OS/Win95/Win95TaskBarItem.cs @@ -25,7 +25,12 @@ namespace TimeHACK.Engine.Template.Taskbars private void Win95TaskBarItem_Load(object sender, EventArgs e) { progName.Text = (string)this.Tag; - progPic.Image = this.BackgroundImage; + if (BackgroundImage == null) + { + progName.Location = new Point(4, 2); + progPic.Hide(); + } + else progPic.Image = this.BackgroundImage; ApplicationID = (TaskBarController.AvalibleApplicationID - 1).ToString(); this.BackgroundImage = null; } diff --git a/TimeHACK.Main/OS/Win98/Win98.cs b/TimeHACK.Main/OS/Win98/Win98.cs index b1f7957..117f447 100644 --- a/TimeHACK.Main/OS/Win98/Win98.cs +++ b/TimeHACK.Main/OS/Win98/Win98.cs @@ -441,9 +441,9 @@ namespace TimeHACK.OS.Win98 private void MSDOSPromptToolStripMenuItem1_Click(object sender, EventArgs e) { WinClassicTerminal msdos = new WinClassicTerminal(false); - WinClassic app = wm.StartWin95(msdos, "MS-DOS Prompt", Properties.Resources.MS_DOS, true, true, false); + WinClassic app = wm.StartWin95(msdos, "MS-DOS Prompt", Properties.Resources.MSDOSPromptToolStripMenuItem1_Image, true, true, false); - AddTaskBarItem(app, app.Tag.ToString(), "MS-DOS Prompt", Properties.Resources.MS_DOS); + AddTaskBarItem(app, app.Tag.ToString(), "MS-DOS Prompt", Properties.Resources.MSDOSPromptToolStripMenuItem1_Image); app.BringToFront(); startmenu.Hide(); } diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs index 78ceb04..7453d8f 100644 --- a/TimeHACK.Main/Properties/Resources.Designer.cs +++ b/TimeHACK.Main/Properties/Resources.Designer.cs @@ -407,9 +407,9 @@ namespace TimeHACK.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap MS_DOS { + internal static System.Drawing.Bitmap MSDOSPromptToolStripMenuItem1_Image { get { - object obj = ResourceManager.GetObject("MS_DOS", resourceCulture); + object obj = ResourceManager.GetObject("MSDOSPromptToolStripMenuItem1_Image", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx index cc6a173..e24acf0 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -528,9 +528,6 @@ ..\Resources\ie4_search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\MS-DOS-logo-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\resources\winclassic\winclassictaskbaritem.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -693,6 +690,9 @@ ..\Resources\WinClassic\WinClassicMinesweeper.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\MSDOSPromptToolStripMenuItem1.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\WinClassic\WinClassicEndingsIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/TimeHACK.Main/Resources/MSDOSPromptToolStripMenuItem1.Image.png b/TimeHACK.Main/Resources/MSDOSPromptToolStripMenuItem1.Image.png new file mode 100644 index 0000000..b38446d Binary files /dev/null and b/TimeHACK.Main/Resources/MSDOSPromptToolStripMenuItem1.Image.png differ diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index aeb1675..1e4550b 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -529,6 +529,7 @@ + -- cgit v1.2.3