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 --- 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 14 files changed, 40 insertions(+), 14 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 (limited to 'TimeHACK.Engine') 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 -- cgit v1.2.3