From 6e46203b387811296c5392fb25e3f4ab8c9cf0c5 Mon Sep 17 00:00:00 2001 From: MaxED Date: Thu, 7 Aug 2014 10:20:35 +0000 Subject: [PATCH] Screenshots Folder can now be set in the Preferences. Added custom icons for ZDoom's Decal and Sparkle things. --- .../Configurations/Includes/ZDoom_things.cfg | 2 + Build/Sprites/Decal.png | Bin 0 -> 682 bytes Build/Sprites/Sparkle.png | Bin 0 -> 432 bytes Source/Core/Builder.csproj | 1 + Source/Core/Config/ProgramConfiguration.cs | 4 + Source/Core/General/General.cs | 4 + Source/Core/Properties/Resources.Designer.cs | 7 ++ Source/Core/Properties/Resources.resx | 71 ++++++------- Source/Core/Resources/FolderExplore.png | Bin 0 -> 815 bytes Source/Core/Windows/MainForm.cs | 15 ++- .../Core/Windows/PreferencesForm.Designer.cs | 94 ++++++++++++++---- Source/Core/Windows/PreferencesForm.cs | 28 ++++++ Source/Core/Windows/PreferencesForm.resx | 3 + 13 files changed, 174 insertions(+), 55 deletions(-) create mode 100644 Build/Sprites/Decal.png create mode 100644 Build/Sprites/Sparkle.png create mode 100644 Source/Core/Resources/FolderExplore.png diff --git a/Build/Configurations/Includes/ZDoom_things.cfg b/Build/Configurations/Includes/ZDoom_things.cfg index dcdfb3e6..efb90818 100644 --- a/Build/Configurations/Includes/ZDoom_things.cfg +++ b/Build/Configurations/Includes/ZDoom_things.cfg @@ -721,6 +721,7 @@ zdoom 9200 { title = "Decal"; + sprite = "internal:Decal"; arg0 { title = "Decal ID"; @@ -743,6 +744,7 @@ zdoom 9026 { title = "Spark"; + sprite = "internal:Sparkle"; arg0 { title = "Particles Amount"; diff --git a/Build/Sprites/Decal.png b/Build/Sprites/Decal.png new file mode 100644 index 0000000000000000000000000000000000000000..139de294da4a9d18d1257bab31ef49247ad6dfad GIT binary patch literal 682 zcmV;b0#*HqP)pP4o`Y$X(OQ-+|u`1|z=gaFzUSgIGkkaTl!ccz| z#(KZ6L2;<8Zxq>*i?yvkJbHdY1#Q$|t=Cs& zWNo&KFxE0xhs<`{n7KFxr4uw7ji5ANnVJgoDsRC<^;QydZ)Os<-A3N&#)?O+Y6xFG zEh0@*zBWCr@;pbDWuZk-p#%5tTz&fB?oH7^hAPjZ(%$CL!fG~~@~AY|>va`0QF0Zf zO`IySa#*s$OpUH>Y%jNdY|#m$L8X?VO9QFlk>S&tLd)g5cw16Tg1-U`09|-t2|$7k QrT_o{07*qoM6N<$g8JD!H2?qr literal 0 HcmV?d00001 diff --git a/Build/Sprites/Sparkle.png b/Build/Sprites/Sparkle.png new file mode 100644 index 0000000000000000000000000000000000000000..3903be5b17c357a652377d3adec75037ef7b0d94 GIT binary patch literal 432 zcmV;h0Z;ykP)+zCFLo6kU0v*f5N&Q&9_ z<2azT2712(-Ma@E_Q5?gn7cyYRSDf~6tk<5z}UF31L4aBxJSQaK7UM9Ugd$PkH`*x zbpUjC1a456w<`ejE^(N-!pF@@TkgMB)RjB~Q9LflEx^(;un#Q8Mwa(lBKf4L71Z?- zSpgKH6d6gXW#=qLDDOUDQXmy1e(SgnZfhp+H|QrH#2HBjDKm*<0h>ZjV_te0)Bl;i a1sDLNJ>ydG1u$^{0000 + diff --git a/Source/Core/Config/ProgramConfiguration.cs b/Source/Core/Config/ProgramConfiguration.cs index ae48c3d2..373cb50f 100644 --- a/Source/Core/Config/ProgramConfiguration.cs +++ b/Source/Core/Config/ProgramConfiguration.cs @@ -68,6 +68,7 @@ namespace CodeImp.DoomBuilder.Config private bool scriptontop; private bool scriptautoindent; private bool snippetsallmanstyle; //mxd + private string screenshotspath; //mxd private int scripttabwidth; private int previewimagesize; private int autoscrollspeed; @@ -159,6 +160,7 @@ namespace CodeImp.DoomBuilder.Config public int ScriptTabWidth { get { return scripttabwidth; } internal set { scripttabwidth = value; } } public bool ScriptAutoIndent { get { return scriptautoindent; } internal set { scriptautoindent = value; } } public bool SnippetsAllmanStyle { get { return snippetsallmanstyle; } internal set { snippetsallmanstyle = value; } } //mxd + internal string ScreenshotsPath { get { return screenshotspath; } set { screenshotspath = value; } } //mxd internal int PreviousVersion { get { return previousversion; } } internal PasteOptions PasteOptions { get { return pasteoptions; } set { pasteoptions = value; } } public int DockersPosition { get { return dockersposition; } internal set { dockersposition = value; } } @@ -260,6 +262,7 @@ namespace CodeImp.DoomBuilder.Config scriptfontbold = cfg.ReadSetting("scriptfontbold", false); scriptautoindent = cfg.ReadSetting("scriptautoindent", true); snippetsallmanstyle = cfg.ReadSetting("snippetsallmanstyle", false); //mxd + screenshotspath = cfg.ReadSetting("screenshotspath", General.DefaultScreenshotsPath); //mxd scriptontop = cfg.ReadSetting("scriptontop", true); scripttabwidth = cfg.ReadSetting("scripttabwidth", 4); previewimagesize = cfg.ReadSetting("previewimagesize", 1); @@ -352,6 +355,7 @@ namespace CodeImp.DoomBuilder.Config cfg.WriteSetting("scripttabwidth", scripttabwidth); cfg.WriteSetting("scriptautoindent", scriptautoindent); cfg.WriteSetting("snippetsallmanstyle", snippetsallmanstyle); //mxd + cfg.WriteSetting("screenshotspath", screenshotspath); //mxd cfg.WriteSetting("previewimagesize", previewimagesize); cfg.WriteSetting("autoscrollspeed", autoscrollspeed); cfg.WriteSetting("zoomfactor", zoomfactor); diff --git a/Source/Core/General/General.cs b/Source/Core/General/General.cs index 44e71240..95625d21 100644 --- a/Source/Core/General/General.cs +++ b/Source/Core/General/General.cs @@ -122,6 +122,7 @@ namespace CodeImp.DoomBuilder private const string COMPILERS_DIR = "Compilers"; private const string PLUGINS_DIR = "Plugins"; private const string SCRIPTS_DIR = "Scripting"; + private const string SCREENSHOTS_DIR = "Screenshots"; //mxd private const string SNIPPETS_DIR = "Snippets"; //mxd private const string SETUP_DIR = "Setup"; private const string SPRITES_DIR = "Sprites"; @@ -153,6 +154,7 @@ namespace CodeImp.DoomBuilder private static string compilerspath; private static string scriptspath; private static string snippetspath; //mxd + private static string screenshotspath; //mxd private static string pluginspath; private static string spritespath; @@ -208,6 +210,7 @@ namespace CodeImp.DoomBuilder public static string PluginsPath { get { return pluginspath; } } public static string SpritesPath { get { return spritespath; } } public static string SnippetsPath { get { return snippetspath; } } //mxd + public static string DefaultScreenshotsPath { get { return screenshotspath; } } //mxd public static ICollection CommandArgs { get { return Array.AsReadOnly(cmdargs); } } internal static MainForm MainWindow { get { return mainwindow; } } public static IMainForm Interface { get { return mainwindow; } } @@ -580,6 +583,7 @@ namespace CodeImp.DoomBuilder pluginspath = Path.Combine(apppath, PLUGINS_DIR); scriptspath = Path.Combine(apppath, SCRIPTS_DIR); snippetspath = Path.Combine(apppath, SNIPPETS_DIR); //mxd + screenshotspath = Path.Combine(apppath, SCREENSHOTS_DIR).Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar); //mxd spritespath = Path.Combine(apppath, SPRITES_DIR); logfile = Path.Combine(settingspath, LOG_FILE); diff --git a/Source/Core/Properties/Resources.Designer.cs b/Source/Core/Properties/Resources.Designer.cs index 082837d2..e58df676 100644 --- a/Source/Core/Properties/Resources.Designer.cs +++ b/Source/Core/Properties/Resources.Designer.cs @@ -193,6 +193,13 @@ namespace CodeImp.DoomBuilder.Properties { } } + internal static System.Drawing.Bitmap FolderExplore { + get { + object obj = ResourceManager.GetObject("FolderExplore", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap fx { get { object obj = ResourceManager.GetObject("fx", resourceCulture); diff --git a/Source/Core/Properties/Resources.resx b/Source/Core/Properties/Resources.resx index c83df003..a66e6afc 100644 --- a/Source/Core/Properties/Resources.resx +++ b/Source/Core/Properties/Resources.resx @@ -175,45 +175,42 @@ ..\Resources\Marine.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ThingStatistics.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\Model.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\ScriptHelp.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\Splash3_trans.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Close.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Status2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ThingStatistics.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Unpin.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Grid2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Status0.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ViewBrightness.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 + + ..\Resources\Model.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\ScriptSnippet.xpm;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\List_Images.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -292,15 +289,24 @@ ..\Resources\ErrorLarge.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Lightbulb.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\MCrash.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\PuzzlePiece.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\ScriptCompile.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Zoom_arrowup.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 + ..\Resources\Model_selected.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -325,6 +331,9 @@ ..\Resources\Redo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Status2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Prefab.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -349,9 +358,6 @@ ..\Resources\Link.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\TagStatistics.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -364,11 +370,8 @@ ..\Resources\Undo.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\KnownTextureSet.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Unpin.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 @@ -385,17 +388,20 @@ ..\Resources\ViewNormal.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\MissingThing.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\Copy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Grid2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ViewBrightness.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Lightbulb.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\Help.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -403,8 +409,8 @@ ..\Resources\OpenScript.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\MissingThing.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\Status11.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -424,10 +430,7 @@ ..\Resources\Check.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\PuzzlePiece.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ScriptSnippet.xpm;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\FolderExplore.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/FolderExplore.png b/Source/Core/Resources/FolderExplore.png new file mode 100644 index 0000000000000000000000000000000000000000..c830338d89ee2befb52c0cb2a6fd72df21b55218 GIT binary patch literal 815 zcmV+~1JL}5P)RCwBqQ%g(}Q4~Gzz3I>vfg&G6 zfP#obq6UA&Pjq2KapOYW04A_78dgSKx-@ZNh%qrl2^vMCQ8u_Bae*er#28ToiW;;c z0c@!)ls}~{GxNMNmHOLwGczx9?>*<;FB@n%Fl}gYmo#*k!ngnvik~rFO@Aq-3M;~_ zM*(BqD{93AS2W%MmbHYF5a?~L%O{c#jQzqUIp_ke*d`cPaxDUB7zBVuR;;eU7k+N{ZyIVmZl0GC0UCpaq{KojFCo1Os0og8^1@j?5B+ zW3%z{A{XUjdg>7hi_&ExnKEaRbb!C_GiH6E1e}0|tRWW#WqB$6RJX?o0z@Iy6w8oI zTNvnjJ%i_8_9Dtt$x9+5-Hs#sOHo*wYt`3ttY;QwDwSnS-BFsg!ZiR7e+s t410PEEa90aQ2+0`{hw_Ac@F*%U;ua(2cjIGj_Uvb002ovPDHLkV1gnTW + + 114, 17 + \ No newline at end of file