From 5f6e9ad3169bfc39cd73dcdec88359423751aaae Mon Sep 17 00:00:00 2001 From: MaxED Date: Thu, 8 May 2014 12:33:10 +0000 Subject: [PATCH] Rearranged controls a bit. "OK/Accept" button is now always the rightmost button on the most of controls. Also made some controls a bit smaller. --- Builder.sln | 14 - Source/Core/Builder.csproj | 9 + .../Controls/PasteOptionsControl.Designer.cs | 18 +- Source/Core/Controls/PasteOptionsControl.resx | 234 ++++++------- .../Windows/ExceptionDialog.designer.cs | 4 +- .../GZBuilder/Windows/ExceptionDialog.resx | 210 ++++++------ Source/Core/Windows/AboutForm.Designer.cs | 2 +- Source/Core/Windows/AboutForm.resx | 218 ++++++------- .../Windows/ActionBrowserForm.Designer.cs | 8 +- Source/Core/Windows/ActionBrowserForm.resx | 284 ++++++++-------- Source/Core/Windows/AngleForm.Designer.cs | 17 +- Source/Core/Windows/AngleForm.resx | 222 ++++++------- Source/Core/Windows/BitFlagsForm.Designer.cs | 7 +- Source/Core/Windows/BitFlagsForm.resx | 210 ++++++------ Source/Core/Windows/ChangeMapForm.Designer.cs | 8 +- Source/Core/Windows/ChangeMapForm.resx | 214 ++++++------ Source/Core/Windows/ConfigForm.Designer.cs | 6 +- Source/Core/Windows/ConfigForm.resx | 50 ++- .../Core/Windows/CustomFieldsForm.Designer.cs | 10 +- Source/Core/Windows/CustomFieldsForm.resx | 221 ++++++------- .../Windows/EffectBrowserForm.Designer.cs | 10 +- Source/Core/Windows/EffectBrowserForm.resx | 261 +++++++-------- Source/Core/Windows/FlagsForm.Designer.cs | 5 +- Source/Core/Windows/FlagsForm.resx | 210 ++++++------ Source/Core/Windows/GridSetupForm.Designer.cs | 23 +- Source/Core/Windows/GridSetupForm.resx | 295 +++++++++-------- .../Core/Windows/LinedefEditForm.Designer.cs | 6 +- Source/Core/Windows/LinedefEditForm.resx | 6 - .../Core/Windows/MapOptionsForm.Designer.cs | 26 +- Source/Core/Windows/MapOptionsForm.resx | 28 +- .../Windows/OpenMapOptionsForm.Designer.cs | 10 +- Source/Core/Windows/OpenMapOptionsForm.resx | 12 - .../Core/Windows/PasteOptionsForm.Designer.cs | 10 +- Source/Core/Windows/PasteOptionsForm.resx | 222 ++++++------- .../Core/Windows/PreferencesForm.Designer.cs | 78 ++--- .../Windows/ResourceOptionsForm.Designer.cs | 8 +- Source/Core/Windows/ResourceOptionsForm.resx | 298 +++++++++-------- .../Windows/ScriptFindReplaceForm.Designer.cs | 14 +- .../Core/Windows/ScriptFindReplaceForm.resx | 233 +++++++------ .../Core/Windows/SectorEditForm.Designer.cs | 10 +- .../Windows/SectorEditFormUDMF.Designer.cs | 6 +- Source/Core/Windows/TextEditForm.Designer.cs | 8 +- Source/Core/Windows/TextEditForm.resx | 222 ++++++------- .../Windows/TextureBrowserForm.Designer.cs | 5 +- Source/Core/Windows/TextureBrowserForm.resx | 2 +- .../Core/Windows/TextureSetForm.Designer.cs | 13 +- Source/Core/Windows/TextureSetForm.resx | 252 +++++++------- .../Core/Windows/ThingBrowserForm.Designer.cs | 9 +- Source/Core/Windows/ThingBrowserForm.resx | 221 ++++++------- Source/Core/Windows/ThingEditForm.Designer.cs | 6 +- .../Windows/ThingEditFormUDMF.Designer.cs | 6 +- .../Windows/ThingsFiltersForm.Designer.cs | 32 +- Source/Core/Windows/ThingsFiltersForm.resx | 307 ++++++++---------- .../Core/Windows/VertexEditForm.Designer.cs | 8 +- Source/Core/Windows/VertexEditForm.resx | 9 - .../Interface/BridgeModeForm.Designer.cs | 11 +- .../Interface/BridgeModeForm.resx | 210 ++++++------ .../Interface/CurveLinedefsForm.Designer.cs | 6 +- .../Interface/CurveLinedefsForm.resx | 243 +++++++------- .../Interface/MakeDoorForm.Designer.cs | 4 +- .../Plugins/TagRange/TagRangeForm.Designer.cs | 54 +-- Source/Plugins/TagRange/TagRangeForm.cs | 6 +- Source/Plugins/TagRange/TagRangeForm.resx | 36 -- 63 files changed, 2635 insertions(+), 2772 deletions(-) diff --git a/Builder.sln b/Builder.sln index c7a0e5d6..1f1b5ace 100644 --- a/Builder.sln +++ b/Builder.sln @@ -17,8 +17,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NodesViewer", "Source\Plugi EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StairSectorBuilder", "Source\Plugins\StairSectorBuilder\StairSectorBuilder.csproj", "{3F365121-906B-409D-BB1E-37E0A78056C2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Statistics", "Source\Plugins\Statistics\Statistics.csproj", "{FBC0A503-9152-4BE2-9B5C-128FFD0B0D3F}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TagRange", "Source\Plugins\TagRange\TagRange.csproj", "{F49EFF6D-51CB-4E49-8223-AAE653C5B62F}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisplaneExplorer", "Source\Plugins\VisplaneExplorer\VisplaneExplorer.csproj", "{CF670175-7099-4090-A330-EE25C7230139}" @@ -131,18 +129,6 @@ Global {3F365121-906B-409D-BB1E-37E0A78056C2}.Release|Win32.ActiveCfg = Release|x86 {3F365121-906B-409D-BB1E-37E0A78056C2}.Release|x86.ActiveCfg = Release|x86 {3F365121-906B-409D-BB1E-37E0A78056C2}.Release|x86.Build.0 = Release|x86 - {FBC0A503-9152-4BE2-9B5C-128FFD0B0D3F}.Debug|Any CPU.ActiveCfg = Debug|x86 - {FBC0A503-9152-4BE2-9B5C-128FFD0B0D3F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {FBC0A503-9152-4BE2-9B5C-128FFD0B0D3F}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {FBC0A503-9152-4BE2-9B5C-128FFD0B0D3F}.Debug|Win32.ActiveCfg = Debug|x86 - {FBC0A503-9152-4BE2-9B5C-128FFD0B0D3F}.Debug|x86.ActiveCfg = Debug|x86 - {FBC0A503-9152-4BE2-9B5C-128FFD0B0D3F}.Debug|x86.Build.0 = Debug|x86 - {FBC0A503-9152-4BE2-9B5C-128FFD0B0D3F}.Release|Any CPU.ActiveCfg = Release|x86 - {FBC0A503-9152-4BE2-9B5C-128FFD0B0D3F}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {FBC0A503-9152-4BE2-9B5C-128FFD0B0D3F}.Release|Mixed Platforms.Build.0 = Release|x86 - {FBC0A503-9152-4BE2-9B5C-128FFD0B0D3F}.Release|Win32.ActiveCfg = Release|x86 - {FBC0A503-9152-4BE2-9B5C-128FFD0B0D3F}.Release|x86.ActiveCfg = Release|x86 - {FBC0A503-9152-4BE2-9B5C-128FFD0B0D3F}.Release|x86.Build.0 = Release|x86 {F49EFF6D-51CB-4E49-8223-AAE653C5B62F}.Debug|Any CPU.ActiveCfg = Debug|x86 {F49EFF6D-51CB-4E49-8223-AAE653C5B62F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 {F49EFF6D-51CB-4E49-8223-AAE653C5B62F}.Debug|Mixed Platforms.Build.0 = Debug|x86 diff --git a/Source/Core/Builder.csproj b/Source/Core/Builder.csproj index b834c240..2a6b7657 100644 --- a/Source/Core/Builder.csproj +++ b/Source/Core/Builder.csproj @@ -703,6 +703,12 @@ PasteOptionsControl.cs + + UserControl + + + StatisticsControl.cs + UserControl @@ -924,6 +930,9 @@ Designer PasteOptionsControl.cs + + StatisticsControl.cs + Designer ThingBrowserControl.cs diff --git a/Source/Core/Controls/PasteOptionsControl.Designer.cs b/Source/Core/Controls/PasteOptionsControl.Designer.cs index 516d4db8..0b24a64c 100644 --- a/Source/Core/Controls/PasteOptionsControl.Designer.cs +++ b/Source/Core/Controls/PasteOptionsControl.Designer.cs @@ -44,9 +44,9 @@ namespace CodeImp.DoomBuilder.Controls this.sectorheightsgroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.sectorheightsgroup.Controls.Add(this.adjustheights); - this.sectorheightsgroup.Location = new System.Drawing.Point(0, 164); + this.sectorheightsgroup.Location = new System.Drawing.Point(0, 138); this.sectorheightsgroup.Name = "sectorheightsgroup"; - this.sectorheightsgroup.Size = new System.Drawing.Size(443, 83); + this.sectorheightsgroup.Size = new System.Drawing.Size(443, 50); this.sectorheightsgroup.TabIndex = 3; this.sectorheightsgroup.TabStop = false; this.sectorheightsgroup.Text = " Floor and Ceiling heights "; @@ -54,7 +54,7 @@ namespace CodeImp.DoomBuilder.Controls // adjustheights // this.adjustheights.AutoSize = true; - this.adjustheights.Location = new System.Drawing.Point(30, 39); + this.adjustheights.Location = new System.Drawing.Point(30, 24); this.adjustheights.Name = "adjustheights"; this.adjustheights.Size = new System.Drawing.Size(292, 17); this.adjustheights.TabIndex = 0; @@ -71,7 +71,7 @@ namespace CodeImp.DoomBuilder.Controls this.tagsgroup.Controls.Add(this.keeptags); this.tagsgroup.Location = new System.Drawing.Point(0, 0); this.tagsgroup.Name = "tagsgroup"; - this.tagsgroup.Size = new System.Drawing.Size(443, 158); + this.tagsgroup.Size = new System.Drawing.Size(443, 132); this.tagsgroup.TabIndex = 2; this.tagsgroup.TabStop = false; this.tagsgroup.Text = " Tags and Actions "; @@ -79,7 +79,7 @@ namespace CodeImp.DoomBuilder.Controls // removeactions // this.removeactions.AutoSize = true; - this.removeactions.Location = new System.Drawing.Point(30, 117); + this.removeactions.Location = new System.Drawing.Point(30, 107); this.removeactions.Name = "removeactions"; this.removeactions.Size = new System.Drawing.Size(116, 17); this.removeactions.TabIndex = 3; @@ -89,7 +89,7 @@ namespace CodeImp.DoomBuilder.Controls // removetags // this.removetags.AutoSize = true; - this.removetags.Location = new System.Drawing.Point(30, 81); + this.removetags.Location = new System.Drawing.Point(30, 71); this.removetags.Name = "removetags"; this.removetags.Size = new System.Drawing.Size(101, 17); this.removetags.TabIndex = 2; @@ -100,7 +100,7 @@ namespace CodeImp.DoomBuilder.Controls // renumbertags // this.renumbertags.AutoSize = true; - this.renumbertags.Location = new System.Drawing.Point(30, 57); + this.renumbertags.Location = new System.Drawing.Point(30, 47); this.renumbertags.Name = "renumbertags"; this.renumbertags.Size = new System.Drawing.Size(271, 17); this.renumbertags.TabIndex = 1; @@ -111,7 +111,7 @@ namespace CodeImp.DoomBuilder.Controls // keeptags // this.keeptags.AutoSize = true; - this.keeptags.Location = new System.Drawing.Point(30, 33); + this.keeptags.Location = new System.Drawing.Point(30, 24); this.keeptags.Name = "keeptags"; this.keeptags.Size = new System.Drawing.Size(217, 17); this.keeptags.TabIndex = 0; @@ -126,7 +126,7 @@ namespace CodeImp.DoomBuilder.Controls this.Controls.Add(this.sectorheightsgroup); this.Controls.Add(this.tagsgroup); this.Name = "PasteOptionsControl"; - this.Size = new System.Drawing.Size(443, 282); + this.Size = new System.Drawing.Size(443, 208); this.sectorheightsgroup.ResumeLayout(false); this.sectorheightsgroup.PerformLayout(); this.tagsgroup.ResumeLayout(false); diff --git a/Source/Core/Controls/PasteOptionsControl.resx b/Source/Core/Controls/PasteOptionsControl.resx index 6091e727..ff31a6db 100644 --- a/Source/Core/Controls/PasteOptionsControl.resx +++ b/Source/Core/Controls/PasteOptionsControl.resx @@ -1,144 +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 - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - \ No newline at end of file diff --git a/Source/Core/GZBuilder/Windows/ExceptionDialog.designer.cs b/Source/Core/GZBuilder/Windows/ExceptionDialog.designer.cs index bb1bb60d..a6a667b8 100644 --- a/Source/Core/GZBuilder/Windows/ExceptionDialog.designer.cs +++ b/Source/Core/GZBuilder/Windows/ExceptionDialog.designer.cs @@ -42,7 +42,7 @@ // this.bQuit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.bQuit.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.bQuit.Location = new System.Drawing.Point(537, 195); + this.bQuit.Location = new System.Drawing.Point(456, 195); this.bQuit.Name = "bQuit"; this.bQuit.Size = new System.Drawing.Size(75, 23); this.bQuit.TabIndex = 0; @@ -52,7 +52,7 @@ // bContinue // this.bContinue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.bContinue.Location = new System.Drawing.Point(456, 195); + this.bContinue.Location = new System.Drawing.Point(537, 195); this.bContinue.Name = "bContinue"; this.bContinue.Size = new System.Drawing.Size(75, 23); this.bContinue.TabIndex = 1; diff --git a/Source/Core/GZBuilder/Windows/ExceptionDialog.resx b/Source/Core/GZBuilder/Windows/ExceptionDialog.resx index 965f82d3..ff31a6db 100644 --- a/Source/Core/GZBuilder/Windows/ExceptionDialog.resx +++ b/Source/Core/GZBuilder/Windows/ExceptionDialog.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/Windows/AboutForm.Designer.cs b/Source/Core/Windows/AboutForm.Designer.cs index 8679ce3e..3587ce75 100644 --- a/Source/Core/Windows/AboutForm.Designer.cs +++ b/Source/Core/Windows/AboutForm.Designer.cs @@ -245,7 +245,7 @@ namespace CodeImp.DoomBuilder.Windows this.Controls.Add(this.tabControl1); this.Controls.Add(this.close); this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "AboutForm"; diff --git a/Source/Core/Windows/AboutForm.resx b/Source/Core/Windows/AboutForm.resx index 43108740..6d67f46f 100644 --- a/Source/Core/Windows/AboutForm.resx +++ b/Source/Core/Windows/AboutForm.resx @@ -1,132 +1,132 @@ + 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 - False + False - False + False - False + False - False + False \ No newline at end of file diff --git a/Source/Core/Windows/ActionBrowserForm.Designer.cs b/Source/Core/Windows/ActionBrowserForm.Designer.cs index 6a63a49e..82b237d0 100644 --- a/Source/Core/Windows/ActionBrowserForm.Designer.cs +++ b/Source/Core/Windows/ActionBrowserForm.Designer.cs @@ -361,7 +361,7 @@ namespace CodeImp.DoomBuilder.Windows // this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(297, 459); + this.cancel.Location = new System.Drawing.Point(177, 450); this.cancel.Name = "cancel"; this.cancel.Size = new System.Drawing.Size(112, 27); this.cancel.TabIndex = 2; @@ -372,7 +372,7 @@ namespace CodeImp.DoomBuilder.Windows // apply // this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.apply.Location = new System.Drawing.Point(177, 459); + this.apply.Location = new System.Drawing.Point(297, 450); this.apply.Name = "apply"; this.apply.Size = new System.Drawing.Size(112, 27); this.apply.TabIndex = 1; @@ -492,12 +492,12 @@ namespace CodeImp.DoomBuilder.Windows this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.CancelButton = this.cancel; - this.ClientSize = new System.Drawing.Size(419, 496); + this.ClientSize = new System.Drawing.Size(419, 482); this.Controls.Add(this.tabs); this.Controls.Add(this.cancel); this.Controls.Add(this.apply); this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "ActionBrowserForm"; diff --git a/Source/Core/Windows/ActionBrowserForm.resx b/Source/Core/Windows/ActionBrowserForm.resx index 5752ab5f..429342ef 100644 --- a/Source/Core/Windows/ActionBrowserForm.resx +++ b/Source/Core/Windows/ActionBrowserForm.resx @@ -1,225 +1,213 @@ + 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 - False + False - False + False - False + False - False + False - False + False - False + False - True + True - False + False - True + True - True + True - False + False - True + True - False + False - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True - - - True - - - True - - - True + True - True + True - True - - - True + True \ No newline at end of file diff --git a/Source/Core/Windows/AngleForm.Designer.cs b/Source/Core/Windows/AngleForm.Designer.cs index dea52266..41020d5b 100644 --- a/Source/Core/Windows/AngleForm.Designer.cs +++ b/Source/Core/Windows/AngleForm.Designer.cs @@ -36,8 +36,9 @@ namespace CodeImp.DoomBuilder.Windows // angle // this.angle.BackColor = System.Drawing.SystemColors.Control; + this.angle.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.angle.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.angle.Location = new System.Drawing.Point(60, 22); + this.angle.Location = new System.Drawing.Point(12, 12); this.angle.Name = "angle"; this.angle.Size = new System.Drawing.Size(84, 84); this.angle.TabIndex = 0; @@ -45,11 +46,10 @@ namespace CodeImp.DoomBuilder.Windows // // cancel // - this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(105, 131); + this.cancel.Location = new System.Drawing.Point(102, 69); this.cancel.Name = "cancel"; - this.cancel.Size = new System.Drawing.Size(91, 25); + this.cancel.Size = new System.Drawing.Size(60, 25); this.cancel.TabIndex = 2; this.cancel.Text = "Cancel"; this.cancel.UseVisualStyleBackColor = true; @@ -57,10 +57,9 @@ namespace CodeImp.DoomBuilder.Windows // // apply // - this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.apply.Location = new System.Drawing.Point(8, 131); + this.apply.Location = new System.Drawing.Point(102, 12); this.apply.Name = "apply"; - this.apply.Size = new System.Drawing.Size(91, 25); + this.apply.Size = new System.Drawing.Size(60, 51); this.apply.TabIndex = 1; this.apply.Text = "OK"; this.apply.UseVisualStyleBackColor = true; @@ -72,12 +71,12 @@ namespace CodeImp.DoomBuilder.Windows this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.CancelButton = this.cancel; - this.ClientSize = new System.Drawing.Size(204, 165); + this.ClientSize = new System.Drawing.Size(168, 106); this.Controls.Add(this.cancel); this.Controls.Add(this.apply); this.Controls.Add(this.angle); this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "AngleForm"; diff --git a/Source/Core/Windows/AngleForm.resx b/Source/Core/Windows/AngleForm.resx index 4ec80ff4..ff31a6db 100644 --- a/Source/Core/Windows/AngleForm.resx +++ b/Source/Core/Windows/AngleForm.resx @@ -1,132 +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 - - True - - - True - - - True - - - True - \ No newline at end of file diff --git a/Source/Core/Windows/BitFlagsForm.Designer.cs b/Source/Core/Windows/BitFlagsForm.Designer.cs index 03837e42..5a0c3a25 100644 --- a/Source/Core/Windows/BitFlagsForm.Designer.cs +++ b/Source/Core/Windows/BitFlagsForm.Designer.cs @@ -44,12 +44,13 @@ namespace CodeImp.DoomBuilder.Windows this.options.Name = "options"; this.options.Size = new System.Drawing.Size(185, 170); this.options.TabIndex = 0; + this.options.VerticalSpacing = 1; // // cancel // this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(106, 188); + this.cancel.Location = new System.Drawing.Point(12, 188); this.cancel.Name = "cancel"; this.cancel.Size = new System.Drawing.Size(91, 25); this.cancel.TabIndex = 2; @@ -60,7 +61,7 @@ namespace CodeImp.DoomBuilder.Windows // apply // this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.apply.Location = new System.Drawing.Point(12, 188); + this.apply.Location = new System.Drawing.Point(106, 188); this.apply.Name = "apply"; this.apply.Size = new System.Drawing.Size(91, 25); this.apply.TabIndex = 1; @@ -79,7 +80,7 @@ namespace CodeImp.DoomBuilder.Windows this.Controls.Add(this.apply); this.Controls.Add(this.options); this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "BitFlagsForm"; diff --git a/Source/Core/Windows/BitFlagsForm.resx b/Source/Core/Windows/BitFlagsForm.resx index 965f82d3..ff31a6db 100644 --- a/Source/Core/Windows/BitFlagsForm.resx +++ b/Source/Core/Windows/BitFlagsForm.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/Windows/ChangeMapForm.Designer.cs b/Source/Core/Windows/ChangeMapForm.Designer.cs index d048e5b4..a9b39188 100644 --- a/Source/Core/Windows/ChangeMapForm.Designer.cs +++ b/Source/Core/Windows/ChangeMapForm.Designer.cs @@ -51,7 +51,7 @@ this.mapslist.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.mapslist.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - columnHeader1}); + columnHeader1}); this.mapslist.FullRowSelect = true; this.mapslist.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; this.mapslist.HideSelection = false; @@ -71,7 +71,7 @@ // this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(296, 152); + this.cancel.Location = new System.Drawing.Point(178, 152); this.cancel.Name = "cancel"; this.cancel.Size = new System.Drawing.Size(112, 25); this.cancel.TabIndex = 20; @@ -82,7 +82,7 @@ // apply // this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.apply.Location = new System.Drawing.Point(178, 152); + this.apply.Location = new System.Drawing.Point(296, 152); this.apply.Name = "apply"; this.apply.Size = new System.Drawing.Size(112, 25); this.apply.TabIndex = 19; @@ -102,7 +102,7 @@ this.Controls.Add(this.mapslist); this.Controls.Add(label2); 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.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "ChangeMapForm"; diff --git a/Source/Core/Windows/ChangeMapForm.resx b/Source/Core/Windows/ChangeMapForm.resx index 9ebb4b01..1688a37d 100644 --- a/Source/Core/Windows/ChangeMapForm.resx +++ b/Source/Core/Windows/ChangeMapForm.resx @@ -1,126 +1,126 @@ + 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 - False + False - False + False \ No newline at end of file diff --git a/Source/Core/Windows/ConfigForm.Designer.cs b/Source/Core/Windows/ConfigForm.Designer.cs index e17b21c3..37672159 100644 --- a/Source/Core/Windows/ConfigForm.Designer.cs +++ b/Source/Core/Windows/ConfigForm.Designer.cs @@ -221,7 +221,7 @@ namespace CodeImp.DoomBuilder.Windows // this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(671, 381); + this.cancel.Location = new System.Drawing.Point(553, 379); this.cancel.Name = "cancel"; this.cancel.Size = new System.Drawing.Size(112, 25); this.cancel.TabIndex = 3; @@ -232,7 +232,7 @@ namespace CodeImp.DoomBuilder.Windows // apply // this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.apply.Location = new System.Drawing.Point(553, 381); + this.apply.Location = new System.Drawing.Point(671, 379); this.apply.Name = "apply"; this.apply.Size = new System.Drawing.Size(112, 25); this.apply.TabIndex = 2; @@ -746,7 +746,7 @@ namespace CodeImp.DoomBuilder.Windows this.Controls.Add(this.cancel); this.Controls.Add(this.apply); this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "ConfigForm"; diff --git a/Source/Core/Windows/ConfigForm.resx b/Source/Core/Windows/ConfigForm.resx index 1846c01a..479b25d6 100644 --- a/Source/Core/Windows/ConfigForm.resx +++ b/Source/Core/Windows/ConfigForm.resx @@ -174,12 +174,6 @@ Here you can select the editing modes that you wish to use in this configuration. This is useful in case there are plugins with additional editing modes that can be used as a replacement for the original editing modes. - - True - - - True - True @@ -204,6 +198,45 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + 159, 17 @@ -212,7 +245,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAA4 - CAAAAk1TRnQBSQFMAwEBAAH8AQAB/AEAARMBAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA + CAAAAk1TRnQBSQFMAwEBAAEEAQEBBAEBARMBAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA AUwDAAEQAwABAQEAAQgFAAHAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -268,9 +301,6 @@ True - - True - True diff --git a/Source/Core/Windows/CustomFieldsForm.Designer.cs b/Source/Core/Windows/CustomFieldsForm.Designer.cs index ce693862..2611c1a6 100644 --- a/Source/Core/Windows/CustomFieldsForm.Designer.cs +++ b/Source/Core/Windows/CustomFieldsForm.Designer.cs @@ -57,7 +57,7 @@ namespace CodeImp.DoomBuilder.Windows // this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(404, 336); + this.cancel.Location = new System.Drawing.Point(287, 332); this.cancel.Margin = new System.Windows.Forms.Padding(1); this.cancel.Name = "cancel"; this.cancel.Size = new System.Drawing.Size(112, 25); @@ -69,7 +69,7 @@ namespace CodeImp.DoomBuilder.Windows // apply // this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.apply.Location = new System.Drawing.Point(285, 336); + this.apply.Location = new System.Drawing.Point(404, 332); this.apply.Margin = new System.Windows.Forms.Padding(1); this.apply.Name = "apply"; this.apply.Size = new System.Drawing.Size(112, 25); @@ -84,12 +84,12 @@ namespace CodeImp.DoomBuilder.Windows this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.CancelButton = this.cancel; - this.ClientSize = new System.Drawing.Size(526, 371); + this.ClientSize = new System.Drawing.Size(526, 367); this.Controls.Add(this.cancel); this.Controls.Add(this.apply); this.Controls.Add(this.fieldslist); this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "CustomFieldsForm"; @@ -97,7 +97,7 @@ namespace CodeImp.DoomBuilder.Windows this.ShowIcon = false; this.ShowInTaskbar = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "CustomFieldsForm"; + this.Text = "Custom Fields"; this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.CustomFieldsForm_HelpRequested); this.ResumeLayout(false); diff --git a/Source/Core/Windows/CustomFieldsForm.resx b/Source/Core/Windows/CustomFieldsForm.resx index e6a044e1..a3f59a1c 100644 --- a/Source/Core/Windows/CustomFieldsForm.resx +++ b/Source/Core/Windows/CustomFieldsForm.resx @@ -1,132 +1,123 @@ + 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 - True - - - True - - - True - - - True + True \ No newline at end of file diff --git a/Source/Core/Windows/EffectBrowserForm.Designer.cs b/Source/Core/Windows/EffectBrowserForm.Designer.cs index 4ccd8ba3..7a08dfad 100644 --- a/Source/Core/Windows/EffectBrowserForm.Designer.cs +++ b/Source/Core/Windows/EffectBrowserForm.Designer.cs @@ -257,7 +257,7 @@ namespace CodeImp.DoomBuilder.Windows // this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(297, 459); + this.cancel.Location = new System.Drawing.Point(175, 457); this.cancel.Name = "cancel"; this.cancel.Size = new System.Drawing.Size(112, 27); this.cancel.TabIndex = 2; @@ -268,7 +268,7 @@ namespace CodeImp.DoomBuilder.Windows // apply // this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.apply.Location = new System.Drawing.Point(177, 459); + this.apply.Location = new System.Drawing.Point(293, 457); this.apply.Name = "apply"; this.apply.Size = new System.Drawing.Size(112, 27); this.apply.TabIndex = 1; @@ -346,8 +346,8 @@ namespace CodeImp.DoomBuilder.Windows // effects // this.effects.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.colnumber, - this.colname}); + this.colnumber, + this.colname}); this.effects.FullRowSelect = true; this.effects.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; this.effects.HideSelection = false; @@ -393,7 +393,7 @@ namespace CodeImp.DoomBuilder.Windows this.Controls.Add(this.cancel); this.Controls.Add(this.apply); this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "EffectBrowserForm"; diff --git a/Source/Core/Windows/EffectBrowserForm.resx b/Source/Core/Windows/EffectBrowserForm.resx index 092ba01d..ba13e608 100644 --- a/Source/Core/Windows/EffectBrowserForm.resx +++ b/Source/Core/Windows/EffectBrowserForm.resx @@ -1,192 +1,183 @@ + 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 - True + True - False + False - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True - - - True - - - True + True - True + True - True + True - True - - - True + True \ No newline at end of file diff --git a/Source/Core/Windows/FlagsForm.Designer.cs b/Source/Core/Windows/FlagsForm.Designer.cs index 6fc1d36e..1230f481 100644 --- a/Source/Core/Windows/FlagsForm.Designer.cs +++ b/Source/Core/Windows/FlagsForm.Designer.cs @@ -46,12 +46,13 @@ this.flags.Name = "flags"; this.flags.Size = new System.Drawing.Size(418, 195); this.flags.TabIndex = 0; + this.flags.VerticalSpacing = 1; // // cancel // this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(351, 238); + this.cancel.Location = new System.Drawing.Point(254, 238); this.cancel.Name = "cancel"; this.cancel.Size = new System.Drawing.Size(91, 25); this.cancel.TabIndex = 4; @@ -62,7 +63,7 @@ // apply // this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.apply.Location = new System.Drawing.Point(254, 238); + this.apply.Location = new System.Drawing.Point(351, 238); this.apply.Name = "apply"; this.apply.Size = new System.Drawing.Size(91, 25); this.apply.TabIndex = 3; diff --git a/Source/Core/Windows/FlagsForm.resx b/Source/Core/Windows/FlagsForm.resx index 965f82d3..ff31a6db 100644 --- a/Source/Core/Windows/FlagsForm.resx +++ b/Source/Core/Windows/FlagsForm.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/Windows/GridSetupForm.Designer.cs b/Source/Core/Windows/GridSetupForm.Designer.cs index d709ac7e..ba4e48e1 100644 --- a/Source/Core/Windows/GridSetupForm.Designer.cs +++ b/Source/Core/Windows/GridSetupForm.Designer.cs @@ -68,12 +68,15 @@ namespace CodeImp.DoomBuilder.Windows // // gridsize // + this.gridsize.AllowDecimal = false; this.gridsize.AllowNegative = false; this.gridsize.AllowRelative = true; this.gridsize.ButtonStep = 8; + this.gridsize.ButtonStepFloat = 1F; this.gridsize.Location = new System.Drawing.Point(146, 26); this.gridsize.Name = "gridsize"; this.gridsize.Size = new System.Drawing.Size(75, 24); + this.gridsize.StepValues = null; this.gridsize.TabIndex = 1; // // label1 @@ -109,46 +112,58 @@ namespace CodeImp.DoomBuilder.Windows // // backscaley // + this.backscaley.AllowDecimal = false; this.backscaley.AllowNegative = false; this.backscaley.AllowRelative = true; this.backscaley.ButtonStep = 1; + this.backscaley.ButtonStepFloat = 1F; this.backscaley.Enabled = false; this.backscaley.Location = new System.Drawing.Point(197, 212); this.backscaley.Name = "backscaley"; this.backscaley.Size = new System.Drawing.Size(67, 24); + this.backscaley.StepValues = null; this.backscaley.TabIndex = 13; // // backscalex // + this.backscalex.AllowDecimal = false; this.backscalex.AllowNegative = false; this.backscalex.AllowRelative = true; this.backscalex.ButtonStep = 1; + this.backscalex.ButtonStepFloat = 1F; this.backscalex.Enabled = false; this.backscalex.Location = new System.Drawing.Point(124, 212); this.backscalex.Name = "backscalex"; this.backscalex.Size = new System.Drawing.Size(67, 24); + this.backscalex.StepValues = null; this.backscalex.TabIndex = 12; // // backoffsety // + this.backoffsety.AllowDecimal = false; this.backoffsety.AllowNegative = true; this.backoffsety.AllowRelative = true; this.backoffsety.ButtonStep = 1; + this.backoffsety.ButtonStepFloat = 1F; this.backoffsety.Enabled = false; this.backoffsety.Location = new System.Drawing.Point(197, 173); this.backoffsety.Name = "backoffsety"; this.backoffsety.Size = new System.Drawing.Size(67, 24); + this.backoffsety.StepValues = null; this.backoffsety.TabIndex = 11; // // backoffsetx // + this.backoffsetx.AllowDecimal = false; this.backoffsetx.AllowNegative = true; this.backoffsetx.AllowRelative = true; this.backoffsetx.ButtonStep = 1; + this.backoffsetx.ButtonStepFloat = 1F; this.backoffsetx.Enabled = false; this.backoffsetx.Location = new System.Drawing.Point(124, 173); this.backoffsetx.Name = "backoffsetx"; this.backoffsetx.Size = new System.Drawing.Size(67, 24); + this.backoffsetx.StepValues = null; this.backoffsetx.TabIndex = 10; // // backscale @@ -229,7 +244,7 @@ namespace CodeImp.DoomBuilder.Windows // this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(193, 368); + this.cancel.Location = new System.Drawing.Point(75, 359); this.cancel.Name = "cancel"; this.cancel.Size = new System.Drawing.Size(112, 25); this.cancel.TabIndex = 3; @@ -240,7 +255,7 @@ namespace CodeImp.DoomBuilder.Windows // apply // this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.apply.Location = new System.Drawing.Point(75, 368); + this.apply.Location = new System.Drawing.Point(193, 359); this.apply.Name = "apply"; this.apply.Size = new System.Drawing.Size(112, 25); this.apply.TabIndex = 2; @@ -260,13 +275,13 @@ namespace CodeImp.DoomBuilder.Windows this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.CancelButton = this.cancel; - this.ClientSize = new System.Drawing.Size(317, 403); + this.ClientSize = new System.Drawing.Size(317, 392); this.Controls.Add(this.cancel); this.Controls.Add(this.apply); this.Controls.Add(groupBox2); this.Controls.Add(groupBox1); this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "GridSetupForm"; diff --git a/Source/Core/Windows/GridSetupForm.resx b/Source/Core/Windows/GridSetupForm.resx index 0f6cd8ba..9c88715c 100644 --- a/Source/Core/Windows/GridSetupForm.resx +++ b/Source/Core/Windows/GridSetupForm.resx @@ -1,186 +1,219 @@ + 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 - True + True - False + False - True + True - True + True - False + False + + + True + + + True + + + False - True + True - False + False - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - - True + + True - - True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True - 17, 17 - - - True + 17, 17 \ No newline at end of file diff --git a/Source/Core/Windows/LinedefEditForm.Designer.cs b/Source/Core/Windows/LinedefEditForm.Designer.cs index 463a419d..81712786 100644 --- a/Source/Core/Windows/LinedefEditForm.Designer.cs +++ b/Source/Core/Windows/LinedefEditForm.Designer.cs @@ -290,7 +290,7 @@ namespace CodeImp.DoomBuilder.Windows // this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(455, 662); + this.cancel.Location = new System.Drawing.Point(335, 665); this.cancel.Name = "cancel"; this.cancel.Size = new System.Drawing.Size(112, 25); this.cancel.TabIndex = 2; @@ -301,7 +301,7 @@ namespace CodeImp.DoomBuilder.Windows // apply // this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.apply.Location = new System.Drawing.Point(336, 662); + this.apply.Location = new System.Drawing.Point(453, 665); this.apply.Name = "apply"; this.apply.Size = new System.Drawing.Size(112, 25); this.apply.TabIndex = 1; @@ -1354,7 +1354,7 @@ namespace CodeImp.DoomBuilder.Windows this.Controls.Add(this.heightpanel1); this.Controls.Add(this.heightpanel2); this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "LinedefEditForm"; diff --git a/Source/Core/Windows/LinedefEditForm.resx b/Source/Core/Windows/LinedefEditForm.resx index 12e99e02..96333b03 100644 --- a/Source/Core/Windows/LinedefEditForm.resx +++ b/Source/Core/Windows/LinedefEditForm.resx @@ -180,12 +180,6 @@ False - - True - - - True - True diff --git a/Source/Core/Windows/MapOptionsForm.Designer.cs b/Source/Core/Windows/MapOptionsForm.Designer.cs index 95b66616..47bb6425 100644 --- a/Source/Core/Windows/MapOptionsForm.Designer.cs +++ b/Source/Core/Windows/MapOptionsForm.Designer.cs @@ -52,7 +52,7 @@ namespace CodeImp.DoomBuilder.Windows // label3 // label3.AutoSize = true; - label3.Location = new System.Drawing.Point(239, 76); + label3.Location = new System.Drawing.Point(239, 60); label3.Name = "label3"; label3.Size = new System.Drawing.Size(90, 14); label3.TabIndex = 9; @@ -61,7 +61,7 @@ namespace CodeImp.DoomBuilder.Windows // label2 // label2.AutoSize = true; - label2.Location = new System.Drawing.Point(58, 76); + label2.Location = new System.Drawing.Point(58, 60); label2.Name = "label2"; label2.Size = new System.Drawing.Size(65, 14); label2.TabIndex = 7; @@ -70,7 +70,7 @@ namespace CodeImp.DoomBuilder.Windows // label1 // label1.AutoSize = true; - label1.Location = new System.Drawing.Point(18, 34); + label1.Location = new System.Drawing.Point(18, 27); label1.Name = "label1"; label1.Size = new System.Drawing.Size(105, 14); label1.TabIndex = 5; @@ -87,7 +87,7 @@ namespace CodeImp.DoomBuilder.Windows panelsettings.Controls.Add(label1); panelsettings.Location = new System.Drawing.Point(12, 12); panelsettings.Name = "panelsettings"; - panelsettings.Size = new System.Drawing.Size(397, 118); + panelsettings.Size = new System.Drawing.Size(397, 88); panelsettings.TabIndex = 0; panelsettings.TabStop = false; panelsettings.Text = " Settings "; @@ -95,7 +95,7 @@ namespace CodeImp.DoomBuilder.Windows // levelname // this.levelname.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; - this.levelname.Location = new System.Drawing.Point(129, 73); + this.levelname.Location = new System.Drawing.Point(129, 57); this.levelname.Name = "levelname"; this.levelname.Size = new System.Drawing.Size(94, 20); this.levelname.TabIndex = 1; @@ -107,9 +107,9 @@ namespace CodeImp.DoomBuilder.Windows this.config.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.config.FormattingEnabled = true; this.config.IntegralHeight = false; - this.config.Location = new System.Drawing.Point(129, 31); + this.config.Location = new System.Drawing.Point(129, 24); this.config.Name = "config"; - this.config.Size = new System.Drawing.Size(213, 22); + this.config.Size = new System.Drawing.Size(254, 22); this.config.TabIndex = 0; this.config.SelectedIndexChanged += new System.EventHandler(this.config_SelectedIndexChanged); // @@ -127,7 +127,7 @@ namespace CodeImp.DoomBuilder.Windows // apply // this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.apply.Location = new System.Drawing.Point(179, 392); + this.apply.Location = new System.Drawing.Point(297, 358); this.apply.Name = "apply"; this.apply.Size = new System.Drawing.Size(112, 25); this.apply.TabIndex = 2; @@ -139,7 +139,7 @@ namespace CodeImp.DoomBuilder.Windows // this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(297, 392); + this.cancel.Location = new System.Drawing.Point(179, 358); this.cancel.Name = "cancel"; this.cancel.Size = new System.Drawing.Size(112, 25); this.cancel.TabIndex = 3; @@ -154,9 +154,9 @@ namespace CodeImp.DoomBuilder.Windows this.panelres.Controls.Add(this.strictpatches); this.panelres.Controls.Add(this.datalocations); this.panelres.Controls.Add(label4); - this.panelres.Location = new System.Drawing.Point(12, 141); + this.panelres.Location = new System.Drawing.Point(12, 106); this.panelres.Name = "panelres"; - this.panelres.Size = new System.Drawing.Size(397, 236); + this.panelres.Size = new System.Drawing.Size(397, 240); this.panelres.TabIndex = 1; this.panelres.TabStop = false; this.panelres.Text = " Resources "; @@ -187,13 +187,13 @@ namespace CodeImp.DoomBuilder.Windows this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.CancelButton = this.cancel; - this.ClientSize = new System.Drawing.Size(421, 429); + this.ClientSize = new System.Drawing.Size(421, 391); this.Controls.Add(this.panelres); this.Controls.Add(this.cancel); this.Controls.Add(this.apply); this.Controls.Add(panelsettings); this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "MapOptionsForm"; diff --git a/Source/Core/Windows/MapOptionsForm.resx b/Source/Core/Windows/MapOptionsForm.resx index e178f567..957f6025 100644 --- a/Source/Core/Windows/MapOptionsForm.resx +++ b/Source/Core/Windows/MapOptionsForm.resx @@ -117,49 +117,28 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - False - - True - False - - True - False - - True - False - - True - - - True - True False - + True - - True - - + True @@ -168,7 +147,4 @@ True - - True - \ No newline at end of file diff --git a/Source/Core/Windows/OpenMapOptionsForm.Designer.cs b/Source/Core/Windows/OpenMapOptionsForm.Designer.cs index 67f69d71..93710057 100644 --- a/Source/Core/Windows/OpenMapOptionsForm.Designer.cs +++ b/Source/Core/Windows/OpenMapOptionsForm.Designer.cs @@ -88,7 +88,7 @@ namespace CodeImp.DoomBuilder.Windows this.panelres.Controls.Add(label3); this.panelres.Location = new System.Drawing.Point(12, 215); this.panelres.Name = "panelres"; - this.panelres.Size = new System.Drawing.Size(396, 238); + this.panelres.Size = new System.Drawing.Size(396, 240); this.panelres.TabIndex = 2; this.panelres.TabStop = false; this.panelres.Text = " Resources "; @@ -116,7 +116,7 @@ namespace CodeImp.DoomBuilder.Windows // apply // this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.apply.Location = new System.Drawing.Point(178, 462); + this.apply.Location = new System.Drawing.Point(296, 465); this.apply.Name = "apply"; this.apply.Size = new System.Drawing.Size(112, 25); this.apply.TabIndex = 3; @@ -128,7 +128,7 @@ namespace CodeImp.DoomBuilder.Windows // this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(296, 462); + this.cancel.Location = new System.Drawing.Point(178, 464); this.cancel.Name = "cancel"; this.cancel.Size = new System.Drawing.Size(112, 25); this.cancel.TabIndex = 4; @@ -144,7 +144,7 @@ namespace CodeImp.DoomBuilder.Windows this.config.IntegralHeight = false; this.config.Location = new System.Drawing.Point(141, 21); this.config.Name = "config"; - this.config.Size = new System.Drawing.Size(242, 22); + this.config.Size = new System.Drawing.Size(267, 22); this.config.TabIndex = 0; this.config.SelectedIndexChanged += new System.EventHandler(this.config_SelectedIndexChanged); // @@ -185,7 +185,7 @@ namespace CodeImp.DoomBuilder.Windows this.Controls.Add(this.apply); this.Controls.Add(this.panelres); this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "OpenMapOptionsForm"; diff --git a/Source/Core/Windows/OpenMapOptionsForm.resx b/Source/Core/Windows/OpenMapOptionsForm.resx index f3e2a0f3..ff50cfee 100644 --- a/Source/Core/Windows/OpenMapOptionsForm.resx +++ b/Source/Core/Windows/OpenMapOptionsForm.resx @@ -147,19 +147,7 @@ True - - True - - - True - - - True - True - - True - \ No newline at end of file diff --git a/Source/Core/Windows/PasteOptionsForm.Designer.cs b/Source/Core/Windows/PasteOptionsForm.Designer.cs index 4869ee0b..993b539c 100644 --- a/Source/Core/Windows/PasteOptionsForm.Designer.cs +++ b/Source/Core/Windows/PasteOptionsForm.Designer.cs @@ -36,7 +36,7 @@ // paste // this.paste.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.paste.Location = new System.Drawing.Point(272, 278); + this.paste.Location = new System.Drawing.Point(260, 214); this.paste.Name = "paste"; this.paste.Size = new System.Drawing.Size(112, 25); this.paste.TabIndex = 3; @@ -48,7 +48,7 @@ // this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(390, 278); + this.cancel.Location = new System.Drawing.Point(142, 214); this.cancel.Name = "cancel"; this.cancel.Size = new System.Drawing.Size(112, 25); this.cancel.TabIndex = 4; @@ -63,7 +63,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.pasteoptions.Location = new System.Drawing.Point(12, 12); this.pasteoptions.Name = "pasteoptions"; - this.pasteoptions.Size = new System.Drawing.Size(490, 260); + this.pasteoptions.Size = new System.Drawing.Size(360, 188); this.pasteoptions.TabIndex = 5; // // PasteOptionsForm @@ -72,13 +72,13 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.CancelButton = this.cancel; - this.ClientSize = new System.Drawing.Size(514, 318); + this.ClientSize = new System.Drawing.Size(384, 246); this.ControlBox = false; this.Controls.Add(this.pasteoptions); this.Controls.Add(this.cancel); this.Controls.Add(this.paste); this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "PasteOptionsForm"; diff --git a/Source/Core/Windows/PasteOptionsForm.resx b/Source/Core/Windows/PasteOptionsForm.resx index 0d209151..ff31a6db 100644 --- a/Source/Core/Windows/PasteOptionsForm.resx +++ b/Source/Core/Windows/PasteOptionsForm.resx @@ -1,132 +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 - - True - - - True - - - True - - - True - \ No newline at end of file diff --git a/Source/Core/Windows/PreferencesForm.Designer.cs b/Source/Core/Windows/PreferencesForm.Designer.cs index 291d7656..8fb8506e 100644 --- a/Source/Core/Windows/PreferencesForm.Designer.cs +++ b/Source/Core/Windows/PreferencesForm.Designer.cs @@ -38,6 +38,9 @@ namespace CodeImp.DoomBuilder.Windows System.Windows.Forms.Label label18; System.Windows.Forms.Label label20; System.Windows.Forms.Label label21; + this.recentFiles = new Dotnetrix.Controls.TrackBar(); + this.labelRecentFiles = new System.Windows.Forms.Label(); + this.label25 = new System.Windows.Forms.Label(); this.vertexScaleLabel = new System.Windows.Forms.Label(); this.label22 = new System.Windows.Forms.Label(); this.vertexScale = new Dotnetrix.Controls.TrackBar(); @@ -159,9 +162,6 @@ namespace CodeImp.DoomBuilder.Windows this.label16 = new System.Windows.Forms.Label(); this.pasteoptions = new CodeImp.DoomBuilder.Controls.PasteOptionsControl(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.recentFiles = new Dotnetrix.Controls.TrackBar(); - this.labelRecentFiles = new System.Windows.Forms.Label(); - this.label25 = new System.Windows.Forms.Label(); label7 = new System.Windows.Forms.Label(); label6 = new System.Windows.Forms.Label(); label5 = new System.Windows.Forms.Label(); @@ -171,6 +171,7 @@ namespace CodeImp.DoomBuilder.Windows label20 = new System.Windows.Forms.Label(); label21 = new System.Windows.Forms.Label(); groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.recentFiles)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.vertexScale)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.zoomfactor)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.autoscrollspeed)).BeginInit(); @@ -196,7 +197,6 @@ namespace CodeImp.DoomBuilder.Windows ((System.ComponentModel.ISupportInitialize)(this.imagebrightness)).BeginInit(); this.colorsgroup3.SuspendLayout(); this.tabpasting.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.recentFiles)).BeginInit(); this.SuspendLayout(); // // label7 @@ -255,6 +255,37 @@ namespace CodeImp.DoomBuilder.Windows groupBox1.TabStop = false; groupBox1.Text = " Options "; // + // recentFiles + // + this.recentFiles.LargeChange = 1; + this.recentFiles.Location = new System.Drawing.Point(127, 238); + this.recentFiles.Maximum = 25; + this.recentFiles.Minimum = 8; + this.recentFiles.Name = "recentFiles"; + this.recentFiles.Size = new System.Drawing.Size(116, 45); + this.recentFiles.TabIndex = 46; + this.recentFiles.TickStyle = System.Windows.Forms.TickStyle.Both; + this.recentFiles.Value = 8; + this.recentFiles.ValueChanged += new System.EventHandler(this.recentFiles_ValueChanged); + // + // labelRecentFiles + // + this.labelRecentFiles.AutoSize = true; + this.labelRecentFiles.Location = new System.Drawing.Point(249, 250); + this.labelRecentFiles.Name = "labelRecentFiles"; + this.labelRecentFiles.Size = new System.Drawing.Size(13, 14); + this.labelRecentFiles.TabIndex = 48; + this.labelRecentFiles.Text = "8"; + // + // label25 + // + this.label25.AutoSize = true; + this.label25.Location = new System.Drawing.Point(31, 251); + this.label25.Name = "label25"; + this.label25.Size = new System.Drawing.Size(90, 14); + this.label25.TabIndex = 47; + this.label25.Text = "Max. recent files:"; + // // vertexScaleLabel // this.vertexScaleLabel.AutoSize = true; @@ -701,7 +732,7 @@ namespace CodeImp.DoomBuilder.Windows // this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(589, 558); + this.cancel.Location = new System.Drawing.Point(469, 557); this.cancel.Name = "cancel"; this.cancel.Size = new System.Drawing.Size(112, 25); this.cancel.TabIndex = 2; @@ -713,7 +744,7 @@ namespace CodeImp.DoomBuilder.Windows // this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.apply.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.apply.Location = new System.Drawing.Point(471, 558); + this.apply.Location = new System.Drawing.Point(587, 557); this.apply.Name = "apply"; this.apply.Size = new System.Drawing.Size(112, 25); this.apply.TabIndex = 1; @@ -1723,37 +1754,6 @@ namespace CodeImp.DoomBuilder.Windows this.pasteoptions.Size = new System.Drawing.Size(666, 427); this.pasteoptions.TabIndex = 0; // - // recentFiles - // - this.recentFiles.LargeChange = 1; - this.recentFiles.Location = new System.Drawing.Point(127, 238); - this.recentFiles.Maximum = 25; - this.recentFiles.Minimum = 8; - this.recentFiles.Name = "recentFiles"; - this.recentFiles.Size = new System.Drawing.Size(116, 45); - this.recentFiles.TabIndex = 46; - this.recentFiles.TickStyle = System.Windows.Forms.TickStyle.Both; - this.recentFiles.Value = 8; - this.recentFiles.ValueChanged += new System.EventHandler(this.recentFiles_ValueChanged); - // - // labelRecentFiles - // - this.labelRecentFiles.AutoSize = true; - this.labelRecentFiles.Location = new System.Drawing.Point(249, 250); - this.labelRecentFiles.Name = "labelRecentFiles"; - this.labelRecentFiles.Size = new System.Drawing.Size(13, 14); - this.labelRecentFiles.TabIndex = 48; - this.labelRecentFiles.Text = "8"; - // - // label25 - // - this.label25.AutoSize = true; - this.label25.Location = new System.Drawing.Point(31, 251); - this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(90, 14); - this.label25.TabIndex = 47; - this.label25.Text = "Max. recent files:"; - // // PreferencesForm // this.AcceptButton = this.apply; @@ -1766,7 +1766,7 @@ namespace CodeImp.DoomBuilder.Windows this.Controls.Add(this.tabs); this.DoubleBuffered = true; this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "PreferencesForm"; @@ -1777,6 +1777,7 @@ namespace CodeImp.DoomBuilder.Windows this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.PreferencesForm_HelpRequested); groupBox1.ResumeLayout(false); groupBox1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.recentFiles)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.vertexScale)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.zoomfactor)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.autoscrollspeed)).EndInit(); @@ -1810,7 +1811,6 @@ namespace CodeImp.DoomBuilder.Windows this.colorsgroup3.ResumeLayout(false); this.colorsgroup3.PerformLayout(); this.tabpasting.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.recentFiles)).EndInit(); this.ResumeLayout(false); } diff --git a/Source/Core/Windows/ResourceOptionsForm.Designer.cs b/Source/Core/Windows/ResourceOptionsForm.Designer.cs index 098cb6a3..35c9ed5b 100644 --- a/Source/Core/Windows/ResourceOptionsForm.Designer.cs +++ b/Source/Core/Windows/ResourceOptionsForm.Designer.cs @@ -313,7 +313,7 @@ namespace CodeImp.DoomBuilder.Windows // this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(266, 306); + this.cancel.Location = new System.Drawing.Point(144, 291); this.cancel.Name = "cancel"; this.cancel.Size = new System.Drawing.Size(112, 25); this.cancel.TabIndex = 2; @@ -324,7 +324,7 @@ namespace CodeImp.DoomBuilder.Windows // apply // this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.apply.Location = new System.Drawing.Point(148, 306); + this.apply.Location = new System.Drawing.Point(262, 291); this.apply.Name = "apply"; this.apply.Size = new System.Drawing.Size(112, 25); this.apply.TabIndex = 1; @@ -363,13 +363,13 @@ namespace CodeImp.DoomBuilder.Windows this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.CancelButton = this.cancel; - this.ClientSize = new System.Drawing.Size(386, 340); + this.ClientSize = new System.Drawing.Size(386, 324); this.Controls.Add(this.notfortesting); this.Controls.Add(this.cancel); this.Controls.Add(this.apply); this.Controls.Add(this.tabs); this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "ResourceOptionsForm"; diff --git a/Source/Core/Windows/ResourceOptionsForm.resx b/Source/Core/Windows/ResourceOptionsForm.resx index 5bea7a59..b69a5284 100644 --- a/Source/Core/Windows/ResourceOptionsForm.resx +++ b/Source/Core/Windows/ResourceOptionsForm.resx @@ -1,213 +1,231 @@ + 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 - True + True - False + False - True + True - False + False - True + True - False + False - True + True - True + True - True + True - Use the option above to enforce strictly loading texture patches from between P_START and P_END marker lumps only. This can solve lump name conflicts, but old WAD files do not always adhere to this rule. + Use the option above to enforce strictly loading texture patches from between P_START and P_END marker lumps only. This can solve lump name conflicts, but old WAD files do not always adhere to this rule. - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - - True + + True - - True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True - 17, 17 + 17, 17 - 133, 17 + 133, 17 - 227, 17 + 227, 17 - True - - - True + True \ No newline at end of file diff --git a/Source/Core/Windows/ScriptFindReplaceForm.Designer.cs b/Source/Core/Windows/ScriptFindReplaceForm.Designer.cs index 0b79513a..cbc010e9 100644 --- a/Source/Core/Windows/ScriptFindReplaceForm.Designer.cs +++ b/Source/Core/Windows/ScriptFindReplaceForm.Designer.cs @@ -94,7 +94,8 @@ namespace CodeImp.DoomBuilder.Windows // // findnextbutton // - this.findnextbutton.Location = new System.Drawing.Point(277, 18); + this.findnextbutton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.findnextbutton.Location = new System.Drawing.Point(257, 18); this.findnextbutton.Name = "findnextbutton"; this.findnextbutton.Size = new System.Drawing.Size(98, 25); this.findnextbutton.TabIndex = 4; @@ -104,7 +105,8 @@ namespace CodeImp.DoomBuilder.Windows // // replaceallbutton // - this.replaceallbutton.Location = new System.Drawing.Point(277, 80); + this.replaceallbutton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.replaceallbutton.Location = new System.Drawing.Point(257, 80); this.replaceallbutton.Name = "replaceallbutton"; this.replaceallbutton.Size = new System.Drawing.Size(98, 25); this.replaceallbutton.TabIndex = 6; @@ -114,8 +116,9 @@ namespace CodeImp.DoomBuilder.Windows // // closebutton // + this.closebutton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.closebutton.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.closebutton.Location = new System.Drawing.Point(277, 127); + this.closebutton.Location = new System.Drawing.Point(257, 127); this.closebutton.Name = "closebutton"; this.closebutton.Size = new System.Drawing.Size(98, 25); this.closebutton.TabIndex = 7; @@ -125,7 +128,8 @@ namespace CodeImp.DoomBuilder.Windows // // replacebutton // - this.replacebutton.Location = new System.Drawing.Point(277, 49); + this.replacebutton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.replacebutton.Location = new System.Drawing.Point(257, 49); this.replacebutton.Name = "replacebutton"; this.replacebutton.Size = new System.Drawing.Size(98, 25); this.replacebutton.TabIndex = 5; @@ -139,7 +143,7 @@ namespace CodeImp.DoomBuilder.Windows this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.CancelButton = this.closebutton; - this.ClientSize = new System.Drawing.Size(387, 163); + this.ClientSize = new System.Drawing.Size(367, 163); this.Controls.Add(this.replacebutton); this.Controls.Add(this.closebutton); this.Controls.Add(this.replaceallbutton); diff --git a/Source/Core/Windows/ScriptFindReplaceForm.resx b/Source/Core/Windows/ScriptFindReplaceForm.resx index 27229895..f5da54cc 100644 --- a/Source/Core/Windows/ScriptFindReplaceForm.resx +++ b/Source/Core/Windows/ScriptFindReplaceForm.resx @@ -1,153 +1,150 @@ + 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 - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True - - - True + True \ No newline at end of file diff --git a/Source/Core/Windows/SectorEditForm.Designer.cs b/Source/Core/Windows/SectorEditForm.Designer.cs index 74148bba..027e19f2 100644 --- a/Source/Core/Windows/SectorEditForm.Designer.cs +++ b/Source/Core/Windows/SectorEditForm.Designer.cs @@ -257,6 +257,7 @@ namespace CodeImp.DoomBuilder.Windows // floortex // this.floortex.Location = new System.Drawing.Point(242, 35); + this.floortex.MultipleTextures = false; this.floortex.Name = "floortex"; this.floortex.Size = new System.Drawing.Size(83, 105); this.floortex.TabIndex = 2; @@ -280,6 +281,7 @@ namespace CodeImp.DoomBuilder.Windows // ceilingtex // this.ceilingtex.Location = new System.Drawing.Point(337, 35); + this.ceilingtex.MultipleTextures = false; this.ceilingtex.Name = "ceilingtex"; this.ceilingtex.Size = new System.Drawing.Size(83, 105); this.ceilingtex.TabIndex = 3; @@ -290,7 +292,7 @@ namespace CodeImp.DoomBuilder.Windows // this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(346, 278); + this.cancel.Location = new System.Drawing.Point(226, 278); this.cancel.Name = "cancel"; this.cancel.Size = new System.Drawing.Size(112, 25); this.cancel.TabIndex = 2; @@ -301,7 +303,7 @@ namespace CodeImp.DoomBuilder.Windows // apply // this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.apply.Location = new System.Drawing.Point(227, 278); + this.apply.Location = new System.Drawing.Point(344, 278); this.apply.Name = "apply"; this.apply.Size = new System.Drawing.Size(112, 25); this.apply.TabIndex = 1; @@ -312,6 +314,7 @@ namespace CodeImp.DoomBuilder.Windows // flatSelectorControl2 // this.flatSelectorControl2.Location = new System.Drawing.Point(271, 37); + this.flatSelectorControl2.MultipleTextures = false; this.flatSelectorControl2.Name = "flatSelectorControl2"; this.flatSelectorControl2.Size = new System.Drawing.Size(83, 105); this.flatSelectorControl2.TabIndex = 13; @@ -320,6 +323,7 @@ namespace CodeImp.DoomBuilder.Windows // flatSelectorControl1 // this.flatSelectorControl1.Location = new System.Drawing.Point(363, 37); + this.flatSelectorControl1.MultipleTextures = false; this.flatSelectorControl1.Name = "flatSelectorControl1"; this.flatSelectorControl1.Size = new System.Drawing.Size(83, 105); this.flatSelectorControl1.TabIndex = 12; @@ -346,7 +350,7 @@ namespace CodeImp.DoomBuilder.Windows this.Controls.Add(this.cancel); this.Controls.Add(this.apply); this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "SectorEditForm"; diff --git a/Source/Core/Windows/SectorEditFormUDMF.Designer.cs b/Source/Core/Windows/SectorEditFormUDMF.Designer.cs index 607c9643..88ff9ffb 100644 --- a/Source/Core/Windows/SectorEditFormUDMF.Designer.cs +++ b/Source/Core/Windows/SectorEditFormUDMF.Designer.cs @@ -866,7 +866,7 @@ // this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(355, 459); + this.cancel.Location = new System.Drawing.Point(235, 459); this.cancel.Name = "cancel"; this.cancel.Size = new System.Drawing.Size(112, 25); this.cancel.TabIndex = 4; @@ -877,7 +877,7 @@ // apply // this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.apply.Location = new System.Drawing.Point(237, 459); + this.apply.Location = new System.Drawing.Point(353, 459); this.apply.Name = "apply"; this.apply.Size = new System.Drawing.Size(112, 25); this.apply.TabIndex = 3; @@ -896,7 +896,7 @@ this.Controls.Add(this.apply); this.Controls.Add(this.tabs); 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.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "SectorEditFormUDMF"; diff --git a/Source/Core/Windows/TextEditForm.Designer.cs b/Source/Core/Windows/TextEditForm.Designer.cs index 85c6d6ef..201e41e0 100644 --- a/Source/Core/Windows/TextEditForm.Designer.cs +++ b/Source/Core/Windows/TextEditForm.Designer.cs @@ -40,7 +40,7 @@ namespace CodeImp.DoomBuilder.Windows // this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(354, 220); + this.cancel.Location = new System.Drawing.Point(235, 224); this.cancel.Margin = new System.Windows.Forms.Padding(1); this.cancel.Name = "cancel"; this.cancel.Size = new System.Drawing.Size(112, 25); @@ -53,7 +53,7 @@ namespace CodeImp.DoomBuilder.Windows // apply // this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.apply.Location = new System.Drawing.Point(235, 220); + this.apply.Location = new System.Drawing.Point(354, 224); this.apply.Margin = new System.Windows.Forms.Padding(1); this.apply.Name = "apply"; this.apply.Size = new System.Drawing.Size(112, 25); @@ -73,7 +73,7 @@ namespace CodeImp.DoomBuilder.Windows this.textbox.Multiline = true; this.textbox.Name = "textbox"; this.textbox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.textbox.Size = new System.Drawing.Size(456, 194); + this.textbox.Size = new System.Drawing.Size(456, 204); this.textbox.TabIndex = 0; this.textbox.TabStop = false; // @@ -88,7 +88,7 @@ namespace CodeImp.DoomBuilder.Windows this.Controls.Add(this.cancel); this.Controls.Add(this.apply); this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "TextEditForm"; diff --git a/Source/Core/Windows/TextEditForm.resx b/Source/Core/Windows/TextEditForm.resx index 15a58a45..ff31a6db 100644 --- a/Source/Core/Windows/TextEditForm.resx +++ b/Source/Core/Windows/TextEditForm.resx @@ -1,132 +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 - - True - - - True - - - True - - - True - \ No newline at end of file diff --git a/Source/Core/Windows/TextureBrowserForm.Designer.cs b/Source/Core/Windows/TextureBrowserForm.Designer.cs index 31cdce19..fffafa95 100644 --- a/Source/Core/Windows/TextureBrowserForm.Designer.cs +++ b/Source/Core/Windows/TextureBrowserForm.Designer.cs @@ -41,7 +41,7 @@ namespace CodeImp.DoomBuilder.Windows // this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(783, 597); + this.cancel.Location = new System.Drawing.Point(681, 597); this.cancel.Name = "cancel"; this.cancel.Size = new System.Drawing.Size(98, 25); this.cancel.TabIndex = 3; @@ -53,7 +53,7 @@ namespace CodeImp.DoomBuilder.Windows // apply // this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.apply.Location = new System.Drawing.Point(681, 597); + this.apply.Location = new System.Drawing.Point(783, 597); this.apply.Name = "apply"; this.apply.Size = new System.Drawing.Size(98, 25); this.apply.TabIndex = 2; @@ -96,6 +96,7 @@ namespace CodeImp.DoomBuilder.Windows this.browser.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.browser.BrowseFlats = false; this.browser.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.browser.HideInputBox = false; this.browser.Location = new System.Drawing.Point(12, 12); diff --git a/Source/Core/Windows/TextureBrowserForm.resx b/Source/Core/Windows/TextureBrowserForm.resx index 5d7f9d92..2949ffdc 100644 --- a/Source/Core/Windows/TextureBrowserForm.resx +++ b/Source/Core/Windows/TextureBrowserForm.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAc - DwAAAk1TRnQBSQFMAgEBBwEAAdwBAAHcAQABEAEAARYBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DwAAAk1TRnQBSQFMAgEBBwEAAeQBAAHkAQABEAEAARYBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASwDAAEBAQABCAYAAQsYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/Source/Core/Windows/TextureSetForm.Designer.cs b/Source/Core/Windows/TextureSetForm.Designer.cs index 28d16dc5..2acbd97c 100644 --- a/Source/Core/Windows/TextureSetForm.Designer.cs +++ b/Source/Core/Windows/TextureSetForm.Designer.cs @@ -75,7 +75,7 @@ namespace CodeImp.DoomBuilder.Windows | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.filters.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.filtercolumn}); + this.filtercolumn}); this.filters.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; this.filters.HideSelection = false; this.filters.LabelEdit = true; @@ -125,7 +125,7 @@ namespace CodeImp.DoomBuilder.Windows // apply // this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.apply.Location = new System.Drawing.Point(503, 515); + this.apply.Location = new System.Drawing.Point(604, 511); this.apply.Name = "apply"; this.apply.Size = new System.Drawing.Size(105, 25); this.apply.TabIndex = 3; @@ -137,7 +137,7 @@ namespace CodeImp.DoomBuilder.Windows // this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(614, 515); + this.cancel.Location = new System.Drawing.Point(493, 511); this.cancel.Name = "cancel"; this.cancel.Size = new System.Drawing.Size(105, 25); this.cancel.TabIndex = 4; @@ -199,7 +199,7 @@ namespace CodeImp.DoomBuilder.Windows this.groupBox2.Controls.Add(this.matchesbutton); this.groupBox2.Controls.Add(this.matcheslist); this.groupBox2.Controls.Add(this.noresultlabel); - this.groupBox2.Location = new System.Drawing.Point(298, 60); + this.groupBox2.Location = new System.Drawing.Point(288, 60); this.groupBox2.Name = "groupBox2"; this.groupBox2.Size = new System.Drawing.Size(421, 440); this.groupBox2.TabIndex = 2; @@ -237,6 +237,7 @@ namespace CodeImp.DoomBuilder.Windows this.matcheslist.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.matcheslist.BrowseFlats = false; this.matcheslist.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.matcheslist.HideInputBox = true; this.matcheslist.Location = new System.Drawing.Point(18, 55); @@ -271,7 +272,7 @@ namespace CodeImp.DoomBuilder.Windows this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.CancelButton = this.cancel; - this.ClientSize = new System.Drawing.Size(731, 552); + this.ClientSize = new System.Drawing.Size(721, 544); this.Controls.Add(this.pictureBox1); this.Controls.Add(this.groupBox2); this.Controls.Add(this.cancel); @@ -280,7 +281,7 @@ namespace CodeImp.DoomBuilder.Windows this.Controls.Add(this.label1); this.Controls.Add(this.groupBox1); this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "TextureSetForm"; diff --git a/Source/Core/Windows/TextureSetForm.resx b/Source/Core/Windows/TextureSetForm.resx index 3030ea28..453c2991 100644 --- a/Source/Core/Windows/TextureSetForm.resx +++ b/Source/Core/Windows/TextureSetForm.resx @@ -1,177 +1,165 @@ + 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 - True + True - True + True - True + True - True + True - True + True - True - - - True - - - True + True - True + True - True + True - True + True - 17, 17 - - - True + 17, 17 - True + True - True + True - True + True - True + True - True - - - True + True \ No newline at end of file diff --git a/Source/Core/Windows/ThingBrowserForm.Designer.cs b/Source/Core/Windows/ThingBrowserForm.Designer.cs index deafaa28..6c51c95d 100644 --- a/Source/Core/Windows/ThingBrowserForm.Designer.cs +++ b/Source/Core/Windows/ThingBrowserForm.Designer.cs @@ -42,13 +42,14 @@ namespace CodeImp.DoomBuilder.Windows this.thingslist.Name = "thingslist"; this.thingslist.Size = new System.Drawing.Size(394, 383); this.thingslist.TabIndex = 0; + this.thingslist.UseMultiSelection = false; this.thingslist.OnTypeDoubleClicked += new CodeImp.DoomBuilder.Controls.ThingBrowserControl.TypeDoubleClickDeletegate(this.thingslist_OnTypeDoubleClicked); // // cancel // this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(291, 416); + this.cancel.Location = new System.Drawing.Point(173, 403); this.cancel.Name = "cancel"; this.cancel.Size = new System.Drawing.Size(112, 27); this.cancel.TabIndex = 2; @@ -59,7 +60,7 @@ namespace CodeImp.DoomBuilder.Windows // apply // this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.apply.Location = new System.Drawing.Point(171, 416); + this.apply.Location = new System.Drawing.Point(291, 403); this.apply.Name = "apply"; this.apply.Size = new System.Drawing.Size(112, 27); this.apply.TabIndex = 1; @@ -73,12 +74,12 @@ namespace CodeImp.DoomBuilder.Windows this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.CancelButton = this.cancel; - this.ClientSize = new System.Drawing.Size(412, 453); + this.ClientSize = new System.Drawing.Size(412, 437); this.Controls.Add(this.cancel); this.Controls.Add(this.apply); this.Controls.Add(this.thingslist); this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "ThingBrowserForm"; diff --git a/Source/Core/Windows/ThingBrowserForm.resx b/Source/Core/Windows/ThingBrowserForm.resx index 77c90cfe..ede83fce 100644 --- a/Source/Core/Windows/ThingBrowserForm.resx +++ b/Source/Core/Windows/ThingBrowserForm.resx @@ -1,132 +1,123 @@ + 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 - True - - - True - - - True - - - True + True \ No newline at end of file diff --git a/Source/Core/Windows/ThingEditForm.Designer.cs b/Source/Core/Windows/ThingEditForm.Designer.cs index fc983265..6d396663 100644 --- a/Source/Core/Windows/ThingEditForm.Designer.cs +++ b/Source/Core/Windows/ThingEditForm.Designer.cs @@ -542,7 +542,7 @@ namespace CodeImp.DoomBuilder.Windows // this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(558, 429); + this.cancel.Location = new System.Drawing.Point(440, 429); this.cancel.Name = "cancel"; this.cancel.Size = new System.Drawing.Size(112, 25); this.cancel.TabIndex = 2; @@ -553,7 +553,7 @@ namespace CodeImp.DoomBuilder.Windows // apply // this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.apply.Location = new System.Drawing.Point(439, 429); + this.apply.Location = new System.Drawing.Point(558, 429); this.apply.Name = "apply"; this.apply.Size = new System.Drawing.Size(112, 25); this.apply.TabIndex = 1; @@ -592,7 +592,7 @@ namespace CodeImp.DoomBuilder.Windows this.Controls.Add(this.apply); this.Controls.Add(this.tabs); this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "ThingEditForm"; diff --git a/Source/Core/Windows/ThingEditFormUDMF.Designer.cs b/Source/Core/Windows/ThingEditFormUDMF.Designer.cs index 4d043226..53475fba 100644 --- a/Source/Core/Windows/ThingEditFormUDMF.Designer.cs +++ b/Source/Core/Windows/ThingEditFormUDMF.Designer.cs @@ -910,7 +910,7 @@ // this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(533, 446); + this.cancel.Location = new System.Drawing.Point(415, 446); this.cancel.Name = "cancel"; this.cancel.Size = new System.Drawing.Size(112, 25); this.cancel.TabIndex = 2; @@ -921,7 +921,7 @@ // apply // this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.apply.Location = new System.Drawing.Point(414, 446); + this.apply.Location = new System.Drawing.Point(533, 446); this.apply.Name = "apply"; this.apply.Size = new System.Drawing.Size(112, 25); this.apply.TabIndex = 1; @@ -962,7 +962,7 @@ this.Controls.Add(this.apply); this.Controls.Add(this.tabs); this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "ThingEditFormUDMF"; diff --git a/Source/Core/Windows/ThingsFiltersForm.Designer.cs b/Source/Core/Windows/ThingsFiltersForm.Designer.cs index 32485bab..db2fcc48 100644 --- a/Source/Core/Windows/ThingsFiltersForm.Designer.cs +++ b/Source/Core/Windows/ThingsFiltersForm.Designer.cs @@ -87,7 +87,7 @@ namespace CodeImp.DoomBuilder.Windows this.listfilters.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.listfilters.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.columnname}); + this.columnname}); this.listfilters.FullRowSelect = true; this.listfilters.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; this.listfilters.HideSelection = false; @@ -95,7 +95,7 @@ namespace CodeImp.DoomBuilder.Windows this.listfilters.MultiSelect = false; this.listfilters.Name = "listfilters"; this.listfilters.ShowGroups = false; - this.listfilters.Size = new System.Drawing.Size(202, 354); + this.listfilters.Size = new System.Drawing.Size(202, 379); this.listfilters.Sorting = System.Windows.Forms.SortOrder.Ascending; this.listfilters.TabIndex = 0; this.listfilters.UseCompatibleStateImageBehavior = false; @@ -109,8 +109,7 @@ namespace CodeImp.DoomBuilder.Windows // // addfilter // - this.addfilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.addfilter.Location = new System.Drawing.Point(12, 372); + this.addfilter.Location = new System.Drawing.Point(12, 397); this.addfilter.Name = "addfilter"; this.addfilter.Size = new System.Drawing.Size(98, 25); this.addfilter.TabIndex = 1; @@ -120,9 +119,8 @@ namespace CodeImp.DoomBuilder.Windows // // deletefilter // - this.deletefilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.deletefilter.Enabled = false; - this.deletefilter.Location = new System.Drawing.Point(116, 372); + this.deletefilter.Location = new System.Drawing.Point(116, 397); this.deletefilter.Name = "deletefilter"; this.deletefilter.Size = new System.Drawing.Size(98, 25); this.deletefilter.TabIndex = 2; @@ -139,7 +137,7 @@ namespace CodeImp.DoomBuilder.Windows this.filtergroup.Controls.Add(this.filtername); this.filtergroup.Controls.Add(this.label1); this.filtergroup.Enabled = false; - this.filtergroup.Location = new System.Drawing.Point(232, 12); + this.filtergroup.Location = new System.Drawing.Point(220, 12); this.filtergroup.Name = "filtergroup"; this.filtergroup.Size = new System.Drawing.Size(465, 385); this.filtergroup.TabIndex = 3; @@ -190,7 +188,7 @@ namespace CodeImp.DoomBuilder.Windows this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(34, 235); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(342, 14); + this.label6.Size = new System.Drawing.Size(341, 14); this.label6.TabIndex = 15; this.label6.Text = "Note: Clear the input fields which you do not want to use in this filter."; // @@ -209,6 +207,7 @@ namespace CodeImp.DoomBuilder.Windows this.filterzheight.AllowNegative = true; this.filterzheight.AllowRelative = false; this.filterzheight.ButtonStep = 1; + this.filterzheight.ButtonStepFloat = 1F; this.filterzheight.Location = new System.Drawing.Point(123, 162); this.filterzheight.Name = "filterzheight"; this.filterzheight.Size = new System.Drawing.Size(72, 24); @@ -236,6 +235,7 @@ namespace CodeImp.DoomBuilder.Windows this.filterangle.AllowNegative = true; this.filterangle.AllowRelative = false; this.filterangle.ButtonStep = 45; + this.filterangle.ButtonStepFloat = 1F; this.filterangle.Location = new System.Drawing.Point(123, 119); this.filterangle.Name = "filterangle"; this.filterangle.Size = new System.Drawing.Size(72, 24); @@ -335,6 +335,7 @@ namespace CodeImp.DoomBuilder.Windows this.filterfields.Name = "filterfields"; this.filterfields.Size = new System.Drawing.Size(402, 229); this.filterfields.TabIndex = 5; + this.filterfields.VerticalSpacing = 1; // // label3 // @@ -536,6 +537,7 @@ namespace CodeImp.DoomBuilder.Windows this.filtertag.AllowNegative = true; this.filtertag.AllowRelative = false; this.filtertag.ButtonStep = 1; + this.filtertag.ButtonStepFloat = 1F; this.filtertag.Location = new System.Drawing.Point(122, 244); this.filtertag.Name = "filtertag"; this.filtertag.Size = new System.Drawing.Size(72, 24); @@ -566,6 +568,7 @@ namespace CodeImp.DoomBuilder.Windows // // fieldslist // + this.fieldslist.AllowInsert = true; this.fieldslist.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))); @@ -575,8 +578,13 @@ namespace CodeImp.DoomBuilder.Windows this.fieldslist.Location = new System.Drawing.Point(8, 9); this.fieldslist.Margin = new System.Windows.Forms.Padding(8, 9, 8, 9); this.fieldslist.Name = "fieldslist"; + this.fieldslist.PropertyColumnVisible = true; + this.fieldslist.PropertyColumnWidth = 150; this.fieldslist.Size = new System.Drawing.Size(426, 271); this.fieldslist.TabIndex = 2; + this.fieldslist.TypeColumnVisible = true; + this.fieldslist.TypeColumnWidth = 100; + this.fieldslist.ValueColumnVisible = true; this.fieldslist.Validated += new System.EventHandler(this.fieldslist_Validated); // // filtername @@ -601,7 +609,7 @@ namespace CodeImp.DoomBuilder.Windows // this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(585, 414); + this.cancel.Location = new System.Drawing.Point(455, 403); this.cancel.Name = "cancel"; this.cancel.Size = new System.Drawing.Size(112, 25); this.cancel.TabIndex = 5; @@ -612,7 +620,7 @@ namespace CodeImp.DoomBuilder.Windows // apply // this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.apply.Location = new System.Drawing.Point(467, 414); + this.apply.Location = new System.Drawing.Point(573, 403); this.apply.Name = "apply"; this.apply.Size = new System.Drawing.Size(112, 25); this.apply.TabIndex = 4; @@ -626,7 +634,7 @@ namespace CodeImp.DoomBuilder.Windows this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.CancelButton = this.cancel; - this.ClientSize = new System.Drawing.Size(707, 449); + this.ClientSize = new System.Drawing.Size(696, 436); this.Controls.Add(this.cancel); this.Controls.Add(this.apply); this.Controls.Add(this.filtergroup); @@ -634,7 +642,7 @@ namespace CodeImp.DoomBuilder.Windows this.Controls.Add(this.addfilter); this.Controls.Add(this.listfilters); this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "ThingsFiltersForm"; diff --git a/Source/Core/Windows/ThingsFiltersForm.resx b/Source/Core/Windows/ThingsFiltersForm.resx index 6f011b9e..8a7b3345 100644 --- a/Source/Core/Windows/ThingsFiltersForm.resx +++ b/Source/Core/Windows/ThingsFiltersForm.resx @@ -1,255 +1,234 @@ + 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 - - True - - - True - - - True - - - True - - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True - - - True - - - True - - - True + True \ No newline at end of file diff --git a/Source/Core/Windows/VertexEditForm.Designer.cs b/Source/Core/Windows/VertexEditForm.Designer.cs index cf2a9417..115b63cf 100644 --- a/Source/Core/Windows/VertexEditForm.Designer.cs +++ b/Source/Core/Windows/VertexEditForm.Designer.cs @@ -265,7 +265,7 @@ namespace CodeImp.DoomBuilder.Windows // this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(334, 259); + this.cancel.Location = new System.Drawing.Point(214, 247); this.cancel.Name = "cancel"; this.cancel.Size = new System.Drawing.Size(112, 25); this.cancel.TabIndex = 2; @@ -276,7 +276,7 @@ namespace CodeImp.DoomBuilder.Windows // apply // this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.apply.Location = new System.Drawing.Point(215, 259); + this.apply.Location = new System.Drawing.Point(332, 247); this.apply.Name = "apply"; this.apply.Size = new System.Drawing.Size(112, 25); this.apply.TabIndex = 1; @@ -290,12 +290,12 @@ namespace CodeImp.DoomBuilder.Windows this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.CancelButton = this.cancel; - this.ClientSize = new System.Drawing.Size(456, 294); + this.ClientSize = new System.Drawing.Size(456, 278); this.Controls.Add(this.cancel); this.Controls.Add(this.apply); this.Controls.Add(this.tabs); this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "VertexEditForm"; diff --git a/Source/Core/Windows/VertexEditForm.resx b/Source/Core/Windows/VertexEditForm.resx index 1452fde7..79889532 100644 --- a/Source/Core/Windows/VertexEditForm.resx +++ b/Source/Core/Windows/VertexEditForm.resx @@ -150,13 +150,4 @@ True - - True - - - True - - - True - \ No newline at end of file diff --git a/Source/Plugins/BuilderModes/Interface/BridgeModeForm.Designer.cs b/Source/Plugins/BuilderModes/Interface/BridgeModeForm.Designer.cs index 0f0b8ac8..c0356320 100644 --- a/Source/Plugins/BuilderModes/Interface/BridgeModeForm.Designer.cs +++ b/Source/Plugins/BuilderModes/Interface/BridgeModeForm.Designer.cs @@ -51,6 +51,7 @@ // // buttonCancel // + this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.buttonCancel.Location = new System.Drawing.Point(95, 139); this.buttonCancel.Name = "buttonCancel"; this.buttonCancel.Size = new System.Drawing.Size(75, 23); @@ -120,10 +121,10 @@ this.nudSubdivisions.Size = new System.Drawing.Size(46, 20); this.nudSubdivisions.TabIndex = 3; this.nudSubdivisions.Value = new decimal(new int[] { - 5, - 0, - 0, - 0}); + 5, + 0, + 0, + 0}); this.nudSubdivisions.ValueChanged += new System.EventHandler(this.nudSubdivisions_ValueChanged); // // label4 @@ -170,8 +171,10 @@ // // BridgeModeForm // + this.AcceptButton = this.buttonOK; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.buttonCancel; this.ClientSize = new System.Drawing.Size(263, 166); this.Controls.Add(this.cbCopy); this.Controls.Add(this.cbMirror); diff --git a/Source/Plugins/BuilderModes/Interface/BridgeModeForm.resx b/Source/Plugins/BuilderModes/Interface/BridgeModeForm.resx index 965f82d3..ff31a6db 100644 --- a/Source/Plugins/BuilderModes/Interface/BridgeModeForm.resx +++ b/Source/Plugins/BuilderModes/Interface/BridgeModeForm.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/BuilderModes/Interface/CurveLinedefsForm.Designer.cs b/Source/Plugins/BuilderModes/Interface/CurveLinedefsForm.Designer.cs index 6afd48d9..0dbf6dc0 100644 --- a/Source/Plugins/BuilderModes/Interface/CurveLinedefsForm.Designer.cs +++ b/Source/Plugins/BuilderModes/Interface/CurveLinedefsForm.Designer.cs @@ -51,7 +51,7 @@ namespace CodeImp.DoomBuilder.BuilderModes label1.AutoSize = true; label1.Location = new System.Drawing.Point(12, 15); label1.Name = "label1"; - label1.Size = new System.Drawing.Size(51, 14); + label1.Size = new System.Drawing.Size(50, 14); label1.TabIndex = 0; label1.Text = "Vertices:"; // @@ -157,7 +157,7 @@ namespace CodeImp.DoomBuilder.BuilderModes // this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(84, 167); + this.cancel.Location = new System.Drawing.Point(7, 167); this.cancel.Name = "cancel"; this.cancel.Size = new System.Drawing.Size(70, 25); this.cancel.TabIndex = 9; @@ -168,7 +168,7 @@ namespace CodeImp.DoomBuilder.BuilderModes // apply // this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.apply.Location = new System.Drawing.Point(7, 167); + this.apply.Location = new System.Drawing.Point(84, 167); this.apply.Name = "apply"; this.apply.Size = new System.Drawing.Size(70, 25); this.apply.TabIndex = 8; diff --git a/Source/Plugins/BuilderModes/Interface/CurveLinedefsForm.resx b/Source/Plugins/BuilderModes/Interface/CurveLinedefsForm.resx index 6d9c9c22..250ad86d 100644 --- a/Source/Plugins/BuilderModes/Interface/CurveLinedefsForm.resx +++ b/Source/Plugins/BuilderModes/Interface/CurveLinedefsForm.resx @@ -1,165 +1,156 @@ + 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 - True + True - False + False - True + True - True + True - True + True - True + True - True + True - True + True - True + True - True - - - True - - - True + True - True + True - True - - - True + True \ No newline at end of file diff --git a/Source/Plugins/BuilderModes/Interface/MakeDoorForm.Designer.cs b/Source/Plugins/BuilderModes/Interface/MakeDoorForm.Designer.cs index 64208366..4cbe848a 100644 --- a/Source/Plugins/BuilderModes/Interface/MakeDoorForm.Designer.cs +++ b/Source/Plugins/BuilderModes/Interface/MakeDoorForm.Designer.cs @@ -102,7 +102,7 @@ namespace CodeImp.DoomBuilder.BuilderModes.Interface // cancel // this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(279, 140); + this.cancel.Location = new System.Drawing.Point(190, 140); this.cancel.Name = "cancel"; this.cancel.Size = new System.Drawing.Size(83, 25); this.cancel.TabIndex = 4; @@ -112,7 +112,7 @@ namespace CodeImp.DoomBuilder.BuilderModes.Interface // // apply // - this.apply.Location = new System.Drawing.Point(190, 140); + this.apply.Location = new System.Drawing.Point(279, 140); this.apply.Name = "apply"; this.apply.Size = new System.Drawing.Size(83, 25); this.apply.TabIndex = 3; diff --git a/Source/Plugins/TagRange/TagRangeForm.Designer.cs b/Source/Plugins/TagRange/TagRangeForm.Designer.cs index 634c032e..66696602 100644 --- a/Source/Plugins/TagRange/TagRangeForm.Designer.cs +++ b/Source/Plugins/TagRange/TagRangeForm.Designer.cs @@ -30,8 +30,6 @@ namespace CodeImp.DoomBuilder.TagRange { this.rangestart = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox(); this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.itemcountlabel = new System.Windows.Forms.Label(); this.doubletagwarning = new System.Windows.Forms.Label(); this.skipdoubletags = new System.Windows.Forms.CheckBox(); this.okbutton = new System.Windows.Forms.Button(); @@ -47,7 +45,8 @@ namespace CodeImp.DoomBuilder.TagRange this.rangestart.AllowNegative = false; this.rangestart.AllowRelative = false; this.rangestart.ButtonStep = 1; - this.rangestart.Location = new System.Drawing.Point(110, 56); + this.rangestart.ButtonStepFloat = 1F; + this.rangestart.Location = new System.Drawing.Point(76, 12); this.rangestart.Name = "rangestart"; this.rangestart.Size = new System.Drawing.Size(96, 24); this.rangestart.StepValues = null; @@ -57,35 +56,17 @@ namespace CodeImp.DoomBuilder.TagRange // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(44, 61); + this.label1.Location = new System.Drawing.Point(10, 17); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(54, 14); + this.label1.Size = new System.Drawing.Size(53, 14); this.label1.TabIndex = 1; this.label1.Text = "Start Tag:"; // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(30, 27); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(68, 14); - this.label2.TabIndex = 2; - this.label2.Text = "Items to Tag:"; - // - // itemcountlabel - // - this.itemcountlabel.AutoSize = true; - this.itemcountlabel.Location = new System.Drawing.Point(110, 27); - this.itemcountlabel.Name = "itemcountlabel"; - this.itemcountlabel.Size = new System.Drawing.Size(13, 14); - this.itemcountlabel.TabIndex = 3; - this.itemcountlabel.Text = "0"; - // // doubletagwarning // this.doubletagwarning.BackColor = System.Drawing.SystemColors.Info; this.doubletagwarning.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.doubletagwarning.Location = new System.Drawing.Point(12, 130); + this.doubletagwarning.Location = new System.Drawing.Point(12, 45); this.doubletagwarning.Name = "doubletagwarning"; this.doubletagwarning.Padding = new System.Windows.Forms.Padding(3); this.doubletagwarning.Size = new System.Drawing.Size(273, 50); @@ -97,7 +78,7 @@ namespace CodeImp.DoomBuilder.TagRange // this.skipdoubletags.AutoSize = true; this.skipdoubletags.BackColor = System.Drawing.SystemColors.Info; - this.skipdoubletags.Location = new System.Drawing.Point(63, 154); + this.skipdoubletags.Location = new System.Drawing.Point(63, 69); this.skipdoubletags.Name = "skipdoubletags"; this.skipdoubletags.Size = new System.Drawing.Size(161, 18); this.skipdoubletags.TabIndex = 5; @@ -109,7 +90,7 @@ namespace CodeImp.DoomBuilder.TagRange // okbutton // this.okbutton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.okbutton.Location = new System.Drawing.Point(41, 197); + this.okbutton.Location = new System.Drawing.Point(186, 102); this.okbutton.Name = "okbutton"; this.okbutton.Size = new System.Drawing.Size(99, 26); this.okbutton.TabIndex = 6; @@ -120,7 +101,8 @@ namespace CodeImp.DoomBuilder.TagRange // cancelbutton // this.cancelbutton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.cancelbutton.Location = new System.Drawing.Point(158, 197); + this.cancelbutton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelbutton.Location = new System.Drawing.Point(81, 102); this.cancelbutton.Name = "cancelbutton"; this.cancelbutton.Size = new System.Drawing.Size(99, 26); this.cancelbutton.TabIndex = 7; @@ -132,7 +114,7 @@ namespace CodeImp.DoomBuilder.TagRange // this.outoftagswarning.BackColor = System.Drawing.SystemColors.Info; this.outoftagswarning.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.outoftagswarning.Location = new System.Drawing.Point(12, 130); + this.outoftagswarning.Location = new System.Drawing.Point(12, 45); this.outoftagswarning.Name = "outoftagswarning"; this.outoftagswarning.Padding = new System.Windows.Forms.Padding(3); this.outoftagswarning.Size = new System.Drawing.Size(273, 50); @@ -143,7 +125,7 @@ namespace CodeImp.DoomBuilder.TagRange // endtaglabel // this.endtaglabel.AutoSize = true; - this.endtaglabel.Location = new System.Drawing.Point(110, 95); + this.endtaglabel.Location = new System.Drawing.Point(250, 17); this.endtaglabel.Name = "endtaglabel"; this.endtaglabel.Size = new System.Drawing.Size(13, 14); this.endtaglabel.TabIndex = 10; @@ -152,30 +134,30 @@ namespace CodeImp.DoomBuilder.TagRange // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(49, 95); + this.label4.Location = new System.Drawing.Point(189, 17); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(49, 14); + this.label4.Size = new System.Drawing.Size(48, 14); this.label4.TabIndex = 9; this.label4.Text = "End Tag:"; // // TagRangeForm // + this.AcceptButton = this.okbutton; this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.ClientSize = new System.Drawing.Size(298, 231); + this.CancelButton = this.cancelbutton; + this.ClientSize = new System.Drawing.Size(298, 134); this.Controls.Add(this.endtaglabel); this.Controls.Add(this.label4); this.Controls.Add(this.cancelbutton); this.Controls.Add(this.okbutton); this.Controls.Add(this.skipdoubletags); this.Controls.Add(this.doubletagwarning); - this.Controls.Add(this.itemcountlabel); - this.Controls.Add(this.label2); this.Controls.Add(this.label1); this.Controls.Add(this.rangestart); this.Controls.Add(this.outoftagswarning); this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "TagRangeForm"; @@ -193,8 +175,6 @@ namespace CodeImp.DoomBuilder.TagRange private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox rangestart; private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label itemcountlabel; private System.Windows.Forms.Label doubletagwarning; private System.Windows.Forms.CheckBox skipdoubletags; private System.Windows.Forms.Button okbutton; diff --git a/Source/Plugins/TagRange/TagRangeForm.cs b/Source/Plugins/TagRange/TagRangeForm.cs index 4544e58c..7772b9a4 100644 --- a/Source/Plugins/TagRange/TagRangeForm.cs +++ b/Source/Plugins/TagRange/TagRangeForm.cs @@ -32,23 +32,23 @@ namespace CodeImp.DoomBuilder.TagRange selectiontype = UniversalType.SectorTag; ICollection list = General.Map.Map.GetSelectedSectors(true); selectioncount = list.Count; + this.Text = "Create tag range for " + selectioncount + (selectioncount > 1 ? " sectors" : " sector"); } else if(modename == "LinedefsMode") { selectiontype = UniversalType.LinedefTag; ICollection list = General.Map.Map.GetSelectedLinedefs(true); selectioncount = list.Count; + this.Text = "Create tag range for " + selectioncount + (selectioncount > 1 ? " linedefs" : " linedef"); } else if(modename == "ThingsMode") { selectiontype = UniversalType.ThingTag; ICollection list = General.Map.Map.GetSelectedThings(true); selectioncount = list.Count; + this.Text = "Create tag range for " + selectioncount + (selectioncount > 1 ? " things" : " thing"); } - // Show number of selected items - itemcountlabel.Text = selectioncount.ToString(); - // Find out which tags are used usedtags = new Dictionary(); General.Map.Map.ForAllTags(TagHandler, false, usedtags); diff --git a/Source/Plugins/TagRange/TagRangeForm.resx b/Source/Plugins/TagRange/TagRangeForm.resx index 6f756533..ff31a6db 100644 --- a/Source/Plugins/TagRange/TagRangeForm.resx +++ b/Source/Plugins/TagRange/TagRangeForm.resx @@ -117,40 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - \ No newline at end of file