aboutsummaryrefslogtreecommitdiff
path: root/TimeHACK.Main/OS/Win95
diff options
context:
space:
mode:
authorAShifter <[email protected]>2017-05-07 14:59:34 -0700
committerGitHub <[email protected]>2017-05-07 14:59:34 -0700
commitdcd6501aed4423bf28d3e27b596050d68028775c (patch)
tree5d5b743c21f4ab3a442332c8b93b32399683bef1 /TimeHACK.Main/OS/Win95
parentfbc7bcb9e8f88ff4ebe3578e589fef845ff931ec (diff)
parent29d2b28cffd5d0f59632a761c2221ece7f257304 (diff)
downloadhistacom2-dcd6501aed4423bf28d3e27b596050d68028775c.tar.gz
histacom2-dcd6501aed4423bf28d3e27b596050d68028775c.tar.bz2
histacom2-dcd6501aed4423bf28d3e27b596050d68028775c.zip
Merge pull request #68 from AShifter/master
start Win98
Diffstat (limited to 'TimeHACK.Main/OS/Win95')
-rw-r--r--TimeHACK.Main/OS/Win95/Win95.Designer.cs93
-rw-r--r--TimeHACK.Main/OS/Win95/Win95.resx79
-rw-r--r--TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.Designer.cs6
-rw-r--r--TimeHACK.Main/OS/Win95/Win95TaskBarItem.Designer.cs45
-rw-r--r--TimeHACK.Main/OS/Win95/Win95TaskBarItem.cs3
-rw-r--r--TimeHACK.Main/OS/Win95/Win95TaskBarItem.resx9
6 files changed, 178 insertions, 57 deletions
diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs
index 2e88c36..ab4e78f 100644
--- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs
@@ -29,21 +29,21 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- this.resources = new System.ComponentModel.ComponentResourceManager(typeof(Windows95));
- System.Windows.Forms.ListViewItem listViewItem1 = new System.Windows.Forms.ListViewItem("My Computer", 0);
- System.Windows.Forms.ListViewItem listViewItem2 = new System.Windows.Forms.ListViewItem("Network Neighborhood", 5);
- System.Windows.Forms.ListViewItem listViewItem3 = new System.Windows.Forms.ListViewItem("Inbox", 3);
- System.Windows.Forms.ListViewItem listViewItem4 = new System.Windows.Forms.ListViewItem("Recycle Bin", 7);
- System.Windows.Forms.ListViewItem listViewItem5 = new System.Windows.Forms.ListViewItem("Internet Explorer", 2);
- System.Windows.Forms.ListViewItem listViewItem6 = new System.Windows.Forms.ListViewItem("Online Services", 1);
- System.Windows.Forms.ListViewItem listViewItem7 = new System.Windows.Forms.ListViewItem("Set Up The Microsoft Network", 4);
- System.Windows.Forms.ListViewItem listViewItem8 = new System.Windows.Forms.ListViewItem("Outlook Express", 6);
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Windows95));
+ System.Windows.Forms.ListViewItem listViewItem9 = new System.Windows.Forms.ListViewItem("My Computer", 0);
+ System.Windows.Forms.ListViewItem listViewItem10 = new System.Windows.Forms.ListViewItem("Network Neighborhood", 5);
+ System.Windows.Forms.ListViewItem listViewItem11 = new System.Windows.Forms.ListViewItem("Inbox", 3);
+ System.Windows.Forms.ListViewItem listViewItem12 = new System.Windows.Forms.ListViewItem("Recycle Bin", 7);
+ System.Windows.Forms.ListViewItem listViewItem13 = new System.Windows.Forms.ListViewItem("Internet Explorer", 2);
+ System.Windows.Forms.ListViewItem listViewItem14 = new System.Windows.Forms.ListViewItem("Online Services", 1);
+ System.Windows.Forms.ListViewItem listViewItem15 = new System.Windows.Forms.ListViewItem("Set Up The Microsoft Network", 4);
+ System.Windows.Forms.ListViewItem listViewItem16 = new System.Windows.Forms.ListViewItem("Outlook Express", 6);
this.panel1 = new System.Windows.Forms.Panel();
this.panel2 = new System.Windows.Forms.Panel();
this.taskbar = new System.Windows.Forms.Panel();
- this.taskbarItems = new System.Windows.Forms.Panel();
- this.taskbartime = new System.Windows.Forms.Label();
this.clockPanel = new System.Windows.Forms.Panel();
+ this.taskbartime = new System.Windows.Forms.Label();
+ this.taskbarItems = new System.Windows.Forms.Panel();
this.startbutton = new System.Windows.Forms.PictureBox();
this.startmenu = new System.Windows.Forms.Panel();
this.startmenuitems = new System.Windows.Forms.MenuStrip();
@@ -129,6 +129,7 @@
this.PropertiesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.panel1.SuspendLayout();
this.taskbar.SuspendLayout();
+ this.clockPanel.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.startbutton)).BeginInit();
this.startmenu.SuspendLayout();
this.startmenuitems.SuspendLayout();
@@ -159,9 +160,8 @@
//
this.taskbar.BackColor = System.Drawing.Color.Silver;
this.taskbar.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("taskbar.BackgroundImage")));
- this.taskbar.Controls.Add(this.taskbarItems);
- this.taskbar.Controls.Add(this.taskbartime);
this.taskbar.Controls.Add(this.clockPanel);
+ this.taskbar.Controls.Add(this.taskbarItems);
this.taskbar.Controls.Add(this.startbutton);
this.taskbar.Dock = System.Windows.Forms.DockStyle.Bottom;
this.taskbar.Location = new System.Drawing.Point(0, 452);
@@ -169,38 +169,41 @@
this.taskbar.Size = new System.Drawing.Size(640, 28);
this.taskbar.TabIndex = 2;
//
- // taskbarItems
+ // clockPanel
//
- this.taskbarItems.Location = new System.Drawing.Point(63, 3);
- this.taskbarItems.Name = "taskbarItems";
- this.taskbarItems.Size = new System.Drawing.Size(506, 22);
- this.taskbarItems.TabIndex = 5;
+ this.clockPanel.BackgroundImage = global::TimeHACK.Properties.Resources.WinClassicTime;
+ this.clockPanel.Controls.Add(this.taskbartime);
+ this.clockPanel.Dock = System.Windows.Forms.DockStyle.Right;
+ this.clockPanel.Location = new System.Drawing.Point(575, 0);
+ this.clockPanel.Name = "clockPanel";
+ this.clockPanel.Size = new System.Drawing.Size(65, 28);
+ this.clockPanel.TabIndex = 4;
//
// taskbartime
//
this.taskbartime.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.taskbartime.AutoSize = true;
this.taskbartime.BackColor = System.Drawing.Color.Transparent;
- this.taskbartime.Location = new System.Drawing.Point(577, 6);
+ this.taskbartime.Location = new System.Drawing.Point(10, 7);
this.taskbartime.Name = "taskbartime";
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);
//
- // clockPanel
+ // taskbarItems
//
- this.clockPanel.BackgroundImage = global::TimeHACK.Properties.Resources.WinClassicTime;
- this.clockPanel.Dock = System.Windows.Forms.DockStyle.Right;
- this.clockPanel.Location = new System.Drawing.Point(575, 0);
- this.clockPanel.Name = "clockPanel";
- this.clockPanel.Size = new System.Drawing.Size(65, 28);
- this.clockPanel.TabIndex = 4;
+ this.taskbarItems.BackColor = System.Drawing.Color.Transparent;
+ this.taskbarItems.Cursor = System.Windows.Forms.Cursors.Default;
+ this.taskbarItems.Location = new System.Drawing.Point(63, 4);
+ this.taskbarItems.Name = "taskbarItems";
+ this.taskbarItems.Size = new System.Drawing.Size(3648, 22);
+ this.taskbarItems.TabIndex = 5;
//
// startbutton
//
this.startbutton.Image = ((System.Drawing.Image)(resources.GetObject("startbutton.Image")));
- this.startbutton.Location = new System.Drawing.Point(3, 3);
+ this.startbutton.Location = new System.Drawing.Point(2, 4);
this.startbutton.Name = "startbutton";
this.startbutton.Size = new System.Drawing.Size(54, 22);
this.startbutton.TabIndex = 3;
@@ -213,7 +216,7 @@
this.startmenu.BackColor = System.Drawing.Color.Silver;
this.startmenu.Controls.Add(this.startmenuitems);
this.startmenu.Controls.Add(this.ossidestartmenu);
- this.startmenu.Location = new System.Drawing.Point(0, 157);
+ this.startmenu.Location = new System.Drawing.Point(0, 160);
this.startmenu.Name = "startmenu";
this.startmenu.Size = new System.Drawing.Size(174, 300);
this.startmenu.TabIndex = 3;
@@ -727,6 +730,7 @@
// DocumentsToolStripMenuItem
//
this.DocumentsToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
+ this.DocumentsToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
this.DocumentsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.windowManagerTestToolStripMenuItem,
this.downloaderTestToolStripMenuItem,
@@ -742,6 +746,8 @@
//
// windowManagerTestToolStripMenuItem
//
+ this.windowManagerTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
+ this.windowManagerTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("windowManagerTestToolStripMenuItem.BackgroundImage")));
this.windowManagerTestToolStripMenuItem.Name = "windowManagerTestToolStripMenuItem";
this.windowManagerTestToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
this.windowManagerTestToolStripMenuItem.Text = "WindowManagerTest";
@@ -749,6 +755,8 @@
//
// downloaderTestToolStripMenuItem
//
+ this.downloaderTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
+ this.downloaderTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("downloaderTestToolStripMenuItem.BackgroundImage")));
this.downloaderTestToolStripMenuItem.Name = "downloaderTestToolStripMenuItem";
this.downloaderTestToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
this.downloaderTestToolStripMenuItem.Text = "DownloaderTest";
@@ -756,6 +764,8 @@
//
// installerTestToolStripMenuItem
//
+ this.installerTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
+ this.installerTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("installerTestToolStripMenuItem.BackgroundImage")));
this.installerTestToolStripMenuItem.Name = "installerTestToolStripMenuItem";
this.installerTestToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
this.installerTestToolStripMenuItem.Text = "InstallerTest";
@@ -780,6 +790,7 @@
// ControlPanelToolStripMenuItem
//
this.ControlPanelToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
+ this.ControlPanelToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ControlPanelToolStripMenuItem.BackgroundImage")));
this.ControlPanelToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.ControlPanelToolStripMenuItem.Name = "ControlPanelToolStripMenuItem";
this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
@@ -788,6 +799,7 @@
// PrintersToolStripMenuItem
//
this.PrintersToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
+ this.PrintersToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("PrintersToolStripMenuItem.BackgroundImage")));
this.PrintersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.PrintersToolStripMenuItem.Name = "PrintersToolStripMenuItem";
this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
@@ -796,6 +808,7 @@
// TaskbarToolStripMenuItem
//
this.TaskbarToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
+ this.TaskbarToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("TaskbarToolStripMenuItem.BackgroundImage")));
this.TaskbarToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.TaskbarToolStripMenuItem.Name = "TaskbarToolStripMenuItem";
this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
@@ -804,6 +817,7 @@
// FindToolStripMenuItem
//
this.FindToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
+ this.FindToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("FindToolStripMenuItem.BackgroundImage")));
this.FindToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.FilesOrFoldersToolStripMenuItem,
this.ComputerToolStripMenuItem,
@@ -822,6 +836,7 @@
// FilesOrFoldersToolStripMenuItem
//
this.FilesOrFoldersToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
+ this.FilesOrFoldersToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("FilesOrFoldersToolStripMenuItem.BackgroundImage")));
this.FilesOrFoldersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.FilesOrFoldersToolStripMenuItem.Name = "FilesOrFoldersToolStripMenuItem";
this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
@@ -830,6 +845,7 @@
// ComputerToolStripMenuItem
//
this.ComputerToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
+ this.ComputerToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ComputerToolStripMenuItem.BackgroundImage")));
this.ComputerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.ComputerToolStripMenuItem.Name = "ComputerToolStripMenuItem";
this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
@@ -838,6 +854,7 @@
// OnTheInternetToolStripMenuItem
//
this.OnTheInternetToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
+ this.OnTheInternetToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("OnTheInternetToolStripMenuItem.BackgroundImage")));
this.OnTheInternetToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.OnTheInternetToolStripMenuItem.Name = "OnTheInternetToolStripMenuItem";
this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
@@ -846,6 +863,7 @@
// PeopleToolStripMenuItem
//
this.PeopleToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
+ this.PeopleToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("PeopleToolStripMenuItem.BackgroundImage")));
this.PeopleToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.PeopleToolStripMenuItem.Name = "PeopleToolStripMenuItem";
this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
@@ -953,14 +971,14 @@
this.desktopicons.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.desktopicons.ForeColor = System.Drawing.Color.White;
this.desktopicons.Items.AddRange(new System.Windows.Forms.ListViewItem[] {
- listViewItem1,
- listViewItem2,
- listViewItem3,
- listViewItem4,
- listViewItem5,
- listViewItem6,
- listViewItem7,
- listViewItem8});
+ listViewItem9,
+ listViewItem10,
+ listViewItem11,
+ listViewItem12,
+ listViewItem13,
+ listViewItem14,
+ listViewItem15,
+ listViewItem16});
this.desktopicons.LargeImageList = this.desktopImages;
this.desktopicons.Location = new System.Drawing.Point(0, 0);
this.desktopicons.Name = "desktopicons";
@@ -1142,7 +1160,8 @@
this.Load += new System.EventHandler(this.Desktop_Load);
this.panel1.ResumeLayout(false);
this.taskbar.ResumeLayout(false);
- this.taskbar.PerformLayout();
+ this.clockPanel.ResumeLayout(false);
+ this.clockPanel.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.startbutton)).EndInit();
this.startmenu.ResumeLayout(false);
this.startmenu.PerformLayout();
diff --git a/TimeHACK.Main/OS/Win95/Win95.resx b/TimeHACK.Main/OS/Win95/Win95.resx
index ae3e1b6..217c713 100644
--- a/TimeHACK.Main/OS/Win95/Win95.resx
+++ b/TimeHACK.Main/OS/Win95/Win95.resx
@@ -138,6 +138,13 @@
<metadata name="startmenuitems.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
+ <data name="FindToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+ 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
@@ -319,6 +326,76 @@
zQAAAABJRU5ErkJggg==
</value>
</data>
+ <data name="windowManagerTestToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+ 4AAABIQCQUtXaBsAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="downloaderTestToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+ 4AAABIQCQUtXaBsAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="installerTestToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+ 4AAABIQCQUtXaBsAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="ControlPanelToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+ 4AAABIQCQUtXaBsAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="PrintersToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+ 4AAABIQCQUtXaBsAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="TaskbarToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+ 4AAABIQCQUtXaBsAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="FilesOrFoldersToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+ 4AAABIQCQUtXaBsAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="ComputerToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+ 4AAABIQCQUtXaBsAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="OnTheInternetToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+ 4AAABIQCQUtXaBsAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="PeopleToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+ 4AAABIQCQUtXaBsAAAAASUVORK5CYII=
+</value>
+ </data>
<metadata name="clockTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>153, 17</value>
</metadata>
@@ -330,7 +407,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq
- ggAAAk1TRnQBSQFMAgEBDAEAATABAQEwAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
+ ggAAAk1TRnQBSQFMAgEBDAEAAVABAQFQAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
AwABgAMAAQEBAAEgBwABAf8A/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/AP8AXAAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/x8AAf8DAAH/
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.Designer.cs
index 04145dd..01cfdb3 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.Designer.cs
@@ -66,7 +66,7 @@
this.helpToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
- this.menuStrip1.Size = new System.Drawing.Size(401, 24);
+ this.menuStrip1.Size = new System.Drawing.Size(619, 24);
this.menuStrip1.TabIndex = 0;
this.menuStrip1.Text = "menuStrip1";
//
@@ -324,7 +324,7 @@
this.mainText.Multiline = true;
this.mainText.Name = "mainText";
this.mainText.ScrollBars = System.Windows.Forms.ScrollBars.Both;
- this.mainText.Size = new System.Drawing.Size(401, 210);
+ this.mainText.Size = new System.Drawing.Size(619, 341);
this.mainText.TabIndex = 1;
this.mainText.WordWrap = false;
//
@@ -335,7 +335,7 @@
this.Controls.Add(this.mainText);
this.Controls.Add(this.menuStrip1);
this.Name = "WinClassicNotepad";
- this.Size = new System.Drawing.Size(401, 234);
+ this.Size = new System.Drawing.Size(619, 365);
this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout();
this.ResumeLayout(false);
diff --git a/TimeHACK.Main/OS/Win95/Win95TaskBarItem.Designer.cs b/TimeHACK.Main/OS/Win95/Win95TaskBarItem.Designer.cs
index 71ccfde..c0977f2 100644
--- a/TimeHACK.Main/OS/Win95/Win95TaskBarItem.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95TaskBarItem.Designer.cs
@@ -28,44 +28,60 @@
/// </summary>
private void InitializeComponent()
{
- this.progPic = new System.Windows.Forms.PictureBox();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Win95TaskBarItem));
this.progName = new System.Windows.Forms.Label();
+ this.progPic = new System.Windows.Forms.PictureBox();
+ this.panel1 = new System.Windows.Forms.Panel();
((System.ComponentModel.ISupportInitialize)(this.progPic)).BeginInit();
+ this.panel1.SuspendLayout();
this.SuspendLayout();
//
- // progPic
- //
- this.progPic.Location = new System.Drawing.Point(3, 3);
- this.progPic.Name = "progPic";
- this.progPic.Size = new System.Drawing.Size(28, 24);
- this.progPic.TabIndex = 0;
- this.progPic.TabStop = false;
- this.progPic.Click += new System.EventHandler(this.Win95TaskBarItem_Click);
- //
// progName
//
this.progName.AutoSize = true;
+ this.progName.BackColor = System.Drawing.Color.Transparent;
this.progName.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.progName.Location = new System.Drawing.Point(37, 3);
+ this.progName.Location = new System.Drawing.Point(18, 2);
this.progName.Name = "progName";
this.progName.Size = new System.Drawing.Size(60, 24);
this.progName.TabIndex = 1;
this.progName.Text = "label1";
this.progName.Click += new System.EventHandler(this.Win95TaskBarItem_Click);
//
+ // progPic
+ //
+ this.progPic.BackColor = System.Drawing.Color.Transparent;
+ this.progPic.Location = new System.Drawing.Point(3, 3);
+ this.progPic.Name = "progPic";
+ this.progPic.Size = new System.Drawing.Size(16, 16);
+ this.progPic.TabIndex = 0;
+ this.progPic.TabStop = false;
+ this.progPic.Click += new System.EventHandler(this.Win95TaskBarItem_Click);
+ //
+ // panel1
+ //
+ this.panel1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("panel1.BackgroundImage")));
+ this.panel1.Controls.Add(this.progName);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panel1.Location = new System.Drawing.Point(0, 0);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(160, 22);
+ this.panel1.TabIndex = 2;
+ //
// Win95TaskBarItem
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Controls.Add(this.progName);
this.Controls.Add(this.progPic);
+ this.Controls.Add(this.panel1);
this.Name = "Win95TaskBarItem";
- this.Size = new System.Drawing.Size(193, 30);
+ this.Size = new System.Drawing.Size(160, 22);
this.Load += new System.EventHandler(this.Win95TaskBarItem_Load);
this.Click += new System.EventHandler(this.Win95TaskBarItem_Click);
((System.ComponentModel.ISupportInitialize)(this.progPic)).EndInit();
+ this.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
this.ResumeLayout(false);
- this.PerformLayout();
}
@@ -73,5 +89,6 @@
private System.Windows.Forms.PictureBox progPic;
private System.Windows.Forms.Label progName;
+ private System.Windows.Forms.Panel panel1;
}
}
diff --git a/TimeHACK.Main/OS/Win95/Win95TaskBarItem.cs b/TimeHACK.Main/OS/Win95/Win95TaskBarItem.cs
index b193e38..b463a83 100644
--- a/TimeHACK.Main/OS/Win95/Win95TaskBarItem.cs
+++ b/TimeHACK.Main/OS/Win95/Win95TaskBarItem.cs
@@ -27,8 +27,7 @@ namespace TimeHACK.Engine.Template.Taskbars
progName.Text = (string)this.Tag;
progPic.Image = this.BackgroundImage;
ApplicationID = (TaskBarController.AvalibleApplicationID - 1).ToString();
- this.BackgroundImage = null;
- this.Width = (progName.Left + progName.Width);
+ this.BackgroundImage = null;
}
private void Win95TaskBarItem_Click(object sender, EventArgs e)
diff --git a/TimeHACK.Main/OS/Win95/Win95TaskBarItem.resx b/TimeHACK.Main/OS/Win95/Win95TaskBarItem.resx
index 1af7de1..bdcd158 100644
--- a/TimeHACK.Main/OS/Win95/Win95TaskBarItem.resx
+++ b/TimeHACK.Main/OS/Win95/Win95TaskBarItem.resx
@@ -117,4 +117,13 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="panel1.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAAKAAAAAWCAIAAADIPgASAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAABXSURBVGhD7dGx
+ EcAwDAMxja7RslniVN7hD2jI/uela44zD0W7K3CZwHECxwkcJ3CcwHECxwkcJ3CcwHECxwkcJ3CcwHEC
+ xwkcJ3CcwHE38Hkk/YEpm/kAYtNZ26573kYAAAAASUVORK5CYII=
+</value>
+ </data>
</root> \ No newline at end of file