From a52cfa8adcf24e9698adfbc243cd7e6a45793c1b Mon Sep 17 00:00:00 2001 From: lempamo Date: Wed, 12 Jul 2017 17:23:10 -0500 Subject: Added TempIE4's start page --- TimeHACK.Main/Properties/Resources.Designer.cs | 30 ++++++++++++++++++++++++++ TimeHACK.Main/Properties/Resources.resx | 11 +++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) (limited to 'TimeHACK.Main/Properties') 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 @@ -274,6 +274,36 @@ namespace TimeHACK.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap start { + get { + object obj = ResourceManager.GetObject("start", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap start_googlink { + get { + object obj = ResourceManager.GetObject("start_googlink", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap start_padamslink { + get { + object obj = ResourceManager.GetObject("start_padamslink", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. /// 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 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ + wAAADsABataJCQAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu QmCC @@ -594,4 +594,13 @@ ..\Resources\WinClassic\WinClassicInstallPic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\IE4\start.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\IE4\start_googlink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\IE4\start_padamslink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file -- cgit v1.2.3 From a48b40e45536ee5c58d4d6a23bde0a9fc2b8ae3d Mon Sep 17 00:00:00 2001 From: lempamo Date: Thu, 13 Jul 2017 12:07:52 -0500 Subject: added invalid page catcher and resx's --- .../Win95/Win95Apps/IE4Sites/IE4NoPage.Designer.cs | 61 ++++++++++ .../OS/Win95/Win95Apps/IE4Sites/IE4NoPage.cs | 20 ++++ .../OS/Win95/Win95Apps/IE4Sites/IE4NoPage.resx | 123 +++++++++++++++++++++ .../OS/Win95/Win95Apps/IE4Sites/IE4Start.resx | 120 ++++++++++++++++++++ TimeHACK.Main/OS/Win95/Win95Apps/TempIE4.cs | 3 + TimeHACK.Main/Properties/Resources.Designer.cs | 10 ++ TimeHACK.Main/Properties/Resources.resx | 5 +- TimeHACK.Main/Resources/IE4/nopage.bmp | Bin 0 -> 219642 bytes TimeHACK.Main/TimeHACK.Main.csproj | 11 ++ 9 files changed, 352 insertions(+), 1 deletion(-) create mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4NoPage.Designer.cs create mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4NoPage.cs create mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4NoPage.resx create mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4Start.resx create mode 100644 TimeHACK.Main/Resources/IE4/nopage.bmp (limited to 'TimeHACK.Main/Properties') diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4NoPage.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4NoPage.Designer.cs new file mode 100644 index 0000000..dd931aa --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4NoPage.Designer.cs @@ -0,0 +1,61 @@ +namespace TimeHACK.OS.Win95.Win95Apps.IE4Sites +{ + partial class IE4NoPage + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.SuspendLayout(); + // + // pictureBox1 + // + this.pictureBox1.Image = global::TimeHACK.Properties.Resources.nopage; + this.pictureBox1.Location = new System.Drawing.Point(0, 0); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(406, 538); + this.pictureBox1.TabIndex = 0; + this.pictureBox1.TabStop = false; + // + // IE4NoPage + // + 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.pictureBox1); + this.Name = "IE4NoPage"; + this.Size = new System.Drawing.Size(959, 541); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.PictureBox pictureBox1; + } +} diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4NoPage.cs b/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4NoPage.cs new file mode 100644 index 0000000..894aaf5 --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4NoPage.cs @@ -0,0 +1,20 @@ +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 IE4NoPage : UserControl + { + public IE4NoPage() + { + InitializeComponent(); + } + } +} diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4NoPage.resx b/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4NoPage.resx new file mode 100644 index 0000000..a167a19 --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4NoPage.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + testy + + \ No newline at end of file diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4Start.resx b/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4Start.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4Start.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/TempIE4.cs b/TimeHACK.Main/OS/Win95/Win95Apps/TempIE4.cs index 637201d..568749f 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/TempIE4.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/TempIE4.cs @@ -38,6 +38,9 @@ namespace TimeHACK.OS.Win95.Win95Apps case "www.google.stanford.edu": uc = new GooglePrototype(); break; + default: + uc = new IE4NoPage(); + break; } addressbar.Text = url; diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs index 803ec4e..c721c0a 100644 --- a/TimeHACK.Main/Properties/Resources.Designer.cs +++ b/TimeHACK.Main/Properties/Resources.Designer.cs @@ -264,6 +264,16 @@ namespace TimeHACK.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap nopage { + get { + object obj = ResourceManager.GetObject("nopage", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx index bf5c1c6..1007fd9 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -522,7 +522,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ + vwAADr8BOAVTJAAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu QmCC @@ -603,4 +603,7 @@ ..\Resources\IE4\start_padamslink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\IE4\nopage.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/TimeHACK.Main/Resources/IE4/nopage.bmp b/TimeHACK.Main/Resources/IE4/nopage.bmp new file mode 100644 index 0000000..ebd05c8 Binary files /dev/null and b/TimeHACK.Main/Resources/IE4/nopage.bmp differ diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index dca45e5..052cbe8 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -145,6 +145,12 @@ GooglePrototype.cs + + UserControl + + + IE4NoPage.cs + UserControl @@ -334,6 +340,10 @@ GooglePrototype.cs + + IE4NoPage.cs + Designer + IE4Start.cs @@ -462,6 +472,7 @@ + -- cgit v1.2.3 From 7a0939095bb8a68e9b79e5d34284d08e13238ac3 Mon Sep 17 00:00:00 2001 From: JayXKanz666 Date: Thu, 13 Jul 2017 22:54:30 +0200 Subject: Added features to IE -Added icons -You can now press enter instead of pressing 'Go' -Made it look more like the real IE4 --- .../OS/Win95/Win95Apps/TempIE4.Designer.cs | 280 +++++++++++++++++---- TimeHACK.Main/OS/Win95/Win95Apps/TempIE4.cs | 16 +- TimeHACK.Main/Properties/Resources.Designer.cs | 150 +++++++++++ TimeHACK.Main/Properties/Resources.resx | 45 ++++ TimeHACK.Main/Resources/ie4_back.png | Bin 0 -> 554 bytes TimeHACK.Main/Resources/ie4_favorites.png | Bin 0 -> 672 bytes TimeHACK.Main/Resources/ie4_forward.png | Bin 0 -> 574 bytes TimeHACK.Main/Resources/ie4_go.png | Bin 0 -> 628 bytes TimeHACK.Main/Resources/ie4_history.png | Bin 0 -> 883 bytes TimeHACK.Main/Resources/ie4_home.png | Bin 0 -> 720 bytes TimeHACK.Main/Resources/ie4_hsplitter.png | Bin 0 -> 437 bytes TimeHACK.Main/Resources/ie4_hsplitter1.png | Bin 0 -> 445 bytes TimeHACK.Main/Resources/ie4_hsplitter2.png | Bin 0 -> 448 bytes TimeHACK.Main/Resources/ie4_mail.png | Bin 0 -> 879 bytes TimeHACK.Main/Resources/ie4_print.png | Bin 0 -> 686 bytes TimeHACK.Main/Resources/ie4_refresh.png | Bin 0 -> 676 bytes TimeHACK.Main/Resources/ie4_search.png | Bin 0 -> 913 bytes TimeHACK.Main/Resources/ie4_stop.png | Bin 0 -> 687 bytes TimeHACK.Main/Resources/ie4_vsplitter.png | Bin 0 -> 425 bytes TimeHACK.Main/TimeHACK.Main.csproj | 15 ++ 20 files changed, 451 insertions(+), 55 deletions(-) create mode 100644 TimeHACK.Main/Resources/ie4_back.png create mode 100644 TimeHACK.Main/Resources/ie4_favorites.png create mode 100644 TimeHACK.Main/Resources/ie4_forward.png create mode 100644 TimeHACK.Main/Resources/ie4_go.png create mode 100644 TimeHACK.Main/Resources/ie4_history.png create mode 100644 TimeHACK.Main/Resources/ie4_home.png create mode 100644 TimeHACK.Main/Resources/ie4_hsplitter.png create mode 100644 TimeHACK.Main/Resources/ie4_hsplitter1.png create mode 100644 TimeHACK.Main/Resources/ie4_hsplitter2.png create mode 100644 TimeHACK.Main/Resources/ie4_mail.png create mode 100644 TimeHACK.Main/Resources/ie4_print.png create mode 100644 TimeHACK.Main/Resources/ie4_refresh.png create mode 100644 TimeHACK.Main/Resources/ie4_search.png create mode 100644 TimeHACK.Main/Resources/ie4_stop.png create mode 100644 TimeHACK.Main/Resources/ie4_vsplitter.png (limited to 'TimeHACK.Main/Properties') diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/TempIE4.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/TempIE4.Designer.cs index 30c1dfb..521d623 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/TempIE4.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/TempIE4.Designer.cs @@ -29,12 +29,12 @@ private void InitializeComponent() { this.Panel14 = new System.Windows.Forms.Panel(); + this.pictureBox3 = new System.Windows.Forms.PictureBox(); this.GoButton = new System.Windows.Forms.Button(); 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(); - this.Button28 = new System.Windows.Forms.Button(); this.Button27 = new System.Windows.Forms.Button(); this.Button7 = new System.Windows.Forms.Button(); this.Button6 = new System.Windows.Forms.Button(); @@ -44,6 +44,11 @@ this.ForwardButton = new System.Windows.Forms.Button(); this.BackButton = new System.Windows.Forms.Button(); this.Panel1 = new System.Windows.Forms.Panel(); + this.pictureBox8 = new System.Windows.Forms.PictureBox(); + this.pictureBox6 = new System.Windows.Forms.PictureBox(); + this.pictureBox5 = new System.Windows.Forms.PictureBox(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.MenuStrip3 = new System.Windows.Forms.MenuStrip(); this.ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.ToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); @@ -141,31 +146,62 @@ this.ToolStripMenuItem94 = new System.Windows.Forms.ToolStripMenuItem(); this.ToolStripMenuItem95 = new System.Windows.Forms.ToolStripMenuItem(); this._browsingArea = new System.Windows.Forms.Panel(); + this.pictureBox4 = new System.Windows.Forms.PictureBox(); + this.pictureBox7 = new System.Windows.Forms.PictureBox(); + this.pictureBox9 = new System.Windows.Forms.PictureBox(); + this.label2 = new System.Windows.Forms.Label(); + this.pictureBox10 = new System.Windows.Forms.PictureBox(); this.Panel14.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); this.Panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox8)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.MenuStrip3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox9)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox10)).BeginInit(); this.SuspendLayout(); // // Panel14 // this.Panel14.BackColor = System.Drawing.Color.Silver; + this.Panel14.Controls.Add(this.pictureBox10); + this.Panel14.Controls.Add(this.label2); + this.Panel14.Controls.Add(this.pictureBox9); + this.Panel14.Controls.Add(this.pictureBox3); this.Panel14.Controls.Add(this.GoButton); 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); + this.Panel14.Location = new System.Drawing.Point(0, 71); this.Panel14.Name = "Panel14"; - this.Panel14.Size = new System.Drawing.Size(959, 38); + this.Panel14.Size = new System.Drawing.Size(959, 31); this.Panel14.TabIndex = 16; // + // pictureBox3 + // + this.pictureBox3.BackgroundImage = global::TimeHACK.Properties.Resources.ie4_vsplitter2; + this.pictureBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pictureBox3.Location = new System.Drawing.Point(2, 3); + this.pictureBox3.Name = "pictureBox3"; + this.pictureBox3.Size = new System.Drawing.Size(3, 21); + this.pictureBox3.TabIndex = 2; + this.pictureBox3.TabStop = false; + // // GoButton // this.GoButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.GoButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.GoButton.Location = new System.Drawing.Point(898, 5); + this.GoButton.Image = global::TimeHACK.Properties.Resources.ie4_go; + this.GoButton.ImageAlign = System.Drawing.ContentAlignment.TopCenter; + this.GoButton.Location = new System.Drawing.Point(872, 2); this.GoButton.Name = "GoButton"; - this.GoButton.Size = new System.Drawing.Size(55, 28); - this.GoButton.TabIndex = 2; + this.GoButton.Size = new System.Drawing.Size(44, 23); + this.GoButton.TabIndex = 0; this.GoButton.Text = "Go"; this.GoButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; this.GoButton.UseVisualStyleBackColor = true; @@ -176,30 +212,33 @@ 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.Location = new System.Drawing.Point(58, 2); 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.KeyDown += new System.Windows.Forms.KeyEventHandler(this._addressbar_KeyDown); // // Label1 // this.Label1.AutoSize = true; - this.Label1.Location = new System.Drawing.Point(4, 13); + this.Label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.Label1.Location = new System.Drawing.Point(12, 7); this.Label1.Name = "Label1"; - this.Label1.Size = new System.Drawing.Size(48, 13); + this.Label1.Size = new System.Drawing.Size(45, 13); this.Label1.TabIndex = 0; - this.Label1.Text = "Address:"; + this.Label1.Text = "Address"; // // Button30 // this.Button30.Dock = System.Windows.Forms.DockStyle.Left; this.Button30.FlatAppearance.BorderSize = 0; this.Button30.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button30.ImageAlign = System.Drawing.ContentAlignment.TopCenter; - this.Button30.Location = new System.Drawing.Point(750, 0); + this.Button30.Image = global::TimeHACK.Properties.Resources.ie4_print; + this.Button30.ImageAlign = System.Drawing.ContentAlignment.BottomCenter; + this.Button30.Location = new System.Drawing.Point(591, 0); this.Button30.Name = "Button30"; - this.Button30.Size = new System.Drawing.Size(75, 47); + this.Button30.Size = new System.Drawing.Size(49, 47); this.Button30.TabIndex = 10; this.Button30.Text = "Print"; this.Button30.TextAlign = System.Drawing.ContentAlignment.BottomCenter; @@ -211,42 +250,29 @@ this.Button29.Dock = System.Windows.Forms.DockStyle.Left; this.Button29.FlatAppearance.BorderSize = 0; this.Button29.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button29.ImageAlign = System.Drawing.ContentAlignment.TopCenter; - this.Button29.Location = new System.Drawing.Point(675, 0); + this.Button29.Image = global::TimeHACK.Properties.Resources.ie4_mail; + this.Button29.ImageAlign = System.Drawing.ContentAlignment.BottomCenter; + this.Button29.Location = new System.Drawing.Point(528, 0); this.Button29.Name = "Button29"; - this.Button29.Size = new System.Drawing.Size(75, 47); + this.Button29.Size = new System.Drawing.Size(63, 47); this.Button29.TabIndex = 9; this.Button29.Text = "Mail"; this.Button29.TextAlign = System.Drawing.ContentAlignment.BottomCenter; this.Button29.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.Button29.UseVisualStyleBackColor = true; // - // Button28 - // - this.Button28.Dock = System.Windows.Forms.DockStyle.Left; - this.Button28.FlatAppearance.BorderSize = 0; - this.Button28.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button28.ImageAlign = System.Drawing.ContentAlignment.TopCenter; - this.Button28.Location = new System.Drawing.Point(600, 0); - this.Button28.Name = "Button28"; - this.Button28.Size = new System.Drawing.Size(75, 47); - this.Button28.TabIndex = 8; - this.Button28.Text = "Full Screen"; - this.Button28.TextAlign = System.Drawing.ContentAlignment.BottomCenter; - this.Button28.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; - this.Button28.UseVisualStyleBackColor = true; - // // Button27 // this.Button27.Dock = System.Windows.Forms.DockStyle.Left; this.Button27.FlatAppearance.BorderSize = 0; this.Button27.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button27.ImageAlign = System.Drawing.ContentAlignment.TopCenter; - this.Button27.Location = new System.Drawing.Point(525, 0); + this.Button27.Image = global::TimeHACK.Properties.Resources.ie4_history; + this.Button27.ImageAlign = System.Drawing.ContentAlignment.BottomCenter; + this.Button27.Location = new System.Drawing.Point(465, 0); this.Button27.Name = "Button27"; - this.Button27.Size = new System.Drawing.Size(75, 47); + this.Button27.Size = new System.Drawing.Size(63, 47); this.Button27.TabIndex = 7; - this.Button27.Text = "Channels"; + this.Button27.Text = "History"; this.Button27.TextAlign = System.Drawing.ContentAlignment.BottomCenter; this.Button27.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.Button27.UseVisualStyleBackColor = true; @@ -256,11 +282,14 @@ this.Button7.Dock = System.Windows.Forms.DockStyle.Left; this.Button7.FlatAppearance.BorderSize = 0; this.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button7.Location = new System.Drawing.Point(450, 0); + this.Button7.Image = global::TimeHACK.Properties.Resources.ie4_favorites; + this.Button7.ImageAlign = System.Drawing.ContentAlignment.BottomCenter; + this.Button7.Location = new System.Drawing.Point(402, 0); this.Button7.Name = "Button7"; - this.Button7.Size = new System.Drawing.Size(75, 47); + this.Button7.Size = new System.Drawing.Size(63, 47); this.Button7.TabIndex = 6; - this.Button7.Text = "History"; + this.Button7.Text = "Favorites"; + this.Button7.TextAlign = System.Drawing.ContentAlignment.BottomCenter; this.Button7.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.Button7.UseVisualStyleBackColor = true; // @@ -269,11 +298,14 @@ this.Button6.Dock = System.Windows.Forms.DockStyle.Left; this.Button6.FlatAppearance.BorderSize = 0; this.Button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button6.Location = new System.Drawing.Point(375, 0); + this.Button6.Image = global::TimeHACK.Properties.Resources.ie4_search; + this.Button6.ImageAlign = System.Drawing.ContentAlignment.BottomCenter; + this.Button6.Location = new System.Drawing.Point(339, 0); this.Button6.Name = "Button6"; - this.Button6.Size = new System.Drawing.Size(75, 47); + this.Button6.Size = new System.Drawing.Size(63, 47); this.Button6.TabIndex = 5; - this.Button6.Text = "Favorites"; + this.Button6.Text = "Search"; + this.Button6.TextAlign = System.Drawing.ContentAlignment.BottomCenter; this.Button6.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.Button6.UseVisualStyleBackColor = true; // @@ -282,11 +314,14 @@ this.HomeButton.Dock = System.Windows.Forms.DockStyle.Left; this.HomeButton.FlatAppearance.BorderSize = 0; this.HomeButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.HomeButton.Location = new System.Drawing.Point(300, 0); + this.HomeButton.Image = global::TimeHACK.Properties.Resources.ie4_home; + this.HomeButton.ImageAlign = System.Drawing.ContentAlignment.BottomCenter; + this.HomeButton.Location = new System.Drawing.Point(276, 0); this.HomeButton.Name = "HomeButton"; - this.HomeButton.Size = new System.Drawing.Size(75, 47); + this.HomeButton.Size = new System.Drawing.Size(63, 47); this.HomeButton.TabIndex = 4; this.HomeButton.Text = "Home"; + this.HomeButton.TextAlign = System.Drawing.ContentAlignment.BottomCenter; this.HomeButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.HomeButton.UseVisualStyleBackColor = true; // @@ -295,11 +330,14 @@ this.Button4.Dock = System.Windows.Forms.DockStyle.Left; this.Button4.FlatAppearance.BorderSize = 0; this.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button4.Location = new System.Drawing.Point(225, 0); + this.Button4.Image = global::TimeHACK.Properties.Resources.ie4_refresh; + this.Button4.ImageAlign = System.Drawing.ContentAlignment.BottomCenter; + this.Button4.Location = new System.Drawing.Point(213, 0); this.Button4.Name = "Button4"; - this.Button4.Size = new System.Drawing.Size(75, 47); + this.Button4.Size = new System.Drawing.Size(63, 47); this.Button4.TabIndex = 3; this.Button4.Text = "Refresh"; + this.Button4.TextAlign = System.Drawing.ContentAlignment.BottomCenter; this.Button4.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.Button4.UseVisualStyleBackColor = true; // @@ -308,11 +346,14 @@ this.Button3.Dock = System.Windows.Forms.DockStyle.Left; this.Button3.FlatAppearance.BorderSize = 0; this.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.Button3.Image = global::TimeHACK.Properties.Resources.ie4_stop; + this.Button3.ImageAlign = System.Drawing.ContentAlignment.BottomCenter; this.Button3.Location = new System.Drawing.Point(150, 0); this.Button3.Name = "Button3"; - this.Button3.Size = new System.Drawing.Size(75, 47); + this.Button3.Size = new System.Drawing.Size(63, 47); this.Button3.TabIndex = 2; this.Button3.Text = "Stop"; + this.Button3.TextAlign = System.Drawing.ContentAlignment.BottomCenter; this.Button3.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.Button3.UseVisualStyleBackColor = true; // @@ -321,11 +362,14 @@ this.ForwardButton.Dock = System.Windows.Forms.DockStyle.Left; this.ForwardButton.FlatAppearance.BorderSize = 0; this.ForwardButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.ForwardButton.Image = global::TimeHACK.Properties.Resources.ie4_forward; + this.ForwardButton.ImageAlign = System.Drawing.ContentAlignment.BottomCenter; this.ForwardButton.Location = new System.Drawing.Point(75, 0); this.ForwardButton.Name = "ForwardButton"; this.ForwardButton.Size = new System.Drawing.Size(75, 47); this.ForwardButton.TabIndex = 1; this.ForwardButton.Text = "Forward"; + this.ForwardButton.TextAlign = System.Drawing.ContentAlignment.BottomCenter; this.ForwardButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.ForwardButton.UseVisualStyleBackColor = true; // @@ -334,21 +378,27 @@ this.BackButton.Dock = System.Windows.Forms.DockStyle.Left; this.BackButton.FlatAppearance.BorderSize = 0; this.BackButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BackButton.Image = global::TimeHACK.Properties.Resources.ie4_back; + this.BackButton.ImageAlign = System.Drawing.ContentAlignment.BottomCenter; this.BackButton.Location = new System.Drawing.Point(0, 0); this.BackButton.Name = "BackButton"; this.BackButton.Size = new System.Drawing.Size(75, 47); - this.BackButton.TabIndex = 0; + this.BackButton.TabIndex = 1; this.BackButton.Text = "Back"; + this.BackButton.TextAlign = System.Drawing.ContentAlignment.BottomCenter; this.BackButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.BackButton.UseVisualStyleBackColor = true; // // Panel1 // this.Panel1.BackColor = System.Drawing.Color.Silver; - this.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.Panel1.Controls.Add(this.pictureBox8); + this.Panel1.Controls.Add(this.pictureBox6); + this.Panel1.Controls.Add(this.pictureBox5); + this.Panel1.Controls.Add(this.pictureBox2); + this.Panel1.Controls.Add(this.pictureBox1); this.Panel1.Controls.Add(this.Button30); this.Panel1.Controls.Add(this.Button29); - this.Panel1.Controls.Add(this.Button28); this.Panel1.Controls.Add(this.Button27); this.Panel1.Controls.Add(this.Button7); this.Panel1.Controls.Add(this.Button6); @@ -360,9 +410,59 @@ this.Panel1.Dock = System.Windows.Forms.DockStyle.Top; this.Panel1.Location = new System.Drawing.Point(0, 24); this.Panel1.Name = "Panel1"; - this.Panel1.Size = new System.Drawing.Size(959, 49); + this.Panel1.Size = new System.Drawing.Size(959, 47); this.Panel1.TabIndex = 14; // + // pictureBox8 + // + this.pictureBox8.BackgroundImage = global::TimeHACK.Properties.Resources.ie4_hsplitter; + this.pictureBox8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pictureBox8.Location = new System.Drawing.Point(0, 46); + this.pictureBox8.Name = "pictureBox8"; + this.pictureBox8.Size = new System.Drawing.Size(959, 2); + this.pictureBox8.TabIndex = 15; + this.pictureBox8.TabStop = false; + // + // pictureBox6 + // + this.pictureBox6.BackgroundImage = global::TimeHACK.Properties.Resources.ie4_hsplitter; + this.pictureBox6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pictureBox6.Location = new System.Drawing.Point(0, 0); + this.pictureBox6.Name = "pictureBox6"; + this.pictureBox6.Size = new System.Drawing.Size(959, 2); + this.pictureBox6.TabIndex = 14; + this.pictureBox6.TabStop = false; + // + // pictureBox5 + // + this.pictureBox5.BackgroundImage = global::TimeHACK.Properties.Resources.ie4_vsplitter3; + this.pictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pictureBox5.Location = new System.Drawing.Point(2, 5); + this.pictureBox5.Name = "pictureBox5"; + this.pictureBox5.Size = new System.Drawing.Size(3, 38); + this.pictureBox5.TabIndex = 13; + this.pictureBox5.TabStop = false; + // + // pictureBox2 + // + this.pictureBox2.BackgroundImage = global::TimeHACK.Properties.Resources.ie4_vsplitter; + this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pictureBox2.Location = new System.Drawing.Point(337, -1); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(2, 47); + this.pictureBox2.TabIndex = 12; + this.pictureBox2.TabStop = false; + // + // pictureBox1 + // + this.pictureBox1.BackgroundImage = global::TimeHACK.Properties.Resources.ie4_vsplitter; + this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pictureBox1.Location = new System.Drawing.Point(526, -1); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(2, 47); + this.pictureBox1.TabIndex = 11; + this.pictureBox1.TabStop = false; + // // MenuStrip3 // this.MenuStrip3.BackColor = System.Drawing.Color.Silver; @@ -1145,16 +1245,68 @@ // // _browsingArea // + this._browsingArea.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this._browsingArea.Dock = System.Windows.Forms.DockStyle.Fill; - this._browsingArea.Location = new System.Drawing.Point(0, 111); - this._browsingArea.Name = "browsingArea"; - this._browsingArea.Size = new System.Drawing.Size(959, 483); + this._browsingArea.Location = new System.Drawing.Point(0, 102); + this._browsingArea.Name = "_browsingArea"; + this._browsingArea.Size = new System.Drawing.Size(959, 492); this._browsingArea.TabIndex = 17; // + // pictureBox4 + // + this.pictureBox4.BackgroundImage = global::TimeHACK.Properties.Resources.ie4_vsplitter2; + this.pictureBox4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pictureBox4.Location = new System.Drawing.Point(2, 4); + this.pictureBox4.Name = "pictureBox4"; + this.pictureBox4.Size = new System.Drawing.Size(3, 19); + this.pictureBox4.TabIndex = 18; + this.pictureBox4.TabStop = false; + // + // pictureBox7 + // + this.pictureBox7.BackgroundImage = global::TimeHACK.Properties.Resources.ie4_hsplitter; + this.pictureBox7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pictureBox7.Location = new System.Drawing.Point(0, 0); + this.pictureBox7.Name = "pictureBox7"; + this.pictureBox7.Size = new System.Drawing.Size(959, 2); + this.pictureBox7.TabIndex = 15; + this.pictureBox7.TabStop = false; + // + // pictureBox9 + // + this.pictureBox9.BackgroundImage = global::TimeHACK.Properties.Resources.ie4_hsplitter; + this.pictureBox9.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pictureBox9.Location = new System.Drawing.Point(0, 26); + this.pictureBox9.Name = "pictureBox9"; + this.pictureBox9.Size = new System.Drawing.Size(959, 2); + this.pictureBox9.TabIndex = 16; + this.pictureBox9.TabStop = false; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(924, 7); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(32, 13); + this.label2.TabIndex = 17; + this.label2.Text = "Links"; + // + // pictureBox10 + // + this.pictureBox10.BackgroundImage = global::TimeHACK.Properties.Resources.ie4_vsplitter2; + this.pictureBox10.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pictureBox10.Location = new System.Drawing.Point(921, 4); + this.pictureBox10.Name = "pictureBox10"; + this.pictureBox10.Size = new System.Drawing.Size(3, 20); + this.pictureBox10.TabIndex = 19; + this.pictureBox10.TabStop = false; + // // TempIE4 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.pictureBox7); + this.Controls.Add(this.pictureBox4); this.Controls.Add(this._browsingArea); this.Controls.Add(this.Panel14); this.Controls.Add(this.Panel1); @@ -1164,9 +1316,19 @@ this.Load += new System.EventHandler(this.TempIE4_Load); this.Panel14.ResumeLayout(false); this.Panel14.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); this.Panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox8)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.MenuStrip3.ResumeLayout(false); this.MenuStrip3.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox9)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox10)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -1180,7 +1342,6 @@ internal System.Windows.Forms.Label Label1; internal System.Windows.Forms.Button Button30; internal System.Windows.Forms.Button Button29; - internal System.Windows.Forms.Button Button28; internal System.Windows.Forms.Button Button27; internal System.Windows.Forms.Button Button7; internal System.Windows.Forms.Button Button6; @@ -1287,5 +1448,16 @@ internal System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem94; internal System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem95; private System.Windows.Forms.Panel _browsingArea; + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.PictureBox pictureBox2; + private System.Windows.Forms.PictureBox pictureBox3; + private System.Windows.Forms.PictureBox pictureBox4; + private System.Windows.Forms.PictureBox pictureBox5; + private System.Windows.Forms.PictureBox pictureBox6; + private System.Windows.Forms.PictureBox pictureBox7; + private System.Windows.Forms.PictureBox pictureBox8; + private System.Windows.Forms.PictureBox pictureBox9; + private System.Windows.Forms.PictureBox pictureBox10; + private System.Windows.Forms.Label label2; } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/TempIE4.cs b/TimeHACK.Main/OS/Win95/Win95Apps/TempIE4.cs index 568749f..d41add1 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/TempIE4.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/TempIE4.cs @@ -23,7 +23,7 @@ namespace TimeHACK.OS.Win95.Win95Apps addressbar = _addressbar; } - public static void GoToPage(string url) + public static async void GoToPage(string url) { UserControl uc = new UserControl(); @@ -45,6 +45,9 @@ namespace TimeHACK.OS.Win95.Win95Apps addressbar.Text = url; uc.Dock = DockStyle.Fill; + + await Task.Delay(new Random().Next(500, 1500)); + browsingArea.Controls.Clear(); browsingArea.Controls.Add(uc); } @@ -52,11 +55,22 @@ namespace TimeHACK.OS.Win95.Win95Apps private void TempIE4_Load(object sender, EventArgs e) { GoToPage("www.microsoft.com/windows/ie/default.htm"); + GoButton.Paint += (s, args) => Engine.Paintbrush.PaintClassicBorders(s, args, 2); } private void GoButton_Click(object sender, EventArgs e) { GoToPage(addressbar.Text); } + + private void _addressbar_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) + { + GoButton_Click(this, new EventArgs()); + e.SuppressKeyPress = true; + browsingArea.Focus(); + } + } } } diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs index c721c0a..65971a2 100644 --- a/TimeHACK.Main/Properties/Resources.Designer.cs +++ b/TimeHACK.Main/Properties/Resources.Designer.cs @@ -175,6 +175,156 @@ namespace TimeHACK.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ie4_back { + get { + object obj = ResourceManager.GetObject("ie4_back", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ie4_favorites { + get { + object obj = ResourceManager.GetObject("ie4_favorites", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ie4_forward { + get { + object obj = ResourceManager.GetObject("ie4_forward", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ie4_go { + get { + object obj = ResourceManager.GetObject("ie4_go", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ie4_history { + get { + object obj = ResourceManager.GetObject("ie4_history", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ie4_home { + get { + object obj = ResourceManager.GetObject("ie4_home", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ie4_hsplitter { + get { + object obj = ResourceManager.GetObject("ie4_hsplitter", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ie4_mail { + get { + object obj = ResourceManager.GetObject("ie4_mail", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ie4_print { + get { + object obj = ResourceManager.GetObject("ie4_print", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ie4_refresh { + get { + object obj = ResourceManager.GetObject("ie4_refresh", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ie4_search { + get { + object obj = ResourceManager.GetObject("ie4_search", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ie4_stop { + get { + object obj = ResourceManager.GetObject("ie4_stop", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ie4_vsplitter { + get { + object obj = ResourceManager.GetObject("ie4_vsplitter", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ie4_vsplitter2 { + get { + object obj = ResourceManager.GetObject("ie4_vsplitter2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ie4_vsplitter3 { + get { + object obj = ResourceManager.GetObject("ie4_vsplitter3", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx index 1007fd9..7fd3bd8 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -606,4 +606,49 @@ ..\Resources\IE4\nopage.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ie4_back.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ie4_favorites.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ie4_forward.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ie4_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ie4_history.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ie4_home.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ie4_hsplitter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ie4_mail.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ie4_print.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ie4_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ie4_search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ie4_stop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ie4_vsplitter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ie4_hsplitter1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ie4_hsplitter2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/TimeHACK.Main/Resources/ie4_back.png b/TimeHACK.Main/Resources/ie4_back.png new file mode 100644 index 0000000..f4983c2 Binary files /dev/null and b/TimeHACK.Main/Resources/ie4_back.png differ diff --git a/TimeHACK.Main/Resources/ie4_favorites.png b/TimeHACK.Main/Resources/ie4_favorites.png new file mode 100644 index 0000000..0f9503f Binary files /dev/null and b/TimeHACK.Main/Resources/ie4_favorites.png differ diff --git a/TimeHACK.Main/Resources/ie4_forward.png b/TimeHACK.Main/Resources/ie4_forward.png new file mode 100644 index 0000000..721c0a2 Binary files /dev/null and b/TimeHACK.Main/Resources/ie4_forward.png differ diff --git a/TimeHACK.Main/Resources/ie4_go.png b/TimeHACK.Main/Resources/ie4_go.png new file mode 100644 index 0000000..68c034f Binary files /dev/null and b/TimeHACK.Main/Resources/ie4_go.png differ diff --git a/TimeHACK.Main/Resources/ie4_history.png b/TimeHACK.Main/Resources/ie4_history.png new file mode 100644 index 0000000..23c50dd Binary files /dev/null and b/TimeHACK.Main/Resources/ie4_history.png differ diff --git a/TimeHACK.Main/Resources/ie4_home.png b/TimeHACK.Main/Resources/ie4_home.png new file mode 100644 index 0000000..f2ff448 Binary files /dev/null and b/TimeHACK.Main/Resources/ie4_home.png differ diff --git a/TimeHACK.Main/Resources/ie4_hsplitter.png b/TimeHACK.Main/Resources/ie4_hsplitter.png new file mode 100644 index 0000000..6a1c325 Binary files /dev/null and b/TimeHACK.Main/Resources/ie4_hsplitter.png differ diff --git a/TimeHACK.Main/Resources/ie4_hsplitter1.png b/TimeHACK.Main/Resources/ie4_hsplitter1.png new file mode 100644 index 0000000..88e567d Binary files /dev/null and b/TimeHACK.Main/Resources/ie4_hsplitter1.png differ diff --git a/TimeHACK.Main/Resources/ie4_hsplitter2.png b/TimeHACK.Main/Resources/ie4_hsplitter2.png new file mode 100644 index 0000000..a920b9e Binary files /dev/null and b/TimeHACK.Main/Resources/ie4_hsplitter2.png differ diff --git a/TimeHACK.Main/Resources/ie4_mail.png b/TimeHACK.Main/Resources/ie4_mail.png new file mode 100644 index 0000000..f3e53a3 Binary files /dev/null and b/TimeHACK.Main/Resources/ie4_mail.png differ diff --git a/TimeHACK.Main/Resources/ie4_print.png b/TimeHACK.Main/Resources/ie4_print.png new file mode 100644 index 0000000..64c9bf4 Binary files /dev/null and b/TimeHACK.Main/Resources/ie4_print.png differ diff --git a/TimeHACK.Main/Resources/ie4_refresh.png b/TimeHACK.Main/Resources/ie4_refresh.png new file mode 100644 index 0000000..e582925 Binary files /dev/null and b/TimeHACK.Main/Resources/ie4_refresh.png differ diff --git a/TimeHACK.Main/Resources/ie4_search.png b/TimeHACK.Main/Resources/ie4_search.png new file mode 100644 index 0000000..7427c74 Binary files /dev/null and b/TimeHACK.Main/Resources/ie4_search.png differ diff --git a/TimeHACK.Main/Resources/ie4_stop.png b/TimeHACK.Main/Resources/ie4_stop.png new file mode 100644 index 0000000..a64a97c Binary files /dev/null and b/TimeHACK.Main/Resources/ie4_stop.png differ diff --git a/TimeHACK.Main/Resources/ie4_vsplitter.png b/TimeHACK.Main/Resources/ie4_vsplitter.png new file mode 100644 index 0000000..c9f2efd Binary files /dev/null and b/TimeHACK.Main/Resources/ie4_vsplitter.png differ diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index a7a8817..ce7407e 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -480,6 +480,21 @@ + + + + + + + + + + + + + + + -- cgit v1.2.3 From 7c02e210108003913dfc77a001f546bb0617dba8 Mon Sep 17 00:00:00 2001 From: lempamo Date: Thu, 13 Jul 2017 19:13:35 -0500 Subject: pixel perfected:tm: calculator --- TimeHACK.Engine/Paintbrush.cs | 9 + .../Win95Apps/WinClassicCalculator.Designer.cs | 183 +++++++++++++-------- .../OS/Win95/Win95Apps/WinClassicCalculator.cs | 19 ++- .../OS/Win95/Win95Apps/WinClassicTimeDistorter.cs | 1 + TimeHACK.Main/Properties/Resources.Designer.cs | 10 ++ TimeHACK.Main/Properties/Resources.resx | 5 +- TimeHACK.Main/Resources/IE4/ie4about.png | Bin 0 -> 11773 bytes TimeHACK.Main/TimeHACK.Main.csproj | 1 + 8 files changed, 158 insertions(+), 70 deletions(-) create mode 100644 TimeHACK.Main/Resources/IE4/ie4about.png (limited to 'TimeHACK.Main/Properties') diff --git a/TimeHACK.Engine/Paintbrush.cs b/TimeHACK.Engine/Paintbrush.cs index 1b442bc..96d324d 100644 --- a/TimeHACK.Engine/Paintbrush.cs +++ b/TimeHACK.Engine/Paintbrush.cs @@ -19,5 +19,14 @@ namespace TimeHACK.Engine SystemColors.ControlLightLight, borderwidth, ButtonBorderStyle.Outset, SystemColors.ControlLightLight, borderwidth, ButtonBorderStyle.Outset); } + + public static void PaintClassicBordersIndented(object sender, PaintEventArgs e, int borderwidth) + { + ControlPaint.DrawBorder(e.Graphics, ((Control)sender).ClientRectangle, + SystemColors.ControlLightLight, borderwidth, ButtonBorderStyle.Inset, + SystemColors.ControlLightLight, borderwidth, ButtonBorderStyle.Inset, + SystemColors.ControlLightLight, borderwidth, ButtonBorderStyle.Inset, + SystemColors.ControlLightLight, borderwidth, ButtonBorderStyle.Inset); + } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicCalculator.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicCalculator.Designer.cs index f71c5e3..49a47d0 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicCalculator.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicCalculator.Designer.cs @@ -67,7 +67,9 @@ this.Button19 = new System.Windows.Forms.Button(); this.Button9 = new System.Windows.Forms.Button(); this.MenuStrip2 = new System.Windows.Forms.MenuStrip(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.MenuStrip2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // // timer1 @@ -79,28 +81,28 @@ this.HelpToolStripMenuItem3.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.AboutCalculatorToolStripMenuItem}); this.HelpToolStripMenuItem3.Name = "HelpToolStripMenuItem3"; - this.HelpToolStripMenuItem3.Size = new System.Drawing.Size(44, 20); + this.HelpToolStripMenuItem3.Size = new System.Drawing.Size(41, 20); this.HelpToolStripMenuItem3.Text = "Help"; // // AboutCalculatorToolStripMenuItem // this.AboutCalculatorToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.AboutCalculatorToolStripMenuItem.Name = "AboutCalculatorToolStripMenuItem"; - this.AboutCalculatorToolStripMenuItem.Size = new System.Drawing.Size(164, 22); + this.AboutCalculatorToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.AboutCalculatorToolStripMenuItem.Text = "About Calculator"; // // StandardToolStripMenuItem // this.StandardToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.StandardToolStripMenuItem.Name = "StandardToolStripMenuItem"; - this.StandardToolStripMenuItem.Size = new System.Drawing.Size(122, 22); + this.StandardToolStripMenuItem.Size = new System.Drawing.Size(117, 22); this.StandardToolStripMenuItem.Text = "Standard"; // // ScientificToolStripMenuItem // this.ScientificToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.ScientificToolStripMenuItem.Name = "ScientificToolStripMenuItem"; - this.ScientificToolStripMenuItem.Size = new System.Drawing.Size(122, 22); + this.ScientificToolStripMenuItem.Size = new System.Drawing.Size(117, 22); this.ScientificToolStripMenuItem.Text = "Scientific"; // // HelpToolStripMenuItem2 @@ -109,21 +111,21 @@ this.ScientificToolStripMenuItem, this.StandardToolStripMenuItem}); this.HelpToolStripMenuItem2.Name = "HelpToolStripMenuItem2"; - this.HelpToolStripMenuItem2.Size = new System.Drawing.Size(44, 20); + this.HelpToolStripMenuItem2.Size = new System.Drawing.Size(42, 20); this.HelpToolStripMenuItem2.Text = "View"; // // PasteCtrlVToolStripMenuItem1 // this.PasteCtrlVToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; this.PasteCtrlVToolStripMenuItem1.Name = "PasteCtrlVToolStripMenuItem1"; - this.PasteCtrlVToolStripMenuItem1.Size = new System.Drawing.Size(158, 22); + this.PasteCtrlVToolStripMenuItem1.Size = new System.Drawing.Size(150, 22); this.PasteCtrlVToolStripMenuItem1.Text = "Paste Ctrl+V"; // // CopyCtrlCToolStripMenuItem1 // this.CopyCtrlCToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; this.CopyCtrlCToolStripMenuItem1.Name = "CopyCtrlCToolStripMenuItem1"; - this.CopyCtrlCToolStripMenuItem1.Size = new System.Drawing.Size(158, 22); + this.CopyCtrlCToolStripMenuItem1.Size = new System.Drawing.Size(150, 22); this.CopyCtrlCToolStripMenuItem1.Text = "Copy Ctrl+C"; // // EditToolStripMenuItem1 @@ -133,19 +135,21 @@ this.CopyCtrlCToolStripMenuItem1, this.PasteCtrlVToolStripMenuItem1}); this.EditToolStripMenuItem1.Name = "EditToolStripMenuItem1"; - this.EditToolStripMenuItem1.Size = new System.Drawing.Size(39, 20); + this.EditToolStripMenuItem1.Size = new System.Drawing.Size(37, 20); this.EditToolStripMenuItem1.Text = "Edit"; // // txtNumbers // this.txtNumbers.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.txtNumbers.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtNumbers.Location = new System.Drawing.Point(18, 62); + this.txtNumbers.BackColor = System.Drawing.Color.White; + this.txtNumbers.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.txtNumbers.Location = new System.Drawing.Point(11, 39); + this.txtNumbers.Margin = new System.Windows.Forms.Padding(4); this.txtNumbers.Multiline = true; this.txtNumbers.Name = "txtNumbers"; this.txtNumbers.ReadOnly = true; - this.txtNumbers.Size = new System.Drawing.Size(272, 28); + this.txtNumbers.Size = new System.Drawing.Size(249, 26); this.txtNumbers.TabIndex = 85; this.txtNumbers.Text = "0"; this.txtNumbers.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -153,11 +157,12 @@ // Button27 // this.Button27.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.Button27.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button27.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button27.ForeColor = System.Drawing.Color.Firebrick; - this.Button27.Location = new System.Drawing.Point(179, 96); + this.Button27.Location = new System.Drawing.Point(157, 71); this.Button27.Name = "Button27"; - this.Button27.Size = new System.Drawing.Size(53, 30); + this.Button27.Size = new System.Drawing.Size(49, 28); this.Button27.TabIndex = 84; this.Button27.Text = "CE"; this.Button27.UseVisualStyleBackColor = true; @@ -166,11 +171,12 @@ // Button26 // this.Button26.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.Button26.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button26.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button26.ForeColor = System.Drawing.Color.Firebrick; - this.Button26.Location = new System.Drawing.Point(237, 96); + this.Button26.Location = new System.Drawing.Point(210, 71); this.Button26.Name = "Button26"; - this.Button26.Size = new System.Drawing.Size(53, 30); + this.Button26.Size = new System.Drawing.Size(49, 28); this.Button26.TabIndex = 83; this.Button26.Text = "C"; this.Button26.UseVisualStyleBackColor = true; @@ -179,11 +185,12 @@ // Button1 // this.Button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button1.ForeColor = System.Drawing.Color.Red; - this.Button1.Location = new System.Drawing.Point(18, 172); + this.Button1.Location = new System.Drawing.Point(11, 139); this.Button1.Name = "Button1"; - this.Button1.Size = new System.Drawing.Size(38, 30); + this.Button1.Size = new System.Drawing.Size(36, 28); this.Button1.TabIndex = 58; this.Button1.Text = "MR"; this.Button1.UseVisualStyleBackColor = true; @@ -191,11 +198,12 @@ // Button25 // this.Button25.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.Button25.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button25.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button25.ForeColor = System.Drawing.Color.Firebrick; - this.Button25.Location = new System.Drawing.Point(120, 96); + this.Button25.Location = new System.Drawing.Point(104, 71); this.Button25.Name = "Button25"; - this.Button25.Size = new System.Drawing.Size(53, 30); + this.Button25.Size = new System.Drawing.Size(49, 28); this.Button25.TabIndex = 82; this.Button25.Text = "Back"; this.Button25.UseVisualStyleBackColor = true; @@ -204,11 +212,12 @@ // Button2 // this.Button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button2.ForeColor = System.Drawing.Color.Red; - this.Button2.Location = new System.Drawing.Point(18, 243); + this.Button2.Location = new System.Drawing.Point(11, 207); this.Button2.Name = "Button2"; - this.Button2.Size = new System.Drawing.Size(38, 30); + this.Button2.Size = new System.Drawing.Size(36, 28); this.Button2.TabIndex = 59; this.Button2.Text = "M+"; this.Button2.UseVisualStyleBackColor = true; @@ -216,11 +225,12 @@ // Button21 // this.Button21.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.Button21.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button21.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button21.ForeColor = System.Drawing.Color.MidnightBlue; - this.Button21.Location = new System.Drawing.Point(252, 243); + this.Button21.ForeColor = System.Drawing.Color.Red; + this.Button21.Location = new System.Drawing.Point(223, 207); this.Button21.Name = "Button21"; - this.Button21.Size = new System.Drawing.Size(38, 30); + this.Button21.Size = new System.Drawing.Size(36, 28); this.Button21.TabIndex = 81; this.Button21.Text = "="; this.Button21.UseVisualStyleBackColor = true; @@ -229,11 +239,12 @@ // Button3 // this.Button3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button3.ForeColor = System.Drawing.Color.Red; - this.Button3.Location = new System.Drawing.Point(18, 208); + this.Button3.Location = new System.Drawing.Point(11, 173); this.Button3.Name = "Button3"; - this.Button3.Size = new System.Drawing.Size(38, 30); + this.Button3.Size = new System.Drawing.Size(36, 28); this.Button3.TabIndex = 60; this.Button3.Text = "MS"; this.Button3.UseVisualStyleBackColor = true; @@ -241,24 +252,27 @@ // Button22 // this.Button22.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.Button22.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button22.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button22.ForeColor = System.Drawing.Color.MidnightBlue; - this.Button22.Location = new System.Drawing.Point(252, 136); + this.Button22.Location = new System.Drawing.Point(223, 105); this.Button22.Name = "Button22"; - this.Button22.Size = new System.Drawing.Size(38, 30); + this.Button22.Size = new System.Drawing.Size(36, 28); this.Button22.TabIndex = 80; this.Button22.Text = "sqrt"; + this.Button22.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.Button22.UseVisualStyleBackColor = true; this.Button22.Click += new System.EventHandler(this.Button22_Click); // // Button4 // this.Button4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button4.ForeColor = System.Drawing.Color.Red; - this.Button4.Location = new System.Drawing.Point(18, 136); + this.Button4.Location = new System.Drawing.Point(11, 105); this.Button4.Name = "Button4"; - this.Button4.Size = new System.Drawing.Size(38, 30); + this.Button4.Size = new System.Drawing.Size(36, 28); this.Button4.TabIndex = 61; this.Button4.Text = "MC"; this.Button4.UseVisualStyleBackColor = true; @@ -266,11 +280,12 @@ // Button23 // this.Button23.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.Button23.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button23.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button23.ForeColor = System.Drawing.Color.MidnightBlue; - this.Button23.Location = new System.Drawing.Point(252, 208); + this.Button23.Location = new System.Drawing.Point(223, 173); this.Button23.Name = "Button23"; - this.Button23.Size = new System.Drawing.Size(38, 30); + this.Button23.Size = new System.Drawing.Size(36, 28); this.Button23.TabIndex = 79; this.Button23.Text = "1/x"; this.Button23.UseVisualStyleBackColor = true; @@ -279,11 +294,12 @@ // Button11 // this.Button11.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.Button11.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button11.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button11.ForeColor = System.Drawing.Color.Blue; - this.Button11.Location = new System.Drawing.Point(162, 136); + this.Button11.Location = new System.Drawing.Point(143, 105); this.Button11.Name = "Button11"; - this.Button11.Size = new System.Drawing.Size(38, 30); + this.Button11.Size = new System.Drawing.Size(36, 28); this.Button11.TabIndex = 70; this.Button11.Text = "9"; this.Button11.UseVisualStyleBackColor = true; @@ -292,11 +308,12 @@ // Button7 // this.Button7.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button7.ForeColor = System.Drawing.Color.Blue; - this.Button7.Location = new System.Drawing.Point(74, 172); + this.Button7.Location = new System.Drawing.Point(63, 139); this.Button7.Name = "Button7"; - this.Button7.Size = new System.Drawing.Size(38, 30); + this.Button7.Size = new System.Drawing.Size(36, 28); this.Button7.TabIndex = 62; this.Button7.Text = "4"; this.Button7.UseVisualStyleBackColor = true; @@ -305,11 +322,12 @@ // Button16 // this.Button16.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.Button16.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button16.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button16.ForeColor = System.Drawing.Color.Blue; - this.Button16.Location = new System.Drawing.Point(74, 243); + this.Button16.Location = new System.Drawing.Point(63, 207); this.Button16.Name = "Button16"; - this.Button16.Size = new System.Drawing.Size(38, 30); + this.Button16.Size = new System.Drawing.Size(36, 28); this.Button16.TabIndex = 71; this.Button16.Text = "0"; this.Button16.UseVisualStyleBackColor = true; @@ -318,11 +336,12 @@ // Button24 // this.Button24.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.Button24.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button24.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button24.ForeColor = System.Drawing.Color.MidnightBlue; - this.Button24.Location = new System.Drawing.Point(252, 172); + this.Button24.Location = new System.Drawing.Point(223, 139); this.Button24.Name = "Button24"; - this.Button24.Size = new System.Drawing.Size(38, 30); + this.Button24.Size = new System.Drawing.Size(36, 28); this.Button24.TabIndex = 78; this.Button24.Text = "%"; this.Button24.UseVisualStyleBackColor = true; @@ -331,11 +350,12 @@ // Button12 // this.Button12.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button12.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button12.ForeColor = System.Drawing.Color.Blue; - this.Button12.Location = new System.Drawing.Point(162, 208); + this.Button12.Location = new System.Drawing.Point(143, 173); this.Button12.Name = "Button12"; - this.Button12.Size = new System.Drawing.Size(38, 30); + this.Button12.Size = new System.Drawing.Size(36, 28); this.Button12.TabIndex = 69; this.Button12.Text = "3"; this.Button12.UseVisualStyleBackColor = true; @@ -344,11 +364,12 @@ // Button6 // this.Button6.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.Button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button6.ForeColor = System.Drawing.Color.Blue; - this.Button6.Location = new System.Drawing.Point(74, 208); + this.Button6.Location = new System.Drawing.Point(63, 173); this.Button6.Name = "Button6"; - this.Button6.Size = new System.Drawing.Size(38, 30); + this.Button6.Size = new System.Drawing.Size(36, 28); this.Button6.TabIndex = 63; this.Button6.Text = "1"; this.Button6.UseVisualStyleBackColor = true; @@ -357,11 +378,12 @@ // Button15 // this.Button15.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.Button15.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button15.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button15.ForeColor = System.Drawing.Color.Blue; - this.Button15.Location = new System.Drawing.Point(118, 243); + this.Button15.Location = new System.Drawing.Point(103, 207); this.Button15.Name = "Button15"; - this.Button15.Size = new System.Drawing.Size(38, 30); + this.Button15.Size = new System.Drawing.Size(36, 28); this.Button15.TabIndex = 72; this.Button15.Text = "+/-"; this.Button15.UseVisualStyleBackColor = true; @@ -370,11 +392,12 @@ // Button17 // this.Button17.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.Button17.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button17.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button17.ForeColor = System.Drawing.Color.Red; - this.Button17.Location = new System.Drawing.Point(208, 243); + this.Button17.Location = new System.Drawing.Point(183, 207); this.Button17.Name = "Button17"; - this.Button17.Size = new System.Drawing.Size(38, 30); + this.Button17.Size = new System.Drawing.Size(36, 28); this.Button17.TabIndex = 77; this.Button17.Text = "+"; this.Button17.UseVisualStyleBackColor = true; @@ -383,11 +406,12 @@ // Button13 // this.Button13.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.Button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button13.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button13.ForeColor = System.Drawing.Color.Blue; - this.Button13.Location = new System.Drawing.Point(162, 172); + this.Button13.Location = new System.Drawing.Point(143, 139); this.Button13.Name = "Button13"; - this.Button13.Size = new System.Drawing.Size(38, 30); + this.Button13.Size = new System.Drawing.Size(36, 28); this.Button13.TabIndex = 68; this.Button13.Text = "6"; this.Button13.UseVisualStyleBackColor = true; @@ -396,11 +420,12 @@ // Button5 // this.Button5.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button5.ForeColor = System.Drawing.Color.Blue; - this.Button5.Location = new System.Drawing.Point(74, 136); + this.Button5.Location = new System.Drawing.Point(63, 105); this.Button5.Name = "Button5"; - this.Button5.Size = new System.Drawing.Size(38, 30); + this.Button5.Size = new System.Drawing.Size(36, 28); this.Button5.TabIndex = 64; this.Button5.Text = "7"; this.Button5.UseVisualStyleBackColor = true; @@ -409,11 +434,12 @@ // Button14 // this.Button14.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.Button14.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button14.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button14.ForeColor = System.Drawing.Color.Blue; - this.Button14.Location = new System.Drawing.Point(162, 243); + this.Button14.Location = new System.Drawing.Point(143, 207); this.Button14.Name = "Button14"; - this.Button14.Size = new System.Drawing.Size(38, 30); + this.Button14.Size = new System.Drawing.Size(36, 28); this.Button14.TabIndex = 73; this.Button14.Text = "."; this.Button14.UseVisualStyleBackColor = true; @@ -422,11 +448,12 @@ // Button18 // this.Button18.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.Button18.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button18.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button18.ForeColor = System.Drawing.Color.Red; - this.Button18.Location = new System.Drawing.Point(208, 136); + this.Button18.Location = new System.Drawing.Point(183, 105); this.Button18.Name = "Button18"; - this.Button18.Size = new System.Drawing.Size(38, 30); + this.Button18.Size = new System.Drawing.Size(36, 28); this.Button18.TabIndex = 76; this.Button18.Text = "/"; this.Button18.UseVisualStyleBackColor = true; @@ -435,11 +462,12 @@ // Button8 // this.Button8.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button8.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button8.ForeColor = System.Drawing.Color.Blue; - this.Button8.Location = new System.Drawing.Point(118, 136); + this.Button8.Location = new System.Drawing.Point(103, 105); this.Button8.Name = "Button8"; - this.Button8.Size = new System.Drawing.Size(38, 30); + this.Button8.Size = new System.Drawing.Size(36, 28); this.Button8.TabIndex = 67; this.Button8.Text = "8"; this.Button8.UseVisualStyleBackColor = true; @@ -448,11 +476,12 @@ // Button10 // this.Button10.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.Button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button10.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button10.ForeColor = System.Drawing.Color.Blue; - this.Button10.Location = new System.Drawing.Point(118, 172); + this.Button10.Location = new System.Drawing.Point(103, 139); this.Button10.Name = "Button10"; - this.Button10.Size = new System.Drawing.Size(38, 30); + this.Button10.Size = new System.Drawing.Size(36, 28); this.Button10.TabIndex = 65; this.Button10.Text = "5"; this.Button10.UseVisualStyleBackColor = true; @@ -461,11 +490,12 @@ // Button20 // this.Button20.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.Button20.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button20.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button20.ForeColor = System.Drawing.Color.Red; - this.Button20.Location = new System.Drawing.Point(208, 172); + this.Button20.Location = new System.Drawing.Point(183, 139); this.Button20.Name = "Button20"; - this.Button20.Size = new System.Drawing.Size(38, 30); + this.Button20.Size = new System.Drawing.Size(36, 28); this.Button20.TabIndex = 74; this.Button20.Text = "*"; this.Button20.UseVisualStyleBackColor = true; @@ -474,11 +504,12 @@ // Button19 // this.Button19.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.Button19.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button19.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button19.ForeColor = System.Drawing.Color.Red; - this.Button19.Location = new System.Drawing.Point(208, 208); + this.Button19.Location = new System.Drawing.Point(183, 173); this.Button19.Name = "Button19"; - this.Button19.Size = new System.Drawing.Size(38, 30); + this.Button19.Size = new System.Drawing.Size(36, 28); this.Button19.TabIndex = 75; this.Button19.Text = "-"; this.Button19.UseVisualStyleBackColor = true; @@ -487,11 +518,12 @@ // Button9 // this.Button9.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button9.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button9.ForeColor = System.Drawing.Color.Blue; - this.Button9.Location = new System.Drawing.Point(118, 208); + this.Button9.Location = new System.Drawing.Point(103, 173); this.Button9.Name = "Button9"; - this.Button9.Size = new System.Drawing.Size(38, 30); + this.Button9.Size = new System.Drawing.Size(36, 28); this.Button9.TabIndex = 66; this.Button9.Text = "2"; this.Button9.UseVisualStyleBackColor = true; @@ -500,20 +532,33 @@ // MenuStrip2 // this.MenuStrip2.BackColor = System.Drawing.Color.Silver; + this.MenuStrip2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.MenuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.EditToolStripMenuItem1, this.HelpToolStripMenuItem2, this.HelpToolStripMenuItem3}); this.MenuStrip2.Location = new System.Drawing.Point(0, 0); this.MenuStrip2.Name = "MenuStrip2"; - this.MenuStrip2.Size = new System.Drawing.Size(308, 24); + this.MenuStrip2.Size = new System.Drawing.Size(270, 24); this.MenuStrip2.TabIndex = 86; this.MenuStrip2.Text = "MenuStrip2"; // + // pictureBox1 + // + this.pictureBox1.BackgroundImage = global::TimeHACK.Properties.Resources.ie4_hsplitter; + this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pictureBox1.Location = new System.Drawing.Point(1, 24); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(268, 2); + this.pictureBox1.TabIndex = 87; + this.pictureBox1.TabStop = false; + // // WinClassicCalculator // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.Silver; + this.Controls.Add(this.pictureBox1); this.Controls.Add(this.txtNumbers); this.Controls.Add(this.Button27); this.Controls.Add(this.Button26); @@ -544,10 +589,11 @@ this.Controls.Add(this.Button9); this.Controls.Add(this.MenuStrip2); this.Name = "WinClassicCalculator"; - this.Size = new System.Drawing.Size(308, 276); + this.Size = new System.Drawing.Size(270, 247); this.Load += new System.EventHandler(this.WinClassicCalculator_Load); this.MenuStrip2.ResumeLayout(false); this.MenuStrip2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -593,5 +639,6 @@ internal System.Windows.Forms.Button Button19; internal System.Windows.Forms.Button Button9; internal System.Windows.Forms.MenuStrip MenuStrip2; + private System.Windows.Forms.PictureBox pictureBox1; } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicCalculator.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicCalculator.cs index 14111c1..9e923bb 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicCalculator.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicCalculator.cs @@ -16,6 +16,19 @@ namespace TimeHACK.OS.Win95.Win95Apps public WinClassicCalculator() { InitializeComponent(); + foreach (Control c in Controls) + { + if (c is Button) + { + c.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(0))); + c.Paint += (sender, args) => Paintbrush.PaintClassicBorders(sender, args, 2); + } + else + { + c.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + } + } + txtNumbers.Paint += (sender, args) => Paintbrush.PaintClassicBordersIndented(sender, args, 2); } public double prevnum = 0; public bool iszero = true; @@ -180,6 +193,10 @@ namespace TimeHACK.OS.Win95.Win95Apps switch (coperator) { case "+": + if (prevnum == 0) + { + break; + } txtNumbers.Text = (prevnum + double.Parse(txtNumbers.Text)).ToString(); prevnum = double.Parse(txtNumbers.Text); break; @@ -221,7 +238,7 @@ namespace TimeHACK.OS.Win95.Win95Apps coperator = "+"; Calculate(); prevnum = double.Parse(txtNumbers.Text); - txtNumbers.Text = "0"; + iszero = true; } private void Button19_Click(object sender, EventArgs e) diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTimeDistorter.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTimeDistorter.cs index 57fa683..e2c8d64 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTimeDistorter.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTimeDistorter.cs @@ -26,6 +26,7 @@ namespace TimeHACK.OS.Win95 { lblCountDown.Visible = true; btnGo.Enabled = false; + ((WinClassic)ParentForm).closeDisabled = true; _action?.Invoke(); countDownTimer.Start(); diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs index 65971a2..ee5c4c5 100644 --- a/TimeHACK.Main/Properties/Resources.Designer.cs +++ b/TimeHACK.Main/Properties/Resources.Designer.cs @@ -325,6 +325,16 @@ namespace TimeHACK.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ie4about { + get { + object obj = ResourceManager.GetObject("ie4about", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx index 7fd3bd8..cf2df35 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -522,7 +522,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ + vgAADr4B6kKxwAAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu QmCC @@ -651,4 +651,7 @@ ..\Resources\ie4_hsplitter2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\IE4\ie4about.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/TimeHACK.Main/Resources/IE4/ie4about.png b/TimeHACK.Main/Resources/IE4/ie4about.png new file mode 100644 index 0000000..c76c16c Binary files /dev/null and b/TimeHACK.Main/Resources/IE4/ie4about.png differ diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index ce7407e..b0ac5d0 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -471,6 +471,7 @@ + -- cgit v1.2.3 From 608bf336dbb035c4e78ab448f8a4c96ec80146ce Mon Sep 17 00:00:00 2001 From: lempamo Date: Wed, 19 Jul 2017 21:32:16 -0400 Subject: fix exe to credit all of us --- TimeHACK.Main/Icon128x.ico | Bin 0 -> 99678 bytes TimeHACK.Main/Properties/AssemblyInfo.cs | 8 ++++---- TimeHACK.Main/TimeHACK.Main.csproj | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 TimeHACK.Main/Icon128x.ico (limited to 'TimeHACK.Main/Properties') diff --git a/TimeHACK.Main/Icon128x.ico b/TimeHACK.Main/Icon128x.ico new file mode 100644 index 0000000..ceb4cff Binary files /dev/null and b/TimeHACK.Main/Icon128x.ico differ diff --git a/TimeHACK.Main/Properties/AssemblyInfo.cs b/TimeHACK.Main/Properties/AssemblyInfo.cs index 0340466..024f418 100644 --- a/TimeHACK.Main/Properties/AssemblyInfo.cs +++ b/TimeHACK.Main/Properties/AssemblyInfo.cs @@ -9,9 +9,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle("TimeHACK")] [assembly: AssemblyDescription("Revival of the original hacking simulator!")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("AShifter")] +[assembly: AssemblyCompany("TimeHACKDevs")] [assembly: AssemblyProduct("TimeHACK")] -[assembly: AssemblyCopyright("Copyright © AShifter 2017")] +[assembly: AssemblyCopyright("Copyright © TimeHACKDevs 2017")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -33,7 +33,7 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.0.3.0")] +[assembly: AssemblyFileVersion("1.0.3.0")] [assembly: NeutralResourcesLanguage("en-US")] diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index d1e8db5..9e02828 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -91,8 +91,7 @@ false - - + Icon128x.ico false @@ -455,6 +454,7 @@ + -- cgit v1.2.3