Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'

This commit is contained in:
JayXKanz666 2017-07-13 00:30:47 +02:00
commit 2fa16a6305
11 changed files with 189 additions and 15 deletions

View file

@ -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;
}
}

View file

@ -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");
}
}
}

View file

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

View file

@ -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 @@ public static void GoToPage(string url)
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 @@ public static void GoToPage(string url)
break;
}
addressbar.Text = url;
uc.Dock = DockStyle.Fill;
browsingArea.Controls.Clear();
browsingArea.Controls.Add(uc);
@ -42,7 +48,7 @@ public static void GoToPage(string url)
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)

View file

@ -1979,13 +1979,13 @@ private void InitializeComponent()
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";

View file

@ -274,6 +274,36 @@ internal static System.Drawing.Bitmap sliversilver {
}
}
/// <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>

View file

@ -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>

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 343 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 405 B

View file

@ -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" />