From 82557462d1bb0a7fb776692cd0887b00919999d8 Mon Sep 17 00:00:00 2001 From: AShifter Date: Fri, 31 Mar 2017 14:17:32 -0600 Subject: Added Infobox Added an Infobox into the TimeHACK.Engine and removed extra WindowManager creations in Win95.cs also probably did some other honeyfries --- TimeHACK.Main/TitleScreen.Designer.cs | 121 +++++++++++++++++++--------------- 1 file changed, 68 insertions(+), 53 deletions(-) (limited to 'TimeHACK.Main/TitleScreen.Designer.cs') diff --git a/TimeHACK.Main/TitleScreen.Designer.cs b/TimeHACK.Main/TitleScreen.Designer.cs index 433d482..1bb9dca 100644 --- a/TimeHACK.Main/TitleScreen.Designer.cs +++ b/TimeHACK.Main/TitleScreen.Designer.cs @@ -32,20 +32,21 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TitleScreen)); this.gameversion = new System.Windows.Forms.Label(); this.vm_mode = new System.Windows.Forms.CheckBox(); - this.widthBox = new System.Windows.Forms.TextBox(); - this.heightBox = new System.Windows.Forms.TextBox(); - this.charX = new System.Windows.Forms.Label(); this.vmModeTimer = new System.Windows.Forms.Timer(this.components); this.panel1 = new System.Windows.Forms.Panel(); this.LoadGame = new System.Windows.Forms.Button(); this.Exit = new System.Windows.Forms.Button(); this.NewGame = new System.Windows.Forms.Button(); this.panel2 = new System.Windows.Forms.Panel(); - this.startbutton = new System.Windows.Forms.PictureBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.startbutton = new System.Windows.Forms.PictureBox(); + this.VM_Width = new System.Windows.Forms.NumericUpDown(); + this.VM_Height = new System.Windows.Forms.NumericUpDown(); this.panel2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.startbutton)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.startbutton)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.VM_Width)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.VM_Height)).BeginInit(); this.SuspendLayout(); // // gameversion @@ -73,44 +74,14 @@ this.vm_mode.Text = "VM Mode"; this.vm_mode.UseVisualStyleBackColor = false; // - // widthBox - // - this.widthBox.Location = new System.Drawing.Point(613, 5); - this.widthBox.Name = "widthBox"; - this.widthBox.Size = new System.Drawing.Size(41, 20); - this.widthBox.TabIndex = 5; - this.widthBox.Text = "640"; - this.widthBox.Visible = false; - // - // heightBox - // - this.heightBox.Location = new System.Drawing.Point(674, 5); - this.heightBox.Name = "heightBox"; - this.heightBox.Size = new System.Drawing.Size(41, 20); - this.heightBox.TabIndex = 6; - this.heightBox.Text = "480"; - this.heightBox.Visible = false; - // - // charX - // - this.charX.AutoSize = true; - this.charX.BackColor = System.Drawing.Color.Transparent; - this.charX.ForeColor = System.Drawing.Color.Black; - this.charX.Location = new System.Drawing.Point(657, 8); - this.charX.Name = "charX"; - this.charX.Size = new System.Drawing.Size(14, 13); - this.charX.TabIndex = 7; - this.charX.Text = "X"; - this.charX.Visible = false; - // // vmModeTimer // - this.vmModeTimer.Tick += new System.EventHandler(this.timer1_Tick); + this.vmModeTimer.Tick += new System.EventHandler(this.vmModeTimer_Tick); // // panel1 // this.panel1.BackColor = System.Drawing.Color.Transparent; - this.panel1.BackgroundImage = global::TimeHACK.Properties.Resources.TimeHACK_Logo; + this.panel1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("panel1.BackgroundImage"))); this.panel1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; @@ -170,11 +141,10 @@ // // panel2 // - this.panel2.BackgroundImage = global::TimeHACK.Properties.Resources.WinClassicTaskBar; + this.panel2.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("panel2.BackgroundImage"))); + this.panel2.Controls.Add(this.VM_Height); + this.panel2.Controls.Add(this.VM_Width); this.panel2.Controls.Add(this.vm_mode); - this.panel2.Controls.Add(this.heightBox); - this.panel2.Controls.Add(this.charX); - this.panel2.Controls.Add(this.widthBox); this.panel2.Controls.Add(this.pictureBox1); this.panel2.Controls.Add(this.gameversion); this.panel2.Controls.Add(this.startbutton); @@ -183,23 +153,67 @@ this.panel2.Size = new System.Drawing.Size(800, 28); this.panel2.TabIndex = 10; // + // pictureBox1 + // + this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Location = new System.Drawing.Point(612, 0); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(187, 28); + this.pictureBox1.TabIndex = 13; + this.pictureBox1.TabStop = false; + // // startbutton // - this.startbutton.Image = global::TimeHACK.Properties.Resources.TaskBarButton; + this.startbutton.Image = ((System.Drawing.Image)(resources.GetObject("startbutton.Image"))); this.startbutton.Location = new System.Drawing.Point(2, 4); this.startbutton.Name = "startbutton"; this.startbutton.Size = new System.Drawing.Size(279, 22); this.startbutton.TabIndex = 12; this.startbutton.TabStop = false; // - // pictureBox1 + // VM_Width // - this.pictureBox1.Image = global::TimeHACK.Properties.Resources.TaskBarClock; - this.pictureBox1.Location = new System.Drawing.Point(612, 0); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(187, 28); - this.pictureBox1.TabIndex = 13; - this.pictureBox1.TabStop = false; + this.VM_Width.Location = new System.Drawing.Point(612, 5); + this.VM_Width.Maximum = new decimal(new int[] { + 3840, + 0, + 0, + 0}); + this.VM_Width.Minimum = new decimal(new int[] { + 640, + 0, + 0, + 0}); + this.VM_Width.Name = "VM_Width"; + this.VM_Width.Size = new System.Drawing.Size(50, 20); + this.VM_Width.TabIndex = 14; + this.VM_Width.Value = new decimal(new int[] { + 640, + 0, + 0, + 0}); + // + // VM_Height + // + this.VM_Height.Location = new System.Drawing.Point(668, 5); + this.VM_Height.Maximum = new decimal(new int[] { + 2160, + 0, + 0, + 0}); + this.VM_Height.Minimum = new decimal(new int[] { + 480, + 0, + 0, + 0}); + this.VM_Height.Name = "VM_Height"; + this.VM_Height.Size = new System.Drawing.Size(50, 20); + this.VM_Height.TabIndex = 15; + this.VM_Height.Value = new decimal(new int[] { + 480, + 0, + 0, + 0}); // // TitleScreen // @@ -220,8 +234,10 @@ this.Load += new System.EventHandler(this.TitleScreen_Load); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.startbutton)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.startbutton)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.VM_Width)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.VM_Height)).EndInit(); this.ResumeLayout(false); } @@ -229,9 +245,6 @@ #endregion private System.Windows.Forms.Label gameversion; private System.Windows.Forms.CheckBox vm_mode; - private System.Windows.Forms.TextBox widthBox; - private System.Windows.Forms.TextBox heightBox; - private System.Windows.Forms.Label charX; private System.Windows.Forms.Timer vmModeTimer; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Button LoadGame; @@ -240,5 +253,7 @@ private System.Windows.Forms.Panel panel2; internal System.Windows.Forms.PictureBox startbutton; internal System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.NumericUpDown VM_Height; + private System.Windows.Forms.NumericUpDown VM_Width; } } \ No newline at end of file -- cgit v1.2.3 From 21fe930cb2ad9fccdd304ab8b0b38fbcc79afb3a Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 1 Apr 2017 21:52:12 -0400 Subject: added error images for infobox --- .vs/TimeHACK/v14/.suo | Bin 131072 -> 131072 bytes TimeHACK.Engine/Properties/Resources.Designer.cs | 40 +++++++++++++++------ TimeHACK.Engine/Properties/Resources.resx | 10 ++++-- .../Resources/WinClassic/Window/Win95Error.png | Bin 0 -> 429 bytes .../Resources/WinClassic/Window/Win95Info.png | Bin 0 -> 384 bytes .../Resources/WinClassic/Window/Win95Warning.png | Bin 0 -> 432 bytes .../WinClassic/Window/WinClassicWarning.png | Bin 562 -> 0 bytes TimeHACK.Engine/Template/Infobox95.Designer.cs | 2 +- TimeHACK.Engine/WindowManager.cs | 2 +- TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll | Bin 126976 -> 126976 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb | Bin 32256 -> 32256 bytes .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 8490 -> 9077 bytes .../TempPE/Properties.Resources.Designer.cs.dll | Bin 5120 -> 5120 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll | Bin 126976 -> 126976 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb | Bin 32256 -> 32256 bytes TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 4 +-- TimeHACK.Main/Properties/Resources.Designer.cs | 30 ++++++++++++++++ TimeHACK.Main/Properties/Resources.resx | 9 +++++ TimeHACK.Main/Resources/WinClassic/Win95Error.png | Bin 0 -> 429 bytes TimeHACK.Main/Resources/WinClassic/Win95Info.png | Bin 0 -> 384 bytes .../Resources/WinClassic/Win95Warning.png | Bin 0 -> 432 bytes TimeHACK.Main/TitleScreen.Designer.cs | 2 +- TimeHACK.Main/bin/Release/TimeHACK.Engine.dll | Bin 126976 -> 126976 bytes TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb | Bin 32256 -> 32256 bytes TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 5488128 -> 5488128 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 4 +-- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 124416 -> 124416 bytes .../bin/Release/TimeHACK.vshost.application | 2 +- .../bin/Release/TimeHACK.vshost.exe.manifest | 4 +-- TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 5488128 -> 5488128 bytes .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 10997 -> 12021 bytes .../TempPE/Properties.Resources.Designer.cs.dll | Bin 9216 -> 9216 bytes ...eHACK.Main.csprojResolveAssemblyReference.cache | Bin 16573 -> 16573 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 5488128 -> 5488128 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 4 +-- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 124416 -> 124416 bytes 38 files changed, 91 insertions(+), 26 deletions(-) create mode 100644 TimeHACK.Engine/Resources/WinClassic/Window/Win95Error.png create mode 100644 TimeHACK.Engine/Resources/WinClassic/Window/Win95Info.png create mode 100644 TimeHACK.Engine/Resources/WinClassic/Window/Win95Warning.png delete mode 100644 TimeHACK.Engine/Resources/WinClassic/Window/WinClassicWarning.png create mode 100644 TimeHACK.Main/Resources/WinClassic/Win95Error.png create mode 100644 TimeHACK.Main/Resources/WinClassic/Win95Info.png create mode 100644 TimeHACK.Main/Resources/WinClassic/Win95Warning.png (limited to 'TimeHACK.Main/TitleScreen.Designer.cs') diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo index ff1e2ef..bddbad5 100644 Binary files a/.vs/TimeHACK/v14/.suo and b/.vs/TimeHACK/v14/.suo differ diff --git a/TimeHACK.Engine/Properties/Resources.Designer.cs b/TimeHACK.Engine/Properties/Resources.Designer.cs index 334f428..b50683f 100644 --- a/TimeHACK.Engine/Properties/Resources.Designer.cs +++ b/TimeHACK.Engine/Properties/Resources.Designer.cs @@ -173,9 +173,9 @@ namespace TimeHACK.Engine.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap WinClassicClose { + internal static System.Drawing.Bitmap Win95Error { get { - object obj = ResourceManager.GetObject("WinClassicClose", resourceCulture); + object obj = ResourceManager.GetObject("Win95Error", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -183,9 +183,9 @@ namespace TimeHACK.Engine.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap WinClassicMax { + internal static System.Drawing.Bitmap Win95Info { get { - object obj = ResourceManager.GetObject("WinClassicMax", resourceCulture); + object obj = ResourceManager.GetObject("Win95Info", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -193,9 +193,9 @@ namespace TimeHACK.Engine.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap WinClassicMin { + internal static System.Drawing.Bitmap Win95Warning { get { - object obj = ResourceManager.GetObject("WinClassicMin", resourceCulture); + object obj = ResourceManager.GetObject("Win95Warning", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -203,9 +203,29 @@ namespace TimeHACK.Engine.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap WinClassicRestore { + internal static System.Drawing.Bitmap WinClassicClose { get { - object obj = ResourceManager.GetObject("WinClassicRestore", resourceCulture); + object obj = ResourceManager.GetObject("WinClassicClose", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap WinClassicMax { + get { + object obj = ResourceManager.GetObject("WinClassicMax", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap WinClassicMin { + get { + object obj = ResourceManager.GetObject("WinClassicMin", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -213,9 +233,9 @@ namespace TimeHACK.Engine.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap WinClassicWarning { + internal static System.Drawing.Bitmap WinClassicRestore { get { - object obj = ResourceManager.GetObject("WinClassicWarning", resourceCulture); + object obj = ResourceManager.GetObject("WinClassicRestore", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } diff --git a/TimeHACK.Engine/Properties/Resources.resx b/TimeHACK.Engine/Properties/Resources.resx index 2763fc4..aa281d1 100644 --- a/TimeHACK.Engine/Properties/Resources.resx +++ b/TimeHACK.Engine/Properties/Resources.resx @@ -163,7 +163,13 @@ ..\resources\winclassic\window\winclassicrestore.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\winclassic\window\winclassicwarning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\Window\Win95Error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\Window\Win95Info.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\Window\Win95Warning.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.Engine/Resources/WinClassic/Window/Win95Error.png b/TimeHACK.Engine/Resources/WinClassic/Window/Win95Error.png new file mode 100644 index 0000000..4667e9d Binary files /dev/null and b/TimeHACK.Engine/Resources/WinClassic/Window/Win95Error.png differ diff --git a/TimeHACK.Engine/Resources/WinClassic/Window/Win95Info.png b/TimeHACK.Engine/Resources/WinClassic/Window/Win95Info.png new file mode 100644 index 0000000..5d2018a Binary files /dev/null and b/TimeHACK.Engine/Resources/WinClassic/Window/Win95Info.png differ diff --git a/TimeHACK.Engine/Resources/WinClassic/Window/Win95Warning.png b/TimeHACK.Engine/Resources/WinClassic/Window/Win95Warning.png new file mode 100644 index 0000000..8e01535 Binary files /dev/null and b/TimeHACK.Engine/Resources/WinClassic/Window/Win95Warning.png differ diff --git a/TimeHACK.Engine/Resources/WinClassic/Window/WinClassicWarning.png b/TimeHACK.Engine/Resources/WinClassic/Window/WinClassicWarning.png deleted file mode 100644 index 7e2e59c..0000000 Binary files a/TimeHACK.Engine/Resources/WinClassic/Window/WinClassicWarning.png and /dev/null differ diff --git a/TimeHACK.Engine/Template/Infobox95.Designer.cs b/TimeHACK.Engine/Template/Infobox95.Designer.cs index cb69fac..d15dea3 100644 --- a/TimeHACK.Engine/Template/Infobox95.Designer.cs +++ b/TimeHACK.Engine/Template/Infobox95.Designer.cs @@ -87,7 +87,7 @@ // pictureBox1 // this.pictureBox1.ErrorImage = null; - this.pictureBox1.Image = global::TimeHACK.Engine.Properties.Resources.WinClassicWarning; + this.pictureBox1.Image = global::TimeHACK.Engine.Properties.Resources.Win95Warning; this.pictureBox1.InitialImage = null; this.pictureBox1.Location = new System.Drawing.Point(8, 33); this.pictureBox1.Name = "pictureBox1"; diff --git a/TimeHACK.Engine/WindowManager.cs b/TimeHACK.Engine/WindowManager.cs index be73ab2..65a0ec5 100644 --- a/TimeHACK.Engine/WindowManager.cs +++ b/TimeHACK.Engine/WindowManager.cs @@ -58,7 +58,7 @@ namespace TimeHACK.Engine return app; } - public Infobox95 startInfobox95(String title, String text) + public Infobox95 startInfobox95(String title, String text, Image erroricon) { Infobox95 app = new Infobox95(); app.Title.Text = title; diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll index ef04c2a..0a13d8f 100644 Binary files a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll and b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb index 01a4f90..80b705d 100644 Binary files a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb and b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb differ diff --git a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index 9381462..d960576 100644 Binary files a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/TimeHACK.Engine/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/TimeHACK.Engine/obj/Release/TempPE/Properties.Resources.Designer.cs.dll index dbb0d34..eeaa15b 100644 Binary files a/TimeHACK.Engine/obj/Release/TempPE/Properties.Resources.Designer.cs.dll and b/TimeHACK.Engine/obj/Release/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll index ef04c2a..0a13d8f 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb index 01a4f90..80b705d 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb differ diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index a259fa5..7679c7a 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -35,13 +35,13 @@ namespace TimeHACK.OS.Win95.Win95Apps if (txtscreenname.Text == "") { WindowManager wm = new WindowManager(); - wm.startInfobox95("Invalid Username", "Your username cannot be blank."); + wm.startInfobox95("Invalid Username", "Your username cannot be blank.", Properties.Resources.Win95Warning); return; } else if (txtscreenname.Text.Length > 12) { WindowManager wm = new WindowManager(); - wm.startInfobox95("Invalid Username", "Your username needs to be less than 12 characters."); + wm.startInfobox95("Invalid Username", "Your username needs to be less than 12 characters.", Properties.Resources.Win95Warning); return; } ParentForm.AcceptButton = button2; diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs index 1865b5e..b68a6f2 100644 --- a/TimeHACK.Main/Properties/Resources.Designer.cs +++ b/TimeHACK.Main/Properties/Resources.Designer.cs @@ -238,6 +238,26 @@ namespace TimeHACK.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Win95Error { + get { + object obj = ResourceManager.GetObject("Win95Error", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Win95Info { + get { + object obj = ResourceManager.GetObject("Win95Info", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -266,6 +286,16 @@ namespace TimeHACK.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Win95Warning { + get { + object obj = ResourceManager.GetObject("Win95Warning", 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 f51d183..d7096e2 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -250,4 +250,13 @@ ..\Resources\WinClassic\sliversilver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\Win95Error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\Win95Info.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\Win95Warning.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/WinClassic/Win95Error.png b/TimeHACK.Main/Resources/WinClassic/Win95Error.png new file mode 100644 index 0000000..4667e9d Binary files /dev/null and b/TimeHACK.Main/Resources/WinClassic/Win95Error.png differ diff --git a/TimeHACK.Main/Resources/WinClassic/Win95Info.png b/TimeHACK.Main/Resources/WinClassic/Win95Info.png new file mode 100644 index 0000000..5d2018a Binary files /dev/null and b/TimeHACK.Main/Resources/WinClassic/Win95Info.png differ diff --git a/TimeHACK.Main/Resources/WinClassic/Win95Warning.png b/TimeHACK.Main/Resources/WinClassic/Win95Warning.png new file mode 100644 index 0000000..8e01535 Binary files /dev/null and b/TimeHACK.Main/Resources/WinClassic/Win95Warning.png differ diff --git a/TimeHACK.Main/TitleScreen.Designer.cs b/TimeHACK.Main/TitleScreen.Designer.cs index 1bb9dca..2777027 100644 --- a/TimeHACK.Main/TitleScreen.Designer.cs +++ b/TimeHACK.Main/TitleScreen.Designer.cs @@ -54,7 +54,7 @@ this.gameversion.AutoSize = true; this.gameversion.BackColor = System.Drawing.Color.Transparent; this.gameversion.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.gameversion.Location = new System.Drawing.Point(25, 8); + this.gameversion.Location = new System.Drawing.Point(25, 6); this.gameversion.Name = "gameversion"; this.gameversion.Size = new System.Drawing.Size(78, 13); this.gameversion.TabIndex = 0; diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll index ef04c2a..0a13d8f 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll and b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb b/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb index 01a4f90..80b705d 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb and b/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application index 0caeed9..1fb9850 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - fKnNtCMWzJ5FDruMlus77oKseVqTKPR1CtiMlKkLtx4= + AwO6OXkOQVExi50oGC9w4YwCEdUdSY0bIMxwJXLF0Mc= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index f854f98..215261d 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.exe and b/TimeHACK.Main/bin/Release/TimeHACK.exe differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest index 515b282..bcb359b 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -63,7 +63,7 @@ - ke+yb6S++pb9eQ7keVJBkXsGT2Fo+xzu55VwmJ6SsAg= + DgwWsOmPm8mC0KMpcotANuhX4vTkbrvn4vNqUvdnI7k= @@ -75,7 +75,7 @@ - Y1QPCUqPsePdcLpE0c4llNeaL2BqfEG6k4jngkXuYoQ= + ENN/ttN6dD185HMujPfXV5rh+8IVRlI2I2eboJ/c3GI= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index f56109d..283347b 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.pdb and b/TimeHACK.Main/bin/Release/TimeHACK.pdb differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application index 0caeed9..1fb9850 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -14,7 +14,7 @@ - fKnNtCMWzJ5FDruMlus77oKseVqTKPR1CtiMlKkLtx4= + AwO6OXkOQVExi50oGC9w4YwCEdUdSY0bIMxwJXLF0Mc= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index 515b282..bcb359b 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -63,7 +63,7 @@ - ke+yb6S++pb9eQ7keVJBkXsGT2Fo+xzu55VwmJ6SsAg= + DgwWsOmPm8mC0KMpcotANuhX4vTkbrvn4vNqUvdnI7k= @@ -75,7 +75,7 @@ - Y1QPCUqPsePdcLpE0c4llNeaL2BqfEG6k4jngkXuYoQ= + ENN/ttN6dD185HMujPfXV5rh+8IVRlI2I2eboJ/c3GI= diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index f854f98..215261d 100644 Binary files a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe and b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe differ diff --git a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index 7d3adc3..049462f 100644 Binary files a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll index df73e28..628d63b 100644 Binary files a/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll and b/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache index 69bd06d..357f866 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache and b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application index 0caeed9..1fb9850 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - fKnNtCMWzJ5FDruMlus77oKseVqTKPR1CtiMlKkLtx4= + AwO6OXkOQVExi50oGC9w4YwCEdUdSY0bIMxwJXLF0Mc= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index f854f98..215261d 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.exe and b/TimeHACK.Main/obj/Release/TimeHACK.exe differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest index 515b282..bcb359b 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -63,7 +63,7 @@ - ke+yb6S++pb9eQ7keVJBkXsGT2Fo+xzu55VwmJ6SsAg= + DgwWsOmPm8mC0KMpcotANuhX4vTkbrvn4vNqUvdnI7k= @@ -75,7 +75,7 @@ - Y1QPCUqPsePdcLpE0c4llNeaL2BqfEG6k4jngkXuYoQ= + ENN/ttN6dD185HMujPfXV5rh+8IVRlI2I2eboJ/c3GI= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index f56109d..283347b 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3