fixed up taskbar things

This commit is contained in:
lempamo 2017-07-31 11:08:49 -04:00
parent 547f538230
commit 93702450a4
9 changed files with 57 additions and 62 deletions

View file

@ -174,7 +174,6 @@ private void InitializeComponent()
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 @@ private void InitializeComponent()
//
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 @@ private void InitializeComponent()
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);

View file

@ -129,14 +129,14 @@ private void Desktop_Load(object sender, EventArgs e)
// 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 @@ private void ShutdownToolStripMenuItem_Click(object sender, EventArgs e)
#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 @@ private void temp_for_std(object sender, EventArgs e)
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 @@ private void deleteToolStripMenuItem_Click(object sender, EventArgs e)
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();

View file

@ -117,13 +117,17 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="startmenuitems.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="startmenuitems.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="startmenuitems.TrayLocation" type="System.Drawing.Point, System.Drawing">
<value>17, 17</value>
</data>
<data name="FindToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
4AAABIQCQUtXaBsAAAAASUVORK5CYII=
</value>
</data>
<data name="InternetConnectionWizardToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAALRJREFUOE+N
@ -270,14 +274,9 @@
QmCC
</value>
</data>
<data name="MSDOSPromptToolStripMenuItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN
upcBf0zA6+7r8QAxA9170IEPm6l7PWu9A1CLwNaVpSfWNEKLWCECDnkvAdFtMgBDLeHFaNaXEpQu22B9
NsFA96i2yQlo00wejQG9VfuSCQ0IXAFAVAb468AVwJB3AHpsBFKn2uYkemh9hllezf4KcDKwtqkBpX5j
Dyj5DRIeDDh3wD3c5AYkh2QwOMYPtAJqglssjE8AAAAASUVORK5CYII=
</value>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="MSDOSPromptToolStripMenuItem1.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\Resources\MSDOSPromptToolStripMenuItem1.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="OutlookExpressToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@ -329,13 +328,6 @@
iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
4AAABIQCQUtXaBsAAAAASUVORK5CYII=
</value>
</data>
<data name="FindToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
4AAABIQCQUtXaBsAAAAASUVORK5CYII=
</value>
</data>
<data name="FilesOrFoldersToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -366,18 +358,18 @@
4AAABIQCQUtXaBsAAAAASUVORK5CYII=
</value>
</data>
<metadata name="clockTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<data name="clockTimer.TrayLocation" type="System.Drawing.Point, System.Drawing">
<value>153, 17</value>
</metadata>
<metadata name="desktopImages.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
</data>
<data name="desktopImages.TrayLocation" type="System.Drawing.Point, System.Drawing">
<value>263, 17</value>
</metadata>
</data>
<data name="desktopImages.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
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==
</value>
</data>
<metadata name="rightclickbackproperties.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<data name="rightclickbackproperties.TrayLocation" type="System.Drawing.Point, System.Drawing">
<value>401, 8</value>
</metadata>
<metadata name="desktopupdate.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
</data>
<data name="desktopupdate.TrayLocation" type="System.Drawing.Point, System.Drawing">
<value>580, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="$this.TrayHeight" type="System.Int32, mscorlib">
<value>63</value>
</metadata>
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAUAEBAAAAAAIABoBAAAVgAAACAgAAAAACAAqBAAAL4EAAAwMAAAAAAgAKglAABmFQAAQEAAAAAA

View file

@ -25,7 +25,12 @@ public Win95TaskBarItem()
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;
}

View file

@ -441,9 +441,9 @@ private void temp_for_std(object sender, EventArgs e)
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();
}

View file

@ -407,9 +407,9 @@ internal static System.IO.UnmanagedMemoryStream modem_dial {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
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));
}
}

View file

@ -528,9 +528,6 @@
<data name="ie4_search" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ie4_search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="MS_DOS" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\MS-DOS-logo-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="WinClassicTaskbarItem" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\winclassic\winclassictaskbaritem.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -693,6 +690,9 @@
<data name="WinClassicMinesweeper" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\WinClassic\WinClassicMinesweeper.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="MSDOSPromptToolStripMenuItem1_Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\MSDOSPromptToolStripMenuItem1.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="WinClassicEndingsIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\WinClassic\WinClassicEndingsIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>

Binary file not shown.

After

Width:  |  Height:  |  Size: 281 B

View file

@ -529,6 +529,7 @@
<None Include="Resources\MS-DOS-logo-1.png" />
<None Include="Resources\msdosprompt.png" />
<None Include="Resources\SeizureWarning.png" />
<None Include="Resources\MSDOSPromptToolStripMenuItem1.Image.png" />
<Content Include="Resources\std_beep.wav" />
<Content Include="Resources\std_gobeep.wav" />
<None Include="Resources\termCopy.png" />