diff --git a/Build/Sprites/TRNGA0B.png b/Build/Sprites/TRNGA0B.png new file mode 100644 index 0000000000000000000000000000000000000000..d86c10c65fe1082aecc5e3b8cb87aa42cafd7e35 Binary files /dev/null and b/Build/Sprites/TRNGA0B.png differ diff --git a/Build/Sprites/TRNGA0R.png b/Build/Sprites/TRNGA0R.png new file mode 100644 index 0000000000000000000000000000000000000000..8119fd93c2b9108aa03c70c503d06ff5f8e09d64 Binary files /dev/null and b/Build/Sprites/TRNGA0R.png differ diff --git a/Build/Sprites/ZDDomPointA.png b/Build/Sprites/ZDDomPointA.png deleted file mode 100755 index a5728ead4cbaa88869cd7b210f797b392bf892e9..0000000000000000000000000000000000000000 Binary files a/Build/Sprites/ZDDomPointA.png and /dev/null differ diff --git a/Build/Sprites/ZDDomPointB.png b/Build/Sprites/ZDDomPointB.png deleted file mode 100755 index 58a4664f70925e945f6f029a001d7e5c16ee117f..0000000000000000000000000000000000000000 Binary files a/Build/Sprites/ZDDomPointB.png and /dev/null differ diff --git a/Build/Sprites/ZDDomPointC.png b/Build/Sprites/ZDDomPointC.png deleted file mode 100755 index fb317737f5d526cf43b13af382cd370d636aeb57..0000000000000000000000000000000000000000 Binary files a/Build/Sprites/ZDDomPointC.png and /dev/null differ diff --git a/Build/Sprites/ZDFlagBlue.png b/Build/Sprites/ZDFlagBlue.png deleted file mode 100644 index f7c080d9c179054ff9592cc6ee9b3456962bc4bc..0000000000000000000000000000000000000000 Binary files a/Build/Sprites/ZDFlagBlue.png and /dev/null differ diff --git a/Build/Sprites/ZDFlagGreen.png b/Build/Sprites/ZDFlagGreen.png deleted file mode 100644 index e5d7b002caa29a275ae0920bffc4a8779199c789..0000000000000000000000000000000000000000 Binary files a/Build/Sprites/ZDFlagGreen.png and /dev/null differ diff --git a/Build/Sprites/ZDFlagRed.png b/Build/Sprites/ZDFlagRed.png deleted file mode 100644 index d882fa3a9cc37039e87ddcae2dce4f15e004829b..0000000000000000000000000000000000000000 Binary files a/Build/Sprites/ZDFlagRed.png and /dev/null differ diff --git a/Build/Sprites/ZDFlagWhite.png b/Build/Sprites/ZDFlagWhite.png deleted file mode 100644 index d2abb48ac72724fce21700b85305a88abbf9e582..0000000000000000000000000000000000000000 Binary files a/Build/Sprites/ZDFlagWhite.png and /dev/null differ diff --git a/Build/Sprites/ZDRailgun.png b/Build/Sprites/ZDRailgun.png deleted file mode 100644 index 0d02d62b4173a943c0baf65f5d07355ba31874ad..0000000000000000000000000000000000000000 Binary files a/Build/Sprites/ZDRailgun.png and /dev/null differ diff --git a/Build/Sprites/ZDoomGoldWand.png b/Build/Sprites/ZDoomGoldWand.png deleted file mode 100755 index f887f04c65d070bff04ff7b7d19354a91daf471a..0000000000000000000000000000000000000000 Binary files a/Build/Sprites/ZDoomGoldWand.png and /dev/null differ diff --git a/Build/Sprites/ZDoomPistol.png b/Build/Sprites/ZDoomPistol.png deleted file mode 100755 index 74ff02360e95494dfa244cb90a2d5f5d570be7d2..0000000000000000000000000000000000000000 Binary files a/Build/Sprites/ZDoomPistol.png and /dev/null differ diff --git a/Build/Sprites/ZandFlagBlue.png b/Build/Sprites/ZandFlagBlue.png deleted file mode 100755 index 0a5d993e014f42bd0c0d36f107df9fa9a3508996..0000000000000000000000000000000000000000 Binary files a/Build/Sprites/ZandFlagBlue.png and /dev/null differ diff --git a/Build/Sprites/ZandFlagGold.png b/Build/Sprites/ZandFlagGold.png deleted file mode 100755 index d53364393eed084aa2af1f920967962aef883509..0000000000000000000000000000000000000000 Binary files a/Build/Sprites/ZandFlagGold.png and /dev/null differ diff --git a/Build/Sprites/ZandFlagGreen.png b/Build/Sprites/ZandFlagGreen.png deleted file mode 100755 index 45815c18ec3645a0e594035c985a3d1dbe1d76d8..0000000000000000000000000000000000000000 Binary files a/Build/Sprites/ZandFlagGreen.png and /dev/null differ diff --git a/Build/Sprites/ZandFlagRed.png b/Build/Sprites/ZandFlagRed.png deleted file mode 100755 index 27bd2e87e58a77d5e4e71d21408d0f96c6dd8e9b..0000000000000000000000000000000000000000 Binary files a/Build/Sprites/ZandFlagRed.png and /dev/null differ diff --git a/Build/Sprites/ZandFlagWhite.png b/Build/Sprites/ZandFlagWhite.png deleted file mode 100755 index c12a857e3acb3696c83454baf921e204e936e04a..0000000000000000000000000000000000000000 Binary files a/Build/Sprites/ZandFlagWhite.png and /dev/null differ diff --git a/Build/Sprites/ZandRuneDrain.png b/Build/Sprites/ZandRuneDrain.png deleted file mode 100755 index 52336d0054e7facf7703f4b3d9bd9ca2b6770d1b..0000000000000000000000000000000000000000 Binary files a/Build/Sprites/ZandRuneDrain.png and /dev/null differ diff --git a/Build/Sprites/ZandRuneHaste.png b/Build/Sprites/ZandRuneHaste.png deleted file mode 100755 index 542961288d28490f18738c80a8347d298ee034a5..0000000000000000000000000000000000000000 Binary files a/Build/Sprites/ZandRuneHaste.png and /dev/null differ diff --git a/Build/Sprites/ZandRuneHighJump.png b/Build/Sprites/ZandRuneHighJump.png deleted file mode 100755 index 66263d1ac8f01eae7a57c6fda606c984022dcf13..0000000000000000000000000000000000000000 Binary files a/Build/Sprites/ZandRuneHighJump.png and /dev/null differ diff --git a/Build/Sprites/ZandRuneProsperity.png b/Build/Sprites/ZandRuneProsperity.png deleted file mode 100755 index 9f5f6e23cc630b15c1739804c467447964100034..0000000000000000000000000000000000000000 Binary files a/Build/Sprites/ZandRuneProsperity.png and /dev/null differ diff --git a/Build/Sprites/ZandRuneRage.png b/Build/Sprites/ZandRuneRage.png deleted file mode 100755 index 409c397fdc536d7c2a449c5a194cd94656602b64..0000000000000000000000000000000000000000 Binary files a/Build/Sprites/ZandRuneRage.png and /dev/null differ diff --git a/Build/Sprites/ZandRuneReflection.png b/Build/Sprites/ZandRuneReflection.png deleted file mode 100755 index ec662f13d3cd05ee8a2f64e508791255ae257963..0000000000000000000000000000000000000000 Binary files a/Build/Sprites/ZandRuneReflection.png and /dev/null differ diff --git a/Build/Sprites/ZandRuneRegeneration.png b/Build/Sprites/ZandRuneRegeneration.png deleted file mode 100755 index 5c99fe6c8200be54c8babcd62b7b9150a2d2068a..0000000000000000000000000000000000000000 Binary files a/Build/Sprites/ZandRuneRegeneration.png and /dev/null differ diff --git a/Build/Sprites/ZandRuneResistance.png b/Build/Sprites/ZandRuneResistance.png deleted file mode 100755 index 55a50a3dbfebe4868cfd47572b78e1142a3c55f8..0000000000000000000000000000000000000000 Binary files a/Build/Sprites/ZandRuneResistance.png and /dev/null differ diff --git a/Build/Sprites/ZandRuneSpread.png b/Build/Sprites/ZandRuneSpread.png deleted file mode 100755 index e7de298da3c6c08aa04af569d301f98a73e5b87c..0000000000000000000000000000000000000000 Binary files a/Build/Sprites/ZandRuneSpread.png and /dev/null differ diff --git a/Build/Sprites/ZandRuneStrength.png b/Build/Sprites/ZandRuneStrength.png deleted file mode 100755 index f5b0e476b46991cfe5a76f845a0a711460670c20..0000000000000000000000000000000000000000 Binary files a/Build/Sprites/ZandRuneStrength.png and /dev/null differ diff --git a/Build/Sprites/ambiance.png b/Build/Sprites/ambiance.png new file mode 100644 index 0000000000000000000000000000000000000000..32c17e5f43da6f489048f267790eece163ea77a8 Binary files /dev/null and b/Build/Sprites/ambiance.png differ diff --git a/Build/Sprites/axis1.png b/Build/Sprites/axis1.png new file mode 100644 index 0000000000000000000000000000000000000000..af4e6b234e5ec35c65c65f4fbb941f53e7a25af5 Binary files /dev/null and b/Build/Sprites/axis1.png differ diff --git a/Build/Sprites/axis2.png b/Build/Sprites/axis2.png new file mode 100644 index 0000000000000000000000000000000000000000..69fd1678a4e465052b2b7d47ec1d00fd6fddd622 Binary files /dev/null and b/Build/Sprites/axis2.png differ diff --git a/Build/Sprites/axis3.png b/Build/Sprites/axis3.png new file mode 100644 index 0000000000000000000000000000000000000000..1e73535e0c822d840767ffa5f7a6fe1d6349a9b7 Binary files /dev/null and b/Build/Sprites/axis3.png differ diff --git a/Build/Sprites/blastexec.png b/Build/Sprites/blastexec.png new file mode 100644 index 0000000000000000000000000000000000000000..a69bf214b0867a165d2df8e1a822dd6ee8e2c19c Binary files /dev/null and b/Build/Sprites/blastexec.png differ diff --git a/Build/Sprites/cannonball.png b/Build/Sprites/cannonball.png new file mode 100644 index 0000000000000000000000000000000000000000..ec9196f67d8f3e805b4e62378b4bc5bc87c2eaed Binary files /dev/null and b/Build/Sprites/cannonball.png differ diff --git a/Build/Sprites/capsule.png b/Build/Sprites/capsule.png new file mode 100644 index 0000000000000000000000000000000000000000..088152e177ff07bace6bdc63e88d1a9528a2791b Binary files /dev/null and b/Build/Sprites/capsule.png differ diff --git a/Build/Sprites/circlebigring.png b/Build/Sprites/circlebigring.png new file mode 100644 index 0000000000000000000000000000000000000000..39fb28c861b4b135f1f5397788b03ca95dcf0f6f Binary files /dev/null and b/Build/Sprites/circlebigring.png differ diff --git a/Build/Sprites/circlebigringsphere.png b/Build/Sprites/circlebigringsphere.png new file mode 100644 index 0000000000000000000000000000000000000000..7e88bde572fc323971054cfb538f7c33812742d0 Binary files /dev/null and b/Build/Sprites/circlebigringsphere.png differ diff --git a/Build/Sprites/circlebigsphere.png b/Build/Sprites/circlebigsphere.png new file mode 100644 index 0000000000000000000000000000000000000000..754c2b041d0c4b6ce4f97744780f7ba9fb609780 Binary files /dev/null and b/Build/Sprites/circlebigsphere.png differ diff --git a/Build/Sprites/circlering.png b/Build/Sprites/circlering.png new file mode 100644 index 0000000000000000000000000000000000000000..583e43b7ac8381df8be216506a1f24078c39c451 Binary files /dev/null and b/Build/Sprites/circlering.png differ diff --git a/Build/Sprites/circleringsphere.png b/Build/Sprites/circleringsphere.png new file mode 100644 index 0000000000000000000000000000000000000000..c5cd334bd59f79d1172f1a8e70063f9bbc219201 Binary files /dev/null and b/Build/Sprites/circleringsphere.png differ diff --git a/Build/Sprites/circlesphere.png b/Build/Sprites/circlesphere.png new file mode 100644 index 0000000000000000000000000000000000000000..d933ac65817cfbe5b13ca383eba2f459b8d89981 Binary files /dev/null and b/Build/Sprites/circlesphere.png differ diff --git a/Build/Sprites/eggmanend.png b/Build/Sprites/eggmanend.png new file mode 100644 index 0000000000000000000000000000000000000000..094aba45b4ff527ef1adfec35756f97e32eac1f8 Binary files /dev/null and b/Build/Sprites/eggmanend.png differ diff --git a/Build/Sprites/eggmanway.png b/Build/Sprites/eggmanway.png new file mode 100644 index 0000000000000000000000000000000000000000..2ea806b5df1b29b1a445baa57eefba0a57447430 Binary files /dev/null and b/Build/Sprites/eggmanway.png differ diff --git a/Build/Sprites/fanparticles.png b/Build/Sprites/fanparticles.png new file mode 100644 index 0000000000000000000000000000000000000000..8614aeb4d2526e615af6e83a5377e1d70ba3e410 Binary files /dev/null and b/Build/Sprites/fanparticles.png differ diff --git a/Build/Sprites/flame1.png b/Build/Sprites/flame1.png new file mode 100644 index 0000000000000000000000000000000000000000..21e85fb8b48eebc60e209c1317ef07e4316e577e Binary files /dev/null and b/Build/Sprites/flame1.png differ diff --git a/Build/Sprites/flame2.png b/Build/Sprites/flame2.png new file mode 100644 index 0000000000000000000000000000000000000000..9b04ac7e207b967d11253815fcbabaf2a022cb9b Binary files /dev/null and b/Build/Sprites/flame2.png differ diff --git a/Build/Sprites/flameh.png b/Build/Sprites/flameh.png new file mode 100644 index 0000000000000000000000000000000000000000..031c00dfb38ad7e746200ca77f2c02256f6aa814 Binary files /dev/null and b/Build/Sprites/flameh.png differ diff --git a/Build/Sprites/flamev.png b/Build/Sprites/flamev.png new file mode 100644 index 0000000000000000000000000000000000000000..ec2c876b0e4ea7153557d3360eb1fe49e3caaeab Binary files /dev/null and b/Build/Sprites/flamev.png differ diff --git a/Build/Sprites/metal.png b/Build/Sprites/metal.png new file mode 100644 index 0000000000000000000000000000000000000000..949d10246d301e722bb39dd0e0069d57e24644e3 Binary files /dev/null and b/Build/Sprites/metal.png differ diff --git a/Build/Sprites/nightshoop.png b/Build/Sprites/nightshoop.png new file mode 100644 index 0000000000000000000000000000000000000000..26b3147869a89dfa0a780ba2f3aa8da80016e214 Binary files /dev/null and b/Build/Sprites/nightshoop.png differ diff --git a/Build/Sprites/polyanchor.png b/Build/Sprites/polyanchor.png new file mode 100644 index 0000000000000000000000000000000000000000..ccec9b81681f5ae96a6a94a2e8c33b134909db5b Binary files /dev/null and b/Build/Sprites/polyanchor.png differ diff --git a/Build/Sprites/polycenter.png b/Build/Sprites/polycenter.png new file mode 100644 index 0000000000000000000000000000000000000000..0efebf628f55f9814ede7a1430b25498fdfb8993 Binary files /dev/null and b/Build/Sprites/polycenter.png differ diff --git a/Build/Sprites/polycentercrush.png b/Build/Sprites/polycentercrush.png new file mode 100644 index 0000000000000000000000000000000000000000..70ddde9e3f5651178336da8b0952e32952c73403 Binary files /dev/null and b/Build/Sprites/polycentercrush.png differ diff --git a/Build/Sprites/ringverticalred.png b/Build/Sprites/ringverticalred.png new file mode 100644 index 0000000000000000000000000000000000000000..f30df04741453a4e9d05b571f38749e1f9c8e519 Binary files /dev/null and b/Build/Sprites/ringverticalred.png differ diff --git a/Build/Sprites/ringverticalyellow.png b/Build/Sprites/ringverticalyellow.png new file mode 100644 index 0000000000000000000000000000000000000000..541fea470bf40552321e880e952fd78b6150abba Binary files /dev/null and b/Build/Sprites/ringverticalyellow.png differ diff --git a/Build/Sprites/skyb.png b/Build/Sprites/skyb.png new file mode 100644 index 0000000000000000000000000000000000000000..908677a72a6b3264a2a380c6940527d9893c2b71 Binary files /dev/null and b/Build/Sprites/skyb.png differ diff --git a/Build/Sprites/tele.png b/Build/Sprites/tele.png new file mode 100644 index 0000000000000000000000000000000000000000..33eb7181ca33ba8d533fe7e231f7d837efff1d6c Binary files /dev/null and b/Build/Sprites/tele.png differ diff --git a/Build/Sprites/vertexslope.png b/Build/Sprites/vertexslope.png new file mode 100644 index 0000000000000000000000000000000000000000..c070bf426f45723cfd1c3966228cfa849c7021cb Binary files /dev/null and b/Build/Sprites/vertexslope.png differ diff --git a/Build/Sprites/view.png b/Build/Sprites/view.png new file mode 100644 index 0000000000000000000000000000000000000000..4f118ac705a339ddb61540f09fc6c7e3b17bddc4 Binary files /dev/null and b/Build/Sprites/view.png differ diff --git a/Build/Sprites/zoom.png b/Build/Sprites/zoom.png new file mode 100644 index 0000000000000000000000000000000000000000..6283111b2e976ffc2e6464f1af9e4339eca440b8 Binary files /dev/null and b/Build/Sprites/zoom.png differ diff --git a/Source/Core/Builder.csproj b/Source/Core/Builder.csproj index f7615e19b1962effd65356eb8f5f83c66bd87b1b..d4b468cb15995ef7b4a54d4a4209032b3607303d 100644 --- a/Source/Core/Builder.csproj +++ b/Source/Core/Builder.csproj @@ -11,7 +11,7 @@ <RootNamespace>CodeImp.DoomBuilder</RootNamespace> <AssemblyName>Builder</AssemblyName> <StartupObject>CodeImp.DoomBuilder.General</StartupObject> - <ApplicationIcon>Resources\UDB2.ico</ApplicationIcon> + <ApplicationIcon>Resources\UZB.ico</ApplicationIcon> <Win32Resource> </Win32Resource> <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent> @@ -906,6 +906,9 @@ <EmbeddedResource Include="Resources\MissingTexture3D.png" /> </ItemGroup> <ItemGroup> + <None Include="Resources\UZB16.png" /> + <None Include="Resources\UZB_Splash.png" /> + <None Include="Resources\UZB.ico" /> <None Include="Resources\Updater.ico" /> <None Include="Resources\UDB2.ico" /> <None Include="app.manifest" /> @@ -1416,6 +1419,7 @@ <EmbeddedResource Include="Resources\Folder96.png" /> <EmbeddedResource Include="Resources\Folder96Up.png" /> <None Include="Resources\Github.png" /> + <None Include="Resources\gitlab.png" /> <Content Include="Resources\Light.png" /> <None Include="Resources\Lightbulb.png" /> <None Include="Resources\LightDisabled.png" /> diff --git a/Source/Core/Controls/RenderTargetControl.cs b/Source/Core/Controls/RenderTargetControl.cs index 467a97063f56c77ec870df7234e2f94dd46f707c..ccad865a32ec439a48f8d966d34b25a9f92be24a 100755 --- a/Source/Core/Controls/RenderTargetControl.cs +++ b/Source/Core/Controls/RenderTargetControl.cs @@ -101,7 +101,7 @@ namespace CodeImp.DoomBuilder.Controls this.SetStyle(ControlStyles.Opaque, false); this.UpdateStyles(); this.BackColor = Color.FromArgb(32, 32, 40); - this.BackgroundImage = Properties.Resources.Splash3_trans; + this.BackgroundImage = Properties.Resources.UZB_Splash; this.BackgroundImageLayout = ImageLayout.Center; } diff --git a/Source/Core/General/General.cs b/Source/Core/General/General.cs index 4f1b77df24392f122fcbec8d65943b50383bdd45..fb3a2321a79607ac25a8640db45dfd7d069c8361 100755 --- a/Source/Core/General/General.cs +++ b/Source/Core/General/General.cs @@ -665,7 +665,7 @@ namespace CodeImp.DoomBuilder // Remove the previous log file and start logging if(File.Exists(logfile)) File.Delete(logfile); string platform = Environment.Is64BitProcess ? "x64" : "x86"; - General.WriteLogLine("Ultimate Doom Builder R" + thisasm.GetName().Version.Revision + " (" + platform + ", " + commithash + ") startup"); //mxd + General.WriteLogLine("Ultimate Zone Builder R" + thisasm.GetName().Version.Revision + " (" + platform + ", " + commithash + ") startup"); //mxd General.WriteLogLine("Application path: \"" + apppath + "\""); General.WriteLogLine("Temporary path: \"" + temppath + "\""); General.WriteLogLine("Local settings path: \"" + settingspath + "\""); diff --git a/Source/Core/Properties/AssemblyInfo.cs b/Source/Core/Properties/AssemblyInfo.cs index e2ca63a53f1d0dc2c3c0350f6d8b488165fa1816..d07414948e57294bb7f528893a2cc8fd17323d70 100755 --- a/Source/Core/Properties/AssemblyInfo.cs +++ b/Source/Core/Properties/AssemblyInfo.cs @@ -6,12 +6,12 @@ using CodeImp.DoomBuilder; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("Ultimate Doom Builder")] -[assembly: AssemblyDescription("ZDoom, GZDoom and Zandronum map editor (can be used for Vanilla/Boom mapping too!)")] +[assembly: AssemblyTitle("Ultimate Zone Builder")] +[assembly: AssemblyDescription("SRB2 UDMF map editor, based on Ultimate Doom Builder")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("CodeImp, MaxED, ZZYZX, boris, dpJudas and others")] -[assembly: AssemblyProduct("Ultimate Doom Builder")] -[assembly: AssemblyCopyright("Copyright © 2007, 2016, 2017-2019")] +[assembly: AssemblyCompany("Sonic Team Junior")] +[assembly: AssemblyProduct("Ultimate Zone Builder")] +[assembly: AssemblyCopyright("Copyright © 2023")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -30,6 +30,5 @@ using CodeImp.DoomBuilder; // Build Number // Revision // -[assembly: AssemblyVersion("3.0.0.3274")] +[assembly: AssemblyVersion("1.0.0.4108")] [assembly: NeutralResourcesLanguageAttribute("en")] -[assembly: AssemblyHash("cbe8abb")] diff --git a/Source/Core/Properties/Resources.Designer.cs b/Source/Core/Properties/Resources.Designer.cs index f4a71b5804fe03b892a802c86e0ed2903b263389..b69a7c8f9d152ab6e322aba8dcab5b502683059f 100755 --- a/Source/Core/Properties/Resources.Designer.cs +++ b/Source/Core/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace CodeImp.DoomBuilder.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -540,6 +540,16 @@ namespace CodeImp.DoomBuilder.Properties { } } + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap GitLab { + get { + object obj = ResourceManager.GetObject("GitLab", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// <summary> /// Looks up a localized resource of type System.Drawing.Bitmap. /// </summary> @@ -1620,6 +1630,36 @@ namespace CodeImp.DoomBuilder.Properties { } } + /// <summary> + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// </summary> + internal static System.Drawing.Icon UZB { + get { + object obj = ResourceManager.GetObject("UZB", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap UZB_Splash { + get { + object obj = ResourceManager.GetObject("UZB_Splash", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap UZB16 { + get { + object obj = ResourceManager.GetObject("UZB16", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// <summary> /// Looks up a localized resource of type System.Drawing.Bitmap. /// </summary> diff --git a/Source/Core/Properties/Resources.resx b/Source/Core/Properties/Resources.resx index a08407a32a00c08c1764620bff67feb673568e18..c32a8ed649888de8de9bc29aa5206f938a3a3424 100755 --- a/Source/Core/Properties/Resources.resx +++ b/Source/Core/Properties/Resources.resx @@ -214,9 +214,6 @@ <data name="Search" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\Search.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="Splash3_trans" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\Splash3_trans.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> <data name="Close" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\Close.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -625,4 +622,19 @@ <data name="Loader" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\Loader.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="UZB" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\UZB.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="GitLab" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\gitlab.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="Splash3_trans" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Splash3_trans.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="UZB16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\UZB16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="UZB_Splash" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\UZB_Splash.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/Source/Core/Resources/UZB.ico b/Source/Core/Resources/UZB.ico new file mode 100644 index 0000000000000000000000000000000000000000..9ecf64aa84442dc3ef258f6090138011a4e28a26 Binary files /dev/null and b/Source/Core/Resources/UZB.ico differ diff --git a/Source/Core/Resources/UZB16.png b/Source/Core/Resources/UZB16.png new file mode 100644 index 0000000000000000000000000000000000000000..fa75527459760bbdb4a907a50a918a38e3b18dd4 Binary files /dev/null and b/Source/Core/Resources/UZB16.png differ diff --git a/Source/Core/Resources/UZB_Splash.png b/Source/Core/Resources/UZB_Splash.png new file mode 100644 index 0000000000000000000000000000000000000000..c3d3575be09c95094b28d4024e5c49f14f49cf2c Binary files /dev/null and b/Source/Core/Resources/UZB_Splash.png differ diff --git a/Source/Core/Resources/gitlab.png b/Source/Core/Resources/gitlab.png new file mode 100644 index 0000000000000000000000000000000000000000..0edd4925cd1aea8a27a22de17dac7403f51a5a71 Binary files /dev/null and b/Source/Core/Resources/gitlab.png differ diff --git a/Source/Core/Windows/AboutForm.Designer.cs b/Source/Core/Windows/AboutForm.Designer.cs index f39533c20de210cf3fca21f04c1432ec0fdeab19..ec351ba0075e0876a345d7b0c4101ee5697fb84d 100755 --- a/Source/Core/Windows/AboutForm.Designer.cs +++ b/Source/Core/Windows/AboutForm.Designer.cs @@ -1,3 +1,5 @@ +using System.Drawing; + namespace CodeImp.DoomBuilder.Windows { partial class AboutForm @@ -28,318 +30,387 @@ namespace CodeImp.DoomBuilder.Windows /// </summary> private void InitializeComponent() { - System.Windows.Forms.PictureBox pictureBox5; - System.Windows.Forms.PictureBox pictureBox3; - System.Windows.Forms.Label label4; - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutForm)); - this.close = new System.Windows.Forms.Button(); - this.tabControl1 = new System.Windows.Forms.TabControl(); - this.tabPage1 = new System.Windows.Forms.TabPage(); - this.panel1 = new System.Windows.Forms.Panel(); - this.version = new System.Windows.Forms.Label(); - this.copyversion = new System.Windows.Forms.Button(); - this.gitlink = new System.Windows.Forms.LinkLabel(); - this.label2 = new System.Windows.Forms.Label(); - this.zdoomorglink = new System.Windows.Forms.LinkLabel(); - this.tabPage3 = new System.Windows.Forms.TabPage(); - this.linkLabel4 = new System.Windows.Forms.LinkLabel(); - this.linkLabel3 = new System.Windows.Forms.LinkLabel(); - this.codeimplink = new System.Windows.Forms.LinkLabel(); - this.pictureBox4 = new System.Windows.Forms.PictureBox(); - this.builderlink = new System.Windows.Forms.LinkLabel(); - this.label3 = new System.Windows.Forms.Label(); - this.pictureBox6 = new System.Windows.Forms.PictureBox(); - pictureBox5 = new System.Windows.Forms.PictureBox(); - pictureBox3 = new System.Windows.Forms.PictureBox(); - label4 = new System.Windows.Forms.Label(); - ((System.ComponentModel.ISupportInitialize)(pictureBox5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(pictureBox3)).BeginInit(); - this.tabControl1.SuspendLayout(); - this.tabPage1.SuspendLayout(); - this.panel1.SuspendLayout(); - this.tabPage3.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).BeginInit(); - this.SuspendLayout(); - // - // pictureBox5 - // - pictureBox5.BackgroundImage = global::CodeImp.DoomBuilder.Properties.Resources.GZDB_Logo_small; - pictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - pictureBox5.Location = new System.Drawing.Point(12, 10); - pictureBox5.Name = "pictureBox5"; - pictureBox5.Size = new System.Drawing.Size(226, 80); - pictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - pictureBox5.TabIndex = 19; - pictureBox5.TabStop = false; - // - // pictureBox3 - // - pictureBox3.BackgroundImage = global::CodeImp.DoomBuilder.Properties.Resources.Splash3_small; - pictureBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - pictureBox3.Location = new System.Drawing.Point(12, 129); - pictureBox3.Name = "pictureBox3"; - pictureBox3.Size = new System.Drawing.Size(226, 80); - pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - pictureBox3.TabIndex = 23; - pictureBox3.TabStop = false; - // - // label4 - // - label4.BackColor = System.Drawing.SystemColors.Window; - label4.FlatStyle = System.Windows.Forms.FlatStyle.System; - label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - label4.Location = new System.Drawing.Point(244, 129); - label4.Name = "label4"; - label4.Size = new System.Drawing.Size(224, 80); - label4.TabIndex = 24; - label4.Text = "Doom Builder is designed and programmed by Pascal vd Heiden.\r\nSeveral game config" + + System.Windows.Forms.PictureBox pictureBox5; + System.Windows.Forms.PictureBox pictureBox3; + System.Windows.Forms.Label label4; + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutForm)); + this.close = new System.Windows.Forms.Button(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.linkLabel1 = new System.Windows.Forms.LinkLabel(); + this.label1 = new System.Windows.Forms.Label(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.version = new System.Windows.Forms.Label(); + this.copyversion = new System.Windows.Forms.Button(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.gitlink = new System.Windows.Forms.LinkLabel(); + this.label2 = new System.Windows.Forms.Label(); + this.zdoomorglink = new System.Windows.Forms.LinkLabel(); + this.tabPage3 = new System.Windows.Forms.TabPage(); + this.linkLabel4 = new System.Windows.Forms.LinkLabel(); + this.linkLabel3 = new System.Windows.Forms.LinkLabel(); + this.codeimplink = new System.Windows.Forms.LinkLabel(); + this.pictureBox4 = new System.Windows.Forms.PictureBox(); + this.builderlink = new System.Windows.Forms.LinkLabel(); + this.label3 = new System.Windows.Forms.Label(); + this.pictureBox6 = new System.Windows.Forms.PictureBox(); + this.label5 = new System.Windows.Forms.Label(); + pictureBox5 = new System.Windows.Forms.PictureBox(); + pictureBox3 = new System.Windows.Forms.PictureBox(); + label4 = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(pictureBox5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(pictureBox3)).BeginInit(); + this.tabControl1.SuspendLayout(); + this.tabPage2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.panel1.SuspendLayout(); + this.tabPage1.SuspendLayout(); + this.tabPage3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).BeginInit(); + this.SuspendLayout(); + // + // pictureBox5 + // + pictureBox5.BackgroundImage = global::CodeImp.DoomBuilder.Properties.Resources.GZDB_Logo_small; + pictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + pictureBox5.Location = new System.Drawing.Point(12, 10); + pictureBox5.Name = "pictureBox5"; + pictureBox5.Size = new System.Drawing.Size(226, 80); + pictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + pictureBox5.TabIndex = 19; + pictureBox5.TabStop = false; + // + // pictureBox3 + // + pictureBox3.BackgroundImage = global::CodeImp.DoomBuilder.Properties.Resources.Splash3_small; + pictureBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + pictureBox3.Location = new System.Drawing.Point(12, 129); + pictureBox3.Name = "pictureBox3"; + pictureBox3.Size = new System.Drawing.Size(226, 80); + pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + pictureBox3.TabIndex = 23; + pictureBox3.TabStop = false; + // + // label4 + // + label4.BackColor = System.Drawing.SystemColors.Window; + label4.FlatStyle = System.Windows.Forms.FlatStyle.System; + label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + label4.Location = new System.Drawing.Point(244, 129); + label4.Name = "label4"; + label4.Size = new System.Drawing.Size(224, 80); + label4.TabIndex = 24; + label4.Text = "Doom Builder is designed and programmed by Pascal vd Heiden.\r\nSeveral game config" + "urations were written by various members of the Doom community. See the website " + "for a complete list of credits."; - // - // close - // - this.close.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.close.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.close.Location = new System.Drawing.Point(472, 298); - this.close.Name = "close"; - this.close.Size = new System.Drawing.Size(116, 25); - this.close.TabIndex = 5; - this.close.Text = "Close"; - this.close.UseVisualStyleBackColor = true; - // - // tabControl1 - // - this.tabControl1.Controls.Add(this.tabPage1); - this.tabControl1.Controls.Add(this.tabPage3); - this.tabControl1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.tabControl1.Location = new System.Drawing.Point(12, 12); - this.tabControl1.Name = "tabControl1"; - this.tabControl1.Padding = new System.Drawing.Point(24, 3); - this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(576, 280); - this.tabControl1.TabIndex = 11; - // - // tabPage1 - // - this.tabPage1.BackgroundImage = global::CodeImp.DoomBuilder.Properties.Resources.AboutBack; - this.tabPage1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.tabPage1.Controls.Add(this.panel1); - this.tabPage1.Controls.Add(this.gitlink); - this.tabPage1.Controls.Add(this.label2); - this.tabPage1.Controls.Add(this.zdoomorglink); - this.tabPage1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.tabPage1.Location = new System.Drawing.Point(4, 22); - this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(568, 254); - this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "About Ultimate Doom Builder"; - this.tabPage1.UseVisualStyleBackColor = true; - // - // panel1 - // - this.panel1.BackColor = System.Drawing.SystemColors.Window; - this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel1.Controls.Add(this.version); - this.panel1.Controls.Add(this.copyversion); - this.panel1.Location = new System.Drawing.Point(17, 16); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(417, 38); - this.panel1.TabIndex = 19; - // - // version - // - this.version.AutoSize = true; - this.version.BackColor = System.Drawing.SystemColors.Window; - this.version.FlatStyle = System.Windows.Forms.FlatStyle.System; - this.version.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.version.Location = new System.Drawing.Point(10, 12); - this.version.Name = "version"; - this.version.Size = new System.Drawing.Size(210, 13); - this.version.TabIndex = 11; - this.version.Text = "Ultimate Doom Builder some version"; - // - // copyversion - // - this.copyversion.Location = new System.Drawing.Point(328, 5); - this.copyversion.Name = "copyversion"; - this.copyversion.Size = new System.Drawing.Size(81, 25); - this.copyversion.TabIndex = 13; - this.copyversion.Text = "Copy Version"; - this.copyversion.UseVisualStyleBackColor = true; - this.copyversion.Click += new System.EventHandler(this.copyversion_Click); - // - // gitlink - // - this.gitlink.AutoSize = true; - this.gitlink.LinkColor = System.Drawing.Color.White; - this.gitlink.Location = new System.Drawing.Point(174, 225); - this.gitlink.Name = "gitlink"; - this.gitlink.Size = new System.Drawing.Size(134, 13); - this.gitlink.TabIndex = 18; - this.gitlink.TabStop = true; - this.gitlink.Text = "Project page at github.com"; - this.gitlink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.gitlink_LinkClicked); - // - // label2 - // - this.label2.AutoSize = true; - this.label2.ForeColor = System.Drawing.Color.White; - this.label2.Location = new System.Drawing.Point(19, 65); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(343, 143); - this.label2.TabIndex = 17; - this.label2.Text = resources.GetString("label2.Text"); - // - // zdoomorglink - // - this.zdoomorglink.AutoSize = true; - this.zdoomorglink.LinkColor = System.Drawing.Color.White; - this.zdoomorglink.Location = new System.Drawing.Point(19, 225); - this.zdoomorglink.Name = "zdoomorglink"; - this.zdoomorglink.Size = new System.Drawing.Size(140, 13); - this.zdoomorglink.TabIndex = 15; - this.zdoomorglink.TabStop = true; - this.zdoomorglink.Text = "Official thread at ZDoom.org"; - this.zdoomorglink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.zdoomorglink_LinkClicked); - // - // tabPage3 - // - this.tabPage3.Controls.Add(this.linkLabel4); - this.tabPage3.Controls.Add(this.linkLabel3); - this.tabPage3.Controls.Add(pictureBox3); - this.tabPage3.Controls.Add(this.codeimplink); - this.tabPage3.Controls.Add(label4); - this.tabPage3.Controls.Add(this.pictureBox4); - this.tabPage3.Controls.Add(this.builderlink); - this.tabPage3.Controls.Add(this.label3); - this.tabPage3.Controls.Add(pictureBox5); - this.tabPage3.Controls.Add(this.pictureBox6); - this.tabPage3.Location = new System.Drawing.Point(4, 22); - this.tabPage3.Name = "tabPage3"; - this.tabPage3.Padding = new System.Windows.Forms.Padding(3); - this.tabPage3.Size = new System.Drawing.Size(568, 254); - this.tabPage3.TabIndex = 2; - this.tabPage3.Text = "Based on..."; - this.tabPage3.UseVisualStyleBackColor = true; - // - // linkLabel4 - // - this.linkLabel4.ActiveLinkColor = System.Drawing.Color.Firebrick; - this.linkLabel4.AutoSize = true; - this.linkLabel4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.linkLabel4.LinkColor = System.Drawing.SystemColors.HotTrack; - this.linkLabel4.Location = new System.Drawing.Point(158, 99); - this.linkLabel4.Name = "linkLabel4"; - this.linkLabel4.Size = new System.Drawing.Size(134, 13); - this.linkLabel4.TabIndex = 29; - this.linkLabel4.TabStop = true; - this.linkLabel4.Text = "Project page at github.com"; - this.linkLabel4.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel4_LinkClicked); - // - // linkLabel3 - // - this.linkLabel3.ActiveLinkColor = System.Drawing.Color.Firebrick; - this.linkLabel3.AutoSize = true; - this.linkLabel3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.linkLabel3.LinkColor = System.Drawing.SystemColors.HotTrack; - this.linkLabel3.Location = new System.Drawing.Point(12, 99); - this.linkLabel3.Name = "linkLabel3"; - this.linkLabel3.Size = new System.Drawing.Size(140, 13); - this.linkLabel3.TabIndex = 28; - this.linkLabel3.TabStop = true; - this.linkLabel3.Text = "Official thread at ZDoom.org"; - this.linkLabel3.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel3_LinkClicked); - // - // codeimplink - // - this.codeimplink.ActiveLinkColor = System.Drawing.Color.Firebrick; - this.codeimplink.AutoSize = true; - this.codeimplink.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.codeimplink.LinkColor = System.Drawing.SystemColors.HotTrack; - this.codeimplink.Location = new System.Drawing.Point(13, 233); - this.codeimplink.Name = "codeimplink"; - this.codeimplink.Size = new System.Drawing.Size(97, 13); - this.codeimplink.TabIndex = 26; - this.codeimplink.TabStop = true; - this.codeimplink.Text = "www.codeimp.com"; - // - // pictureBox4 - // - this.pictureBox4.BackgroundImage = global::CodeImp.DoomBuilder.Properties.Resources.CLogo; - this.pictureBox4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.pictureBox4.Location = new System.Drawing.Point(474, 129); - this.pictureBox4.Name = "pictureBox4"; - this.pictureBox4.Size = new System.Drawing.Size(88, 80); - this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.pictureBox4.TabIndex = 27; - this.pictureBox4.TabStop = false; - // - // builderlink - // - this.builderlink.ActiveLinkColor = System.Drawing.Color.Firebrick; - this.builderlink.AutoSize = true; - this.builderlink.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.builderlink.LinkColor = System.Drawing.SystemColors.HotTrack; - this.builderlink.Location = new System.Drawing.Point(13, 213); - this.builderlink.Name = "builderlink"; - this.builderlink.Size = new System.Drawing.Size(114, 13); - this.builderlink.TabIndex = 25; - this.builderlink.TabStop = true; - this.builderlink.Text = "www.doombuilder.com"; - // - // label3 - // - this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.label3.Location = new System.Drawing.Point(244, 10); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(226, 59); - this.label3.TabIndex = 22; - this.label3.Text = "GZDoom Builder is designed and programmed by MaxED; GZDoom Builder uses game conf" + + // + // close + // + this.close.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.close.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.close.Location = new System.Drawing.Point(472, 298); + this.close.Name = "close"; + this.close.Size = new System.Drawing.Size(116, 25); + this.close.TabIndex = 5; + this.close.Text = "Close"; + this.close.UseVisualStyleBackColor = true; + // + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage3); + this.tabControl1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.tabControl1.Location = new System.Drawing.Point(12, 12); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.Padding = new System.Drawing.Point(24, 3); + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(576, 280); + this.tabControl1.TabIndex = 2; + // + // tabPage2 + // + this.tabPage2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(40))))); + this.tabPage2.Controls.Add(this.label5); + this.tabPage2.Controls.Add(this.linkLabel1); + this.tabPage2.Controls.Add(this.label1); + this.tabPage2.Controls.Add(this.pictureBox1); + this.tabPage2.Controls.Add(this.panel1); + this.tabPage2.Location = new System.Drawing.Point(4, 22); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(568, 254); + this.tabPage2.TabIndex = 3; + this.tabPage2.Text = "About Ultimate Zone Builder"; + // + // linkLabel1 + // + this.linkLabel1.ActiveLinkColor = System.Drawing.Color.Blue; + this.linkLabel1.AutoSize = true; + this.linkLabel1.LinkColor = System.Drawing.Color.Silver; + this.linkLabel1.Location = new System.Drawing.Point(196, 131); + this.linkLabel1.Name = "linkLabel1"; + this.linkLabel1.Size = new System.Drawing.Size(97, 13); + this.linkLabel1.TabIndex = 23; + this.linkLabel1.TabStop = true; + this.linkLabel1.Text = "https://srb2.org"; + this.linkLabel1.VisitedLinkColor = System.Drawing.Color.Gray; + this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); + // + // label1 + // + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.label1.ForeColor = System.Drawing.Color.White; + this.label1.Location = new System.Drawing.Point(196, 115); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(142, 16); + this.label1.TabIndex = 22; + this.label1.Text = "for Sonic Robo Blast 2:"; + // + // pictureBox1 + // + this.pictureBox1.Image = global::CodeImp.DoomBuilder.Properties.Resources.UZB_Splash; + this.pictureBox1.Location = new System.Drawing.Point(6, 6); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(184, 242); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.pictureBox1.TabIndex = 21; + this.pictureBox1.TabStop = false; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.SystemColors.Window; + this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.version); + this.panel1.Controls.Add(this.copyversion); + this.panel1.Location = new System.Drawing.Point(196, 74); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(366, 38); + this.panel1.TabIndex = 20; + // + // version + // + this.version.AutoSize = true; + this.version.BackColor = System.Drawing.SystemColors.Window; + this.version.FlatStyle = System.Windows.Forms.FlatStyle.System; + this.version.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.version.Location = new System.Drawing.Point(10, 12); + this.version.Name = "version"; + this.version.Size = new System.Drawing.Size(207, 13); + this.version.TabIndex = 11; + this.version.Text = "Ultimate Zone Builder some version"; + // + // copyversion + // + this.copyversion.Location = new System.Drawing.Point(280, 6); + this.copyversion.Name = "copyversion"; + this.copyversion.Size = new System.Drawing.Size(81, 25); + this.copyversion.TabIndex = 13; + this.copyversion.Text = "Copy Version"; + this.copyversion.UseVisualStyleBackColor = true; + // + // tabPage1 + // + this.tabPage1.BackgroundImage = global::CodeImp.DoomBuilder.Properties.Resources.AboutBack; + this.tabPage1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.tabPage1.Controls.Add(this.gitlink); + this.tabPage1.Controls.Add(this.label2); + this.tabPage1.Controls.Add(this.zdoomorglink); + this.tabPage1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.tabPage1.Location = new System.Drawing.Point(4, 22); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(568, 254); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "About Ultimate Doom Builder"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // gitlink + // + this.gitlink.AutoSize = true; + this.gitlink.LinkColor = System.Drawing.Color.White; + this.gitlink.Location = new System.Drawing.Point(174, 225); + this.gitlink.Name = "gitlink"; + this.gitlink.Size = new System.Drawing.Size(134, 13); + this.gitlink.TabIndex = 18; + this.gitlink.TabStop = true; + this.gitlink.Text = "Project page at github.com"; + this.gitlink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.gitlink_LinkClicked); + // + // label2 + // + this.label2.AutoSize = true; + this.label2.ForeColor = System.Drawing.Color.White; + this.label2.Location = new System.Drawing.Point(19, 65); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(343, 143); + this.label2.TabIndex = 17; + this.label2.Text = resources.GetString("label2.Text"); + // + // zdoomorglink + // + this.zdoomorglink.AutoSize = true; + this.zdoomorglink.LinkColor = System.Drawing.Color.White; + this.zdoomorglink.Location = new System.Drawing.Point(19, 225); + this.zdoomorglink.Name = "zdoomorglink"; + this.zdoomorglink.Size = new System.Drawing.Size(140, 13); + this.zdoomorglink.TabIndex = 15; + this.zdoomorglink.TabStop = true; + this.zdoomorglink.Text = "Official thread at ZDoom.org"; + this.zdoomorglink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.zdoomorglink_LinkClicked); + // + // tabPage3 + // + this.tabPage3.Controls.Add(this.linkLabel4); + this.tabPage3.Controls.Add(this.linkLabel3); + this.tabPage3.Controls.Add(pictureBox3); + this.tabPage3.Controls.Add(this.codeimplink); + this.tabPage3.Controls.Add(label4); + this.tabPage3.Controls.Add(this.pictureBox4); + this.tabPage3.Controls.Add(this.builderlink); + this.tabPage3.Controls.Add(this.label3); + this.tabPage3.Controls.Add(pictureBox5); + this.tabPage3.Controls.Add(this.pictureBox6); + this.tabPage3.Location = new System.Drawing.Point(4, 22); + this.tabPage3.Name = "tabPage3"; + this.tabPage3.Padding = new System.Windows.Forms.Padding(3); + this.tabPage3.Size = new System.Drawing.Size(568, 254); + this.tabPage3.TabIndex = 2; + this.tabPage3.Text = "Based on..."; + this.tabPage3.UseVisualStyleBackColor = true; + // + // linkLabel4 + // + this.linkLabel4.ActiveLinkColor = System.Drawing.Color.Firebrick; + this.linkLabel4.AutoSize = true; + this.linkLabel4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.linkLabel4.LinkColor = System.Drawing.SystemColors.HotTrack; + this.linkLabel4.Location = new System.Drawing.Point(158, 99); + this.linkLabel4.Name = "linkLabel4"; + this.linkLabel4.Size = new System.Drawing.Size(134, 13); + this.linkLabel4.TabIndex = 29; + this.linkLabel4.TabStop = true; + this.linkLabel4.Text = "Project page at github.com"; + this.linkLabel4.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel4_LinkClicked); + // + // linkLabel3 + // + this.linkLabel3.ActiveLinkColor = System.Drawing.Color.Firebrick; + this.linkLabel3.AutoSize = true; + this.linkLabel3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.linkLabel3.LinkColor = System.Drawing.SystemColors.HotTrack; + this.linkLabel3.Location = new System.Drawing.Point(12, 99); + this.linkLabel3.Name = "linkLabel3"; + this.linkLabel3.Size = new System.Drawing.Size(140, 13); + this.linkLabel3.TabIndex = 28; + this.linkLabel3.TabStop = true; + this.linkLabel3.Text = "Official thread at ZDoom.org"; + this.linkLabel3.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel3_LinkClicked); + // + // codeimplink + // + this.codeimplink.ActiveLinkColor = System.Drawing.Color.Firebrick; + this.codeimplink.AutoSize = true; + this.codeimplink.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.codeimplink.LinkColor = System.Drawing.SystemColors.HotTrack; + this.codeimplink.Location = new System.Drawing.Point(13, 233); + this.codeimplink.Name = "codeimplink"; + this.codeimplink.Size = new System.Drawing.Size(97, 13); + this.codeimplink.TabIndex = 26; + this.codeimplink.TabStop = true; + this.codeimplink.Text = "www.codeimp.com"; + // + // pictureBox4 + // + this.pictureBox4.BackgroundImage = global::CodeImp.DoomBuilder.Properties.Resources.CLogo; + this.pictureBox4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pictureBox4.Location = new System.Drawing.Point(474, 129); + this.pictureBox4.Name = "pictureBox4"; + this.pictureBox4.Size = new System.Drawing.Size(88, 80); + this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.pictureBox4.TabIndex = 27; + this.pictureBox4.TabStop = false; + // + // builderlink + // + this.builderlink.ActiveLinkColor = System.Drawing.Color.Firebrick; + this.builderlink.AutoSize = true; + this.builderlink.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.builderlink.LinkColor = System.Drawing.SystemColors.HotTrack; + this.builderlink.Location = new System.Drawing.Point(13, 213); + this.builderlink.Name = "builderlink"; + this.builderlink.Size = new System.Drawing.Size(114, 13); + this.builderlink.TabIndex = 25; + this.builderlink.TabStop = true; + this.builderlink.Text = "www.doombuilder.com"; + // + // label3 + // + this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.label3.Location = new System.Drawing.Point(244, 10); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(226, 59); + this.label3.TabIndex = 22; + this.label3.Text = "GZDoom Builder is designed and programmed by MaxED; GZDoom Builder uses game conf" + "igurations created by Gez."; - // - // pictureBox6 - // - this.pictureBox6.BackgroundImage = global::CodeImp.DoomBuilder.Properties.Resources.MLogo; - this.pictureBox6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.pictureBox6.Location = new System.Drawing.Point(476, 6); - this.pictureBox6.Name = "pictureBox6"; - this.pictureBox6.Size = new System.Drawing.Size(86, 88); - this.pictureBox6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.pictureBox6.TabIndex = 21; - this.pictureBox6.TabStop = false; - // - // AboutForm - // - this.AcceptButton = this.close; - this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.CancelButton = this.close; - this.ClientSize = new System.Drawing.Size(600, 334); - this.Controls.Add(this.tabControl1); - this.Controls.Add(this.close); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "AboutForm"; - this.Opacity = 0D; - this.ShowIcon = false; - this.ShowInTaskbar = false; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "About"; - ((System.ComponentModel.ISupportInitialize)(pictureBox5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(pictureBox3)).EndInit(); - this.tabControl1.ResumeLayout(false); - this.tabPage1.ResumeLayout(false); - this.tabPage1.PerformLayout(); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); - this.tabPage3.ResumeLayout(false); - this.tabPage3.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).EndInit(); - this.ResumeLayout(false); + // + // pictureBox6 + // + this.pictureBox6.BackgroundImage = global::CodeImp.DoomBuilder.Properties.Resources.MLogo; + this.pictureBox6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pictureBox6.Location = new System.Drawing.Point(476, 6); + this.pictureBox6.Name = "pictureBox6"; + this.pictureBox6.Size = new System.Drawing.Size(86, 88); + this.pictureBox6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.pictureBox6.TabIndex = 21; + this.pictureBox6.TabStop = false; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.label5.ForeColor = System.Drawing.Color.White; + this.label5.Location = new System.Drawing.Point(196, 170); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(202, 13); + this.label5.TabIndex = 24; + this.label5.Text = "developed by MascaraSnake and sphere"; + // + // AboutForm + // + this.AcceptButton = this.close; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.CancelButton = this.close; + this.ClientSize = new System.Drawing.Size(600, 334); + this.Controls.Add(this.tabControl1); + this.Controls.Add(this.close); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "AboutForm"; + this.Opacity = 0D; + this.ShowIcon = false; + this.ShowInTaskbar = false; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "About"; + ((System.ComponentModel.ISupportInitialize)(pictureBox5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(pictureBox3)).EndInit(); + this.tabControl1.ResumeLayout(false); + this.tabPage2.ResumeLayout(false); + this.tabPage2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.tabPage1.ResumeLayout(false); + this.tabPage1.PerformLayout(); + this.tabPage3.ResumeLayout(false); + this.tabPage3.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).EndInit(); + this.ResumeLayout(false); } @@ -349,18 +420,23 @@ namespace CodeImp.DoomBuilder.Windows private System.Windows.Forms.TabControl tabControl1; private System.Windows.Forms.TabPage tabPage1; private System.Windows.Forms.LinkLabel zdoomorglink; - private System.Windows.Forms.Button copyversion; - private System.Windows.Forms.Label version; private System.Windows.Forms.Label label2; private System.Windows.Forms.LinkLabel gitlink; private System.Windows.Forms.TabPage tabPage3; private System.Windows.Forms.Label label3; private System.Windows.Forms.PictureBox pictureBox6; - private System.Windows.Forms.Panel panel1; private System.Windows.Forms.LinkLabel codeimplink; private System.Windows.Forms.PictureBox pictureBox4; private System.Windows.Forms.LinkLabel builderlink; private System.Windows.Forms.LinkLabel linkLabel4; private System.Windows.Forms.LinkLabel linkLabel3; - } + private System.Windows.Forms.TabPage tabPage2; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Label version; + private System.Windows.Forms.Button copyversion; + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.LinkLabel linkLabel1; + private System.Windows.Forms.Label label5; + } } \ No newline at end of file diff --git a/Source/Core/Windows/AboutForm.cs b/Source/Core/Windows/AboutForm.cs index 84946e17bd6b03569261cc1e60a19250d850a210..b100fa03e6ee537aefe53eda02d62f1b0d3961ef 100755 --- a/Source/Core/Windows/AboutForm.cs +++ b/Source/Core/Windows/AboutForm.cs @@ -37,7 +37,7 @@ namespace CodeImp.DoomBuilder.Windows #if DEBUG version.Text = Application.ProductName + " [DEVBUILD]"; #else - version.Text = Application.ProductName + " v" + Application.ProductVersion + " (" + General.CommitHash + ")"; + version.Text = Application.ProductName + " v" + Application.ProductVersion; #endif } @@ -89,5 +89,10 @@ namespace CodeImp.DoomBuilder.Windows { General.OpenWebsite("https://github.com/m-x-d/GZDoom-Builder"); } - } + + private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + General.OpenWebsite("https://srb2.org"); + } + } } \ No newline at end of file diff --git a/Source/Core/Windows/ExceptionDialog.cs b/Source/Core/Windows/ExceptionDialog.cs index 3edfdd39e9b3ea0c0c8032039d4452648316c70f..9af949ee064c63c763784ec50eea50f6b0f0b822 100755 --- a/Source/Core/Windows/ExceptionDialog.cs +++ b/Source/Core/Windows/ExceptionDialog.cs @@ -54,89 +54,35 @@ namespace CodeImp.DoomBuilder.Windows { string[] titles = { - "0x000000 at 0xFFFFFF. That's probably bad", - "Here we go again...", - "Uh oh, you're screwed", - "All is lost!", - "Achievement unlocked: CRASH TIME!", - "OH NOES! TEH ERROR!", - "0001000001111011000000000011001101011120110111", - "Nuclear launch detected!", - "Don't send this to Microsoft", - "You. Shall. Not. Pass!!!", - "Yep, we have bugs", - "It's dangerous to go alone. Take this!", - "The operation completed successfully", - "Security Alert – Moving cursor is not as safe as you thought", - "Random error appears from north", - "ERROR: NO_ERROR", - "Epic fail", - "At least it's not BSoD...", - "User Error. Please Replace User", - "Brought to you by MaxED!", - "Ultimate Doom Builder proudly presents:", - "You aren't expected to understand this", - "Back to the drawing board...", - "I'm sorry... :(", - "This is a horrible day for you, and of course, the world", - "Abort, Retry, Fail?", - "You are making progress. I'm afraid that's something I can't allow to happen", - "You are making progress. That's not OK", - "No errors found, restarting computer", - "Does Not Compute!", - "I’m sorry, Dave, I’m afraid I can’t do that", - "What's that? Chicken?", - "It can only be attributable to human error", - "It's now safe to turn off your computer", - "I've got a bad feeling about this", - "YOU CAN’T DO THAT!", - "Man the Lifeboats! Women and children first!", - "IMPOSSIBURU!!!", - "Now deleting all files. Goodbye", - "General Failure", - "Invalid Error", - "Beam me up Scotty, there’s no life out here", - "Well, you ran into something and the game is over", - "I'm good at writing bad code", - "$FUNNY_ERROR_CAPTION", - "In Soviet Russia, exception throws YOU!", - "...and then GZDB was the demons!", - "B U S T E D", - "Freeze mode enabled", - "You feel strange...", - "That doesn't seem to work", - "This function is only available in the retail version of Ultimate Doom Builder", - "You picked up the Random Exception.", - "Pinky says that you're the new hope. Bear that in mind.", - "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "Deal with it", - "Error 47", - "YOU DIED", - "The God Of Exceptions Demands MORE Exceptions!", - "Good. It's boring here anyway.", - "Shameful display!", - "It's CRASHENING!", - "W-W-W-WIPEOUT!", - "EVERYTHING IS LOST!", - "Your empty is full!", - "Let's see how far this infinite loop goes...", - "Windows 10 is here! RUN!", - "You really screwed up this time!", - "[WFDS]", - "[No]", - "An error has occurred while creating an error", - "Catastrophic failure", - "This time, it’s the human’s fault", - "No error occurred", - "Hey! It looks like you're having an error!", - "What, what, what, what, what, what, what, what, what, what?", - "WARNING: PROGRAMMING BUG IN GZDB!", - "Something happened", - "The Device is Error", - "Worship me, and I may yet be merciful... then again, maybe not.", - "EXTERMINATE", - "What you spend years building may be destroyed overnight; build it anyway" - }; + "Ultimate Zone Builder was killed by Eggman's nefarious TV magic.", + "Ultimate Zone Builder was killed by an environmental hazard.", + "Ultimate Zone Builder drowned.", + "Ultimate Zone Builder was crushed.", + "Ultimate Zone Builder fell into a bottomless pit.", + "Ultimate Zone Builder asphyxiated in space.", + "Ultimate Zone Builder died.", + "Ultimate Zone Builder's playtime with heavy objects killed Ultimate Zone Builder.", + "Resynching...", + "You have been banned from the server.", + "SIGSEGV - segment violation", + "[Eggman laughing]", + "[Armageddon pow]", + "[Dying]", + "I'm outta here...", + "GAME OVER", + "SONIC MADE A BAD FUTURE IN Ultimate Zone Builder", + "Sonic arrived just in time to see what little of the 'ruins' were left.", + "The natural beauty of the zone had been obliterated.", + "I'm putting my foot down.", + "All of this is over. You will be left with ashes.", + "some doofus gave us an empty string?", + "unfortunate player falls into spike?!", + "Ack! Metal Sonic shouldn't die! Cut the tape, end recording!", + "ALL YOUR RINGS ARE BELONG TO US!", + "Hohohoho!! *B^D", + "So that's it. I was so busy playing SRB2 I never noticed... but... everything's gone...", + "Tails! You made the engines quit!" + }; this.Text = titles[new Random().Next(0, titles.Length - 1)]; bContinue.Enabled = !isterminating; @@ -208,7 +154,7 @@ namespace CodeImp.DoomBuilder.Windows private void newissue_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - try { System.Diagnostics.Process.Start("https://github.com/jewalky/UltimateDoomBuilder/issues"); } + try { System.Diagnostics.Process.Start("https://git.do.srb2.org/STJr/UltimateZoneBuilder/-/issues"); } catch { MessageBox.Show("Unable to open URL..."); } newissue.LinkVisited = true; } diff --git a/Source/Core/Windows/ExceptionDialog.designer.cs b/Source/Core/Windows/ExceptionDialog.designer.cs index a933740b105a1510874e2883d68249b596294301..86c440c689cba13fea791b72ff9a36fd171b9bf1 100755 --- a/Source/Core/Windows/ExceptionDialog.designer.cs +++ b/Source/Core/Windows/ExceptionDialog.designer.cs @@ -110,7 +110,7 @@ this.newissue.Size = new System.Drawing.Size(359, 17); this.newissue.TabIndex = 8; this.newissue.TabStop = true; - this.newissue.Text = "Help fixing this error by creating an Issue at the GitHub Issues Tracker."; + this.newissue.Text = "Help fixing this error by creating an Issue at the GitLab Issues Tracker."; this.newissue.UseCompatibleTextRendering = true; this.newissue.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.newissue_LinkClicked); // diff --git a/Source/Core/Windows/MainForm.Designer.cs b/Source/Core/Windows/MainForm.Designer.cs index 8da269debf2bc34a4a7133984c6e467ff666aa58..b33a1440977d947fe097fcf020b2bdd02ee98c3c 100755 --- a/Source/Core/Windows/MainForm.Designer.cs +++ b/Source/Core/Windows/MainForm.Designer.cs @@ -1319,6 +1319,8 @@ namespace CodeImp.DoomBuilder.Windows // // itemhelpcheckupdates // + this.itemhelpcheckupdates.Enabled = false; + this.itemhelpcheckupdates.Visible = false; this.itemhelpcheckupdates.Image = global::CodeImp.DoomBuilder.Properties.Resources.Update; this.itemhelpcheckupdates.Name = "itemhelpcheckupdates"; this.itemhelpcheckupdates.Size = new System.Drawing.Size(232, 22); @@ -1333,18 +1335,18 @@ namespace CodeImp.DoomBuilder.Windows // // itemhelpissues // - this.itemhelpissues.Image = global::CodeImp.DoomBuilder.Properties.Resources.Github; + this.itemhelpissues.Image = global::CodeImp.DoomBuilder.Properties.Resources.GitLab; this.itemhelpissues.Name = "itemhelpissues"; this.itemhelpissues.Size = new System.Drawing.Size(232, 22); - this.itemhelpissues.Text = "&GitHub issues tracker"; + this.itemhelpissues.Text = "&GitLab issues tracker"; this.itemhelpissues.Click += new System.EventHandler(this.itemhelpissues_Click); // // itemhelpabout // - this.itemhelpabout.Image = global::CodeImp.DoomBuilder.Properties.Resources.About; + this.itemhelpabout.Image = global::CodeImp.DoomBuilder.Properties.Resources.UZB16; this.itemhelpabout.Name = "itemhelpabout"; this.itemhelpabout.Size = new System.Drawing.Size(232, 22); - this.itemhelpabout.Text = "&About Ultimate Doom Builder..."; + this.itemhelpabout.Text = "&About Ultimate Zone Builder..."; this.itemhelpabout.Click += new System.EventHandler(this.itemhelpabout_Click); // // toolbar diff --git a/Source/Core/Windows/MainForm.cs b/Source/Core/Windows/MainForm.cs index 0c9e171e2569ee068349ac728526852367db64a0..21055ea72d5cbb8f5577c2b39ed4757ba90d2ef4 100755 --- a/Source/Core/Windows/MainForm.cs +++ b/Source/Core/Windows/MainForm.cs @@ -432,8 +432,8 @@ namespace CodeImp.DoomBuilder.Windows //mxd private void UpdateTitle() { - string programname = this.Text = Application.ProductName + " R" + General.ThisAssembly.GetName().Version.Revision; - if (Environment.Is64BitProcess) + string programname = this.Text = Application.ProductName + " v" + General.ThisAssembly.GetName().Version.Major + "." + General.ThisAssembly.GetName().Version.Minor; + if (Environment.Is64BitProcess) programname += " (64-bit)"; else programname += " (32-bit)"; @@ -3379,7 +3379,7 @@ namespace CodeImp.DoomBuilder.Windows //mxd. Github issues clicked private void itemhelpissues_Click(object sender, EventArgs e) { - General.OpenWebsite("https://github.com/jewalky/GZDoom-Builder-Bugfix/issues"); + General.OpenWebsite("https://git.do.srb2.org/STJr/UltimateZoneBuilder/-/issues"); } // About clicked diff --git a/Source/Core/Windows/MainForm.resx b/Source/Core/Windows/MainForm.resx index f4b749830ecec750d2aba2906bb2a550f0aec64f..e1c8c6d3aa1d0dfbc9b74f751ed3bdf273efc258 100755 --- a/Source/Core/Windows/MainForm.resx +++ b/Source/Core/Windows/MainForm.resx @@ -223,6 +223,6 @@ </data> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <data name="$this.Icon" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\UDB2.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Resources\UZB.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> </root> \ No newline at end of file diff --git a/Source/Plugins/BuilderModes/General/BuilderPlug.cs b/Source/Plugins/BuilderModes/General/BuilderPlug.cs index 9b35433f3251336a0e6d5779c01b4ca22bc0e074..f8a46b21325b76c26535f2cb1b18123f236116a5 100755 --- a/Source/Plugins/BuilderModes/General/BuilderPlug.cs +++ b/Source/Plugins/BuilderModes/General/BuilderPlug.cs @@ -154,7 +154,7 @@ namespace CodeImp.DoomBuilder.BuilderModes #region ================== Properties - public override string Name { get { return "Ultimate Doom Builder"; } } //mxd + public override string Name { get { return "Ultimate Zone Builder"; } } //mxd public static BuilderPlug Me { get { return me; } } //mxd. BuilderModes.dll revision should always match the main module revision diff --git a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs index 248ef8a1a6777f30ff7a567f430be46d695951cf..6abc164476097707e009e30cff6d20dae4527d02 100755 --- a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs +++ b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs @@ -6,10 +6,10 @@ using System.Resources; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Builder Modes")] -[assembly: AssemblyDescription("Ultimate Doom Builder Editing Modes")] +[assembly: AssemblyDescription("Ultimate Zone Builder Editing Modes")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("CodeImp, MaxED, ZZYZX, boris, dpJudas and others")] -[assembly: AssemblyProduct("Ultimate Doom Builder")] +[assembly: AssemblyProduct("Ultimate Zone Builder")] [assembly: AssemblyCopyright("Copyright © 2007, 2016, 2017-2019")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -29,5 +29,5 @@ using System.Resources; // Build Number // Revision // -[assembly: AssemblyVersion("3.0.0.3274")] +[assembly: AssemblyVersion("1.0.0.4108")] [assembly: NeutralResourcesLanguageAttribute("en")]