From eb86ab60af0ed0e19f37227f7e307319ae1ae0c0 Mon Sep 17 00:00:00 2001 From: MaxED Date: Fri, 10 Aug 2012 12:08:08 +0000 Subject: [PATCH] GZDoom Builder 1.12d: TEXTURES patches can now be loaded from anywhere inside resource. Configs: things from "Cameras and Interpolation" and "Boom Items" categories weren't rendered in Visual modes. Configs: several new icons are now used for things. Reverted sectors rendering from 1.12b, because it was done in too hackish way and was causing more and more problems. Models rendered height is now 25% lower instead. Models rendering height can be toggled between normal and 85% in Preferences->Appearance->"Scale models in Visual modes" Fixed several small bugs here and there. --- Build/Configurations/Includes/Boom_things.cfg | 4 +- .../Configurations/Includes/ZDoom_things.cfg | 15 +- Build/Scripting/ZDoom_ACS.cfg | 1 + Build/Sprites/Bridge.png | Bin 0 -> 361 bytes Build/Sprites/Camera.png | Bin 0 -> 595 bytes Build/Sprites/Portal_lower.png | Bin 0 -> 337 bytes Build/Sprites/Portal_upper.png | Bin 0 -> 360 bytes Build/Sprites/Slope.png | Bin 0 -> 331 bytes Source/Core/Config/ProgramConfiguration.cs | 4 + Source/Core/Data/DirectoryReader.cs | 7 +- Source/Core/Data/PK3Reader.cs | 3 +- Source/Core/Data/PK3StructuredReader.cs | 13 +- Source/Core/GZBuilder/GZGeneral.cs | 2 +- Source/Core/GZBuilder/md3/ModelReader.cs | 10 +- Source/Core/Map/Thing.cs | 23 - Source/Core/Rendering/Renderer3D.cs | 29 +- Source/Core/Types/EnumBitsHandler.cs | 7 + Source/Core/Types/EnumOptionHandler.cs | 7 + Source/Core/Types/EnumStringsHandler.cs | 7 + Source/Core/Types/IntegerHandler.cs | 1 + Source/Core/VisualModes/VisualMode.cs | 24 +- Source/Core/VisualModes/VisualThing.cs | 6 +- Source/Core/Windows/MainForm.cs | 5 + .../Core/Windows/PreferencesForm.Designer.cs | 3209 +++++++++-------- Source/Core/Windows/PreferencesForm.cs | 2 + Source/Core/Windows/PreferencesForm.resx | 3 + 26 files changed, 1703 insertions(+), 1679 deletions(-) create mode 100644 Build/Sprites/Bridge.png create mode 100644 Build/Sprites/Camera.png create mode 100644 Build/Sprites/Portal_lower.png create mode 100644 Build/Sprites/Portal_upper.png create mode 100644 Build/Sprites/Slope.png diff --git a/Build/Configurations/Includes/Boom_things.cfg b/Build/Configurations/Includes/Boom_things.cfg index ae830caf..5eaba4d6 100644 --- a/Build/Configurations/Includes/Boom_things.cfg +++ b/Build/Configurations/Includes/Boom_things.cfg @@ -4,9 +4,11 @@ boom color = 8; // Grey arrow = 1; title = "Boom Items"; - width = 0; + width = 8; + height = 16; sort = 1; fixedsize = true; + sprite = "internal:action"; 5001 = "Pusher"; 5002 = "Puller"; diff --git a/Build/Configurations/Includes/ZDoom_things.cfg b/Build/Configurations/Includes/ZDoom_things.cfg index 2964435a..b1a75616 100644 --- a/Build/Configurations/Includes/ZDoom_things.cfg +++ b/Build/Configurations/Includes/ZDoom_things.cfg @@ -273,6 +273,7 @@ zdoom hangs = 0; blocking = 0; error = 1; + sprite = "internal:bridge"; 5064 { @@ -331,13 +332,14 @@ zdoom color = 7; // Light Grey arrow = 1; title = "Cameras and Interpolation"; - width = 16; + width = 8; + height = 16; sort = 1; - height = 0; hangs = 0; blocking = 0; error = 1; fixedsize = true; + sprite = "internal:camera"; 9025 { @@ -595,10 +597,11 @@ zdoom title = "Slopes"; width = 8; sort = 1; - height = 0; + height = 16; hangs = 0; blocking = 0; fixedsize = true; + sprite = "internal:slope"; 9511 { @@ -793,9 +796,9 @@ zdoom color = 7; arrow = 0; title = "Portals"; - width = 0; + width = 8; sort = 1; - height = 0; + height = 16; hangs = 0; blocking = 0; fixedsize = true; @@ -803,6 +806,7 @@ zdoom 9077 { title = "Upper Sector"; + sprite = "internal:portal_upper"; arg0 { title = "Flat Transparency"; @@ -813,6 +817,7 @@ zdoom 9078 { title = "Lower Sector"; + sprite = "internal:portal_lower"; arg0 { title = "Flat Transparency"; diff --git a/Build/Scripting/ZDoom_ACS.cfg b/Build/Scripting/ZDoom_ACS.cfg index 6b65238c..bb4d7a84 100644 --- a/Build/Scripting/ZDoom_ACS.cfg +++ b/Build/Scripting/ZDoom_ACS.cfg @@ -346,6 +346,7 @@ keywords StartConversation = "StartConversation(tid, facing)"; Str = "Str expression"; strlen = "strlen(string)"; + StrParam = "int StrParam(item(s))"; Suspend = "Suspend"; Switch = "Switch(expression)"; TagWait = "TagWait(tag)"; diff --git a/Build/Sprites/Bridge.png b/Build/Sprites/Bridge.png new file mode 100644 index 0000000000000000000000000000000000000000..c72329f24dab9414a3c8e577de97a4d2bfb8a8ea GIT binary patch literal 361 zcmV-v0ha!WP)UEXRXCK zxWJkC0|b}#luRcUz5pt7T;cPmI%_ANuJZ%IKoZn`hq_(VvlzH~Z45-EPX+jEjb zuE^napK*G3YblKJv{>P7`|izI8S6s2$zA-A+}olk@VfnQaqGcnwzSuy$VwteR?{Gg zZxHfm5JoYGhHhV~%=I{eN-I3iCJ0!b5Pb`JF{=+av3^XT_nTj@U`kwt5){A{)a(a_ zpMDY=ku=aMYje&6^)f&D&pzLz&9|v1FrKaYCjQf}{3XBu#-nC;)Wa-D00000NkvXX Hu0mjfK!Bgq literal 0 HcmV?d00001 diff --git a/Build/Sprites/Camera.png b/Build/Sprites/Camera.png new file mode 100644 index 0000000000000000000000000000000000000000..b8232d20665e5e27b1d3d819c1bd1b570a9c3190 GIT binary patch literal 595 zcmV-Z0<8UsP)Amoeh%F2fe79LLAaHp5|RAO=7saB9S15J)}NFnDoeGYtQ~a%l2@Yb!$# zjVBNr|ATEk>UsfedT>(Re-;)N1`y`vo z8U6wB*Kgm*N{OIw`2XkMKZehrzc7UP=z_&Su|cd081LP?{{PpHZwz06E)W*tVpz51 zGS)Q0g2#1?pT2zi|Lx~jhUtq=GWa;DU`=3*1D+cJ0t^5;oV2(;F7T580000AG7b8~b5Bg+wGz~v(gv1%sD0FY*E8i_K1kY*6Z8HiVoF8a@Y z`W=ectI3lw0+I=r=2A zYpyeZyfOLSJq%Z28h{0?TU7l2+qbV^_Ni-Z43j2LW&l|NH;ky1h$lsoW&qR>H4o#M1x(002ovPDHLkV1n}Bgp&XO literal 0 HcmV?d00001 diff --git a/Source/Core/Config/ProgramConfiguration.cs b/Source/Core/Config/ProgramConfiguration.cs index d6efed63..72db487e 100644 --- a/Source/Core/Config/ProgramConfiguration.cs +++ b/Source/Core/Config/ProgramConfiguration.cs @@ -107,6 +107,7 @@ namespace CodeImp.DoomBuilder.Config private float gzDynamicLightRadius; private float gzDynamicLightIntensity; private bool gzTestFromCurrentPosition; + private bool gzStretchModels; // These are not stored in the configuration, only used at runtime private string defaulttexture; @@ -183,6 +184,7 @@ namespace CodeImp.DoomBuilder.Config public int GZMaxDynamicLights { get { return gzMaxDynamicLights; } internal set { gzMaxDynamicLights = value; } } public float GZDynamicLightRadius { get { return gzDynamicLightRadius; } internal set { gzDynamicLightRadius = value; } } public float GZDynamicLightIntensity { get { return gzDynamicLightIntensity; } internal set { gzDynamicLightIntensity = value; } } + public bool GZStretchModels { get { return gzStretchModels; } internal set { gzStretchModels = value; } } public string DefaultTexture { get { return defaulttexture; } set { defaulttexture = value; } } public string DefaultFloorTexture { get { return defaultfloortexture; } set { defaultfloortexture = value; } } @@ -275,6 +277,7 @@ namespace CodeImp.DoomBuilder.Config gzMaxDynamicLights = cfg.ReadSetting("gzmaxdynamiclights", 16); gzDynamicLightRadius = cfg.ReadSetting("gzdynamiclightradius", 1.0f); gzDynamicLightIntensity = cfg.ReadSetting("gzdynamiclightintensity", 1.0f); + gzStretchModels = cfg.ReadSetting("gzstretchmodels", true); // Success return true; @@ -349,6 +352,7 @@ namespace CodeImp.DoomBuilder.Config cfg.WriteSetting("gzmaxdynamiclights", gzMaxDynamicLights); cfg.WriteSetting("gzdynamiclightradius", gzDynamicLightRadius); cfg.WriteSetting("gzdynamiclightintensity", gzDynamicLightIntensity); + cfg.WriteSetting("gzstretchmodels", gzStretchModels); // Save settings configuration General.WriteLogLine("Saving program configuration..."); diff --git a/Source/Core/Data/DirectoryReader.cs b/Source/Core/Data/DirectoryReader.cs index 6041ed6d..69be7348 100644 --- a/Source/Core/Data/DirectoryReader.cs +++ b/Source/Core/Data/DirectoryReader.cs @@ -88,8 +88,11 @@ namespace CodeImp.DoomBuilder.Data try { // Find in patches directory - string path = Path.Combine(PATCHES_DIR, Path.GetDirectoryName(pname)); - string filename = FindFirstFile(path, Path.GetFileName(pname), true); + //string path = Path.Combine(PATCHES_DIR, Path.GetDirectoryName(pname)); + //string filename = FindFirstFile(path, Path.GetFileName(pname), true); + + //mxd. ZDoom can load them from anywhere, so shall we + string filename = FindFirstFile(Path.GetDirectoryName(pname), Path.GetFileName(pname), true); if((filename != null) && FileExists(filename)) { return LoadFile(filename); diff --git a/Source/Core/Data/PK3Reader.cs b/Source/Core/Data/PK3Reader.cs index aa72012e..885a42af 100644 --- a/Source/Core/Data/PK3Reader.cs +++ b/Source/Core/Data/PK3Reader.cs @@ -128,7 +128,8 @@ namespace CodeImp.DoomBuilder.Data } // Find in patches directory - string filename = FindFirstFile(PATCHES_DIR, pname, true); + //string filename = FindFirstFile(PATCHES_DIR, pname, true); + string filename = FindFirstFile("", pname, true); //mxd. ZDoom can load them from anywhere, so shall we if((filename != null) && FileExists(filename)) { return LoadFile(filename); diff --git a/Source/Core/Data/PK3StructuredReader.cs b/Source/Core/Data/PK3StructuredReader.cs index 62336fd8..6b9070d5 100644 --- a/Source/Core/Data/PK3StructuredReader.cs +++ b/Source/Core/Data/PK3StructuredReader.cs @@ -270,7 +270,8 @@ namespace CodeImp.DoomBuilder.Data //no need to search in wads... // Find in patches directory - string filename = FindFirstFile(PATCHES_DIR, pname, true); + //string filename = FindFirstFile(PATCHES_DIR, pname, true); + string filename = FindFirstFile("", pname, true); //mxd. ZDoom can load them from anywhere, so shall we if ((filename != null) && FileExists(filename)) return filename; @@ -419,8 +420,14 @@ namespace CodeImp.DoomBuilder.Data if(filename.IndexOf('.') > -1) { - allfilenames = new string[1]; - allfilenames[0] = Path.Combine(pathname, filename); + string fullName = Path.Combine(pathname, filename); + if(FileExists(fullName)) { + allfilenames = new string[1]; + allfilenames[0] = Path.Combine(pathname, filename); + } else { + allfilenames = new string[0]; + General.ErrorLogger.Add(ErrorType.Warning, "Unable to load DECORATE file '" + fullName + "'"); + } } else allfilenames = GetAllFilesWithTitle(pathname, filename, false); diff --git a/Source/Core/GZBuilder/GZGeneral.cs b/Source/Core/GZBuilder/GZGeneral.cs index d9c4b570..8e76ed9f 100644 --- a/Source/Core/GZBuilder/GZGeneral.cs +++ b/Source/Core/GZBuilder/GZGeneral.cs @@ -33,7 +33,7 @@ namespace CodeImp.DoomBuilder.GZBuilder //version public const float Version = 1.12f; - public const char Revision = 'b'; + public const char Revision = 'd'; //debug console #if DEBUG diff --git a/Source/Core/GZBuilder/md3/ModelReader.cs b/Source/Core/GZBuilder/md3/ModelReader.cs index 485188bf..504c583e 100644 --- a/Source/Core/GZBuilder/md3/ModelReader.cs +++ b/Source/Core/GZBuilder/md3/ModelReader.cs @@ -20,7 +20,9 @@ namespace CodeImp.DoomBuilder.GZBuilder.MD3 { internal static class ModelReader { - public static void Parse(ref ModeldefEntry mde, PK3StructuredReader reader, Device D3DDevice) { + private const float VERTICAL_STRETCH = 1 / 1.2f; + + public static void Parse(ref ModeldefEntry mde, PK3StructuredReader reader, Device D3DDevice) { string[] modelNames = new string[mde.ModelNames.Count]; string[] textureNames = new string[mde.TextureNames.Count]; @@ -234,7 +236,8 @@ namespace CodeImp.DoomBuilder.GZBuilder.MD3 //scale it v.y *= mde.Scale.X; v.x *= mde.Scale.Y; - v.z *= mde.Scale.Z; + v.z *= mde.Scale.Z; + if(General.Settings.GZStretchModels) v.z *= VERTICAL_STRETCH; //GZDoom vertical stretch hack //add zOffset v.z += mde.zOffset; @@ -362,7 +365,8 @@ namespace CodeImp.DoomBuilder.GZBuilder.MD3 //scale it v.x *= mde.Scale.X; v.y *= mde.Scale.Y; - v.z *= mde.Scale.Z; + v.z *= mde.Scale.Z; + if(General.Settings.GZStretchModels) v.z *= VERTICAL_STRETCH; //GZDoom vertical stretch hack //add zOffset v.z += mde.zOffset; diff --git a/Source/Core/Map/Thing.cs b/Source/Core/Map/Thing.cs index ab2dc356..c0db54b6 100644 --- a/Source/Core/Map/Thing.cs +++ b/Source/Core/Map/Thing.cs @@ -216,29 +216,6 @@ namespace CodeImp.DoomBuilder.Map { //mxd sector = map.GetSectorByCoordinates(pos); - - /*Linedef nl; - - // Find the nearest linedef on the map - nl = map.NearestLinedef(pos); - if(nl != null) - { - // Check what side of line we are at - if(nl.SideOfLine(pos) < 0f) - { - // Front side - if(nl.Front != null) sector = nl.Front.Sector; else sector = null; - } - else - { - // Back side - if(nl.Back != null) sector = nl.Back.Sector; else sector = null; - } - } - else - { - sector = null; - }*/ } // This determines which sector the thing is in and links it diff --git a/Source/Core/Rendering/Renderer3D.cs b/Source/Core/Rendering/Renderer3D.cs index 22af65e2..608d7fa4 100644 --- a/Source/Core/Rendering/Renderer3D.cs +++ b/Source/Core/Rendering/Renderer3D.cs @@ -513,7 +513,7 @@ namespace CodeImp.DoomBuilder.Rendering // This ends rendering world geometry public void FinishGeometry() { - //mxd. sort lights + //mxd. sort lights if (General.Settings.GZDrawLights && !fullbrightness && thingsWithLight.Count > 0) updateLights(); @@ -527,8 +527,7 @@ namespace CodeImp.DoomBuilder.Rendering graphics.Shaders.World3D.Begin(); // SOLID PASS - //world = Matrix.Identity; - world = Matrix.Scaling(new Vector3(1.0f, 1.0f, 1.2f)); //mxd. GZDoom vertical scale hack + world = Matrix.Identity; ApplyMatrices3D(); RenderSinglePass((int)RenderPass.Solid); @@ -539,14 +538,12 @@ namespace CodeImp.DoomBuilder.Rendering graphics.Device.SetRenderState(RenderState.CullMode, Cull.Counterclockwise); // MASK PASS - //world = Matrix.Identity; - world = Matrix.Scaling(new Vector3(1.0f, 1.0f, 1.2f)); //mxd. GZDoom vertical scale hack + world = Matrix.Identity; ApplyMatrices3D(); RenderSinglePass((int)RenderPass.Mask); // ALPHA PASS - //world = Matrix.Identity; - world = Matrix.Scaling(new Vector3(1.0f, 1.0f, 1.2f)); //mxd. GZDoom vertical scale hack + world = Matrix.Identity; ApplyMatrices3D(); graphics.Device.SetRenderState(RenderState.AlphaBlendEnable, true); graphics.Device.SetRenderState(RenderState.AlphaTestEnable, false); @@ -559,15 +556,13 @@ namespace CodeImp.DoomBuilder.Rendering if(renderthingcages) RenderThingCages(); // ADDITIVE PASS - //world = Matrix.Identity; - world = Matrix.Scaling(new Vector3(1.0f, 1.0f, 1.2f)); //mxd. GZDoom vertical scale hack + world = Matrix.Identity; ApplyMatrices3D(); graphics.Device.SetRenderState(RenderState.DestinationBlend, Blend.One); RenderSinglePass((int)RenderPass.Additive); //mxd. LIGHT PASS if (General.Settings.GZDrawLights && !fullbrightness && thingsWithLight.Count > 0 && litGeometry.Count > 0) { - world = Matrix.Scaling(new Vector3(1.0f, 1.0f, 1.2f)); //mxd. GZDoom vertical scale hack RenderLights(litGeometry, thingsWithLight); } @@ -629,7 +624,7 @@ namespace CodeImp.DoomBuilder.Rendering foreach (VisualThing t in thingsbydistance) { // Setup matrix - world = Matrix.Multiply(t.CageScales, t.ScaledPosition); //mxd. GZDoom vertical scale hack + world = Matrix.Multiply(t.CageScales, t.Position); ApplyMatrices3D(); // Setup color @@ -650,7 +645,7 @@ namespace CodeImp.DoomBuilder.Rendering //and arrow float sx = t.CageScales.M11; Matrix arrowScaler = Matrix.Scaling(sx, sx, sx); //scale arrow evenly based on thing width\depth - world = Matrix.Multiply(arrowScaler, t.ScaledPosition * Matrix.Translation(0.0f, 0.0f, t.CageScales.M33 / 2)); //mxd. GZDoom vertical scale hack + world = Matrix.Multiply(arrowScaler, t.Position * Matrix.Translation(0.0f, 0.0f, t.CageScales.M33 / 2)); Matrix rot = Matrix.RotationZ(t.Thing.Angle - Angle2D.PI / 2); world = Matrix.Multiply(rot, world); ApplyMatrices3D(); @@ -860,7 +855,7 @@ namespace CodeImp.DoomBuilder.Rendering // Create the matrix for positioning / rotation world = t.Orientation; if (t.Billboard) world = Matrix.Multiply(world, billboard); - world = Matrix.Multiply(world, t.ScaledPosition); //mxd. GZDoom vertical scale hack + world = Matrix.Multiply(world, t.Position); ApplyMatrices3D(); //mxd. set variables for fog rendering @@ -896,7 +891,7 @@ namespace CodeImp.DoomBuilder.Rendering //mxd. Dynamic lights pass! private void RenderLights(Dictionary> geometry_to_lit, List lights) { - graphics.Shaders.World3D.World = world; + graphics.Shaders.World3D.World = Matrix.Identity; graphics.Shaders.World3D.BeginPass(17); int i, count; @@ -921,7 +916,7 @@ namespace CodeImp.DoomBuilder.Rendering for (i = 0; i < count; i++) { if (checkBBoxIntersection(g.BoundingBox, lights[i].BoundingBox)) { - lpr = new Vector4(lights[i].Center,lights[i].LightRadius) ; + lpr = new Vector4(lights[i].Center, lights[i].LightRadius); if (lpr.W == 0) continue; graphics.Shaders.World3D.LightColor = lights[i].LightColor; @@ -1023,7 +1018,7 @@ namespace CodeImp.DoomBuilder.Rendering // Create the matrix for positioning / rotation world = Matrix.Multiply(t.Orientation, Matrix.RotationZ(t.Thing.Angle)); - world = Matrix.Multiply(world, t.ScaledPosition); //mxd. GZDoom vertical scale hack + world = Matrix.Multiply(world, t.Position); ApplyMatrices3D(); //mxd. set variables for fog rendering @@ -1160,7 +1155,7 @@ namespace CodeImp.DoomBuilder.Rendering //t.CameraDistance3D is actually squared distance, hence (t.LightRadius * t.LightRadius) if (t.CameraDistance3D < (t.LightRadius * t.LightRadius) || isThingOnScreen(t.BoundingBox)) { //always render light if camera is within it's radius if (Array.IndexOf(GZBuilder.GZGeneral.GZ_ANIMATED_LIGHT_TYPES, t.LightType) != -1) - t.UpdateBoundingBox();//t.UpdateBoundingBox(t.LightRadius, t.LightRadius * 2); + t.UpdateBoundingBox(); thingsWithLight.Add(t); } } diff --git a/Source/Core/Types/EnumBitsHandler.cs b/Source/Core/Types/EnumBitsHandler.cs index 3a9f48df..41f277e3 100644 --- a/Source/Core/Types/EnumBitsHandler.cs +++ b/Source/Core/Types/EnumBitsHandler.cs @@ -45,6 +45,7 @@ namespace CodeImp.DoomBuilder.Types private EnumList list; private int value; + private int defaultValue; //mxd #endregion @@ -61,6 +62,7 @@ namespace CodeImp.DoomBuilder.Types // When set up for an argument public override void SetupArgument(TypeHandlerAttribute attr, ArgumentInfo arginfo) { + defaultValue = (int)arginfo.DefaultValue;//mxd base.SetupArgument(attr, arginfo); // Keep enum list reference @@ -105,6 +107,11 @@ namespace CodeImp.DoomBuilder.Types } } + //mxd + public override void SetDefaultValue() { + value = defaultValue; + } + public override object GetValue() { return this.value; diff --git a/Source/Core/Types/EnumOptionHandler.cs b/Source/Core/Types/EnumOptionHandler.cs index 73616d94..063df9b6 100644 --- a/Source/Core/Types/EnumOptionHandler.cs +++ b/Source/Core/Types/EnumOptionHandler.cs @@ -42,6 +42,7 @@ namespace CodeImp.DoomBuilder.Types private EnumList list; private EnumItem value; + private EnumItem defaultValue; //mxd #endregion @@ -57,6 +58,7 @@ namespace CodeImp.DoomBuilder.Types // When set up for an argument public override void SetupArgument(TypeHandlerAttribute attr, ArgumentInfo arginfo) { + defaultValue = new EnumItem(arginfo.DefaultValue.ToString(), arginfo.DefaultValue.ToString());//mxd base.SetupArgument(attr, arginfo); // Keep enum list reference @@ -144,6 +146,11 @@ namespace CodeImp.DoomBuilder.Types } } + //mxd + public override void SetDefaultValue() { + value = defaultValue; + } + public override object GetValue() { return GetIntValue(); diff --git a/Source/Core/Types/EnumStringsHandler.cs b/Source/Core/Types/EnumStringsHandler.cs index 42b65ed2..fd506914 100644 --- a/Source/Core/Types/EnumStringsHandler.cs +++ b/Source/Core/Types/EnumStringsHandler.cs @@ -42,6 +42,7 @@ namespace CodeImp.DoomBuilder.Types private EnumList list; private EnumItem value; + private EnumItem defaultValue; //mxd #endregion @@ -57,6 +58,7 @@ namespace CodeImp.DoomBuilder.Types // When set up for an argument public override void SetupArgument(TypeHandlerAttribute attr, ArgumentInfo arginfo) { + defaultValue = new EnumItem(arginfo.DefaultValue.ToString(), arginfo.DefaultValue.ToString()); //mxd base.SetupArgument(attr, arginfo); // Keep enum list reference @@ -126,6 +128,11 @@ namespace CodeImp.DoomBuilder.Types } } + //mxd + public override void SetDefaultValue() { + value = defaultValue; + } + public override object GetValue() { if(this.value != null) return this.value.Value; else return ""; diff --git a/Source/Core/Types/IntegerHandler.cs b/Source/Core/Types/IntegerHandler.cs index 1eb67e96..0d69a0c7 100644 --- a/Source/Core/Types/IntegerHandler.cs +++ b/Source/Core/Types/IntegerHandler.cs @@ -91,6 +91,7 @@ namespace CodeImp.DoomBuilder.Types } } + //mxd public override void SetDefaultValue() { value = defaultValue; } diff --git a/Source/Core/VisualModes/VisualMode.cs b/Source/Core/VisualModes/VisualMode.cs index d10c2a4e..f5886ff4 100644 --- a/Source/Core/VisualModes/VisualMode.cs +++ b/Source/Core/VisualModes/VisualMode.cs @@ -46,7 +46,6 @@ namespace CodeImp.DoomBuilder.VisualModes #region ================== Constants private const float MOVE_SPEED_MULTIPLIER = 0.001f; - private const float SCALE_OFFSET = 1f / 1.2f; //mxd GZDoom vertical scale hack #endregion @@ -645,23 +644,9 @@ namespace CodeImp.DoomBuilder.VisualModes #region ================== Object Picking - //mxd - public VisualPickResult PickObject(Vector3D from, Vector3D to) { - return PickObject(from, to, true); - } - // This picks an object from the scene - public VisualPickResult PickObject(Vector3D from, Vector3D to, bool scaleHack) + public VisualPickResult PickObject(Vector3D from, Vector3D to) { - //mxd GZDoom vertical scale hack - Vector3D from_orig = from; - Vector3D to_orig = to; - - if(scaleHack) { - to.z *= SCALE_OFFSET; - from.z *= SCALE_OFFSET; - } - VisualPickResult result = new VisualPickResult(); Line2D ray2d = new Line2D(from, to); Vector3D delta = to - from; @@ -823,10 +808,6 @@ namespace CodeImp.DoomBuilder.VisualModes // Setup final result result.hitpos = from + to * result.u_ray; - //mxd. Hackish way to select Things correctly - if(scaleHack && result.picked is VisualThing) - return PickObject(from_orig, to_orig, false); - // Done return result; } @@ -1035,8 +1016,7 @@ namespace CodeImp.DoomBuilder.VisualModes delta = delta.GetFixedLength(General.Settings.ViewDistance * 0.98f); VisualPickResult target = PickObject(start, start + delta); - //not appropriate way to do this, but... - if (target.picked != null && target.picked.GetType().Name.IndexOf("Thing") == -1) { + if(target.picked != null && target.picked is VisualGeometry) { VisualGeometry vg = (VisualGeometry)target.picked; if (vg.Sector != null) return vg; diff --git a/Source/Core/VisualModes/VisualThing.cs b/Source/Core/VisualModes/VisualThing.cs index 37c689f1..9bcf9d5f 100644 --- a/Source/Core/VisualModes/VisualThing.cs +++ b/Source/Core/VisualModes/VisualThing.cs @@ -83,7 +83,6 @@ namespace CodeImp.DoomBuilder.VisualModes //mxd private int cameraDistance3D; private int thingHeight; - private Matrix scaledPosition; //mxd GZDoom vertical scale hack //mxd. light properties private int lightType; @@ -125,7 +124,6 @@ namespace CodeImp.DoomBuilder.VisualModes } } public Vector3 PositionV3 { get { return position_v3; } } - public Matrix ScaledPosition { get { return scaledPosition; } } //mxd GZDoom vertical scale hack public Vector3[] BoundingBox { get { return boundingBox; } } //mxd. light properties public int LightType { get { return lightType; } } @@ -187,7 +185,6 @@ namespace CodeImp.DoomBuilder.VisualModes lightInterval = -1; lightColor = new Color4(); boundingBox = new Vector3[9]; - scaledPosition = position; //mxd GZDoom vertical scale hack // Register as resource General.Map.Graphics.RegisterResource(this); @@ -223,7 +220,7 @@ namespace CodeImp.DoomBuilder.VisualModes //mxd internal void CalculateCameraDistance3D(Vector3 campos) { - cameraDistance3D = (int)Vector3.DistanceSquared(D3DDevice.V3(thing.Position), campos); + cameraDistance3D = (int)Vector3.DistanceSquared(PositionV3, campos); } // This is called before a device is reset @@ -271,7 +268,6 @@ namespace CodeImp.DoomBuilder.VisualModes //mxd position_v3 = D3DDevice.V3(pos); position = Matrix.Translation(position_v3); - scaledPosition = Matrix.Translation(position_v3.X, position_v3.Y, position_v3.Z * 1.2f); //mxd GZDoom vertical scale hack //mxd. update bounding box if (thing.IsModel) { diff --git a/Source/Core/Windows/MainForm.cs b/Source/Core/Windows/MainForm.cs index be5ffed4..6178b38d 100644 --- a/Source/Core/Windows/MainForm.cs +++ b/Source/Core/Windows/MainForm.cs @@ -2344,6 +2344,9 @@ namespace CodeImp.DoomBuilder.Windows [BeginAction("preferences")] internal void ShowPreferences() { + //mxd + bool stretchModels = General.Settings.GZStretchModels; + // Show preferences dialog PreferencesForm prefform = new PreferencesForm(); if(prefform.ShowDialog(this) == DialogResult.OK) @@ -2363,6 +2366,8 @@ namespace CodeImp.DoomBuilder.Windows General.Map.Graphics.SetupSettings(); General.Map.UpdateConfiguration(); if(prefform.ReloadResources) General.Actions.InvokeAction("builder_reloadresources"); + //mxd + if(stretchModels != General.Settings.GZStretchModels) General.Map.Data.ReloadModeldef(); } // Redraw display diff --git a/Source/Core/Windows/PreferencesForm.Designer.cs b/Source/Core/Windows/PreferencesForm.Designer.cs index 089a4444..0fd923a3 100644 --- a/Source/Core/Windows/PreferencesForm.Designer.cs +++ b/Source/Core/Windows/PreferencesForm.Designer.cs @@ -29,1382 +29,1396 @@ namespace CodeImp.DoomBuilder.Windows /// private void InitializeComponent() { - System.Windows.Forms.Label label7; - System.Windows.Forms.Label label6; - System.Windows.Forms.Label label5; - System.Windows.Forms.GroupBox groupBox1; - System.Windows.Forms.Label label1; - System.Windows.Forms.Label label18; - System.Windows.Forms.Label label20; - System.Windows.Forms.Label label21; - this.showtexturesizes = new System.Windows.Forms.CheckBox(); - this.scriptontop = new System.Windows.Forms.CheckBox(); - this.zoomfactor = new Dotnetrix.Controls.TrackBar(); - this.zoomfactorlabel = new System.Windows.Forms.Label(); - this.label19 = new System.Windows.Forms.Label(); - this.autoscrollspeed = new Dotnetrix.Controls.TrackBar(); - this.autoscrollspeedlabel = new System.Windows.Forms.Label(); - this.label15 = new System.Windows.Forms.Label(); - this.previewsize = new Dotnetrix.Controls.TrackBar(); - this.previewsizelabel = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); - this.label14 = new System.Windows.Forms.Label(); - this.defaultviewmode = new System.Windows.Forms.ComboBox(); - this.keyusedlabel = new System.Windows.Forms.Label(); - this.colorsgroup1 = new System.Windows.Forms.GroupBox(); - this.colorMD3 = new CodeImp.DoomBuilder.Controls.ColorControl(); - this.label2 = new System.Windows.Forms.Label(); - this.colorgrid64 = new CodeImp.DoomBuilder.Controls.ColorControl(); - this.squarethings = new System.Windows.Forms.CheckBox(); - this.colorgrid = new CodeImp.DoomBuilder.Controls.ColorControl(); - this.doublesidedalphalabel = new System.Windows.Forms.Label(); - this.colorindication = new CodeImp.DoomBuilder.Controls.ColorControl(); - this.colorsoundlinedefs = new CodeImp.DoomBuilder.Controls.ColorControl(); - this.colorspeciallinedefs = new CodeImp.DoomBuilder.Controls.ColorControl(); - this.qualitydisplay = new System.Windows.Forms.CheckBox(); - this.colorbackcolor = new CodeImp.DoomBuilder.Controls.ColorControl(); - this.colorselection = new CodeImp.DoomBuilder.Controls.ColorControl(); - this.colorvertices = new CodeImp.DoomBuilder.Controls.ColorControl(); - this.doublesidedalpha = new Dotnetrix.Controls.TrackBar(); - this.colorhighlight = new CodeImp.DoomBuilder.Controls.ColorControl(); - this.colorlinedefs = new CodeImp.DoomBuilder.Controls.ColorControl(); - this.cancel = new System.Windows.Forms.Button(); - this.apply = new System.Windows.Forms.Button(); - this.tabs = new System.Windows.Forms.TabControl(); - this.tabinterface = new System.Windows.Forms.TabPage(); - this.groupBox5 = new System.Windows.Forms.GroupBox(); - this.toolbar_gzdoom = new System.Windows.Forms.CheckBox(); - this.toolbar_file = new System.Windows.Forms.CheckBox(); - this.toolbar_testing = new System.Windows.Forms.CheckBox(); - this.toolbar_geometry = new System.Windows.Forms.CheckBox(); - this.toolbar_viewmodes = new System.Windows.Forms.CheckBox(); - this.toolbar_filter = new System.Windows.Forms.CheckBox(); - this.toolbar_prefabs = new System.Windows.Forms.CheckBox(); - this.toolbar_copy = new System.Windows.Forms.CheckBox(); - this.toolbar_undo = new System.Windows.Forms.CheckBox(); - this.toolbar_script = new System.Windows.Forms.CheckBox(); - this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.collapsedockers = new System.Windows.Forms.CheckBox(); - this.dockersposition = new System.Windows.Forms.ComboBox(); - this.label17 = new System.Windows.Forms.Label(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.viewdistance = new Dotnetrix.Controls.TrackBar(); - this.movespeed = new Dotnetrix.Controls.TrackBar(); - this.mousespeed = new Dotnetrix.Controls.TrackBar(); - this.fieldofview = new Dotnetrix.Controls.TrackBar(); - this.viewdistancelabel = new System.Windows.Forms.Label(); - this.label13 = new System.Windows.Forms.Label(); - this.invertyaxis = new System.Windows.Forms.CheckBox(); - this.movespeedlabel = new System.Windows.Forms.Label(); - this.label11 = new System.Windows.Forms.Label(); - this.mousespeedlabel = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); - this.fieldofviewlabel = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.tabkeys = new System.Windows.Forms.TabPage(); - this.listactions = new System.Windows.Forms.ListView(); - this.columncontrolaction = new System.Windows.Forms.ColumnHeader(); - this.columncontrolkey = new System.Windows.Forms.ColumnHeader(); - this.actioncontrolpanel = new System.Windows.Forms.GroupBox(); - this.keyusedlist = new System.Windows.Forms.ListBox(); - this.disregardshiftlabel = new System.Windows.Forms.Label(); - this.actioncontrol = new System.Windows.Forms.ComboBox(); - this.actiontitle = new System.Windows.Forms.Label(); - this.actioncontrolclear = new System.Windows.Forms.Button(); - this.actionkey = new System.Windows.Forms.TextBox(); - this.actiondescription = new System.Windows.Forms.Label(); - this.tabcolors = new System.Windows.Forms.TabPage(); - this.appearancegroup1 = new System.Windows.Forms.GroupBox(); - this.labelDynLightIntensity = new System.Windows.Forms.Label(); - this.tbDynLightIntensity = new Dotnetrix.Controls.TrackBar(); - this.labelDynLightSize = new System.Windows.Forms.Label(); - this.tbDynLightSize = new Dotnetrix.Controls.TrackBar(); - this.labelDynLightCount = new System.Windows.Forms.Label(); - this.tbDynLightCount = new Dotnetrix.Controls.TrackBar(); - this.animatevisualselection = new System.Windows.Forms.CheckBox(); - this.blackbrowsers = new System.Windows.Forms.CheckBox(); - this.visualbilinear = new System.Windows.Forms.CheckBox(); - this.classicbilinear = new System.Windows.Forms.CheckBox(); - this.imagebrightnesslabel = new System.Windows.Forms.Label(); - this.imagebrightness = new Dotnetrix.Controls.TrackBar(); - this.colorsgroup3 = new System.Windows.Forms.GroupBox(); - this.scripttabwidth = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox(); - this.scriptautoindent = new System.Windows.Forms.CheckBox(); - this.label10 = new System.Windows.Forms.Label(); - this.panel1 = new System.Windows.Forms.Panel(); - this.scriptfontlabel = new System.Windows.Forms.Label(); - this.scriptfontsize = new System.Windows.Forms.ComboBox(); - this.label8 = new System.Windows.Forms.Label(); - this.scriptfontbold = new System.Windows.Forms.CheckBox(); - this.scriptfontname = new System.Windows.Forms.ComboBox(); - this.label3 = new System.Windows.Forms.Label(); - this.colorconstants = new CodeImp.DoomBuilder.Controls.ColorControl(); - this.colorliterals = new CodeImp.DoomBuilder.Controls.ColorControl(); - this.colorscriptbackground = new CodeImp.DoomBuilder.Controls.ColorControl(); - this.colorkeywords = new CodeImp.DoomBuilder.Controls.ColorControl(); - this.colorlinenumbers = new CodeImp.DoomBuilder.Controls.ColorControl(); - this.colorcomments = new CodeImp.DoomBuilder.Controls.ColorControl(); - this.colorplaintext = new CodeImp.DoomBuilder.Controls.ColorControl(); - this.tabpasting = new System.Windows.Forms.TabPage(); - this.label16 = new System.Windows.Forms.Label(); - this.pasteoptions = new CodeImp.DoomBuilder.Controls.PasteOptionsControl(); - this.cbSynchCameras = new System.Windows.Forms.CheckBox(); - label7 = new System.Windows.Forms.Label(); - label6 = new System.Windows.Forms.Label(); - label5 = new System.Windows.Forms.Label(); - groupBox1 = new System.Windows.Forms.GroupBox(); - label1 = new System.Windows.Forms.Label(); - label18 = new System.Windows.Forms.Label(); - label20 = new System.Windows.Forms.Label(); - label21 = new System.Windows.Forms.Label(); - groupBox1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.zoomfactor)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.autoscrollspeed)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.previewsize)).BeginInit(); - this.colorsgroup1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.doublesidedalpha)).BeginInit(); - this.tabs.SuspendLayout(); - this.tabinterface.SuspendLayout(); - this.groupBox5.SuspendLayout(); - this.groupBox4.SuspendLayout(); - this.groupBox2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.viewdistance)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.movespeed)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.mousespeed)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.fieldofview)).BeginInit(); - this.tabkeys.SuspendLayout(); - this.actioncontrolpanel.SuspendLayout(); - this.tabcolors.SuspendLayout(); - this.appearancegroup1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.tbDynLightIntensity)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.tbDynLightSize)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.tbDynLightCount)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.imagebrightness)).BeginInit(); - this.colorsgroup3.SuspendLayout(); - this.panel1.SuspendLayout(); - this.tabpasting.SuspendLayout(); - this.SuspendLayout(); - // - // label7 - // - label7.AutoSize = true; - label7.Location = new System.Drawing.Point(20, 172); - label7.Name = "label7"; - label7.Size = new System.Drawing.Size(187, 14); - label7.TabIndex = 7; - label7.Text = "Or select a special input control here:"; - // - // label6 - // - label6.AutoSize = true; - label6.Location = new System.Drawing.Point(20, 30); - label6.Name = "label6"; - label6.Size = new System.Drawing.Size(41, 14); - label6.TabIndex = 2; - label6.Text = "Action:"; - // - // label5 - // - label5.AutoSize = true; - label5.Location = new System.Drawing.Point(20, 122); - label5.Name = "label5"; - label5.Size = new System.Drawing.Size(200, 14); - label5.TabIndex = 4; - label5.Text = "Press the desired key combination here:"; - // - // groupBox1 - // - groupBox1.Controls.Add(this.cbSynchCameras); - groupBox1.Controls.Add(this.showtexturesizes); - groupBox1.Controls.Add(this.scriptontop); - groupBox1.Controls.Add(this.zoomfactor); - groupBox1.Controls.Add(this.zoomfactorlabel); - groupBox1.Controls.Add(this.label19); - groupBox1.Controls.Add(this.autoscrollspeed); - groupBox1.Controls.Add(this.autoscrollspeedlabel); - groupBox1.Controls.Add(this.label15); - groupBox1.Controls.Add(this.previewsize); - groupBox1.Controls.Add(this.previewsizelabel); - groupBox1.Controls.Add(this.label12); - groupBox1.Controls.Add(this.label14); - groupBox1.Controls.Add(this.defaultviewmode); - groupBox1.Location = new System.Drawing.Point(8, 8); - groupBox1.Name = "groupBox1"; - groupBox1.Size = new System.Drawing.Size(331, 313); - groupBox1.TabIndex = 0; - groupBox1.TabStop = false; - groupBox1.Text = " Options "; - // - // showtexturesizes - // - this.showtexturesizes.AutoSize = true; - this.showtexturesizes.Location = new System.Drawing.Point(32, 258); - this.showtexturesizes.Name = "showtexturesizes"; - this.showtexturesizes.Size = new System.Drawing.Size(222, 18); - this.showtexturesizes.TabIndex = 41; - this.showtexturesizes.Text = "Show texture and flat sizes in browsers"; - this.showtexturesizes.UseVisualStyleBackColor = true; - // - // scriptontop - // - this.scriptontop.AutoSize = true; - this.scriptontop.Location = new System.Drawing.Point(32, 234); - this.scriptontop.Name = "scriptontop"; - this.scriptontop.Size = new System.Drawing.Size(237, 18); - this.scriptontop.TabIndex = 40; - this.scriptontop.Text = "Script Editor always on top of main window"; - this.scriptontop.UseVisualStyleBackColor = true; - // - // zoomfactor - // - this.zoomfactor.LargeChange = 1; - this.zoomfactor.Location = new System.Drawing.Point(127, 181); - this.zoomfactor.Minimum = 1; - this.zoomfactor.Name = "zoomfactor"; - this.zoomfactor.Size = new System.Drawing.Size(116, 45); - this.zoomfactor.TabIndex = 37; - this.zoomfactor.TickStyle = System.Windows.Forms.TickStyle.Both; - this.zoomfactor.Value = 3; - this.zoomfactor.ValueChanged += new System.EventHandler(this.zoomfactor_ValueChanged); - // - // zoomfactorlabel - // - this.zoomfactorlabel.AutoSize = true; - this.zoomfactorlabel.Location = new System.Drawing.Point(249, 193); - this.zoomfactorlabel.Name = "zoomfactorlabel"; - this.zoomfactorlabel.Size = new System.Drawing.Size(29, 14); - this.zoomfactorlabel.TabIndex = 39; - this.zoomfactorlabel.Text = "30%"; - // - // label19 - // - this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(52, 193); - this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(69, 14); - this.label19.TabIndex = 38; - this.label19.Text = "Zoom factor:"; - // - // autoscrollspeed - // - this.autoscrollspeed.LargeChange = 1; - this.autoscrollspeed.Location = new System.Drawing.Point(127, 129); - this.autoscrollspeed.Maximum = 5; - this.autoscrollspeed.Name = "autoscrollspeed"; - this.autoscrollspeed.Size = new System.Drawing.Size(116, 45); - this.autoscrollspeed.TabIndex = 2; - this.autoscrollspeed.TickStyle = System.Windows.Forms.TickStyle.Both; - this.autoscrollspeed.ValueChanged += new System.EventHandler(this.autoscrollspeed_ValueChanged); - // - // autoscrollspeedlabel - // - this.autoscrollspeedlabel.AutoSize = true; - this.autoscrollspeedlabel.Location = new System.Drawing.Point(249, 141); - this.autoscrollspeedlabel.Name = "autoscrollspeedlabel"; - this.autoscrollspeedlabel.Size = new System.Drawing.Size(23, 14); - this.autoscrollspeedlabel.TabIndex = 36; - this.autoscrollspeedlabel.Text = "Off"; - // - // label15 - // - this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(29, 141); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(92, 14); - this.label15.TabIndex = 35; - this.label15.Text = "Autoscroll speed:"; - // - // previewsize - // - this.previewsize.LargeChange = 1; - this.previewsize.Location = new System.Drawing.Point(127, 75); - this.previewsize.Maximum = 5; - this.previewsize.Name = "previewsize"; - this.previewsize.Size = new System.Drawing.Size(116, 45); - this.previewsize.TabIndex = 1; - this.previewsize.TickStyle = System.Windows.Forms.TickStyle.Both; - this.previewsize.Value = 5; - this.previewsize.ValueChanged += new System.EventHandler(this.previewsize_ValueChanged); - // - // previewsizelabel - // - this.previewsizelabel.AutoSize = true; - this.previewsizelabel.Location = new System.Drawing.Point(249, 87); - this.previewsizelabel.Name = "previewsizelabel"; - this.previewsizelabel.Size = new System.Drawing.Size(55, 14); - this.previewsizelabel.TabIndex = 33; - this.previewsizelabel.Text = "128 x 128"; - // - // label12 - // - this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(17, 87); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(104, 14); - this.label12.TabIndex = 32; - this.label12.Text = "Preview image size:"; - // - // label14 - // - this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(50, 35); - this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(71, 14); - this.label14.TabIndex = 14; - this.label14.Text = "Default view:"; - // - // defaultviewmode - // - this.defaultviewmode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.defaultviewmode.FormattingEnabled = true; - this.defaultviewmode.Items.AddRange(new object[] { + this.components = new System.ComponentModel.Container(); + System.Windows.Forms.Label label7; + System.Windows.Forms.Label label6; + System.Windows.Forms.Label label5; + System.Windows.Forms.GroupBox groupBox1; + System.Windows.Forms.Label label1; + System.Windows.Forms.Label label18; + System.Windows.Forms.Label label20; + System.Windows.Forms.Label label21; + this.cbSynchCameras = new System.Windows.Forms.CheckBox(); + this.showtexturesizes = new System.Windows.Forms.CheckBox(); + this.scriptontop = new System.Windows.Forms.CheckBox(); + this.zoomfactor = new Dotnetrix.Controls.TrackBar(); + this.zoomfactorlabel = new System.Windows.Forms.Label(); + this.label19 = new System.Windows.Forms.Label(); + this.autoscrollspeed = new Dotnetrix.Controls.TrackBar(); + this.autoscrollspeedlabel = new System.Windows.Forms.Label(); + this.label15 = new System.Windows.Forms.Label(); + this.previewsize = new Dotnetrix.Controls.TrackBar(); + this.previewsizelabel = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); + this.label14 = new System.Windows.Forms.Label(); + this.defaultviewmode = new System.Windows.Forms.ComboBox(); + this.keyusedlabel = new System.Windows.Forms.Label(); + this.colorsgroup1 = new System.Windows.Forms.GroupBox(); + this.colorMD3 = new CodeImp.DoomBuilder.Controls.ColorControl(); + this.label2 = new System.Windows.Forms.Label(); + this.colorgrid64 = new CodeImp.DoomBuilder.Controls.ColorControl(); + this.squarethings = new System.Windows.Forms.CheckBox(); + this.colorgrid = new CodeImp.DoomBuilder.Controls.ColorControl(); + this.doublesidedalphalabel = new System.Windows.Forms.Label(); + this.colorindication = new CodeImp.DoomBuilder.Controls.ColorControl(); + this.colorsoundlinedefs = new CodeImp.DoomBuilder.Controls.ColorControl(); + this.colorspeciallinedefs = new CodeImp.DoomBuilder.Controls.ColorControl(); + this.qualitydisplay = new System.Windows.Forms.CheckBox(); + this.colorbackcolor = new CodeImp.DoomBuilder.Controls.ColorControl(); + this.colorselection = new CodeImp.DoomBuilder.Controls.ColorControl(); + this.colorvertices = new CodeImp.DoomBuilder.Controls.ColorControl(); + this.doublesidedalpha = new Dotnetrix.Controls.TrackBar(); + this.colorhighlight = new CodeImp.DoomBuilder.Controls.ColorControl(); + this.colorlinedefs = new CodeImp.DoomBuilder.Controls.ColorControl(); + this.cancel = new System.Windows.Forms.Button(); + this.apply = new System.Windows.Forms.Button(); + this.tabs = new System.Windows.Forms.TabControl(); + this.tabinterface = new System.Windows.Forms.TabPage(); + this.groupBox5 = new System.Windows.Forms.GroupBox(); + this.toolbar_gzdoom = new System.Windows.Forms.CheckBox(); + this.toolbar_file = new System.Windows.Forms.CheckBox(); + this.toolbar_testing = new System.Windows.Forms.CheckBox(); + this.toolbar_geometry = new System.Windows.Forms.CheckBox(); + this.toolbar_viewmodes = new System.Windows.Forms.CheckBox(); + this.toolbar_filter = new System.Windows.Forms.CheckBox(); + this.toolbar_prefabs = new System.Windows.Forms.CheckBox(); + this.toolbar_copy = new System.Windows.Forms.CheckBox(); + this.toolbar_undo = new System.Windows.Forms.CheckBox(); + this.toolbar_script = new System.Windows.Forms.CheckBox(); + this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.collapsedockers = new System.Windows.Forms.CheckBox(); + this.dockersposition = new System.Windows.Forms.ComboBox(); + this.label17 = new System.Windows.Forms.Label(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.viewdistance = new Dotnetrix.Controls.TrackBar(); + this.movespeed = new Dotnetrix.Controls.TrackBar(); + this.mousespeed = new Dotnetrix.Controls.TrackBar(); + this.fieldofview = new Dotnetrix.Controls.TrackBar(); + this.viewdistancelabel = new System.Windows.Forms.Label(); + this.label13 = new System.Windows.Forms.Label(); + this.invertyaxis = new System.Windows.Forms.CheckBox(); + this.movespeedlabel = new System.Windows.Forms.Label(); + this.label11 = new System.Windows.Forms.Label(); + this.mousespeedlabel = new System.Windows.Forms.Label(); + this.label9 = new System.Windows.Forms.Label(); + this.fieldofviewlabel = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.tabkeys = new System.Windows.Forms.TabPage(); + this.listactions = new System.Windows.Forms.ListView(); + this.columncontrolaction = new System.Windows.Forms.ColumnHeader(); + this.columncontrolkey = new System.Windows.Forms.ColumnHeader(); + this.actioncontrolpanel = new System.Windows.Forms.GroupBox(); + this.keyusedlist = new System.Windows.Forms.ListBox(); + this.disregardshiftlabel = new System.Windows.Forms.Label(); + this.actioncontrol = new System.Windows.Forms.ComboBox(); + this.actiontitle = new System.Windows.Forms.Label(); + this.actioncontrolclear = new System.Windows.Forms.Button(); + this.actionkey = new System.Windows.Forms.TextBox(); + this.actiondescription = new System.Windows.Forms.Label(); + this.tabcolors = new System.Windows.Forms.TabPage(); + this.appearancegroup1 = new System.Windows.Forms.GroupBox(); + this.labelDynLightIntensity = new System.Windows.Forms.Label(); + this.tbDynLightIntensity = new Dotnetrix.Controls.TrackBar(); + this.labelDynLightSize = new System.Windows.Forms.Label(); + this.tbDynLightSize = new Dotnetrix.Controls.TrackBar(); + this.labelDynLightCount = new System.Windows.Forms.Label(); + this.tbDynLightCount = new Dotnetrix.Controls.TrackBar(); + this.animatevisualselection = new System.Windows.Forms.CheckBox(); + this.blackbrowsers = new System.Windows.Forms.CheckBox(); + this.visualbilinear = new System.Windows.Forms.CheckBox(); + this.classicbilinear = new System.Windows.Forms.CheckBox(); + this.imagebrightnesslabel = new System.Windows.Forms.Label(); + this.imagebrightness = new Dotnetrix.Controls.TrackBar(); + this.colorsgroup3 = new System.Windows.Forms.GroupBox(); + this.scripttabwidth = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox(); + this.scriptautoindent = new System.Windows.Forms.CheckBox(); + this.label10 = new System.Windows.Forms.Label(); + this.panel1 = new System.Windows.Forms.Panel(); + this.scriptfontlabel = new System.Windows.Forms.Label(); + this.scriptfontsize = new System.Windows.Forms.ComboBox(); + this.label8 = new System.Windows.Forms.Label(); + this.scriptfontbold = new System.Windows.Forms.CheckBox(); + this.scriptfontname = new System.Windows.Forms.ComboBox(); + this.label3 = new System.Windows.Forms.Label(); + this.colorconstants = new CodeImp.DoomBuilder.Controls.ColorControl(); + this.colorliterals = new CodeImp.DoomBuilder.Controls.ColorControl(); + this.colorscriptbackground = new CodeImp.DoomBuilder.Controls.ColorControl(); + this.colorkeywords = new CodeImp.DoomBuilder.Controls.ColorControl(); + this.colorlinenumbers = new CodeImp.DoomBuilder.Controls.ColorControl(); + this.colorcomments = new CodeImp.DoomBuilder.Controls.ColorControl(); + this.colorplaintext = new CodeImp.DoomBuilder.Controls.ColorControl(); + this.tabpasting = new System.Windows.Forms.TabPage(); + this.label16 = new System.Windows.Forms.Label(); + this.pasteoptions = new CodeImp.DoomBuilder.Controls.PasteOptionsControl(); + this.cbStretchModels = new System.Windows.Forms.CheckBox(); + this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + label7 = new System.Windows.Forms.Label(); + label6 = new System.Windows.Forms.Label(); + label5 = new System.Windows.Forms.Label(); + groupBox1 = new System.Windows.Forms.GroupBox(); + label1 = new System.Windows.Forms.Label(); + label18 = new System.Windows.Forms.Label(); + label20 = new System.Windows.Forms.Label(); + label21 = new System.Windows.Forms.Label(); + groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.zoomfactor)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.autoscrollspeed)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.previewsize)).BeginInit(); + this.colorsgroup1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.doublesidedalpha)).BeginInit(); + this.tabs.SuspendLayout(); + this.tabinterface.SuspendLayout(); + this.groupBox5.SuspendLayout(); + this.groupBox4.SuspendLayout(); + this.groupBox2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.viewdistance)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.movespeed)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.mousespeed)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.fieldofview)).BeginInit(); + this.tabkeys.SuspendLayout(); + this.actioncontrolpanel.SuspendLayout(); + this.tabcolors.SuspendLayout(); + this.appearancegroup1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.tbDynLightIntensity)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.tbDynLightSize)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.tbDynLightCount)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.imagebrightness)).BeginInit(); + this.colorsgroup3.SuspendLayout(); + this.panel1.SuspendLayout(); + this.tabpasting.SuspendLayout(); + this.SuspendLayout(); + // + // label7 + // + label7.AutoSize = true; + label7.Location = new System.Drawing.Point(20, 172); + label7.Name = "label7"; + label7.Size = new System.Drawing.Size(187, 14); + label7.TabIndex = 7; + label7.Text = "Or select a special input control here:"; + // + // label6 + // + label6.AutoSize = true; + label6.Location = new System.Drawing.Point(20, 30); + label6.Name = "label6"; + label6.Size = new System.Drawing.Size(41, 14); + label6.TabIndex = 2; + label6.Text = "Action:"; + // + // label5 + // + label5.AutoSize = true; + label5.Location = new System.Drawing.Point(20, 122); + label5.Name = "label5"; + label5.Size = new System.Drawing.Size(200, 14); + label5.TabIndex = 4; + label5.Text = "Press the desired key combination here:"; + // + // groupBox1 + // + groupBox1.Controls.Add(this.cbSynchCameras); + groupBox1.Controls.Add(this.showtexturesizes); + groupBox1.Controls.Add(this.scriptontop); + groupBox1.Controls.Add(this.zoomfactor); + groupBox1.Controls.Add(this.zoomfactorlabel); + groupBox1.Controls.Add(this.label19); + groupBox1.Controls.Add(this.autoscrollspeed); + groupBox1.Controls.Add(this.autoscrollspeedlabel); + groupBox1.Controls.Add(this.label15); + groupBox1.Controls.Add(this.previewsize); + groupBox1.Controls.Add(this.previewsizelabel); + groupBox1.Controls.Add(this.label12); + groupBox1.Controls.Add(this.label14); + groupBox1.Controls.Add(this.defaultviewmode); + groupBox1.Location = new System.Drawing.Point(8, 8); + groupBox1.Name = "groupBox1"; + groupBox1.Size = new System.Drawing.Size(331, 313); + groupBox1.TabIndex = 0; + groupBox1.TabStop = false; + groupBox1.Text = " Options "; + // + // cbSynchCameras + // + this.cbSynchCameras.AutoSize = true; + this.cbSynchCameras.Location = new System.Drawing.Point(32, 282); + this.cbSynchCameras.Name = "cbSynchCameras"; + this.cbSynchCameras.Size = new System.Drawing.Size(264, 18); + this.cbSynchCameras.TabIndex = 42; + this.cbSynchCameras.Text = "Sync camera position between 2D and 3D modes"; + this.cbSynchCameras.UseVisualStyleBackColor = true; + // + // showtexturesizes + // + this.showtexturesizes.AutoSize = true; + this.showtexturesizes.Location = new System.Drawing.Point(32, 258); + this.showtexturesizes.Name = "showtexturesizes"; + this.showtexturesizes.Size = new System.Drawing.Size(222, 18); + this.showtexturesizes.TabIndex = 41; + this.showtexturesizes.Text = "Show texture and flat sizes in browsers"; + this.showtexturesizes.UseVisualStyleBackColor = true; + // + // scriptontop + // + this.scriptontop.AutoSize = true; + this.scriptontop.Location = new System.Drawing.Point(32, 234); + this.scriptontop.Name = "scriptontop"; + this.scriptontop.Size = new System.Drawing.Size(237, 18); + this.scriptontop.TabIndex = 40; + this.scriptontop.Text = "Script Editor always on top of main window"; + this.scriptontop.UseVisualStyleBackColor = true; + // + // zoomfactor + // + this.zoomfactor.LargeChange = 1; + this.zoomfactor.Location = new System.Drawing.Point(127, 181); + this.zoomfactor.Minimum = 1; + this.zoomfactor.Name = "zoomfactor"; + this.zoomfactor.Size = new System.Drawing.Size(116, 45); + this.zoomfactor.TabIndex = 37; + this.zoomfactor.TickStyle = System.Windows.Forms.TickStyle.Both; + this.zoomfactor.Value = 3; + this.zoomfactor.ValueChanged += new System.EventHandler(this.zoomfactor_ValueChanged); + // + // zoomfactorlabel + // + this.zoomfactorlabel.AutoSize = true; + this.zoomfactorlabel.Location = new System.Drawing.Point(249, 193); + this.zoomfactorlabel.Name = "zoomfactorlabel"; + this.zoomfactorlabel.Size = new System.Drawing.Size(29, 14); + this.zoomfactorlabel.TabIndex = 39; + this.zoomfactorlabel.Text = "30%"; + // + // label19 + // + this.label19.AutoSize = true; + this.label19.Location = new System.Drawing.Point(52, 193); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(69, 14); + this.label19.TabIndex = 38; + this.label19.Text = "Zoom factor:"; + // + // autoscrollspeed + // + this.autoscrollspeed.LargeChange = 1; + this.autoscrollspeed.Location = new System.Drawing.Point(127, 129); + this.autoscrollspeed.Maximum = 5; + this.autoscrollspeed.Name = "autoscrollspeed"; + this.autoscrollspeed.Size = new System.Drawing.Size(116, 45); + this.autoscrollspeed.TabIndex = 2; + this.autoscrollspeed.TickStyle = System.Windows.Forms.TickStyle.Both; + this.autoscrollspeed.ValueChanged += new System.EventHandler(this.autoscrollspeed_ValueChanged); + // + // autoscrollspeedlabel + // + this.autoscrollspeedlabel.AutoSize = true; + this.autoscrollspeedlabel.Location = new System.Drawing.Point(249, 141); + this.autoscrollspeedlabel.Name = "autoscrollspeedlabel"; + this.autoscrollspeedlabel.Size = new System.Drawing.Size(23, 14); + this.autoscrollspeedlabel.TabIndex = 36; + this.autoscrollspeedlabel.Text = "Off"; + // + // label15 + // + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(29, 141); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(92, 14); + this.label15.TabIndex = 35; + this.label15.Text = "Autoscroll speed:"; + // + // previewsize + // + this.previewsize.LargeChange = 1; + this.previewsize.Location = new System.Drawing.Point(127, 75); + this.previewsize.Maximum = 5; + this.previewsize.Name = "previewsize"; + this.previewsize.Size = new System.Drawing.Size(116, 45); + this.previewsize.TabIndex = 1; + this.previewsize.TickStyle = System.Windows.Forms.TickStyle.Both; + this.previewsize.Value = 5; + this.previewsize.ValueChanged += new System.EventHandler(this.previewsize_ValueChanged); + // + // previewsizelabel + // + this.previewsizelabel.AutoSize = true; + this.previewsizelabel.Location = new System.Drawing.Point(249, 87); + this.previewsizelabel.Name = "previewsizelabel"; + this.previewsizelabel.Size = new System.Drawing.Size(55, 14); + this.previewsizelabel.TabIndex = 33; + this.previewsizelabel.Text = "128 x 128"; + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Location = new System.Drawing.Point(17, 87); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(104, 14); + this.label12.TabIndex = 32; + this.label12.Text = "Preview image size:"; + // + // label14 + // + this.label14.AutoSize = true; + this.label14.Location = new System.Drawing.Point(50, 35); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(71, 14); + this.label14.TabIndex = 14; + this.label14.Text = "Default view:"; + // + // defaultviewmode + // + this.defaultviewmode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.defaultviewmode.FormattingEnabled = true; + this.defaultviewmode.Items.AddRange(new object[] { "Wireframe", "Brightness Levels", "Floor Textures", "Ceiling Textures"}); - this.defaultviewmode.Location = new System.Drawing.Point(135, 32); - this.defaultviewmode.Name = "defaultviewmode"; - this.defaultviewmode.Size = new System.Drawing.Size(145, 22); - this.defaultviewmode.TabIndex = 0; - // - // label1 - // - label1.AutoSize = true; - label1.Location = new System.Drawing.Point(28, 30); - label1.Name = "label1"; - label1.Size = new System.Drawing.Size(147, 14); - label1.TabIndex = 20; - label1.Text = "Texture and Flats brightness:"; - label1.TextAlign = System.Drawing.ContentAlignment.TopRight; - // - // label18 - // - label18.AutoSize = true; - label18.Location = new System.Drawing.Point(22, 78); - label18.Name = "label18"; - label18.Size = new System.Drawing.Size(151, 14); - label18.TabIndex = 25; - label18.Text = "Max. dynamic lights to render:"; - label18.TextAlign = System.Drawing.ContentAlignment.TopRight; - // - // label20 - // - label20.AutoSize = true; - label20.Location = new System.Drawing.Point(76, 126); - label20.Name = "label20"; - label20.Size = new System.Drawing.Size(96, 14); - label20.TabIndex = 28; - label20.Text = "Dynamic light size:"; - label20.TextAlign = System.Drawing.ContentAlignment.TopRight; - // - // label21 - // - label21.AutoSize = true; - label21.Location = new System.Drawing.Point(55, 174); - label21.Name = "label21"; - label21.Size = new System.Drawing.Size(116, 14); - label21.TabIndex = 31; - label21.Text = "Dynamic light intensity:"; - label21.TextAlign = System.Drawing.ContentAlignment.TopRight; - // - // keyusedlabel - // - this.keyusedlabel.AutoSize = true; - this.keyusedlabel.Location = new System.Drawing.Point(20, 287); - this.keyusedlabel.Name = "keyusedlabel"; - this.keyusedlabel.Size = new System.Drawing.Size(222, 14); - this.keyusedlabel.TabIndex = 10; - this.keyusedlabel.Text = "Key combination also used by these actions:"; - this.keyusedlabel.Visible = false; - // - // colorsgroup1 - // - this.colorsgroup1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.colorsgroup1.Controls.Add(this.colorMD3); - this.colorsgroup1.Controls.Add(this.label2); - this.colorsgroup1.Controls.Add(this.colorgrid64); - this.colorsgroup1.Controls.Add(this.squarethings); - this.colorsgroup1.Controls.Add(this.colorgrid); - this.colorsgroup1.Controls.Add(this.doublesidedalphalabel); - this.colorsgroup1.Controls.Add(this.colorindication); - this.colorsgroup1.Controls.Add(this.colorsoundlinedefs); - this.colorsgroup1.Controls.Add(this.colorspeciallinedefs); - this.colorsgroup1.Controls.Add(this.qualitydisplay); - this.colorsgroup1.Controls.Add(this.colorbackcolor); - this.colorsgroup1.Controls.Add(this.colorselection); - this.colorsgroup1.Controls.Add(this.colorvertices); - this.colorsgroup1.Controls.Add(this.doublesidedalpha); - this.colorsgroup1.Controls.Add(this.colorhighlight); - this.colorsgroup1.Controls.Add(this.colorlinedefs); - this.colorsgroup1.Location = new System.Drawing.Point(8, 8); - this.colorsgroup1.Name = "colorsgroup1"; - this.colorsgroup1.Size = new System.Drawing.Size(203, 493); - this.colorsgroup1.TabIndex = 0; - this.colorsgroup1.TabStop = false; - this.colorsgroup1.Text = " Display "; - this.colorsgroup1.Visible = false; - // - // colorMD3 - // - this.colorMD3.BackColor = System.Drawing.Color.Transparent; - this.colorMD3.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.colorMD3.Label = "Model wireframe:"; - this.colorMD3.Location = new System.Drawing.Point(15, 297); - this.colorMD3.MaximumSize = new System.Drawing.Size(10000, 23); - this.colorMD3.MinimumSize = new System.Drawing.Size(100, 23); - this.colorMD3.Name = "colorMD3"; - this.colorMD3.Size = new System.Drawing.Size(168, 23); - this.colorMD3.TabIndex = 17; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(18, 333); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(147, 14); - this.label2.TabIndex = 14; - this.label2.Text = "Passable lines transparency:"; - this.label2.TextAlign = System.Drawing.ContentAlignment.TopRight; - // - // colorgrid64 - // - this.colorgrid64.BackColor = System.Drawing.Color.Transparent; - this.colorgrid64.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.colorgrid64.Label = "64 Block grid:"; - this.colorgrid64.Location = new System.Drawing.Point(15, 270); - this.colorgrid64.MaximumSize = new System.Drawing.Size(10000, 23); - this.colorgrid64.MinimumSize = new System.Drawing.Size(100, 23); - this.colorgrid64.Name = "colorgrid64"; - this.colorgrid64.Size = new System.Drawing.Size(168, 23); - this.colorgrid64.TabIndex = 9; - // - // squarethings - // - this.squarethings.AutoSize = true; - this.squarethings.Location = new System.Drawing.Point(21, 445); - this.squarethings.Name = "squarethings"; - this.squarethings.Size = new System.Drawing.Size(93, 18); - this.squarethings.TabIndex = 8; - this.squarethings.Text = "Square things"; - this.squarethings.UseVisualStyleBackColor = true; - // - // colorgrid - // - this.colorgrid.BackColor = System.Drawing.Color.Transparent; - this.colorgrid.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.colorgrid.Label = "Custom grid:"; - this.colorgrid.Location = new System.Drawing.Point(15, 243); - this.colorgrid.MaximumSize = new System.Drawing.Size(10000, 23); - this.colorgrid.MinimumSize = new System.Drawing.Size(100, 23); - this.colorgrid.Name = "colorgrid"; - this.colorgrid.Size = new System.Drawing.Size(168, 23); - this.colorgrid.TabIndex = 8; - // - // doublesidedalphalabel - // - this.doublesidedalphalabel.AutoSize = true; - this.doublesidedalphalabel.Location = new System.Drawing.Point(148, 365); - this.doublesidedalphalabel.Name = "doublesidedalphalabel"; - this.doublesidedalphalabel.Size = new System.Drawing.Size(23, 14); - this.doublesidedalphalabel.TabIndex = 16; - this.doublesidedalphalabel.Text = "0%"; - // - // colorindication - // - this.colorindication.BackColor = System.Drawing.Color.Transparent; - this.colorindication.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.colorindication.Label = "Indications:"; - this.colorindication.Location = new System.Drawing.Point(15, 216); - this.colorindication.MaximumSize = new System.Drawing.Size(10000, 23); - this.colorindication.MinimumSize = new System.Drawing.Size(100, 23); - this.colorindication.Name = "colorindication"; - this.colorindication.Size = new System.Drawing.Size(168, 23); - this.colorindication.TabIndex = 7; - // - // colorsoundlinedefs - // - this.colorsoundlinedefs.BackColor = System.Drawing.Color.Transparent; - this.colorsoundlinedefs.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.colorsoundlinedefs.Label = "Sound lines:"; - this.colorsoundlinedefs.Location = new System.Drawing.Point(15, 135); - this.colorsoundlinedefs.MaximumSize = new System.Drawing.Size(10000, 23); - this.colorsoundlinedefs.MinimumSize = new System.Drawing.Size(100, 23); - this.colorsoundlinedefs.Name = "colorsoundlinedefs"; - this.colorsoundlinedefs.Size = new System.Drawing.Size(168, 23); - this.colorsoundlinedefs.TabIndex = 4; - // - // colorspeciallinedefs - // - this.colorspeciallinedefs.BackColor = System.Drawing.Color.Transparent; - this.colorspeciallinedefs.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.colorspeciallinedefs.Label = "Action lines:"; - this.colorspeciallinedefs.Location = new System.Drawing.Point(15, 108); - this.colorspeciallinedefs.MaximumSize = new System.Drawing.Size(10000, 23); - this.colorspeciallinedefs.MinimumSize = new System.Drawing.Size(100, 23); - this.colorspeciallinedefs.Name = "colorspeciallinedefs"; - this.colorspeciallinedefs.Size = new System.Drawing.Size(168, 23); - this.colorspeciallinedefs.TabIndex = 3; - // - // qualitydisplay - // - this.qualitydisplay.AutoSize = true; - this.qualitydisplay.Location = new System.Drawing.Point(21, 413); - this.qualitydisplay.Name = "qualitydisplay"; - this.qualitydisplay.Size = new System.Drawing.Size(130, 18); - this.qualitydisplay.TabIndex = 7; - this.qualitydisplay.Text = "High quality rendering"; - this.qualitydisplay.UseVisualStyleBackColor = true; - // - // colorbackcolor - // - this.colorbackcolor.BackColor = System.Drawing.Color.Transparent; - this.colorbackcolor.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.colorbackcolor.Label = "Background:"; - this.colorbackcolor.Location = new System.Drawing.Point(15, 27); - this.colorbackcolor.MaximumSize = new System.Drawing.Size(10000, 23); - this.colorbackcolor.MinimumSize = new System.Drawing.Size(100, 23); - this.colorbackcolor.Name = "colorbackcolor"; - this.colorbackcolor.Size = new System.Drawing.Size(168, 23); - this.colorbackcolor.TabIndex = 0; - // - // colorselection - // - this.colorselection.BackColor = System.Drawing.Color.Transparent; - this.colorselection.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.colorselection.Label = "Selection:"; - this.colorselection.Location = new System.Drawing.Point(15, 189); - this.colorselection.MaximumSize = new System.Drawing.Size(10000, 23); - this.colorselection.MinimumSize = new System.Drawing.Size(100, 23); - this.colorselection.Name = "colorselection"; - this.colorselection.Size = new System.Drawing.Size(168, 23); - this.colorselection.TabIndex = 6; - // - // colorvertices - // - this.colorvertices.BackColor = System.Drawing.Color.Transparent; - this.colorvertices.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.colorvertices.Label = "Vertices:"; - this.colorvertices.Location = new System.Drawing.Point(15, 54); - this.colorvertices.MaximumSize = new System.Drawing.Size(10000, 23); - this.colorvertices.MinimumSize = new System.Drawing.Size(100, 23); - this.colorvertices.Name = "colorvertices"; - this.colorvertices.Size = new System.Drawing.Size(168, 23); - this.colorvertices.TabIndex = 1; - // - // doublesidedalpha - // - this.doublesidedalpha.LargeChange = 3; - this.doublesidedalpha.Location = new System.Drawing.Point(11, 352); - this.doublesidedalpha.Name = "doublesidedalpha"; - this.doublesidedalpha.Size = new System.Drawing.Size(130, 45); - this.doublesidedalpha.TabIndex = 2; - this.doublesidedalpha.TickStyle = System.Windows.Forms.TickStyle.Both; - this.doublesidedalpha.ValueChanged += new System.EventHandler(this.doublesidedalpha_ValueChanged); - // - // colorhighlight - // - this.colorhighlight.BackColor = System.Drawing.Color.Transparent; - this.colorhighlight.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.colorhighlight.Label = "Highlight:"; - this.colorhighlight.Location = new System.Drawing.Point(15, 162); - this.colorhighlight.MaximumSize = new System.Drawing.Size(10000, 23); - this.colorhighlight.MinimumSize = new System.Drawing.Size(100, 23); - this.colorhighlight.Name = "colorhighlight"; - this.colorhighlight.Size = new System.Drawing.Size(168, 23); - this.colorhighlight.TabIndex = 5; - // - // colorlinedefs - // - this.colorlinedefs.BackColor = System.Drawing.Color.Transparent; - this.colorlinedefs.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.colorlinedefs.Label = "Common lines:"; - this.colorlinedefs.Location = new System.Drawing.Point(15, 81); - this.colorlinedefs.MaximumSize = new System.Drawing.Size(10000, 23); - this.colorlinedefs.MinimumSize = new System.Drawing.Size(100, 23); - this.colorlinedefs.Name = "colorlinedefs"; - this.colorlinedefs.Size = new System.Drawing.Size(168, 23); - this.colorlinedefs.TabIndex = 2; - // - // cancel - // - this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(589, 558); - this.cancel.Name = "cancel"; - this.cancel.Size = new System.Drawing.Size(112, 25); - this.cancel.TabIndex = 2; - this.cancel.Text = "Cancel"; - this.cancel.UseVisualStyleBackColor = true; - this.cancel.Click += new System.EventHandler(this.cancel_Click); - // - // 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(471, 558); - this.apply.Name = "apply"; - this.apply.Size = new System.Drawing.Size(112, 25); - this.apply.TabIndex = 1; - this.apply.Text = "OK"; - this.apply.UseVisualStyleBackColor = true; - this.apply.Click += new System.EventHandler(this.apply_Click); - // - // tabs - // - this.tabs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.tabs.Controls.Add(this.tabinterface); - this.tabs.Controls.Add(this.tabkeys); - this.tabs.Controls.Add(this.tabcolors); - this.tabs.Controls.Add(this.tabpasting); - this.tabs.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tabs.ItemSize = new System.Drawing.Size(110, 19); - this.tabs.Location = new System.Drawing.Point(11, 13); - this.tabs.Name = "tabs"; - this.tabs.Padding = new System.Drawing.Point(20, 3); - this.tabs.SelectedIndex = 0; - this.tabs.Size = new System.Drawing.Size(690, 536); - this.tabs.TabIndex = 0; - this.tabs.SelectedIndexChanged += new System.EventHandler(this.tabs_SelectedIndexChanged); - // - // tabinterface - // - this.tabinterface.Controls.Add(this.groupBox5); - this.tabinterface.Controls.Add(this.groupBox4); - this.tabinterface.Controls.Add(this.groupBox2); - this.tabinterface.Controls.Add(groupBox1); - this.tabinterface.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tabinterface.Location = new System.Drawing.Point(4, 23); - this.tabinterface.Name = "tabinterface"; - this.tabinterface.Padding = new System.Windows.Forms.Padding(5); - this.tabinterface.Size = new System.Drawing.Size(682, 509); - this.tabinterface.TabIndex = 0; - this.tabinterface.Text = "Interface"; - this.tabinterface.UseVisualStyleBackColor = true; - // - // groupBox5 - // - this.groupBox5.Controls.Add(this.toolbar_gzdoom); - this.groupBox5.Controls.Add(this.toolbar_file); - this.groupBox5.Controls.Add(this.toolbar_testing); - this.groupBox5.Controls.Add(this.toolbar_geometry); - this.groupBox5.Controls.Add(this.toolbar_viewmodes); - this.groupBox5.Controls.Add(this.toolbar_filter); - this.groupBox5.Controls.Add(this.toolbar_prefabs); - this.groupBox5.Controls.Add(this.toolbar_copy); - this.groupBox5.Controls.Add(this.toolbar_undo); - this.groupBox5.Controls.Add(this.toolbar_script); - this.groupBox5.Location = new System.Drawing.Point(8, 327); - this.groupBox5.Name = "groupBox5"; - this.groupBox5.Size = new System.Drawing.Size(331, 173); - this.groupBox5.TabIndex = 4; - this.groupBox5.TabStop = false; - this.groupBox5.Text = " Toolbar Buttons "; - // - // toolbar_gzdoom - // - this.toolbar_gzdoom.AutoSize = true; - this.toolbar_gzdoom.Location = new System.Drawing.Point(188, 137); - this.toolbar_gzdoom.Name = "toolbar_gzdoom"; - this.toolbar_gzdoom.Size = new System.Drawing.Size(104, 18); - this.toolbar_gzdoom.TabIndex = 50; - this.toolbar_gzdoom.Text = "GZDoom toolbar"; - this.toolbar_gzdoom.UseVisualStyleBackColor = true; - // - // toolbar_file - // - this.toolbar_file.AutoSize = true; - this.toolbar_file.Location = new System.Drawing.Point(32, 33); - this.toolbar_file.Name = "toolbar_file"; - this.toolbar_file.Size = new System.Drawing.Size(118, 18); - this.toolbar_file.TabIndex = 49; - this.toolbar_file.Text = "New / Open / Save"; - this.toolbar_file.UseVisualStyleBackColor = true; - // - // toolbar_testing - // - this.toolbar_testing.AutoSize = true; - this.toolbar_testing.Location = new System.Drawing.Point(188, 111); - this.toolbar_testing.Name = "toolbar_testing"; - this.toolbar_testing.Size = new System.Drawing.Size(60, 18); - this.toolbar_testing.TabIndex = 48; - this.toolbar_testing.Text = "Testing"; - this.toolbar_testing.UseVisualStyleBackColor = true; - // - // toolbar_geometry - // - this.toolbar_geometry.AutoSize = true; - this.toolbar_geometry.Location = new System.Drawing.Point(188, 85); - this.toolbar_geometry.Name = "toolbar_geometry"; - this.toolbar_geometry.Size = new System.Drawing.Size(90, 18); - this.toolbar_geometry.TabIndex = 47; - this.toolbar_geometry.Text = "Snap / Merge"; - this.toolbar_geometry.UseVisualStyleBackColor = true; - // - // toolbar_viewmodes - // - this.toolbar_viewmodes.AutoSize = true; - this.toolbar_viewmodes.Location = new System.Drawing.Point(188, 59); - this.toolbar_viewmodes.Name = "toolbar_viewmodes"; - this.toolbar_viewmodes.Size = new System.Drawing.Size(87, 18); - this.toolbar_viewmodes.TabIndex = 46; - this.toolbar_viewmodes.Text = "View Modes"; - this.toolbar_viewmodes.UseVisualStyleBackColor = true; - // - // toolbar_filter - // - this.toolbar_filter.AutoSize = true; - this.toolbar_filter.Location = new System.Drawing.Point(188, 33); - this.toolbar_filter.Name = "toolbar_filter"; - this.toolbar_filter.Size = new System.Drawing.Size(84, 18); - this.toolbar_filter.TabIndex = 45; - this.toolbar_filter.Text = "Things Filter"; - this.toolbar_filter.UseVisualStyleBackColor = true; - // - // toolbar_prefabs - // - this.toolbar_prefabs.AutoSize = true; - this.toolbar_prefabs.Location = new System.Drawing.Point(32, 137); - this.toolbar_prefabs.Name = "toolbar_prefabs"; - this.toolbar_prefabs.Size = new System.Drawing.Size(64, 18); - this.toolbar_prefabs.TabIndex = 44; - this.toolbar_prefabs.Text = "Prefabs"; - this.toolbar_prefabs.UseVisualStyleBackColor = true; - // - // toolbar_copy - // - this.toolbar_copy.AutoSize = true; - this.toolbar_copy.Location = new System.Drawing.Point(32, 111); - this.toolbar_copy.Name = "toolbar_copy"; - this.toolbar_copy.Size = new System.Drawing.Size(112, 18); - this.toolbar_copy.TabIndex = 43; - this.toolbar_copy.Text = "Cut / Copy / Paste"; - this.toolbar_copy.UseVisualStyleBackColor = true; - // - // toolbar_undo - // - this.toolbar_undo.AutoSize = true; - this.toolbar_undo.Location = new System.Drawing.Point(32, 85); - this.toolbar_undo.Name = "toolbar_undo"; - this.toolbar_undo.Size = new System.Drawing.Size(85, 18); - this.toolbar_undo.TabIndex = 42; - this.toolbar_undo.Text = "Undo / Redo"; - this.toolbar_undo.UseVisualStyleBackColor = true; - // - // toolbar_script - // - this.toolbar_script.AutoSize = true; - this.toolbar_script.Location = new System.Drawing.Point(32, 59); - this.toolbar_script.Name = "toolbar_script"; - this.toolbar_script.Size = new System.Drawing.Size(84, 18); - this.toolbar_script.TabIndex = 41; - this.toolbar_script.Text = "Script Editor"; - this.toolbar_script.UseVisualStyleBackColor = true; - // - // groupBox4 - // - 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(345, 327); - this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(329, 173); - this.groupBox4.TabIndex = 3; - this.groupBox4.TabStop = false; - this.groupBox4.Text = " Side Panels "; - // - // collapsedockers - // - this.collapsedockers.AutoSize = true; - this.collapsedockers.Location = new System.Drawing.Point(204, 36); - this.collapsedockers.Name = "collapsedockers"; - this.collapsedockers.Size = new System.Drawing.Size(72, 18); - this.collapsedockers.TabIndex = 2; - this.collapsedockers.Text = "Auto hide"; - this.collapsedockers.UseVisualStyleBackColor = true; - // - // dockersposition - // - this.dockersposition.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.dockersposition.FormattingEnabled = true; - this.dockersposition.Items.AddRange(new object[] { + this.defaultviewmode.Location = new System.Drawing.Point(135, 32); + this.defaultviewmode.Name = "defaultviewmode"; + this.defaultviewmode.Size = new System.Drawing.Size(145, 22); + this.defaultviewmode.TabIndex = 0; + // + // label1 + // + label1.AutoSize = true; + label1.Location = new System.Drawing.Point(28, 30); + label1.Name = "label1"; + label1.Size = new System.Drawing.Size(147, 14); + label1.TabIndex = 20; + label1.Text = "Texture and Flats brightness:"; + label1.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // label18 + // + label18.AutoSize = true; + label18.Location = new System.Drawing.Point(22, 78); + label18.Name = "label18"; + label18.Size = new System.Drawing.Size(151, 14); + label18.TabIndex = 25; + label18.Text = "Max. dynamic lights to render:"; + label18.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // label20 + // + label20.AutoSize = true; + label20.Location = new System.Drawing.Point(76, 126); + label20.Name = "label20"; + label20.Size = new System.Drawing.Size(96, 14); + label20.TabIndex = 28; + label20.Text = "Dynamic light size:"; + label20.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // label21 + // + label21.AutoSize = true; + label21.Location = new System.Drawing.Point(55, 174); + label21.Name = "label21"; + label21.Size = new System.Drawing.Size(116, 14); + label21.TabIndex = 31; + label21.Text = "Dynamic light intensity:"; + label21.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // keyusedlabel + // + this.keyusedlabel.AutoSize = true; + this.keyusedlabel.Location = new System.Drawing.Point(20, 287); + this.keyusedlabel.Name = "keyusedlabel"; + this.keyusedlabel.Size = new System.Drawing.Size(222, 14); + this.keyusedlabel.TabIndex = 10; + this.keyusedlabel.Text = "Key combination also used by these actions:"; + this.keyusedlabel.Visible = false; + // + // colorsgroup1 + // + this.colorsgroup1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); + this.colorsgroup1.Controls.Add(this.cbStretchModels); + this.colorsgroup1.Controls.Add(this.colorMD3); + this.colorsgroup1.Controls.Add(this.label2); + this.colorsgroup1.Controls.Add(this.colorgrid64); + this.colorsgroup1.Controls.Add(this.squarethings); + this.colorsgroup1.Controls.Add(this.colorgrid); + this.colorsgroup1.Controls.Add(this.doublesidedalphalabel); + this.colorsgroup1.Controls.Add(this.colorindication); + this.colorsgroup1.Controls.Add(this.colorsoundlinedefs); + this.colorsgroup1.Controls.Add(this.colorspeciallinedefs); + this.colorsgroup1.Controls.Add(this.qualitydisplay); + this.colorsgroup1.Controls.Add(this.colorbackcolor); + this.colorsgroup1.Controls.Add(this.colorselection); + this.colorsgroup1.Controls.Add(this.colorvertices); + this.colorsgroup1.Controls.Add(this.doublesidedalpha); + this.colorsgroup1.Controls.Add(this.colorhighlight); + this.colorsgroup1.Controls.Add(this.colorlinedefs); + this.colorsgroup1.Location = new System.Drawing.Point(8, 8); + this.colorsgroup1.Name = "colorsgroup1"; + this.colorsgroup1.Size = new System.Drawing.Size(203, 493); + this.colorsgroup1.TabIndex = 0; + this.colorsgroup1.TabStop = false; + this.colorsgroup1.Text = " Display "; + this.colorsgroup1.Visible = false; + // + // colorMD3 + // + this.colorMD3.BackColor = System.Drawing.Color.Transparent; + this.colorMD3.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.colorMD3.Label = "Model wireframe:"; + this.colorMD3.Location = new System.Drawing.Point(15, 297); + this.colorMD3.MaximumSize = new System.Drawing.Size(10000, 23); + this.colorMD3.MinimumSize = new System.Drawing.Size(100, 23); + this.colorMD3.Name = "colorMD3"; + this.colorMD3.Size = new System.Drawing.Size(168, 23); + this.colorMD3.TabIndex = 17; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(18, 333); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(147, 14); + this.label2.TabIndex = 14; + this.label2.Text = "Passable lines transparency:"; + this.label2.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // colorgrid64 + // + this.colorgrid64.BackColor = System.Drawing.Color.Transparent; + this.colorgrid64.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.colorgrid64.Label = "64 Block grid:"; + this.colorgrid64.Location = new System.Drawing.Point(15, 270); + this.colorgrid64.MaximumSize = new System.Drawing.Size(10000, 23); + this.colorgrid64.MinimumSize = new System.Drawing.Size(100, 23); + this.colorgrid64.Name = "colorgrid64"; + this.colorgrid64.Size = new System.Drawing.Size(168, 23); + this.colorgrid64.TabIndex = 9; + // + // squarethings + // + this.squarethings.AutoSize = true; + this.squarethings.Location = new System.Drawing.Point(21, 438); + this.squarethings.Name = "squarethings"; + this.squarethings.Size = new System.Drawing.Size(93, 18); + this.squarethings.TabIndex = 8; + this.squarethings.Text = "Square things"; + this.squarethings.UseVisualStyleBackColor = true; + // + // colorgrid + // + this.colorgrid.BackColor = System.Drawing.Color.Transparent; + this.colorgrid.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.colorgrid.Label = "Custom grid:"; + this.colorgrid.Location = new System.Drawing.Point(15, 243); + this.colorgrid.MaximumSize = new System.Drawing.Size(10000, 23); + this.colorgrid.MinimumSize = new System.Drawing.Size(100, 23); + this.colorgrid.Name = "colorgrid"; + this.colorgrid.Size = new System.Drawing.Size(168, 23); + this.colorgrid.TabIndex = 8; + // + // doublesidedalphalabel + // + this.doublesidedalphalabel.AutoSize = true; + this.doublesidedalphalabel.Location = new System.Drawing.Point(148, 365); + this.doublesidedalphalabel.Name = "doublesidedalphalabel"; + this.doublesidedalphalabel.Size = new System.Drawing.Size(23, 14); + this.doublesidedalphalabel.TabIndex = 16; + this.doublesidedalphalabel.Text = "0%"; + // + // colorindication + // + this.colorindication.BackColor = System.Drawing.Color.Transparent; + this.colorindication.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.colorindication.Label = "Indications:"; + this.colorindication.Location = new System.Drawing.Point(15, 216); + this.colorindication.MaximumSize = new System.Drawing.Size(10000, 23); + this.colorindication.MinimumSize = new System.Drawing.Size(100, 23); + this.colorindication.Name = "colorindication"; + this.colorindication.Size = new System.Drawing.Size(168, 23); + this.colorindication.TabIndex = 7; + // + // colorsoundlinedefs + // + this.colorsoundlinedefs.BackColor = System.Drawing.Color.Transparent; + this.colorsoundlinedefs.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.colorsoundlinedefs.Label = "Sound lines:"; + this.colorsoundlinedefs.Location = new System.Drawing.Point(15, 135); + this.colorsoundlinedefs.MaximumSize = new System.Drawing.Size(10000, 23); + this.colorsoundlinedefs.MinimumSize = new System.Drawing.Size(100, 23); + this.colorsoundlinedefs.Name = "colorsoundlinedefs"; + this.colorsoundlinedefs.Size = new System.Drawing.Size(168, 23); + this.colorsoundlinedefs.TabIndex = 4; + // + // colorspeciallinedefs + // + this.colorspeciallinedefs.BackColor = System.Drawing.Color.Transparent; + this.colorspeciallinedefs.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.colorspeciallinedefs.Label = "Action lines:"; + this.colorspeciallinedefs.Location = new System.Drawing.Point(15, 108); + this.colorspeciallinedefs.MaximumSize = new System.Drawing.Size(10000, 23); + this.colorspeciallinedefs.MinimumSize = new System.Drawing.Size(100, 23); + this.colorspeciallinedefs.Name = "colorspeciallinedefs"; + this.colorspeciallinedefs.Size = new System.Drawing.Size(168, 23); + this.colorspeciallinedefs.TabIndex = 3; + // + // qualitydisplay + // + this.qualitydisplay.AutoSize = true; + this.qualitydisplay.Location = new System.Drawing.Point(21, 413); + this.qualitydisplay.Name = "qualitydisplay"; + this.qualitydisplay.Size = new System.Drawing.Size(130, 18); + this.qualitydisplay.TabIndex = 7; + this.qualitydisplay.Text = "High quality rendering"; + this.qualitydisplay.UseVisualStyleBackColor = true; + // + // colorbackcolor + // + this.colorbackcolor.BackColor = System.Drawing.Color.Transparent; + this.colorbackcolor.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.colorbackcolor.Label = "Background:"; + this.colorbackcolor.Location = new System.Drawing.Point(15, 27); + this.colorbackcolor.MaximumSize = new System.Drawing.Size(10000, 23); + this.colorbackcolor.MinimumSize = new System.Drawing.Size(100, 23); + this.colorbackcolor.Name = "colorbackcolor"; + this.colorbackcolor.Size = new System.Drawing.Size(168, 23); + this.colorbackcolor.TabIndex = 0; + // + // colorselection + // + this.colorselection.BackColor = System.Drawing.Color.Transparent; + this.colorselection.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.colorselection.Label = "Selection:"; + this.colorselection.Location = new System.Drawing.Point(15, 189); + this.colorselection.MaximumSize = new System.Drawing.Size(10000, 23); + this.colorselection.MinimumSize = new System.Drawing.Size(100, 23); + this.colorselection.Name = "colorselection"; + this.colorselection.Size = new System.Drawing.Size(168, 23); + this.colorselection.TabIndex = 6; + // + // colorvertices + // + this.colorvertices.BackColor = System.Drawing.Color.Transparent; + this.colorvertices.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.colorvertices.Label = "Vertices:"; + this.colorvertices.Location = new System.Drawing.Point(15, 54); + this.colorvertices.MaximumSize = new System.Drawing.Size(10000, 23); + this.colorvertices.MinimumSize = new System.Drawing.Size(100, 23); + this.colorvertices.Name = "colorvertices"; + this.colorvertices.Size = new System.Drawing.Size(168, 23); + this.colorvertices.TabIndex = 1; + // + // doublesidedalpha + // + this.doublesidedalpha.LargeChange = 3; + this.doublesidedalpha.Location = new System.Drawing.Point(11, 352); + this.doublesidedalpha.Name = "doublesidedalpha"; + this.doublesidedalpha.Size = new System.Drawing.Size(130, 45); + this.doublesidedalpha.TabIndex = 2; + this.doublesidedalpha.TickStyle = System.Windows.Forms.TickStyle.Both; + this.doublesidedalpha.ValueChanged += new System.EventHandler(this.doublesidedalpha_ValueChanged); + // + // colorhighlight + // + this.colorhighlight.BackColor = System.Drawing.Color.Transparent; + this.colorhighlight.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.colorhighlight.Label = "Highlight:"; + this.colorhighlight.Location = new System.Drawing.Point(15, 162); + this.colorhighlight.MaximumSize = new System.Drawing.Size(10000, 23); + this.colorhighlight.MinimumSize = new System.Drawing.Size(100, 23); + this.colorhighlight.Name = "colorhighlight"; + this.colorhighlight.Size = new System.Drawing.Size(168, 23); + this.colorhighlight.TabIndex = 5; + // + // colorlinedefs + // + this.colorlinedefs.BackColor = System.Drawing.Color.Transparent; + this.colorlinedefs.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.colorlinedefs.Label = "Common lines:"; + this.colorlinedefs.Location = new System.Drawing.Point(15, 81); + this.colorlinedefs.MaximumSize = new System.Drawing.Size(10000, 23); + this.colorlinedefs.MinimumSize = new System.Drawing.Size(100, 23); + this.colorlinedefs.Name = "colorlinedefs"; + this.colorlinedefs.Size = new System.Drawing.Size(168, 23); + this.colorlinedefs.TabIndex = 2; + // + // cancel + // + this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancel.Location = new System.Drawing.Point(589, 558); + this.cancel.Name = "cancel"; + this.cancel.Size = new System.Drawing.Size(112, 25); + this.cancel.TabIndex = 2; + this.cancel.Text = "Cancel"; + this.cancel.UseVisualStyleBackColor = true; + this.cancel.Click += new System.EventHandler(this.cancel_Click); + // + // 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(471, 558); + this.apply.Name = "apply"; + this.apply.Size = new System.Drawing.Size(112, 25); + this.apply.TabIndex = 1; + this.apply.Text = "OK"; + this.apply.UseVisualStyleBackColor = true; + this.apply.Click += new System.EventHandler(this.apply_Click); + // + // tabs + // + this.tabs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.tabs.Controls.Add(this.tabinterface); + this.tabs.Controls.Add(this.tabkeys); + this.tabs.Controls.Add(this.tabcolors); + this.tabs.Controls.Add(this.tabpasting); + this.tabs.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tabs.ItemSize = new System.Drawing.Size(110, 19); + this.tabs.Location = new System.Drawing.Point(11, 13); + this.tabs.Name = "tabs"; + this.tabs.Padding = new System.Drawing.Point(20, 3); + this.tabs.SelectedIndex = 0; + this.tabs.Size = new System.Drawing.Size(690, 536); + this.tabs.TabIndex = 0; + this.tabs.SelectedIndexChanged += new System.EventHandler(this.tabs_SelectedIndexChanged); + // + // tabinterface + // + this.tabinterface.Controls.Add(this.groupBox5); + this.tabinterface.Controls.Add(this.groupBox4); + this.tabinterface.Controls.Add(this.groupBox2); + this.tabinterface.Controls.Add(groupBox1); + this.tabinterface.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tabinterface.Location = new System.Drawing.Point(4, 23); + this.tabinterface.Name = "tabinterface"; + this.tabinterface.Padding = new System.Windows.Forms.Padding(5); + this.tabinterface.Size = new System.Drawing.Size(682, 509); + this.tabinterface.TabIndex = 0; + this.tabinterface.Text = "Interface"; + this.tabinterface.UseVisualStyleBackColor = true; + // + // groupBox5 + // + this.groupBox5.Controls.Add(this.toolbar_gzdoom); + this.groupBox5.Controls.Add(this.toolbar_file); + this.groupBox5.Controls.Add(this.toolbar_testing); + this.groupBox5.Controls.Add(this.toolbar_geometry); + this.groupBox5.Controls.Add(this.toolbar_viewmodes); + this.groupBox5.Controls.Add(this.toolbar_filter); + this.groupBox5.Controls.Add(this.toolbar_prefabs); + this.groupBox5.Controls.Add(this.toolbar_copy); + this.groupBox5.Controls.Add(this.toolbar_undo); + this.groupBox5.Controls.Add(this.toolbar_script); + this.groupBox5.Location = new System.Drawing.Point(8, 327); + this.groupBox5.Name = "groupBox5"; + this.groupBox5.Size = new System.Drawing.Size(331, 173); + this.groupBox5.TabIndex = 4; + this.groupBox5.TabStop = false; + this.groupBox5.Text = " Toolbar Buttons "; + // + // toolbar_gzdoom + // + this.toolbar_gzdoom.AutoSize = true; + this.toolbar_gzdoom.Location = new System.Drawing.Point(188, 137); + this.toolbar_gzdoom.Name = "toolbar_gzdoom"; + this.toolbar_gzdoom.Size = new System.Drawing.Size(104, 18); + this.toolbar_gzdoom.TabIndex = 50; + this.toolbar_gzdoom.Text = "GZDoom toolbar"; + this.toolbar_gzdoom.UseVisualStyleBackColor = true; + // + // toolbar_file + // + this.toolbar_file.AutoSize = true; + this.toolbar_file.Location = new System.Drawing.Point(32, 33); + this.toolbar_file.Name = "toolbar_file"; + this.toolbar_file.Size = new System.Drawing.Size(118, 18); + this.toolbar_file.TabIndex = 49; + this.toolbar_file.Text = "New / Open / Save"; + this.toolbar_file.UseVisualStyleBackColor = true; + // + // toolbar_testing + // + this.toolbar_testing.AutoSize = true; + this.toolbar_testing.Location = new System.Drawing.Point(188, 111); + this.toolbar_testing.Name = "toolbar_testing"; + this.toolbar_testing.Size = new System.Drawing.Size(60, 18); + this.toolbar_testing.TabIndex = 48; + this.toolbar_testing.Text = "Testing"; + this.toolbar_testing.UseVisualStyleBackColor = true; + // + // toolbar_geometry + // + this.toolbar_geometry.AutoSize = true; + this.toolbar_geometry.Location = new System.Drawing.Point(188, 85); + this.toolbar_geometry.Name = "toolbar_geometry"; + this.toolbar_geometry.Size = new System.Drawing.Size(90, 18); + this.toolbar_geometry.TabIndex = 47; + this.toolbar_geometry.Text = "Snap / Merge"; + this.toolbar_geometry.UseVisualStyleBackColor = true; + // + // toolbar_viewmodes + // + this.toolbar_viewmodes.AutoSize = true; + this.toolbar_viewmodes.Location = new System.Drawing.Point(188, 59); + this.toolbar_viewmodes.Name = "toolbar_viewmodes"; + this.toolbar_viewmodes.Size = new System.Drawing.Size(87, 18); + this.toolbar_viewmodes.TabIndex = 46; + this.toolbar_viewmodes.Text = "View Modes"; + this.toolbar_viewmodes.UseVisualStyleBackColor = true; + // + // toolbar_filter + // + this.toolbar_filter.AutoSize = true; + this.toolbar_filter.Location = new System.Drawing.Point(188, 33); + this.toolbar_filter.Name = "toolbar_filter"; + this.toolbar_filter.Size = new System.Drawing.Size(84, 18); + this.toolbar_filter.TabIndex = 45; + this.toolbar_filter.Text = "Things Filter"; + this.toolbar_filter.UseVisualStyleBackColor = true; + // + // toolbar_prefabs + // + this.toolbar_prefabs.AutoSize = true; + this.toolbar_prefabs.Location = new System.Drawing.Point(32, 137); + this.toolbar_prefabs.Name = "toolbar_prefabs"; + this.toolbar_prefabs.Size = new System.Drawing.Size(64, 18); + this.toolbar_prefabs.TabIndex = 44; + this.toolbar_prefabs.Text = "Prefabs"; + this.toolbar_prefabs.UseVisualStyleBackColor = true; + // + // toolbar_copy + // + this.toolbar_copy.AutoSize = true; + this.toolbar_copy.Location = new System.Drawing.Point(32, 111); + this.toolbar_copy.Name = "toolbar_copy"; + this.toolbar_copy.Size = new System.Drawing.Size(112, 18); + this.toolbar_copy.TabIndex = 43; + this.toolbar_copy.Text = "Cut / Copy / Paste"; + this.toolbar_copy.UseVisualStyleBackColor = true; + // + // toolbar_undo + // + this.toolbar_undo.AutoSize = true; + this.toolbar_undo.Location = new System.Drawing.Point(32, 85); + this.toolbar_undo.Name = "toolbar_undo"; + this.toolbar_undo.Size = new System.Drawing.Size(85, 18); + this.toolbar_undo.TabIndex = 42; + this.toolbar_undo.Text = "Undo / Redo"; + this.toolbar_undo.UseVisualStyleBackColor = true; + // + // toolbar_script + // + this.toolbar_script.AutoSize = true; + this.toolbar_script.Location = new System.Drawing.Point(32, 59); + this.toolbar_script.Name = "toolbar_script"; + this.toolbar_script.Size = new System.Drawing.Size(84, 18); + this.toolbar_script.TabIndex = 41; + this.toolbar_script.Text = "Script Editor"; + this.toolbar_script.UseVisualStyleBackColor = true; + // + // groupBox4 + // + 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(345, 327); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.Size = new System.Drawing.Size(329, 173); + this.groupBox4.TabIndex = 3; + this.groupBox4.TabStop = false; + this.groupBox4.Text = " Side Panels "; + // + // collapsedockers + // + this.collapsedockers.AutoSize = true; + this.collapsedockers.Location = new System.Drawing.Point(204, 36); + this.collapsedockers.Name = "collapsedockers"; + this.collapsedockers.Size = new System.Drawing.Size(72, 18); + this.collapsedockers.TabIndex = 2; + this.collapsedockers.Text = "Auto hide"; + this.collapsedockers.UseVisualStyleBackColor = true; + // + // dockersposition + // + this.dockersposition.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.dockersposition.FormattingEnabled = true; + this.dockersposition.Items.AddRange(new object[] { "Left", "Right", "None"}); - this.dockersposition.Location = new System.Drawing.Point(95, 34); - this.dockersposition.Name = "dockersposition"; - this.dockersposition.Size = new System.Drawing.Size(85, 22); - this.dockersposition.TabIndex = 1; - // - // label17 - // - this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(33, 37); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(47, 14); - this.label17.TabIndex = 0; - this.label17.Text = "Position:"; - // - // groupBox2 - // - this.groupBox2.Controls.Add(this.viewdistance); - this.groupBox2.Controls.Add(this.movespeed); - this.groupBox2.Controls.Add(this.mousespeed); - this.groupBox2.Controls.Add(this.fieldofview); - this.groupBox2.Controls.Add(this.viewdistancelabel); - this.groupBox2.Controls.Add(this.label13); - this.groupBox2.Controls.Add(this.invertyaxis); - this.groupBox2.Controls.Add(this.movespeedlabel); - this.groupBox2.Controls.Add(this.label11); - this.groupBox2.Controls.Add(this.mousespeedlabel); - this.groupBox2.Controls.Add(this.label9); - this.groupBox2.Controls.Add(this.fieldofviewlabel); - this.groupBox2.Controls.Add(this.label4); - this.groupBox2.Location = new System.Drawing.Point(345, 8); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(329, 313); - this.groupBox2.TabIndex = 2; - this.groupBox2.TabStop = false; - this.groupBox2.Text = " Visual Modes "; - // - // viewdistance - // - this.viewdistance.LargeChange = 2; - this.viewdistance.Location = new System.Drawing.Point(108, 187); - this.viewdistance.Maximum = 15; - this.viewdistance.Minimum = 1; - this.viewdistance.Name = "viewdistance"; - this.viewdistance.Size = new System.Drawing.Size(150, 45); - this.viewdistance.TabIndex = 3; - this.viewdistance.TickStyle = System.Windows.Forms.TickStyle.Both; - this.viewdistance.Value = 1; - this.viewdistance.ValueChanged += new System.EventHandler(this.viewdistance_ValueChanged); - // - // movespeed - // - this.movespeed.Location = new System.Drawing.Point(108, 135); - this.movespeed.Maximum = 20; - this.movespeed.Minimum = 1; - this.movespeed.Name = "movespeed"; - this.movespeed.Size = new System.Drawing.Size(150, 45); - this.movespeed.TabIndex = 2; - this.movespeed.TickStyle = System.Windows.Forms.TickStyle.Both; - this.movespeed.Value = 1; - this.movespeed.ValueChanged += new System.EventHandler(this.movespeed_ValueChanged); - // - // mousespeed - // - this.mousespeed.Location = new System.Drawing.Point(108, 81); - this.mousespeed.Maximum = 20; - this.mousespeed.Minimum = 1; - this.mousespeed.Name = "mousespeed"; - this.mousespeed.Size = new System.Drawing.Size(150, 45); - this.mousespeed.TabIndex = 1; - this.mousespeed.TickStyle = System.Windows.Forms.TickStyle.Both; - this.mousespeed.Value = 1; - this.mousespeed.ValueChanged += new System.EventHandler(this.mousespeed_ValueChanged); - // - // fieldofview - // - this.fieldofview.LargeChange = 1; - this.fieldofview.Location = new System.Drawing.Point(108, 29); - this.fieldofview.Maximum = 17; - this.fieldofview.Minimum = 5; - this.fieldofview.Name = "fieldofview"; - this.fieldofview.Size = new System.Drawing.Size(150, 45); - this.fieldofview.TabIndex = 0; - this.fieldofview.TickStyle = System.Windows.Forms.TickStyle.Both; - this.fieldofview.Value = 5; - this.fieldofview.ValueChanged += new System.EventHandler(this.fieldofview_ValueChanged); - // - // viewdistancelabel - // - this.viewdistancelabel.AutoSize = true; - this.viewdistancelabel.Location = new System.Drawing.Point(264, 199); - this.viewdistancelabel.Name = "viewdistancelabel"; - this.viewdistancelabel.Size = new System.Drawing.Size(42, 14); - this.viewdistancelabel.TabIndex = 30; - this.viewdistancelabel.Text = "200 mp"; - // - // label13 - // - this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(22, 199); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(80, 14); - this.label13.TabIndex = 28; - this.label13.Text = "View distance:"; - // - // invertyaxis - // - this.invertyaxis.AutoSize = true; - this.invertyaxis.Location = new System.Drawing.Point(36, 248); - this.invertyaxis.Name = "invertyaxis"; - this.invertyaxis.Size = new System.Drawing.Size(122, 18); - this.invertyaxis.TabIndex = 4; - this.invertyaxis.Text = "Invert mouse Y axis"; - this.invertyaxis.UseVisualStyleBackColor = true; - // - // movespeedlabel - // - this.movespeedlabel.AutoSize = true; - this.movespeedlabel.Location = new System.Drawing.Point(264, 147); - this.movespeedlabel.Name = "movespeedlabel"; - this.movespeedlabel.Size = new System.Drawing.Size(25, 14); - this.movespeedlabel.TabIndex = 25; - this.movespeedlabel.Text = "100"; - // - // label11 - // - this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(33, 147); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(69, 14); - this.label11.TabIndex = 23; - this.label11.Text = "Move speed:"; - // - // mousespeedlabel - // - this.mousespeedlabel.AutoSize = true; - this.mousespeedlabel.Location = new System.Drawing.Point(264, 93); - this.mousespeedlabel.Name = "mousespeedlabel"; - this.mousespeedlabel.Size = new System.Drawing.Size(25, 14); - this.mousespeedlabel.TabIndex = 22; - this.mousespeedlabel.Text = "100"; - // - // label9 - // - this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(27, 93); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(75, 14); - this.label9.TabIndex = 20; - this.label9.Text = "Mouse speed:"; - // - // fieldofviewlabel - // - this.fieldofviewlabel.AutoSize = true; - this.fieldofviewlabel.Location = new System.Drawing.Point(264, 41); - this.fieldofviewlabel.Name = "fieldofviewlabel"; - this.fieldofviewlabel.Size = new System.Drawing.Size(23, 14); - this.fieldofviewlabel.TabIndex = 19; - this.fieldofviewlabel.Text = "50°"; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(30, 41); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(72, 14); - this.label4.TabIndex = 17; - this.label4.Text = "Field of view:"; - // - // tabkeys - // - this.tabkeys.Controls.Add(this.listactions); - this.tabkeys.Controls.Add(this.actioncontrolpanel); - this.tabkeys.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tabkeys.Location = new System.Drawing.Point(4, 23); - this.tabkeys.Name = "tabkeys"; - this.tabkeys.Padding = new System.Windows.Forms.Padding(3); - this.tabkeys.Size = new System.Drawing.Size(682, 509); - this.tabkeys.TabIndex = 1; - this.tabkeys.Text = "Controls"; - this.tabkeys.UseVisualStyleBackColor = true; - // - // listactions - // - this.listactions.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.listactions.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.dockersposition.Location = new System.Drawing.Point(95, 34); + this.dockersposition.Name = "dockersposition"; + this.dockersposition.Size = new System.Drawing.Size(85, 22); + this.dockersposition.TabIndex = 1; + // + // label17 + // + this.label17.AutoSize = true; + this.label17.Location = new System.Drawing.Point(33, 37); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(47, 14); + this.label17.TabIndex = 0; + this.label17.Text = "Position:"; + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.viewdistance); + this.groupBox2.Controls.Add(this.movespeed); + this.groupBox2.Controls.Add(this.mousespeed); + this.groupBox2.Controls.Add(this.fieldofview); + this.groupBox2.Controls.Add(this.viewdistancelabel); + this.groupBox2.Controls.Add(this.label13); + this.groupBox2.Controls.Add(this.invertyaxis); + this.groupBox2.Controls.Add(this.movespeedlabel); + this.groupBox2.Controls.Add(this.label11); + this.groupBox2.Controls.Add(this.mousespeedlabel); + this.groupBox2.Controls.Add(this.label9); + this.groupBox2.Controls.Add(this.fieldofviewlabel); + this.groupBox2.Controls.Add(this.label4); + this.groupBox2.Location = new System.Drawing.Point(345, 8); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(329, 313); + this.groupBox2.TabIndex = 2; + this.groupBox2.TabStop = false; + this.groupBox2.Text = " Visual Modes "; + // + // viewdistance + // + this.viewdistance.LargeChange = 2; + this.viewdistance.Location = new System.Drawing.Point(108, 187); + this.viewdistance.Maximum = 15; + this.viewdistance.Minimum = 1; + this.viewdistance.Name = "viewdistance"; + this.viewdistance.Size = new System.Drawing.Size(150, 45); + this.viewdistance.TabIndex = 3; + this.viewdistance.TickStyle = System.Windows.Forms.TickStyle.Both; + this.viewdistance.Value = 1; + this.viewdistance.ValueChanged += new System.EventHandler(this.viewdistance_ValueChanged); + // + // movespeed + // + this.movespeed.Location = new System.Drawing.Point(108, 135); + this.movespeed.Maximum = 20; + this.movespeed.Minimum = 1; + this.movespeed.Name = "movespeed"; + this.movespeed.Size = new System.Drawing.Size(150, 45); + this.movespeed.TabIndex = 2; + this.movespeed.TickStyle = System.Windows.Forms.TickStyle.Both; + this.movespeed.Value = 1; + this.movespeed.ValueChanged += new System.EventHandler(this.movespeed_ValueChanged); + // + // mousespeed + // + this.mousespeed.Location = new System.Drawing.Point(108, 81); + this.mousespeed.Maximum = 20; + this.mousespeed.Minimum = 1; + this.mousespeed.Name = "mousespeed"; + this.mousespeed.Size = new System.Drawing.Size(150, 45); + this.mousespeed.TabIndex = 1; + this.mousespeed.TickStyle = System.Windows.Forms.TickStyle.Both; + this.mousespeed.Value = 1; + this.mousespeed.ValueChanged += new System.EventHandler(this.mousespeed_ValueChanged); + // + // fieldofview + // + this.fieldofview.LargeChange = 1; + this.fieldofview.Location = new System.Drawing.Point(108, 29); + this.fieldofview.Maximum = 17; + this.fieldofview.Minimum = 5; + this.fieldofview.Name = "fieldofview"; + this.fieldofview.Size = new System.Drawing.Size(150, 45); + this.fieldofview.TabIndex = 0; + this.fieldofview.TickStyle = System.Windows.Forms.TickStyle.Both; + this.fieldofview.Value = 5; + this.fieldofview.ValueChanged += new System.EventHandler(this.fieldofview_ValueChanged); + // + // viewdistancelabel + // + this.viewdistancelabel.AutoSize = true; + this.viewdistancelabel.Location = new System.Drawing.Point(264, 199); + this.viewdistancelabel.Name = "viewdistancelabel"; + this.viewdistancelabel.Size = new System.Drawing.Size(42, 14); + this.viewdistancelabel.TabIndex = 30; + this.viewdistancelabel.Text = "200 mp"; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.Location = new System.Drawing.Point(22, 199); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(80, 14); + this.label13.TabIndex = 28; + this.label13.Text = "View distance:"; + // + // invertyaxis + // + this.invertyaxis.AutoSize = true; + this.invertyaxis.Location = new System.Drawing.Point(36, 248); + this.invertyaxis.Name = "invertyaxis"; + this.invertyaxis.Size = new System.Drawing.Size(122, 18); + this.invertyaxis.TabIndex = 4; + this.invertyaxis.Text = "Invert mouse Y axis"; + this.invertyaxis.UseVisualStyleBackColor = true; + // + // movespeedlabel + // + this.movespeedlabel.AutoSize = true; + this.movespeedlabel.Location = new System.Drawing.Point(264, 147); + this.movespeedlabel.Name = "movespeedlabel"; + this.movespeedlabel.Size = new System.Drawing.Size(25, 14); + this.movespeedlabel.TabIndex = 25; + this.movespeedlabel.Text = "100"; + // + // label11 + // + this.label11.AutoSize = true; + this.label11.Location = new System.Drawing.Point(33, 147); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(69, 14); + this.label11.TabIndex = 23; + this.label11.Text = "Move speed:"; + // + // mousespeedlabel + // + this.mousespeedlabel.AutoSize = true; + this.mousespeedlabel.Location = new System.Drawing.Point(264, 93); + this.mousespeedlabel.Name = "mousespeedlabel"; + this.mousespeedlabel.Size = new System.Drawing.Size(25, 14); + this.mousespeedlabel.TabIndex = 22; + this.mousespeedlabel.Text = "100"; + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(27, 93); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(75, 14); + this.label9.TabIndex = 20; + this.label9.Text = "Mouse speed:"; + // + // fieldofviewlabel + // + this.fieldofviewlabel.AutoSize = true; + this.fieldofviewlabel.Location = new System.Drawing.Point(264, 41); + this.fieldofviewlabel.Name = "fieldofviewlabel"; + this.fieldofviewlabel.Size = new System.Drawing.Size(23, 14); + this.fieldofviewlabel.TabIndex = 19; + this.fieldofviewlabel.Text = "50°"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(30, 41); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(72, 14); + this.label4.TabIndex = 17; + this.label4.Text = "Field of view:"; + // + // tabkeys + // + this.tabkeys.Controls.Add(this.listactions); + this.tabkeys.Controls.Add(this.actioncontrolpanel); + this.tabkeys.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tabkeys.Location = new System.Drawing.Point(4, 23); + this.tabkeys.Name = "tabkeys"; + this.tabkeys.Padding = new System.Windows.Forms.Padding(3); + this.tabkeys.Size = new System.Drawing.Size(682, 509); + this.tabkeys.TabIndex = 1; + this.tabkeys.Text = "Controls"; + this.tabkeys.UseVisualStyleBackColor = true; + // + // listactions + // + this.listactions.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.listactions.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.columncontrolaction, this.columncontrolkey}); - this.listactions.FullRowSelect = true; - this.listactions.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; - this.listactions.HideSelection = false; - this.listactions.Location = new System.Drawing.Point(11, 12); - this.listactions.Margin = new System.Windows.Forms.Padding(8, 9, 8, 9); - this.listactions.MultiSelect = false; - this.listactions.Name = "listactions"; - this.listactions.Size = new System.Drawing.Size(352, 462); - this.listactions.Sorting = System.Windows.Forms.SortOrder.Ascending; - this.listactions.TabIndex = 0; - this.listactions.TabStop = false; - this.listactions.UseCompatibleStateImageBehavior = false; - this.listactions.View = System.Windows.Forms.View.Details; - this.listactions.MouseUp += new System.Windows.Forms.MouseEventHandler(this.listactions_MouseUp); - this.listactions.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.listactions_ItemSelectionChanged); - this.listactions.KeyUp += new System.Windows.Forms.KeyEventHandler(this.listactions_KeyUp); - // - // columncontrolaction - // - this.columncontrolaction.Text = "Action"; - this.columncontrolaction.Width = 179; - // - // columncontrolkey - // - this.columncontrolkey.Text = "Key"; - this.columncontrolkey.Width = 130; - // - // actioncontrolpanel - // - this.actioncontrolpanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Right))); - this.actioncontrolpanel.Controls.Add(this.keyusedlist); - this.actioncontrolpanel.Controls.Add(this.keyusedlabel); - this.actioncontrolpanel.Controls.Add(this.disregardshiftlabel); - this.actioncontrolpanel.Controls.Add(this.actioncontrol); - this.actioncontrolpanel.Controls.Add(label7); - this.actioncontrolpanel.Controls.Add(this.actiontitle); - this.actioncontrolpanel.Controls.Add(this.actioncontrolclear); - this.actioncontrolpanel.Controls.Add(label6); - this.actioncontrolpanel.Controls.Add(this.actionkey); - this.actioncontrolpanel.Controls.Add(this.actiondescription); - this.actioncontrolpanel.Controls.Add(label5); - this.actioncontrolpanel.Enabled = false; - this.actioncontrolpanel.Location = new System.Drawing.Point(377, 12); - this.actioncontrolpanel.Margin = new System.Windows.Forms.Padding(6); - this.actioncontrolpanel.Name = "actioncontrolpanel"; - this.actioncontrolpanel.Size = new System.Drawing.Size(282, 462); - this.actioncontrolpanel.TabIndex = 9; - this.actioncontrolpanel.TabStop = false; - this.actioncontrolpanel.Text = " Action control "; - // - // keyusedlist - // - this.keyusedlist.BackColor = System.Drawing.SystemColors.Control; - this.keyusedlist.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.keyusedlist.FormattingEnabled = true; - this.keyusedlist.IntegralHeight = false; - this.keyusedlist.ItemHeight = 14; - this.keyusedlist.Location = new System.Drawing.Point(33, 307); - this.keyusedlist.Name = "keyusedlist"; - this.keyusedlist.SelectionMode = System.Windows.Forms.SelectionMode.None; - this.keyusedlist.Size = new System.Drawing.Size(232, 115); - this.keyusedlist.Sorted = true; - this.keyusedlist.TabIndex = 11; - this.keyusedlist.Visible = false; - // - // disregardshiftlabel - // - this.disregardshiftlabel.Location = new System.Drawing.Point(20, 224); - this.disregardshiftlabel.Name = "disregardshiftlabel"; - this.disregardshiftlabel.Size = new System.Drawing.Size(245, 47); - this.disregardshiftlabel.TabIndex = 9; - this.disregardshiftlabel.Tag = "The selected actions uses %s to modify its behavior. These modifiers can not be u" + - "sed in a key combination for this action."; - this.disregardshiftlabel.Text = "The selected actions uses Shift, Alt and Control to modify its behavior. These mo" + - "difiers can not be used in a key combination for this action."; - this.disregardshiftlabel.Visible = false; - // - // actioncontrol - // - this.actioncontrol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.actioncontrol.FormattingEnabled = true; - this.actioncontrol.ImeMode = System.Windows.Forms.ImeMode.Off; - this.actioncontrol.Location = new System.Drawing.Point(23, 190); - this.actioncontrol.Name = "actioncontrol"; - this.actioncontrol.Size = new System.Drawing.Size(197, 22); - this.actioncontrol.TabIndex = 8; - this.actioncontrol.TabStop = false; - this.actioncontrol.SelectedIndexChanged += new System.EventHandler(this.actioncontrol_SelectedIndexChanged); - // - // actiontitle - // - this.actiontitle.AutoSize = true; - this.actiontitle.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.actiontitle.Location = new System.Drawing.Point(67, 30); - this.actiontitle.Name = "actiontitle"; - this.actiontitle.Size = new System.Drawing.Size(172, 14); - this.actiontitle.TabIndex = 1; - this.actiontitle.Text = "(select an action from the list)"; - this.actiontitle.UseMnemonic = false; - // - // actioncontrolclear - // - this.actioncontrolclear.Location = new System.Drawing.Point(193, 138); - this.actioncontrolclear.Name = "actioncontrolclear"; - this.actioncontrolclear.Size = new System.Drawing.Size(63, 25); - this.actioncontrolclear.TabIndex = 6; - this.actioncontrolclear.TabStop = false; - this.actioncontrolclear.Text = "Clear"; - this.actioncontrolclear.UseVisualStyleBackColor = true; - this.actioncontrolclear.Click += new System.EventHandler(this.actioncontrolclear_Click); - // - // actionkey - // - this.actionkey.ImeMode = System.Windows.Forms.ImeMode.Off; - this.actionkey.Location = new System.Drawing.Point(23, 140); - this.actionkey.Name = "actionkey"; - this.actionkey.Size = new System.Drawing.Size(163, 20); - this.actionkey.TabIndex = 5; - this.actionkey.TabStop = false; - this.actionkey.KeyDown += new System.Windows.Forms.KeyEventHandler(this.actionkey_KeyDown); - // - // actiondescription - // - this.actiondescription.AutoEllipsis = true; - this.actiondescription.Location = new System.Drawing.Point(20, 50); - this.actiondescription.Name = "actiondescription"; - this.actiondescription.Size = new System.Drawing.Size(245, 71); - this.actiondescription.TabIndex = 3; - this.actiondescription.UseMnemonic = false; - // - // tabcolors - // - this.tabcolors.Controls.Add(this.appearancegroup1); - this.tabcolors.Controls.Add(this.colorsgroup3); - this.tabcolors.Controls.Add(this.colorsgroup1); - this.tabcolors.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tabcolors.Location = new System.Drawing.Point(4, 23); - this.tabcolors.Name = "tabcolors"; - this.tabcolors.Padding = new System.Windows.Forms.Padding(5); - this.tabcolors.Size = new System.Drawing.Size(682, 509); - this.tabcolors.TabIndex = 2; - this.tabcolors.Text = "Appearance"; - this.tabcolors.UseVisualStyleBackColor = true; - // - // appearancegroup1 - // - this.appearancegroup1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.appearancegroup1.Controls.Add(label21); - this.appearancegroup1.Controls.Add(this.labelDynLightIntensity); - this.appearancegroup1.Controls.Add(this.tbDynLightIntensity); - this.appearancegroup1.Controls.Add(label20); - this.appearancegroup1.Controls.Add(this.labelDynLightSize); - this.appearancegroup1.Controls.Add(this.tbDynLightSize); - this.appearancegroup1.Controls.Add(label18); - this.appearancegroup1.Controls.Add(this.labelDynLightCount); - this.appearancegroup1.Controls.Add(this.tbDynLightCount); - this.appearancegroup1.Controls.Add(this.animatevisualselection); - this.appearancegroup1.Controls.Add(this.blackbrowsers); - this.appearancegroup1.Controls.Add(this.visualbilinear); - this.appearancegroup1.Controls.Add(label1); - this.appearancegroup1.Controls.Add(this.classicbilinear); - this.appearancegroup1.Controls.Add(this.imagebrightnesslabel); - this.appearancegroup1.Controls.Add(this.imagebrightness); - this.appearancegroup1.Location = new System.Drawing.Point(217, 236); - this.appearancegroup1.Name = "appearancegroup1"; - this.appearancegroup1.Size = new System.Drawing.Size(457, 265); - this.appearancegroup1.TabIndex = 24; - this.appearancegroup1.TabStop = false; - this.appearancegroup1.Text = " Additional Options "; - // - // labelDynLightIntensity - // - this.labelDynLightIntensity.AutoSize = true; - this.labelDynLightIntensity.Location = new System.Drawing.Point(337, 174); - this.labelDynLightIntensity.Name = "labelDynLightIntensity"; - this.labelDynLightIntensity.Size = new System.Drawing.Size(22, 14); - this.labelDynLightIntensity.TabIndex = 32; - this.labelDynLightIntensity.Text = "1.0"; - // - // tbDynLightIntensity - // - this.tbDynLightIntensity.LargeChange = 1; - this.tbDynLightIntensity.Location = new System.Drawing.Point(176, 161); - this.tbDynLightIntensity.Minimum = 1; - this.tbDynLightIntensity.Name = "tbDynLightIntensity"; - this.tbDynLightIntensity.Size = new System.Drawing.Size(154, 45); - this.tbDynLightIntensity.TabIndex = 30; - this.tbDynLightIntensity.TickStyle = System.Windows.Forms.TickStyle.Both; - this.tbDynLightIntensity.Value = 10; - this.tbDynLightIntensity.ValueChanged += new System.EventHandler(this.tbDynLightIntensity_ValueChanged); - // - // labelDynLightSize - // - this.labelDynLightSize.AutoSize = true; - this.labelDynLightSize.Location = new System.Drawing.Point(337, 126); - this.labelDynLightSize.Name = "labelDynLightSize"; - this.labelDynLightSize.Size = new System.Drawing.Size(22, 14); - this.labelDynLightSize.TabIndex = 29; - this.labelDynLightSize.Text = "1.0"; - // - // tbDynLightSize - // - this.tbDynLightSize.LargeChange = 1; - this.tbDynLightSize.Location = new System.Drawing.Point(176, 113); - this.tbDynLightSize.Maximum = 20; - this.tbDynLightSize.Minimum = 1; - this.tbDynLightSize.Name = "tbDynLightSize"; - this.tbDynLightSize.Size = new System.Drawing.Size(154, 45); - this.tbDynLightSize.TabIndex = 27; - this.tbDynLightSize.TickStyle = System.Windows.Forms.TickStyle.Both; - this.tbDynLightSize.Value = 10; - this.tbDynLightSize.ValueChanged += new System.EventHandler(this.tbDynLightSize_ValueChanged); - // - // labelDynLightCount - // - this.labelDynLightCount.AutoSize = true; - this.labelDynLightCount.Location = new System.Drawing.Point(337, 78); - this.labelDynLightCount.Name = "labelDynLightCount"; - this.labelDynLightCount.Size = new System.Drawing.Size(19, 14); - this.labelDynLightCount.TabIndex = 26; - this.labelDynLightCount.Text = "16"; - // - // tbDynLightCount - // - this.tbDynLightCount.LargeChange = 3; - this.tbDynLightCount.Location = new System.Drawing.Point(176, 65); - this.tbDynLightCount.Maximum = 32; - this.tbDynLightCount.Minimum = 1; - this.tbDynLightCount.Name = "tbDynLightCount"; - this.tbDynLightCount.Size = new System.Drawing.Size(154, 45); - this.tbDynLightCount.TabIndex = 24; - this.tbDynLightCount.TickFrequency = 4; - this.tbDynLightCount.TickStyle = System.Windows.Forms.TickStyle.Both; - this.tbDynLightCount.Value = 1; - this.tbDynLightCount.ValueChanged += new System.EventHandler(this.tbDynLightCount_ValueChanged); - // - // animatevisualselection - // - this.animatevisualselection.AutoSize = true; - this.animatevisualselection.Location = new System.Drawing.Point(244, 236); - this.animatevisualselection.Name = "animatevisualselection"; - this.animatevisualselection.Size = new System.Drawing.Size(188, 18); - this.animatevisualselection.TabIndex = 23; - this.animatevisualselection.Text = "Animate selection in visual modes"; - this.animatevisualselection.UseVisualStyleBackColor = true; - // - // blackbrowsers - // - this.blackbrowsers.AutoSize = true; - this.blackbrowsers.Location = new System.Drawing.Point(244, 212); - this.blackbrowsers.Name = "blackbrowsers"; - this.blackbrowsers.Size = new System.Drawing.Size(199, 18); - this.blackbrowsers.TabIndex = 4; - this.blackbrowsers.Text = "Black background in image browser"; - this.blackbrowsers.UseVisualStyleBackColor = true; - // - // visualbilinear - // - this.visualbilinear.AutoSize = true; - this.visualbilinear.Location = new System.Drawing.Point(25, 236); - this.visualbilinear.Name = "visualbilinear"; - this.visualbilinear.Size = new System.Drawing.Size(176, 18); - this.visualbilinear.TabIndex = 6; - this.visualbilinear.Text = "Bilinear filtering in visual modes"; - this.visualbilinear.UseVisualStyleBackColor = true; - // - // classicbilinear - // - this.classicbilinear.AutoSize = true; - this.classicbilinear.Location = new System.Drawing.Point(25, 212); - this.classicbilinear.Name = "classicbilinear"; - this.classicbilinear.Size = new System.Drawing.Size(182, 18); - this.classicbilinear.TabIndex = 5; - this.classicbilinear.Text = "Bilinear filtering in classic modes"; - this.classicbilinear.UseVisualStyleBackColor = true; - // - // imagebrightnesslabel - // - this.imagebrightnesslabel.AutoSize = true; - this.imagebrightnesslabel.Location = new System.Drawing.Point(337, 30); - this.imagebrightnesslabel.Name = "imagebrightnesslabel"; - this.imagebrightnesslabel.Size = new System.Drawing.Size(31, 14); - this.imagebrightnesslabel.TabIndex = 22; - this.imagebrightnesslabel.Text = "+ 0 y"; - // - // imagebrightness - // - this.imagebrightness.LargeChange = 3; - this.imagebrightness.Location = new System.Drawing.Point(176, 17); - this.imagebrightness.Name = "imagebrightness"; - this.imagebrightness.Size = new System.Drawing.Size(154, 45); - this.imagebrightness.TabIndex = 3; - this.imagebrightness.TickStyle = System.Windows.Forms.TickStyle.Both; - this.imagebrightness.ValueChanged += new System.EventHandler(this.imagebrightness_ValueChanged); - // - // colorsgroup3 - // - this.colorsgroup3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.colorsgroup3.Controls.Add(this.scripttabwidth); - this.colorsgroup3.Controls.Add(this.scriptautoindent); - this.colorsgroup3.Controls.Add(this.label10); - this.colorsgroup3.Controls.Add(this.panel1); - this.colorsgroup3.Controls.Add(this.scriptfontsize); - this.colorsgroup3.Controls.Add(this.label8); - this.colorsgroup3.Controls.Add(this.scriptfontbold); - this.colorsgroup3.Controls.Add(this.scriptfontname); - this.colorsgroup3.Controls.Add(this.label3); - this.colorsgroup3.Controls.Add(this.colorconstants); - this.colorsgroup3.Controls.Add(this.colorliterals); - this.colorsgroup3.Controls.Add(this.colorscriptbackground); - this.colorsgroup3.Controls.Add(this.colorkeywords); - this.colorsgroup3.Controls.Add(this.colorlinenumbers); - this.colorsgroup3.Controls.Add(this.colorcomments); - this.colorsgroup3.Controls.Add(this.colorplaintext); - this.colorsgroup3.Location = new System.Drawing.Point(217, 8); - this.colorsgroup3.Name = "colorsgroup3"; - this.colorsgroup3.Size = new System.Drawing.Size(457, 222); - this.colorsgroup3.TabIndex = 1; - this.colorsgroup3.TabStop = false; - this.colorsgroup3.Text = " Script editor "; - this.colorsgroup3.Visible = false; - // - // scripttabwidth - // - this.scripttabwidth.AllowDecimal = false; - this.scripttabwidth.AllowNegative = false; - this.scripttabwidth.AllowRelative = false; - this.scripttabwidth.ButtonStep = 2; - this.scripttabwidth.Location = new System.Drawing.Point(259, 165); - this.scripttabwidth.Name = "scripttabwidth"; - this.scripttabwidth.Size = new System.Drawing.Size(71, 24); - this.scripttabwidth.StepValues = null; - this.scripttabwidth.TabIndex = 32; - // - // scriptautoindent - // - this.scriptautoindent.AutoSize = true; - this.scriptautoindent.Location = new System.Drawing.Point(354, 169); - this.scriptautoindent.Name = "scriptautoindent"; - this.scriptautoindent.Size = new System.Drawing.Size(81, 18); - this.scriptautoindent.TabIndex = 31; - this.scriptautoindent.Text = "Auto indent"; - this.scriptautoindent.UseVisualStyleBackColor = true; - // - // label10 - // - this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(199, 170); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(57, 14); - this.label10.TabIndex = 30; - this.label10.Text = "Tab width:"; - // - // panel1 - // - this.panel1.BackColor = System.Drawing.SystemColors.Window; - this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.panel1.Controls.Add(this.scriptfontlabel); - this.panel1.Location = new System.Drawing.Point(236, 109); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(199, 38); - this.panel1.TabIndex = 29; - // - // scriptfontlabel - // - this.scriptfontlabel.BackColor = System.Drawing.SystemColors.Window; - this.scriptfontlabel.Dock = System.Windows.Forms.DockStyle.Fill; - this.scriptfontlabel.Location = new System.Drawing.Point(0, 0); - this.scriptfontlabel.Name = "scriptfontlabel"; - this.scriptfontlabel.Size = new System.Drawing.Size(195, 34); - this.scriptfontlabel.TabIndex = 0; - this.scriptfontlabel.Text = "Font"; - this.scriptfontlabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // scriptfontsize - // - this.scriptfontsize.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.scriptfontsize.FormattingEnabled = true; - this.scriptfontsize.Items.AddRange(new object[] { + this.listactions.FullRowSelect = true; + this.listactions.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; + this.listactions.HideSelection = false; + this.listactions.Location = new System.Drawing.Point(11, 12); + this.listactions.Margin = new System.Windows.Forms.Padding(8, 9, 8, 9); + this.listactions.MultiSelect = false; + this.listactions.Name = "listactions"; + this.listactions.Size = new System.Drawing.Size(352, 462); + this.listactions.Sorting = System.Windows.Forms.SortOrder.Ascending; + this.listactions.TabIndex = 0; + this.listactions.TabStop = false; + this.listactions.UseCompatibleStateImageBehavior = false; + this.listactions.View = System.Windows.Forms.View.Details; + this.listactions.MouseUp += new System.Windows.Forms.MouseEventHandler(this.listactions_MouseUp); + this.listactions.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.listactions_ItemSelectionChanged); + this.listactions.KeyUp += new System.Windows.Forms.KeyEventHandler(this.listactions_KeyUp); + // + // columncontrolaction + // + this.columncontrolaction.Text = "Action"; + this.columncontrolaction.Width = 179; + // + // columncontrolkey + // + this.columncontrolkey.Text = "Key"; + this.columncontrolkey.Width = 130; + // + // actioncontrolpanel + // + this.actioncontrolpanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); + this.actioncontrolpanel.Controls.Add(this.keyusedlist); + this.actioncontrolpanel.Controls.Add(this.keyusedlabel); + this.actioncontrolpanel.Controls.Add(this.disregardshiftlabel); + this.actioncontrolpanel.Controls.Add(this.actioncontrol); + this.actioncontrolpanel.Controls.Add(label7); + this.actioncontrolpanel.Controls.Add(this.actiontitle); + this.actioncontrolpanel.Controls.Add(this.actioncontrolclear); + this.actioncontrolpanel.Controls.Add(label6); + this.actioncontrolpanel.Controls.Add(this.actionkey); + this.actioncontrolpanel.Controls.Add(this.actiondescription); + this.actioncontrolpanel.Controls.Add(label5); + this.actioncontrolpanel.Enabled = false; + this.actioncontrolpanel.Location = new System.Drawing.Point(377, 12); + this.actioncontrolpanel.Margin = new System.Windows.Forms.Padding(6); + this.actioncontrolpanel.Name = "actioncontrolpanel"; + this.actioncontrolpanel.Size = new System.Drawing.Size(282, 462); + this.actioncontrolpanel.TabIndex = 9; + this.actioncontrolpanel.TabStop = false; + this.actioncontrolpanel.Text = " Action control "; + // + // keyusedlist + // + this.keyusedlist.BackColor = System.Drawing.SystemColors.Control; + this.keyusedlist.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.keyusedlist.FormattingEnabled = true; + this.keyusedlist.IntegralHeight = false; + this.keyusedlist.ItemHeight = 14; + this.keyusedlist.Location = new System.Drawing.Point(33, 307); + this.keyusedlist.Name = "keyusedlist"; + this.keyusedlist.SelectionMode = System.Windows.Forms.SelectionMode.None; + this.keyusedlist.Size = new System.Drawing.Size(232, 115); + this.keyusedlist.Sorted = true; + this.keyusedlist.TabIndex = 11; + this.keyusedlist.Visible = false; + // + // disregardshiftlabel + // + this.disregardshiftlabel.Location = new System.Drawing.Point(20, 224); + this.disregardshiftlabel.Name = "disregardshiftlabel"; + this.disregardshiftlabel.Size = new System.Drawing.Size(245, 47); + this.disregardshiftlabel.TabIndex = 9; + this.disregardshiftlabel.Tag = "The selected actions uses %s to modify its behavior. These modifiers can not be u" + + "sed in a key combination for this action."; + this.disregardshiftlabel.Text = "The selected actions uses Shift, Alt and Control to modify its behavior. These mo" + + "difiers can not be used in a key combination for this action."; + this.disregardshiftlabel.Visible = false; + // + // actioncontrol + // + this.actioncontrol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.actioncontrol.FormattingEnabled = true; + this.actioncontrol.ImeMode = System.Windows.Forms.ImeMode.Off; + this.actioncontrol.Location = new System.Drawing.Point(23, 190); + this.actioncontrol.Name = "actioncontrol"; + this.actioncontrol.Size = new System.Drawing.Size(197, 22); + this.actioncontrol.TabIndex = 8; + this.actioncontrol.TabStop = false; + this.actioncontrol.SelectedIndexChanged += new System.EventHandler(this.actioncontrol_SelectedIndexChanged); + // + // actiontitle + // + this.actiontitle.AutoSize = true; + this.actiontitle.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.actiontitle.Location = new System.Drawing.Point(67, 30); + this.actiontitle.Name = "actiontitle"; + this.actiontitle.Size = new System.Drawing.Size(172, 14); + this.actiontitle.TabIndex = 1; + this.actiontitle.Text = "(select an action from the list)"; + this.actiontitle.UseMnemonic = false; + // + // actioncontrolclear + // + this.actioncontrolclear.Location = new System.Drawing.Point(193, 138); + this.actioncontrolclear.Name = "actioncontrolclear"; + this.actioncontrolclear.Size = new System.Drawing.Size(63, 25); + this.actioncontrolclear.TabIndex = 6; + this.actioncontrolclear.TabStop = false; + this.actioncontrolclear.Text = "Clear"; + this.actioncontrolclear.UseVisualStyleBackColor = true; + this.actioncontrolclear.Click += new System.EventHandler(this.actioncontrolclear_Click); + // + // actionkey + // + this.actionkey.ImeMode = System.Windows.Forms.ImeMode.Off; + this.actionkey.Location = new System.Drawing.Point(23, 140); + this.actionkey.Name = "actionkey"; + this.actionkey.Size = new System.Drawing.Size(163, 20); + this.actionkey.TabIndex = 5; + this.actionkey.TabStop = false; + this.actionkey.KeyDown += new System.Windows.Forms.KeyEventHandler(this.actionkey_KeyDown); + // + // actiondescription + // + this.actiondescription.AutoEllipsis = true; + this.actiondescription.Location = new System.Drawing.Point(20, 50); + this.actiondescription.Name = "actiondescription"; + this.actiondescription.Size = new System.Drawing.Size(245, 71); + this.actiondescription.TabIndex = 3; + this.actiondescription.UseMnemonic = false; + // + // tabcolors + // + this.tabcolors.Controls.Add(this.appearancegroup1); + this.tabcolors.Controls.Add(this.colorsgroup3); + this.tabcolors.Controls.Add(this.colorsgroup1); + this.tabcolors.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tabcolors.Location = new System.Drawing.Point(4, 23); + this.tabcolors.Name = "tabcolors"; + this.tabcolors.Padding = new System.Windows.Forms.Padding(5); + this.tabcolors.Size = new System.Drawing.Size(682, 509); + this.tabcolors.TabIndex = 2; + this.tabcolors.Text = "Appearance"; + this.tabcolors.UseVisualStyleBackColor = true; + // + // appearancegroup1 + // + this.appearancegroup1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.appearancegroup1.Controls.Add(label21); + this.appearancegroup1.Controls.Add(this.labelDynLightIntensity); + this.appearancegroup1.Controls.Add(this.tbDynLightIntensity); + this.appearancegroup1.Controls.Add(label20); + this.appearancegroup1.Controls.Add(this.labelDynLightSize); + this.appearancegroup1.Controls.Add(this.tbDynLightSize); + this.appearancegroup1.Controls.Add(label18); + this.appearancegroup1.Controls.Add(this.labelDynLightCount); + this.appearancegroup1.Controls.Add(this.tbDynLightCount); + this.appearancegroup1.Controls.Add(this.animatevisualselection); + this.appearancegroup1.Controls.Add(this.blackbrowsers); + this.appearancegroup1.Controls.Add(this.visualbilinear); + this.appearancegroup1.Controls.Add(label1); + this.appearancegroup1.Controls.Add(this.classicbilinear); + this.appearancegroup1.Controls.Add(this.imagebrightnesslabel); + this.appearancegroup1.Controls.Add(this.imagebrightness); + this.appearancegroup1.Location = new System.Drawing.Point(217, 236); + this.appearancegroup1.Name = "appearancegroup1"; + this.appearancegroup1.Size = new System.Drawing.Size(457, 265); + this.appearancegroup1.TabIndex = 24; + this.appearancegroup1.TabStop = false; + this.appearancegroup1.Text = " Additional Options "; + // + // labelDynLightIntensity + // + this.labelDynLightIntensity.AutoSize = true; + this.labelDynLightIntensity.Location = new System.Drawing.Point(337, 174); + this.labelDynLightIntensity.Name = "labelDynLightIntensity"; + this.labelDynLightIntensity.Size = new System.Drawing.Size(22, 14); + this.labelDynLightIntensity.TabIndex = 32; + this.labelDynLightIntensity.Text = "1.0"; + // + // tbDynLightIntensity + // + this.tbDynLightIntensity.LargeChange = 1; + this.tbDynLightIntensity.Location = new System.Drawing.Point(176, 161); + this.tbDynLightIntensity.Minimum = 1; + this.tbDynLightIntensity.Name = "tbDynLightIntensity"; + this.tbDynLightIntensity.Size = new System.Drawing.Size(154, 45); + this.tbDynLightIntensity.TabIndex = 30; + this.tbDynLightIntensity.TickStyle = System.Windows.Forms.TickStyle.Both; + this.tbDynLightIntensity.Value = 10; + this.tbDynLightIntensity.ValueChanged += new System.EventHandler(this.tbDynLightIntensity_ValueChanged); + // + // labelDynLightSize + // + this.labelDynLightSize.AutoSize = true; + this.labelDynLightSize.Location = new System.Drawing.Point(337, 126); + this.labelDynLightSize.Name = "labelDynLightSize"; + this.labelDynLightSize.Size = new System.Drawing.Size(22, 14); + this.labelDynLightSize.TabIndex = 29; + this.labelDynLightSize.Text = "1.0"; + // + // tbDynLightSize + // + this.tbDynLightSize.LargeChange = 1; + this.tbDynLightSize.Location = new System.Drawing.Point(176, 113); + this.tbDynLightSize.Maximum = 20; + this.tbDynLightSize.Minimum = 1; + this.tbDynLightSize.Name = "tbDynLightSize"; + this.tbDynLightSize.Size = new System.Drawing.Size(154, 45); + this.tbDynLightSize.TabIndex = 27; + this.tbDynLightSize.TickStyle = System.Windows.Forms.TickStyle.Both; + this.tbDynLightSize.Value = 10; + this.tbDynLightSize.ValueChanged += new System.EventHandler(this.tbDynLightSize_ValueChanged); + // + // labelDynLightCount + // + this.labelDynLightCount.AutoSize = true; + this.labelDynLightCount.Location = new System.Drawing.Point(337, 78); + this.labelDynLightCount.Name = "labelDynLightCount"; + this.labelDynLightCount.Size = new System.Drawing.Size(19, 14); + this.labelDynLightCount.TabIndex = 26; + this.labelDynLightCount.Text = "16"; + // + // tbDynLightCount + // + this.tbDynLightCount.LargeChange = 3; + this.tbDynLightCount.Location = new System.Drawing.Point(176, 65); + this.tbDynLightCount.Maximum = 32; + this.tbDynLightCount.Minimum = 1; + this.tbDynLightCount.Name = "tbDynLightCount"; + this.tbDynLightCount.Size = new System.Drawing.Size(154, 45); + this.tbDynLightCount.TabIndex = 24; + this.tbDynLightCount.TickFrequency = 4; + this.tbDynLightCount.TickStyle = System.Windows.Forms.TickStyle.Both; + this.tbDynLightCount.Value = 1; + this.tbDynLightCount.ValueChanged += new System.EventHandler(this.tbDynLightCount_ValueChanged); + // + // animatevisualselection + // + this.animatevisualselection.AutoSize = true; + this.animatevisualselection.Location = new System.Drawing.Point(244, 236); + this.animatevisualselection.Name = "animatevisualselection"; + this.animatevisualselection.Size = new System.Drawing.Size(188, 18); + this.animatevisualselection.TabIndex = 23; + this.animatevisualselection.Text = "Animate selection in visual modes"; + this.animatevisualselection.UseVisualStyleBackColor = true; + // + // blackbrowsers + // + this.blackbrowsers.AutoSize = true; + this.blackbrowsers.Location = new System.Drawing.Point(244, 212); + this.blackbrowsers.Name = "blackbrowsers"; + this.blackbrowsers.Size = new System.Drawing.Size(199, 18); + this.blackbrowsers.TabIndex = 4; + this.blackbrowsers.Text = "Black background in image browser"; + this.blackbrowsers.UseVisualStyleBackColor = true; + // + // visualbilinear + // + this.visualbilinear.AutoSize = true; + this.visualbilinear.Location = new System.Drawing.Point(25, 236); + this.visualbilinear.Name = "visualbilinear"; + this.visualbilinear.Size = new System.Drawing.Size(176, 18); + this.visualbilinear.TabIndex = 6; + this.visualbilinear.Text = "Bilinear filtering in visual modes"; + this.visualbilinear.UseVisualStyleBackColor = true; + // + // classicbilinear + // + this.classicbilinear.AutoSize = true; + this.classicbilinear.Location = new System.Drawing.Point(25, 212); + this.classicbilinear.Name = "classicbilinear"; + this.classicbilinear.Size = new System.Drawing.Size(182, 18); + this.classicbilinear.TabIndex = 5; + this.classicbilinear.Text = "Bilinear filtering in classic modes"; + this.classicbilinear.UseVisualStyleBackColor = true; + // + // imagebrightnesslabel + // + this.imagebrightnesslabel.AutoSize = true; + this.imagebrightnesslabel.Location = new System.Drawing.Point(337, 30); + this.imagebrightnesslabel.Name = "imagebrightnesslabel"; + this.imagebrightnesslabel.Size = new System.Drawing.Size(31, 14); + this.imagebrightnesslabel.TabIndex = 22; + this.imagebrightnesslabel.Text = "+ 0 y"; + // + // imagebrightness + // + this.imagebrightness.LargeChange = 3; + this.imagebrightness.Location = new System.Drawing.Point(176, 17); + this.imagebrightness.Name = "imagebrightness"; + this.imagebrightness.Size = new System.Drawing.Size(154, 45); + this.imagebrightness.TabIndex = 3; + this.imagebrightness.TickStyle = System.Windows.Forms.TickStyle.Both; + this.imagebrightness.ValueChanged += new System.EventHandler(this.imagebrightness_ValueChanged); + // + // colorsgroup3 + // + this.colorsgroup3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.colorsgroup3.Controls.Add(this.scripttabwidth); + this.colorsgroup3.Controls.Add(this.scriptautoindent); + this.colorsgroup3.Controls.Add(this.label10); + this.colorsgroup3.Controls.Add(this.panel1); + this.colorsgroup3.Controls.Add(this.scriptfontsize); + this.colorsgroup3.Controls.Add(this.label8); + this.colorsgroup3.Controls.Add(this.scriptfontbold); + this.colorsgroup3.Controls.Add(this.scriptfontname); + this.colorsgroup3.Controls.Add(this.label3); + this.colorsgroup3.Controls.Add(this.colorconstants); + this.colorsgroup3.Controls.Add(this.colorliterals); + this.colorsgroup3.Controls.Add(this.colorscriptbackground); + this.colorsgroup3.Controls.Add(this.colorkeywords); + this.colorsgroup3.Controls.Add(this.colorlinenumbers); + this.colorsgroup3.Controls.Add(this.colorcomments); + this.colorsgroup3.Controls.Add(this.colorplaintext); + this.colorsgroup3.Location = new System.Drawing.Point(217, 8); + this.colorsgroup3.Name = "colorsgroup3"; + this.colorsgroup3.Size = new System.Drawing.Size(457, 222); + this.colorsgroup3.TabIndex = 1; + this.colorsgroup3.TabStop = false; + this.colorsgroup3.Text = " Script editor "; + this.colorsgroup3.Visible = false; + // + // scripttabwidth + // + this.scripttabwidth.AllowDecimal = false; + this.scripttabwidth.AllowNegative = false; + this.scripttabwidth.AllowRelative = false; + this.scripttabwidth.ButtonStep = 2; + this.scripttabwidth.Location = new System.Drawing.Point(259, 165); + this.scripttabwidth.Name = "scripttabwidth"; + this.scripttabwidth.Size = new System.Drawing.Size(71, 24); + this.scripttabwidth.StepValues = null; + this.scripttabwidth.TabIndex = 32; + // + // scriptautoindent + // + this.scriptautoindent.AutoSize = true; + this.scriptautoindent.Location = new System.Drawing.Point(354, 169); + this.scriptautoindent.Name = "scriptautoindent"; + this.scriptautoindent.Size = new System.Drawing.Size(81, 18); + this.scriptautoindent.TabIndex = 31; + this.scriptautoindent.Text = "Auto indent"; + this.scriptautoindent.UseVisualStyleBackColor = true; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.Location = new System.Drawing.Point(199, 170); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(57, 14); + this.label10.TabIndex = 30; + this.label10.Text = "Tab width:"; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.SystemColors.Window; + this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.panel1.Controls.Add(this.scriptfontlabel); + this.panel1.Location = new System.Drawing.Point(236, 109); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(199, 38); + this.panel1.TabIndex = 29; + // + // scriptfontlabel + // + this.scriptfontlabel.BackColor = System.Drawing.SystemColors.Window; + this.scriptfontlabel.Dock = System.Windows.Forms.DockStyle.Fill; + this.scriptfontlabel.Location = new System.Drawing.Point(0, 0); + this.scriptfontlabel.Name = "scriptfontlabel"; + this.scriptfontlabel.Size = new System.Drawing.Size(195, 34); + this.scriptfontlabel.TabIndex = 0; + this.scriptfontlabel.Text = "Font"; + this.scriptfontlabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // scriptfontsize + // + this.scriptfontsize.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.scriptfontsize.FormattingEnabled = true; + this.scriptfontsize.Items.AddRange(new object[] { "7", "8", "9", @@ -1422,235 +1436,236 @@ namespace CodeImp.DoomBuilder.Windows "36", "48", "72"}); - this.scriptfontsize.Location = new System.Drawing.Point(236, 67); - this.scriptfontsize.Name = "scriptfontsize"; - this.scriptfontsize.Size = new System.Drawing.Size(94, 22); - this.scriptfontsize.TabIndex = 25; - // - // label8 - // - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(199, 70); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(31, 14); - this.label8.TabIndex = 28; - this.label8.Text = "Size:"; - // - // scriptfontbold - // - this.scriptfontbold.AutoSize = true; - this.scriptfontbold.Location = new System.Drawing.Point(354, 69); - this.scriptfontbold.Name = "scriptfontbold"; - this.scriptfontbold.Size = new System.Drawing.Size(47, 18); - this.scriptfontbold.TabIndex = 26; - this.scriptfontbold.Text = "Bold"; - this.scriptfontbold.UseVisualStyleBackColor = true; - // - // scriptfontname - // - this.scriptfontname.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.scriptfontname.FormattingEnabled = true; - this.scriptfontname.Location = new System.Drawing.Point(236, 27); - this.scriptfontname.Name = "scriptfontname"; - this.scriptfontname.Size = new System.Drawing.Size(199, 22); - this.scriptfontname.Sorted = true; - this.scriptfontname.TabIndex = 23; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(199, 30); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(31, 14); - this.label3.TabIndex = 24; - this.label3.Text = "Font:"; - // - // colorconstants - // - this.colorconstants.BackColor = System.Drawing.Color.Transparent; - this.colorconstants.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.colorconstants.Label = "Constants:"; - this.colorconstants.Location = new System.Drawing.Point(15, 189); - this.colorconstants.MaximumSize = new System.Drawing.Size(10000, 23); - this.colorconstants.MinimumSize = new System.Drawing.Size(100, 23); - this.colorconstants.Name = "colorconstants"; - this.colorconstants.Size = new System.Drawing.Size(150, 23); - this.colorconstants.TabIndex = 6; - // - // colorliterals - // - this.colorliterals.BackColor = System.Drawing.Color.Transparent; - this.colorliterals.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.colorliterals.Label = "Literals:"; - this.colorliterals.Location = new System.Drawing.Point(15, 162); - this.colorliterals.MaximumSize = new System.Drawing.Size(10000, 23); - this.colorliterals.MinimumSize = new System.Drawing.Size(100, 23); - this.colorliterals.Name = "colorliterals"; - this.colorliterals.Size = new System.Drawing.Size(150, 23); - this.colorliterals.TabIndex = 5; - // - // colorscriptbackground - // - this.colorscriptbackground.BackColor = System.Drawing.Color.Transparent; - this.colorscriptbackground.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.colorscriptbackground.Label = "Background:"; - this.colorscriptbackground.Location = new System.Drawing.Point(15, 27); - this.colorscriptbackground.MaximumSize = new System.Drawing.Size(10000, 23); - this.colorscriptbackground.MinimumSize = new System.Drawing.Size(100, 23); - this.colorscriptbackground.Name = "colorscriptbackground"; - this.colorscriptbackground.Size = new System.Drawing.Size(150, 23); - this.colorscriptbackground.TabIndex = 0; - // - // colorkeywords - // - this.colorkeywords.BackColor = System.Drawing.Color.Transparent; - this.colorkeywords.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.colorkeywords.Label = "Keywords:"; - this.colorkeywords.Location = new System.Drawing.Point(15, 135); - this.colorkeywords.MaximumSize = new System.Drawing.Size(10000, 23); - this.colorkeywords.MinimumSize = new System.Drawing.Size(100, 23); - this.colorkeywords.Name = "colorkeywords"; - this.colorkeywords.Size = new System.Drawing.Size(150, 23); - this.colorkeywords.TabIndex = 4; - // - // colorlinenumbers - // - this.colorlinenumbers.BackColor = System.Drawing.Color.Transparent; - this.colorlinenumbers.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.colorlinenumbers.Label = "Line numbers:"; - this.colorlinenumbers.Location = new System.Drawing.Point(15, 54); - this.colorlinenumbers.MaximumSize = new System.Drawing.Size(10000, 23); - this.colorlinenumbers.MinimumSize = new System.Drawing.Size(100, 23); - this.colorlinenumbers.Name = "colorlinenumbers"; - this.colorlinenumbers.Size = new System.Drawing.Size(150, 23); - this.colorlinenumbers.TabIndex = 1; - // - // colorcomments - // - this.colorcomments.BackColor = System.Drawing.Color.Transparent; - this.colorcomments.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.colorcomments.Label = "Comments:"; - this.colorcomments.Location = new System.Drawing.Point(15, 108); - this.colorcomments.MaximumSize = new System.Drawing.Size(10000, 23); - this.colorcomments.MinimumSize = new System.Drawing.Size(100, 23); - this.colorcomments.Name = "colorcomments"; - this.colorcomments.Size = new System.Drawing.Size(150, 23); - this.colorcomments.TabIndex = 3; - // - // colorplaintext - // - this.colorplaintext.BackColor = System.Drawing.Color.Transparent; - this.colorplaintext.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.colorplaintext.Label = "Plain text:"; - this.colorplaintext.Location = new System.Drawing.Point(15, 81); - this.colorplaintext.MaximumSize = new System.Drawing.Size(10000, 23); - this.colorplaintext.MinimumSize = new System.Drawing.Size(100, 23); - this.colorplaintext.Name = "colorplaintext"; - this.colorplaintext.Size = new System.Drawing.Size(150, 23); - this.colorplaintext.TabIndex = 2; - // - // tabpasting - // - this.tabpasting.Controls.Add(this.label16); - this.tabpasting.Controls.Add(this.pasteoptions); - this.tabpasting.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tabpasting.Location = new System.Drawing.Point(4, 23); - this.tabpasting.Name = "tabpasting"; - this.tabpasting.Padding = new System.Windows.Forms.Padding(5); - this.tabpasting.Size = new System.Drawing.Size(682, 509); - this.tabpasting.TabIndex = 3; - this.tabpasting.Text = "Pasting "; - this.tabpasting.UseVisualStyleBackColor = true; - // - // label16 - // - this.label16.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.label16.Location = new System.Drawing.Point(11, 15); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(649, 35); - this.label16.TabIndex = 1; - this.label16.Text = "These are the default options for pasting geometry. You can also choose these opt" + - "ions when you use the Paste Special function. These options also apply when inse" + - "rting prefabs."; - // - // pasteoptions - // - this.pasteoptions.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.pasteoptions.Location = new System.Drawing.Point(8, 53); - this.pasteoptions.Name = "pasteoptions"; - this.pasteoptions.Size = new System.Drawing.Size(666, 427); - this.pasteoptions.TabIndex = 0; - // - // cbSynchCameras - // - this.cbSynchCameras.AutoSize = true; - this.cbSynchCameras.Location = new System.Drawing.Point(32, 282); - this.cbSynchCameras.Name = "cbSynchCameras"; - this.cbSynchCameras.Size = new System.Drawing.Size(270, 18); - this.cbSynchCameras.TabIndex = 42; - this.cbSynchCameras.Text = "Synch camera position between 2D and 3D modes"; - this.cbSynchCameras.UseVisualStyleBackColor = true; - // - // 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.ClientSize = new System.Drawing.Size(711, 594); - this.Controls.Add(this.cancel); - this.Controls.Add(this.apply); - this.Controls.Add(this.tabs); - this.DoubleBuffered = true; - 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 = "PreferencesForm"; - this.Opacity = 0; - this.ShowIcon = false; - this.ShowInTaskbar = false; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Preferences"; - this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.PreferencesForm_HelpRequested); - groupBox1.ResumeLayout(false); - groupBox1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.zoomfactor)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.autoscrollspeed)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.previewsize)).EndInit(); - this.colorsgroup1.ResumeLayout(false); - this.colorsgroup1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.doublesidedalpha)).EndInit(); - this.tabs.ResumeLayout(false); - this.tabinterface.ResumeLayout(false); - this.groupBox5.ResumeLayout(false); - this.groupBox5.PerformLayout(); - this.groupBox4.ResumeLayout(false); - this.groupBox4.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.viewdistance)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.movespeed)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.mousespeed)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.fieldofview)).EndInit(); - this.tabkeys.ResumeLayout(false); - this.actioncontrolpanel.ResumeLayout(false); - this.actioncontrolpanel.PerformLayout(); - this.tabcolors.ResumeLayout(false); - this.appearancegroup1.ResumeLayout(false); - this.appearancegroup1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.tbDynLightIntensity)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.tbDynLightSize)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.tbDynLightCount)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.imagebrightness)).EndInit(); - this.colorsgroup3.ResumeLayout(false); - this.colorsgroup3.PerformLayout(); - this.panel1.ResumeLayout(false); - this.tabpasting.ResumeLayout(false); - this.ResumeLayout(false); + this.scriptfontsize.Location = new System.Drawing.Point(236, 67); + this.scriptfontsize.Name = "scriptfontsize"; + this.scriptfontsize.Size = new System.Drawing.Size(94, 22); + this.scriptfontsize.TabIndex = 25; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(199, 70); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(31, 14); + this.label8.TabIndex = 28; + this.label8.Text = "Size:"; + // + // scriptfontbold + // + this.scriptfontbold.AutoSize = true; + this.scriptfontbold.Location = new System.Drawing.Point(354, 69); + this.scriptfontbold.Name = "scriptfontbold"; + this.scriptfontbold.Size = new System.Drawing.Size(47, 18); + this.scriptfontbold.TabIndex = 26; + this.scriptfontbold.Text = "Bold"; + this.scriptfontbold.UseVisualStyleBackColor = true; + // + // scriptfontname + // + this.scriptfontname.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.scriptfontname.FormattingEnabled = true; + this.scriptfontname.Location = new System.Drawing.Point(236, 27); + this.scriptfontname.Name = "scriptfontname"; + this.scriptfontname.Size = new System.Drawing.Size(199, 22); + this.scriptfontname.Sorted = true; + this.scriptfontname.TabIndex = 23; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(199, 30); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(31, 14); + this.label3.TabIndex = 24; + this.label3.Text = "Font:"; + // + // colorconstants + // + this.colorconstants.BackColor = System.Drawing.Color.Transparent; + this.colorconstants.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.colorconstants.Label = "Constants:"; + this.colorconstants.Location = new System.Drawing.Point(15, 189); + this.colorconstants.MaximumSize = new System.Drawing.Size(10000, 23); + this.colorconstants.MinimumSize = new System.Drawing.Size(100, 23); + this.colorconstants.Name = "colorconstants"; + this.colorconstants.Size = new System.Drawing.Size(150, 23); + this.colorconstants.TabIndex = 6; + // + // colorliterals + // + this.colorliterals.BackColor = System.Drawing.Color.Transparent; + this.colorliterals.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.colorliterals.Label = "Literals:"; + this.colorliterals.Location = new System.Drawing.Point(15, 162); + this.colorliterals.MaximumSize = new System.Drawing.Size(10000, 23); + this.colorliterals.MinimumSize = new System.Drawing.Size(100, 23); + this.colorliterals.Name = "colorliterals"; + this.colorliterals.Size = new System.Drawing.Size(150, 23); + this.colorliterals.TabIndex = 5; + // + // colorscriptbackground + // + this.colorscriptbackground.BackColor = System.Drawing.Color.Transparent; + this.colorscriptbackground.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.colorscriptbackground.Label = "Background:"; + this.colorscriptbackground.Location = new System.Drawing.Point(15, 27); + this.colorscriptbackground.MaximumSize = new System.Drawing.Size(10000, 23); + this.colorscriptbackground.MinimumSize = new System.Drawing.Size(100, 23); + this.colorscriptbackground.Name = "colorscriptbackground"; + this.colorscriptbackground.Size = new System.Drawing.Size(150, 23); + this.colorscriptbackground.TabIndex = 0; + // + // colorkeywords + // + this.colorkeywords.BackColor = System.Drawing.Color.Transparent; + this.colorkeywords.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.colorkeywords.Label = "Keywords:"; + this.colorkeywords.Location = new System.Drawing.Point(15, 135); + this.colorkeywords.MaximumSize = new System.Drawing.Size(10000, 23); + this.colorkeywords.MinimumSize = new System.Drawing.Size(100, 23); + this.colorkeywords.Name = "colorkeywords"; + this.colorkeywords.Size = new System.Drawing.Size(150, 23); + this.colorkeywords.TabIndex = 4; + // + // colorlinenumbers + // + this.colorlinenumbers.BackColor = System.Drawing.Color.Transparent; + this.colorlinenumbers.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.colorlinenumbers.Label = "Line numbers:"; + this.colorlinenumbers.Location = new System.Drawing.Point(15, 54); + this.colorlinenumbers.MaximumSize = new System.Drawing.Size(10000, 23); + this.colorlinenumbers.MinimumSize = new System.Drawing.Size(100, 23); + this.colorlinenumbers.Name = "colorlinenumbers"; + this.colorlinenumbers.Size = new System.Drawing.Size(150, 23); + this.colorlinenumbers.TabIndex = 1; + // + // colorcomments + // + this.colorcomments.BackColor = System.Drawing.Color.Transparent; + this.colorcomments.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.colorcomments.Label = "Comments:"; + this.colorcomments.Location = new System.Drawing.Point(15, 108); + this.colorcomments.MaximumSize = new System.Drawing.Size(10000, 23); + this.colorcomments.MinimumSize = new System.Drawing.Size(100, 23); + this.colorcomments.Name = "colorcomments"; + this.colorcomments.Size = new System.Drawing.Size(150, 23); + this.colorcomments.TabIndex = 3; + // + // colorplaintext + // + this.colorplaintext.BackColor = System.Drawing.Color.Transparent; + this.colorplaintext.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.colorplaintext.Label = "Plain text:"; + this.colorplaintext.Location = new System.Drawing.Point(15, 81); + this.colorplaintext.MaximumSize = new System.Drawing.Size(10000, 23); + this.colorplaintext.MinimumSize = new System.Drawing.Size(100, 23); + this.colorplaintext.Name = "colorplaintext"; + this.colorplaintext.Size = new System.Drawing.Size(150, 23); + this.colorplaintext.TabIndex = 2; + // + // tabpasting + // + this.tabpasting.Controls.Add(this.label16); + this.tabpasting.Controls.Add(this.pasteoptions); + this.tabpasting.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tabpasting.Location = new System.Drawing.Point(4, 23); + this.tabpasting.Name = "tabpasting"; + this.tabpasting.Padding = new System.Windows.Forms.Padding(5); + this.tabpasting.Size = new System.Drawing.Size(682, 509); + this.tabpasting.TabIndex = 3; + this.tabpasting.Text = "Pasting "; + this.tabpasting.UseVisualStyleBackColor = true; + // + // label16 + // + this.label16.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.label16.Location = new System.Drawing.Point(11, 15); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(649, 35); + this.label16.TabIndex = 1; + this.label16.Text = "These are the default options for pasting geometry. You can also choose these opt" + + "ions when you use the Paste Special function. These options also apply when inse" + + "rting prefabs."; + // + // pasteoptions + // + this.pasteoptions.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.pasteoptions.Location = new System.Drawing.Point(8, 53); + this.pasteoptions.Name = "pasteoptions"; + this.pasteoptions.Size = new System.Drawing.Size(666, 427); + this.pasteoptions.TabIndex = 0; + // + // cbStretchModels + // + this.cbStretchModels.AutoSize = true; + this.cbStretchModels.Location = new System.Drawing.Point(21, 463); + this.cbStretchModels.Name = "cbStretchModels"; + this.cbStretchModels.Size = new System.Drawing.Size(169, 18); + this.cbStretchModels.TabIndex = 18; + this.cbStretchModels.Text = "Scale models in Visual modes"; + this.toolTip1.SetToolTip(this.cbStretchModels, "Set models\' rendered height to 85% \r\nto mimic GZDoom\'s way of rendering."); + this.cbStretchModels.UseVisualStyleBackColor = true; + // + // 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.ClientSize = new System.Drawing.Size(711, 594); + this.Controls.Add(this.cancel); + this.Controls.Add(this.apply); + this.Controls.Add(this.tabs); + this.DoubleBuffered = true; + 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 = "PreferencesForm"; + this.Opacity = 0; + this.ShowIcon = false; + this.ShowInTaskbar = false; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "Preferences"; + this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.PreferencesForm_HelpRequested); + groupBox1.ResumeLayout(false); + groupBox1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.zoomfactor)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.autoscrollspeed)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.previewsize)).EndInit(); + this.colorsgroup1.ResumeLayout(false); + this.colorsgroup1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.doublesidedalpha)).EndInit(); + this.tabs.ResumeLayout(false); + this.tabinterface.ResumeLayout(false); + this.groupBox5.ResumeLayout(false); + this.groupBox5.PerformLayout(); + this.groupBox4.ResumeLayout(false); + this.groupBox4.PerformLayout(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.viewdistance)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.movespeed)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.mousespeed)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.fieldofview)).EndInit(); + this.tabkeys.ResumeLayout(false); + this.actioncontrolpanel.ResumeLayout(false); + this.actioncontrolpanel.PerformLayout(); + this.tabcolors.ResumeLayout(false); + this.appearancegroup1.ResumeLayout(false); + this.appearancegroup1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.tbDynLightIntensity)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.tbDynLightSize)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.tbDynLightCount)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.imagebrightness)).EndInit(); + this.colorsgroup3.ResumeLayout(false); + this.colorsgroup3.PerformLayout(); + this.panel1.ResumeLayout(false); + this.tabpasting.ResumeLayout(false); + this.ResumeLayout(false); } @@ -1768,5 +1783,7 @@ namespace CodeImp.DoomBuilder.Windows private System.Windows.Forms.Label labelDynLightIntensity; private Dotnetrix.Controls.TrackBar tbDynLightIntensity; private System.Windows.Forms.CheckBox cbSynchCameras; + private System.Windows.Forms.CheckBox cbStretchModels; + private System.Windows.Forms.ToolTip toolTip1; } } \ No newline at end of file diff --git a/Source/Core/Windows/PreferencesForm.cs b/Source/Core/Windows/PreferencesForm.cs index 1fdb46d0..30a46bcc 100644 --- a/Source/Core/Windows/PreferencesForm.cs +++ b/Source/Core/Windows/PreferencesForm.cs @@ -103,6 +103,7 @@ namespace CodeImp.DoomBuilder.Windows labelDynLightSize.Text = General.Settings.GZDynamicLightRadius.ToString(); tbDynLightIntensity.Value = General.Clamp((int)(General.Settings.GZDynamicLightIntensity * 10), tbDynLightIntensity.Minimum, tbDynLightIntensity.Maximum); labelDynLightIntensity.Text = General.Settings.GZDynamicLightIntensity.ToString(); + cbStretchModels.Checked = General.Settings.GZStretchModels; // Fill fonts list scriptfontname.BeginUpdate(); @@ -274,6 +275,7 @@ namespace CodeImp.DoomBuilder.Windows General.Settings.GZMaxDynamicLights = tbDynLightCount.Value; General.Settings.GZDynamicLightRadius = ((float)tbDynLightSize.Value / 10.0f); General.Settings.GZDynamicLightIntensity = ((float)tbDynLightIntensity.Value / 10.0f); + General.Settings.GZStretchModels = cbStretchModels.Checked; // Paste options General.Settings.PasteOptions = pasteoptions.GetOptions(); diff --git a/Source/Core/Windows/PreferencesForm.resx b/Source/Core/Windows/PreferencesForm.resx index 4d3363b7..89c6f931 100644 --- a/Source/Core/Windows/PreferencesForm.resx +++ b/Source/Core/Windows/PreferencesForm.resx @@ -141,4 +141,7 @@ False + + 17, 17 + \ No newline at end of file