diff --git a/DS4Windows/DS4Forms/KBM360.Designer.cs b/DS4Windows/DS4Forms/KBM360.Designer.cs index 885de32..e9f4a4c 100644 --- a/DS4Windows/DS4Forms/KBM360.Designer.cs +++ b/DS4Windows/DS4Forms/KBM360.Designer.cs @@ -216,7 +216,6 @@ this.pnlDS4Controls = new System.Windows.Forms.Panel(); this.buttonTmp = new System.Windows.Forms.Button(); this.label1 = new System.Windows.Forms.Label(); - this.advColorDialog = new DS4Windows.AdvancedColorDialog(); ((System.ComponentModel.ISupportInitialize)(this.pBHighlight)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pBMouse)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nUDHeavy)).BeginInit(); @@ -1923,13 +1922,6 @@ resources.ApplyResources(this.label1, "label1"); this.label1.Name = "label1"; // - // advColorDialog - // - this.advColorDialog.AnyColor = true; - this.advColorDialog.Color = System.Drawing.Color.Blue; - this.advColorDialog.FullOpen = true; - this.advColorDialog.OnUpdateColor += new DS4Windows.AdvancedColorDialog.ColorUpdateHandler(this.advColorDialog_OnUpdateColor); - // // KBM360 // resources.ApplyResources(this, "$this"); @@ -2275,7 +2267,6 @@ private System.Windows.Forms.Label lbBlueV; private System.Windows.Forms.Label lbGreenV; private System.Windows.Forms.Label lbRedV; - private AdvancedColorDialog advColorDialog; private System.Windows.Forms.CheckBox cBMouse; private System.Windows.Forms.CheckBox cBLightbar; private System.Windows.Forms.RadioButton rBRegular; diff --git a/DS4Windows/DS4Forms/KBM360.cs b/DS4Windows/DS4Forms/KBM360.cs index e336b04..01b270e 100644 --- a/DS4Windows/DS4Forms/KBM360.cs +++ b/DS4Windows/DS4Forms/KBM360.cs @@ -28,10 +28,13 @@ namespace DS4Windows.Forms private bool extraChanged; private Bitmap pnl360BgImage; private Bitmap pnlDS4BgImage; + private AdvancedColorDialog advColorDialog; public KBM360(int deviceNum, Options ooo, Button buton) { InitializeComponent(); + advColorDialog = new AdvancedColorDialog(); + this.advColorDialog.OnUpdateColor += new AdvancedColorDialog.ColorUpdateHandler(this.advColorDialog_OnUpdateColor); pnl360BgImage = (Bitmap)Properties.Resources._360_map.Clone(); //pnl360Controls.BackgroundImage = null; //pnl360Controls.BackgroundImageLayout = ImageLayout.None; diff --git a/DS4Windows/DS4Forms/KBM360.resx b/DS4Windows/DS4Forms/KBM360.resx index 9bbc153..6d5fe7b 100644 --- a/DS4Windows/DS4Forms/KBM360.resx +++ b/DS4Windows/DS4Forms/KBM360.resx @@ -5197,93 +5197,6 @@ a key by typing it 6 - - cBMouse - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gBExtras - - - 1 - - - cBLightbar - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gBExtras - - - 2 - - - lbBlueV - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gBExtras - - - 7 - - - lbGreenV - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gBExtras - - - 8 - - - lbRedV - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gBExtras - - - 9 - - - Right - - - 871, 0 - - - 167, 446 - - - 324 - - - Extras - - - gBExtras - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 5 - BottomRight @@ -5446,6 +5359,33 @@ a key by typing it 9 + + Right + + + 871, 0 + + + 167, 446 + + + 324 + + + Extras + + + gBExtras + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + True @@ -5617,6 +5557,27 @@ a key by typing it Zoom + + True + + + NoControl + + + 467, 24 + + + 14, 13 + + + 323 + + + A + + + False + lb360Tip @@ -5653,39 +5614,6 @@ a key by typing it 1 - - True - - - NoControl - - - 467, 24 - - - 14, 13 - - - 323 - - - A - - - False - - - lb360Tip - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pnl360Controls - - - 0 - Zoom @@ -5773,9 +5701,6 @@ a key by typing it 0 - - 17, 17 - True @@ -5785,21 +5710,12 @@ a key by typing it 1038, 446 - - NoControl - CenterParent Keybaord - - advColorDialog - - - DS4Windows.AdvancedColorDialog, DS4Windows, Version=1.7.3.0, Culture=neutral, PublicKeyToken=null - KBM360