The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-11-23 01:39:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Take Color Dialog out of KB360 form

Browse Source 
Form can now be designed in x64 mode
This commit is contained in:
Travis Nickles 2019-06-29 21:36:54 -05:00
parent 2295434c02
commit a09b06cb28
3 changed files with 51 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
DS4Windows/DS4Forms/KBM360.Designer.cs generated
View File

@ -216,7 +216,6 @@
this.pnlDS4Controls = new System.Windows.Forms.Panel(); this.pnlDS4Controls = new System.Windows.Forms.Panel();
this.buttonTmp = new System.Windows.Forms.Button(); this.buttonTmp = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.advColorDialog = new DS4Windows.AdvancedColorDialog();
((System.ComponentModel.ISupportInitialize)(this.pBHighlight)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pBHighlight)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pBMouse)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pBMouse)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nUDHeavy)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nUDHeavy)).BeginInit();
@ -1923,13 +1922,6 @@
resources.ApplyResources(this.label1, "label1"); resources.ApplyResources(this.label1, "label1");
this.label1.Name = "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 // KBM360
// //
resources.ApplyResources(this, "$this"); resources.ApplyResources(this, "$this");
@ -2275,7 +2267,6 @@
private System.Windows.Forms.Label lbBlueV; private System.Windows.Forms.Label lbBlueV;
private System.Windows.Forms.Label lbGreenV; private System.Windows.Forms.Label lbGreenV;
private System.Windows.Forms.Label lbRedV; private System.Windows.Forms.Label lbRedV;
private AdvancedColorDialog advColorDialog;
private System.Windows.Forms.CheckBox cBMouse; private System.Windows.Forms.CheckBox cBMouse;
private System.Windows.Forms.CheckBox cBLightbar; private System.Windows.Forms.CheckBox cBLightbar;
private System.Windows.Forms.RadioButton rBRegular; private System.Windows.Forms.RadioButton rBRegular;

3
DS4Windows/DS4Forms/KBM360.cs
View File

@ -28,10 +28,13 @@ namespace DS4Windows.Forms
private bool extraChanged; private bool extraChanged;
private Bitmap pnl360BgImage; private Bitmap pnl360BgImage;
private Bitmap pnlDS4BgImage; private Bitmap pnlDS4BgImage;
private AdvancedColorDialog advColorDialog;
public KBM360(int deviceNum, Options ooo, Button buton) public KBM360(int deviceNum, Options ooo, Button buton)
{ {
InitializeComponent(); InitializeComponent();
advColorDialog = new AdvancedColorDialog();
this.advColorDialog.OnUpdateColor += new AdvancedColorDialog.ColorUpdateHandler(this.advColorDialog_OnUpdateColor);
pnl360BgImage = (Bitmap)Properties.Resources._360_map.Clone(); pnl360BgImage = (Bitmap)Properties.Resources._360_map.Clone();
//pnl360Controls.BackgroundImage = null; //pnl360Controls.BackgroundImage = null;
//pnl360Controls.BackgroundImageLayout = ImageLayout.None; //pnl360Controls.BackgroundImageLayout = ImageLayout.None;

180
DS4Windows/DS4Forms/KBM360.resx
View File

@ -5197,93 +5197,6 @@ a key by typing it</value>
<data name="&gt;&gt;btnESC.ZOrder" xml:space="preserve"> <data name="&gt;&gt;btnESC.ZOrder" xml:space="preserve">
<value>6</value> <value>6</value>
</data> </data>
<data name="&gt;&gt;cBMouse.Name" xml:space="preserve">
<value>cBMouse</value>
</data>
<data name="&gt;&gt;cBMouse.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;cBMouse.Parent" xml:space="preserve">
<value>gBExtras</value>
</data>
<data name="&gt;&gt;cBMouse.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="&gt;&gt;cBLightbar.Name" xml:space="preserve">
<value>cBLightbar</value>
</data>
<data name="&gt;&gt;cBLightbar.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;cBLightbar.Parent" xml:space="preserve">
<value>gBExtras</value>
</data>
<data name="&gt;&gt;cBLightbar.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="&gt;&gt;lbBlueV.Name" xml:space="preserve">
<value>lbBlueV</value>
</data>
<data name="&gt;&gt;lbBlueV.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lbBlueV.Parent" xml:space="preserve">
<value>gBExtras</value>
</data>
<data name="&gt;&gt;lbBlueV.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="&gt;&gt;lbGreenV.Name" xml:space="preserve">
<value>lbGreenV</value>
</data>
<data name="&gt;&gt;lbGreenV.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lbGreenV.Parent" xml:space="preserve">
<value>gBExtras</value>
</data>
<data name="&gt;&gt;lbGreenV.ZOrder" xml:space="preserve">
<value>8</value>
</data>
<data name="&gt;&gt;lbRedV.Name" xml:space="preserve">
<value>lbRedV</value>
</data>
<data name="&gt;&gt;lbRedV.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lbRedV.Parent" xml:space="preserve">
<value>gBExtras</value>
</data>
<data name="&gt;&gt;lbRedV.ZOrder" xml:space="preserve">
<value>9</value>
</data>
<data name="gBExtras.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Right</value>
</data>
<data name="gBExtras.Location" type="System.Drawing.Point, System.Drawing">
<value>871, 0</value>
</data>
<data name="gBExtras.Size" type="System.Drawing.Size, System.Drawing">
<value>167, 446</value>
</data>
<data name="gBExtras.TabIndex" type="System.Int32, mscorlib">
<value>324</value>
</data>
<data name="gBExtras.Text" xml:space="preserve">
<value>Extras</value>
</data>
<data name="&gt;&gt;gBExtras.Name" xml:space="preserve">
<value>gBExtras</value>
</data>
<data name="&gt;&gt;gBExtras.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;gBExtras.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;gBExtras.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="cBMouse.CheckAlign" type="System.Drawing.ContentAlignment, System.Drawing"> <data name="cBMouse.CheckAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>BottomRight</value> <value>BottomRight</value>
</data> </data>
@ -5446,6 +5359,33 @@ a key by typing it</value>
<data name="&gt;&gt;lbRedV.ZOrder" xml:space="preserve"> <data name="&gt;&gt;lbRedV.ZOrder" xml:space="preserve">
<value>9</value> <value>9</value>
</data> </data>
<data name="gBExtras.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Right</value>
</data>
<data name="gBExtras.Location" type="System.Drawing.Point, System.Drawing">
<value>871, 0</value>
</data>
<data name="gBExtras.Size" type="System.Drawing.Size, System.Drawing">
<value>167, 446</value>
</data>
<data name="gBExtras.TabIndex" type="System.Int32, mscorlib">
<value>324</value>
</data>
<data name="gBExtras.Text" xml:space="preserve">
<value>Extras</value>
</data>
<data name="&gt;&gt;gBExtras.Name" xml:space="preserve">
<value>gBExtras</value>
</data>
<data name="&gt;&gt;gBExtras.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;gBExtras.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;gBExtras.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="rBRegular.AutoSize" type="System.Boolean, mscorlib"> <data name="rBRegular.AutoSize" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</data> </data>
@ -5617,6 +5557,27 @@ a key by typing it</value>
<data name="pnl360Controls.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms"> <data name="pnl360Controls.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>Zoom</value> <value>Zoom</value>
</data> </data>
<data name="lb360Tip.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lb360Tip.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="lb360Tip.Location" type="System.Drawing.Point, System.Drawing">
<value>467, 24</value>
</data>
<data name="lb360Tip.Size" type="System.Drawing.Size, System.Drawing">
<value>14, 13</value>
</data>
<data name="lb360Tip.TabIndex" type="System.Int32, mscorlib">
<value>323</value>
</data>
<data name="lb360Tip.Text" xml:space="preserve">
<value>A</value>
</data>
<data name="lb360Tip.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;lb360Tip.Name" xml:space="preserve"> <data name="&gt;&gt;lb360Tip.Name" xml:space="preserve">
<value>lb360Tip</value> <value>lb360Tip</value>
</data> </data>
@ -5653,39 +5614,6 @@ a key by typing it</value>
<data name="&gt;&gt;pnl360Controls.ZOrder" xml:space="preserve"> <data name="&gt;&gt;pnl360Controls.ZOrder" xml:space="preserve">
<value>1</value> <value>1</value>
</data> </data>
<data name="lb360Tip.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lb360Tip.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="lb360Tip.Location" type="System.Drawing.Point, System.Drawing">
<value>467, 24</value>
</data>
<data name="lb360Tip.Size" type="System.Drawing.Size, System.Drawing">
<value>14, 13</value>
</data>
<data name="lb360Tip.TabIndex" type="System.Int32, mscorlib">
<value>323</value>
</data>
<data name="lb360Tip.Text" xml:space="preserve">
<value>A</value>
</data>
<data name="lb360Tip.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;lb360Tip.Name" xml:space="preserve">
<value>lb360Tip</value>
</data>
<data name="&gt;&gt;lb360Tip.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lb360Tip.Parent" xml:space="preserve">
<value>pnl360Controls</value>
</data>
<data name="&gt;&gt;lb360Tip.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="pnlDS4Controls.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms"> <data name="pnlDS4Controls.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>Zoom</value> <value>Zoom</value>
</data> </data>
@ -5773,9 +5701,6 @@ a key by typing it</value>
<data name="&gt;&gt;pnlDS4Controls.ZOrder" xml:space="preserve"> <data name="&gt;&gt;pnlDS4Controls.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </data>
<metadata name="advColorDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
@ -5785,21 +5710,12 @@ a key by typing it</value>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing"> <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>1038, 446</value> <value>1038, 446</value>
</data> </data>
<data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms"> <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterParent</value> <value>CenterParent</value>
</data> </data>
<data name="$this.Text" xml:space="preserve"> <data name="$this.Text" xml:space="preserve">
<value>Keybaord</value> <value>Keybaord</value>
</data> </data>
<data name="&gt;&gt;advColorDialog.Name" xml:space="preserve">
<value>advColorDialog</value>
</data>
<data name="&gt;&gt;advColorDialog.Type" xml:space="preserve">
<value>DS4Windows.AdvancedColorDialog, DS4Windows, Version=1.7.3.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve"> <data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>KBM360</value> <value>KBM360</value>
</data> </data>