From 03265d7d5d361d2f63854c32b53999eae37d952b Mon Sep 17 00:00:00 2001 From: MaxED <j.maxed@gmail.com> Date: Thu, 27 Aug 2015 22:55:01 +0000 Subject: [PATCH] Replaced Dotnetrix.TrackBar with the built-in version. No change in functionality. Removed Trackbar.dll. --- Build/Trackbar.dll | Bin 32768 -> 0 bytes Source/Core/Builder.csproj | 3 - .../Core/Windows/PreferencesForm.Designer.cs | 70 ++++++++++-------- .../Controls/IntControl.designer.cs | 4 +- Source/Plugins/ColorPicker/ColorPicker.csproj | 5 -- .../Controls/ColorPickerSlider.Designer.cs | 6 +- 6 files changed, 45 insertions(+), 43 deletions(-) delete mode 100644 Build/Trackbar.dll diff --git a/Build/Trackbar.dll b/Build/Trackbar.dll deleted file mode 100644 index 527d35cf2c661a4c63519d6e0a0ffb531d5f9f9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32768 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 diff --git a/Source/Core/Builder.csproj b/Source/Core/Builder.csproj index ea98ca36d..b10b014aa 100644 --- a/Source/Core/Builder.csproj +++ b/Source/Core/Builder.csproj @@ -519,9 +519,6 @@ <Reference Include="System.Drawing" /> <Reference Include="System.Windows.Forms" /> <Reference Include="System.Xml" /> - <Reference Include="Trackbar, Version=1.0.2486.37933, Culture=neutral, PublicKeyToken=503bf28f63ad27b4"> - <Private>False</Private> - </Reference> </ItemGroup> <ItemGroup> <EmbeddedResource Include="GZBuilder\Controls\PairedFloatControl.resx"> diff --git a/Source/Core/Windows/PreferencesForm.Designer.cs b/Source/Core/Windows/PreferencesForm.Designer.cs index c70cfe414..e595f17fc 100644 --- a/Source/Core/Windows/PreferencesForm.Designer.cs +++ b/Source/Core/Windows/PreferencesForm.Designer.cs @@ -42,22 +42,22 @@ namespace CodeImp.DoomBuilder.Windows this.checkforupdates = new System.Windows.Forms.CheckBox(); this.cbStoreEditTab = new System.Windows.Forms.CheckBox(); this.locatetexturegroup = new System.Windows.Forms.CheckBox(); - this.recentFiles = new Dotnetrix.Controls.TrackBar(); + this.recentFiles = new System.Windows.Forms.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(); + this.vertexScale = new System.Windows.Forms.TrackBar(); this.cbSynchCameras = new System.Windows.Forms.CheckBox(); this.showtexturesizes = new System.Windows.Forms.CheckBox(); this.scriptontop = new System.Windows.Forms.CheckBox(); - this.zoomfactor = new Dotnetrix.Controls.TrackBar(); + this.zoomfactor = new System.Windows.Forms.TrackBar(); this.zoomfactorlabel = new System.Windows.Forms.Label(); this.label19 = new System.Windows.Forms.Label(); - this.autoscrollspeed = new Dotnetrix.Controls.TrackBar(); + this.autoscrollspeed = new System.Windows.Forms.TrackBar(); this.autoscrollspeedlabel = new System.Windows.Forms.Label(); this.label15 = new System.Windows.Forms.Label(); - this.previewsize = new Dotnetrix.Controls.TrackBar(); + this.previewsize = new System.Windows.Forms.TrackBar(); this.previewsizelabel = new System.Windows.Forms.Label(); this.label12 = new System.Windows.Forms.Label(); this.label14 = new System.Windows.Forms.Label(); @@ -67,7 +67,7 @@ namespace CodeImp.DoomBuilder.Windows this.color3dFloors = new CodeImp.DoomBuilder.Controls.ColorControl(); this.colorInfo = new CodeImp.DoomBuilder.Controls.ColorControl(); this.colorMD3 = new CodeImp.DoomBuilder.Controls.ColorControl(); - this.doublesidedalpha = new Dotnetrix.Controls.TrackBar(); + this.doublesidedalpha = new System.Windows.Forms.TrackBar(); this.colorgrid64 = new CodeImp.DoomBuilder.Controls.ColorControl(); this.colorgrid = new CodeImp.DoomBuilder.Controls.ColorControl(); this.colorindication = new CodeImp.DoomBuilder.Controls.ColorControl(); @@ -104,13 +104,13 @@ namespace CodeImp.DoomBuilder.Windows this.dockersposition = new System.Windows.Forms.ComboBox(); this.label17 = new System.Windows.Forms.Label(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.vertexScale3D = new Dotnetrix.Controls.TrackBar(); + this.vertexScale3D = new System.Windows.Forms.TrackBar(); this.vertexScale3DLabel = new System.Windows.Forms.Label(); this.label26 = new System.Windows.Forms.Label(); - this.viewdistance = new Dotnetrix.Controls.TrackBar(); - this.movespeed = new Dotnetrix.Controls.TrackBar(); - this.mousespeed = new Dotnetrix.Controls.TrackBar(); - this.fieldofview = new Dotnetrix.Controls.TrackBar(); + this.viewdistance = new System.Windows.Forms.TrackBar(); + this.movespeed = new System.Windows.Forms.TrackBar(); + this.mousespeed = new System.Windows.Forms.TrackBar(); + this.fieldofview = new System.Windows.Forms.TrackBar(); this.viewdistancelabel = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); this.invertyaxis = new System.Windows.Forms.CheckBox(); @@ -141,17 +141,17 @@ namespace CodeImp.DoomBuilder.Windows this.cbMarkExtraFloors = new System.Windows.Forms.CheckBox(); this.cbOldHighlightMode = new System.Windows.Forms.CheckBox(); this.labelDynLightIntensity = new System.Windows.Forms.Label(); - this.tbDynLightIntensity = new Dotnetrix.Controls.TrackBar(); + this.tbDynLightIntensity = new System.Windows.Forms.TrackBar(); this.labelDynLightSize = new System.Windows.Forms.Label(); - this.tbDynLightSize = new Dotnetrix.Controls.TrackBar(); + this.tbDynLightSize = new System.Windows.Forms.TrackBar(); this.labelDynLightCount = new System.Windows.Forms.Label(); - this.tbDynLightCount = new Dotnetrix.Controls.TrackBar(); + this.tbDynLightCount = new System.Windows.Forms.TrackBar(); this.animatevisualselection = new System.Windows.Forms.CheckBox(); this.blackbrowsers = new System.Windows.Forms.CheckBox(); this.visualbilinear = new System.Windows.Forms.CheckBox(); this.classicbilinear = new System.Windows.Forms.CheckBox(); this.imagebrightnesslabel = new System.Windows.Forms.Label(); - this.imagebrightness = new Dotnetrix.Controls.TrackBar(); + this.imagebrightness = new System.Windows.Forms.TrackBar(); this.colorsgroup3 = new System.Windows.Forms.GroupBox(); this.snippetsallmanstyle = new System.Windows.Forms.CheckBox(); this.scripttabwidth = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox(); @@ -307,6 +307,7 @@ namespace CodeImp.DoomBuilder.Windows // // recentFiles // + this.recentFiles.BackColor = System.Drawing.SystemColors.Window; this.recentFiles.LargeChange = 1; this.recentFiles.Location = new System.Drawing.Point(127, 233); this.recentFiles.Maximum = 25; @@ -358,6 +359,7 @@ namespace CodeImp.DoomBuilder.Windows // // vertexScale // + this.vertexScale.BackColor = System.Drawing.SystemColors.Window; this.vertexScale.LargeChange = 1; this.vertexScale.Location = new System.Drawing.Point(127, 186); this.vertexScale.Minimum = 1; @@ -400,6 +402,7 @@ namespace CodeImp.DoomBuilder.Windows // // zoomfactor // + this.zoomfactor.BackColor = System.Drawing.SystemColors.Window; this.zoomfactor.LargeChange = 1; this.zoomfactor.Location = new System.Drawing.Point(127, 139); this.zoomfactor.Minimum = 1; @@ -430,6 +433,7 @@ namespace CodeImp.DoomBuilder.Windows // // autoscrollspeed // + this.autoscrollspeed.BackColor = System.Drawing.SystemColors.Window; this.autoscrollspeed.LargeChange = 1; this.autoscrollspeed.Location = new System.Drawing.Point(127, 92); this.autoscrollspeed.Maximum = 5; @@ -459,6 +463,7 @@ namespace CodeImp.DoomBuilder.Windows // // previewsize // + this.previewsize.BackColor = System.Drawing.SystemColors.Window; this.previewsize.LargeChange = 1; this.previewsize.Location = new System.Drawing.Point(127, 45); this.previewsize.Maximum = 5; @@ -1049,6 +1054,7 @@ namespace CodeImp.DoomBuilder.Windows // // vertexScale3D // + this.vertexScale3D.BackColor = System.Drawing.SystemColors.Window; this.vertexScale3D.LargeChange = 1; this.vertexScale3D.Location = new System.Drawing.Point(116, 181); this.vertexScale3D.Maximum = 15; @@ -1081,6 +1087,7 @@ namespace CodeImp.DoomBuilder.Windows // // viewdistance // + this.viewdistance.BackColor = System.Drawing.SystemColors.Window; this.viewdistance.LargeChange = 2; this.viewdistance.Location = new System.Drawing.Point(116, 230); this.viewdistance.Maximum = 45; @@ -1095,6 +1102,7 @@ namespace CodeImp.DoomBuilder.Windows // // movespeed // + this.movespeed.BackColor = System.Drawing.SystemColors.Window; this.movespeed.Location = new System.Drawing.Point(116, 131); this.movespeed.Maximum = 20; this.movespeed.Minimum = 1; @@ -1107,6 +1115,7 @@ namespace CodeImp.DoomBuilder.Windows // // mousespeed // + this.mousespeed.BackColor = System.Drawing.SystemColors.Window; this.mousespeed.Location = new System.Drawing.Point(116, 79); this.mousespeed.Maximum = 20; this.mousespeed.Minimum = 1; @@ -1119,6 +1128,7 @@ namespace CodeImp.DoomBuilder.Windows // // fieldofview // + this.fieldofview.BackColor = System.Drawing.SystemColors.Window; this.fieldofview.LargeChange = 1; this.fieldofview.Location = new System.Drawing.Point(116, 29); this.fieldofview.Maximum = 17; @@ -1998,22 +2008,22 @@ namespace CodeImp.DoomBuilder.Windows private System.Windows.Forms.CheckBox invertyaxis; private System.Windows.Forms.ComboBox defaultviewmode; private System.Windows.Forms.Label label14; - private Dotnetrix.Controls.TrackBar fieldofview; - private Dotnetrix.Controls.TrackBar movespeed; - private Dotnetrix.Controls.TrackBar mousespeed; - private Dotnetrix.Controls.TrackBar viewdistance; - private Dotnetrix.Controls.TrackBar doublesidedalpha; - private Dotnetrix.Controls.TrackBar imagebrightness; + private System.Windows.Forms.TrackBar fieldofview; + private System.Windows.Forms.TrackBar movespeed; + private System.Windows.Forms.TrackBar mousespeed; + private System.Windows.Forms.TrackBar viewdistance; + private System.Windows.Forms.TrackBar doublesidedalpha; + private System.Windows.Forms.TrackBar imagebrightness; private System.Windows.Forms.Label disregardshiftlabel; private System.Windows.Forms.ListBox keyusedlist; private System.Windows.Forms.Label keyusedlabel; private System.Windows.Forms.CheckBox qualitydisplay; private System.Windows.Forms.CheckBox visualbilinear; private System.Windows.Forms.CheckBox classicbilinear; - private Dotnetrix.Controls.TrackBar previewsize; + private System.Windows.Forms.TrackBar previewsize; private System.Windows.Forms.Label previewsizelabel; private System.Windows.Forms.Label label12; - private Dotnetrix.Controls.TrackBar autoscrollspeed; + private System.Windows.Forms.TrackBar autoscrollspeed; private System.Windows.Forms.Label autoscrollspeedlabel; private System.Windows.Forms.Label label15; private System.Windows.Forms.CheckBox animatevisualselection; @@ -2025,7 +2035,7 @@ namespace CodeImp.DoomBuilder.Windows private System.Windows.Forms.ComboBox dockersposition; private System.Windows.Forms.Label label17; private System.Windows.Forms.CheckBox collapsedockers; - private Dotnetrix.Controls.TrackBar zoomfactor; + private System.Windows.Forms.TrackBar zoomfactor; private System.Windows.Forms.Label zoomfactorlabel; private System.Windows.Forms.Label label19; private System.Windows.Forms.GroupBox groupBox5; @@ -2051,15 +2061,15 @@ namespace CodeImp.DoomBuilder.Windows private CodeImp.DoomBuilder.Controls.ColorControl colorMD3; private System.Windows.Forms.CheckBox toolbar_gzdoom; private System.Windows.Forms.Label labelDynLightCount; - private Dotnetrix.Controls.TrackBar tbDynLightCount; + private System.Windows.Forms.TrackBar tbDynLightCount; private System.Windows.Forms.Label labelDynLightSize; - private Dotnetrix.Controls.TrackBar tbDynLightSize; + private System.Windows.Forms.TrackBar tbDynLightSize; private System.Windows.Forms.Label labelDynLightIntensity; - private Dotnetrix.Controls.TrackBar tbDynLightIntensity; + private System.Windows.Forms.TrackBar tbDynLightIntensity; private System.Windows.Forms.CheckBox cbSynchCameras; private System.Windows.Forms.CheckBox cbStretchView; private System.Windows.Forms.ToolTip toolTip1; - private Dotnetrix.Controls.TrackBar vertexScale; + private System.Windows.Forms.TrackBar vertexScale; private System.Windows.Forms.Label vertexScaleLabel; private System.Windows.Forms.Label label22; private CodeImp.DoomBuilder.Controls.ColorControl colorInfo; @@ -2071,7 +2081,7 @@ namespace CodeImp.DoomBuilder.Windows private System.Windows.Forms.TextBox actiondescription; private System.Windows.Forms.RichTextBox fontpreview; private System.Windows.Forms.CheckBox cbMarkExtraFloors; - private Dotnetrix.Controls.TrackBar recentFiles; + private System.Windows.Forms.TrackBar recentFiles; private System.Windows.Forms.Label labelRecentFiles; private System.Windows.Forms.Label label25; private System.Windows.Forms.CheckBox snippetsallmanstyle; @@ -2081,7 +2091,7 @@ namespace CodeImp.DoomBuilder.Windows private System.Windows.Forms.TextBox screenshotsfolderpath; private System.Windows.Forms.Button resetscreenshotsdir; private System.Windows.Forms.FolderBrowserDialog browseScreenshotsFolderDialog; - private Dotnetrix.Controls.TrackBar vertexScale3D; + private System.Windows.Forms.TrackBar vertexScale3D; private System.Windows.Forms.Label vertexScale3DLabel; private System.Windows.Forms.Label label26; private System.Windows.Forms.CheckBox locatetexturegroup; diff --git a/Source/Plugins/BuilderEffects/Controls/IntControl.designer.cs b/Source/Plugins/BuilderEffects/Controls/IntControl.designer.cs index 6a9a0e323..3f1a6aaf4 100644 --- a/Source/Plugins/BuilderEffects/Controls/IntControl.designer.cs +++ b/Source/Plugins/BuilderEffects/Controls/IntControl.designer.cs @@ -27,7 +27,7 @@ /// </summary> private void InitializeComponent() { - this.trackBar1 = new Dotnetrix.Controls.TrackBar(); + this.trackBar1 = new System.Windows.Forms.TrackBar(); this.label1 = new System.Windows.Forms.Label(); this.numericUpDown1 = new CodeImp.DoomBuilder.BuilderEffects.NumericUpDownEx(); this.labelMaximum = new System.Windows.Forms.Label(); @@ -97,7 +97,7 @@ #endregion - private Dotnetrix.Controls.TrackBar trackBar1; + private System.Windows.Forms.TrackBar trackBar1; private System.Windows.Forms.Label label1; private NumericUpDownEx numericUpDown1; private System.Windows.Forms.Label labelMaximum; diff --git a/Source/Plugins/ColorPicker/ColorPicker.csproj b/Source/Plugins/ColorPicker/ColorPicker.csproj index 53510bd45..cadfbb265 100644 --- a/Source/Plugins/ColorPicker/ColorPicker.csproj +++ b/Source/Plugins/ColorPicker/ColorPicker.csproj @@ -41,11 +41,6 @@ </Reference> <Reference Include="System.Drawing" /> <Reference Include="System.Windows.Forms" /> - <Reference Include="Trackbar, Version=1.0.2486.37933, Culture=neutral, PublicKeyToken=503bf28f63ad27b4"> - <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\Build\Trackbar.dll</HintPath> - <Private>False</Private> - </Reference> </ItemGroup> <ItemGroup> <Compile Include="BuilderPlug.cs" /> diff --git a/Source/Plugins/ColorPicker/Controls/ColorPickerSlider.Designer.cs b/Source/Plugins/ColorPicker/Controls/ColorPickerSlider.Designer.cs index d30500879..8c56b0cb2 100644 --- a/Source/Plugins/ColorPicker/Controls/ColorPickerSlider.Designer.cs +++ b/Source/Plugins/ColorPicker/Controls/ColorPickerSlider.Designer.cs @@ -24,7 +24,7 @@ /// </summary> private void InitializeComponent() { this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); - this.trackBar1 = new Dotnetrix.Controls.TrackBar(); + this.trackBar1 = new System.Windows.Forms.TrackBar(); this.label1 = new System.Windows.Forms.Label(); this.labelMin = new System.Windows.Forms.Label(); this.labelMax = new System.Windows.Forms.Label(); @@ -55,7 +55,7 @@ // // label1 // - this.label1.Location = new System.Drawing.Point(3, 15); + this.label1.Location = new System.Drawing.Point(3, 17); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(106, 14); this.label1.TabIndex = 3; @@ -101,7 +101,7 @@ #endregion private System.Windows.Forms.NumericUpDown numericUpDown1; - private Dotnetrix.Controls.TrackBar trackBar1; + private System.Windows.Forms.TrackBar trackBar1; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label labelMin; private System.Windows.Forms.Label labelMax; -- GitLab