diff options
| author | AShifter <[email protected]> | 2017-04-01 20:01:39 -0600 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-04-01 20:01:39 -0600 |
| commit | 4df4250f29c2fb19f547b9a7e28de72b265eb1b1 (patch) | |
| tree | 3e56fa83746cef51ff7daecaed8d437ff5bb4a17 /TimeHACK.Main | |
| parent | ef8f165210c792e3e8241b84d555bcaed9b55fd0 (diff) | |
| parent | 49907c5f3a594ab3b2385d1d7dec8015c19a5aae (diff) | |
| download | histacom2-4df4250f29c2fb19f547b9a7e28de72b265eb1b1.tar.gz histacom2-4df4250f29c2fb19f547b9a7e28de72b265eb1b1.tar.bz2 histacom2-4df4250f29c2fb19f547b9a7e28de72b265eb1b1.zip | |
Merge pull request #28 from lempamo/master
errors for infoboxes
Diffstat (limited to 'TimeHACK.Main')
25 files changed, 55 insertions, 13 deletions
diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index 8efa6d3..85039ef 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -201,7 +201,7 @@ namespace TimeHACK.OS.Win95 private void infoboxTestToolStripMenuItem_Click(object sender, EventArgs e) { - wm.startInfobox95("AShifter's Infobox", "This is the very first TimeHACK Infobox. It's really easy to call, too! \n Just use wm.startInfobox95(String title, String text)!"); + wm.startInfobox95("AShifter's Infobox", "This is the very first TimeHACK Infobox. It's really easy to call, too! \n Just use wm.startInfobox95(String title, String text, Image erroricon)!", Properties.Resources.Win95Info); } private void WebChatToolStripMenuItem_Click(object sender, EventArgs e) { 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 @@ -241,6 +241,26 @@ namespace TimeHACK.Properties { /// <summary> /// Looks up a localized resource of type System.Drawing.Bitmap. /// </summary> + internal static System.Drawing.Bitmap Win95Error { + get { + object obj = ResourceManager.GetObject("Win95Error", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap Win95Info { + get { + object obj = ResourceManager.GetObject("Win95Info", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> internal static System.Drawing.Bitmap Win95SideBar { get { object obj = ResourceManager.GetObject("Win95SideBar", resourceCulture); @@ -269,6 +289,16 @@ namespace TimeHACK.Properties { /// <summary> /// Looks up a localized resource of type System.Drawing.Bitmap. /// </summary> + internal static System.Drawing.Bitmap Win95Warning { + get { + object obj = ResourceManager.GetObject("Win95Warning", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> internal static System.Drawing.Bitmap WinClassicClock { get { object obj = ResourceManager.GetObject("WinClassicClock", resourceCulture); 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 @@ <data name="sliversilver" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\WinClassic\sliversilver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="Win95Error" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\WinClassic\Win95Error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="Win95Info" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\WinClassic\Win95Info.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="Win95Warning" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\WinClassic\Win95Warning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> </root>
\ No newline at end of file diff --git a/TimeHACK.Main/Resources/WinClassic/Win95Error.png b/TimeHACK.Main/Resources/WinClassic/Win95Error.png Binary files differnew file mode 100644 index 0000000..4667e9d --- /dev/null +++ b/TimeHACK.Main/Resources/WinClassic/Win95Error.png diff --git a/TimeHACK.Main/Resources/WinClassic/Win95Info.png b/TimeHACK.Main/Resources/WinClassic/Win95Info.png Binary files differnew file mode 100644 index 0000000..5d2018a --- /dev/null +++ b/TimeHACK.Main/Resources/WinClassic/Win95Info.png diff --git a/TimeHACK.Main/Resources/WinClassic/Win95Warning.png b/TimeHACK.Main/Resources/WinClassic/Win95Warning.png Binary files differnew file mode 100644 index 0000000..8e01535 --- /dev/null +++ b/TimeHACK.Main/Resources/WinClassic/Win95Warning.png diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index e044640..d7b5a11 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -235,8 +235,11 @@ <None Include="Resources\WinClassic\tada.wav" /> <None Include="Resources\WinClassic\sliversilver.png" /> <Content Include="Resources\WinClassic\TrueColor.png" /> + <None Include="Resources\WinClassic\Win95Info.png" /> + <None Include="Resources\WinClassic\Win95Error.png" /> <Content Include="Resources\WinClassic\Win95SideBar.png" /> <Content Include="Resources\WinClassic\Win95Start.wav" /> + <None Include="Resources\WinClassic\Win95Warning.png" /> <Content Include="Resources\WinClassic\WinClassicClock.png" /> <Content Include="Resources\WinClassic\WinClassicComputer.png" /> <Content Include="Resources\WinClassic\WinClassicDocuments.png" /> 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 Binary files differindex ef04c2a..0a13d8f 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll +++ b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb b/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb Binary files differindex 01a4f90..80b705d 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb +++ b/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb 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 @@ <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> - <dsig:DigestValue>fKnNtCMWzJ5FDruMlus77oKseVqTKPR1CtiMlKkLtx4=</dsig:DigestValue> + <dsig:DigestValue>AwO6OXkOQVExi50oGC9w4YwCEdUdSY0bIMxwJXLF0Mc=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe Binary files differindex f854f98..215261d 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe 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 @@ <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> - <dsig:DigestValue>ke+yb6S++pb9eQ7keVJBkXsGT2Fo+xzu55VwmJ6SsAg=</dsig:DigestValue> + <dsig:DigestValue>DgwWsOmPm8mC0KMpcotANuhX4vTkbrvn4vNqUvdnI7k=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> @@ -75,7 +75,7 @@ <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> - <dsig:DigestValue>Y1QPCUqPsePdcLpE0c4llNeaL2BqfEG6k4jngkXuYoQ=</dsig:DigestValue> + <dsig:DigestValue>ENN/ttN6dD185HMujPfXV5rh+8IVRlI2I2eboJ/c3GI=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb Binary files differindex f56109d..283347b 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.pdb +++ b/TimeHACK.Main/bin/Release/TimeHACK.pdb 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 @@ <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> - <dsig:DigestValue>fKnNtCMWzJ5FDruMlus77oKseVqTKPR1CtiMlKkLtx4=</dsig:DigestValue> + <dsig:DigestValue>AwO6OXkOQVExi50oGC9w4YwCEdUdSY0bIMxwJXLF0Mc=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> 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 @@ <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> - <dsig:DigestValue>ke+yb6S++pb9eQ7keVJBkXsGT2Fo+xzu55VwmJ6SsAg=</dsig:DigestValue> + <dsig:DigestValue>DgwWsOmPm8mC0KMpcotANuhX4vTkbrvn4vNqUvdnI7k=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> @@ -75,7 +75,7 @@ <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> - <dsig:DigestValue>Y1QPCUqPsePdcLpE0c4llNeaL2BqfEG6k4jngkXuYoQ=</dsig:DigestValue> + <dsig:DigestValue>ENN/ttN6dD185HMujPfXV5rh+8IVRlI2I2eboJ/c3GI=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe Binary files differindex f854f98..215261d 100644 --- a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe +++ b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe diff --git a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache Binary files differindex 7d3adc3..049462f 100644 --- a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache +++ b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache diff --git a/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll Binary files differindex df73e28..628d63b 100644 --- a/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll +++ b/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache Binary files differindex 69bd06d..357f866 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache +++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache 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 @@ <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> - <dsig:DigestValue>fKnNtCMWzJ5FDruMlus77oKseVqTKPR1CtiMlKkLtx4=</dsig:DigestValue> + <dsig:DigestValue>AwO6OXkOQVExi50oGC9w4YwCEdUdSY0bIMxwJXLF0Mc=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe Binary files differindex f854f98..215261d 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe 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 @@ <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> - <dsig:DigestValue>ke+yb6S++pb9eQ7keVJBkXsGT2Fo+xzu55VwmJ6SsAg=</dsig:DigestValue> + <dsig:DigestValue>DgwWsOmPm8mC0KMpcotANuhX4vTkbrvn4vNqUvdnI7k=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> @@ -75,7 +75,7 @@ <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> - <dsig:DigestValue>Y1QPCUqPsePdcLpE0c4llNeaL2BqfEG6k4jngkXuYoQ=</dsig:DigestValue> + <dsig:DigestValue>ENN/ttN6dD185HMujPfXV5rh+8IVRlI2I2eboJ/c3GI=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb Binary files differindex f56109d..283347b 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.pdb +++ b/TimeHACK.Main/obj/Release/TimeHACK.pdb |
