diff options
| author | JayXKanz666 <[email protected]> | 2017-07-13 00:30:47 +0200 |
|---|---|---|
| committer | JayXKanz666 <[email protected]> | 2017-07-13 00:30:47 +0200 |
| commit | 2fa16a63050251f28866567bd07b1a14575a5ce3 (patch) | |
| tree | 0c830f514dd8f8b905df49482ac4ee963c7dcbaf | |
| parent | d45804aec7e3cb313b4884b9de198542c376ed1f (diff) | |
| parent | a52cfa8adcf24e9698adfbc243cd7e6a45793c1b (diff) | |
| download | histacom2-2fa16a63050251f28866567bd07b1a14575a5ce3.tar.gz histacom2-2fa16a63050251f28866567bd07b1a14575a5ce3.tar.bz2 histacom2-2fa16a63050251f28866567bd07b1a14575a5ce3.zip | |
Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4Start.Designer.cs | 92 | ||||
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4Start.cs | 25 | ||||
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95Apps/TempIE4.Designer.cs | 22 | ||||
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95Apps/TempIE4.cs | 8 | ||||
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.Designer.cs | 4 | ||||
| -rw-r--r-- | TimeHACK.Main/Properties/Resources.Designer.cs | 30 | ||||
| -rw-r--r-- | TimeHACK.Main/Properties/Resources.resx | 11 | ||||
| -rw-r--r-- | TimeHACK.Main/Resources/IE4/start.png | bin | 0 -> 28819 bytes | |||
| -rw-r--r-- | TimeHACK.Main/Resources/IE4/start_googlink.png | bin | 0 -> 343 bytes | |||
| -rw-r--r-- | TimeHACK.Main/Resources/IE4/start_padamslink.png | bin | 0 -> 405 bytes | |||
| -rw-r--r-- | TimeHACK.Main/TimeHACK.Main.csproj | 12 |
11 files changed, 189 insertions, 15 deletions
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4Start.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4Start.Designer.cs new file mode 100644 index 0000000..2ffa277 --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4Start.Designer.cs @@ -0,0 +1,92 @@ +namespace TimeHACK.OS.Win95.Win95Apps.IE4Sites +{ + partial class IE4Start + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.linkLabel1 = new System.Windows.Forms.LinkLabel(); + this.linkLabel2 = new System.Windows.Forms.LinkLabel(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.SuspendLayout(); + // + // pictureBox1 + // + this.pictureBox1.Image = global::TimeHACK.Properties.Resources.start; + this.pictureBox1.Location = new System.Drawing.Point(0, 0); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(640, 480); + this.pictureBox1.TabIndex = 0; + this.pictureBox1.TabStop = false; + // + // linkLabel1 + // + this.linkLabel1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.linkLabel1.Image = global::TimeHACK.Properties.Resources.start_googlink; + this.linkLabel1.LinkColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(65)))), ((int)(((byte)(145))))); + this.linkLabel1.Location = new System.Drawing.Point(10, 269); + this.linkLabel1.Name = "linkLabel1"; + this.linkLabel1.Size = new System.Drawing.Size(95, 14); + this.linkLabel1.TabIndex = 1; + this.linkLabel1.TabStop = true; + this.linkLabel1.Text = " "; + this.linkLabel1.Click += new System.EventHandler(this.linkLabel1_Click); + // + // linkLabel2 + // + this.linkLabel2.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.linkLabel2.Image = global::TimeHACK.Properties.Resources.start_padamslink; + this.linkLabel2.LinkColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(65)))), ((int)(((byte)(145))))); + this.linkLabel2.Location = new System.Drawing.Point(10, 283); + this.linkLabel2.Name = "linkLabel2"; + this.linkLabel2.Size = new System.Drawing.Size(116, 14); + this.linkLabel2.TabIndex = 2; + this.linkLabel2.TabStop = true; + this.linkLabel2.Text = " "; + // + // IE4Start + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.White; + this.Controls.Add(this.linkLabel2); + this.Controls.Add(this.linkLabel1); + this.Controls.Add(this.pictureBox1); + this.Name = "IE4Start"; + this.Size = new System.Drawing.Size(959, 483); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.LinkLabel linkLabel1; + private System.Windows.Forms.LinkLabel linkLabel2; + } +} diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4Start.cs b/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4Start.cs new file mode 100644 index 0000000..ee21b0f --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4Start.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace TimeHACK.OS.Win95.Win95Apps.IE4Sites +{ + public partial class IE4Start : UserControl + { + public IE4Start() + { + InitializeComponent(); + } + + private void linkLabel1_Click(object sender, EventArgs e) + { + TempIE4.GoToPage("www.google.com"); + } + } +} diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/TempIE4.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/TempIE4.Designer.cs index 93fdd53..30c1dfb 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/TempIE4.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/TempIE4.Designer.cs @@ -30,7 +30,7 @@ { this.Panel14 = new System.Windows.Forms.Panel(); this.GoButton = new System.Windows.Forms.Button(); - this.addressbar = new System.Windows.Forms.ComboBox(); + this._addressbar = new System.Windows.Forms.ComboBox(); this.Label1 = new System.Windows.Forms.Label(); this.Button30 = new System.Windows.Forms.Button(); this.Button29 = new System.Windows.Forms.Button(); @@ -150,7 +150,7 @@ // this.Panel14.BackColor = System.Drawing.Color.Silver; this.Panel14.Controls.Add(this.GoButton); - this.Panel14.Controls.Add(this.addressbar); + this.Panel14.Controls.Add(this._addressbar); this.Panel14.Controls.Add(this.Label1); this.Panel14.Dock = System.Windows.Forms.DockStyle.Top; this.Panel14.Location = new System.Drawing.Point(0, 73); @@ -171,16 +171,16 @@ this.GoButton.UseVisualStyleBackColor = true; this.GoButton.Click += new System.EventHandler(this.GoButton_Click); // - // addressbar + // _addressbar // - this.addressbar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this._addressbar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.addressbar.FormattingEnabled = true; - this.addressbar.Location = new System.Drawing.Point(58, 9); - this.addressbar.Name = "addressbar"; - this.addressbar.Size = new System.Drawing.Size(812, 21); - this.addressbar.TabIndex = 1; - this.addressbar.Text = "www.microsoft.com/internetexplorer4/welcome"; + this._addressbar.FormattingEnabled = true; + this._addressbar.Location = new System.Drawing.Point(58, 9); + this._addressbar.Name = "_addressbar"; + this._addressbar.Size = new System.Drawing.Size(812, 21); + this._addressbar.TabIndex = 1; + this._addressbar.Text = "www.microsoft.com/internetexplorer4/welcome"; // // Label1 // @@ -1176,7 +1176,7 @@ internal System.Windows.Forms.Panel Panel14; internal System.Windows.Forms.Button GoButton; - internal System.Windows.Forms.ComboBox addressbar; + internal System.Windows.Forms.ComboBox _addressbar; internal System.Windows.Forms.Label Label1; internal System.Windows.Forms.Button Button30; internal System.Windows.Forms.Button Button29; diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/TempIE4.cs b/TimeHACK.Main/OS/Win95/Win95Apps/TempIE4.cs index 8f5de0f..637201d 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/TempIE4.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/TempIE4.cs @@ -14,11 +14,13 @@ namespace TimeHACK.OS.Win95.Win95Apps public partial class TempIE4 : UserControl { public static Panel browsingArea = new Panel(); + public static ComboBox addressbar = new ComboBox(); public TempIE4() { InitializeComponent(); browsingArea = _browsingArea; + addressbar = _addressbar; } public static void GoToPage(string url) @@ -27,6 +29,9 @@ namespace TimeHACK.OS.Win95.Win95Apps switch (url) { + case "www.microsoft.com/windows/ie/default.htm": + uc = new IE4Start(); + break; case "www.google.com": uc = new GoogleHome(); break; @@ -35,6 +40,7 @@ namespace TimeHACK.OS.Win95.Win95Apps break; } + addressbar.Text = url; uc.Dock = DockStyle.Fill; browsingArea.Controls.Clear(); browsingArea.Controls.Add(uc); @@ -42,7 +48,7 @@ namespace TimeHACK.OS.Win95.Win95Apps private void TempIE4_Load(object sender, EventArgs e) { - GoToPage("www.google.com"); + GoToPage("www.microsoft.com/windows/ie/default.htm"); } private void GoButton_Click(object sender, EventArgs e) diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.Designer.cs index d2cea2e..3184160 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.Designer.cs @@ -1979,13 +1979,13 @@ this.GoButton.UseVisualStyleBackColor = true; this.GoButton.Click += new System.EventHandler(GoButton_Click); // - // addressbar + // _addressbar // this.addressbar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.addressbar.FormattingEnabled = true; this.addressbar.Location = new System.Drawing.Point(58, 9); - this.addressbar.Name = "addressbar"; + this.addressbar.Name = "_addressbar"; this.addressbar.Size = new System.Drawing.Size(812, 21); this.addressbar.TabIndex = 1; this.addressbar.Text = "www.microsoft.com/internetexplorer4/welcome"; diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs index 95327fa..803ec4e 100644 --- a/TimeHACK.Main/Properties/Resources.Designer.cs +++ b/TimeHACK.Main/Properties/Resources.Designer.cs @@ -275,6 +275,36 @@ namespace TimeHACK.Properties { } /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap start { + get { + object obj = ResourceManager.GetObject("start", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap start_googlink { + get { + object obj = ResourceManager.GetObject("start_googlink", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap start_padamslink { + get { + object obj = ResourceManager.GetObject("start_padamslink", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. /// </summary> internal static System.IO.UnmanagedMemoryStream std_beep { diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx index 09baced..bf5c1c6 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -522,7 +522,7 @@ <data name="Win95IconIE4" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ + wAAADsABataJCQAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu QmCC @@ -594,4 +594,13 @@ <data name="WinClassicInstallPic" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\WinClassic\WinClassicInstallPic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="start" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\IE4\start.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="start_googlink" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\IE4\start_googlink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="start_padamslink" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\IE4\start_padamslink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> </root>
\ No newline at end of file diff --git a/TimeHACK.Main/Resources/IE4/start.png b/TimeHACK.Main/Resources/IE4/start.png Binary files differnew file mode 100644 index 0000000..225659c --- /dev/null +++ b/TimeHACK.Main/Resources/IE4/start.png diff --git a/TimeHACK.Main/Resources/IE4/start_googlink.png b/TimeHACK.Main/Resources/IE4/start_googlink.png Binary files differnew file mode 100644 index 0000000..c5fbdf5 --- /dev/null +++ b/TimeHACK.Main/Resources/IE4/start_googlink.png diff --git a/TimeHACK.Main/Resources/IE4/start_padamslink.png b/TimeHACK.Main/Resources/IE4/start_padamslink.png Binary files differnew file mode 100644 index 0000000..d28a61f --- /dev/null +++ b/TimeHACK.Main/Resources/IE4/start_padamslink.png diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index f31f9f7..dca45e5 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -145,6 +145,12 @@ <Compile Include="OS\Win95\Win95Apps\IE4Sites\GooglePrototype.Designer.cs"> <DependentUpon>GooglePrototype.cs</DependentUpon> </Compile> + <Compile Include="OS\Win95\Win95Apps\IE4Sites\IE4Start.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="OS\Win95\Win95Apps\IE4Sites\IE4Start.Designer.cs"> + <DependentUpon>IE4Start.cs</DependentUpon> + </Compile> <Compile Include="OS\Win95\Win95Apps\Story\Hack1.cs" /> <Compile Include="OS\Win95\Win95Apps\Story\Hack2.cs" /> <Compile Include="OS\Win95\Win95Apps\TempIE4.cs"> @@ -328,6 +334,9 @@ <EmbeddedResource Include="OS\Win95\Win95Apps\IE4Sites\GooglePrototype.resx"> <DependentUpon>GooglePrototype.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="OS\Win95\Win95Apps\IE4Sites\IE4Start.resx"> + <DependentUpon>IE4Start.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="OS\Win95\Win95Apps\TempIE4.resx"> <DependentUpon>TempIE4.cs</DependentUpon> </EmbeddedResource> @@ -457,6 +466,9 @@ <None Include="Resources\wmsui32_1001.ico_16x16.png" /> <None Include="Resources\shell32_21.ico_16x16.png" /> <None Include="Resources\LauncherSideBar.png" /> + <None Include="Resources\IE4\start.png" /> + <None Include="Resources\IE4\start_googlink.png" /> + <None Include="Resources\IE4\start_padamslink.png" /> <Content Include="Resources\modem_dial.wav" /> <None Include="Resources\MS-DOS-logo-1.png" /> <Content Include="Resources\std_beep.wav" /> |
