diff options
Diffstat (limited to 'TimeHACK.Main/OS/Win95/Win95.Designer.cs')
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95.Designer.cs | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs index ab4e78f..d9cca0e 100644 --- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs @@ -30,6 +30,16 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Windows95)); +<<<<<<< HEAD + 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.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); @@ -38,6 +48,7 @@ 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); +>>>>>>> refs/remotes/TimeHACKDevs/master this.panel1 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); this.taskbar = new System.Windows.Forms.Panel(); @@ -241,7 +252,7 @@ this.startmenuitems.Name = "startmenuitems"; this.startmenuitems.Padding = new System.Windows.Forms.Padding(6, 2, 0, 0); this.startmenuitems.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; - this.startmenuitems.Size = new System.Drawing.Size(141, 292); + this.startmenuitems.Size = new System.Drawing.Size(141, 311); this.startmenuitems.TabIndex = 0; this.startmenuitems.Text = "StartMenu"; // @@ -442,6 +453,7 @@ this.AddressBookToolStripMenuItem.Name = "AddressBookToolStripMenuItem"; this.AddressBookToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.AddressBookToolStripMenuItem.Text = "Address Book"; + this.AddressBookToolStripMenuItem.Click += new System.EventHandler(this.AddressBookToolStripMenuItem_Click); // // CalculatorToolStripMenuItem // |