mirror of
https://git.do.srb2.org/STJr/ZoneBuilder.git
synced 2024-11-12 23:54:10 +00:00
Fix checkboxes in the Editing tab of Preferences and remove a stray bracket.
This commit is contained in:
sphere
parent
4794b0effc
commit
9cd41b15ef
3 changed files with 545 additions and 497 deletions
|
|
@ -40,7 +40,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.defaultbrightness = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
|
||||
this.label11 = new System.Windows.Forms.Label();
|
||||
this.groupBox3 = new System.Windows.Forms.GroupBox();
|
||||
this.switchviewmodes = new System.Windows.Forms.CheckBox();
|
||||
this.additivepaintselect = new System.Windows.Forms.CheckBox();
|
||||
this.autodrawonedit = new System.Windows.Forms.CheckBox();
|
||||
this.syncSelection = new System.Windows.Forms.CheckBox();
|
||||
this.dontMoveGeometryOutsideBounds = new System.Windows.Forms.CheckBox();
|
||||
|
|
@ -51,10 +51,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.editnewthing = new System.Windows.Forms.CheckBox();
|
||||
this.editnewsector = new System.Windows.Forms.CheckBox();
|
||||
this.additiveselect = new System.Windows.Forms.CheckBox();
|
||||
this.dontusenodes = new System.Windows.Forms.CheckBox();
|
||||
this.groupBox2 = new System.Windows.Forms.GroupBox();
|
||||
this.mouseselectionthreshold = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
|
||||
this.label16 = new System.Windows.Forms.Label();
|
||||
this.label17 = new System.Windows.Forms.Label();
|
||||
this.splitlinedefsrange = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
|
||||
this.stitchrange = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
|
||||
this.highlightthingsrange = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
|
||||
|
|
@ -72,7 +70,10 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.label10 = new System.Windows.Forms.Label();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.heightbysidedef = new System.Windows.Forms.ComboBox();
|
||||
this.additivepaintselect = new System.Windows.Forms.CheckBox();
|
||||
this.switchviewmodes = new System.Windows.Forms.CheckBox();
|
||||
this.mouseselectionthreshold = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
|
||||
this.label16 = new System.Windows.Forms.Label();
|
||||
this.label17 = new System.Windows.Forms.Label();
|
||||
this.tabs.SuspendLayout();
|
||||
this.taboptions.SuspendLayout();
|
||||
this.groupBox4.SuspendLayout();
|
||||
|
|
@ -92,7 +93,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.tabs.Name = "tabs";
|
||||
this.tabs.Padding = new System.Drawing.Point(24, 3);
|
||||
this.tabs.SelectedIndex = 0;
|
||||
this.tabs.Size = new System.Drawing.Size(677, 449);
|
||||
this.tabs.Size = new System.Drawing.Size(685, 561);
|
||||
this.tabs.TabIndex = 0;
|
||||
//
|
||||
// taboptions
|
||||
|
|
@ -105,7 +106,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.taboptions.Location = new System.Drawing.Point(4, 22);
|
||||
this.taboptions.Name = "taboptions";
|
||||
this.taboptions.Padding = new System.Windows.Forms.Padding(3);
|
||||
this.taboptions.Size = new System.Drawing.Size(669, 423);
|
||||
this.taboptions.Size = new System.Drawing.Size(677, 535);
|
||||
this.taboptions.TabIndex = 0;
|
||||
this.taboptions.Text = "Editing";
|
||||
this.taboptions.UseVisualStyleBackColor = true;
|
||||
|
|
@ -122,7 +123,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.groupBox4.Controls.Add(this.label11);
|
||||
this.groupBox4.Location = new System.Drawing.Point(6, 261);
|
||||
this.groupBox4.Name = "groupBox4";
|
||||
this.groupBox4.Size = new System.Drawing.Size(272, 130);
|
||||
this.groupBox4.Size = new System.Drawing.Size(272, 144);
|
||||
this.groupBox4.TabIndex = 19;
|
||||
this.groupBox4.TabStop = false;
|
||||
this.groupBox4.Text = " Default sector settings";
|
||||
|
|
@ -130,7 +131,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
// label15
|
||||
//
|
||||
this.label15.AutoSize = true;
|
||||
this.label15.Location = new System.Drawing.Point(221, 28);
|
||||
this.label15.Location = new System.Drawing.Point(218, 37);
|
||||
this.label15.Name = "label15";
|
||||
this.label15.Size = new System.Drawing.Size(27, 13);
|
||||
this.label15.TabIndex = 26;
|
||||
|
|
@ -139,7 +140,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
// label14
|
||||
//
|
||||
this.label14.AutoSize = true;
|
||||
this.label14.Location = new System.Drawing.Point(221, 58);
|
||||
this.label14.Location = new System.Drawing.Point(218, 67);
|
||||
this.label14.Name = "label14";
|
||||
this.label14.Size = new System.Drawing.Size(27, 13);
|
||||
this.label14.TabIndex = 20;
|
||||
|
|
@ -156,7 +157,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.defaultfloorheight.ButtonStepSmall = 0.1F;
|
||||
this.defaultfloorheight.ButtonStepsUseModifierKeys = false;
|
||||
this.defaultfloorheight.ButtonStepsWrapAround = false;
|
||||
this.defaultfloorheight.Location = new System.Drawing.Point(156, 23);
|
||||
this.defaultfloorheight.Location = new System.Drawing.Point(153, 32);
|
||||
this.defaultfloorheight.MaximumValue = 2147483647;
|
||||
this.defaultfloorheight.Name = "defaultfloorheight";
|
||||
this.defaultfloorheight.Size = new System.Drawing.Size(59, 24);
|
||||
this.defaultfloorheight.StepValues = null;
|
||||
|
|
@ -164,7 +166,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
//
|
||||
// label13
|
||||
//
|
||||
this.label13.Location = new System.Drawing.Point(41, 28);
|
||||
this.label13.Location = new System.Drawing.Point(38, 37);
|
||||
this.label13.Name = "label13";
|
||||
this.label13.Size = new System.Drawing.Size(110, 14);
|
||||
this.label13.TabIndex = 24;
|
||||
|
|
@ -182,7 +184,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.defaultceilheight.ButtonStepSmall = 0.1F;
|
||||
this.defaultceilheight.ButtonStepsUseModifierKeys = false;
|
||||
this.defaultceilheight.ButtonStepsWrapAround = false;
|
||||
this.defaultceilheight.Location = new System.Drawing.Point(156, 53);
|
||||
this.defaultceilheight.Location = new System.Drawing.Point(153, 62);
|
||||
this.defaultceilheight.MaximumValue = 2147483647;
|
||||
this.defaultceilheight.Name = "defaultceilheight";
|
||||
this.defaultceilheight.Size = new System.Drawing.Size(59, 24);
|
||||
this.defaultceilheight.StepValues = null;
|
||||
|
|
@ -190,7 +193,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
//
|
||||
// label12
|
||||
//
|
||||
this.label12.Location = new System.Drawing.Point(41, 58);
|
||||
this.label12.Location = new System.Drawing.Point(38, 67);
|
||||
this.label12.Name = "label12";
|
||||
this.label12.Size = new System.Drawing.Size(110, 14);
|
||||
this.label12.TabIndex = 22;
|
||||
|
|
@ -208,7 +211,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.defaultbrightness.ButtonStepSmall = 0.1F;
|
||||
this.defaultbrightness.ButtonStepsUseModifierKeys = false;
|
||||
this.defaultbrightness.ButtonStepsWrapAround = false;
|
||||
this.defaultbrightness.Location = new System.Drawing.Point(156, 83);
|
||||
this.defaultbrightness.Location = new System.Drawing.Point(153, 92);
|
||||
this.defaultbrightness.MaximumValue = 2147483647;
|
||||
this.defaultbrightness.Name = "defaultbrightness";
|
||||
this.defaultbrightness.Size = new System.Drawing.Size(59, 24);
|
||||
this.defaultbrightness.StepValues = null;
|
||||
|
|
@ -216,7 +220,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
//
|
||||
// label11
|
||||
//
|
||||
this.label11.Location = new System.Drawing.Point(41, 88);
|
||||
this.label11.Location = new System.Drawing.Point(38, 97);
|
||||
this.label11.Name = "label11";
|
||||
this.label11.Size = new System.Drawing.Size(110, 14);
|
||||
this.label11.TabIndex = 20;
|
||||
|
|
@ -225,6 +229,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
//
|
||||
// groupBox3
|
||||
//
|
||||
this.groupBox3.Controls.Add(this.additivepaintselect);
|
||||
this.groupBox3.Controls.Add(this.autodrawonedit);
|
||||
this.groupBox3.Controls.Add(this.syncSelection);
|
||||
this.groupBox3.Controls.Add(this.dontMoveGeometryOutsideBounds);
|
||||
|
|
@ -238,11 +243,21 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.groupBox3.Controls.Add(this.dontusenodes);
|
||||
this.groupBox3.Location = new System.Drawing.Point(284, 104);
|
||||
this.groupBox3.Name = "groupBox3";
|
||||
this.groupBox3.Size = new System.Drawing.Size(379, 312);
|
||||
this.groupBox3.Size = new System.Drawing.Size(379, 327);
|
||||
this.groupBox3.TabIndex = 18;
|
||||
this.groupBox3.TabStop = false;
|
||||
this.groupBox3.Text = " Options ";
|
||||
//
|
||||
// additivepaintselect
|
||||
//
|
||||
this.additivepaintselect.AutoSize = true;
|
||||
this.additivepaintselect.Location = new System.Drawing.Point(13, 124);
|
||||
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;
|
||||
|
|
@ -256,7 +271,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
// syncSelection
|
||||
//
|
||||
this.syncSelection.AutoSize = true;
|
||||
this.syncSelection.Location = new System.Drawing.Point(13, 249);
|
||||
this.syncSelection.Location = new System.Drawing.Point(13, 274);
|
||||
this.syncSelection.Name = "syncSelection";
|
||||
this.syncSelection.Size = new System.Drawing.Size(295, 17);
|
||||
this.syncSelection.TabIndex = 10;
|
||||
|
|
@ -266,7 +281,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
// dontMoveGeometryOutsideBounds
|
||||
//
|
||||
this.dontMoveGeometryOutsideBounds.AutoSize = true;
|
||||
this.dontMoveGeometryOutsideBounds.Location = new System.Drawing.Point(13, 224);
|
||||
this.dontMoveGeometryOutsideBounds.Location = new System.Drawing.Point(13, 249);
|
||||
this.dontMoveGeometryOutsideBounds.Name = "dontMoveGeometryOutsideBounds";
|
||||
this.dontMoveGeometryOutsideBounds.Size = new System.Drawing.Size(323, 17);
|
||||
this.dontMoveGeometryOutsideBounds.TabIndex = 9;
|
||||
|
|
@ -276,7 +291,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
// autoaligntexturesoncreate
|
||||
//
|
||||
this.autoaligntexturesoncreate.AutoSize = true;
|
||||
this.autoaligntexturesoncreate.Location = new System.Drawing.Point(13, 199);
|
||||
this.autoaligntexturesoncreate.Location = new System.Drawing.Point(13, 224);
|
||||
this.autoaligntexturesoncreate.Name = "autoaligntexturesoncreate";
|
||||
this.autoaligntexturesoncreate.Size = new System.Drawing.Size(233, 17);
|
||||
this.autoaligntexturesoncreate.TabIndex = 7;
|
||||
|
|
@ -286,7 +301,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
// autodragonpaste
|
||||
//
|
||||
this.autodragonpaste.AutoSize = true;
|
||||
this.autodragonpaste.Location = new System.Drawing.Point(13, 174);
|
||||
this.autodragonpaste.Location = new System.Drawing.Point(13, 199);
|
||||
this.autodragonpaste.Name = "autodragonpaste";
|
||||
this.autodragonpaste.Size = new System.Drawing.Size(202, 17);
|
||||
this.autodragonpaste.TabIndex = 6;
|
||||
|
|
@ -296,7 +311,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
// visualmodeclearselection
|
||||
//
|
||||
this.visualmodeclearselection.AutoSize = true;
|
||||
this.visualmodeclearselection.Location = new System.Drawing.Point(13, 149);
|
||||
this.visualmodeclearselection.Location = new System.Drawing.Point(13, 174);
|
||||
this.visualmodeclearselection.Name = "visualmodeclearselection";
|
||||
this.visualmodeclearselection.Size = new System.Drawing.Size(216, 17);
|
||||
this.visualmodeclearselection.TabIndex = 5;
|
||||
|
|
@ -306,7 +321,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
// autoclearselection
|
||||
//
|
||||
this.autoclearselection.AutoSize = true;
|
||||
this.autoclearselection.Location = new System.Drawing.Point(13, 124);
|
||||
this.autoclearselection.Location = new System.Drawing.Point(13, 149);
|
||||
this.autoclearselection.Name = "autoclearselection";
|
||||
this.autoclearselection.Size = new System.Drawing.Size(226, 17);
|
||||
this.autoclearselection.TabIndex = 4;
|
||||
|
|
@ -346,7 +361,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
// dontusenodes
|
||||
//
|
||||
this.dontusenodes.AutoSize = true;
|
||||
this.dontusenodes.Location = new System.Drawing.Point(13, 274);
|
||||
this.dontusenodes.Location = new System.Drawing.Point(13, 299);
|
||||
this.dontusenodes.Name = "dontusenodes";
|
||||
this.dontusenodes.Size = new System.Drawing.Size(349, 17);
|
||||
this.dontusenodes.TabIndex = 12;
|
||||
|
|
@ -386,6 +401,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.splitlinedefsrange.ButtonStepsUseModifierKeys = false;
|
||||
this.splitlinedefsrange.ButtonStepsWrapAround = false;
|
||||
this.splitlinedefsrange.Location = new System.Drawing.Point(156, 111);
|
||||
this.splitlinedefsrange.MaximumValue = 2147483647;
|
||||
this.splitlinedefsrange.Name = "splitlinedefsrange";
|
||||
this.splitlinedefsrange.Size = new System.Drawing.Size(59, 24);
|
||||
this.splitlinedefsrange.StepValues = null;
|
||||
|
|
@ -403,6 +419,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.stitchrange.ButtonStepsUseModifierKeys = false;
|
||||
this.stitchrange.ButtonStepsWrapAround = false;
|
||||
this.stitchrange.Location = new System.Drawing.Point(156, 81);
|
||||
this.stitchrange.MaximumValue = 2147483647;
|
||||
this.stitchrange.Name = "stitchrange";
|
||||
this.stitchrange.Size = new System.Drawing.Size(59, 24);
|
||||
this.stitchrange.StepValues = null;
|
||||
|
|
@ -420,6 +437,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.highlightthingsrange.ButtonStepsUseModifierKeys = false;
|
||||
this.highlightthingsrange.ButtonStepsWrapAround = false;
|
||||
this.highlightthingsrange.Location = new System.Drawing.Point(156, 51);
|
||||
this.highlightthingsrange.MaximumValue = 2147483647;
|
||||
this.highlightthingsrange.Name = "highlightthingsrange";
|
||||
this.highlightthingsrange.Size = new System.Drawing.Size(59, 24);
|
||||
this.highlightthingsrange.StepValues = null;
|
||||
|
|
@ -437,6 +455,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.highlightrange.ButtonStepsUseModifierKeys = false;
|
||||
this.highlightrange.ButtonStepsWrapAround = false;
|
||||
this.highlightrange.Location = new System.Drawing.Point(156, 21);
|
||||
this.highlightrange.MaximumValue = 2147483647;
|
||||
this.highlightrange.Name = "highlightrange";
|
||||
this.highlightrange.Size = new System.Drawing.Size(59, 24);
|
||||
this.highlightrange.StepValues = null;
|
||||
|
|
@ -579,15 +598,44 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.heightbysidedef.Size = new System.Drawing.Size(309, 21);
|
||||
this.heightbysidedef.TabIndex = 0;
|
||||
//
|
||||
// additivepaintselect
|
||||
// switchviewmodes
|
||||
//
|
||||
this.additivepaintselect.AutoSize = true;
|
||||
this.additivepaintselect.Location = new System.Drawing.Point(13, 135);
|
||||
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;
|
||||
this.switchviewmodes.Location = new System.Drawing.Point(0, 0);
|
||||
this.switchviewmodes.Name = "switchviewmodes";
|
||||
this.switchviewmodes.Size = new System.Drawing.Size(104, 24);
|
||||
this.switchviewmodes.TabIndex = 0;
|
||||
//
|
||||
// mouseselectionthreshold
|
||||
//
|
||||
this.mouseselectionthreshold.AllowDecimal = false;
|
||||
this.mouseselectionthreshold.AllowNegative = false;
|
||||
this.mouseselectionthreshold.AllowRelative = false;
|
||||
this.mouseselectionthreshold.ButtonStep = 1;
|
||||
this.mouseselectionthreshold.ButtonStepBig = 10F;
|
||||
this.mouseselectionthreshold.ButtonStepFloat = 1F;
|
||||
this.mouseselectionthreshold.ButtonStepSmall = 0.1F;
|
||||
this.mouseselectionthreshold.ButtonStepsUseModifierKeys = false;
|
||||
this.mouseselectionthreshold.ButtonStepsWrapAround = false;
|
||||
this.mouseselectionthreshold.Location = new System.Drawing.Point(0, 0);
|
||||
this.mouseselectionthreshold.MaximumValue = 2147483647;
|
||||
this.mouseselectionthreshold.Name = "mouseselectionthreshold";
|
||||
this.mouseselectionthreshold.Size = new System.Drawing.Size(289, 24);
|
||||
this.mouseselectionthreshold.StepValues = null;
|
||||
this.mouseselectionthreshold.TabIndex = 0;
|
||||
//
|
||||
// label16
|
||||
//
|
||||
this.label16.Location = new System.Drawing.Point(0, 0);
|
||||
this.label16.Name = "label16";
|
||||
this.label16.Size = new System.Drawing.Size(100, 23);
|
||||
this.label16.TabIndex = 0;
|
||||
//
|
||||
// label17
|
||||
//
|
||||
this.label17.Location = new System.Drawing.Point(0, 0);
|
||||
this.label17.Name = "label17";
|
||||
this.label17.Size = new System.Drawing.Size(100, 23);
|
||||
this.label17.TabIndex = 0;
|
||||
//
|
||||
// PreferencesForm
|
||||
//
|
||||
|
|
@ -598,6 +646,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.MaximizeBox = false;
|
||||
this.MinimizeBox = false;
|
||||
this.Name = "PreferencesForm";
|
||||
this.Opacity = 1D;
|
||||
this.ShowIcon = false;
|
||||
this.Text = "PreferencesForm";
|
||||
this.tabs.ResumeLayout(false);
|
||||
|
|
|
|||
|
|
@ -112,12 +112,12 @@
|
|||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<metadata name="tabs.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<metadata name="tabs.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
|
|
|
|||
|
|
@ -1423,7 +1423,6 @@ togglecolormaps
|
|||
allowscroll = false;
|
||||
default = 262211; //Alt+C
|
||||
}
|
||||
}
|
||||
|
||||
// biwa
|
||||
visualpaintselect
|
||||
|
|
|
|||
Loading…
Reference in a new issue