diff --git a/Source/Core/Controls/ColorControl.Designer.cs b/Source/Core/Controls/ColorControl.Designer.cs index 4687dc91..accedbf1 100644 --- a/Source/Core/Controls/ColorControl.Designer.cs +++ b/Source/Core/Controls/ColorControl.Designer.cs @@ -30,49 +30,33 @@ namespace CodeImp.DoomBuilder.Controls { this.label = new System.Windows.Forms.Label(); this.panel = new System.Windows.Forms.Panel(); - this.button = new System.Windows.Forms.Button(); this.dialog = new System.Windows.Forms.ColorDialog(); this.SuspendLayout(); // // label // - this.label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); + this.label.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.label.Location = new System.Drawing.Point(-3, 0); this.label.Name = "label"; this.label.Size = new System.Drawing.Size(175, 23); this.label.TabIndex = 0; this.label.Text = "Color name:"; - this.label.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.label.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // panel // this.panel.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.panel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.panel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.panel.Location = new System.Drawing.Point(178, 0); + this.panel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel.Cursor = System.Windows.Forms.Cursors.Hand; + this.panel.Location = new System.Drawing.Point(179, 2); this.panel.Name = "panel"; - this.panel.Size = new System.Drawing.Size(27, 23); + this.panel.Size = new System.Drawing.Size(32, 19); this.panel.TabIndex = 1; - // - // button - // - this.button.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.button.BackColor = System.Drawing.SystemColors.Control; - this.button.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.button.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button.Image = global::CodeImp.DoomBuilder.Properties.Resources.ColorPick; - this.button.Location = new System.Drawing.Point(322, 0); - this.button.Name = "button"; - this.button.Size = new System.Drawing.Size(26, 23); - this.button.TabIndex = 2; - this.button.UseVisualStyleBackColor = false; - this.button.MouseMove += new System.Windows.Forms.MouseEventHandler(this.button_MouseMove); - this.button.Click += new System.EventHandler(this.button_Click); - this.button.MouseDown += new System.Windows.Forms.MouseEventHandler(this.button_MouseDown); - this.button.MouseUp += new System.Windows.Forms.MouseEventHandler(this.button_MouseUp); + this.panel.Click += new System.EventHandler(this.panel_Click); // // dialog // @@ -83,14 +67,12 @@ namespace CodeImp.DoomBuilder.Controls this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.BackColor = System.Drawing.Color.Transparent; - this.Controls.Add(this.button); this.Controls.Add(this.panel); this.Controls.Add(this.label); this.MaximumSize = new System.Drawing.Size(10000, 23); this.MinimumSize = new System.Drawing.Size(100, 16); this.Name = "ColorControl"; - this.Size = new System.Drawing.Size(348, 23); - this.Resize += new System.EventHandler(this.ColorControl_Resize); + this.Size = new System.Drawing.Size(213, 23); this.ResumeLayout(false); } @@ -99,7 +81,6 @@ namespace CodeImp.DoomBuilder.Controls private System.Windows.Forms.Label label; private System.Windows.Forms.Panel panel; - private System.Windows.Forms.Button button; private System.Windows.Forms.ColorDialog dialog; } } diff --git a/Source/Core/Controls/ColorControl.cs b/Source/Core/Controls/ColorControl.cs index 389ff34a..911b4866 100644 --- a/Source/Core/Controls/ColorControl.cs +++ b/Source/Core/Controls/ColorControl.cs @@ -27,7 +27,11 @@ namespace CodeImp.DoomBuilder.Controls public partial class ColorControl : UserControl { public event EventHandler ColorChanged; - + + // Properties + public string Label { get { return label.Text; } set { label.Text = value; } } + public PixelColor Color { get { return PixelColor.FromColor(panel.BackColor); } set { panel.BackColor = System.Drawing.Color.FromArgb(value.ToInt()); } } + // Constructor public ColorControl() { @@ -35,62 +39,19 @@ namespace CodeImp.DoomBuilder.Controls InitializeComponent(); } - // Properties - public string Label { get { return label.Text; } set { label.Text = value; } } - public PixelColor Color { get { return PixelColor.FromColor(panel.BackColor); } set { panel.BackColor = System.Drawing.Color.FromArgb(value.ToInt()); } } - - // Button clicked - private void button_Click(object sender, EventArgs e) + //mxd. Panel clicked + private void panel_Click(object sender, EventArgs e) { - // Mouse up first - button_MouseUp(sender, new MouseEventArgs(MouseButtons.Left, 1, 0, 0, 0)); - // Show color dialog dialog.Color = panel.BackColor; if(dialog.ShowDialog(this.ParentForm) == DialogResult.OK) { // Apply new color panel.BackColor = dialog.Color; - - //mxd. Dispatch Event - if(ColorChanged != null) ColorChanged(this, EventArgs.Empty); + + // Dispatch Event + if(ColorChanged != null) ColorChanged(this, EventArgs.Empty); } } - - // Resized - private void ColorControl_Resize(object sender, EventArgs e) - { - button.Left = ClientSize.Width - button.Width; - panel.Left = ClientSize.Width - button.Width - panel.Width - 3; - label.Left = 0; - label.Width = panel.Left; - } - - // Mouse pressed on button - private void button_MouseDown(object sender, MouseEventArgs e) - { - // This moves the image 1 pixel to right-bottom - if(e.Button == MouseButtons.Left) - button.Padding = new Padding(1, 0, 1, 1); - } - - // Mouse released on button - private void button_MouseUp(object sender, MouseEventArgs e) - { - // This moves the image 1 pixel to normal position - if(e.Button == MouseButtons.Left) - button.Padding = new Padding(0, 0, 2, 3); - - // Lose focus - panel.Focus(); - } - - // Mouse moves over button - private void button_MouseMove(object sender, MouseEventArgs e) - { - // Outside button rect? - if((e.X < 0) || (e.X >= button.Width) || (e.Y < 0) || (e.Y >= button.Height)) - button.Padding = new Padding(0, 0, 2, 3); - } } } diff --git a/Source/Core/Windows/SectorEditFormUDMF.Designer.cs b/Source/Core/Windows/SectorEditFormUDMF.Designer.cs index f12e4c94..012ffcda 100644 --- a/Source/Core/Windows/SectorEditFormUDMF.Designer.cs +++ b/Source/Core/Windows/SectorEditFormUDMF.Designer.cs @@ -206,7 +206,7 @@ this.soundsequence.Location = new System.Drawing.Point(283, 48); this.soundsequence.Name = "soundsequence"; this.soundsequence.Size = new System.Drawing.Size(167, 21); - this.soundsequence.TabIndex = 32; + this.soundsequence.TabIndex = 5; this.soundsequence.MouseDown += new System.Windows.Forms.MouseEventHandler(this.soundsequence_MouseDown); this.soundsequence.TextChanged += new System.EventHandler(this.soundsequence_TextChanged); // @@ -216,7 +216,7 @@ this.resetsoundsequence.Location = new System.Drawing.Point(456, 46); this.resetsoundsequence.Name = "resetsoundsequence"; this.resetsoundsequence.Size = new System.Drawing.Size(28, 25); - this.resetsoundsequence.TabIndex = 31; + this.resetsoundsequence.TabIndex = 6; this.resetsoundsequence.Text = " "; this.resetsoundsequence.UseVisualStyleBackColor = true; this.resetsoundsequence.Click += new System.EventHandler(this.resetsoundsequence_Click); @@ -226,10 +226,10 @@ this.fadeColor.DefaultValue = 0; this.fadeColor.Field = "fadecolor"; this.fadeColor.Label = "Fade:"; - this.fadeColor.Location = new System.Drawing.Point(236, 99); + this.fadeColor.Location = new System.Drawing.Point(215, 99); this.fadeColor.Name = "fadeColor"; this.fadeColor.Size = new System.Drawing.Size(207, 31); - this.fadeColor.TabIndex = 30; + this.fadeColor.TabIndex = 8; this.fadeColor.OnValueChanged += new System.EventHandler(this.fadeColor_OnValueChanged); // // lightColor @@ -237,10 +237,10 @@ this.lightColor.DefaultValue = 16777215; this.lightColor.Field = "lightcolor"; this.lightColor.Label = "Light:"; - this.lightColor.Location = new System.Drawing.Point(236, 71); + this.lightColor.Location = new System.Drawing.Point(215, 71); this.lightColor.Name = "lightColor"; this.lightColor.Size = new System.Drawing.Size(207, 29); - this.lightColor.TabIndex = 29; + this.lightColor.TabIndex = 7; this.lightColor.OnValueChanged += new System.EventHandler(this.lightColor_OnValueChanged); // // brightness @@ -258,7 +258,7 @@ this.brightness.Name = "brightness"; this.brightness.Size = new System.Drawing.Size(81, 24); this.brightness.StepValues = null; - this.brightness.TabIndex = 24; + this.brightness.TabIndex = 2; this.brightness.WhenTextChanged += new System.EventHandler(this.brightness_WhenTextChanged); // // desaturation @@ -276,7 +276,7 @@ this.desaturation.Name = "desaturation"; this.desaturation.Size = new System.Drawing.Size(81, 24); this.desaturation.StepValues = null; - this.desaturation.TabIndex = 28; + this.desaturation.TabIndex = 4; // // label14 // @@ -320,7 +320,7 @@ this.gravity.Name = "gravity"; this.gravity.Size = new System.Drawing.Size(81, 24); this.gravity.StepValues = null; - this.gravity.TabIndex = 24; + this.gravity.TabIndex = 3; // // label2 // @@ -429,7 +429,7 @@ this.heightoffset.Name = "heightoffset"; this.heightoffset.Size = new System.Drawing.Size(81, 24); this.heightoffset.StepValues = null; - this.heightoffset.TabIndex = 28; + this.heightoffset.TabIndex = 2; this.heightoffset.WhenTextChanged += new System.EventHandler(this.heightoffset_WhenTextChanged); // // ceilingheight @@ -447,7 +447,7 @@ this.ceilingheight.Name = "ceilingheight"; this.ceilingheight.Size = new System.Drawing.Size(81, 24); this.ceilingheight.StepValues = null; - this.ceilingheight.TabIndex = 22; + this.ceilingheight.TabIndex = 0; this.ceilingheight.WhenTextChanged += new System.EventHandler(this.ceilingheight_WhenTextChanged); // // sectorheightlabel @@ -465,7 +465,7 @@ this.sectorheight.Location = new System.Drawing.Point(89, 114); this.sectorheight.Name = "sectorheight"; this.sectorheight.Size = new System.Drawing.Size(13, 13); - this.sectorheight.TabIndex = 21; + this.sectorheight.TabIndex = 3; this.sectorheight.Text = "0"; // // floorheight @@ -483,7 +483,7 @@ this.floorheight.Name = "floorheight"; this.floorheight.Size = new System.Drawing.Size(81, 24); this.floorheight.StepValues = null; - this.floorheight.TabIndex = 23; + this.floorheight.TabIndex = 1; this.floorheight.WhenTextChanged += new System.EventHandler(this.floorheight_WhenTextChanged); // // label17 @@ -601,7 +601,7 @@ this.leakiness.Name = "leakiness"; this.leakiness.Size = new System.Drawing.Size(81, 24); this.leakiness.StepValues = null; - this.leakiness.TabIndex = 40; + this.leakiness.TabIndex = 4; // // damageinterval // @@ -618,7 +618,7 @@ this.damageinterval.Name = "damageinterval"; this.damageinterval.Size = new System.Drawing.Size(81, 24); this.damageinterval.StepValues = null; - this.damageinterval.TabIndex = 38; + this.damageinterval.TabIndex = 3; // // resetdamagetype // @@ -626,7 +626,7 @@ this.resetdamagetype.Location = new System.Drawing.Point(263, 17); this.resetdamagetype.Name = "resetdamagetype"; this.resetdamagetype.Size = new System.Drawing.Size(28, 25); - this.resetdamagetype.TabIndex = 35; + this.resetdamagetype.TabIndex = 1; this.resetdamagetype.Text = " "; this.resetdamagetype.UseVisualStyleBackColor = true; this.resetdamagetype.Click += new System.EventHandler(this.resetdamagetype_Click); @@ -646,7 +646,7 @@ this.damageamount.Name = "damageamount"; this.damageamount.Size = new System.Drawing.Size(81, 24); this.damageamount.StepValues = null; - this.damageamount.TabIndex = 30; + this.damageamount.TabIndex = 2; // // damagetype // @@ -654,7 +654,7 @@ this.damagetype.Location = new System.Drawing.Point(90, 19); this.damagetype.Name = "damagetype"; this.damagetype.Size = new System.Drawing.Size(167, 21); - this.damagetype.TabIndex = 34; + this.damagetype.TabIndex = 0; this.damagetype.MouseDown += new System.Windows.Forms.MouseEventHandler(this.damagetype_MouseDown); this.damagetype.TextChanged += new System.EventHandler(this.damagetype_TextChanged); // @@ -678,7 +678,7 @@ this.flags.Location = new System.Drawing.Point(15, 21); this.flags.Name = "flags"; this.flags.Size = new System.Drawing.Size(469, 73); - this.flags.TabIndex = 5; + this.flags.TabIndex = 0; this.flags.VerticalSpacing = 1; // // tabSurfaces @@ -730,7 +730,7 @@ this.resetfloorterrain.Location = new System.Drawing.Point(246, 110); this.resetfloorterrain.Name = "resetfloorterrain"; this.resetfloorterrain.Size = new System.Drawing.Size(23, 23); - this.resetfloorterrain.TabIndex = 66; + this.resetfloorterrain.TabIndex = 4; this.resetfloorterrain.Text = " "; this.resetfloorterrain.UseVisualStyleBackColor = true; this.resetfloorterrain.Click += new System.EventHandler(this.resetfloorterrain_Click); @@ -751,7 +751,7 @@ this.floorterrain.Location = new System.Drawing.Point(113, 111); this.floorterrain.Name = "floorterrain"; this.floorterrain.Size = new System.Drawing.Size(130, 21); - this.floorterrain.TabIndex = 61; + this.floorterrain.TabIndex = 3; this.floorterrain.MouseDown += new System.Windows.Forms.MouseEventHandler(this.floorterrain_MouseDown); this.floorterrain.TextChanged += new System.EventHandler(this.floorterrain_TextChanged); // @@ -761,7 +761,7 @@ this.resetfloorlight.Location = new System.Drawing.Point(246, 138); this.resetfloorlight.Name = "resetfloorlight"; this.resetfloorlight.Size = new System.Drawing.Size(23, 23); - this.resetfloorlight.TabIndex = 60; + this.resetfloorlight.TabIndex = 7; this.tooltip.SetToolTip(this.resetfloorlight, "Reset Floor Brightness"); this.resetfloorlight.UseVisualStyleBackColor = true; this.resetfloorlight.Click += new System.EventHandler(this.resetfloorlight_Click); @@ -792,7 +792,7 @@ this.cbUseFloorLineAngles.Location = new System.Drawing.Point(181, 172); this.cbUseFloorLineAngles.Name = "cbUseFloorLineAngles"; this.cbUseFloorLineAngles.Size = new System.Drawing.Size(113, 17); - this.cbUseFloorLineAngles.TabIndex = 57; + this.cbUseFloorLineAngles.TabIndex = 9; this.cbUseFloorLineAngles.Tag = ""; this.cbUseFloorLineAngles.Text = "Use linedef angles"; this.cbUseFloorLineAngles.UseVisualStyleBackColor = true; @@ -800,7 +800,7 @@ // // floorAngleControl // - this.floorAngleControl.Angle = -1350; + this.floorAngleControl.Angle = -1440; this.floorAngleControl.AngleOffset = 90; this.floorAngleControl.Location = new System.Drawing.Point(6, 156); this.floorAngleControl.Name = "floorAngleControl"; @@ -843,7 +843,7 @@ this.floorAlpha.Name = "floorAlpha"; this.floorAlpha.Size = new System.Drawing.Size(62, 24); this.floorAlpha.StepValues = null; - this.floorAlpha.TabIndex = 53; + this.floorAlpha.TabIndex = 10; this.floorAlpha.Tag = ""; // // label11 @@ -871,7 +871,7 @@ this.floorRotation.Name = "floorRotation"; this.floorRotation.Size = new System.Drawing.Size(62, 24); this.floorRotation.StepValues = null; - this.floorRotation.TabIndex = 51; + this.floorRotation.TabIndex = 8; this.floorRotation.Tag = ""; this.floorRotation.WhenTextChanged += new System.EventHandler(this.floorRotation_WhenTextChanged); // @@ -881,7 +881,7 @@ this.floorLightAbsolute.Location = new System.Drawing.Point(181, 142); this.floorLightAbsolute.Name = "floorLightAbsolute"; this.floorLightAbsolute.Size = new System.Drawing.Size(67, 17); - this.floorLightAbsolute.TabIndex = 49; + this.floorLightAbsolute.TabIndex = 6; this.floorLightAbsolute.Text = "Absolute"; this.floorLightAbsolute.UseVisualStyleBackColor = true; this.floorLightAbsolute.CheckedChanged += new System.EventHandler(this.floorLightAbsolute_CheckedChanged); @@ -911,7 +911,7 @@ this.floorBrightness.Name = "floorBrightness"; this.floorBrightness.Size = new System.Drawing.Size(62, 24); this.floorBrightness.StepValues = null; - this.floorBrightness.TabIndex = 48; + this.floorBrightness.TabIndex = 5; this.floorBrightness.Tag = "lightfloor"; this.floorBrightness.WhenTextChanged += new System.EventHandler(this.floorBrightness_WhenTextChanged); // @@ -922,7 +922,7 @@ this.floorRenderStyle.Location = new System.Drawing.Point(113, 85); this.floorRenderStyle.Name = "floorRenderStyle"; this.floorRenderStyle.Size = new System.Drawing.Size(130, 21); - this.floorRenderStyle.TabIndex = 46; + this.floorRenderStyle.TabIndex = 2; // // floorScale // @@ -940,7 +940,7 @@ this.floorScale.Location = new System.Drawing.Point(110, 53); this.floorScale.Name = "floorScale"; this.floorScale.Size = new System.Drawing.Size(186, 26); - this.floorScale.TabIndex = 17; + this.floorScale.TabIndex = 1; this.floorScale.OnValuesChanged += new System.EventHandler(this.floorScale_OnValuesChanged); // // floorOffsets @@ -959,7 +959,7 @@ this.floorOffsets.Location = new System.Drawing.Point(110, 21); this.floorOffsets.Name = "floorOffsets"; this.floorOffsets.Size = new System.Drawing.Size(186, 26); - this.floorOffsets.TabIndex = 16; + this.floorOffsets.TabIndex = 0; this.floorOffsets.OnValuesChanged += new System.EventHandler(this.floorOffsets_OnValuesChanged); // // floortex @@ -968,7 +968,7 @@ this.floortex.MultipleTextures = false; this.floortex.Name = "floortex"; this.floortex.Size = new System.Drawing.Size(190, 204); - this.floortex.TabIndex = 15; + this.floortex.TabIndex = 11; this.floortex.TextureName = ""; this.floortex.UsePreviews = false; this.floortex.OnValueChanged += new System.EventHandler(this.floortex_OnValueChanged); @@ -1010,7 +1010,7 @@ this.resetceilterrain.Location = new System.Drawing.Point(246, 110); this.resetceilterrain.Name = "resetceilterrain"; this.resetceilterrain.Size = new System.Drawing.Size(23, 23); - this.resetceilterrain.TabIndex = 65; + this.resetceilterrain.TabIndex = 4; this.resetceilterrain.Text = " "; this.resetceilterrain.UseVisualStyleBackColor = true; this.resetceilterrain.Click += new System.EventHandler(this.resetceilterrain_Click); @@ -1031,7 +1031,7 @@ this.ceilterrain.Location = new System.Drawing.Point(113, 111); this.ceilterrain.Name = "ceilterrain"; this.ceilterrain.Size = new System.Drawing.Size(130, 21); - this.ceilterrain.TabIndex = 63; + this.ceilterrain.TabIndex = 3; this.ceilterrain.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ceilterrain_MouseDown); this.ceilterrain.TextChanged += new System.EventHandler(this.ceilterrain_TextChanged); // @@ -1041,7 +1041,7 @@ this.resetceillight.Location = new System.Drawing.Point(246, 138); this.resetceillight.Name = "resetceillight"; this.resetceillight.Size = new System.Drawing.Size(23, 23); - this.resetceillight.TabIndex = 62; + this.resetceillight.TabIndex = 7; this.tooltip.SetToolTip(this.resetceillight, "Reset Ceiling Brightness"); this.resetceillight.UseVisualStyleBackColor = true; this.resetceillight.Click += new System.EventHandler(this.resetceillight_Click); @@ -1072,7 +1072,7 @@ this.cbUseCeilLineAngles.Location = new System.Drawing.Point(181, 172); this.cbUseCeilLineAngles.Name = "cbUseCeilLineAngles"; this.cbUseCeilLineAngles.Size = new System.Drawing.Size(113, 17); - this.cbUseCeilLineAngles.TabIndex = 56; + this.cbUseCeilLineAngles.TabIndex = 9; this.cbUseCeilLineAngles.Tag = ""; this.cbUseCeilLineAngles.Text = "Use linedef angles"; this.cbUseCeilLineAngles.UseVisualStyleBackColor = true; @@ -1080,7 +1080,7 @@ // // ceilAngleControl // - this.ceilAngleControl.Angle = -1350; + this.ceilAngleControl.Angle = -1440; this.ceilAngleControl.AngleOffset = 90; this.ceilAngleControl.Location = new System.Drawing.Point(6, 156); this.ceilAngleControl.Name = "ceilAngleControl"; @@ -1123,7 +1123,7 @@ this.ceilAlpha.Name = "ceilAlpha"; this.ceilAlpha.Size = new System.Drawing.Size(62, 24); this.ceilAlpha.StepValues = null; - this.ceilAlpha.TabIndex = 53; + this.ceilAlpha.TabIndex = 10; this.ceilAlpha.Tag = ""; // // label1 @@ -1151,7 +1151,7 @@ this.ceilRotation.Name = "ceilRotation"; this.ceilRotation.Size = new System.Drawing.Size(62, 24); this.ceilRotation.StepValues = null; - this.ceilRotation.TabIndex = 51; + this.ceilRotation.TabIndex = 8; this.ceilRotation.Tag = ""; this.ceilRotation.WhenTextChanged += new System.EventHandler(this.ceilRotation_WhenTextChanged); // @@ -1161,7 +1161,7 @@ this.ceilLightAbsolute.Location = new System.Drawing.Point(181, 142); this.ceilLightAbsolute.Name = "ceilLightAbsolute"; this.ceilLightAbsolute.Size = new System.Drawing.Size(67, 17); - this.ceilLightAbsolute.TabIndex = 49; + this.ceilLightAbsolute.TabIndex = 6; this.ceilLightAbsolute.Tag = ""; this.ceilLightAbsolute.Text = "Absolute"; this.ceilLightAbsolute.UseVisualStyleBackColor = true; @@ -1192,7 +1192,7 @@ this.ceilBrightness.Name = "ceilBrightness"; this.ceilBrightness.Size = new System.Drawing.Size(62, 24); this.ceilBrightness.StepValues = null; - this.ceilBrightness.TabIndex = 48; + this.ceilBrightness.TabIndex = 5; this.ceilBrightness.Tag = "lightceiling"; this.ceilBrightness.WhenTextChanged += new System.EventHandler(this.ceilBrightness_WhenTextChanged); // @@ -1203,7 +1203,7 @@ this.ceilRenderStyle.Location = new System.Drawing.Point(113, 85); this.ceilRenderStyle.Name = "ceilRenderStyle"; this.ceilRenderStyle.Size = new System.Drawing.Size(130, 21); - this.ceilRenderStyle.TabIndex = 46; + this.ceilRenderStyle.TabIndex = 2; // // ceilScale // @@ -1221,7 +1221,7 @@ this.ceilScale.Location = new System.Drawing.Point(110, 53); this.ceilScale.Name = "ceilScale"; this.ceilScale.Size = new System.Drawing.Size(186, 26); - this.ceilScale.TabIndex = 17; + this.ceilScale.TabIndex = 1; this.ceilScale.OnValuesChanged += new System.EventHandler(this.ceilScale_OnValuesChanged); // // ceilOffsets @@ -1240,7 +1240,7 @@ this.ceilOffsets.Location = new System.Drawing.Point(110, 21); this.ceilOffsets.Name = "ceilOffsets"; this.ceilOffsets.Size = new System.Drawing.Size(186, 26); - this.ceilOffsets.TabIndex = 16; + this.ceilOffsets.TabIndex = 0; this.ceilOffsets.OnValuesChanged += new System.EventHandler(this.ceilOffsets_OnValuesChanged); // // ceilingtex @@ -1249,7 +1249,7 @@ this.ceilingtex.MultipleTextures = false; this.ceilingtex.Name = "ceilingtex"; this.ceilingtex.Size = new System.Drawing.Size(190, 204); - this.ceilingtex.TabIndex = 15; + this.ceilingtex.TabIndex = 11; this.ceilingtex.TextureName = ""; this.ceilingtex.UsePreviews = false; this.ceilingtex.OnValueChanged += new System.EventHandler(this.ceilingtex_OnValueChanged); diff --git a/Source/Core/Windows/SectorEditFormUDMF.resx b/Source/Core/Windows/SectorEditFormUDMF.resx index c2cb3618..da172541 100644 --- a/Source/Core/Windows/SectorEditFormUDMF.resx +++ b/Source/Core/Windows/SectorEditFormUDMF.resx @@ -192,6 +192,9 @@ True + + 17, 17 + True @@ -201,7 +204,4 @@ True - - 17, 17 - \ No newline at end of file diff --git a/Source/Core/Windows/ThingEditFormUDMF.Designer.cs b/Source/Core/Windows/ThingEditFormUDMF.Designer.cs index 7aeef675..1a976d87 100644 --- a/Source/Core/Windows/ThingEditFormUDMF.Designer.cs +++ b/Source/Core/Windows/ThingEditFormUDMF.Designer.cs @@ -153,7 +153,7 @@ this.groupBox2.Location = new System.Drawing.Point(428, 298); this.groupBox2.Name = "groupBox2"; this.groupBox2.Size = new System.Drawing.Size(193, 98); - this.groupBox2.TabIndex = 2; + this.groupBox2.TabIndex = 6; this.groupBox2.TabStop = false; this.groupBox2.Text = " Rotation "; // @@ -163,7 +163,7 @@ this.cbrandomroll.Location = new System.Drawing.Point(120, 71); this.cbrandomroll.Name = "cbrandomroll"; this.cbrandomroll.Size = new System.Drawing.Size(66, 17); - this.cbrandomroll.TabIndex = 26; + this.cbrandomroll.TabIndex = 5; this.cbrandomroll.Text = "Random"; this.cbrandomroll.UseVisualStyleBackColor = true; this.cbrandomroll.CheckedChanged += new System.EventHandler(this.cbrandomroll_CheckedChanged); @@ -174,7 +174,7 @@ this.cbrandompitch.Location = new System.Drawing.Point(120, 46); this.cbrandompitch.Name = "cbrandompitch"; this.cbrandompitch.Size = new System.Drawing.Size(66, 17); - this.cbrandompitch.TabIndex = 25; + this.cbrandompitch.TabIndex = 3; this.cbrandompitch.Text = "Random"; this.cbrandompitch.UseVisualStyleBackColor = true; this.cbrandompitch.CheckedChanged += new System.EventHandler(this.cbrandompitch_CheckedChanged); @@ -185,7 +185,7 @@ this.cbrandomangle.Location = new System.Drawing.Point(120, 21); this.cbrandomangle.Name = "cbrandomangle"; this.cbrandomangle.Size = new System.Drawing.Size(66, 17); - this.cbrandomangle.TabIndex = 17; + this.cbrandomangle.TabIndex = 1; this.cbrandomangle.Text = "Random"; this.cbrandomangle.UseVisualStyleBackColor = true; this.cbrandomangle.CheckedChanged += new System.EventHandler(this.cbrandomangle_CheckedChanged); @@ -205,7 +205,7 @@ this.roll.Name = "roll"; this.roll.Size = new System.Drawing.Size(60, 24); this.roll.StepValues = null; - this.roll.TabIndex = 24; + this.roll.TabIndex = 4; this.roll.WhenTextChanged += new System.EventHandler(this.roll_WhenTextChanged); // // labelroll @@ -232,7 +232,7 @@ this.pitch.Name = "pitch"; this.pitch.Size = new System.Drawing.Size(60, 24); this.pitch.StepValues = null; - this.pitch.TabIndex = 22; + this.pitch.TabIndex = 2; this.pitch.WhenTextChanged += new System.EventHandler(this.pitch_WhenTextChanged); // // labelpitch @@ -259,7 +259,7 @@ this.angle.Name = "angle"; this.angle.Size = new System.Drawing.Size(60, 24); this.angle.StepValues = null; - this.angle.TabIndex = 10; + this.angle.TabIndex = 0; this.angle.WhenTextChanged += new System.EventHandler(this.angle_WhenTextChanged); // // labelAngle @@ -346,7 +346,7 @@ this.settingsgroup.Location = new System.Drawing.Point(242, 6); this.settingsgroup.Name = "settingsgroup"; this.settingsgroup.Size = new System.Drawing.Size(295, 286); - this.settingsgroup.TabIndex = 23; + this.settingsgroup.TabIndex = 1; this.settingsgroup.TabStop = false; this.settingsgroup.Text = " Flags "; // @@ -381,7 +381,7 @@ this.grouproll.Location = new System.Drawing.Point(543, 16); this.grouproll.Name = "grouproll"; this.grouproll.Size = new System.Drawing.Size(78, 88); - this.grouproll.TabIndex = 26; + this.grouproll.TabIndex = 2; this.grouproll.TabStop = false; this.grouproll.Text = " Roll "; // @@ -401,7 +401,7 @@ this.grouppitch.Location = new System.Drawing.Point(543, 110); this.grouppitch.Name = "grouppitch"; this.grouppitch.Size = new System.Drawing.Size(78, 88); - this.grouppitch.TabIndex = 25; + this.grouppitch.TabIndex = 3; this.grouppitch.TabStop = false; this.grouppitch.Text = " Pitch "; // @@ -421,7 +421,7 @@ this.groupangle.Location = new System.Drawing.Point(543, 204); this.groupangle.Name = "groupangle"; this.groupangle.Size = new System.Drawing.Size(78, 88); - this.groupangle.TabIndex = 24; + this.groupangle.TabIndex = 4; this.groupangle.TabStop = false; this.groupangle.Text = " Angle"; // @@ -437,7 +437,7 @@ this.groupBox4.Location = new System.Drawing.Point(242, 298); this.groupBox4.Name = "groupBox4"; this.groupBox4.Size = new System.Drawing.Size(180, 98); - this.groupBox4.TabIndex = 21; + this.groupBox4.TabIndex = 5; this.groupBox4.TabStop = false; this.groupBox4.Text = " Position"; // @@ -447,7 +447,7 @@ this.cbAbsoluteHeight.Location = new System.Drawing.Point(109, 71); this.cbAbsoluteHeight.Name = "cbAbsoluteHeight"; this.cbAbsoluteHeight.Size = new System.Drawing.Size(67, 17); - this.cbAbsoluteHeight.TabIndex = 16; + this.cbAbsoluteHeight.TabIndex = 3; this.cbAbsoluteHeight.Text = "Absolute"; this.cbAbsoluteHeight.UseVisualStyleBackColor = true; this.cbAbsoluteHeight.CheckedChanged += new System.EventHandler(this.cbAbsoluteHeight_CheckedChanged); @@ -485,7 +485,7 @@ this.posX.Name = "posX"; this.posX.Size = new System.Drawing.Size(72, 24); this.posX.StepValues = null; - this.posX.TabIndex = 13; + this.posX.TabIndex = 0; this.posX.WhenTextChanged += new System.EventHandler(this.posX_WhenTextChanged); // // posY @@ -503,7 +503,7 @@ this.posY.Name = "posY"; this.posY.Size = new System.Drawing.Size(72, 24); this.posY.StepValues = null; - this.posY.TabIndex = 12; + this.posY.TabIndex = 1; this.posY.WhenTextChanged += new System.EventHandler(this.posY_WhenTextChanged); // // posZ @@ -521,7 +521,7 @@ this.posZ.Name = "posZ"; this.posZ.Size = new System.Drawing.Size(72, 24); this.posZ.StepValues = null; - this.posZ.TabIndex = 11; + this.posZ.TabIndex = 2; this.posZ.WhenTextChanged += new System.EventHandler(this.posZ_WhenTextChanged); // // zlabel @@ -582,7 +582,7 @@ this.floatbobphase.Name = "floatbobphase"; this.floatbobphase.Size = new System.Drawing.Size(72, 24); this.floatbobphase.StepValues = null; - this.floatbobphase.TabIndex = 28; + this.floatbobphase.TabIndex = 4; // // label1 // @@ -608,7 +608,7 @@ this.conversationID.Name = "conversationID"; this.conversationID.Size = new System.Drawing.Size(72, 24); this.conversationID.StepValues = null; - this.conversationID.TabIndex = 26; + this.conversationID.TabIndex = 3; // // labelID // @@ -634,7 +634,7 @@ this.health.Name = "health"; this.health.Size = new System.Drawing.Size(72, 24); this.health.StepValues = null; - this.health.TabIndex = 23; + this.health.TabIndex = 2; // // label10 // @@ -664,7 +664,7 @@ this.score.Name = "score"; this.score.Size = new System.Drawing.Size(72, 24); this.score.StepValues = null; - this.score.TabIndex = 21; + this.score.TabIndex = 1; // // label9 // @@ -690,7 +690,7 @@ this.gravity.Name = "gravity"; this.gravity.Size = new System.Drawing.Size(72, 24); this.gravity.StepValues = null; - this.gravity.TabIndex = 19; + this.gravity.TabIndex = 0; // // grouprendering // @@ -729,7 +729,7 @@ this.scale.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.scale.Name = "scale"; this.scale.Size = new System.Drawing.Size(186, 26); - this.scale.TabIndex = 31; + this.scale.TabIndex = 0; this.scale.OnValuesChanged += new System.EventHandler(this.scale_OnValuesChanged); // // color @@ -737,10 +737,10 @@ this.color.DefaultValue = 0; this.color.Field = "fillcolor"; this.color.Label = "Color:"; - this.color.Location = new System.Drawing.Point(44, 115); + this.color.Location = new System.Drawing.Point(22, 115); this.color.Name = "color"; this.color.Size = new System.Drawing.Size(207, 31); - this.color.TabIndex = 30; + this.color.TabIndex = 3; // // alpha // @@ -757,7 +757,7 @@ this.alpha.Name = "alpha"; this.alpha.Size = new System.Drawing.Size(72, 24); this.alpha.StepValues = null; - this.alpha.TabIndex = 23; + this.alpha.TabIndex = 2; this.alpha.WhenTextChanged += new System.EventHandler(this.alpha_WhenTextChanged); // // label8 @@ -776,7 +776,7 @@ this.renderStyle.Location = new System.Drawing.Point(91, 57); this.renderStyle.Name = "renderStyle"; this.renderStyle.Size = new System.Drawing.Size(156, 21); - this.renderStyle.TabIndex = 24; + this.renderStyle.TabIndex = 1; this.renderStyle.SelectedIndexChanged += new System.EventHandler(this.renderStyle_SelectedIndexChanged); // // labelrenderstyle diff --git a/Source/Plugins/SoundPropagationMode/Windows/ColorConfiguration.designer.cs b/Source/Plugins/SoundPropagationMode/Windows/ColorConfiguration.designer.cs index 88929ed5..10a4a872 100644 --- a/Source/Plugins/SoundPropagationMode/Windows/ColorConfiguration.designer.cs +++ b/Source/Plugins/SoundPropagationMode/Windows/ColorConfiguration.designer.cs @@ -47,8 +47,8 @@ this.highlightcolor.MaximumSize = new System.Drawing.Size(10000, 23); this.highlightcolor.MinimumSize = new System.Drawing.Size(100, 23); this.highlightcolor.Name = "highlightcolor"; - this.highlightcolor.Size = new System.Drawing.Size(168, 23); - this.highlightcolor.TabIndex = 1; + this.highlightcolor.Size = new System.Drawing.Size(150, 23); + this.highlightcolor.TabIndex = 0; // // level1color // @@ -59,8 +59,8 @@ this.level1color.MaximumSize = new System.Drawing.Size(10000, 23); this.level1color.MinimumSize = new System.Drawing.Size(100, 23); this.level1color.Name = "level1color"; - this.level1color.Size = new System.Drawing.Size(168, 23); - this.level1color.TabIndex = 2; + this.level1color.Size = new System.Drawing.Size(150, 23); + this.level1color.TabIndex = 1; // // level2color // @@ -71,8 +71,8 @@ this.level2color.MaximumSize = new System.Drawing.Size(10000, 23); this.level2color.MinimumSize = new System.Drawing.Size(100, 23); this.level2color.Name = "level2color"; - this.level2color.Size = new System.Drawing.Size(168, 23); - this.level2color.TabIndex = 3; + this.level2color.Size = new System.Drawing.Size(150, 23); + this.level2color.TabIndex = 2; // // nosoundcolor // @@ -83,8 +83,8 @@ this.nosoundcolor.MaximumSize = new System.Drawing.Size(10000, 23); this.nosoundcolor.MinimumSize = new System.Drawing.Size(100, 23); this.nosoundcolor.Name = "nosoundcolor"; - this.nosoundcolor.Size = new System.Drawing.Size(168, 23); - this.nosoundcolor.TabIndex = 4; + this.nosoundcolor.Size = new System.Drawing.Size(150, 23); + this.nosoundcolor.TabIndex = 3; // // blocksoundcolor // @@ -95,14 +95,14 @@ this.blocksoundcolor.MaximumSize = new System.Drawing.Size(10000, 23); this.blocksoundcolor.MinimumSize = new System.Drawing.Size(100, 23); this.blocksoundcolor.Name = "blocksoundcolor"; - this.blocksoundcolor.Size = new System.Drawing.Size(168, 23); - this.blocksoundcolor.TabIndex = 5; + this.blocksoundcolor.Size = new System.Drawing.Size(150, 23); + this.blocksoundcolor.TabIndex = 4; // // okbutton // - this.okbutton.Location = new System.Drawing.Point(105, 186); + this.okbutton.Location = new System.Drawing.Point(12, 186); this.okbutton.Name = "okbutton"; - this.okbutton.Size = new System.Drawing.Size(75, 23); + this.okbutton.Size = new System.Drawing.Size(73, 23); this.okbutton.TabIndex = 6; this.okbutton.Text = "OK"; this.okbutton.UseVisualStyleBackColor = true; @@ -111,9 +111,9 @@ // cancelbutton // this.cancelbutton.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancelbutton.Location = new System.Drawing.Point(12, 186); + this.cancelbutton.Location = new System.Drawing.Point(89, 186); this.cancelbutton.Name = "cancelbutton"; - this.cancelbutton.Size = new System.Drawing.Size(75, 23); + this.cancelbutton.Size = new System.Drawing.Size(73, 23); this.cancelbutton.TabIndex = 7; this.cancelbutton.Text = "Cancel"; this.cancelbutton.UseVisualStyleBackColor = true; @@ -122,8 +122,8 @@ // this.resetcolors.Location = new System.Drawing.Point(12, 157); this.resetcolors.Name = "resetcolors"; - this.resetcolors.Size = new System.Drawing.Size(168, 23); - this.resetcolors.TabIndex = 8; + this.resetcolors.Size = new System.Drawing.Size(150, 23); + this.resetcolors.TabIndex = 5; this.resetcolors.Text = "Reset colors"; this.resetcolors.UseVisualStyleBackColor = true; this.resetcolors.Click += new System.EventHandler(this.resetcolors_Click); @@ -134,7 +134,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.CancelButton = this.cancelbutton; - this.ClientSize = new System.Drawing.Size(196, 223); + this.ClientSize = new System.Drawing.Size(174, 214); this.Controls.Add(this.resetcolors); this.Controls.Add(this.cancelbutton); this.Controls.Add(this.okbutton);