From 568618b9290f0326535b086d1cef7b0e932e10fa Mon Sep 17 00:00:00 2001 From: spherallic Date: Thu, 27 Apr 2023 03:08:56 +0200 Subject: [PATCH] Correct preferences form --- .../Core/Windows/PreferencesForm.Designer.cs | 240 +++++++++--------- Source/Core/Windows/PreferencesForm.resx | 8 +- 2 files changed, 121 insertions(+), 127 deletions(-) diff --git a/Source/Core/Windows/PreferencesForm.Designer.cs b/Source/Core/Windows/PreferencesForm.Designer.cs index 3e4d712..ba94fc8 100644 --- a/Source/Core/Windows/PreferencesForm.Designer.cs +++ b/Source/Core/Windows/PreferencesForm.Designer.cs @@ -42,6 +42,7 @@ namespace CodeImp.DoomBuilder.Windows System.Windows.Forms.Label label31; System.Windows.Forms.Label label32; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PreferencesForm)); + this.autolaunchontest = new System.Windows.Forms.CheckBox(); this.keepfilterfocused = new System.Windows.Forms.CheckBox(); this.maxBackups = new System.Windows.Forms.TrackBar(); this.labelBackups = new System.Windows.Forms.Label(); @@ -70,21 +71,21 @@ 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(); - this.doublesidedalpha = new System.Windows.Forms.TrackBar(); this.colorgrid64 = new CodeImp.DoomBuilder.Controls.ColorControl(); this.colorgrid = new CodeImp.DoomBuilder.Controls.ColorControl(); this.colorindication = new CodeImp.DoomBuilder.Controls.ColorControl(); this.colorbackcolor = new CodeImp.DoomBuilder.Controls.ColorControl(); - this.doublesidedalphalabel = new System.Windows.Forms.Label(); this.colorselection = new CodeImp.DoomBuilder.Controls.ColorControl(); this.colorvertices = new CodeImp.DoomBuilder.Controls.ColorControl(); this.colorhighlight = new CodeImp.DoomBuilder.Controls.ColorControl(); this.colorlinedefs = new CodeImp.DoomBuilder.Controls.ColorControl(); this.colorguidelines = new CodeImp.DoomBuilder.Controls.ColorControl(); + this.label2 = new System.Windows.Forms.Label(); + this.doublesidedalpha = new System.Windows.Forms.TrackBar(); + this.doublesidedalphalabel = new System.Windows.Forms.Label(); this.cbStretchView = new System.Windows.Forms.CheckBox(); this.qualitydisplay = new System.Windows.Forms.CheckBox(); this.cancel = new System.Windows.Forms.Button(); @@ -150,14 +151,15 @@ namespace CodeImp.DoomBuilder.Windows this.actionkey = new System.Windows.Forms.TextBox(); this.tabcolors = new System.Windows.Forms.TabPage(); this.appearancegroup1 = new System.Windows.Forms.GroupBox(); - this.activethingsalphalabel = new System.Windows.Forms.Label(); - this.inactivethingsalphalabel = new System.Windows.Forms.Label(); - this.hiddenthingsalphalabel = new System.Windows.Forms.Label(); this.hiddenthingsalpha = new System.Windows.Forms.TrackBar(); this.inactivethingsalpha = new System.Windows.Forms.TrackBar(); this.activethingsalpha = new System.Windows.Forms.TrackBar(); - this.labelDefaultThingSize = new System.Windows.Forms.Label(); this.tbDefaultThingSize = new System.Windows.Forms.TrackBar(); + this.imagebrightness = new System.Windows.Forms.TrackBar(); + this.activethingsalphalabel = new System.Windows.Forms.Label(); + this.inactivethingsalphalabel = new System.Windows.Forms.Label(); + this.hiddenthingsalphalabel = new System.Windows.Forms.Label(); + this.labelDefaultThingSize = new System.Windows.Forms.Label(); this.cbDrawThingsFixedSize = new System.Windows.Forms.CheckBox(); this.cbDrawCrosshair = new System.Windows.Forms.CheckBox(); this.cbDrawFullCrosshair = new System.Windows.Forms.CheckBox(); @@ -165,13 +167,12 @@ namespace CodeImp.DoomBuilder.Windows this.cbMarkExtraFloors = new System.Windows.Forms.CheckBox(); this.cbOldHighlightMode = new System.Windows.Forms.CheckBox(); this.labelDynLightCount = new System.Windows.Forms.Label(); - this.tbDynLightCount = new System.Windows.Forms.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 System.Windows.Forms.TrackBar(); + this.tbDynLightCount = new System.Windows.Forms.TrackBar(); this.nightsgroup = new System.Windows.Forms.GroupBox(); this.nightscolormare8 = new CodeImp.DoomBuilder.Controls.ColorControl(); this.nightscolormare7 = new CodeImp.DoomBuilder.Controls.ColorControl(); @@ -231,7 +232,6 @@ namespace CodeImp.DoomBuilder.Windows this.pasteoptions = new CodeImp.DoomBuilder.Controls.PasteOptionsControl(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.browseScreenshotsFolderDialog = new System.Windows.Forms.FolderBrowserDialog(); - this.autolaunchontest = new System.Windows.Forms.CheckBox(); label7 = new System.Windows.Forms.Label(); label5 = new System.Windows.Forms.Label(); groupBox1 = new System.Windows.Forms.GroupBox(); @@ -270,8 +270,8 @@ namespace CodeImp.DoomBuilder.Windows ((System.ComponentModel.ISupportInitialize)(this.inactivethingsalpha)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.activethingsalpha)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tbDefaultThingSize)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.tbDynLightCount)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.imagebrightness)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.tbDynLightCount)).BeginInit(); this.nightsgroup.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nightscircleprecision)).BeginInit(); this.tabscripteditor.SuspendLayout(); @@ -336,10 +336,20 @@ namespace CodeImp.DoomBuilder.Windows groupBox1.TabStop = false; groupBox1.Text = " Options "; // + // autolaunchontest + // + this.autolaunchontest.AutoSize = true; + this.autolaunchontest.Location = new System.Drawing.Point(32, 445); + this.autolaunchontest.Name = "autolaunchontest"; + this.autolaunchontest.Size = new System.Drawing.Size(301, 17); + this.autolaunchontest.TabIndex = 50; + this.autolaunchontest.Text = "Automatically launch engine when test parameters change"; + this.autolaunchontest.UseVisualStyleBackColor = true; + // // keepfilterfocused // this.keepfilterfocused.AutoSize = true; - this.keepfilterfocused.Location = new System.Drawing.Point(32, 356); + this.keepfilterfocused.Location = new System.Drawing.Point(32, 345); this.keepfilterfocused.Name = "keepfilterfocused"; this.keepfilterfocused.Size = new System.Drawing.Size(280, 17); this.keepfilterfocused.TabIndex = 52; @@ -383,7 +393,7 @@ namespace CodeImp.DoomBuilder.Windows // cbStoreEditTab // this.cbStoreEditTab.AutoSize = true; - this.cbStoreEditTab.Location = new System.Drawing.Point(32, 440); + this.cbStoreEditTab.Location = new System.Drawing.Point(32, 425); this.cbStoreEditTab.Name = "cbStoreEditTab"; this.cbStoreEditTab.Size = new System.Drawing.Size(203, 17); this.cbStoreEditTab.TabIndex = 50; @@ -393,7 +403,7 @@ namespace CodeImp.DoomBuilder.Windows // locatetexturegroup // this.locatetexturegroup.AutoSize = true; - this.locatetexturegroup.Location = new System.Drawing.Point(32, 398); + this.locatetexturegroup.Location = new System.Drawing.Point(32, 385); this.locatetexturegroup.Name = "locatetexturegroup"; this.locatetexturegroup.Size = new System.Drawing.Size(267, 17); this.locatetexturegroup.TabIndex = 49; @@ -470,7 +480,7 @@ namespace CodeImp.DoomBuilder.Windows // cbSynchCameras // this.cbSynchCameras.AutoSize = true; - this.cbSynchCameras.Location = new System.Drawing.Point(32, 419); + this.cbSynchCameras.Location = new System.Drawing.Point(32, 405); this.cbSynchCameras.Name = "cbSynchCameras"; this.cbSynchCameras.Size = new System.Drawing.Size(260, 17); this.cbSynchCameras.TabIndex = 42; @@ -480,7 +490,7 @@ namespace CodeImp.DoomBuilder.Windows // showtexturesizes // this.showtexturesizes.AutoSize = true; - this.showtexturesizes.Location = new System.Drawing.Point(32, 377); + this.showtexturesizes.Location = new System.Drawing.Point(32, 365); this.showtexturesizes.Name = "showtexturesizes"; this.showtexturesizes.Size = new System.Drawing.Size(208, 17); this.showtexturesizes.TabIndex = 41; @@ -490,7 +500,7 @@ namespace CodeImp.DoomBuilder.Windows // scriptontop // this.scriptontop.AutoSize = true; - this.scriptontop.Location = new System.Drawing.Point(32, 335); + this.scriptontop.Location = new System.Drawing.Point(32, 325); this.scriptontop.Name = "scriptontop"; this.scriptontop.Size = new System.Drawing.Size(227, 17); this.scriptontop.TabIndex = 40; @@ -711,16 +721,6 @@ 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; @@ -754,17 +754,6 @@ namespace CodeImp.DoomBuilder.Windows this.colorMD3.Size = new System.Drawing.Size(168, 23); this.colorMD3.TabIndex = 17; // - // doublesidedalpha - // - this.doublesidedalpha.BackColor = System.Drawing.SystemColors.Window; - this.doublesidedalpha.LargeChange = 3; - this.doublesidedalpha.Location = new System.Drawing.Point(194, 19); - this.doublesidedalpha.Name = "doublesidedalpha"; - 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); - // // colorgrid64 // this.colorgrid64.BackColor = System.Drawing.Color.Transparent; @@ -809,15 +798,6 @@ namespace CodeImp.DoomBuilder.Windows this.colorbackcolor.Size = new System.Drawing.Size(168, 23); this.colorbackcolor.TabIndex = 0; // - // doublesidedalphalabel - // - this.doublesidedalphalabel.AutoSize = true; - 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; - this.doublesidedalphalabel.Text = "0%"; - // // colorselection // this.colorselection.BackColor = System.Drawing.Color.Transparent; @@ -873,6 +853,36 @@ namespace CodeImp.DoomBuilder.Windows this.colorguidelines.Size = new System.Drawing.Size(168, 23); this.colorguidelines.TabIndex = 11; // + // 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; + // + // doublesidedalpha + // + this.doublesidedalpha.BackColor = System.Drawing.SystemColors.Window; + this.doublesidedalpha.LargeChange = 3; + this.doublesidedalpha.Location = new System.Drawing.Point(194, 19); + this.doublesidedalpha.Name = "doublesidedalpha"; + 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); + // + // doublesidedalphalabel + // + this.doublesidedalphalabel.AutoSize = true; + 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; + this.doublesidedalphalabel.Text = "0%"; + // // cbStretchView // this.cbStretchView.AutoSize = true; @@ -1673,33 +1683,6 @@ namespace CodeImp.DoomBuilder.Windows this.appearancegroup1.TabStop = false; this.appearancegroup1.Text = " Additional Options "; // - // activethingsalphalabel - // - this.activethingsalphalabel.AutoSize = true; - 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; - this.activethingsalphalabel.Text = "0%"; - // - // inactivethingsalphalabel - // - this.inactivethingsalphalabel.AutoSize = true; - 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; - this.inactivethingsalphalabel.Text = "0%"; - // - // hiddenthingsalphalabel - // - this.hiddenthingsalphalabel.AutoSize = true; - 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; - this.hiddenthingsalphalabel.Text = "0%"; - // // hiddenthingsalpha // this.hiddenthingsalpha.BackColor = System.Drawing.SystemColors.Window; @@ -1733,15 +1716,6 @@ namespace CodeImp.DoomBuilder.Windows this.activethingsalpha.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.activethingsalpha.ValueChanged += new System.EventHandler(this.activethingsalpha_ValueChanged); // - // labelDefaultThingSize - // - this.labelDefaultThingSize.AutoSize = true; - 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; - this.labelDefaultThingSize.Text = "8"; - // // tbDefaultThingSize // this.tbDefaultThingSize.BackColor = System.Drawing.SystemColors.Window; @@ -1757,6 +1731,53 @@ namespace CodeImp.DoomBuilder.Windows this.tbDefaultThingSize.Value = 8; this.tbDefaultThingSize.ValueChanged += new System.EventHandler(this.tbDefaultThingSize_ValueChanged); // + // imagebrightness + // + this.imagebrightness.BackColor = System.Drawing.SystemColors.Window; + this.imagebrightness.LargeChange = 3; + 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; + this.imagebrightness.TickStyle = System.Windows.Forms.TickStyle.TopLeft; + this.imagebrightness.ValueChanged += new System.EventHandler(this.imagebrightness_ValueChanged); + // + // activethingsalphalabel + // + this.activethingsalphalabel.AutoSize = true; + 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; + this.activethingsalphalabel.Text = "0%"; + // + // inactivethingsalphalabel + // + this.inactivethingsalphalabel.AutoSize = true; + 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; + this.inactivethingsalphalabel.Text = "0%"; + // + // hiddenthingsalphalabel + // + this.hiddenthingsalphalabel.AutoSize = true; + 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; + this.hiddenthingsalphalabel.Text = "0%"; + // + // labelDefaultThingSize + // + this.labelDefaultThingSize.AutoSize = true; + 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; + this.labelDefaultThingSize.Text = "8"; + // // cbDrawThingsFixedSize // this.cbDrawThingsFixedSize.AutoSize = true; @@ -1839,23 +1860,6 @@ namespace CodeImp.DoomBuilder.Windows this.labelDynLightCount.Text = "16"; this.labelDynLightCount.Visible = false; // - // tbDynLightCount - // - this.tbDynLightCount.BackColor = System.Drawing.SystemColors.Window; - this.tbDynLightCount.Enabled = false; - this.tbDynLightCount.LargeChange = 3; - this.tbDynLightCount.Location = new System.Drawing.Point(194, 223); - 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.TopLeft; - this.tbDynLightCount.Value = 1; - this.tbDynLightCount.Visible = false; - this.tbDynLightCount.ValueChanged += new System.EventHandler(this.tbDynLightCount_ValueChanged); - // // animatevisualselection // this.animatevisualselection.AutoSize = true; @@ -1905,16 +1909,22 @@ namespace CodeImp.DoomBuilder.Windows this.imagebrightnesslabel.TabIndex = 22; this.imagebrightnesslabel.Text = "+ 0 y"; // - // imagebrightness + // tbDynLightCount // - this.imagebrightness.BackColor = System.Drawing.SystemColors.Window; - this.imagebrightness.LargeChange = 3; - 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; - this.imagebrightness.TickStyle = System.Windows.Forms.TickStyle.TopLeft; - this.imagebrightness.ValueChanged += new System.EventHandler(this.imagebrightness_ValueChanged); + this.tbDynLightCount.BackColor = System.Drawing.SystemColors.Window; + this.tbDynLightCount.Enabled = false; + this.tbDynLightCount.LargeChange = 3; + this.tbDynLightCount.Location = new System.Drawing.Point(194, 223); + 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.TopLeft; + this.tbDynLightCount.Value = 1; + this.tbDynLightCount.Visible = false; + this.tbDynLightCount.ValueChanged += new System.EventHandler(this.tbDynLightCount_ValueChanged); // // nightsgroup // @@ -2642,16 +2652,6 @@ namespace CodeImp.DoomBuilder.Windows // this.browseScreenshotsFolderDialog.Description = "Select a Folder to Save Screenshots Into"; // - // autolaunchontest - // - this.autolaunchontest.AutoSize = true; - this.autolaunchontest.Location = new System.Drawing.Point(16, 392); - this.autolaunchontest.Name = "autolaunchontest"; - this.autolaunchontest.Size = new System.Drawing.Size(301, 17); - this.autolaunchontest.TabIndex = 50; - this.autolaunchontest.Text = "Automatically launch engine when test parameters change"; - this.autolaunchontest.UseVisualStyleBackColor = true; - // // PreferencesForm // this.AcceptButton = this.apply; @@ -2711,8 +2711,8 @@ namespace CodeImp.DoomBuilder.Windows ((System.ComponentModel.ISupportInitialize)(this.inactivethingsalpha)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.activethingsalpha)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tbDefaultThingSize)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.tbDynLightCount)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.imagebrightness)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.tbDynLightCount)).EndInit(); this.nightsgroup.ResumeLayout(false); this.nightsgroup.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.nightscircleprecision)).EndInit(); diff --git a/Source/Core/Windows/PreferencesForm.resx b/Source/Core/Windows/PreferencesForm.resx index c6bb4dd..67fe7d5 100644 --- a/Source/Core/Windows/PreferencesForm.resx +++ b/Source/Core/Windows/PreferencesForm.resx @@ -135,9 +135,6 @@ False - - 17, 17 - False @@ -150,9 +147,6 @@ False - - 17, 17 - When enabled, the opening brace will be placed on a new line when @@ -168,6 +162,6 @@ they will be replaced with tabs/spaces. 114, 17 - 50 + 25 \ No newline at end of file