diff --git a/Source/Core/Controls/ActionSpecialHelpButton.Designer.cs b/Source/Core/Controls/ActionSpecialHelpButton.Designer.cs index ec06a607..f285b804 100644 --- a/Source/Core/Controls/ActionSpecialHelpButton.Designer.cs +++ b/Source/Core/Controls/ActionSpecialHelpButton.Designer.cs @@ -45,8 +45,8 @@ // // ActionSpecialHelpButton // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.Controls.Add(this.button); this.Name = "ActionSpecialHelpButton"; this.Size = new System.Drawing.Size(28, 26); diff --git a/Source/Core/Controls/HintsPanel.Designer.cs b/Source/Core/Controls/HintsPanel.Designer.cs index 777c32ed..de3ea123 100644 --- a/Source/Core/Controls/HintsPanel.Designer.cs +++ b/Source/Core/Controls/HintsPanel.Designer.cs @@ -63,8 +63,8 @@ // // HintsPanel // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.Controls.Add(this.hints); this.Controls.Add(this.label1); this.Name = "HintsPanel"; diff --git a/Source/Core/Controls/SectorSlopeControl.Designer.cs b/Source/Core/Controls/SectorSlopeControl.Designer.cs index ec8492d2..cef92456 100644 --- a/Source/Core/Controls/SectorSlopeControl.Designer.cs +++ b/Source/Core/Controls/SectorSlopeControl.Designer.cs @@ -123,7 +123,7 @@ this.rotationcontrol.Name = "rotationcontrol"; this.rotationcontrol.Size = new System.Drawing.Size(44, 44); this.rotationcontrol.TabIndex = 56; - this.rotationcontrol.AngleChanged += new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl.AngleChangedDelegate(this.rotationcontrol_AngleChanged); + this.rotationcontrol.AngleChanged += new System.EventHandler(this.rotationcontrol_AngleChanged); // // slopeangle // diff --git a/Source/Core/Controls/SectorSlopeControl.cs b/Source/Core/Controls/SectorSlopeControl.cs index e86d1f38..bdbef402 100644 --- a/Source/Core/Controls/SectorSlopeControl.cs +++ b/Source/Core/Controls/SectorSlopeControl.cs @@ -179,7 +179,7 @@ namespace CodeImp.DoomBuilder.Controls blockUpdate = false; } - private void rotationcontrol_AngleChanged() + private void rotationcontrol_AngleChanged(object sender, EventArgs e) { if(blockUpdate) return; blockUpdate = true; diff --git a/Source/Core/GZBuilder/Controls/AngleControl.Designer.cs b/Source/Core/GZBuilder/Controls/AngleControl.Designer.cs index 0ad7193b..f146a081 100644 --- a/Source/Core/GZBuilder/Controls/AngleControl.Designer.cs +++ b/Source/Core/GZBuilder/Controls/AngleControl.Designer.cs @@ -34,8 +34,8 @@ // // AngleControl // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.Name = "AngleControl"; this.Size = new System.Drawing.Size(40, 40); this.toolTip.SetToolTip(this, "Left-click (and drag) to set angle snapped to 45-degree increment.\r\nRight-click (" + diff --git a/Source/Core/GZBuilder/Controls/AngleControl.cs b/Source/Core/GZBuilder/Controls/AngleControl.cs index 0858d065..4d2aa15d 100644 --- a/Source/Core/GZBuilder/Controls/AngleControl.cs +++ b/Source/Core/GZBuilder/Controls/AngleControl.cs @@ -40,8 +40,7 @@ namespace CodeImp.DoomBuilder.GZBuilder.Controls #region Properties - public delegate void AngleChangedDelegate(); - public event AngleChangedDelegate AngleChanged; + public event EventHandler AngleChanged; public int Angle { get { return (angle == NO_ANGLE ? NO_ANGLE : angle - angleoffset); } set { angle = (value == NO_ANGLE ? NO_ANGLE : value + angleoffset); this.Refresh(); } } public int AngleOffset { get { return angleoffset; } set { angleoffset = value; this.Refresh(); } } @@ -175,7 +174,7 @@ namespace CodeImp.DoomBuilder.GZBuilder.Controls if(thisAngle != angle) { angle = thisAngle; - if(!this.DesignMode && AngleChanged != null) AngleChanged(); //Raise event + if(!this.DesignMode && AngleChanged != null) AngleChanged(this, EventArgs.Empty); //Raise event this.Refresh(); } } @@ -195,7 +194,7 @@ namespace CodeImp.DoomBuilder.GZBuilder.Controls if(thisAngle != angle) { angle = thisAngle; - if(!this.DesignMode && AngleChanged != null) AngleChanged(); //Raise event + if(!this.DesignMode && AngleChanged != null) AngleChanged(this, EventArgs.Empty); //Raise event this.Refresh(); } } diff --git a/Source/Core/GZBuilder/Controls/ColorFieldsControl.Designer.cs b/Source/Core/GZBuilder/Controls/ColorFieldsControl.Designer.cs index cdc94183..e007158e 100644 --- a/Source/Core/GZBuilder/Controls/ColorFieldsControl.Designer.cs +++ b/Source/Core/GZBuilder/Controls/ColorFieldsControl.Designer.cs @@ -67,8 +67,8 @@ // // ColorFieldsControl // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.Controls.Add(this.tbColor); this.Controls.Add(this.bReset); this.Controls.Add(this.cpColor); diff --git a/Source/Core/GZBuilder/Controls/ColorFieldsControl.resx b/Source/Core/GZBuilder/Controls/ColorFieldsControl.resx index 965f82d3..ff31a6db 100644 --- a/Source/Core/GZBuilder/Controls/ColorFieldsControl.resx +++ b/Source/Core/GZBuilder/Controls/ColorFieldsControl.resx @@ -1,120 +1,120 @@ + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - text/microsoft-resx + text/microsoft-resx - 2.0 + 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/Source/Core/GZBuilder/Controls/CustomLinedefColorProperties.designer.cs b/Source/Core/GZBuilder/Controls/CustomLinedefColorProperties.designer.cs index 1edb900a..c4700ef6 100644 --- a/Source/Core/GZBuilder/Controls/CustomLinedefColorProperties.designer.cs +++ b/Source/Core/GZBuilder/Controls/CustomLinedefColorProperties.designer.cs @@ -30,18 +30,18 @@ { this.gbLineColor = new System.Windows.Forms.GroupBox(); this.labelErrors = new System.Windows.Forms.Label(); + this.lineColor = new CodeImp.DoomBuilder.Controls.ColorControl(); this.tcLineSettings = new System.Windows.Forms.TabControl(); this.tabFlags = new System.Windows.Forms.TabPage(); this.flags = new System.Windows.Forms.CheckedListBox(); this.cbUseFlags = new System.Windows.Forms.CheckBox(); this.tabAction = new System.Windows.Forms.TabPage(); + this.action = new CodeImp.DoomBuilder.Controls.ActionSelectorControl(); this.cbUseAction = new System.Windows.Forms.CheckBox(); this.tabActivation = new System.Windows.Forms.TabPage(); this.activation = new System.Windows.Forms.ComboBox(); this.cbUseActivation = new System.Windows.Forms.CheckBox(); this.udmfactivates = new System.Windows.Forms.CheckedListBox(); - this.lineColor = new CodeImp.DoomBuilder.Controls.ColorControl(); - this.action = new CodeImp.DoomBuilder.Controls.ActionSelectorControl(); this.gbLineColor.SuspendLayout(); this.tcLineSettings.SuspendLayout(); this.tabFlags.SuspendLayout(); @@ -72,6 +72,19 @@ this.labelErrors.Text = "Teh Error occured!"; this.labelErrors.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // + // lineColor + // + this.lineColor.BackColor = System.Drawing.Color.Transparent; + this.lineColor.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lineColor.Label = "Linedef color:"; + this.lineColor.Location = new System.Drawing.Point(6, 13); + this.lineColor.MaximumSize = new System.Drawing.Size(10000, 23); + this.lineColor.MinimumSize = new System.Drawing.Size(100, 23); + this.lineColor.Name = "lineColor"; + this.lineColor.Size = new System.Drawing.Size(132, 23); + this.lineColor.TabIndex = 0; + this.lineColor.ColorChanged += new System.EventHandler(this.lineColor_ColorChanged); + // // tcLineSettings // this.tcLineSettings.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -138,6 +151,22 @@ this.tabAction.Text = "Action"; this.tabAction.UseVisualStyleBackColor = true; // + // action + // + this.action.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.action.BackColor = System.Drawing.Color.Transparent; + this.action.Cursor = System.Windows.Forms.Cursors.Default; + this.action.Empty = false; + this.action.GeneralizedCategories = null; + this.action.GeneralizedOptions = null; + this.action.Location = new System.Drawing.Point(6, 30); + this.action.Name = "action"; + this.action.Size = new System.Drawing.Size(309, 21); + this.action.TabIndex = 6; + this.action.Value = 0; + this.action.ValueChanges += new System.EventHandler(this.action_ValueChanges); + // // cbUseAction // this.cbUseAction.AutoSize = true; @@ -200,38 +229,10 @@ this.udmfactivates.ItemCheck += new System.Windows.Forms.ItemCheckEventHandler(this.flags_ItemCheck); this.udmfactivates.SelectedValueChanged += new System.EventHandler(this.udmfactivates_SelectedValueChanged); // - // lineColor - // - this.lineColor.BackColor = System.Drawing.Color.Transparent; - this.lineColor.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lineColor.Label = "Linedef color:"; - this.lineColor.Location = new System.Drawing.Point(6, 13); - this.lineColor.MaximumSize = new System.Drawing.Size(10000, 23); - this.lineColor.MinimumSize = new System.Drawing.Size(100, 23); - this.lineColor.Name = "lineColor"; - this.lineColor.Size = new System.Drawing.Size(132, 23); - this.lineColor.TabIndex = 0; - this.lineColor.ColorChanged += new System.EventHandler(this.lineColor_ColorChanged); - // - // action - // - this.action.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.action.BackColor = System.Drawing.Color.Transparent; - this.action.Cursor = System.Windows.Forms.Cursors.Default; - this.action.Empty = false; - this.action.GeneralizedCategories = null; - this.action.Location = new System.Drawing.Point(6, 30); - this.action.Name = "action"; - this.action.Size = new System.Drawing.Size(309, 21); - this.action.TabIndex = 6; - this.action.Value = 0; - this.action.ValueChanges += new System.EventHandler(this.action_ValueChanges); - // // CustomLinedefColorProperties // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.Controls.Add(this.gbLineColor); this.Controls.Add(this.tcLineSettings); this.Name = "CustomLinedefColorProperties"; diff --git a/Source/Core/GZBuilder/Controls/CustomLinedefColorProperties.resx b/Source/Core/GZBuilder/Controls/CustomLinedefColorProperties.resx index 965f82d3..ff31a6db 100644 --- a/Source/Core/GZBuilder/Controls/CustomLinedefColorProperties.resx +++ b/Source/Core/GZBuilder/Controls/CustomLinedefColorProperties.resx @@ -1,120 +1,120 @@ + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - text/microsoft-resx + text/microsoft-resx - 2.0 + 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/Source/Core/GZBuilder/Controls/CustomLinedefColorsControl.designer.cs b/Source/Core/GZBuilder/Controls/CustomLinedefColorsControl.designer.cs index 44f21368..92c534e5 100644 --- a/Source/Core/GZBuilder/Controls/CustomLinedefColorsControl.designer.cs +++ b/Source/Core/GZBuilder/Controls/CustomLinedefColorsControl.designer.cs @@ -32,10 +32,10 @@ this.bMoveUp = new System.Windows.Forms.Button(); this.bMoveDown = new System.Windows.Forms.Button(); this.bRemovePreset = new System.Windows.Forms.Button(); + this.lbColorPresets = new CodeImp.DoomBuilder.GZBuilder.Controls.IconListBox(); this.tbNewPresetName = new System.Windows.Forms.TextBox(); this.bAddPreset = new System.Windows.Forms.Button(); this.colorProperties = new CodeImp.DoomBuilder.GZBuilder.Controls.CustomLinedefColorProperties(); - this.lbColorPresets = new CodeImp.DoomBuilder.GZBuilder.Controls.IconListBox(); this.gbPresets.SuspendLayout(); this.SuspendLayout(); // @@ -92,6 +92,20 @@ this.bRemovePreset.UseVisualStyleBackColor = true; this.bRemovePreset.Click += new System.EventHandler(this.bRemovePreset_Click); // + // lbColorPresets + // + this.lbColorPresets.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.lbColorPresets.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.lbColorPresets.FormattingEnabled = true; + this.lbColorPresets.HorizontalScrollbar = true; + this.lbColorPresets.Location = new System.Drawing.Point(6, 73); + this.lbColorPresets.Name = "lbColorPresets"; + this.lbColorPresets.Size = new System.Drawing.Size(133, 173); + this.lbColorPresets.TabIndex = 4; + this.lbColorPresets.SelectedIndexChanged += new System.EventHandler(this.lbColorPresets_SelectedIndexChanged); + // // tbNewPresetName // this.tbNewPresetName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -129,24 +143,10 @@ this.colorProperties.Size = new System.Drawing.Size(270, 250); this.colorProperties.TabIndex = 3; // - // lbColorPresets - // - this.lbColorPresets.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.lbColorPresets.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.lbColorPresets.FormattingEnabled = true; - this.lbColorPresets.HorizontalScrollbar = true; - this.lbColorPresets.Location = new System.Drawing.Point(6, 73); - this.lbColorPresets.Name = "lbColorPresets"; - this.lbColorPresets.Size = new System.Drawing.Size(133, 173); - this.lbColorPresets.TabIndex = 4; - this.lbColorPresets.SelectedIndexChanged += new System.EventHandler(this.lbColorPresets_SelectedIndexChanged); - // // CustomLinedefColorsControl // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.Controls.Add(this.colorProperties); this.Controls.Add(this.gbPresets); this.Name = "CustomLinedefColorsControl"; diff --git a/Source/Core/GZBuilder/Controls/CustomLinedefColorsControl.resx b/Source/Core/GZBuilder/Controls/CustomLinedefColorsControl.resx index 965f82d3..ff31a6db 100644 --- a/Source/Core/GZBuilder/Controls/CustomLinedefColorsControl.resx +++ b/Source/Core/GZBuilder/Controls/CustomLinedefColorsControl.resx @@ -1,120 +1,120 @@ + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - text/microsoft-resx + text/microsoft-resx - 2.0 + 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/Source/Core/GZBuilder/Controls/PairedFloatControl.Designer.cs b/Source/Core/GZBuilder/Controls/PairedFloatControl.Designer.cs index 30d418a9..6aca9f11 100644 --- a/Source/Core/GZBuilder/Controls/PairedFloatControl.Designer.cs +++ b/Source/Core/GZBuilder/Controls/PairedFloatControl.Designer.cs @@ -28,96 +28,98 @@ /// private void InitializeComponent() { - this.value1 = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox(); - this.value2 = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox(); - this.label = new System.Windows.Forms.Label(); - this.bReset = new System.Windows.Forms.Button(); - this.bLink = new System.Windows.Forms.Button(); - this.SuspendLayout(); - // - // value1 - // - this.value1.AllowDecimal = true; - this.value1.AllowNegative = true; - this.value1.AllowRelative = true; - this.value1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.value1.ButtonStep = 1; - this.value1.ButtonStepFloat = 1F; - this.value1.Location = new System.Drawing.Point(86, 1); - this.value1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); - this.value1.Name = "value1"; - this.value1.Size = new System.Drawing.Size(62, 24); - this.value1.StepValues = null; - this.value1.TabIndex = 42; - this.value1.Tag = "offsetx_top"; - this.value1.WhenTextChanged += new System.EventHandler(this.value1_WhenTextChanged); - // - // value2 - // - this.value2.AllowDecimal = true; - this.value2.AllowNegative = true; - this.value2.AllowRelative = true; - this.value2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.value2.ButtonStep = 1; - this.value2.ButtonStepFloat = 1F; - this.value2.Location = new System.Drawing.Point(155, 1); - this.value2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); - this.value2.Name = "value2"; - this.value2.Size = new System.Drawing.Size(62, 24); - this.value2.StepValues = null; - this.value2.TabIndex = 43; - this.value2.Tag = "offsety_top"; - this.value2.WhenTextChanged += new System.EventHandler(this.value2_WhenTextChanged); - // - // label - // - this.label.Location = new System.Drawing.Point(0, 6); - this.label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.label.Name = "label"; - this.label.Size = new System.Drawing.Size(86, 15); - this.label.TabIndex = 41; - this.label.Text = "Texture Offsets:"; - this.label.TextAlign = System.Drawing.ContentAlignment.TopRight; - // - // bReset - // - this.bReset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.bReset.Image = global::CodeImp.DoomBuilder.Properties.Resources.Reset; - this.bReset.Location = new System.Drawing.Point(245, 1); - this.bReset.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); - this.bReset.Name = "bReset"; - this.bReset.Size = new System.Drawing.Size(23, 25); - this.bReset.TabIndex = 45; - this.bReset.UseVisualStyleBackColor = true; - this.bReset.Visible = false; - this.bReset.Click += new System.EventHandler(this.bReset_Click); - // - // bLink - // - this.bLink.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.bLink.Image = global::CodeImp.DoomBuilder.Properties.Resources.Link; - this.bLink.Location = new System.Drawing.Point(220, 1); - this.bLink.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); - this.bLink.Name = "bLink"; - this.bLink.Size = new System.Drawing.Size(23, 25); - this.bLink.TabIndex = 44; - this.bLink.UseVisualStyleBackColor = true; - this.bLink.Click += new System.EventHandler(this.bLink_Click); - // - // PairedFloatControl - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.bReset); - this.Controls.Add(this.bLink); - this.Controls.Add(this.value1); - this.Controls.Add(this.value2); - this.Controls.Add(this.label); - this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); - this.Name = "PairedFloatControl"; - this.Size = new System.Drawing.Size(268, 26); - this.ResumeLayout(false); + this.value1 = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox(); + this.value2 = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox(); + this.label = new System.Windows.Forms.Label(); + this.bReset = new System.Windows.Forms.Button(); + this.bLink = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // value1 + // + this.value1.AllowDecimal = true; + this.value1.AllowNegative = true; + this.value1.AllowRelative = true; + this.value1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.value1.ButtonStep = 1; + this.value1.ButtonStepFloat = 1F; + this.value1.ButtonStepsWrapAround = false; + this.value1.Location = new System.Drawing.Point(86, 1); + this.value1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.value1.Name = "value1"; + this.value1.Size = new System.Drawing.Size(62, 24); + this.value1.StepValues = null; + this.value1.TabIndex = 42; + this.value1.Tag = "offsetx_top"; + this.value1.WhenTextChanged += new System.EventHandler(this.value1_WhenTextChanged); + // + // value2 + // + this.value2.AllowDecimal = true; + this.value2.AllowNegative = true; + this.value2.AllowRelative = true; + this.value2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.value2.ButtonStep = 1; + this.value2.ButtonStepFloat = 1F; + this.value2.ButtonStepsWrapAround = false; + this.value2.Location = new System.Drawing.Point(155, 1); + this.value2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.value2.Name = "value2"; + this.value2.Size = new System.Drawing.Size(62, 24); + this.value2.StepValues = null; + this.value2.TabIndex = 43; + this.value2.Tag = "offsety_top"; + this.value2.WhenTextChanged += new System.EventHandler(this.value2_WhenTextChanged); + // + // label + // + this.label.Location = new System.Drawing.Point(0, 6); + this.label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label.Name = "label"; + this.label.Size = new System.Drawing.Size(86, 15); + this.label.TabIndex = 41; + this.label.Text = "Texture Offsets:"; + this.label.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // bReset + // + this.bReset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.bReset.Image = global::CodeImp.DoomBuilder.Properties.Resources.Reset; + this.bReset.Location = new System.Drawing.Point(245, 1); + this.bReset.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.bReset.Name = "bReset"; + this.bReset.Size = new System.Drawing.Size(23, 25); + this.bReset.TabIndex = 45; + this.bReset.UseVisualStyleBackColor = true; + this.bReset.Visible = false; + this.bReset.Click += new System.EventHandler(this.bReset_Click); + // + // bLink + // + this.bLink.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.bLink.Image = global::CodeImp.DoomBuilder.Properties.Resources.Unlink; + this.bLink.Location = new System.Drawing.Point(220, 1); + this.bLink.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.bLink.Name = "bLink"; + this.bLink.Size = new System.Drawing.Size(23, 25); + this.bLink.TabIndex = 44; + this.bLink.UseVisualStyleBackColor = true; + this.bLink.Click += new System.EventHandler(this.bLink_Click); + // + // PairedFloatControl + // + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.Controls.Add(this.bReset); + this.Controls.Add(this.bLink); + this.Controls.Add(this.value1); + this.Controls.Add(this.value2); + this.Controls.Add(this.label); + this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.Name = "PairedFloatControl"; + this.Size = new System.Drawing.Size(268, 26); + this.ResumeLayout(false); } diff --git a/Source/Core/GZBuilder/Controls/TagSelector.Designer.cs b/Source/Core/GZBuilder/Controls/TagSelector.Designer.cs index 2b250cbf..63b93e81 100644 --- a/Source/Core/GZBuilder/Controls/TagSelector.Designer.cs +++ b/Source/Core/GZBuilder/Controls/TagSelector.Designer.cs @@ -97,8 +97,8 @@ // // TagSelector // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.Controls.Add(this.clear); this.Controls.Add(this.unusedTag); this.Controls.Add(this.newTag); diff --git a/Source/Core/GZBuilder/Controls/TagSelector.resx b/Source/Core/GZBuilder/Controls/TagSelector.resx index e641aef8..7ce03af8 100644 --- a/Source/Core/GZBuilder/Controls/TagSelector.resx +++ b/Source/Core/GZBuilder/Controls/TagSelector.resx @@ -120,7 +120,4 @@ 17, 17 - - 17, 17 - \ No newline at end of file diff --git a/Source/Core/Resources/GZDB2.ico b/Source/Core/Resources/GZDB2.ico index 7b4041b3..5091522d 100644 Binary files a/Source/Core/Resources/GZDB2.ico and b/Source/Core/Resources/GZDB2.ico differ diff --git a/Source/Core/Windows/SectorEditFormUDMF.Designer.cs b/Source/Core/Windows/SectorEditFormUDMF.Designer.cs index 8e1851de..dfe0ff8d 100644 --- a/Source/Core/Windows/SectorEditFormUDMF.Designer.cs +++ b/Source/Core/Windows/SectorEditFormUDMF.Designer.cs @@ -531,7 +531,7 @@ this.floorAngleControl.Name = "floorAngleControl"; this.floorAngleControl.Size = new System.Drawing.Size(44, 44); this.floorAngleControl.TabIndex = 56; - this.floorAngleControl.AngleChanged += new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl.AngleChangedDelegate(this.floorAngleControl_AngleChanged); + this.floorAngleControl.AngleChanged += new System.EventHandler(this.floorAngleControl_AngleChanged); // // labelfloorrenderstyle // @@ -732,7 +732,7 @@ this.ceilAngleControl.Name = "ceilAngleControl"; this.ceilAngleControl.Size = new System.Drawing.Size(44, 44); this.ceilAngleControl.TabIndex = 55; - this.ceilAngleControl.AngleChanged += new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl.AngleChangedDelegate(this.ceilAngleControl_AngleChanged); + this.ceilAngleControl.AngleChanged += new System.EventHandler(this.ceilAngleControl_AngleChanged); // // labelceilrenderstyle // diff --git a/Source/Core/Windows/SectorEditFormUDMF.cs b/Source/Core/Windows/SectorEditFormUDMF.cs index 6b460bbc..6d5ddfa8 100644 --- a/Source/Core/Windows/SectorEditFormUDMF.cs +++ b/Source/Core/Windows/SectorEditFormUDMF.cs @@ -729,12 +729,12 @@ namespace CodeImp.DoomBuilder.Windows fieldslist.Focus(); } - private void ceilAngleControl_AngleChanged() + private void ceilAngleControl_AngleChanged(object sender, EventArgs e) { ceilRotation.Text = (General.ClampAngle(360 - ceilAngleControl.Angle)).ToString(); } - private void floorAngleControl_AngleChanged() + private void floorAngleControl_AngleChanged(object sender, EventArgs e) { floorRotation.Text = (General.ClampAngle(360 - floorAngleControl.Angle)).ToString(); } diff --git a/Source/Core/Windows/ThingEditForm.Designer.cs b/Source/Core/Windows/ThingEditForm.Designer.cs index 52a63312..b2a75eb8 100644 --- a/Source/Core/Windows/ThingEditForm.Designer.cs +++ b/Source/Core/Windows/ThingEditForm.Designer.cs @@ -234,7 +234,7 @@ namespace CodeImp.DoomBuilder.Windows this.anglecontrol.Name = "anglecontrol"; this.anglecontrol.Size = new System.Drawing.Size(88, 88); this.anglecontrol.TabIndex = 20; - this.anglecontrol.AngleChanged += new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl.AngleChangedDelegate(this.anglecontrol_AngleChanged); + this.anglecontrol.AngleChanged += new System.EventHandler(this.anglecontrol_AngleChanged); // // cbRandomAngle // diff --git a/Source/Core/Windows/ThingEditForm.cs b/Source/Core/Windows/ThingEditForm.cs index b023e7b5..3688d138 100644 --- a/Source/Core/Windows/ThingEditForm.cs +++ b/Source/Core/Windows/ThingEditForm.cs @@ -386,7 +386,7 @@ namespace CodeImp.DoomBuilder.Windows } //mxd. Angle control clicked - private void anglecontrol_AngleChanged() + private void anglecontrol_AngleChanged(object sender, EventArgs e) { if(preventchanges) return; angle.Text = anglecontrol.Angle.ToString(); diff --git a/Source/Core/Windows/ThingEditFormUDMF.Designer.cs b/Source/Core/Windows/ThingEditFormUDMF.Designer.cs index e5b8dd3d..524dd3e7 100644 --- a/Source/Core/Windows/ThingEditFormUDMF.Designer.cs +++ b/Source/Core/Windows/ThingEditFormUDMF.Designer.cs @@ -243,7 +243,7 @@ this.anglecontrol.Name = "anglecontrol"; this.anglecontrol.Size = new System.Drawing.Size(64, 64); this.anglecontrol.TabIndex = 20; - this.anglecontrol.AngleChanged += new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl.AngleChangedDelegate(this.anglecontrol_AngleChanged); + this.anglecontrol.AngleChanged += new System.EventHandler(this.anglecontrol_AngleChanged); // // labelGravity // @@ -355,7 +355,7 @@ this.rollControl.Name = "rollControl"; this.rollControl.Size = new System.Drawing.Size(64, 64); this.rollControl.TabIndex = 20; - this.rollControl.AngleChanged += new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl.AngleChangedDelegate(this.rollControl_AngleChanged); + this.rollControl.AngleChanged += new System.EventHandler(this.rollControl_AngleChanged); // // grouppitch // @@ -375,7 +375,7 @@ this.pitchControl.Name = "pitchControl"; this.pitchControl.Size = new System.Drawing.Size(64, 64); this.pitchControl.TabIndex = 20; - this.pitchControl.AngleChanged += new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl.AngleChangedDelegate(this.pitchControl_AngleChanged); + this.pitchControl.AngleChanged += new System.EventHandler(this.pitchControl_AngleChanged); // // groupBox7 // diff --git a/Source/Core/Windows/ThingEditFormUDMF.cs b/Source/Core/Windows/ThingEditFormUDMF.cs index 2fec5537..da5e258d 100644 --- a/Source/Core/Windows/ThingEditFormUDMF.cs +++ b/Source/Core/Windows/ThingEditFormUDMF.cs @@ -480,7 +480,7 @@ namespace CodeImp.DoomBuilder.Windows } //mxd. Angle control clicked - private void anglecontrol_AngleChanged() + private void anglecontrol_AngleChanged(object sender, EventArgs e) { if(preventchanges) return; angle.Text = anglecontrol.Angle.ToString(); @@ -497,7 +497,7 @@ namespace CodeImp.DoomBuilder.Windows UpdatePitch(); } - private void pitchControl_AngleChanged() + private void pitchControl_AngleChanged(object sender, EventArgs e) { if(preventchanges) return; pitch.Text = (General.ClampAngle(pitchControl.Angle - 90)).ToString(); @@ -514,7 +514,7 @@ namespace CodeImp.DoomBuilder.Windows UpdateRoll(); } - private void rollControl_AngleChanged() + private void rollControl_AngleChanged(object sender, EventArgs e) { if(preventchanges) return; roll.Text = (General.ClampAngle(rollControl.Angle - 90)).ToString(); diff --git a/Source/Plugins/BuilderEffects/Interface/MenusForm.Designer.cs b/Source/Plugins/BuilderEffects/Interface/MenusForm.Designer.cs index 9dd718d4..2087d9eb 100644 --- a/Source/Plugins/BuilderEffects/Interface/MenusForm.Designer.cs +++ b/Source/Plugins/BuilderEffects/Interface/MenusForm.Designer.cs @@ -76,7 +76,7 @@ // this.jitterItem.Image = global::CodeImp.DoomBuilder.BuilderEffects.Properties.Resources.Jitter; this.jitterItem.Name = "jitterItem"; - this.jitterItem.Size = new System.Drawing.Size(152, 22); + this.jitterItem.Size = new System.Drawing.Size(133, 22); this.jitterItem.Tag = "applyjitter"; this.jitterItem.Text = "Randomize"; this.jitterItem.Click += new System.EventHandler(this.InvokeTaggedAction); @@ -104,8 +104,8 @@ // // MenusForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.ClientSize = new System.Drawing.Size(452, 129); this.Controls.Add(this.toolStrip); this.Controls.Add(this.menuStrip); diff --git a/Source/Plugins/BuilderModes/Interface/BridgeModeForm.Designer.cs b/Source/Plugins/BuilderModes/Interface/BridgeModeForm.Designer.cs index da69e2d9..5182e85f 100644 --- a/Source/Plugins/BuilderModes/Interface/BridgeModeForm.Designer.cs +++ b/Source/Plugins/BuilderModes/Interface/BridgeModeForm.Designer.cs @@ -44,7 +44,8 @@ // // buttonOK // - this.buttonOK.Location = new System.Drawing.Point(177, 139); + this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonOK.Location = new System.Drawing.Point(177, 148); this.buttonOK.Name = "buttonOK"; this.buttonOK.Size = new System.Drawing.Size(75, 23); this.buttonOK.TabIndex = 4; @@ -54,8 +55,9 @@ // // buttonCancel // + this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.buttonCancel.Location = new System.Drawing.Point(95, 139); + this.buttonCancel.Location = new System.Drawing.Point(95, 148); this.buttonCancel.Name = "buttonCancel"; this.buttonCancel.Size = new System.Drawing.Size(75, 23); this.buttonCancel.TabIndex = 5; @@ -68,7 +70,7 @@ this.cbFloorAlign.FormattingEnabled = true; this.cbFloorAlign.Location = new System.Drawing.Point(93, 12); this.cbFloorAlign.Name = "cbFloorAlign"; - this.cbFloorAlign.Size = new System.Drawing.Size(158, 21); + this.cbFloorAlign.Size = new System.Drawing.Size(158, 22); this.cbFloorAlign.TabIndex = 0; // // cbCeilingAlign @@ -76,7 +78,7 @@ this.cbCeilingAlign.FormattingEnabled = true; this.cbCeilingAlign.Location = new System.Drawing.Point(93, 39); this.cbCeilingAlign.Name = "cbCeilingAlign"; - this.cbCeilingAlign.Size = new System.Drawing.Size(158, 21); + this.cbCeilingAlign.Size = new System.Drawing.Size(158, 22); this.cbCeilingAlign.TabIndex = 1; // // cbBrightness @@ -84,7 +86,7 @@ this.cbBrightness.FormattingEnabled = true; this.cbBrightness.Location = new System.Drawing.Point(93, 66); this.cbBrightness.Name = "cbBrightness"; - this.cbBrightness.Size = new System.Drawing.Size(158, 21); + this.cbBrightness.Size = new System.Drawing.Size(158, 22); this.cbBrightness.TabIndex = 2; // // label1 @@ -92,7 +94,7 @@ this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(31, 15); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(56, 13); + this.label1.Size = new System.Drawing.Size(59, 14); this.label1.TabIndex = 5; this.label1.Text = "Align floor:"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -102,7 +104,7 @@ this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(21, 42); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(66, 13); + this.label2.Size = new System.Drawing.Size(67, 14); this.label2.TabIndex = 6; this.label2.Text = "Align ceiling:"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -112,14 +114,14 @@ this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(28, 69); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(59, 13); + this.label3.Size = new System.Drawing.Size(62, 14); this.label3.TabIndex = 7; this.label3.Text = "Brightness:"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // nudSubdivisions // - this.nudSubdivisions.Location = new System.Drawing.Point(205, 93); + this.nudSubdivisions.Location = new System.Drawing.Point(93, 94); this.nudSubdivisions.Name = "nudSubdivisions"; this.nudSubdivisions.Size = new System.Drawing.Size(46, 20); this.nudSubdivisions.TabIndex = 3; @@ -133,16 +135,17 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(130, 97); + this.label4.Location = new System.Drawing.Point(16, 95); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(69, 13); + this.label4.Size = new System.Drawing.Size(71, 14); this.label4.TabIndex = 9; this.label4.Text = "Subdivisions:"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // buttonFlip // - this.buttonFlip.Location = new System.Drawing.Point(13, 139); + this.buttonFlip.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonFlip.Location = new System.Drawing.Point(13, 148); this.buttonFlip.Name = "buttonFlip"; this.buttonFlip.Size = new System.Drawing.Size(75, 23); this.buttonFlip.TabIndex = 6; @@ -153,9 +156,9 @@ // cbMirror // this.cbMirror.AutoSize = true; - this.cbMirror.Location = new System.Drawing.Point(14, 95); + this.cbMirror.Location = new System.Drawing.Point(168, 96); this.cbMirror.Name = "cbMirror"; - this.cbMirror.Size = new System.Drawing.Size(81, 17); + this.cbMirror.Size = new System.Drawing.Size(83, 18); this.cbMirror.TabIndex = 10; this.cbMirror.Text = "Mirror mode"; this.cbMirror.UseVisualStyleBackColor = true; @@ -164,9 +167,9 @@ // cbCopy // this.cbCopy.AutoSize = true; - this.cbCopy.Location = new System.Drawing.Point(14, 118); + this.cbCopy.Location = new System.Drawing.Point(168, 119); this.cbCopy.Name = "cbCopy"; - this.cbCopy.Size = new System.Drawing.Size(79, 17); + this.cbCopy.Size = new System.Drawing.Size(80, 18); this.cbCopy.TabIndex = 10; this.cbCopy.Text = "Copy mode"; this.cbCopy.UseVisualStyleBackColor = true; @@ -175,10 +178,10 @@ // BridgeModeForm // this.AcceptButton = this.buttonOK; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.CancelButton = this.buttonCancel; - this.ClientSize = new System.Drawing.Size(263, 166); + this.ClientSize = new System.Drawing.Size(263, 175); this.Controls.Add(this.cbCopy); this.Controls.Add(this.cbMirror); this.Controls.Add(this.buttonFlip); @@ -192,10 +195,12 @@ this.Controls.Add(this.cbFloorAlign); this.Controls.Add(this.buttonCancel); this.Controls.Add(this.buttonOK); + this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "BridgeModeForm"; + this.Opacity = 1; this.ShowIcon = false; this.ShowInTaskbar = false; this.Text = "Options"; diff --git a/Source/Plugins/BuilderModes/Interface/FitTexturesForm.Designer.cs b/Source/Plugins/BuilderModes/Interface/FitTexturesForm.Designer.cs index 034346aa..f5a15df2 100644 --- a/Source/Plugins/BuilderModes/Interface/FitTexturesForm.Designer.cs +++ b/Source/Plugins/BuilderModes/Interface/FitTexturesForm.Designer.cs @@ -148,7 +148,7 @@ this.cbfitwidth.AutoSize = true; this.cbfitwidth.Location = new System.Drawing.Point(10, 19); this.cbfitwidth.Name = "cbfitwidth"; - this.cbfitwidth.Size = new System.Drawing.Size(65, 17); + this.cbfitwidth.Size = new System.Drawing.Size(67, 18); this.cbfitwidth.TabIndex = 2; this.cbfitwidth.Text = "Fit width"; this.cbfitwidth.UseVisualStyleBackColor = true; @@ -181,7 +181,7 @@ this.cbfitheight.AutoSize = true; this.cbfitheight.Location = new System.Drawing.Point(10, 42); this.cbfitheight.Name = "cbfitheight"; - this.cbfitheight.Size = new System.Drawing.Size(69, 17); + this.cbfitheight.Size = new System.Drawing.Size(69, 18); this.cbfitheight.TabIndex = 8; this.cbfitheight.Text = "Fit height"; this.cbfitheight.UseVisualStyleBackColor = true; @@ -192,7 +192,7 @@ this.cbfitconnected.AutoSize = true; this.cbfitconnected.Location = new System.Drawing.Point(10, 65); this.cbfitconnected.Name = "cbfitconnected"; - this.cbfitconnected.Size = new System.Drawing.Size(168, 17); + this.cbfitconnected.Size = new System.Drawing.Size(175, 18); this.cbfitconnected.TabIndex = 9; this.cbfitconnected.Text = "Fit across connected surfaces"; this.cbfitconnected.UseVisualStyleBackColor = true; @@ -212,13 +212,14 @@ // FitTexturesForm // this.AcceptButton = this.accept; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.ClientSize = new System.Drawing.Size(206, 223); this.Controls.Add(this.groupBox2); this.Controls.Add(this.cancel); this.Controls.Add(this.accept); this.Controls.Add(this.repeatgroup); + this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FitTexturesForm"; diff --git a/Source/Plugins/BuilderModes/Interface/SectorDrawingOptionsPanel.Designer.cs b/Source/Plugins/BuilderModes/Interface/SectorDrawingOptionsPanel.Designer.cs index 3f938e71..124856b7 100644 --- a/Source/Plugins/BuilderModes/Interface/SectorDrawingOptionsPanel.Designer.cs +++ b/Source/Plugins/BuilderModes/Interface/SectorDrawingOptionsPanel.Designer.cs @@ -51,6 +51,7 @@ this.top = new CodeImp.DoomBuilder.Controls.TextureSelectorControl(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.fillall = new System.Windows.Forms.Button(); this.filllower = new System.Windows.Forms.Button(); this.fillmiddle = new System.Windows.Forms.Button(); this.fillupper = new System.Windows.Forms.Button(); @@ -62,9 +63,8 @@ this.clearupper = new System.Windows.Forms.Button(); this.clearfloor = new System.Windows.Forms.Button(); this.clearceiling = new System.Windows.Forms.Button(); - this.groupBox5 = new System.Windows.Forms.GroupBox(); - this.fillall = new System.Windows.Forms.Button(); this.clearall = new System.Windows.Forms.Button(); + this.groupBox5 = new System.Windows.Forms.GroupBox(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); this.groupBox3.SuspendLayout(); @@ -90,19 +90,23 @@ // ceiling // this.ceiling.Location = new System.Drawing.Point(6, 41); + this.ceiling.MultipleTextures = false; this.ceiling.Name = "ceiling"; this.ceiling.Size = new System.Drawing.Size(68, 90); this.ceiling.TabIndex = 30; this.ceiling.TextureName = ""; + this.ceiling.UsePreviews = true; this.ceiling.OnValueChanged += new System.EventHandler(this.ceiling_OnValueChanged); // // floor // this.floor.Location = new System.Drawing.Point(87, 41); + this.floor.MultipleTextures = false; this.floor.Name = "floor"; this.floor.Size = new System.Drawing.Size(68, 90); this.floor.TabIndex = 29; this.floor.TextureName = ""; + this.floor.UsePreviews = true; this.floor.OnValueChanged += new System.EventHandler(this.floor_OnValueChanged); // // cbOverrideFloorTexture @@ -182,6 +186,7 @@ this.brightness.AllowRelative = false; this.brightness.ButtonStep = 16; this.brightness.ButtonStepFloat = 1F; + this.brightness.ButtonStepsWrapAround = false; this.brightness.Location = new System.Drawing.Point(105, 78); this.brightness.Name = "brightness"; this.brightness.Size = new System.Drawing.Size(72, 24); @@ -196,6 +201,7 @@ this.floorHeight.AllowRelative = false; this.floorHeight.ButtonStep = 16; this.floorHeight.ButtonStepFloat = 1F; + this.floorHeight.ButtonStepsWrapAround = false; this.floorHeight.Location = new System.Drawing.Point(105, 48); this.floorHeight.Name = "floorHeight"; this.floorHeight.Size = new System.Drawing.Size(72, 24); @@ -232,6 +238,7 @@ this.ceilHeight.AllowRelative = false; this.ceilHeight.ButtonStep = 16; this.ceilHeight.ButtonStepFloat = 1F; + this.ceilHeight.ButtonStepsWrapAround = false; this.ceilHeight.Location = new System.Drawing.Point(105, 18); this.ceilHeight.Name = "ceilHeight"; this.ceilHeight.Size = new System.Drawing.Size(72, 24); @@ -264,11 +271,13 @@ // bottom // this.bottom.Location = new System.Drawing.Point(168, 41); + this.bottom.MultipleTextures = false; this.bottom.Name = "bottom"; this.bottom.Required = false; this.bottom.Size = new System.Drawing.Size(68, 90); this.bottom.TabIndex = 25; this.bottom.TextureName = ""; + this.bottom.UsePreviews = true; this.bottom.OnValueChanged += new System.EventHandler(this.bottom_OnValueChanged); // // cbOverrideTopTexture @@ -285,21 +294,25 @@ // middle // this.middle.Location = new System.Drawing.Point(87, 41); + this.middle.MultipleTextures = false; this.middle.Name = "middle"; this.middle.Required = false; this.middle.Size = new System.Drawing.Size(68, 90); this.middle.TabIndex = 24; this.middle.TextureName = ""; + this.middle.UsePreviews = true; this.middle.OnValueChanged += new System.EventHandler(this.middle_OnValueChanged); // // top // this.top.Location = new System.Drawing.Point(6, 41); + this.top.MultipleTextures = false; this.top.Name = "top"; this.top.Required = false; this.top.Size = new System.Drawing.Size(68, 90); this.top.TabIndex = 23; this.top.TextureName = ""; + this.top.UsePreviews = true; this.top.OnValueChanged += new System.EventHandler(this.top_OnValueChanged); // // groupBox3 @@ -336,6 +349,17 @@ this.groupBox4.TabStop = false; this.groupBox4.Text = "Fill Selection with Textures:"; // + // fillall + // + this.fillall.Location = new System.Drawing.Point(6, 19); + this.fillall.Name = "fillall"; + this.fillall.Size = new System.Drawing.Size(32, 23); + this.fillall.TabIndex = 5; + this.fillall.Text = "All"; + this.toolTip1.SetToolTip(this.fillall, "Replace all textures with currently enabled overrides"); + this.fillall.UseVisualStyleBackColor = true; + this.fillall.Click += new System.EventHandler(this.fillall_Click); + // // filllower // this.filllower.Location = new System.Drawing.Point(171, 19); @@ -447,6 +471,17 @@ this.clearceiling.UseVisualStyleBackColor = true; this.clearceiling.Click += new System.EventHandler(this.clearceiling_Click); // + // clearall + // + this.clearall.Location = new System.Drawing.Point(6, 19); + this.clearall.Name = "clearall"; + this.clearall.Size = new System.Drawing.Size(32, 23); + this.clearall.TabIndex = 6; + this.clearall.Text = "All"; + this.toolTip1.SetToolTip(this.clearall, "Remove all textures from selected map elements"); + this.clearall.UseVisualStyleBackColor = true; + this.clearall.Click += new System.EventHandler(this.clearall_Click); + // // groupBox5 // this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -464,32 +499,10 @@ this.groupBox5.TabStop = false; this.groupBox5.Text = "Remove Textures form Selection:"; // - // fillall - // - this.fillall.Location = new System.Drawing.Point(6, 19); - this.fillall.Name = "fillall"; - this.fillall.Size = new System.Drawing.Size(32, 23); - this.fillall.TabIndex = 5; - this.fillall.Text = "All"; - this.toolTip1.SetToolTip(this.fillall, "Replace all textures with currently enabled overrides"); - this.fillall.UseVisualStyleBackColor = true; - this.fillall.Click += new System.EventHandler(this.fillall_Click); - // - // clearall - // - this.clearall.Location = new System.Drawing.Point(6, 19); - this.clearall.Name = "clearall"; - this.clearall.Size = new System.Drawing.Size(32, 23); - this.clearall.TabIndex = 6; - this.clearall.Text = "All"; - this.toolTip1.SetToolTip(this.clearall, "Remove all textures from selected map elements"); - this.clearall.UseVisualStyleBackColor = true; - this.clearall.Click += new System.EventHandler(this.clearall_Click); - // // SectorDrawingOptionsPanel // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.Controls.Add(this.groupBox5); this.Controls.Add(this.groupBox4); this.Controls.Add(this.groupBox3); diff --git a/Source/Plugins/BuilderModes/Interface/SectorDrawingOptionsPanel.resx b/Source/Plugins/BuilderModes/Interface/SectorDrawingOptionsPanel.resx index e641aef8..7ce03af8 100644 --- a/Source/Plugins/BuilderModes/Interface/SectorDrawingOptionsPanel.resx +++ b/Source/Plugins/BuilderModes/Interface/SectorDrawingOptionsPanel.resx @@ -120,7 +120,4 @@ 17, 17 - - 17, 17 - \ No newline at end of file diff --git a/Source/Plugins/BuilderModes/Interface/UndoRedoPanel.Designer.cs b/Source/Plugins/BuilderModes/Interface/UndoRedoPanel.Designer.cs index 86a6d00e..ff7f0ba8 100644 --- a/Source/Plugins/BuilderModes/Interface/UndoRedoPanel.Designer.cs +++ b/Source/Plugins/BuilderModes/Interface/UndoRedoPanel.Designer.cs @@ -60,8 +60,8 @@ namespace CodeImp.DoomBuilder.BuilderModes // // UndoRedoPanel // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.Controls.Add(this.list); this.Name = "UndoRedoPanel"; this.Size = new System.Drawing.Size(390, 548); diff --git a/Source/Plugins/ColorPicker/Controls/ColorPickerControl.designer.cs b/Source/Plugins/ColorPicker/Controls/ColorPickerControl.designer.cs index a3a91762..d2524174 100644 --- a/Source/Plugins/ColorPicker/Controls/ColorPickerControl.designer.cs +++ b/Source/Plugins/ColorPicker/Controls/ColorPickerControl.designer.cs @@ -84,10 +84,10 @@ this.nudRed.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.nudRed.Location = new System.Drawing.Point(49, 4); this.nudRed.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); + 255, + 0, + 0, + 0}); this.nudRed.Name = "nudRed"; this.nudRed.Size = new System.Drawing.Size(48, 20); this.nudRed.TabIndex = 55; @@ -124,10 +124,10 @@ this.nudBlue.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.nudBlue.Location = new System.Drawing.Point(49, 50); this.nudBlue.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); + 255, + 0, + 0, + 0}); this.nudBlue.Name = "nudBlue"; this.nudBlue.Size = new System.Drawing.Size(48, 20); this.nudBlue.TabIndex = 57; @@ -138,10 +138,10 @@ this.nudGreen.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.nudGreen.Location = new System.Drawing.Point(49, 27); this.nudGreen.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); + 255, + 0, + 0, + 0}); this.nudGreen.Name = "nudGreen"; this.nudGreen.Size = new System.Drawing.Size(48, 20); this.nudGreen.TabIndex = 56; @@ -191,8 +191,8 @@ // // ColorPickerControl // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.Controls.Add(this.cbColorInfo); this.Controls.Add(this.pRGB); this.Controls.Add(this.tbFloatVals); diff --git a/Source/Plugins/ColorPicker/Controls/ColorPickerControl.resx b/Source/Plugins/ColorPicker/Controls/ColorPickerControl.resx index 965f82d3..ff31a6db 100644 --- a/Source/Plugins/ColorPicker/Controls/ColorPickerControl.resx +++ b/Source/Plugins/ColorPicker/Controls/ColorPickerControl.resx @@ -1,120 +1,120 @@ + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - text/microsoft-resx + text/microsoft-resx - 2.0 + 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/Source/Plugins/ColorPicker/Controls/ColorPickerSlider.Designer.cs b/Source/Plugins/ColorPicker/Controls/ColorPickerSlider.Designer.cs index 8f0b2567..d3050087 100644 --- a/Source/Plugins/ColorPicker/Controls/ColorPickerSlider.Designer.cs +++ b/Source/Plugins/ColorPicker/Controls/ColorPickerSlider.Designer.cs @@ -82,8 +82,8 @@ // // ColorPickerSlider // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.Controls.Add(this.labelMax); this.Controls.Add(this.labelMin); this.Controls.Add(this.numericUpDown1); diff --git a/Source/Plugins/ColorPicker/Controls/ColorPickerSlider.resx b/Source/Plugins/ColorPicker/Controls/ColorPickerSlider.resx index 965f82d3..ff31a6db 100644 --- a/Source/Plugins/ColorPicker/Controls/ColorPickerSlider.resx +++ b/Source/Plugins/ColorPicker/Controls/ColorPickerSlider.resx @@ -1,120 +1,120 @@ + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - text/microsoft-resx + text/microsoft-resx - 2.0 + 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/Source/Plugins/ColorPicker/Windows/ToolForm.Designer.cs b/Source/Plugins/ColorPicker/Windows/ToolForm.Designer.cs index 637023b4..6249a62a 100644 --- a/Source/Plugins/ColorPicker/Windows/ToolForm.Designer.cs +++ b/Source/Plugins/ColorPicker/Windows/ToolForm.Designer.cs @@ -84,8 +84,8 @@ // // ToolsForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.ClientSize = new System.Drawing.Size(284, 262); this.Controls.Add(this.toolStrip1); this.Controls.Add(this.menuStrip1);