diff --git a/Source/Core/Config/ProgramConfiguration.cs b/Source/Core/Config/ProgramConfiguration.cs index 525bafd..bbbc74f 100644 --- a/Source/Core/Config/ProgramConfiguration.cs +++ b/Source/Core/Config/ProgramConfiguration.cs @@ -93,6 +93,7 @@ public class ProgramConfiguration private bool toolbargeometry; private bool toolbartesting; private bool toolbarfile; + private bool showfps; // These are not stored in the configuration, only used at runtime private string defaulttexture; @@ -155,6 +156,7 @@ public class ProgramConfiguration public bool ToolbarGeometry { get { return toolbargeometry; } internal set { toolbargeometry = value; } } public bool ToolbarTesting { get { return toolbartesting; } internal set { toolbartesting = value; } } public bool ToolbarFile { get { return toolbarfile; } internal set { toolbarfile = value; } } + public bool ShowFPS { get { return showfps; } internal set { showfps = value; } } public string DefaultTexture { get { return defaulttexture; } set { defaulttexture = value; } } public string DefaultFloorTexture { get { return defaultfloortexture; } set { defaultfloortexture = value; } } @@ -234,6 +236,7 @@ internal bool Load(string cfgfilepathname, string defaultfilepathname) toolbargeometry = cfg.ReadSetting("toolbargeometry", true); toolbartesting = cfg.ReadSetting("toolbartesting", true); toolbarfile = cfg.ReadSetting("toolbarfile", true); + showfps = cfg.ReadSetting("showfps", false); // Success return true; @@ -295,6 +298,7 @@ internal void Save(string filepathname) cfg.WriteSetting("toolbargeometry", toolbargeometry); cfg.WriteSetting("toolbartesting", toolbartesting); cfg.WriteSetting("toolbarfile", toolbarfile); + cfg.WriteSetting("showfps", showfps); // Save settings configuration General.WriteLogLine("Saving program configuration..."); diff --git a/Source/Core/Rendering/Renderer3D.cs b/Source/Core/Rendering/Renderer3D.cs index ad4e29d..87e9d57 100644 --- a/Source/Core/Rendering/Renderer3D.cs +++ b/Source/Core/Rendering/Renderer3D.cs @@ -433,7 +433,7 @@ public void ApplyMatrices2D() // This starts rendering public bool Start() { - if (!fpsWatch.IsRunning) + if (General.Settings.ShowFPS && !fpsWatch.IsRunning) { fpsWatch.Start(); } @@ -566,13 +566,16 @@ public void FinishGeometry() graphics.Shaders.World3D.End(); geometry = null; - fps++; - if (fpsWatch.ElapsedMilliseconds > 1000) + if (General.Settings.ShowFPS) { - fpsLabel.Text = string.Format("{0} FPS", fps); - fps = 0; - fpsWatch.Reset(); - fpsWatch.Start(); + fps++; + if (fpsWatch.ElapsedMilliseconds > 1000) + { + fpsLabel.Text = string.Format("{0} FPS", fps); + fps = 0; + fpsWatch.Reset(); + fpsWatch.Start(); + } } } @@ -1015,7 +1018,10 @@ public void RenderCrosshair() graphics.Shaders.Display2D.EndPass(); graphics.Shaders.Display2D.End(); - General.Map.Renderer2D.RenderText(fpsLabel); + if (General.Settings.ShowFPS) + { + General.Map.Renderer2D.RenderText(fpsLabel); + } } // This switches fog on and off diff --git a/Source/Core/Windows/PreferencesForm.Designer.cs b/Source/Core/Windows/PreferencesForm.Designer.cs index 5298e5b..eff9792 100644 --- a/Source/Core/Windows/PreferencesForm.Designer.cs +++ b/Source/Core/Windows/PreferencesForm.Designer.cs @@ -104,8 +104,8 @@ private void InitializeComponent() 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.columncontrolaction = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columncontrolkey = ((System.Windows.Forms.ColumnHeader)(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(); @@ -119,6 +119,7 @@ private void InitializeComponent() this.animatevisualselection = new System.Windows.Forms.CheckBox(); this.blackbrowsers = new System.Windows.Forms.CheckBox(); this.visualbilinear = new System.Windows.Forms.CheckBox(); + this.cbShowFPS = new System.Windows.Forms.CheckBox(); this.classicbilinear = new System.Windows.Forms.CheckBox(); this.imagebrightnesslabel = new System.Windows.Forms.Label(); this.imagebrightness = new CodeImp.DoomBuilder.Controls.TransparentTrackBar(); @@ -177,27 +178,30 @@ private void InitializeComponent() // label7 // label7.AutoSize = true; - label7.Location = new System.Drawing.Point(20, 172); + label7.Location = new System.Drawing.Point(25, 215); + label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label7.Name = "label7"; - label7.Size = new System.Drawing.Size(187, 14); + label7.Size = new System.Drawing.Size(243, 16); 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.Location = new System.Drawing.Point(25, 38); + label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label6.Name = "label6"; - label6.Size = new System.Drawing.Size(41, 14); + label6.Size = new System.Drawing.Size(50, 16); label6.TabIndex = 2; label6.Text = "Action:"; // // label5 // label5.AutoSize = true; - label5.Location = new System.Drawing.Point(20, 122); + label5.Location = new System.Drawing.Point(25, 152); + label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label5.Name = "label5"; - label5.Size = new System.Drawing.Size(200, 14); + label5.Size = new System.Drawing.Size(261, 16); label5.TabIndex = 4; label5.Text = "Press the desired key combination here:"; // @@ -215,9 +219,11 @@ private void InitializeComponent() groupBox1.Controls.Add(this.label12); groupBox1.Controls.Add(this.label14); groupBox1.Controls.Add(this.defaultviewmode); - groupBox1.Location = new System.Drawing.Point(8, 8); + groupBox1.Location = new System.Drawing.Point(10, 10); + groupBox1.Margin = new System.Windows.Forms.Padding(4); groupBox1.Name = "groupBox1"; - groupBox1.Size = new System.Drawing.Size(331, 286); + groupBox1.Padding = new System.Windows.Forms.Padding(4); + groupBox1.Size = new System.Drawing.Size(414, 358); groupBox1.TabIndex = 0; groupBox1.TabStop = false; groupBox1.Text = " Options "; @@ -225,20 +231,23 @@ private void InitializeComponent() // scriptontop // this.scriptontop.AutoSize = true; - this.scriptontop.Location = new System.Drawing.Point(32, 248); + this.scriptontop.Location = new System.Drawing.Point(40, 310); + this.scriptontop.Margin = new System.Windows.Forms.Padding(4); this.scriptontop.Name = "scriptontop"; - this.scriptontop.Size = new System.Drawing.Size(237, 18); + this.scriptontop.Size = new System.Drawing.Size(295, 20); this.scriptontop.TabIndex = 40; this.scriptontop.Text = "Script Editor always on top of main window"; this.scriptontop.UseVisualStyleBackColor = true; // // zoomfactor // + this.zoomfactor.BackColor = System.Drawing.Color.Transparent; this.zoomfactor.LargeChange = 1; - this.zoomfactor.Location = new System.Drawing.Point(127, 187); + this.zoomfactor.Location = new System.Drawing.Point(159, 234); + this.zoomfactor.Margin = new System.Windows.Forms.Padding(4); this.zoomfactor.Minimum = 1; this.zoomfactor.Name = "zoomfactor"; - this.zoomfactor.Size = new System.Drawing.Size(116, 42); + this.zoomfactor.Size = new System.Drawing.Size(145, 56); this.zoomfactor.TabIndex = 37; this.zoomfactor.TickStyle = System.Windows.Forms.TickStyle.Both; this.zoomfactor.Value = 3; @@ -247,28 +256,32 @@ private void InitializeComponent() // zoomfactorlabel // this.zoomfactorlabel.AutoSize = true; - this.zoomfactorlabel.Location = new System.Drawing.Point(249, 199); + this.zoomfactorlabel.Location = new System.Drawing.Point(311, 249); + this.zoomfactorlabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.zoomfactorlabel.Name = "zoomfactorlabel"; - this.zoomfactorlabel.Size = new System.Drawing.Size(29, 14); + this.zoomfactorlabel.Size = new System.Drawing.Size(35, 16); this.zoomfactorlabel.TabIndex = 39; this.zoomfactorlabel.Text = "30%"; // // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(52, 199); + this.label19.Location = new System.Drawing.Point(65, 249); + this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(69, 14); + this.label19.Size = new System.Drawing.Size(86, 16); this.label19.TabIndex = 38; this.label19.Text = "Zoom factor:"; // // autoscrollspeed // + this.autoscrollspeed.BackColor = System.Drawing.Color.Transparent; this.autoscrollspeed.LargeChange = 1; - this.autoscrollspeed.Location = new System.Drawing.Point(127, 135); + this.autoscrollspeed.Location = new System.Drawing.Point(159, 169); + this.autoscrollspeed.Margin = new System.Windows.Forms.Padding(4); this.autoscrollspeed.Maximum = 5; this.autoscrollspeed.Name = "autoscrollspeed"; - this.autoscrollspeed.Size = new System.Drawing.Size(116, 42); + this.autoscrollspeed.Size = new System.Drawing.Size(145, 56); this.autoscrollspeed.TabIndex = 2; this.autoscrollspeed.TickStyle = System.Windows.Forms.TickStyle.Both; this.autoscrollspeed.ValueChanged += new System.EventHandler(this.autoscrollspeed_ValueChanged); @@ -276,28 +289,32 @@ private void InitializeComponent() // autoscrollspeedlabel // this.autoscrollspeedlabel.AutoSize = true; - this.autoscrollspeedlabel.Location = new System.Drawing.Point(249, 147); + this.autoscrollspeedlabel.Location = new System.Drawing.Point(311, 184); + this.autoscrollspeedlabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.autoscrollspeedlabel.Name = "autoscrollspeedlabel"; - this.autoscrollspeedlabel.Size = new System.Drawing.Size(23, 14); + this.autoscrollspeedlabel.Size = new System.Drawing.Size(26, 16); this.autoscrollspeedlabel.TabIndex = 36; this.autoscrollspeedlabel.Text = "Off"; // // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(29, 147); + this.label15.Location = new System.Drawing.Point(36, 184); + this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(92, 14); + this.label15.Size = new System.Drawing.Size(116, 16); this.label15.TabIndex = 35; this.label15.Text = "Autoscroll speed:"; // // previewsize // + this.previewsize.BackColor = System.Drawing.Color.Transparent; this.previewsize.LargeChange = 1; - this.previewsize.Location = new System.Drawing.Point(127, 81); + this.previewsize.Location = new System.Drawing.Point(159, 101); + this.previewsize.Margin = new System.Windows.Forms.Padding(4); this.previewsize.Maximum = 5; this.previewsize.Name = "previewsize"; - this.previewsize.Size = new System.Drawing.Size(116, 42); + this.previewsize.Size = new System.Drawing.Size(145, 56); this.previewsize.TabIndex = 1; this.previewsize.TickStyle = System.Windows.Forms.TickStyle.Both; this.previewsize.Value = 5; @@ -306,27 +323,30 @@ private void InitializeComponent() // previewsizelabel // this.previewsizelabel.AutoSize = true; - this.previewsizelabel.Location = new System.Drawing.Point(249, 93); + this.previewsizelabel.Location = new System.Drawing.Point(311, 116); + this.previewsizelabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.previewsizelabel.Name = "previewsizelabel"; - this.previewsizelabel.Size = new System.Drawing.Size(55, 14); + this.previewsizelabel.Size = new System.Drawing.Size(69, 16); this.previewsizelabel.TabIndex = 33; this.previewsizelabel.Text = "128 x 128"; // // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(17, 93); + this.label12.Location = new System.Drawing.Point(21, 116); + this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(104, 14); + this.label12.Size = new System.Drawing.Size(130, 16); this.label12.TabIndex = 32; this.label12.Text = "Preview image size:"; // // label14 // this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(50, 41); + this.label14.Location = new System.Drawing.Point(62, 51); + this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(71, 14); + this.label14.Size = new System.Drawing.Size(87, 16); this.label14.TabIndex = 14; this.label14.Text = "Default view:"; // @@ -336,20 +356,21 @@ private void InitializeComponent() 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, 38); + this.defaultviewmode.Location = new System.Drawing.Point(169, 48); + this.defaultviewmode.Margin = new System.Windows.Forms.Padding(4); this.defaultviewmode.Name = "defaultviewmode"; - this.defaultviewmode.Size = new System.Drawing.Size(145, 22); + this.defaultviewmode.Size = new System.Drawing.Size(180, 24); this.defaultviewmode.TabIndex = 0; // // label1 // label1.AutoSize = true; - label1.Location = new System.Drawing.Point(22, 40); + label1.Location = new System.Drawing.Point(28, 50); + label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label1.Name = "label1"; - label1.Size = new System.Drawing.Size(148, 14); + label1.Size = new System.Drawing.Size(190, 16); label1.TabIndex = 20; label1.Text = "Texture and Flats brightness:"; label1.TextAlign = System.Drawing.ContentAlignment.TopRight; @@ -357,17 +378,18 @@ private void InitializeComponent() // keyusedlabel // this.keyusedlabel.AutoSize = true; - this.keyusedlabel.Location = new System.Drawing.Point(20, 287); + this.keyusedlabel.Location = new System.Drawing.Point(25, 359); + this.keyusedlabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.keyusedlabel.Name = "keyusedlabel"; - this.keyusedlabel.Size = new System.Drawing.Size(222, 14); + this.keyusedlabel.Size = new System.Drawing.Size(287, 16); 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.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.colorTagonly); this.colorsgroup1.Controls.Add(this.colorSecret); this.colorsgroup1.Controls.Add(this.colorMblock); @@ -382,9 +404,11 @@ private void InitializeComponent() this.colorsgroup1.Controls.Add(this.colorvertices); this.colorsgroup1.Controls.Add(this.colorhighlight); this.colorsgroup1.Controls.Add(this.colorlinedefs); - this.colorsgroup1.Location = new System.Drawing.Point(8, 8); + this.colorsgroup1.Location = new System.Drawing.Point(10, 10); + this.colorsgroup1.Margin = new System.Windows.Forms.Padding(4); this.colorsgroup1.Name = "colorsgroup1"; - this.colorsgroup1.Size = new System.Drawing.Size(203, 472); + this.colorsgroup1.Padding = new System.Windows.Forms.Padding(4); + this.colorsgroup1.Size = new System.Drawing.Size(254, 590); this.colorsgroup1.TabIndex = 0; this.colorsgroup1.TabStop = false; this.colorsgroup1.Text = " Display "; @@ -395,11 +419,12 @@ private void InitializeComponent() this.colorTagonly.BackColor = System.Drawing.Color.Transparent; this.colorTagonly.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.colorTagonly.Label = "Tag only lines:"; - this.colorTagonly.Location = new System.Drawing.Point(15, 378); - this.colorTagonly.MaximumSize = new System.Drawing.Size(10000, 23); - this.colorTagonly.MinimumSize = new System.Drawing.Size(100, 23); + this.colorTagonly.Location = new System.Drawing.Point(19, 472); + this.colorTagonly.Margin = new System.Windows.Forms.Padding(5); + this.colorTagonly.MaximumSize = new System.Drawing.Size(12500, 29); + this.colorTagonly.MinimumSize = new System.Drawing.Size(125, 29); this.colorTagonly.Name = "colorTagonly"; - this.colorTagonly.Size = new System.Drawing.Size(168, 23); + this.colorTagonly.Size = new System.Drawing.Size(210, 29); this.colorTagonly.TabIndex = 17; // // colorSecret @@ -407,11 +432,12 @@ private void InitializeComponent() this.colorSecret.BackColor = System.Drawing.Color.Transparent; this.colorSecret.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.colorSecret.Label = "Secret lines:"; - this.colorSecret.Location = new System.Drawing.Point(15, 351); - this.colorSecret.MaximumSize = new System.Drawing.Size(10000, 23); - this.colorSecret.MinimumSize = new System.Drawing.Size(100, 23); + this.colorSecret.Location = new System.Drawing.Point(19, 439); + this.colorSecret.Margin = new System.Windows.Forms.Padding(5); + this.colorSecret.MaximumSize = new System.Drawing.Size(12500, 29); + this.colorSecret.MinimumSize = new System.Drawing.Size(125, 29); this.colorSecret.Name = "colorSecret"; - this.colorSecret.Size = new System.Drawing.Size(168, 23); + this.colorSecret.Size = new System.Drawing.Size(210, 29); this.colorSecret.TabIndex = 16; // // colorMblock @@ -419,11 +445,12 @@ private void InitializeComponent() this.colorMblock.BackColor = System.Drawing.Color.Transparent; this.colorMblock.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.colorMblock.Label = "Monster block:"; - this.colorMblock.Location = new System.Drawing.Point(15, 324); - this.colorMblock.MaximumSize = new System.Drawing.Size(10000, 23); - this.colorMblock.MinimumSize = new System.Drawing.Size(100, 23); + this.colorMblock.Location = new System.Drawing.Point(19, 405); + this.colorMblock.Margin = new System.Windows.Forms.Padding(5); + this.colorMblock.MaximumSize = new System.Drawing.Size(12500, 29); + this.colorMblock.MinimumSize = new System.Drawing.Size(125, 29); this.colorMblock.Name = "colorMblock"; - this.colorMblock.Size = new System.Drawing.Size(168, 23); + this.colorMblock.Size = new System.Drawing.Size(210, 29); this.colorMblock.TabIndex = 15; // // coloinvisiblelinedef @@ -431,11 +458,12 @@ private void InitializeComponent() this.coloinvisiblelinedef.BackColor = System.Drawing.Color.Transparent; this.coloinvisiblelinedef.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.coloinvisiblelinedef.Label = "Invisible lines:"; - this.coloinvisiblelinedef.Location = new System.Drawing.Point(15, 297); - this.coloinvisiblelinedef.MaximumSize = new System.Drawing.Size(10000, 23); - this.coloinvisiblelinedef.MinimumSize = new System.Drawing.Size(100, 23); + this.coloinvisiblelinedef.Location = new System.Drawing.Point(19, 371); + this.coloinvisiblelinedef.Margin = new System.Windows.Forms.Padding(5); + this.coloinvisiblelinedef.MaximumSize = new System.Drawing.Size(12500, 29); + this.coloinvisiblelinedef.MinimumSize = new System.Drawing.Size(125, 29); this.coloinvisiblelinedef.Name = "coloinvisiblelinedef"; - this.coloinvisiblelinedef.Size = new System.Drawing.Size(168, 23); + this.coloinvisiblelinedef.Size = new System.Drawing.Size(210, 29); this.coloinvisiblelinedef.TabIndex = 14; // // colorgrid64 @@ -443,11 +471,12 @@ private void InitializeComponent() 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.Location = new System.Drawing.Point(19, 338); + this.colorgrid64.Margin = new System.Windows.Forms.Padding(5); + this.colorgrid64.MaximumSize = new System.Drawing.Size(12500, 29); + this.colorgrid64.MinimumSize = new System.Drawing.Size(125, 29); this.colorgrid64.Name = "colorgrid64"; - this.colorgrid64.Size = new System.Drawing.Size(168, 23); + this.colorgrid64.Size = new System.Drawing.Size(210, 29); this.colorgrid64.TabIndex = 9; // // colorgrid @@ -455,11 +484,12 @@ private void InitializeComponent() 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.Location = new System.Drawing.Point(19, 304); + this.colorgrid.Margin = new System.Windows.Forms.Padding(5); + this.colorgrid.MaximumSize = new System.Drawing.Size(12500, 29); + this.colorgrid.MinimumSize = new System.Drawing.Size(125, 29); this.colorgrid.Name = "colorgrid"; - this.colorgrid.Size = new System.Drawing.Size(168, 23); + this.colorgrid.Size = new System.Drawing.Size(210, 29); this.colorgrid.TabIndex = 8; // // colorindication @@ -467,11 +497,12 @@ private void InitializeComponent() 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.Location = new System.Drawing.Point(19, 270); + this.colorindication.Margin = new System.Windows.Forms.Padding(5); + this.colorindication.MaximumSize = new System.Drawing.Size(12500, 29); + this.colorindication.MinimumSize = new System.Drawing.Size(125, 29); this.colorindication.Name = "colorindication"; - this.colorindication.Size = new System.Drawing.Size(168, 23); + this.colorindication.Size = new System.Drawing.Size(210, 29); this.colorindication.TabIndex = 7; // // colorsoundlinedefs @@ -479,11 +510,12 @@ private void InitializeComponent() 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.Location = new System.Drawing.Point(19, 169); + this.colorsoundlinedefs.Margin = new System.Windows.Forms.Padding(5); + this.colorsoundlinedefs.MaximumSize = new System.Drawing.Size(12500, 29); + this.colorsoundlinedefs.MinimumSize = new System.Drawing.Size(125, 29); this.colorsoundlinedefs.Name = "colorsoundlinedefs"; - this.colorsoundlinedefs.Size = new System.Drawing.Size(168, 23); + this.colorsoundlinedefs.Size = new System.Drawing.Size(210, 29); this.colorsoundlinedefs.TabIndex = 4; // // colorspeciallinedefs @@ -491,11 +523,12 @@ private void InitializeComponent() 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.Location = new System.Drawing.Point(19, 135); + this.colorspeciallinedefs.Margin = new System.Windows.Forms.Padding(5); + this.colorspeciallinedefs.MaximumSize = new System.Drawing.Size(12500, 29); + this.colorspeciallinedefs.MinimumSize = new System.Drawing.Size(125, 29); this.colorspeciallinedefs.Name = "colorspeciallinedefs"; - this.colorspeciallinedefs.Size = new System.Drawing.Size(168, 23); + this.colorspeciallinedefs.Size = new System.Drawing.Size(210, 29); this.colorspeciallinedefs.TabIndex = 3; // // colorbackcolor @@ -503,11 +536,12 @@ private void InitializeComponent() 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.Location = new System.Drawing.Point(19, 34); + this.colorbackcolor.Margin = new System.Windows.Forms.Padding(5); + this.colorbackcolor.MaximumSize = new System.Drawing.Size(12500, 29); + this.colorbackcolor.MinimumSize = new System.Drawing.Size(125, 29); this.colorbackcolor.Name = "colorbackcolor"; - this.colorbackcolor.Size = new System.Drawing.Size(168, 23); + this.colorbackcolor.Size = new System.Drawing.Size(210, 29); this.colorbackcolor.TabIndex = 0; // // colorselection @@ -515,11 +549,12 @@ private void InitializeComponent() 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.Location = new System.Drawing.Point(19, 236); + this.colorselection.Margin = new System.Windows.Forms.Padding(5); + this.colorselection.MaximumSize = new System.Drawing.Size(12500, 29); + this.colorselection.MinimumSize = new System.Drawing.Size(125, 29); this.colorselection.Name = "colorselection"; - this.colorselection.Size = new System.Drawing.Size(168, 23); + this.colorselection.Size = new System.Drawing.Size(210, 29); this.colorselection.TabIndex = 6; // // colorvertices @@ -527,11 +562,12 @@ private void InitializeComponent() 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.Location = new System.Drawing.Point(19, 68); + this.colorvertices.Margin = new System.Windows.Forms.Padding(5); + this.colorvertices.MaximumSize = new System.Drawing.Size(12500, 29); + this.colorvertices.MinimumSize = new System.Drawing.Size(125, 29); this.colorvertices.Name = "colorvertices"; - this.colorvertices.Size = new System.Drawing.Size(168, 23); + this.colorvertices.Size = new System.Drawing.Size(210, 29); this.colorvertices.TabIndex = 1; // // colorhighlight @@ -539,11 +575,12 @@ private void InitializeComponent() 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.Location = new System.Drawing.Point(19, 202); + this.colorhighlight.Margin = new System.Windows.Forms.Padding(5); + this.colorhighlight.MaximumSize = new System.Drawing.Size(12500, 29); + this.colorhighlight.MinimumSize = new System.Drawing.Size(125, 29); this.colorhighlight.Name = "colorhighlight"; - this.colorhighlight.Size = new System.Drawing.Size(168, 23); + this.colorhighlight.Size = new System.Drawing.Size(210, 29); this.colorhighlight.TabIndex = 5; // // colorlinedefs @@ -551,19 +588,21 @@ private void InitializeComponent() 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.Location = new System.Drawing.Point(19, 101); + this.colorlinedefs.Margin = new System.Windows.Forms.Padding(5); + this.colorlinedefs.MaximumSize = new System.Drawing.Size(12500, 29); + this.colorlinedefs.MinimumSize = new System.Drawing.Size(125, 29); this.colorlinedefs.Name = "colorlinedefs"; - this.colorlinedefs.Size = new System.Drawing.Size(168, 23); + this.colorlinedefs.Size = new System.Drawing.Size(210, 29); this.colorlinedefs.TabIndex = 2; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(22, 85); + this.label2.Location = new System.Drawing.Point(28, 106); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(147, 14); + this.label2.Size = new System.Drawing.Size(189, 16); this.label2.TabIndex = 14; this.label2.Text = "Passable lines transparency:"; this.label2.TextAlign = System.Drawing.ContentAlignment.TopRight; @@ -571,9 +610,10 @@ private void InitializeComponent() // squarethings // this.squarethings.AutoSize = true; - this.squarethings.Location = new System.Drawing.Point(236, 120); + this.squarethings.Location = new System.Drawing.Point(295, 150); + this.squarethings.Margin = new System.Windows.Forms.Padding(4); this.squarethings.Name = "squarethings"; - this.squarethings.Size = new System.Drawing.Size(93, 18); + this.squarethings.Size = new System.Drawing.Size(117, 20); this.squarethings.TabIndex = 8; this.squarethings.Text = "Square things"; this.squarethings.UseVisualStyleBackColor = true; @@ -581,28 +621,32 @@ private void InitializeComponent() // doublesidedalphalabel // this.doublesidedalphalabel.AutoSize = true; - this.doublesidedalphalabel.Location = new System.Drawing.Point(337, 85); + this.doublesidedalphalabel.Location = new System.Drawing.Point(421, 106); + this.doublesidedalphalabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.doublesidedalphalabel.Name = "doublesidedalphalabel"; - this.doublesidedalphalabel.Size = new System.Drawing.Size(23, 14); + this.doublesidedalphalabel.Size = new System.Drawing.Size(27, 16); this.doublesidedalphalabel.TabIndex = 16; this.doublesidedalphalabel.Text = "0%"; // // qualitydisplay // this.qualitydisplay.AutoSize = true; - this.qualitydisplay.Location = new System.Drawing.Point(25, 120); + this.qualitydisplay.Location = new System.Drawing.Point(31, 150); + this.qualitydisplay.Margin = new System.Windows.Forms.Padding(4); this.qualitydisplay.Name = "qualitydisplay"; - this.qualitydisplay.Size = new System.Drawing.Size(130, 18); + this.qualitydisplay.Size = new System.Drawing.Size(167, 20); this.qualitydisplay.TabIndex = 7; this.qualitydisplay.Text = "High quality rendering"; this.qualitydisplay.UseVisualStyleBackColor = true; // // doublesidedalpha // + this.doublesidedalpha.BackColor = System.Drawing.Color.Transparent; this.doublesidedalpha.LargeChange = 3; - this.doublesidedalpha.Location = new System.Drawing.Point(180, 72); + this.doublesidedalpha.Location = new System.Drawing.Point(225, 90); + this.doublesidedalpha.Margin = new System.Windows.Forms.Padding(4); this.doublesidedalpha.Name = "doublesidedalpha"; - this.doublesidedalpha.Size = new System.Drawing.Size(150, 42); + this.doublesidedalpha.Size = new System.Drawing.Size(188, 56); this.doublesidedalpha.TabIndex = 2; this.doublesidedalpha.TickStyle = System.Windows.Forms.TickStyle.Both; this.doublesidedalpha.ValueChanged += new System.EventHandler(this.doublesidedalpha_ValueChanged); @@ -611,9 +655,10 @@ private void InitializeComponent() // 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, 537); + this.cancel.Location = new System.Drawing.Point(736, 671); + this.cancel.Margin = new System.Windows.Forms.Padding(4); this.cancel.Name = "cancel"; - this.cancel.Size = new System.Drawing.Size(112, 25); + this.cancel.Size = new System.Drawing.Size(140, 31); this.cancel.TabIndex = 2; this.cancel.Text = "Cancel"; this.cancel.UseVisualStyleBackColor = true; @@ -623,9 +668,10 @@ private void InitializeComponent() // 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, 537); + this.apply.Location = new System.Drawing.Point(589, 671); + this.apply.Margin = new System.Windows.Forms.Padding(4); this.apply.Name = "apply"; - this.apply.Size = new System.Drawing.Size(112, 25); + this.apply.Size = new System.Drawing.Size(140, 31); this.apply.TabIndex = 1; this.apply.Text = "OK"; this.apply.UseVisualStyleBackColor = true; @@ -633,20 +679,21 @@ private void InitializeComponent() // // 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.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.Location = new System.Drawing.Point(14, 16); + this.tabs.Margin = new System.Windows.Forms.Padding(4); 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, 515); + this.tabs.Size = new System.Drawing.Size(862, 644); this.tabs.TabIndex = 0; this.tabs.SelectedIndexChanged += new System.EventHandler(this.tabs_SelectedIndexChanged); // @@ -658,9 +705,10 @@ private void InitializeComponent() 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.Margin = new System.Windows.Forms.Padding(4); this.tabinterface.Name = "tabinterface"; - this.tabinterface.Padding = new System.Windows.Forms.Padding(5); - this.tabinterface.Size = new System.Drawing.Size(682, 488); + this.tabinterface.Padding = new System.Windows.Forms.Padding(6); + this.tabinterface.Size = new System.Drawing.Size(854, 617); this.tabinterface.TabIndex = 0; this.tabinterface.Text = "Interface"; this.tabinterface.UseVisualStyleBackColor = true; @@ -676,9 +724,11 @@ private void InitializeComponent() 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, 300); + this.groupBox5.Location = new System.Drawing.Point(10, 375); + this.groupBox5.Margin = new System.Windows.Forms.Padding(4); this.groupBox5.Name = "groupBox5"; - this.groupBox5.Size = new System.Drawing.Size(331, 180); + this.groupBox5.Padding = new System.Windows.Forms.Padding(4); + this.groupBox5.Size = new System.Drawing.Size(414, 225); this.groupBox5.TabIndex = 4; this.groupBox5.TabStop = false; this.groupBox5.Text = " Toolbar Buttons "; @@ -686,9 +736,10 @@ private void InitializeComponent() // toolbar_file // this.toolbar_file.AutoSize = true; - this.toolbar_file.Location = new System.Drawing.Point(32, 36); + this.toolbar_file.Location = new System.Drawing.Point(40, 45); + this.toolbar_file.Margin = new System.Windows.Forms.Padding(4); this.toolbar_file.Name = "toolbar_file"; - this.toolbar_file.Size = new System.Drawing.Size(118, 18); + this.toolbar_file.Size = new System.Drawing.Size(146, 20); this.toolbar_file.TabIndex = 49; this.toolbar_file.Text = "New / Open / Save"; this.toolbar_file.UseVisualStyleBackColor = true; @@ -696,9 +747,10 @@ private void InitializeComponent() // toolbar_testing // this.toolbar_testing.AutoSize = true; - this.toolbar_testing.Location = new System.Drawing.Point(188, 114); + this.toolbar_testing.Location = new System.Drawing.Point(235, 142); + this.toolbar_testing.Margin = new System.Windows.Forms.Padding(4); this.toolbar_testing.Name = "toolbar_testing"; - this.toolbar_testing.Size = new System.Drawing.Size(61, 18); + this.toolbar_testing.Size = new System.Drawing.Size(74, 20); this.toolbar_testing.TabIndex = 48; this.toolbar_testing.Text = "Testing"; this.toolbar_testing.UseVisualStyleBackColor = true; @@ -706,9 +758,10 @@ private void InitializeComponent() // toolbar_geometry // this.toolbar_geometry.AutoSize = true; - this.toolbar_geometry.Location = new System.Drawing.Point(188, 88); + this.toolbar_geometry.Location = new System.Drawing.Point(235, 110); + this.toolbar_geometry.Margin = new System.Windows.Forms.Padding(4); this.toolbar_geometry.Name = "toolbar_geometry"; - this.toolbar_geometry.Size = new System.Drawing.Size(90, 18); + this.toolbar_geometry.Size = new System.Drawing.Size(114, 20); this.toolbar_geometry.TabIndex = 47; this.toolbar_geometry.Text = "Snap / Merge"; this.toolbar_geometry.UseVisualStyleBackColor = true; @@ -716,9 +769,10 @@ private void InitializeComponent() // toolbar_viewmodes // this.toolbar_viewmodes.AutoSize = true; - this.toolbar_viewmodes.Location = new System.Drawing.Point(188, 62); + this.toolbar_viewmodes.Location = new System.Drawing.Point(235, 78); + this.toolbar_viewmodes.Margin = new System.Windows.Forms.Padding(4); this.toolbar_viewmodes.Name = "toolbar_viewmodes"; - this.toolbar_viewmodes.Size = new System.Drawing.Size(87, 18); + this.toolbar_viewmodes.Size = new System.Drawing.Size(104, 20); this.toolbar_viewmodes.TabIndex = 46; this.toolbar_viewmodes.Text = "View Modes"; this.toolbar_viewmodes.UseVisualStyleBackColor = true; @@ -726,9 +780,10 @@ private void InitializeComponent() // toolbar_filter // this.toolbar_filter.AutoSize = true; - this.toolbar_filter.Location = new System.Drawing.Point(188, 36); + this.toolbar_filter.Location = new System.Drawing.Point(235, 45); + this.toolbar_filter.Margin = new System.Windows.Forms.Padding(4); this.toolbar_filter.Name = "toolbar_filter"; - this.toolbar_filter.Size = new System.Drawing.Size(84, 18); + this.toolbar_filter.Size = new System.Drawing.Size(108, 20); this.toolbar_filter.TabIndex = 45; this.toolbar_filter.Text = "Things Filter"; this.toolbar_filter.UseVisualStyleBackColor = true; @@ -736,9 +791,10 @@ private void InitializeComponent() // toolbar_prefabs // this.toolbar_prefabs.AutoSize = true; - this.toolbar_prefabs.Location = new System.Drawing.Point(32, 140); + this.toolbar_prefabs.Location = new System.Drawing.Point(40, 175); + this.toolbar_prefabs.Margin = new System.Windows.Forms.Padding(4); this.toolbar_prefabs.Name = "toolbar_prefabs"; - this.toolbar_prefabs.Size = new System.Drawing.Size(64, 18); + this.toolbar_prefabs.Size = new System.Drawing.Size(78, 20); this.toolbar_prefabs.TabIndex = 44; this.toolbar_prefabs.Text = "Prefabs"; this.toolbar_prefabs.UseVisualStyleBackColor = true; @@ -746,9 +802,10 @@ private void InitializeComponent() // toolbar_copy // this.toolbar_copy.AutoSize = true; - this.toolbar_copy.Location = new System.Drawing.Point(32, 114); + this.toolbar_copy.Location = new System.Drawing.Point(40, 142); + this.toolbar_copy.Margin = new System.Windows.Forms.Padding(4); this.toolbar_copy.Name = "toolbar_copy"; - this.toolbar_copy.Size = new System.Drawing.Size(112, 18); + this.toolbar_copy.Size = new System.Drawing.Size(144, 20); this.toolbar_copy.TabIndex = 43; this.toolbar_copy.Text = "Cut / Copy / Paste"; this.toolbar_copy.UseVisualStyleBackColor = true; @@ -756,9 +813,10 @@ private void InitializeComponent() // toolbar_undo // this.toolbar_undo.AutoSize = true; - this.toolbar_undo.Location = new System.Drawing.Point(32, 88); + this.toolbar_undo.Location = new System.Drawing.Point(40, 110); + this.toolbar_undo.Margin = new System.Windows.Forms.Padding(4); this.toolbar_undo.Name = "toolbar_undo"; - this.toolbar_undo.Size = new System.Drawing.Size(85, 18); + this.toolbar_undo.Size = new System.Drawing.Size(108, 20); this.toolbar_undo.TabIndex = 42; this.toolbar_undo.Text = "Undo / Redo"; this.toolbar_undo.UseVisualStyleBackColor = true; @@ -766,9 +824,10 @@ private void InitializeComponent() // toolbar_script // this.toolbar_script.AutoSize = true; - this.toolbar_script.Location = new System.Drawing.Point(32, 62); + this.toolbar_script.Location = new System.Drawing.Point(40, 78); + this.toolbar_script.Margin = new System.Windows.Forms.Padding(4); this.toolbar_script.Name = "toolbar_script"; - this.toolbar_script.Size = new System.Drawing.Size(84, 18); + this.toolbar_script.Size = new System.Drawing.Size(106, 20); this.toolbar_script.TabIndex = 41; this.toolbar_script.Text = "Script Editor"; this.toolbar_script.UseVisualStyleBackColor = true; @@ -778,9 +837,11 @@ private void InitializeComponent() 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, 300); + this.groupBox4.Location = new System.Drawing.Point(431, 375); + this.groupBox4.Margin = new System.Windows.Forms.Padding(4); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(329, 180); + this.groupBox4.Padding = new System.Windows.Forms.Padding(4); + this.groupBox4.Size = new System.Drawing.Size(411, 225); this.groupBox4.TabIndex = 3; this.groupBox4.TabStop = false; this.groupBox4.Text = " Side Panels "; @@ -788,9 +849,10 @@ private void InitializeComponent() // collapsedockers // this.collapsedockers.AutoSize = true; - this.collapsedockers.Location = new System.Drawing.Point(204, 39); + this.collapsedockers.Location = new System.Drawing.Point(255, 49); + this.collapsedockers.Margin = new System.Windows.Forms.Padding(4); this.collapsedockers.Name = "collapsedockers"; - this.collapsedockers.Size = new System.Drawing.Size(72, 18); + this.collapsedockers.Size = new System.Drawing.Size(89, 20); this.collapsedockers.TabIndex = 2; this.collapsedockers.Text = "Auto hide"; this.collapsedockers.UseVisualStyleBackColor = true; @@ -803,17 +865,19 @@ private void InitializeComponent() "Left", "Right", "None"}); - this.dockersposition.Location = new System.Drawing.Point(95, 37); + this.dockersposition.Location = new System.Drawing.Point(119, 46); + this.dockersposition.Margin = new System.Windows.Forms.Padding(4); this.dockersposition.Name = "dockersposition"; - this.dockersposition.Size = new System.Drawing.Size(85, 22); + this.dockersposition.Size = new System.Drawing.Size(105, 24); this.dockersposition.TabIndex = 1; // // label17 // this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(33, 40); + this.label17.Location = new System.Drawing.Point(41, 50); + this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(47, 14); + this.label17.Size = new System.Drawing.Size(61, 16); this.label17.TabIndex = 0; this.label17.Text = "Position:"; // @@ -835,9 +899,11 @@ private void InitializeComponent() 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.Location = new System.Drawing.Point(431, 10); + this.groupBox2.Margin = new System.Windows.Forms.Padding(4); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(329, 286); + this.groupBox2.Padding = new System.Windows.Forms.Padding(4); + this.groupBox2.Size = new System.Drawing.Size(411, 358); this.groupBox2.TabIndex = 2; this.groupBox2.TabStop = false; this.groupBox2.Text = " Visual Modes "; @@ -845,17 +911,20 @@ private void InitializeComponent() // lightintensitylabel // this.lightintensitylabel.AutoSize = true; - this.lightintensitylabel.Location = new System.Drawing.Point(264, 221); + this.lightintensitylabel.Location = new System.Drawing.Point(330, 276); + this.lightintensitylabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lightintensitylabel.Name = "lightintensitylabel"; - this.lightintensitylabel.Size = new System.Drawing.Size(13, 14); + this.lightintensitylabel.Size = new System.Drawing.Size(15, 16); this.lightintensitylabel.TabIndex = 35; this.lightintensitylabel.Text = "0"; // // lightintensity // - this.lightintensity.Location = new System.Drawing.Point(108, 209); + this.lightintensity.BackColor = System.Drawing.Color.Transparent; + this.lightintensity.Location = new System.Drawing.Point(135, 261); + this.lightintensity.Margin = new System.Windows.Forms.Padding(4); this.lightintensity.Name = "lightintensity"; - this.lightintensity.Size = new System.Drawing.Size(150, 42); + this.lightintensity.Size = new System.Drawing.Size(188, 56); this.lightintensity.TabIndex = 33; this.lightintensity.TickStyle = System.Windows.Forms.TickStyle.Both; this.lightintensity.ValueChanged += new System.EventHandler(this.lightintensity_ValueChanged); @@ -863,20 +932,23 @@ private void InitializeComponent() // label18 // this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(27, 221); + this.label18.Location = new System.Drawing.Point(34, 276); + this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(76, 14); + this.label18.Size = new System.Drawing.Size(98, 16); this.label18.TabIndex = 34; this.label18.Text = "Light Intensity:"; // // viewdistance // + this.viewdistance.BackColor = System.Drawing.Color.Transparent; this.viewdistance.LargeChange = 2; - this.viewdistance.Location = new System.Drawing.Point(108, 161); + this.viewdistance.Location = new System.Drawing.Point(135, 201); + this.viewdistance.Margin = new System.Windows.Forms.Padding(4); this.viewdistance.Maximum = 15; this.viewdistance.Minimum = 1; this.viewdistance.Name = "viewdistance"; - this.viewdistance.Size = new System.Drawing.Size(150, 42); + this.viewdistance.Size = new System.Drawing.Size(188, 56); this.viewdistance.TabIndex = 3; this.viewdistance.TickStyle = System.Windows.Forms.TickStyle.Both; this.viewdistance.Value = 1; @@ -884,11 +956,13 @@ private void InitializeComponent() // // movespeed // - this.movespeed.Location = new System.Drawing.Point(108, 113); + this.movespeed.BackColor = System.Drawing.Color.Transparent; + this.movespeed.Location = new System.Drawing.Point(135, 141); + this.movespeed.Margin = new System.Windows.Forms.Padding(4); this.movespeed.Maximum = 20; this.movespeed.Minimum = 1; this.movespeed.Name = "movespeed"; - this.movespeed.Size = new System.Drawing.Size(150, 42); + this.movespeed.Size = new System.Drawing.Size(188, 56); this.movespeed.TabIndex = 2; this.movespeed.TickStyle = System.Windows.Forms.TickStyle.Both; this.movespeed.Value = 1; @@ -896,11 +970,13 @@ private void InitializeComponent() // // mousespeed // - this.mousespeed.Location = new System.Drawing.Point(108, 65); + this.mousespeed.BackColor = System.Drawing.Color.Transparent; + this.mousespeed.Location = new System.Drawing.Point(135, 81); + this.mousespeed.Margin = new System.Windows.Forms.Padding(4); this.mousespeed.Maximum = 20; this.mousespeed.Minimum = 1; this.mousespeed.Name = "mousespeed"; - this.mousespeed.Size = new System.Drawing.Size(150, 42); + this.mousespeed.Size = new System.Drawing.Size(188, 56); this.mousespeed.TabIndex = 1; this.mousespeed.TickStyle = System.Windows.Forms.TickStyle.Both; this.mousespeed.Value = 1; @@ -908,12 +984,14 @@ private void InitializeComponent() // // fieldofview // + this.fieldofview.BackColor = System.Drawing.Color.Transparent; this.fieldofview.LargeChange = 1; - this.fieldofview.Location = new System.Drawing.Point(108, 18); + this.fieldofview.Location = new System.Drawing.Point(135, 22); + this.fieldofview.Margin = new System.Windows.Forms.Padding(4); this.fieldofview.Maximum = 17; this.fieldofview.Minimum = 5; this.fieldofview.Name = "fieldofview"; - this.fieldofview.Size = new System.Drawing.Size(150, 42); + this.fieldofview.Size = new System.Drawing.Size(188, 56); this.fieldofview.TabIndex = 0; this.fieldofview.TickStyle = System.Windows.Forms.TickStyle.Both; this.fieldofview.Value = 5; @@ -922,27 +1000,30 @@ private void InitializeComponent() // viewdistancelabel // this.viewdistancelabel.AutoSize = true; - this.viewdistancelabel.Location = new System.Drawing.Point(264, 173); + this.viewdistancelabel.Location = new System.Drawing.Point(330, 216); + this.viewdistancelabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.viewdistancelabel.Name = "viewdistancelabel"; - this.viewdistancelabel.Size = new System.Drawing.Size(42, 14); + this.viewdistancelabel.Size = new System.Drawing.Size(54, 16); this.viewdistancelabel.TabIndex = 30; this.viewdistancelabel.Text = "200 mp"; // // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(22, 173); + this.label13.Location = new System.Drawing.Point(28, 216); + this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(80, 14); + this.label13.Size = new System.Drawing.Size(97, 16); this.label13.TabIndex = 28; this.label13.Text = "View distance:"; // // invertyaxis // this.invertyaxis.AutoSize = true; - this.invertyaxis.Location = new System.Drawing.Point(25, 257); + this.invertyaxis.Location = new System.Drawing.Point(31, 321); + this.invertyaxis.Margin = new System.Windows.Forms.Padding(4); this.invertyaxis.Name = "invertyaxis"; - this.invertyaxis.Size = new System.Drawing.Size(122, 18); + this.invertyaxis.Size = new System.Drawing.Size(151, 20); this.invertyaxis.TabIndex = 4; this.invertyaxis.Text = "Invert mouse Y axis"; this.invertyaxis.UseVisualStyleBackColor = true; @@ -950,54 +1031,60 @@ private void InitializeComponent() // movespeedlabel // this.movespeedlabel.AutoSize = true; - this.movespeedlabel.Location = new System.Drawing.Point(264, 125); + this.movespeedlabel.Location = new System.Drawing.Point(330, 156); + this.movespeedlabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.movespeedlabel.Name = "movespeedlabel"; - this.movespeedlabel.Size = new System.Drawing.Size(25, 14); + this.movespeedlabel.Size = new System.Drawing.Size(31, 16); this.movespeedlabel.TabIndex = 25; this.movespeedlabel.Text = "100"; // // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(33, 125); + this.label11.Location = new System.Drawing.Point(41, 156); + this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(69, 14); + this.label11.Size = new System.Drawing.Size(88, 16); this.label11.TabIndex = 23; this.label11.Text = "Move speed:"; // // mousespeedlabel // this.mousespeedlabel.AutoSize = true; - this.mousespeedlabel.Location = new System.Drawing.Point(264, 77); + this.mousespeedlabel.Location = new System.Drawing.Point(330, 96); + this.mousespeedlabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.mousespeedlabel.Name = "mousespeedlabel"; - this.mousespeedlabel.Size = new System.Drawing.Size(25, 14); + this.mousespeedlabel.Size = new System.Drawing.Size(31, 16); this.mousespeedlabel.TabIndex = 22; this.mousespeedlabel.Text = "100"; // // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(27, 77); + this.label9.Location = new System.Drawing.Point(34, 96); + this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(75, 14); + this.label9.Size = new System.Drawing.Size(96, 16); this.label9.TabIndex = 20; this.label9.Text = "Mouse speed:"; // // fieldofviewlabel // this.fieldofviewlabel.AutoSize = true; - this.fieldofviewlabel.Location = new System.Drawing.Point(264, 30); + this.fieldofviewlabel.Location = new System.Drawing.Point(330, 38); + this.fieldofviewlabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.fieldofviewlabel.Name = "fieldofviewlabel"; - this.fieldofviewlabel.Size = new System.Drawing.Size(23, 14); + this.fieldofviewlabel.Size = new System.Drawing.Size(29, 16); this.fieldofviewlabel.TabIndex = 19; this.fieldofviewlabel.Text = "50�"; // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(30, 30); + this.label4.Location = new System.Drawing.Point(38, 38); + this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(72, 14); + this.label4.Size = new System.Drawing.Size(89, 16); this.label4.TabIndex = 17; this.label4.Text = "Field of view:"; // @@ -1007,37 +1094,38 @@ private void InitializeComponent() 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.Margin = new System.Windows.Forms.Padding(4); this.tabkeys.Name = "tabkeys"; - this.tabkeys.Padding = new System.Windows.Forms.Padding(3); - this.tabkeys.Size = new System.Drawing.Size(682, 488); + this.tabkeys.Padding = new System.Windows.Forms.Padding(4); + this.tabkeys.Size = new System.Drawing.Size(854, 617); 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.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.Location = new System.Drawing.Point(14, 15); + this.listactions.Margin = new System.Windows.Forms.Padding(10, 11, 10, 11); this.listactions.MultiSelect = false; this.listactions.Name = "listactions"; - this.listactions.Size = new System.Drawing.Size(352, 462); + this.listactions.Size = new System.Drawing.Size(439, 576); 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); + this.listactions.MouseUp += new System.Windows.Forms.MouseEventHandler(this.listactions_MouseUp); // // columncontrolaction // @@ -1051,8 +1139,8 @@ private void InitializeComponent() // // 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.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); @@ -1065,10 +1153,11 @@ private void InitializeComponent() 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.Location = new System.Drawing.Point(471, 15); + this.actioncontrolpanel.Margin = new System.Windows.Forms.Padding(8); this.actioncontrolpanel.Name = "actioncontrolpanel"; - this.actioncontrolpanel.Size = new System.Drawing.Size(282, 462); + this.actioncontrolpanel.Padding = new System.Windows.Forms.Padding(4); + this.actioncontrolpanel.Size = new System.Drawing.Size(352, 578); this.actioncontrolpanel.TabIndex = 9; this.actioncontrolpanel.TabStop = false; this.actioncontrolpanel.Text = " Action control "; @@ -1079,25 +1168,27 @@ private void InitializeComponent() 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.ItemHeight = 16; + this.keyusedlist.Location = new System.Drawing.Point(41, 384); + this.keyusedlist.Margin = new System.Windows.Forms.Padding(4); this.keyusedlist.Name = "keyusedlist"; this.keyusedlist.SelectionMode = System.Windows.Forms.SelectionMode.None; - this.keyusedlist.Size = new System.Drawing.Size(232, 115); + this.keyusedlist.Size = new System.Drawing.Size(290, 143); this.keyusedlist.Sorted = true; this.keyusedlist.TabIndex = 11; this.keyusedlist.Visible = false; // // disregardshiftlabel // - this.disregardshiftlabel.Location = new System.Drawing.Point(20, 224); + this.disregardshiftlabel.Location = new System.Drawing.Point(25, 280); + this.disregardshiftlabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.disregardshiftlabel.Name = "disregardshiftlabel"; - this.disregardshiftlabel.Size = new System.Drawing.Size(245, 47); + this.disregardshiftlabel.Size = new System.Drawing.Size(306, 59); 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."; + "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."; + "difiers can not be used in a key combination for this action."; this.disregardshiftlabel.Visible = false; // // actioncontrol @@ -1105,9 +1196,10 @@ private void InitializeComponent() 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.Location = new System.Drawing.Point(29, 238); + this.actioncontrol.Margin = new System.Windows.Forms.Padding(4); this.actioncontrol.Name = "actioncontrol"; - this.actioncontrol.Size = new System.Drawing.Size(197, 22); + this.actioncontrol.Size = new System.Drawing.Size(245, 24); this.actioncontrol.TabIndex = 8; this.actioncontrol.TabStop = false; this.actioncontrol.SelectedIndexChanged += new System.EventHandler(this.actioncontrol_SelectedIndexChanged); @@ -1116,18 +1208,20 @@ private void InitializeComponent() // 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.Location = new System.Drawing.Point(84, 38); + this.actiontitle.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.actiontitle.Name = "actiontitle"; - this.actiontitle.Size = new System.Drawing.Size(172, 14); + this.actiontitle.Size = new System.Drawing.Size(216, 16); 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.Location = new System.Drawing.Point(241, 172); + this.actioncontrolclear.Margin = new System.Windows.Forms.Padding(4); this.actioncontrolclear.Name = "actioncontrolclear"; - this.actioncontrolclear.Size = new System.Drawing.Size(63, 25); + this.actioncontrolclear.Size = new System.Drawing.Size(79, 31); this.actioncontrolclear.TabIndex = 6; this.actioncontrolclear.TabStop = false; this.actioncontrolclear.Text = "Clear"; @@ -1137,9 +1231,10 @@ private void InitializeComponent() // actionkey // this.actionkey.ImeMode = System.Windows.Forms.ImeMode.Off; - this.actionkey.Location = new System.Drawing.Point(23, 140); + this.actionkey.Location = new System.Drawing.Point(29, 175); + this.actionkey.Margin = new System.Windows.Forms.Padding(4); this.actionkey.Name = "actionkey"; - this.actionkey.Size = new System.Drawing.Size(163, 20); + this.actionkey.Size = new System.Drawing.Size(203, 23); this.actionkey.TabIndex = 5; this.actionkey.TabStop = false; this.actionkey.KeyDown += new System.Windows.Forms.KeyEventHandler(this.actionkey_KeyDown); @@ -1147,9 +1242,10 @@ private void InitializeComponent() // actiondescription // this.actiondescription.AutoEllipsis = true; - this.actiondescription.Location = new System.Drawing.Point(20, 50); + this.actiondescription.Location = new System.Drawing.Point(25, 62); + this.actiondescription.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.actiondescription.Name = "actiondescription"; - this.actiondescription.Size = new System.Drawing.Size(245, 71); + this.actiondescription.Size = new System.Drawing.Size(306, 89); this.actiondescription.TabIndex = 3; this.actiondescription.UseMnemonic = false; // @@ -1160,23 +1256,25 @@ private void InitializeComponent() 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.Margin = new System.Windows.Forms.Padding(4); this.tabcolors.Name = "tabcolors"; - this.tabcolors.Padding = new System.Windows.Forms.Padding(5); - this.tabcolors.Size = new System.Drawing.Size(682, 488); + this.tabcolors.Padding = new System.Windows.Forms.Padding(6); + this.tabcolors.Size = new System.Drawing.Size(854, 617); 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.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.label2); this.appearancegroup1.Controls.Add(this.squarethings); this.appearancegroup1.Controls.Add(this.animatevisualselection); this.appearancegroup1.Controls.Add(this.blackbrowsers); this.appearancegroup1.Controls.Add(this.visualbilinear); + this.appearancegroup1.Controls.Add(this.cbShowFPS); this.appearancegroup1.Controls.Add(label1); this.appearancegroup1.Controls.Add(this.doublesidedalphalabel); this.appearancegroup1.Controls.Add(this.qualitydisplay); @@ -1184,9 +1282,11 @@ private void InitializeComponent() this.appearancegroup1.Controls.Add(this.imagebrightnesslabel); this.appearancegroup1.Controls.Add(this.imagebrightness); this.appearancegroup1.Controls.Add(this.doublesidedalpha); - this.appearancegroup1.Location = new System.Drawing.Point(217, 251); + this.appearancegroup1.Location = new System.Drawing.Point(271, 314); + this.appearancegroup1.Margin = new System.Windows.Forms.Padding(4); this.appearancegroup1.Name = "appearancegroup1"; - this.appearancegroup1.Size = new System.Drawing.Size(457, 229); + this.appearancegroup1.Padding = new System.Windows.Forms.Padding(4); + this.appearancegroup1.Size = new System.Drawing.Size(571, 286); this.appearancegroup1.TabIndex = 24; this.appearancegroup1.TabStop = false; this.appearancegroup1.Text = " Additional Options "; @@ -1194,9 +1294,10 @@ private void InitializeComponent() // animatevisualselection // this.animatevisualselection.AutoSize = true; - this.animatevisualselection.Location = new System.Drawing.Point(236, 152); + this.animatevisualselection.Location = new System.Drawing.Point(295, 180); + this.animatevisualselection.Margin = new System.Windows.Forms.Padding(4); this.animatevisualselection.Name = "animatevisualselection"; - this.animatevisualselection.Size = new System.Drawing.Size(188, 18); + this.animatevisualselection.Size = new System.Drawing.Size(241, 20); this.animatevisualselection.TabIndex = 23; this.animatevisualselection.Text = "Animate selection in visual modes"; this.animatevisualselection.UseVisualStyleBackColor = true; @@ -1204,9 +1305,10 @@ private void InitializeComponent() // blackbrowsers // this.blackbrowsers.AutoSize = true; - this.blackbrowsers.Location = new System.Drawing.Point(236, 184); + this.blackbrowsers.Location = new System.Drawing.Point(295, 210); + this.blackbrowsers.Margin = new System.Windows.Forms.Padding(4); this.blackbrowsers.Name = "blackbrowsers"; - this.blackbrowsers.Size = new System.Drawing.Size(199, 18); + this.blackbrowsers.Size = new System.Drawing.Size(253, 20); this.blackbrowsers.TabIndex = 4; this.blackbrowsers.Text = "Black background in image browser"; this.blackbrowsers.UseVisualStyleBackColor = true; @@ -1214,19 +1316,31 @@ private void InitializeComponent() // visualbilinear // this.visualbilinear.AutoSize = true; - this.visualbilinear.Location = new System.Drawing.Point(25, 184); + this.visualbilinear.Location = new System.Drawing.Point(31, 210); + this.visualbilinear.Margin = new System.Windows.Forms.Padding(4); this.visualbilinear.Name = "visualbilinear"; - this.visualbilinear.Size = new System.Drawing.Size(176, 18); + this.visualbilinear.Size = new System.Drawing.Size(227, 20); this.visualbilinear.TabIndex = 6; this.visualbilinear.Text = "Bilinear filtering in visual modes"; this.visualbilinear.UseVisualStyleBackColor = true; // + // cbShowFPS + // + this.cbShowFPS.AutoSize = true; + this.cbShowFPS.Location = new System.Drawing.Point(31, 237); + this.cbShowFPS.Name = "cbShowFPS"; + this.cbShowFPS.Size = new System.Drawing.Size(190, 20); + this.cbShowFPS.TabIndex = 15; + this.cbShowFPS.Text = "Show FPS in Visual Mode"; + this.cbShowFPS.UseVisualStyleBackColor = true; + // // classicbilinear // this.classicbilinear.AutoSize = true; - this.classicbilinear.Location = new System.Drawing.Point(25, 152); + this.classicbilinear.Location = new System.Drawing.Point(31, 180); + this.classicbilinear.Margin = new System.Windows.Forms.Padding(4); this.classicbilinear.Name = "classicbilinear"; - this.classicbilinear.Size = new System.Drawing.Size(182, 18); + this.classicbilinear.Size = new System.Drawing.Size(233, 20); this.classicbilinear.TabIndex = 5; this.classicbilinear.Text = "Bilinear filtering in classic modes"; this.classicbilinear.UseVisualStyleBackColor = true; @@ -1234,26 +1348,29 @@ private void InitializeComponent() // imagebrightnesslabel // this.imagebrightnesslabel.AutoSize = true; - this.imagebrightnesslabel.Location = new System.Drawing.Point(337, 40); + this.imagebrightnesslabel.Location = new System.Drawing.Point(421, 50); + this.imagebrightnesslabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.imagebrightnesslabel.Name = "imagebrightnesslabel"; - this.imagebrightnesslabel.Size = new System.Drawing.Size(31, 14); + this.imagebrightnesslabel.Size = new System.Drawing.Size(38, 16); this.imagebrightnesslabel.TabIndex = 22; this.imagebrightnesslabel.Text = "+ 0 y"; // // imagebrightness // + this.imagebrightness.BackColor = System.Drawing.Color.Transparent; this.imagebrightness.LargeChange = 3; - this.imagebrightness.Location = new System.Drawing.Point(176, 27); + this.imagebrightness.Location = new System.Drawing.Point(220, 34); + this.imagebrightness.Margin = new System.Windows.Forms.Padding(4); this.imagebrightness.Name = "imagebrightness"; - this.imagebrightness.Size = new System.Drawing.Size(154, 42); + this.imagebrightness.Size = new System.Drawing.Size(192, 56); 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.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); @@ -1270,9 +1387,11 @@ private void InitializeComponent() 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.Location = new System.Drawing.Point(271, 10); + this.colorsgroup3.Margin = new System.Windows.Forms.Padding(4); this.colorsgroup3.Name = "colorsgroup3"; - this.colorsgroup3.Size = new System.Drawing.Size(457, 237); + this.colorsgroup3.Padding = new System.Windows.Forms.Padding(4); + this.colorsgroup3.Size = new System.Drawing.Size(571, 296); this.colorsgroup3.TabIndex = 1; this.colorsgroup3.TabStop = false; this.colorsgroup3.Text = " Script editor "; @@ -1284,18 +1403,20 @@ private void InitializeComponent() this.scripttabwidth.AllowNegative = false; this.scripttabwidth.AllowRelative = false; this.scripttabwidth.ButtonStep = 2; - this.scripttabwidth.Location = new System.Drawing.Point(259, 165); + this.scripttabwidth.Location = new System.Drawing.Point(324, 206); + this.scripttabwidth.Margin = new System.Windows.Forms.Padding(5); this.scripttabwidth.Name = "scripttabwidth"; - this.scripttabwidth.Size = new System.Drawing.Size(71, 24); + this.scripttabwidth.Size = new System.Drawing.Size(89, 27); this.scripttabwidth.StepValues = null; this.scripttabwidth.TabIndex = 32; // // scriptautoindent // this.scriptautoindent.AutoSize = true; - this.scriptautoindent.Location = new System.Drawing.Point(354, 169); + this.scriptautoindent.Location = new System.Drawing.Point(442, 211); + this.scriptautoindent.Margin = new System.Windows.Forms.Padding(4); this.scriptautoindent.Name = "scriptautoindent"; - this.scriptautoindent.Size = new System.Drawing.Size(81, 18); + this.scriptautoindent.Size = new System.Drawing.Size(101, 20); this.scriptautoindent.TabIndex = 31; this.scriptautoindent.Text = "Auto indent"; this.scriptautoindent.UseVisualStyleBackColor = true; @@ -1303,9 +1424,10 @@ private void InitializeComponent() // label10 // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(199, 170); + this.label10.Location = new System.Drawing.Point(249, 212); + this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(58, 14); + this.label10.Size = new System.Drawing.Size(70, 16); this.label10.TabIndex = 30; this.label10.Text = "Tab width:"; // @@ -1314,9 +1436,10 @@ private void InitializeComponent() 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.Location = new System.Drawing.Point(295, 136); + this.panel1.Margin = new System.Windows.Forms.Padding(4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(199, 38); + this.panel1.Size = new System.Drawing.Size(248, 46); this.panel1.TabIndex = 29; // // scriptfontlabel @@ -1324,8 +1447,9 @@ private void InitializeComponent() 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.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.scriptfontlabel.Name = "scriptfontlabel"; - this.scriptfontlabel.Size = new System.Drawing.Size(195, 34); + this.scriptfontlabel.Size = new System.Drawing.Size(244, 42); this.scriptfontlabel.TabIndex = 0; this.scriptfontlabel.Text = "Font"; this.scriptfontlabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1352,26 +1476,29 @@ private void InitializeComponent() "36", "48", "72"}); - this.scriptfontsize.Location = new System.Drawing.Point(236, 67); + this.scriptfontsize.Location = new System.Drawing.Point(295, 84); + this.scriptfontsize.Margin = new System.Windows.Forms.Padding(4); this.scriptfontsize.Name = "scriptfontsize"; - this.scriptfontsize.Size = new System.Drawing.Size(94, 22); + this.scriptfontsize.Size = new System.Drawing.Size(116, 24); this.scriptfontsize.TabIndex = 25; // // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(199, 70); + this.label8.Location = new System.Drawing.Point(249, 88); + this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(31, 14); + this.label8.Size = new System.Drawing.Size(37, 16); this.label8.TabIndex = 28; this.label8.Text = "Size:"; // // scriptfontbold // this.scriptfontbold.AutoSize = true; - this.scriptfontbold.Location = new System.Drawing.Point(354, 69); + this.scriptfontbold.Location = new System.Drawing.Point(442, 86); + this.scriptfontbold.Margin = new System.Windows.Forms.Padding(4); this.scriptfontbold.Name = "scriptfontbold"; - this.scriptfontbold.Size = new System.Drawing.Size(47, 18); + this.scriptfontbold.Size = new System.Drawing.Size(57, 20); this.scriptfontbold.TabIndex = 26; this.scriptfontbold.Text = "Bold"; this.scriptfontbold.UseVisualStyleBackColor = true; @@ -1380,18 +1507,20 @@ private void InitializeComponent() // this.scriptfontname.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.scriptfontname.FormattingEnabled = true; - this.scriptfontname.Location = new System.Drawing.Point(236, 27); + this.scriptfontname.Location = new System.Drawing.Point(295, 34); + this.scriptfontname.Margin = new System.Windows.Forms.Padding(4); this.scriptfontname.Name = "scriptfontname"; - this.scriptfontname.Size = new System.Drawing.Size(199, 22); + this.scriptfontname.Size = new System.Drawing.Size(248, 24); this.scriptfontname.Sorted = true; this.scriptfontname.TabIndex = 23; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(199, 30); + this.label3.Location = new System.Drawing.Point(249, 38); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(31, 14); + this.label3.Size = new System.Drawing.Size(40, 16); this.label3.TabIndex = 24; this.label3.Text = "Font:"; // @@ -1400,11 +1529,12 @@ private void InitializeComponent() 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.Location = new System.Drawing.Point(19, 236); + this.colorconstants.Margin = new System.Windows.Forms.Padding(5); + this.colorconstants.MaximumSize = new System.Drawing.Size(12500, 29); + this.colorconstants.MinimumSize = new System.Drawing.Size(125, 29); this.colorconstants.Name = "colorconstants"; - this.colorconstants.Size = new System.Drawing.Size(150, 23); + this.colorconstants.Size = new System.Drawing.Size(188, 29); this.colorconstants.TabIndex = 6; // // colorliterals @@ -1412,11 +1542,12 @@ private void InitializeComponent() 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.Location = new System.Drawing.Point(19, 202); + this.colorliterals.Margin = new System.Windows.Forms.Padding(5); + this.colorliterals.MaximumSize = new System.Drawing.Size(12500, 29); + this.colorliterals.MinimumSize = new System.Drawing.Size(125, 29); this.colorliterals.Name = "colorliterals"; - this.colorliterals.Size = new System.Drawing.Size(150, 23); + this.colorliterals.Size = new System.Drawing.Size(188, 29); this.colorliterals.TabIndex = 5; // // colorscriptbackground @@ -1424,11 +1555,12 @@ private void InitializeComponent() 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.Location = new System.Drawing.Point(19, 34); + this.colorscriptbackground.Margin = new System.Windows.Forms.Padding(5); + this.colorscriptbackground.MaximumSize = new System.Drawing.Size(12500, 29); + this.colorscriptbackground.MinimumSize = new System.Drawing.Size(125, 29); this.colorscriptbackground.Name = "colorscriptbackground"; - this.colorscriptbackground.Size = new System.Drawing.Size(150, 23); + this.colorscriptbackground.Size = new System.Drawing.Size(188, 29); this.colorscriptbackground.TabIndex = 0; // // colorkeywords @@ -1436,11 +1568,12 @@ private void InitializeComponent() 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.Location = new System.Drawing.Point(19, 169); + this.colorkeywords.Margin = new System.Windows.Forms.Padding(5); + this.colorkeywords.MaximumSize = new System.Drawing.Size(12500, 29); + this.colorkeywords.MinimumSize = new System.Drawing.Size(125, 29); this.colorkeywords.Name = "colorkeywords"; - this.colorkeywords.Size = new System.Drawing.Size(150, 23); + this.colorkeywords.Size = new System.Drawing.Size(188, 29); this.colorkeywords.TabIndex = 4; // // colorlinenumbers @@ -1448,11 +1581,12 @@ private void InitializeComponent() 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.Location = new System.Drawing.Point(19, 68); + this.colorlinenumbers.Margin = new System.Windows.Forms.Padding(5); + this.colorlinenumbers.MaximumSize = new System.Drawing.Size(12500, 29); + this.colorlinenumbers.MinimumSize = new System.Drawing.Size(125, 29); this.colorlinenumbers.Name = "colorlinenumbers"; - this.colorlinenumbers.Size = new System.Drawing.Size(150, 23); + this.colorlinenumbers.Size = new System.Drawing.Size(188, 29); this.colorlinenumbers.TabIndex = 1; // // colorcomments @@ -1460,11 +1594,12 @@ private void InitializeComponent() 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.Location = new System.Drawing.Point(19, 135); + this.colorcomments.Margin = new System.Windows.Forms.Padding(5); + this.colorcomments.MaximumSize = new System.Drawing.Size(12500, 29); + this.colorcomments.MinimumSize = new System.Drawing.Size(125, 29); this.colorcomments.Name = "colorcomments"; - this.colorcomments.Size = new System.Drawing.Size(150, 23); + this.colorcomments.Size = new System.Drawing.Size(188, 29); this.colorcomments.TabIndex = 3; // // colorplaintext @@ -1472,11 +1607,12 @@ private void InitializeComponent() 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.Location = new System.Drawing.Point(19, 101); + this.colorplaintext.Margin = new System.Windows.Forms.Padding(5); + this.colorplaintext.MaximumSize = new System.Drawing.Size(12500, 29); + this.colorplaintext.MinimumSize = new System.Drawing.Size(125, 29); this.colorplaintext.Name = "colorplaintext"; - this.colorplaintext.Size = new System.Drawing.Size(150, 23); + this.colorplaintext.Size = new System.Drawing.Size(188, 29); this.colorplaintext.TabIndex = 2; // // tabpasting @@ -1485,52 +1621,56 @@ private void InitializeComponent() 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.Margin = new System.Windows.Forms.Padding(4); this.tabpasting.Name = "tabpasting"; - this.tabpasting.Padding = new System.Windows.Forms.Padding(5); - this.tabpasting.Size = new System.Drawing.Size(682, 488); + this.tabpasting.Padding = new System.Windows.Forms.Padding(6); + this.tabpasting.Size = new System.Drawing.Size(854, 617); 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.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(14, 19); + this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(649, 35); + this.label16.Size = new System.Drawing.Size(811, 44); 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."; + "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.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(10, 66); + this.pasteoptions.Margin = new System.Windows.Forms.Padding(5); this.pasteoptions.Name = "pasteoptions"; - this.pasteoptions.Size = new System.Drawing.Size(666, 427); + this.pasteoptions.Size = new System.Drawing.Size(832, 534); this.pasteoptions.TabIndex = 0; // // PreferencesForm // this.AcceptButton = this.apply; - this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleDimensions = new System.Drawing.SizeF(120F, 120F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.CancelButton = this.apply; - this.ClientSize = new System.Drawing.Size(711, 573); + this.ClientSize = new System.Drawing.Size(889, 716); 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.Margin = new System.Windows.Forms.Padding(4); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "PreferencesForm"; - this.Opacity = 0; + this.Opacity = 0D; this.ShowIcon = false; this.ShowInTaskbar = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; @@ -1682,5 +1822,6 @@ private void InitializeComponent() private CodeImp.DoomBuilder.Controls.ColorControl colorSecret; private CodeImp.DoomBuilder.Controls.ColorControl colorMblock; private CodeImp.DoomBuilder.Controls.ColorControl coloinvisiblelinedef; + private System.Windows.Forms.CheckBox cbShowFPS; } } \ No newline at end of file diff --git a/Source/Core/Windows/PreferencesForm.cs b/Source/Core/Windows/PreferencesForm.cs index b86749f..05e3e92 100644 --- a/Source/Core/Windows/PreferencesForm.cs +++ b/Source/Core/Windows/PreferencesForm.cs @@ -94,6 +94,7 @@ public PreferencesForm() toolbar_viewmodes.Checked = General.Settings.ToolbarViewModes; toolbar_geometry.Checked = General.Settings.ToolbarGeometry; toolbar_testing.Checked = General.Settings.ToolbarTesting; + cbShowFPS.Checked = General.Settings.ShowFPS; // Fill fonts list scriptfontname.BeginUpdate(); @@ -221,6 +222,7 @@ private void apply_Click(object sender, EventArgs e) General.Settings.ToolbarViewModes = toolbar_viewmodes.Checked; General.Settings.ToolbarGeometry = toolbar_geometry.Checked; General.Settings.ToolbarTesting = toolbar_testing.Checked; + General.Settings.ShowFPS = cbShowFPS.Checked; // Script font size int fontsize = 8; diff --git a/Source/Core/Windows/PreferencesForm.resx b/Source/Core/Windows/PreferencesForm.resx index a78f4d3..957c5e4 100644 --- a/Source/Core/Windows/PreferencesForm.resx +++ b/Source/Core/Windows/PreferencesForm.resx @@ -117,30 +117,30 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - False - + True False - + True False - + True False + + True + True @@ -177,12 +177,12 @@ True - - True - False + + True + True