mirror of
https://git.do.srb2.org/STJr/UltimateZoneBuilder.git
synced 2024-11-26 05:41:45 +00:00
Screenshots Folder can now be set in the Preferences.
Added custom icons for ZDoom's Decal and Sparkle things.
This commit is contained in:
MaxED
parent
948dda0406
commit
6e46203b38
13 changed files with 174 additions and 55 deletions
|
|
@ -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";
|
||||
|
|
|
|||
BIN
Build/Sprites/Decal.png
Normal file
BIN
Build/Sprites/Decal.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 682 B |
BIN
Build/Sprites/Sparkle.png
Normal file
BIN
Build/Sprites/Sparkle.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 432 B |
|
|
@ -994,6 +994,7 @@
|
|||
<None Include="Resources\InfoLine.png" />
|
||||
<None Include="Resources\Keyboard.png" />
|
||||
<None Include="Resources\ImageStack.png" />
|
||||
<None Include="Resources\FolderExplore.png" />
|
||||
<Content Include="Resources\Light.png" />
|
||||
<None Include="Resources\Lightbulb.png" />
|
||||
<Content Include="Resources\Light_animate.png" />
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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<string> 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);
|
||||
|
||||
|
|
|
|||
7
Source/Core/Properties/Resources.Designer.cs
generated
7
Source/Core/Properties/Resources.Designer.cs
generated
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -175,45 +175,42 @@
|
|||
<data name="Marine" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Marine.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ThingStatistics" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ThingStatistics.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Splash3_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Splash3_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Model" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Model.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ScriptPalette" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ScriptPalette.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ScriptHelp" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ScriptHelp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="KnownTextureSet" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\KnownTextureSet.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>
|
||||
<data name="Status2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Status2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="ThingStatistics" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ThingStatistics.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Unpin" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Unpin.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="Grid2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Grid2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Status0" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Status0.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ViewBrightness" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ViewBrightness.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Zoom" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Zoom.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="Model" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Model.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="mergegeometry" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\mergegeometry.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ScriptSnippet" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ScriptSnippet.xpm;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="List_Images" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\List_Images.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
|
@ -292,15 +289,24 @@
|
|||
<data name="ErrorLarge" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ErrorLarge.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Lightbulb" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Lightbulb.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="MCrash" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\MCrash.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="PuzzlePiece" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\PuzzlePiece.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ScriptCompile" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ScriptCompile.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Zoom_arrowup" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Zoom_arrowup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Zoom" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Zoom.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Model_selected" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Model_selected.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
|
@ -325,6 +331,9 @@
|
|||
<data name="Redo" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Redo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Status2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Status2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Prefab" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Prefab.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
|
@ -349,9 +358,6 @@
|
|||
<data name="Link" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Link.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Light" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Light.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="TagStatistics" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\TagStatistics.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
|
@ -364,11 +370,8 @@
|
|||
<data name="Undo" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Undo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="SlimDX_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\SlimDX_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="KnownTextureSet" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\KnownTextureSet.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="Unpin" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Unpin.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Angle" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Angle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
@ -385,17 +388,20 @@
|
|||
<data name="ViewNormal" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ViewNormal.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="MissingThing" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\MissingThing.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Monster3" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Monster3.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Copy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Grid2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Grid2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="ViewBrightness" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ViewBrightness.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Lightbulb" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Lightbulb.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="Light" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Light.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Help" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Help.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
@ -403,8 +409,8 @@
|
|||
<data name="OpenScript" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\OpenScript.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="MissingThing" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\MissingThing.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="SlimDX_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\SlimDX_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Status11" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Status11.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
@ -424,10 +430,7 @@
|
|||
<data name="Check" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Check.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="PuzzlePiece" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\PuzzlePiece.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ScriptSnippet" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ScriptSnippet.xpm;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<data name="FolderExplore" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\FolderExplore.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
</root>
|
||||
BIN
Source/Core/Resources/FolderExplore.png
Normal file
BIN
Source/Core/Resources/FolderExplore.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 815 B |
|
|
@ -2905,9 +2905,18 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
return;
|
||||
}
|
||||
|
||||
//check folder
|
||||
string folder = Path.Combine(General.AppPath, "Screenshots").Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
|
||||
//pick a valid folder
|
||||
string folder = General.Settings.ScreenshotsPath;
|
||||
if (!Directory.Exists(folder)) {
|
||||
if (General.ShowErrorMessage("Screenshots save path '" + folder
|
||||
+ "' does not exist!\nPress OK to save to the default folder ('"
|
||||
+ General.DefaultScreenshotsPath
|
||||
+ "').\nPress Cancel to abort.", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return;
|
||||
|
||||
|
||||
folder = General.DefaultScreenshotsPath;
|
||||
if(!Directory.Exists(folder)) Directory.CreateDirectory(folder);
|
||||
}
|
||||
|
||||
//create name
|
||||
string name;
|
||||
|
|
|
|||
94
Source/Core/Windows/PreferencesForm.Designer.cs
generated
94
Source/Core/Windows/PreferencesForm.Designer.cs
generated
|
|
@ -82,6 +82,10 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.apply = new System.Windows.Forms.Button();
|
||||
this.tabs = new System.Windows.Forms.TabControl();
|
||||
this.tabinterface = new System.Windows.Forms.TabPage();
|
||||
this.groupBox3 = new System.Windows.Forms.GroupBox();
|
||||
this.resetscreenshotsdir = new System.Windows.Forms.Button();
|
||||
this.browsescreenshotsdir = new System.Windows.Forms.Button();
|
||||
this.screenshotsfolderpath = new System.Windows.Forms.TextBox();
|
||||
this.groupBox5 = new System.Windows.Forms.GroupBox();
|
||||
this.toolbar_gzdoom = new System.Windows.Forms.CheckBox();
|
||||
this.toolbar_file = new System.Windows.Forms.CheckBox();
|
||||
|
|
@ -128,6 +132,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.actionkey = new System.Windows.Forms.TextBox();
|
||||
this.tabcolors = new System.Windows.Forms.TabPage();
|
||||
this.appearancegroup1 = new System.Windows.Forms.GroupBox();
|
||||
this.capitalizetexturenames = new System.Windows.Forms.CheckBox();
|
||||
this.cbMarkExtraFloors = new System.Windows.Forms.CheckBox();
|
||||
this.cbOldHighlightMode = new System.Windows.Forms.CheckBox();
|
||||
this.labelDynLightIntensity = new System.Windows.Forms.Label();
|
||||
|
|
@ -164,7 +169,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.label16 = new System.Windows.Forms.Label();
|
||||
this.pasteoptions = new CodeImp.DoomBuilder.Controls.PasteOptionsControl();
|
||||
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
|
||||
this.capitalizetexturenames = new System.Windows.Forms.CheckBox();
|
||||
this.browseScreenshotsFolderDialog = new System.Windows.Forms.FolderBrowserDialog();
|
||||
label7 = new System.Windows.Forms.Label();
|
||||
label6 = new System.Windows.Forms.Label();
|
||||
label5 = new System.Windows.Forms.Label();
|
||||
|
|
@ -183,6 +188,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
((System.ComponentModel.ISupportInitialize)(this.doublesidedalpha)).BeginInit();
|
||||
this.tabs.SuspendLayout();
|
||||
this.tabinterface.SuspendLayout();
|
||||
this.groupBox3.SuspendLayout();
|
||||
this.groupBox5.SuspendLayout();
|
||||
this.groupBox4.SuspendLayout();
|
||||
this.groupBox2.SuspendLayout();
|
||||
|
|
@ -748,7 +754,6 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
// apply
|
||||
//
|
||||
this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.apply.DialogResult = System.Windows.Forms.DialogResult.Cancel;
|
||||
this.apply.Location = new System.Drawing.Point(587, 557);
|
||||
this.apply.Name = "apply";
|
||||
this.apply.Size = new System.Drawing.Size(112, 25);
|
||||
|
|
@ -778,6 +783,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
//
|
||||
// tabinterface
|
||||
//
|
||||
this.tabinterface.Controls.Add(this.groupBox3);
|
||||
this.tabinterface.Controls.Add(this.groupBox5);
|
||||
this.tabinterface.Controls.Add(this.groupBox4);
|
||||
this.tabinterface.Controls.Add(this.groupBox2);
|
||||
|
|
@ -791,6 +797,47 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.tabinterface.Text = "Interface";
|
||||
this.tabinterface.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// groupBox3
|
||||
//
|
||||
this.groupBox3.Controls.Add(this.resetscreenshotsdir);
|
||||
this.groupBox3.Controls.Add(this.browsescreenshotsdir);
|
||||
this.groupBox3.Controls.Add(this.screenshotsfolderpath);
|
||||
this.groupBox3.Location = new System.Drawing.Point(8, 449);
|
||||
this.groupBox3.Name = "groupBox3";
|
||||
this.groupBox3.Size = new System.Drawing.Size(331, 51);
|
||||
this.groupBox3.TabIndex = 5;
|
||||
this.groupBox3.TabStop = false;
|
||||
this.groupBox3.Text = " Screenshots Folder: ";
|
||||
//
|
||||
// resetscreenshotsdir
|
||||
//
|
||||
this.resetscreenshotsdir.Image = global::CodeImp.DoomBuilder.Properties.Resources.Reset;
|
||||
this.resetscreenshotsdir.Location = new System.Drawing.Point(301, 17);
|
||||
this.resetscreenshotsdir.Name = "resetscreenshotsdir";
|
||||
this.resetscreenshotsdir.Size = new System.Drawing.Size(24, 24);
|
||||
this.resetscreenshotsdir.TabIndex = 2;
|
||||
this.toolTip1.SetToolTip(this.resetscreenshotsdir, "Use Default Screenshots Folder");
|
||||
this.resetscreenshotsdir.UseVisualStyleBackColor = true;
|
||||
this.resetscreenshotsdir.Click += new System.EventHandler(this.resetscreenshotsdir_Click);
|
||||
//
|
||||
// browsescreenshotsdir
|
||||
//
|
||||
this.browsescreenshotsdir.Image = global::CodeImp.DoomBuilder.Properties.Resources.FolderExplore;
|
||||
this.browsescreenshotsdir.Location = new System.Drawing.Point(275, 17);
|
||||
this.browsescreenshotsdir.Name = "browsescreenshotsdir";
|
||||
this.browsescreenshotsdir.Size = new System.Drawing.Size(24, 24);
|
||||
this.browsescreenshotsdir.TabIndex = 1;
|
||||
this.toolTip1.SetToolTip(this.browsescreenshotsdir, "Browse Screenshots Folder");
|
||||
this.browsescreenshotsdir.UseVisualStyleBackColor = true;
|
||||
this.browsescreenshotsdir.Click += new System.EventHandler(this.browsescreenshotsdir_Click);
|
||||
//
|
||||
// screenshotsfolderpath
|
||||
//
|
||||
this.screenshotsfolderpath.Location = new System.Drawing.Point(6, 19);
|
||||
this.screenshotsfolderpath.Name = "screenshotsfolderpath";
|
||||
this.screenshotsfolderpath.Size = new System.Drawing.Size(264, 20);
|
||||
this.screenshotsfolderpath.TabIndex = 0;
|
||||
//
|
||||
// groupBox5
|
||||
//
|
||||
this.groupBox5.Controls.Add(this.toolbar_gzdoom);
|
||||
|
|
@ -915,9 +962,9 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.groupBox4.Controls.Add(this.collapsedockers);
|
||||
this.groupBox4.Controls.Add(this.dockersposition);
|
||||
this.groupBox4.Controls.Add(this.label17);
|
||||
this.groupBox4.Location = new System.Drawing.Point(10, 386);
|
||||
this.groupBox4.Location = new System.Drawing.Point(8, 386);
|
||||
this.groupBox4.Name = "groupBox4";
|
||||
this.groupBox4.Size = new System.Drawing.Size(329, 114);
|
||||
this.groupBox4.Size = new System.Drawing.Size(331, 57);
|
||||
this.groupBox4.TabIndex = 3;
|
||||
this.groupBox4.TabStop = false;
|
||||
this.groupBox4.Text = " Side Panels ";
|
||||
|
|
@ -925,7 +972,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
// collapsedockers
|
||||
//
|
||||
this.collapsedockers.AutoSize = true;
|
||||
this.collapsedockers.Location = new System.Drawing.Point(204, 36);
|
||||
this.collapsedockers.Location = new System.Drawing.Point(200, 24);
|
||||
this.collapsedockers.Name = "collapsedockers";
|
||||
this.collapsedockers.Size = new System.Drawing.Size(72, 18);
|
||||
this.collapsedockers.TabIndex = 2;
|
||||
|
|
@ -940,7 +987,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
"Left",
|
||||
"Right",
|
||||
"None"});
|
||||
this.dockersposition.Location = new System.Drawing.Point(95, 34);
|
||||
this.dockersposition.Location = new System.Drawing.Point(91, 22);
|
||||
this.dockersposition.Name = "dockersposition";
|
||||
this.dockersposition.Size = new System.Drawing.Size(85, 22);
|
||||
this.dockersposition.TabIndex = 1;
|
||||
|
|
@ -948,7 +995,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
// label17
|
||||
//
|
||||
this.label17.AutoSize = true;
|
||||
this.label17.Location = new System.Drawing.Point(33, 37);
|
||||
this.label17.Location = new System.Drawing.Point(29, 25);
|
||||
this.label17.Name = "label17";
|
||||
this.label17.Size = new System.Drawing.Size(47, 14);
|
||||
this.label17.TabIndex = 0;
|
||||
|
|
@ -1343,6 +1390,18 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.appearancegroup1.TabStop = false;
|
||||
this.appearancegroup1.Text = " Additional Options ";
|
||||
//
|
||||
// capitalizetexturenames
|
||||
//
|
||||
this.capitalizetexturenames.AutoSize = true;
|
||||
this.capitalizetexturenames.Location = new System.Drawing.Point(236, 212);
|
||||
this.capitalizetexturenames.Name = "capitalizetexturenames";
|
||||
this.capitalizetexturenames.Size = new System.Drawing.Size(144, 18);
|
||||
this.capitalizetexturenames.TabIndex = 36;
|
||||
this.capitalizetexturenames.Text = "Capitalize texture names";
|
||||
this.toolTip1.SetToolTip(this.capitalizetexturenames, "When enabled, texture names will be shown \r\nand saved as all caps (DB2 behaviour)" +
|
||||
"");
|
||||
this.capitalizetexturenames.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// cbMarkExtraFloors
|
||||
//
|
||||
this.cbMarkExtraFloors.AutoSize = true;
|
||||
|
|
@ -1772,24 +1831,16 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.pasteoptions.Size = new System.Drawing.Size(666, 427);
|
||||
this.pasteoptions.TabIndex = 0;
|
||||
//
|
||||
// capitalizetexturenames
|
||||
// browseScreenshotsFolderDialog
|
||||
//
|
||||
this.capitalizetexturenames.AutoSize = true;
|
||||
this.capitalizetexturenames.Location = new System.Drawing.Point(236, 212);
|
||||
this.capitalizetexturenames.Name = "capitalizetexturenames";
|
||||
this.capitalizetexturenames.Size = new System.Drawing.Size(144, 18);
|
||||
this.capitalizetexturenames.TabIndex = 36;
|
||||
this.capitalizetexturenames.Text = "Capitalize texture names";
|
||||
this.toolTip1.SetToolTip(this.capitalizetexturenames, "When enabled, texture names will be shown \r\nand saved as all caps (DB2 behaviour)" +
|
||||
"");
|
||||
this.capitalizetexturenames.UseVisualStyleBackColor = true;
|
||||
this.browseScreenshotsFolderDialog.Description = "Select a Folder to Save Screenshots Into";
|
||||
//
|
||||
// PreferencesForm
|
||||
//
|
||||
this.AcceptButton = this.apply;
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
|
||||
this.CancelButton = this.apply;
|
||||
this.CancelButton = this.cancel;
|
||||
this.ClientSize = new System.Drawing.Size(711, 594);
|
||||
this.Controls.Add(this.cancel);
|
||||
this.Controls.Add(this.apply);
|
||||
|
|
@ -1817,6 +1868,8 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
((System.ComponentModel.ISupportInitialize)(this.doublesidedalpha)).EndInit();
|
||||
this.tabs.ResumeLayout(false);
|
||||
this.tabinterface.ResumeLayout(false);
|
||||
this.groupBox3.ResumeLayout(false);
|
||||
this.groupBox3.PerformLayout();
|
||||
this.groupBox5.ResumeLayout(false);
|
||||
this.groupBox5.PerformLayout();
|
||||
this.groupBox4.ResumeLayout(false);
|
||||
|
|
@ -1973,5 +2026,10 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
private System.Windows.Forms.Label label25;
|
||||
private System.Windows.Forms.CheckBox snippetsallmanstyle;
|
||||
private System.Windows.Forms.CheckBox capitalizetexturenames;
|
||||
private System.Windows.Forms.GroupBox groupBox3;
|
||||
private System.Windows.Forms.Button browsescreenshotsdir;
|
||||
private System.Windows.Forms.TextBox screenshotsfolderpath;
|
||||
private System.Windows.Forms.Button resetscreenshotsdir;
|
||||
private System.Windows.Forms.FolderBrowserDialog browseScreenshotsFolderDialog;
|
||||
}
|
||||
}
|
||||
|
|
@ -23,6 +23,7 @@ using System.Windows.Forms;
|
|||
using CodeImp.DoomBuilder.Actions;
|
||||
using System.Globalization;
|
||||
using CodeImp.DoomBuilder.Data;
|
||||
using System.IO;
|
||||
|
||||
#endregion
|
||||
|
||||
|
|
@ -106,6 +107,9 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
vertexScaleLabel.Text = vertexScale.Value * 100 + "%" + (vertexScale.Value == 1 ? " (default)" : "");
|
||||
cbMarkExtraFloors.Checked = General.Settings.GZMarkExtraFloors;
|
||||
recentFiles.Value = General.Settings.MaxRecentFiles;
|
||||
screenshotsfolderpath.Text = General.Settings.ScreenshotsPath;
|
||||
if(Directory.Exists(General.Settings.ScreenshotsPath))
|
||||
browseScreenshotsFolderDialog.SelectedPath = General.Settings.ScreenshotsPath;
|
||||
|
||||
// Fill fonts list
|
||||
scriptfontname.BeginUpdate();
|
||||
|
|
@ -205,6 +209,13 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
// OK clicked
|
||||
private void apply_Click(object sender, EventArgs e)
|
||||
{
|
||||
//mxd. Check if Screenshots folder is valid
|
||||
if(screenshotsfolderpath.Text != General.Settings.ScreenshotsPath && !Directory.Exists(screenshotsfolderpath.Text.Trim()))
|
||||
{
|
||||
General.ShowErrorMessage("Screenshots folder does not exist!\nPlease enter a correct path.", MessageBoxButtons.OK);
|
||||
return;
|
||||
}
|
||||
|
||||
// Let the plugins know
|
||||
controller.RaiseAccept();
|
||||
|
||||
|
|
@ -246,6 +257,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
General.Settings.GZToolbarGZDoom = toolbar_gzdoom.Checked; //mxd
|
||||
General.Settings.ShowTextureSizes = showtexturesizes.Checked;
|
||||
General.Settings.MaxRecentFiles = recentFiles.Value; //mxd
|
||||
General.Settings.ScreenshotsPath = screenshotsfolderpath.Text.Trim(); //mxd
|
||||
|
||||
// Script font size
|
||||
int fontsize = 8;
|
||||
|
|
@ -939,6 +951,22 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
|
||||
#endregion
|
||||
|
||||
#region ================== Screenshots Stuff (mxd)
|
||||
|
||||
private void resetscreenshotsdir_Click(object sender, EventArgs e)
|
||||
{
|
||||
screenshotsfolderpath.Text = General.DefaultScreenshotsPath;
|
||||
browseScreenshotsFolderDialog.SelectedPath = General.DefaultScreenshotsPath;
|
||||
}
|
||||
|
||||
private void browsescreenshotsdir_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (browseScreenshotsFolderDialog.ShowDialog(General.MainWindow) == DialogResult.OK)
|
||||
screenshotsfolderpath.Text = browseScreenshotsFolderDialog.SelectedPath;
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
// Help
|
||||
private void PreferencesForm_HelpRequested(object sender, HelpEventArgs hlpevent)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -154,4 +154,7 @@ with newline characters, otherwise
|
|||
they will be replaced with spaces
|
||||
</value>
|
||||
</data>
|
||||
<metadata name="browseScreenshotsFolderDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>114, 17</value>
|
||||
</metadata>
|
||||
</root>
|
||||
Loading…
Reference in a new issue