Fix inconsistencies in Preferences forms

This commit is contained in:
spherallic 2023-01-09 15:31:09 +01:00
parent 022b0474af
commit 667c15b59a
3 changed files with 66 additions and 63 deletions

View File

@ -70,6 +70,7 @@ namespace CodeImp.DoomBuilder.Windows
this.defaultviewmode = new System.Windows.Forms.ComboBox();
this.keyusedlabel = new System.Windows.Forms.Label();
this.colorsgroup1 = new System.Windows.Forms.GroupBox();
this.label2 = new System.Windows.Forms.Label();
this.color3dFloors = new CodeImp.DoomBuilder.Controls.ColorControl();
this.colorInfo = new CodeImp.DoomBuilder.Controls.ColorControl();
this.colorMD3 = new CodeImp.DoomBuilder.Controls.ColorControl();
@ -78,7 +79,6 @@ namespace CodeImp.DoomBuilder.Windows
this.colorgrid = new CodeImp.DoomBuilder.Controls.ColorControl();
this.colorindication = new CodeImp.DoomBuilder.Controls.ColorControl();
this.colorbackcolor = new CodeImp.DoomBuilder.Controls.ColorControl();
this.label2 = new System.Windows.Forms.Label();
this.doublesidedalphalabel = new System.Windows.Forms.Label();
this.colorselection = new CodeImp.DoomBuilder.Controls.ColorControl();
this.colorvertices = new CodeImp.DoomBuilder.Controls.ColorControl();
@ -613,18 +613,18 @@ namespace CodeImp.DoomBuilder.Windows
// label1
//
label1.AutoSize = true;
label1.Location = new System.Drawing.Point(28, 29);
label1.Location = new System.Drawing.Point(46, 64);
label1.Name = "label1";
label1.Size = new System.Drawing.Size(135, 13);
label1.Size = new System.Drawing.Size(140, 13);
label1.TabIndex = 20;
label1.Text = "Texture and flat brightness:";
label1.Text = "Texture and flats brightness:";
label1.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// label18
//
label18.AutoSize = true;
label18.Enabled = false;
label18.Location = new System.Drawing.Point(23, 206);
label18.Location = new System.Drawing.Point(41, 230);
label18.Name = "label18";
label18.Size = new System.Drawing.Size(147, 13);
label18.TabIndex = 25;
@ -637,7 +637,7 @@ namespace CodeImp.DoomBuilder.Windows
// label29
//
label29.AutoSize = true;
label29.Location = new System.Drawing.Point(51, 63);
label29.Location = new System.Drawing.Point(68, 98);
label29.Name = "label29";
label29.Size = new System.Drawing.Size(118, 13);
label29.TabIndex = 41;
@ -647,7 +647,7 @@ namespace CodeImp.DoomBuilder.Windows
// label30
//
label30.AutoSize = true;
label30.Location = new System.Drawing.Point(6, 131);
label30.Location = new System.Drawing.Point(13, 166);
label30.Name = "label30";
label30.Size = new System.Drawing.Size(173, 13);
label30.TabIndex = 45;
@ -658,7 +658,7 @@ namespace CodeImp.DoomBuilder.Windows
// label31
//
label31.AutoSize = true;
label31.Location = new System.Drawing.Point(31, 165);
label31.Location = new System.Drawing.Point(47, 200);
label31.Name = "label31";
label31.Size = new System.Drawing.Size(139, 13);
label31.TabIndex = 46;
@ -668,7 +668,7 @@ namespace CodeImp.DoomBuilder.Windows
// label32
//
label32.AutoSize = true;
label32.Location = new System.Drawing.Point(6, 97);
label32.Location = new System.Drawing.Point(10, 132);
label32.Name = "label32";
label32.Size = new System.Drawing.Size(176, 13);
label32.TabIndex = 49;
@ -689,16 +689,13 @@ namespace CodeImp.DoomBuilder.Windows
//
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.label2);
this.colorsgroup1.Controls.Add(this.color3dFloors);
this.colorsgroup1.Controls.Add(this.colorInfo);
this.colorsgroup1.Controls.Add(this.colorMD3);
this.colorsgroup1.Controls.Add(this.doublesidedalpha);
this.colorsgroup1.Controls.Add(this.colorgrid64);
this.colorsgroup1.Controls.Add(this.colorgrid);
this.colorsgroup1.Controls.Add(this.colorindication);
this.colorsgroup1.Controls.Add(this.colorbackcolor);
this.colorsgroup1.Controls.Add(this.doublesidedalphalabel);
this.colorsgroup1.Controls.Add(this.colorselection);
this.colorsgroup1.Controls.Add(this.colorvertices);
this.colorsgroup1.Controls.Add(this.colorhighlight);
@ -712,6 +709,16 @@ namespace CodeImp.DoomBuilder.Windows
this.colorsgroup1.Text = " Display ";
this.colorsgroup1.Visible = false;
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(45, 32);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(141, 13);
this.label2.TabIndex = 14;
this.label2.Text = "Passable lines transparency:";
this.label2.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// color3dFloors
//
this.color3dFloors.BackColor = System.Drawing.Color.Transparent;
@ -749,9 +756,9 @@ namespace CodeImp.DoomBuilder.Windows
//
this.doublesidedalpha.BackColor = System.Drawing.SystemColors.Window;
this.doublesidedalpha.LargeChange = 3;
this.doublesidedalpha.Location = new System.Drawing.Point(11, 337);
this.doublesidedalpha.Location = new System.Drawing.Point(194, 19);
this.doublesidedalpha.Name = "doublesidedalpha";
this.doublesidedalpha.Size = new System.Drawing.Size(130, 45);
this.doublesidedalpha.Size = new System.Drawing.Size(154, 45);
this.doublesidedalpha.TabIndex = 2;
this.doublesidedalpha.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
this.doublesidedalpha.ValueChanged += new System.EventHandler(this.doublesidedalpha_ValueChanged);
@ -800,20 +807,10 @@ namespace CodeImp.DoomBuilder.Windows
this.colorbackcolor.Size = new System.Drawing.Size(168, 23);
this.colorbackcolor.TabIndex = 0;
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(12, 366);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(141, 13);
this.label2.TabIndex = 14;
this.label2.Text = "Passable lines transparency:";
this.label2.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// doublesidedalphalabel
//
this.doublesidedalphalabel.AutoSize = true;
this.doublesidedalphalabel.Location = new System.Drawing.Point(159, 366);
this.doublesidedalphalabel.Location = new System.Drawing.Point(354, 32);
this.doublesidedalphalabel.Name = "doublesidedalphalabel";
this.doublesidedalphalabel.Size = new System.Drawing.Size(21, 13);
this.doublesidedalphalabel.TabIndex = 16;
@ -1634,18 +1631,22 @@ namespace CodeImp.DoomBuilder.Windows
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(this.hiddenthingsalpha);
this.appearancegroup1.Controls.Add(this.inactivethingsalpha);
this.appearancegroup1.Controls.Add(this.activethingsalpha);
this.appearancegroup1.Controls.Add(this.tbDefaultThingSize);
this.appearancegroup1.Controls.Add(this.label2);
this.appearancegroup1.Controls.Add(this.imagebrightness);
this.appearancegroup1.Controls.Add(label32);
this.appearancegroup1.Controls.Add(this.activethingsalphalabel);
this.appearancegroup1.Controls.Add(this.inactivethingsalphalabel);
this.appearancegroup1.Controls.Add(this.hiddenthingsalphalabel);
this.appearancegroup1.Controls.Add(this.doublesidedalpha);
this.appearancegroup1.Controls.Add(label31);
this.appearancegroup1.Controls.Add(label30);
this.appearancegroup1.Controls.Add(this.hiddenthingsalpha);
this.appearancegroup1.Controls.Add(this.inactivethingsalpha);
this.appearancegroup1.Controls.Add(this.activethingsalpha);
this.appearancegroup1.Controls.Add(this.doublesidedalphalabel);
this.appearancegroup1.Controls.Add(label29);
this.appearancegroup1.Controls.Add(this.labelDefaultThingSize);
this.appearancegroup1.Controls.Add(this.tbDefaultThingSize);
this.appearancegroup1.Controls.Add(this.cbDrawThingsFixedSize);
this.appearancegroup1.Controls.Add(this.cbDrawCrosshair);
this.appearancegroup1.Controls.Add(this.cbDrawFullCrosshair);
@ -1656,14 +1657,13 @@ namespace CodeImp.DoomBuilder.Windows
this.appearancegroup1.Controls.Add(this.qualitydisplay);
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.Controls.Add(this.tbDynLightCount);
this.appearancegroup1.Location = new System.Drawing.Point(217, 8);
this.appearancegroup1.Name = "appearancegroup1";
this.appearancegroup1.Size = new System.Drawing.Size(457, 388);
@ -1674,7 +1674,7 @@ namespace CodeImp.DoomBuilder.Windows
// activethingsalphalabel
//
this.activethingsalphalabel.AutoSize = true;
this.activethingsalphalabel.Location = new System.Drawing.Point(337, 97);
this.activethingsalphalabel.Location = new System.Drawing.Point(354, 132);
this.activethingsalphalabel.Name = "activethingsalphalabel";
this.activethingsalphalabel.Size = new System.Drawing.Size(21, 13);
this.activethingsalphalabel.TabIndex = 48;
@ -1683,7 +1683,7 @@ namespace CodeImp.DoomBuilder.Windows
// inactivethingsalphalabel
//
this.inactivethingsalphalabel.AutoSize = true;
this.inactivethingsalphalabel.Location = new System.Drawing.Point(337, 131);
this.inactivethingsalphalabel.Location = new System.Drawing.Point(354, 166);
this.inactivethingsalphalabel.Name = "inactivethingsalphalabel";
this.inactivethingsalphalabel.Size = new System.Drawing.Size(21, 13);
this.inactivethingsalphalabel.TabIndex = 48;
@ -1692,7 +1692,7 @@ namespace CodeImp.DoomBuilder.Windows
// hiddenthingsalphalabel
//
this.hiddenthingsalphalabel.AutoSize = true;
this.hiddenthingsalphalabel.Location = new System.Drawing.Point(337, 165);
this.hiddenthingsalphalabel.Location = new System.Drawing.Point(354, 200);
this.hiddenthingsalphalabel.Name = "hiddenthingsalphalabel";
this.hiddenthingsalphalabel.Size = new System.Drawing.Size(21, 13);
this.hiddenthingsalphalabel.TabIndex = 47;
@ -1702,7 +1702,7 @@ namespace CodeImp.DoomBuilder.Windows
//
this.hiddenthingsalpha.BackColor = System.Drawing.SystemColors.Window;
this.hiddenthingsalpha.LargeChange = 3;
this.hiddenthingsalpha.Location = new System.Drawing.Point(176, 154);
this.hiddenthingsalpha.Location = new System.Drawing.Point(193, 189);
this.hiddenthingsalpha.Name = "hiddenthingsalpha";
this.hiddenthingsalpha.Size = new System.Drawing.Size(154, 45);
this.hiddenthingsalpha.TabIndex = 43;
@ -1713,7 +1713,7 @@ namespace CodeImp.DoomBuilder.Windows
//
this.inactivethingsalpha.BackColor = System.Drawing.SystemColors.Window;
this.inactivethingsalpha.LargeChange = 3;
this.inactivethingsalpha.Location = new System.Drawing.Point(176, 120);
this.inactivethingsalpha.Location = new System.Drawing.Point(193, 155);
this.inactivethingsalpha.Name = "inactivethingsalpha";
this.inactivethingsalpha.Size = new System.Drawing.Size(154, 45);
this.inactivethingsalpha.TabIndex = 44;
@ -1724,7 +1724,7 @@ namespace CodeImp.DoomBuilder.Windows
//
this.activethingsalpha.BackColor = System.Drawing.SystemColors.Window;
this.activethingsalpha.LargeChange = 3;
this.activethingsalpha.Location = new System.Drawing.Point(176, 86);
this.activethingsalpha.Location = new System.Drawing.Point(193, 121);
this.activethingsalpha.Name = "activethingsalpha";
this.activethingsalpha.Size = new System.Drawing.Size(154, 45);
this.activethingsalpha.TabIndex = 44;
@ -1734,7 +1734,7 @@ namespace CodeImp.DoomBuilder.Windows
// labelDefaultThingSize
//
this.labelDefaultThingSize.AutoSize = true;
this.labelDefaultThingSize.Location = new System.Drawing.Point(337, 63);
this.labelDefaultThingSize.Location = new System.Drawing.Point(354, 98);
this.labelDefaultThingSize.Name = "labelDefaultThingSize";
this.labelDefaultThingSize.Size = new System.Drawing.Size(13, 13);
this.labelDefaultThingSize.TabIndex = 42;
@ -1744,7 +1744,7 @@ namespace CodeImp.DoomBuilder.Windows
//
this.tbDefaultThingSize.BackColor = System.Drawing.SystemColors.Window;
this.tbDefaultThingSize.LargeChange = 4;
this.tbDefaultThingSize.Location = new System.Drawing.Point(176, 52);
this.tbDefaultThingSize.Location = new System.Drawing.Point(193, 87);
this.tbDefaultThingSize.Maximum = 64;
this.tbDefaultThingSize.Minimum = 1;
this.tbDefaultThingSize.Name = "tbDefaultThingSize";
@ -1830,7 +1830,7 @@ namespace CodeImp.DoomBuilder.Windows
//
this.labelDynLightCount.AutoSize = true;
this.labelDynLightCount.Enabled = false;
this.labelDynLightCount.Location = new System.Drawing.Point(336, 206);
this.labelDynLightCount.Location = new System.Drawing.Point(354, 230);
this.labelDynLightCount.Name = "labelDynLightCount";
this.labelDynLightCount.Size = new System.Drawing.Size(19, 13);
this.labelDynLightCount.TabIndex = 26;
@ -1842,7 +1842,7 @@ namespace CodeImp.DoomBuilder.Windows
this.tbDynLightCount.BackColor = System.Drawing.SystemColors.Window;
this.tbDynLightCount.Enabled = false;
this.tbDynLightCount.LargeChange = 3;
this.tbDynLightCount.Location = new System.Drawing.Point(176, 195);
this.tbDynLightCount.Location = new System.Drawing.Point(194, 223);
this.tbDynLightCount.Maximum = 32;
this.tbDynLightCount.Minimum = 1;
this.tbDynLightCount.Name = "tbDynLightCount";
@ -1897,7 +1897,7 @@ namespace CodeImp.DoomBuilder.Windows
// imagebrightnesslabel
//
this.imagebrightnesslabel.AutoSize = true;
this.imagebrightnesslabel.Location = new System.Drawing.Point(337, 29);
this.imagebrightnesslabel.Location = new System.Drawing.Point(354, 64);
this.imagebrightnesslabel.Name = "imagebrightnesslabel";
this.imagebrightnesslabel.Size = new System.Drawing.Size(30, 13);
this.imagebrightnesslabel.TabIndex = 22;
@ -1907,7 +1907,7 @@ namespace CodeImp.DoomBuilder.Windows
//
this.imagebrightness.BackColor = System.Drawing.SystemColors.Window;
this.imagebrightness.LargeChange = 3;
this.imagebrightness.Location = new System.Drawing.Point(176, 18);
this.imagebrightness.Location = new System.Drawing.Point(193, 53);
this.imagebrightness.Name = "imagebrightness";
this.imagebrightness.Size = new System.Drawing.Size(154, 45);
this.imagebrightness.TabIndex = 3;
@ -2219,6 +2219,7 @@ namespace CodeImp.DoomBuilder.Windows
// scripttabwidth
//
this.scripttabwidth.AllowDecimal = false;
this.scripttabwidth.AllowExpressions = false;
this.scripttabwidth.AllowNegative = false;
this.scripttabwidth.AllowRelative = false;
this.scripttabwidth.ButtonStep = 2;
@ -2669,7 +2670,6 @@ namespace CodeImp.DoomBuilder.Windows
((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);

View File

@ -135,6 +135,9 @@
<metadata name="label18.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="label29.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>

View File

@ -249,16 +249,6 @@ namespace CodeImp.DoomBuilder.BuilderModes
this.groupBox3.TabStop = false;
this.groupBox3.Text = " Options ";
//
// additivepaintselect
//
this.additivepaintselect.AutoSize = true;
this.additivepaintselect.Location = new System.Drawing.Point(13, 126);
this.additivepaintselect.Name = "additivepaintselect";
this.additivepaintselect.Size = new System.Drawing.Size(233, 17);
this.additivepaintselect.TabIndex = 11;
this.additivepaintselect.Text = "Additive paint selecting without holding Shift";
this.additivepaintselect.UseVisualStyleBackColor = true;
//
// autodrawonedit
//
this.autodrawonedit.AutoSize = true;
@ -273,7 +263,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
// syncSelection
//
this.syncSelection.AutoSize = true;
this.syncSelection.Location = new System.Drawing.Point(13, 299);
this.syncSelection.Location = new System.Drawing.Point(13, 312);
this.syncSelection.Name = "syncSelection";
this.syncSelection.Size = new System.Drawing.Size(295, 17);
this.syncSelection.TabIndex = 10;
@ -283,7 +273,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
// dontMoveGeometryOutsideBounds
//
this.dontMoveGeometryOutsideBounds.AutoSize = true;
this.dontMoveGeometryOutsideBounds.Location = new System.Drawing.Point(13, 249);
this.dontMoveGeometryOutsideBounds.Location = new System.Drawing.Point(13, 262);
this.dontMoveGeometryOutsideBounds.Name = "dontMoveGeometryOutsideBounds";
this.dontMoveGeometryOutsideBounds.Size = new System.Drawing.Size(323, 17);
this.dontMoveGeometryOutsideBounds.TabIndex = 9;
@ -293,7 +283,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
// autoaligntexturesoncreate
//
this.autoaligntexturesoncreate.AutoSize = true;
this.autoaligntexturesoncreate.Location = new System.Drawing.Point(13, 224);
this.autoaligntexturesoncreate.Location = new System.Drawing.Point(13, 237);
this.autoaligntexturesoncreate.Name = "autoaligntexturesoncreate";
this.autoaligntexturesoncreate.Size = new System.Drawing.Size(233, 17);
this.autoaligntexturesoncreate.TabIndex = 7;
@ -303,7 +293,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
// autodragonpaste
//
this.autodragonpaste.AutoSize = true;
this.autodragonpaste.Location = new System.Drawing.Point(13, 199);
this.autodragonpaste.Location = new System.Drawing.Point(13, 212);
this.autodragonpaste.Name = "autodragonpaste";
this.autodragonpaste.Size = new System.Drawing.Size(201, 17);
this.autodragonpaste.TabIndex = 6;
@ -313,7 +303,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
// visualmodeclearselection
//
this.visualmodeclearselection.AutoSize = true;
this.visualmodeclearselection.Location = new System.Drawing.Point(13, 174);
this.visualmodeclearselection.Location = new System.Drawing.Point(13, 187);
this.visualmodeclearselection.Name = "visualmodeclearselection";
this.visualmodeclearselection.Size = new System.Drawing.Size(231, 17);
this.visualmodeclearselection.TabIndex = 5;
@ -323,7 +313,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
// autoclearselection
//
this.autoclearselection.AutoSize = true;
this.autoclearselection.Location = new System.Drawing.Point(13, 149);
this.autoclearselection.Location = new System.Drawing.Point(13, 162);
this.autoclearselection.Name = "autoclearselection";
this.autoclearselection.Size = new System.Drawing.Size(241, 17);
this.autoclearselection.TabIndex = 4;
@ -353,17 +343,27 @@ namespace CodeImp.DoomBuilder.BuilderModes
// additiveselect
//
this.additiveselect.AutoSize = true;
this.additiveselect.Location = new System.Drawing.Point(13, 110);
this.additiveselect.Location = new System.Drawing.Point(13, 112);
this.additiveselect.Name = "additiveselect";
this.additiveselect.Size = new System.Drawing.Size(207, 17);
this.additiveselect.TabIndex = 3;
this.additiveselect.Text = "Additive selecting without holding Shift";
this.additiveselect.UseVisualStyleBackColor = true;
//
// additivepaintselect
//
this.additivepaintselect.AutoSize = true;
this.additivepaintselect.Location = new System.Drawing.Point(13, 137);
this.additivepaintselect.Name = "additivepaintselect";
this.additivepaintselect.Size = new System.Drawing.Size(233, 17);
this.additivepaintselect.TabIndex = 11;
this.additivepaintselect.Text = "Additive paint selecting without holding Shift";
this.additivepaintselect.UseVisualStyleBackColor = true;
//
// dontusenodes
//
this.dontusenodes.AutoSize = true;
this.dontusenodes.Location = new System.Drawing.Point(13, 324);
this.dontusenodes.Location = new System.Drawing.Point(13, 337);
this.dontusenodes.Name = "dontusenodes";
this.dontusenodes.Size = new System.Drawing.Size(349, 17);
this.dontusenodes.TabIndex = 12;
@ -603,7 +603,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
// switchviewmodes
//
this.switchviewmodes.AutoSize = true;
this.switchviewmodes.Location = new System.Drawing.Point(13, 274);
this.switchviewmodes.Location = new System.Drawing.Point(13, 287);
this.switchviewmodes.Name = "switchviewmodes";
this.switchviewmodes.Size = new System.Drawing.Size(317, 17);
this.switchviewmodes.TabIndex = 11;