From cc6424fb1ca9432ad8d6a9920fdfdaddf9c307ec Mon Sep 17 00:00:00 2001 From: MaxED Date: Tue, 17 Jul 2012 22:51:55 +0000 Subject: [PATCH] Fixed an error when a setting in configuration is outside of PreferencesForm's slider range. Fixed another potential Decorate parser error while parsing one line actors. Added info about GZDoom Builder to About form. --- Source/Core/Builder.csproj | 2 + Source/Core/Builder.sln | 12 - Source/Core/GZBuilder/GZGeneral.cs | 1 + Source/Core/General/General.cs | 2 +- Source/Core/Properties/Resources.Designer.cs | 40 +- Source/Core/Properties/Resources.resx | 126 +++--- Source/Core/Resources/GZDB_Logo_small.png | Bin 0 -> 22897 bytes Source/Core/Resources/MLogo.png | Bin 0 -> 3677 bytes Source/Core/Windows/AboutForm.Designer.cs | 384 ++++++++++++------- Source/Core/Windows/AboutForm.cs | 13 +- Source/Core/Windows/AboutForm.resx | 29 +- Source/Core/Windows/PreferencesForm.cs | 20 +- Source/Core/ZDoom/ActorStructure.cs | 1 + 13 files changed, 363 insertions(+), 267 deletions(-) create mode 100644 Source/Core/Resources/GZDB_Logo_small.png create mode 100644 Source/Core/Resources/MLogo.png diff --git a/Source/Core/Builder.csproj b/Source/Core/Builder.csproj index ff72b544..473ee190 100644 --- a/Source/Core/Builder.csproj +++ b/Source/Core/Builder.csproj @@ -816,8 +816,10 @@ + + diff --git a/Source/Core/Builder.sln b/Source/Core/Builder.sln index 38302107..ed3d7843 100644 --- a/Source/Core/Builder.sln +++ b/Source/Core/Builder.sln @@ -13,8 +13,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UDMFControls", "..\Plugins\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorPicker", "..\Plugins\ColorPicker\ColorPicker.csproj", "{A4761900-0EA3-4FE4-A919-847FD5080EFC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommentsPanel", "..\Plugins\CommentsPanel\CommentsPanel.csproj", "{58BD8A5B-1B48-435D-8473-A92F27D06C49}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -85,16 +83,6 @@ Global {A4761900-0EA3-4FE4-A919-847FD5080EFC}.Release|Mixed Platforms.Build.0 = Release|x86 {A4761900-0EA3-4FE4-A919-847FD5080EFC}.Release|x86.ActiveCfg = Release|x86 {A4761900-0EA3-4FE4-A919-847FD5080EFC}.Release|x86.Build.0 = Release|x86 - {58BD8A5B-1B48-435D-8473-A92F27D06C49}.Debug|Any CPU.ActiveCfg = Debug|x86 - {58BD8A5B-1B48-435D-8473-A92F27D06C49}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {58BD8A5B-1B48-435D-8473-A92F27D06C49}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {58BD8A5B-1B48-435D-8473-A92F27D06C49}.Debug|x86.ActiveCfg = Debug|x86 - {58BD8A5B-1B48-435D-8473-A92F27D06C49}.Debug|x86.Build.0 = Debug|x86 - {58BD8A5B-1B48-435D-8473-A92F27D06C49}.Release|Any CPU.ActiveCfg = Release|x86 - {58BD8A5B-1B48-435D-8473-A92F27D06C49}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {58BD8A5B-1B48-435D-8473-A92F27D06C49}.Release|Mixed Platforms.Build.0 = Release|x86 - {58BD8A5B-1B48-435D-8473-A92F27D06C49}.Release|x86.ActiveCfg = Release|x86 - {58BD8A5B-1B48-435D-8473-A92F27D06C49}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Source/Core/GZBuilder/GZGeneral.cs b/Source/Core/GZBuilder/GZGeneral.cs index 79170fce..623a7441 100644 --- a/Source/Core/GZBuilder/GZGeneral.cs +++ b/Source/Core/GZBuilder/GZGeneral.cs @@ -33,6 +33,7 @@ namespace CodeImp.DoomBuilder.GZBuilder //version public const float Version = 1.11f; + public const char Revision = 'b'; //debug console #if DEBUG diff --git a/Source/Core/General/General.cs b/Source/Core/General/General.cs index 0b734755..ae3cdd8d 100644 --- a/Source/Core/General/General.cs +++ b/Source/Core/General/General.cs @@ -575,7 +575,7 @@ namespace CodeImp.DoomBuilder // Remove the previous log file and start logging if(File.Exists(logfile)) File.Delete(logfile); //mxd - General.WriteLogLine("GZDoom Builder " + CodeImp.DoomBuilder.GZBuilder.GZGeneral.Version + " startup"); + General.WriteLogLine("GZDoom Builder " + CodeImp.DoomBuilder.GZBuilder.GZGeneral.Version + CodeImp.DoomBuilder.GZBuilder.GZGeneral.Revision + " startup"); //General.WriteLogLine("Doom Builder " + thisversion.Major + "." + thisversion.Minor + " startup"); General.WriteLogLine("Application path: " + apppath); General.WriteLogLine("Temporary path: " + temppath); diff --git a/Source/Core/Properties/Resources.Designer.cs b/Source/Core/Properties/Resources.Designer.cs index 478bf5dd..32568fbd 100644 --- a/Source/Core/Properties/Resources.Designer.cs +++ b/Source/Core/Properties/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.269 +// Этот код создан программой. +// Исполняемая версия:2.0.50727.5420 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. // //------------------------------------------------------------------------------ @@ -13,13 +13,13 @@ namespace CodeImp.DoomBuilder.Properties { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// Класс ресурса со строгой типизацией для поиска локализованных строк и т.д. /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // 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", "4.0.0.0")] + // Этот класс создан автоматически классом StronglyTypedResourceBuilder + // с помощью такого средства, как ResGen или Visual Studio. + // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen + // с параметром /str или перестройте свой проект VS. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -33,7 +33,7 @@ namespace CodeImp.DoomBuilder.Properties { } /// - /// Returns the cached ResourceManager instance used by this class. + /// Возвращает кэшированный экземпляр ResourceManager, использованный этим классом. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ namespace CodeImp.DoomBuilder.Properties { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// Перезаписывает свойство CurrentUICulture текущего потока для всех + /// обращений к ресурсу с помощью этого класса ресурса со строгой типизацией. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -172,6 +172,13 @@ namespace CodeImp.DoomBuilder.Properties { } } + internal static System.Drawing.Bitmap GZDB_Logo_small { + get { + object obj = ResourceManager.GetObject("GZDB_Logo_small", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Icon GZDB2 { get { object obj = ResourceManager.GetObject("GZDB2", resourceCulture); @@ -249,6 +256,13 @@ namespace CodeImp.DoomBuilder.Properties { } } + internal static System.Drawing.Bitmap MLogo { + get { + object obj = ResourceManager.GetObject("MLogo", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap Model { get { object obj = ResourceManager.GetObject("Model", resourceCulture); diff --git a/Source/Core/Properties/Resources.resx b/Source/Core/Properties/Resources.resx index 1c2fbb48..17b47f57 100644 --- a/Source/Core/Properties/Resources.resx +++ b/Source/Core/Properties/Resources.resx @@ -127,9 +127,6 @@ ..\Resources\ScriptConstant.xpm;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\Grid4.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\PasteSpecial.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -142,11 +139,17 @@ ..\Resources\Status11.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ScriptPalette.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Status10.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\CLogo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\MLogo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Model_selected.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Status1.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -166,11 +169,14 @@ ..\Resources\Status2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\KnownTextureSet.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\List.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\NewScript.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Warning.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\GZDB2.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Status12.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -178,8 +184,8 @@ ..\Resources\Redo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\SaveAll.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Model.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\ViewTextureFloor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -196,14 +202,17 @@ ..\Resources\Hourglass.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ViewNormal.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\WarningLarge.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\NewMap.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ScriptPalette.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\mergegeometry.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\NewMap2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -211,6 +220,9 @@ ..\Resources\Grid2_arrowup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\CLogo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\SaveMap.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -226,8 +238,8 @@ ..\Resources\Prefab.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\MissingTexture.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Splash3_trans.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Zoom.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -238,15 +250,24 @@ ..\Resources\Test.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Text.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Monster3.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\List_Images.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Properties.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\SlimDX_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Light_animate.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\WarningOff.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -259,23 +280,26 @@ ..\Resources\Help.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Splash3_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\KnownTextureSet.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\mergegeometry2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ViewNormal.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\NewScript.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Prefab2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Question.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\mergegeometry.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\SaveAll.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ColorPick.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\fog.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Filter.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -286,8 +310,8 @@ ..\Resources\ScriptCompile.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Prefab2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Splash3_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Paste.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -295,52 +319,34 @@ ..\Resources\Folder.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Splash3_trans.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Grid4.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\MissingTexture.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\OpenMap.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ErrorLarge.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Warning.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\SaveScript.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\List.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\List_Images.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Text.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Angle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ColorPick.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Light.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Light_animate.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Model.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Model_selected.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\GZDB2.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\fog.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\fx.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\SaveScript.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ErrorLarge.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\GZDB_Logo_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Source/Core/Resources/GZDB_Logo_small.png b/Source/Core/Resources/GZDB_Logo_small.png new file mode 100644 index 0000000000000000000000000000000000000000..3ed95cc8d3e41aecc4b32e2366687989aa5e5f91 GIT binary patch literal 22897 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 literal 0 HcmV?d00001 diff --git a/Source/Core/Resources/MLogo.png b/Source/Core/Resources/MLogo.png new file mode 100644 index 0000000000000000000000000000000000000000..6ae0ce316341b7b02bcede6220a953e13e8db416 GIT binary patch literal 3677 zcmV-j4x;giP)$*>gdlxTBQZwmgEtIG``{&LV(5dS;0q**w@6Zq7qF60lu|Si z+lugjAxfcuhFa)pdwTBYpXHjpXJ)UNS^NM0zLmI>IsZO0vuDrxX5D8t5)u4AU)ZP4 z{ThF7TKXQ(ms?ru@2&qI#IFhf-UGOB9pLR9pj$eCS8)GP;%>;#k?&5iU@{_Ay_z=4 z`Zm91o6W|wt>dAf42ySh{oFj@u5qxB+y|2nJ_qwtTs`lL&A>HbfQy*;ZCr7&@zcT_p@NGjYi~dTF-8p`BoJV%ZAOuQso++Mb3jp7KH2mh z1-#%!7=36tnC1NM5-y9ljBx3M?m@QAM*ueRKNm`38xTrDB>^ae0W&3%6QC<1N{B`Q z8AcAoI38sZi~@X$cXiJNfaiSUFM5bDcO_^L@k<= zMBf0EB#W{U!ppaT`57Q15WTF&(4z74UsM;M92b*!#3xShWq|;|80qnm!hm65Dwti8feB!#ktEe%Vqv`-Cf3JI z;n(5HNl)5GeFwdL0jVOxOf`c3io%zc%1W1gQf!A*g*l;^X(ke86B83!h=~z| z8|eoWDvAo?NY&ap@})3HyFlU{Dd;p1QfyJ8sdB`u2bJ!Nc)Z(i04nR7szuD$S-QoL z#R>9WDkduY#ldkIDQ46v9tX9UL4+2qDLH@?msV3nxg$yg0!+-@mDD)W0N02TzAT@j zmN!%KzJ39}fsFN2Z#`$ze3eOEDNrIs=%c90iI#$h8UJC6eJMfg?}m3v{75*sSRhD! z!y;-`Y*GsZD{a;Fld`NCLQ;HwRF$e5!6yCsasXr;K&m`b;hU#iL&+rbl}STuUFK1- z{p}thsTPS;H+=vHl={2PUxy-5L4{5r#ackSjTY7+CCaMaM;^9O!S>h(LX`t-rs#44 znuJE0&Cy~xN?2HG|28wKfl{t+Iu0p0h~{bAH+E3~$YnAOFfmKCp^^g2gHuw2Vyk2q zNOizUl}LqyRXV>^0MefWy1AEShti!IYv-JSiOy&gD@6cP;wf2A>SJ1M-&D)7BWXch4yMTRwBgIW|DX386i|8W=qFp`tHELemnq(t_)TT2T2 zw>wd&*mF$0Mp7&RsXj@27(Ij;M8&Q`5_06LY6}ILCrBt`^W0B>f|w@TONp4YWb%vD zNEuZO$pLBSG76*?FHft_%^79UM4LybaY^m_lUR8wK-98_c}{A8A5beNJ^sc4X^MQ0 zpfq$%EG=88441#jSY z)Z&2Aup&T3RvnZWFr#{{#wm4<=Gw(@e$+k1Un@geo zmwCV2fmQO4D&na~>-XgVRCZ?CT~A4g3#ot-{w92w#^FXf0+(-pq+;ng-}VmH@Rx17TTz52ipVacjXxxBw|DJD=En{((grTw`ZIVZ6CT>0Tzys5=BBZXpTB1J&iL&1)mOvVp1)W3D{ucatiJ#I z0|T3fuKOtLdt!$>6Ht|fTt++xd=d`c>!!=)MgO~>%b_GABpnN@$j&TJ_W8|Uh5b+b zG1i@R`)4BYdl`)9H-9a*oyg#w$?Y@Mo;1Opjh~0Pir~8KeCC=NzgN9_>rdlz&u;z( z>}TRB8RvDrZT9{v?Px#8n={g&^*hqiBn zGuD65Pl{J_!zbY2o@cA}@v$*jbN>&jwv!p0DIU|w-0j{6rr`!sk!n!5u z8U}To0jd>eZm#ph`tWHnl>=1IO_JB%({25W`M`wMIQDNpDbOymc=LUdC%8fTN|R>J_<&2|UTm_G>KnJJ_E8nL!BGwagi(GZ3|+J;Z%> z#I~ClxaGcWB|B6%vnP1&tv40Ez_DCLa}I4w4xpb|(E^{G3(nz5U$p6tDBpkZiqHY@ zk}#duv*TlZptF0+JqZ`ww)-i#gAT(DTOVXSlCFMlz#hX8Iv`JM3_1+acBrBZpHJph zzxw`rW1Vw$##pnH=bCN8Dy-mDUc=6fGr7(>Jj(W8yQUe$eS$;sL$}AYHI^nnY7q9a zSqjIibNhOb<#P|)?Or9T&qebXdbl<><^)d?1<@fs+{0d6&@HZJg2DJTJ3&s)g8~d> z{PW@8z!qEzmv8z~oSh^7xd(m%XRp5o{>31<`nTAJK=lYV4i1KX2PeNF^EC55xiI5@ zttT)XvJLx)wbN1)HR`okaf;4Kx-Dk2i3iYo75OG1 zEWp^|dimLh%?`&_ho1d{b>g|f$`hSe^fx6sfP^+1b++Gz$zM!@ec5JO6ovN}R?0+xf-IZF6O?RS%cb!$8N5m3pEbV7 zbF58W*Y^w125+=mDdW00cX%|q=tiu54dI(WM}7%Y|L_6ptjMxeAcRHg?FTz?A57ml z4)l8dRS#xI*mKolvV$$tN@%!|Y#A0n_Dy7oP-XiT)u9W-1Dct*r8xz5H;h{gVvLf*Vu;Zc`2xg2qxwzKvDT;~fcb}2aLh;cd7#U?Ilh5AE- zg-{zgJpbTneuGZ~v*c1LAmsR89lD`g=qmCQ8iQiLK9t8jSjAs?cK8pZ^4|Mzk zVEx>u1ONv-ZAU$=Rbr_t6l@^Y2;wI_`^e8sj(0AwB1`AyKkjL8#2@lB&IVVcD-fIa zEF%FKhvqYrk+&HK%=wj`^h6)^zthlsMoXxK^j*K&3!wSFCVpe{HUgk0Oy7*q{>i7a vT2eKBO6N;QAs&xo;&Tvs(C6dn{|PVvAm4^`vvxS400000NkvXXu0mjf4wUms literal 0 HcmV?d00001 diff --git a/Source/Core/Windows/AboutForm.Designer.cs b/Source/Core/Windows/AboutForm.Designer.cs index c8442625..72e22a0d 100644 --- a/Source/Core/Windows/AboutForm.Designer.cs +++ b/Source/Core/Windows/AboutForm.Designer.cs @@ -28,154 +28,256 @@ namespace CodeImp.DoomBuilder.Windows /// private void InitializeComponent() { - System.Windows.Forms.Label label1; - System.Windows.Forms.PictureBox pictureBox1; - this.close = new System.Windows.Forms.Button(); - this.builderlink = new System.Windows.Forms.LinkLabel(); - this.version = new System.Windows.Forms.Label(); - this.copyversion = new System.Windows.Forms.Button(); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); - this.codeimplink = new System.Windows.Forms.LinkLabel(); - label1 = new System.Windows.Forms.Label(); - pictureBox1 = new System.Windows.Forms.PictureBox(); - ((System.ComponentModel.ISupportInitialize)(pictureBox1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); - this.SuspendLayout(); - // - // label1 - // - label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - label1.FlatStyle = System.Windows.Forms.FlatStyle.System; - label1.Location = new System.Drawing.Point(15, 161); - label1.Name = "label1"; - label1.Size = new System.Drawing.Size(349, 50); - label1.TabIndex = 2; - label1.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."; - // - // pictureBox1 - // - pictureBox1.Image = global::CodeImp.DoomBuilder.Properties.Resources.Splash3_small; - pictureBox1.Location = new System.Drawing.Point(10, 12); - pictureBox1.Name = "pictureBox1"; - pictureBox1.Size = new System.Drawing.Size(226, 80); - pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - pictureBox1.TabIndex = 0; - pictureBox1.TabStop = false; - // - // 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(265, 243); - 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; - // - // builderlink - // - this.builderlink.ActiveLinkColor = System.Drawing.Color.Firebrick; - this.builderlink.AutoSize = true; - this.builderlink.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; - this.builderlink.LinkColor = System.Drawing.Color.Firebrick; - this.builderlink.Location = new System.Drawing.Point(12, 219); - this.builderlink.Name = "builderlink"; - this.builderlink.Size = new System.Drawing.Size(121, 14); - this.builderlink.TabIndex = 3; - this.builderlink.TabStop = true; - this.builderlink.Text = "www.doombuilder.com"; - this.builderlink.VisitedLinkColor = System.Drawing.Color.Firebrick; - this.builderlink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.builderlink_LinkClicked); - // - // version - // - this.version.AutoSize = true; - this.version.FlatStyle = System.Windows.Forms.FlatStyle.System; - this.version.Location = new System.Drawing.Point(15, 118); - this.version.Name = "version"; - this.version.Size = new System.Drawing.Size(138, 14); - this.version.TabIndex = 0; - this.version.Text = "Doom Builder some version"; - // - // copyversion - // - this.copyversion.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.copyversion.Location = new System.Drawing.Point(265, 113); - this.copyversion.Name = "copyversion"; - this.copyversion.Size = new System.Drawing.Size(116, 25); - this.copyversion.TabIndex = 1; - this.copyversion.Text = "Copy Version"; - this.copyversion.UseVisualStyleBackColor = true; - this.copyversion.Click += new System.EventHandler(this.copyversion_Click); - // - // pictureBox2 - // - this.pictureBox2.Image = global::CodeImp.DoomBuilder.Properties.Resources.CLogo; - this.pictureBox2.Location = new System.Drawing.Point(293, 12); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(88, 80); - this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.pictureBox2.TabIndex = 10; - this.pictureBox2.TabStop = false; - // - // codeimplink - // - this.codeimplink.ActiveLinkColor = System.Drawing.Color.Firebrick; - this.codeimplink.AutoSize = true; - this.codeimplink.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; - this.codeimplink.LinkColor = System.Drawing.Color.Firebrick; - this.codeimplink.Location = new System.Drawing.Point(12, 239); - this.codeimplink.Name = "codeimplink"; - this.codeimplink.Size = new System.Drawing.Size(103, 14); - this.codeimplink.TabIndex = 4; - this.codeimplink.TabStop = true; - this.codeimplink.Text = "www.codeimp.com"; - this.codeimplink.VisitedLinkColor = System.Drawing.Color.Firebrick; - this.codeimplink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.codeimplink_LinkClicked); - // - // 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(393, 280); - this.Controls.Add(this.codeimplink); - this.Controls.Add(this.pictureBox2); - this.Controls.Add(this.copyversion); - this.Controls.Add(this.version); - this.Controls.Add(this.builderlink); - this.Controls.Add(this.close); - this.Controls.Add(label1); - this.Controls.Add(pictureBox1); - this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "AboutForm"; - this.Opacity = 0; - this.ShowIcon = false; - this.ShowInTaskbar = false; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "About Doom Builder"; - ((System.ComponentModel.ISupportInitialize)(pictureBox1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); + System.Windows.Forms.Label label1; + System.Windows.Forms.PictureBox pictureBox1; + System.Windows.Forms.PictureBox pictureBox3; + System.Windows.Forms.Label label2; + this.close = new System.Windows.Forms.Button(); + this.builderlink = new System.Windows.Forms.LinkLabel(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.codeimplink = new System.Windows.Forms.LinkLabel(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.pictureBox4 = new System.Windows.Forms.PictureBox(); + this.gzdbLink = new System.Windows.Forms.LinkLabel(); + this.copyversion = new System.Windows.Forms.Button(); + this.version = new System.Windows.Forms.Label(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + label1 = new System.Windows.Forms.Label(); + pictureBox1 = new System.Windows.Forms.PictureBox(); + pictureBox3 = new System.Windows.Forms.PictureBox(); + label2 = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(pictureBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(pictureBox3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); + this.tabControl1.SuspendLayout(); + this.tabPage1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); + this.tabPage2.SuspendLayout(); + this.SuspendLayout(); + // + // label1 + // + label1.FlatStyle = System.Windows.Forms.FlatStyle.System; + label1.Location = new System.Drawing.Point(11, 98); + label1.Name = "label1"; + label1.Size = new System.Drawing.Size(349, 50); + label1.TabIndex = 2; + label1.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."; + // + // pictureBox1 + // + pictureBox1.Image = global::CodeImp.DoomBuilder.Properties.Resources.Splash3_small; + pictureBox1.Location = new System.Drawing.Point(6, 6); + pictureBox1.Name = "pictureBox1"; + pictureBox1.Size = new System.Drawing.Size(226, 80); + pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + pictureBox1.TabIndex = 0; + pictureBox1.TabStop = false; + // + // pictureBox3 + // + pictureBox3.Image = global::CodeImp.DoomBuilder.Properties.Resources.GZDB_Logo_small; + pictureBox3.Location = new System.Drawing.Point(6, 6); + pictureBox3.Name = "pictureBox3"; + pictureBox3.Size = new System.Drawing.Size(226, 80); + pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + pictureBox3.TabIndex = 12; + pictureBox3.TabStop = false; + // + // label2 + // + label2.BackColor = System.Drawing.Color.White; + label2.FlatStyle = System.Windows.Forms.FlatStyle.System; + label2.Location = new System.Drawing.Point(11, 152); + label2.Name = "label2"; + label2.Size = new System.Drawing.Size(349, 23); + label2.TabIndex = 14; + label2.Text = "GZDoom Builder is designed and programmed by MaxED.\r\n"; + // + // 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(285, 245); + 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; + // + // builderlink + // + this.builderlink.ActiveLinkColor = System.Drawing.Color.Firebrick; + this.builderlink.AutoSize = true; + this.builderlink.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; + this.builderlink.LinkColor = System.Drawing.Color.Firebrick; + this.builderlink.Location = new System.Drawing.Point(8, 156); + this.builderlink.Name = "builderlink"; + this.builderlink.Size = new System.Drawing.Size(119, 14); + this.builderlink.TabIndex = 3; + this.builderlink.TabStop = true; + this.builderlink.Text = "www.doombuilder.com"; + this.builderlink.VisitedLinkColor = System.Drawing.Color.Firebrick; + this.builderlink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.builderlink_LinkClicked); + // + // pictureBox2 + // + this.pictureBox2.Image = global::CodeImp.DoomBuilder.Properties.Resources.CLogo; + this.pictureBox2.Location = new System.Drawing.Point(289, 6); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(88, 80); + this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.pictureBox2.TabIndex = 10; + this.pictureBox2.TabStop = false; + // + // codeimplink + // + this.codeimplink.ActiveLinkColor = System.Drawing.Color.Firebrick; + this.codeimplink.AutoSize = true; + this.codeimplink.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; + this.codeimplink.LinkColor = System.Drawing.Color.Firebrick; + this.codeimplink.Location = new System.Drawing.Point(8, 176); + this.codeimplink.Name = "codeimplink"; + this.codeimplink.Size = new System.Drawing.Size(102, 14); + this.codeimplink.TabIndex = 4; + this.codeimplink.TabStop = true; + this.codeimplink.Text = "www.codeimp.com"; + this.codeimplink.VisitedLinkColor = System.Drawing.Color.Firebrick; + this.codeimplink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.codeimplink_LinkClicked); + // + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Location = new System.Drawing.Point(12, 12); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(391, 227); + this.tabControl1.TabIndex = 11; + // + // tabPage1 + // + this.tabPage1.Controls.Add(pictureBox3); + this.tabPage1.Controls.Add(label2); + this.tabPage1.Controls.Add(this.pictureBox4); + this.tabPage1.Controls.Add(this.gzdbLink); + this.tabPage1.Controls.Add(this.copyversion); + this.tabPage1.Controls.Add(this.version); + this.tabPage1.Location = new System.Drawing.Point(4, 23); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(383, 200); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "About GZDoom Builder"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // pictureBox4 + // + this.pictureBox4.Image = global::CodeImp.DoomBuilder.Properties.Resources.MLogo; + this.pictureBox4.Location = new System.Drawing.Point(289, 6); + this.pictureBox4.Name = "pictureBox4"; + this.pictureBox4.Size = new System.Drawing.Size(88, 80); + this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.pictureBox4.TabIndex = 16; + this.pictureBox4.TabStop = false; + // + // gzdbLink + // + this.gzdbLink.ActiveLinkColor = System.Drawing.Color.Firebrick; + this.gzdbLink.AutoSize = true; + this.gzdbLink.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; + this.gzdbLink.LinkColor = System.Drawing.Color.Firebrick; + this.gzdbLink.Location = new System.Drawing.Point(8, 175); + this.gzdbLink.Name = "gzdbLink"; + this.gzdbLink.Size = new System.Drawing.Size(143, 14); + this.gzdbLink.TabIndex = 15; + this.gzdbLink.TabStop = true; + this.gzdbLink.Text = "Official thread at ZDoom.org"; + this.gzdbLink.VisitedLinkColor = System.Drawing.Color.Firebrick; + this.gzdbLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.gzdbLink_LinkClicked); + // + // copyversion + // + this.copyversion.Location = new System.Drawing.Point(269, 97); + this.copyversion.Name = "copyversion"; + this.copyversion.Size = new System.Drawing.Size(108, 25); + this.copyversion.TabIndex = 13; + this.copyversion.Text = "Copy Version"; + this.copyversion.UseVisualStyleBackColor = true; + this.copyversion.Click += new System.EventHandler(this.copyversion_Click); + // + // version + // + this.version.AutoSize = true; + this.version.FlatStyle = System.Windows.Forms.FlatStyle.System; + this.version.Location = new System.Drawing.Point(11, 102); + this.version.Name = "version"; + this.version.Size = new System.Drawing.Size(153, 14); + this.version.TabIndex = 11; + this.version.Text = "GZDoom Builder some version"; + // + // tabPage2 + // + this.tabPage2.Controls.Add(pictureBox1); + this.tabPage2.Controls.Add(this.codeimplink); + this.tabPage2.Controls.Add(label1); + this.tabPage2.Controls.Add(this.pictureBox2); + this.tabPage2.Controls.Add(this.builderlink); + this.tabPage2.Location = new System.Drawing.Point(4, 23); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(383, 200); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "About Doom Builder"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // 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(413, 277); + this.Controls.Add(this.tabControl1); + this.Controls.Add(this.close); + this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "AboutForm"; + this.Opacity = 0; + this.ShowIcon = false; + this.ShowInTaskbar = false; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "About"; + ((System.ComponentModel.ISupportInitialize)(pictureBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(pictureBox3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); + this.tabControl1.ResumeLayout(false); + this.tabPage1.ResumeLayout(false); + this.tabPage1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit(); + this.tabPage2.ResumeLayout(false); + this.tabPage2.PerformLayout(); + this.ResumeLayout(false); } #endregion private System.Windows.Forms.Button close; - private System.Windows.Forms.LinkLabel builderlink; - private System.Windows.Forms.Label version; - private System.Windows.Forms.Button copyversion; + private System.Windows.Forms.LinkLabel builderlink; private System.Windows.Forms.PictureBox pictureBox2; private System.Windows.Forms.LinkLabel codeimplink; + private System.Windows.Forms.TabControl tabControl1; + private System.Windows.Forms.TabPage tabPage1; + private System.Windows.Forms.PictureBox pictureBox4; + private System.Windows.Forms.LinkLabel gzdbLink; + private System.Windows.Forms.Button copyversion; + private System.Windows.Forms.Label version; + private System.Windows.Forms.TabPage tabPage2; } } \ No newline at end of file diff --git a/Source/Core/Windows/AboutForm.cs b/Source/Core/Windows/AboutForm.cs index a5a7e19e..f521ac5e 100644 --- a/Source/Core/Windows/AboutForm.cs +++ b/Source/Core/Windows/AboutForm.cs @@ -40,9 +40,7 @@ namespace CodeImp.DoomBuilder.Windows InitializeComponent(); // Show version - string postfix = ""; - if(General.DebugBuild) postfix = "(debug)"; - version.Text = Application.ProductName + " version " + Application.ProductVersion + " " + postfix; + version.Text = "GZDoom Builder " + CodeImp.DoomBuilder.GZBuilder.GZGeneral.Version + CodeImp.DoomBuilder.GZBuilder.GZGeneral.Revision + " " + (General.DebugBuild ? "(debug)" : ""); } // Launch Doom Builder website @@ -57,11 +55,16 @@ namespace CodeImp.DoomBuilder.Windows General.OpenWebsite("http://" + codeimplink.Text); } + //mxd + private void gzdbLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { + General.OpenWebsite("http://forum.zdoom.org/viewtopic.php?f=3&t=32392"); + } + // This copies the version number to clipboard private void copyversion_Click(object sender, EventArgs e) { Clipboard.Clear(); - Clipboard.SetText(Application.ProductVersion); - } + Clipboard.SetText(CodeImp.DoomBuilder.GZBuilder.GZGeneral.Version.ToString() + CodeImp.DoomBuilder.GZBuilder.GZGeneral.Revision); + } } } \ No newline at end of file diff --git a/Source/Core/Windows/AboutForm.resx b/Source/Core/Windows/AboutForm.resx index 2310e084..6d67f46f 100644 --- a/Source/Core/Windows/AboutForm.resx +++ b/Source/Core/Windows/AboutForm.resx @@ -117,37 +117,16 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - False - - True - False - - True + + False - - True - - - True - - - True - - - True - - - True - - - True + + False \ No newline at end of file diff --git a/Source/Core/Windows/PreferencesForm.cs b/Source/Core/Windows/PreferencesForm.cs index 162c7d6c..1fdb46d0 100644 --- a/Source/Core/Windows/PreferencesForm.cs +++ b/Source/Core/Windows/PreferencesForm.cs @@ -67,20 +67,20 @@ namespace CodeImp.DoomBuilder.Windows // Interface imagebrightness.Value = General.Settings.ImageBrightness; squarethings.Checked = General.Settings.SquareThings; - doublesidedalpha.Value = (int)((1.0f - General.Settings.DoubleSidedAlpha) * 10.0f); + doublesidedalpha.Value = General.Clamp((int)((1.0f - General.Settings.DoubleSidedAlpha) * 10.0f), doublesidedalpha.Minimum, doublesidedalpha.Maximum); defaultviewmode.SelectedIndex = General.Settings.DefaultViewMode; - fieldofview.Value = General.Settings.VisualFOV / 10; - mousespeed.Value = General.Settings.MouseSpeed / 100; - movespeed.Value = General.Settings.MoveSpeed / 100; + fieldofview.Value = General.Clamp(General.Settings.VisualFOV / 10, fieldofview.Minimum, fieldofview.Maximum); + mousespeed.Value = General.Clamp(General.Settings.MouseSpeed / 100, mousespeed.Minimum, mousespeed.Maximum); + movespeed.Value = General.Clamp(General.Settings.MoveSpeed / 100, movespeed.Minimum, movespeed.Maximum); viewdistance.Value = General.Clamp((int)(General.Settings.ViewDistance / 200.0f), viewdistance.Minimum, viewdistance.Maximum); invertyaxis.Checked = General.Settings.InvertYAxis; scriptfontbold.Checked = General.Settings.ScriptFontBold; scriptontop.Checked = General.Settings.ScriptOnTop; scripttabwidth.Text = General.Settings.ScriptTabWidth.ToString(); scriptautoindent.Checked = General.Settings.ScriptAutoIndent; - previewsize.Value = General.Settings.PreviewImageSize; - autoscrollspeed.Value = General.Settings.AutoScrollSpeed; - zoomfactor.Value = General.Settings.ZoomFactor; + previewsize.Value = General.Clamp(General.Settings.PreviewImageSize, previewsize.Minimum, previewsize.Maximum); + autoscrollspeed.Value = General.Clamp(General.Settings.AutoScrollSpeed, autoscrollspeed.Minimum, autoscrollspeed.Maximum); + zoomfactor.Value = General.Clamp(General.Settings.ZoomFactor, zoomfactor.Minimum, zoomfactor.Maximum); animatevisualselection.Checked = General.Settings.AnimateVisualSelection; dockersposition.SelectedIndex = General.Settings.DockersPosition; collapsedockers.Checked = General.Settings.CollapseDockers; @@ -97,11 +97,11 @@ namespace CodeImp.DoomBuilder.Windows //mxd toolbar_gzdoom.Checked = General.Settings.GZToolbarGZDoom; cbSynchCameras.Checked = General.Settings.GZSynchCameras; - tbDynLightCount.Value = General.Settings.GZMaxDynamicLights; + tbDynLightCount.Value = General.Clamp(General.Settings.GZMaxDynamicLights, tbDynLightCount.Minimum, tbDynLightCount.Maximum); labelDynLightCount.Text = General.Settings.GZMaxDynamicLights.ToString(); - tbDynLightSize.Value = (int)(General.Settings.GZDynamicLightRadius * 10); + tbDynLightSize.Value = General.Clamp((int)(General.Settings.GZDynamicLightRadius * 10), tbDynLightSize.Minimum, tbDynLightSize.Maximum); labelDynLightSize.Text = General.Settings.GZDynamicLightRadius.ToString(); - tbDynLightIntensity.Value = (int)(General.Settings.GZDynamicLightIntensity * 10); + tbDynLightIntensity.Value = General.Clamp((int)(General.Settings.GZDynamicLightIntensity * 10), tbDynLightIntensity.Minimum, tbDynLightIntensity.Maximum); labelDynLightIntensity.Text = General.Settings.GZDynamicLightIntensity.ToString(); // Fill fonts list diff --git a/Source/Core/ZDoom/ActorStructure.cs b/Source/Core/ZDoom/ActorStructure.cs index 0d80fe8a..f12585ff 100644 --- a/Source/Core/ZDoom/ActorStructure.cs +++ b/Source/Core/ZDoom/ActorStructure.cs @@ -317,6 +317,7 @@ namespace CodeImp.DoomBuilder.ZDoom return; } if(v == "\n") break; + if (v == "}") return; //mxd if(v != ",") games.Add(v.ToLowerInvariant()); }