mirror of
https://github.com/cemu-project/DS4Windows.git
synced 2024-12-26 16:41:50 +01:00
Removed color dialog dep from design for some forms
Allows using the designer for x64 target for some forms
This commit is contained in:
Travis Nickles
parent
ddb4ca96ba
commit
3473fe1dc9
@ -8,7 +8,6 @@ using System.Windows.Forms;
|
||||
namespace DS4Windows
|
||||
{
|
||||
[SuppressUnmanagedCodeSecurity]
|
||||
[System.ComponentModel.DesignerCategory("")]
|
||||
public class AdvancedColorDialog : ColorDialog
|
||||
{
|
||||
#region WinAPI
|
||||
@ -18,6 +17,7 @@ namespace DS4Windows
|
||||
public string ClassName;
|
||||
public string MainWindowTitle;
|
||||
}
|
||||
[SuppressUnmanagedCodeSecurity]
|
||||
internal class WindowsEnumerator
|
||||
{
|
||||
private delegate int EnumCallBackDelegate(IntPtr hwnd, int lParam);
|
||||
|
||||
14
DS4Windows/DS4Forms/DS4Form.Designer.cs
generated
14
DS4Windows/DS4Forms/DS4Form.Designer.cs
generated
@ -155,6 +155,7 @@
|
||||
this.ckUdpServ = new System.Windows.Forms.CheckBox();
|
||||
this.nUDUdpPortNum = new System.Windows.Forms.NumericUpDown();
|
||||
this.tBUdpListenAddress = new System.Windows.Forms.TextBox();
|
||||
this.langPanel = new System.Windows.Forms.Panel();
|
||||
this.cBCustomSteam = new System.Windows.Forms.CheckBox();
|
||||
this.tBSteamFolder = new System.Windows.Forms.TextBox();
|
||||
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
|
||||
@ -171,8 +172,6 @@
|
||||
this.cMCustomLed = new System.Windows.Forms.ContextMenuStrip(this.components);
|
||||
this.useProfileColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.useCustomColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.advColorDialog = new DS4Windows.AdvancedColorDialog();
|
||||
this.langPanel = new System.Windows.Forms.Panel();
|
||||
this.pnlButton.SuspendLayout();
|
||||
this.cMTaskbar.SuspendLayout();
|
||||
this.tabMain.SuspendLayout();
|
||||
@ -1213,6 +1212,11 @@
|
||||
resources.ApplyResources(this.tBUdpListenAddress, "tBUdpListenAddress");
|
||||
this.tBUdpListenAddress.Name = "tBUdpListenAddress";
|
||||
//
|
||||
// langPanel
|
||||
//
|
||||
resources.ApplyResources(this.langPanel, "langPanel");
|
||||
this.langPanel.Name = "langPanel";
|
||||
//
|
||||
// cBCustomSteam
|
||||
//
|
||||
resources.ApplyResources(this.cBCustomSteam, "cBCustomSteam");
|
||||
@ -1324,11 +1328,6 @@
|
||||
resources.ApplyResources(this.useCustomColorToolStripMenuItem, "useCustomColorToolStripMenuItem");
|
||||
this.useCustomColorToolStripMenuItem.Click += new System.EventHandler(this.useCustomColorToolStripMenuItem_Click);
|
||||
//
|
||||
// langPanel
|
||||
//
|
||||
resources.ApplyResources(this.langPanel, "langPanel");
|
||||
this.langPanel.Name = "langPanel";
|
||||
//
|
||||
// DS4Form
|
||||
//
|
||||
resources.ApplyResources(this, "$this");
|
||||
@ -1495,7 +1494,6 @@
|
||||
private System.Windows.Forms.ContextMenuStrip cMCustomLed;
|
||||
private System.Windows.Forms.ToolStripMenuItem useProfileColorToolStripMenuItem;
|
||||
private System.Windows.Forms.ToolStripMenuItem useCustomColorToolStripMenuItem;
|
||||
private AdvancedColorDialog advColorDialog;
|
||||
private System.Windows.Forms.CheckBox cBUseWhiteIcon;
|
||||
private System.Windows.Forms.Panel runStartupPanel;
|
||||
private System.Windows.Forms.Label label1;
|
||||
|
||||
@ -58,6 +58,7 @@ namespace DS4Windows.Forms
|
||||
private IntPtr regHandle = new IntPtr();
|
||||
private ManagementEventWatcher managementEvWatcher;
|
||||
private DS4Forms.LanguagePackComboBox languagePackComboBox1;
|
||||
private AdvancedColorDialog advColorDialog;
|
||||
Dictionary<Control, string> hoverTextDict = new Dictionary<Control, string>();
|
||||
// 0 index is used for application version text. 1 - 4 indices are used for controller status
|
||||
string[] notifyText = new string[5]
|
||||
@ -97,6 +98,7 @@ namespace DS4Windows.Forms
|
||||
Global.SetCulture(UseLang);
|
||||
|
||||
InitializeComponent();
|
||||
advColorDialog = new AdvancedColorDialog();
|
||||
|
||||
this.languagePackComboBox1 = new DS4Forms.LanguagePackComboBox();
|
||||
this.languagePackComboBox1.AutoValidate = System.Windows.Forms.AutoValidate.Disable;
|
||||
|
||||
@ -445,10 +445,10 @@
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="bnLight3.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>739, 89</value>
|
||||
<value>737, 89</value>
|
||||
</data>
|
||||
<data name="bnLight3.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>154, 22</value>
|
||||
<value>156, 22</value>
|
||||
</data>
|
||||
<data name="bnLight3.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>50</value>
|
||||
@ -472,7 +472,7 @@
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="pBStatus1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>341, 34</value>
|
||||
<value>340, 34</value>
|
||||
</data>
|
||||
<data name="pBStatus1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>39, 20</value>
|
||||
@ -574,7 +574,7 @@
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="bnEditC3.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>699, 89</value>
|
||||
<value>697, 89</value>
|
||||
</data>
|
||||
<data name="bnEditC3.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>34, 22</value>
|
||||
@ -604,7 +604,7 @@
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="bnEditC4.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>699, 117</value>
|
||||
<value>697, 117</value>
|
||||
</data>
|
||||
<data name="bnEditC4.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>34, 22</value>
|
||||
@ -703,7 +703,7 @@
|
||||
<value>None</value>
|
||||
</data>
|
||||
<data name="cBController1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>582, 33</value>
|
||||
<value>580, 33</value>
|
||||
</data>
|
||||
<data name="cBController1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>111, 21</value>
|
||||
@ -730,7 +730,7 @@
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="bnEditC2.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>699, 61</value>
|
||||
<value>697, 61</value>
|
||||
</data>
|
||||
<data name="bnEditC2.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>34, 22</value>
|
||||
@ -757,7 +757,7 @@
|
||||
<value>None</value>
|
||||
</data>
|
||||
<data name="cBController2.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>582, 61</value>
|
||||
<value>580, 61</value>
|
||||
</data>
|
||||
<data name="cBController2.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>111, 21</value>
|
||||
@ -781,7 +781,7 @@
|
||||
<value>None</value>
|
||||
</data>
|
||||
<data name="cBController3.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>582, 89</value>
|
||||
<value>580, 89</value>
|
||||
</data>
|
||||
<data name="cBController3.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>111, 21</value>
|
||||
@ -808,7 +808,7 @@
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="bnEditC1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>699, 33</value>
|
||||
<value>697, 33</value>
|
||||
</data>
|
||||
<data name="bnEditC1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>34, 22</value>
|
||||
@ -835,7 +835,7 @@
|
||||
<value>None</value>
|
||||
</data>
|
||||
<data name="cBController4.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>582, 117</value>
|
||||
<value>580, 117</value>
|
||||
</data>
|
||||
<data name="cBController4.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>111, 21</value>
|
||||
@ -868,7 +868,7 @@
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="lbSelectedProfile.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>583, 7</value>
|
||||
<value>581, 7</value>
|
||||
</data>
|
||||
<data name="lbSelectedProfile.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>109, 15</value>
|
||||
@ -940,7 +940,7 @@
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="lbStatus.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>337, 7</value>
|
||||
<value>336, 7</value>
|
||||
</data>
|
||||
<data name="lbStatus.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>47, 15</value>
|
||||
@ -976,7 +976,7 @@
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="lbBattery.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>429, 7</value>
|
||||
<value>427, 7</value>
|
||||
</data>
|
||||
<data name="lbBattery.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>51, 15</value>
|
||||
@ -1012,7 +1012,7 @@
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="lbBatt1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>435, 36</value>
|
||||
<value>433, 36</value>
|
||||
</data>
|
||||
<data name="lbBatt1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>39, 15</value>
|
||||
@ -1048,7 +1048,7 @@
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="lbBatt2.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>435, 64</value>
|
||||
<value>433, 64</value>
|
||||
</data>
|
||||
<data name="lbBatt2.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>39, 15</value>
|
||||
@ -1084,7 +1084,7 @@
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="lbBatt3.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>435, 92</value>
|
||||
<value>433, 92</value>
|
||||
</data>
|
||||
<data name="lbBatt3.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>39, 15</value>
|
||||
@ -1120,7 +1120,7 @@
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="lbBatt4.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>435, 120</value>
|
||||
<value>433, 120</value>
|
||||
</data>
|
||||
<data name="lbBatt4.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>39, 15</value>
|
||||
@ -1150,7 +1150,7 @@
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="pBStatus2.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>341, 62</value>
|
||||
<value>340, 62</value>
|
||||
</data>
|
||||
<data name="pBStatus2.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>39, 20</value>
|
||||
@ -1180,7 +1180,7 @@
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="pBStatus3.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>341, 90</value>
|
||||
<value>340, 90</value>
|
||||
</data>
|
||||
<data name="pBStatus3.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>39, 20</value>
|
||||
@ -1210,7 +1210,7 @@
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="pBStatus4.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>341, 118</value>
|
||||
<value>340, 118</value>
|
||||
</data>
|
||||
<data name="pBStatus4.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>39, 20</value>
|
||||
@ -1243,10 +1243,10 @@
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="bnLight1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>739, 33</value>
|
||||
<value>737, 33</value>
|
||||
</data>
|
||||
<data name="bnLight1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>154, 22</value>
|
||||
<value>156, 22</value>
|
||||
</data>
|
||||
<data name="bnLight1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>50</value>
|
||||
@ -1273,10 +1273,10 @@
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="bnLight2.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>739, 61</value>
|
||||
<value>737, 61</value>
|
||||
</data>
|
||||
<data name="bnLight2.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>154, 22</value>
|
||||
<value>156, 22</value>
|
||||
</data>
|
||||
<data name="bnLight2.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>51</value>
|
||||
@ -1303,10 +1303,10 @@
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="bnLight4.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>739, 117</value>
|
||||
<value>737, 117</value>
|
||||
</data>
|
||||
<data name="bnLight4.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>154, 22</value>
|
||||
<value>156, 22</value>
|
||||
</data>
|
||||
<data name="bnLight4.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>52</value>
|
||||
@ -1336,7 +1336,7 @@
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="lbLinkProfile.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>505, 0</value>
|
||||
<value>503, 0</value>
|
||||
</data>
|
||||
<data name="lbLinkProfile.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>67, 30</value>
|
||||
@ -1375,7 +1375,7 @@
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="linkCB1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>531, 37</value>
|
||||
<value>529, 37</value>
|
||||
</data>
|
||||
<data name="linkCB1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>15, 14</value>
|
||||
@ -1408,7 +1408,7 @@
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="linkCB2.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>531, 65</value>
|
||||
<value>529, 65</value>
|
||||
</data>
|
||||
<data name="linkCB2.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>15, 14</value>
|
||||
@ -1441,7 +1441,7 @@
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="linkCB3.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>531, 93</value>
|
||||
<value>529, 93</value>
|
||||
</data>
|
||||
<data name="linkCB3.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>15, 14</value>
|
||||
@ -1474,7 +1474,7 @@
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="linkCB4.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>531, 121</value>
|
||||
<value>529, 121</value>
|
||||
</data>
|
||||
<data name="linkCB4.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>15, 14</value>
|
||||
@ -1522,7 +1522,7 @@
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="tLPControllers.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
|
||||
<value><?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="bnLight3" Row="3" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="pBStatus1" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="lbPad1" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lbPad2" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="bnEditC3" Row="3" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="bnEditC4" Row="4" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="lbPad3" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lbPad4" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="cBController1" Row="1" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="bnEditC2" Row="2" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="cBController2" Row="2" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="cBController3" Row="3" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="bnEditC1" Row="1" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="cBController4" Row="4" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="lbSelectedProfile" Row="0" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="lbID" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lbStatus" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="lbBattery" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt1" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt2" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt3" Row="3" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt4" Row="4" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="pBStatus2" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="pBStatus3" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="pBStatus4" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="bnLight1" Row="1" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="bnLight2" Row="2" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="bnLight4" Row="4" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="lbLinkProfile" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB1" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB2" Row="2" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB3" Row="3" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB4" Row="4" RowSpan="1" Column="3" ColumnSpan="1" /></Controls><Columns Styles="Percent,62.29144,Percent,20.02225,Percent,17.68632,Absolute,80,AutoSize,0,AutoSize,0,Absolute,159" /><Rows Styles="AutoSize,0,Percent,25,Percent,25,Percent,25,Percent,25" /></TableLayoutSettings></value>
|
||||
<value><?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="bnLight3" Row="3" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="pBStatus1" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="lbPad1" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lbPad2" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="bnEditC3" Row="3" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="bnEditC4" Row="4" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="lbPad3" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lbPad4" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="cBController1" Row="1" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="bnEditC2" Row="2" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="cBController2" Row="2" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="cBController3" Row="3" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="bnEditC1" Row="1" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="cBController4" Row="4" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="lbSelectedProfile" Row="0" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="lbID" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lbStatus" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="lbBattery" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt1" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt2" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt3" Row="3" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt4" Row="4" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="pBStatus2" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="pBStatus3" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="pBStatus4" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="bnLight1" Row="1" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="bnLight2" Row="2" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="bnLight4" Row="4" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="lbLinkProfile" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB1" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB2" Row="2" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB3" Row="3" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB4" Row="4" RowSpan="1" Column="3" ColumnSpan="1" /></Controls><Columns Styles="Percent,62.29144,Percent,20.02225,Percent,17.68632,Absolute,80,AutoSize,0,AutoSize,0,Absolute,160" /><Rows Styles="AutoSize,0,Percent,25,Percent,25,Percent,25,Percent,25" /></TableLayoutSettings></value>
|
||||
</data>
|
||||
<data name="lbNoControllers.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
@ -3279,9 +3279,6 @@
|
||||
<data name=">>cMCustomLed.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</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">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
@ -3579,12 +3576,6 @@
|
||||
<data name=">>useCustomColorToolStripMenuItem.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>advColorDialog.Name" xml:space="preserve">
|
||||
<value>advColorDialog</value>
|
||||
</data>
|
||||
<data name=">>advColorDialog.Type" xml:space="preserve">
|
||||
<value>DS4Windows.AdvancedColorDialog, DS4Windows, Version=1.7.9.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>$this.Name" xml:space="preserve">
|
||||
<value>DS4Form</value>
|
||||
</data>
|
||||
|
||||
2
DS4Windows/DS4Forms/Options.Designer.cs
generated
2
DS4Windows/DS4Forms/Options.Designer.cs
generated
@ -401,7 +401,6 @@
|
||||
this.optionsTouchInvStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.shareTouchInvStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.psTouchInvStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.advColorDialog = new DS4Windows.AdvancedColorDialog();
|
||||
((System.ComponentModel.ISupportInitialize)(this.nUDRainbow)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.tBBlueBar)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.tBGreenBar)).BeginInit();
|
||||
@ -4606,7 +4605,6 @@
|
||||
private System.Windows.Forms.CheckBox cBGyroInvertX;
|
||||
private System.Windows.Forms.Label lbGyroInvert;
|
||||
private System.Windows.Forms.Panel panel2;
|
||||
private AdvancedColorDialog advColorDialog;
|
||||
private System.Windows.Forms.TabPage tPControls;
|
||||
private System.Windows.Forms.Label lbControlTip;
|
||||
private System.Windows.Forms.Panel pnlController;
|
||||
|
||||
@ -37,12 +37,14 @@ namespace DS4Windows.Forms
|
||||
private Bitmap btnLightBgImg;
|
||||
private Bitmap btnLightBg;
|
||||
private OutContType devOutContType = OutContType.X360;
|
||||
private AdvancedColorDialog advColorDialog;
|
||||
|
||||
int tempInt = 0;
|
||||
|
||||
public Options(DS4Form rt)
|
||||
{
|
||||
InitializeComponent();
|
||||
advColorDialog = new AdvancedColorDialog();
|
||||
pnlControllerBgImg = (Bitmap)Properties.Resources.DS4_Config.Clone();
|
||||
btnLightBg = (Bitmap)Properties.Resources.DS4_lightbar.Clone();
|
||||
pnlController.BackgroundImage = null;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -166,7 +166,9 @@
|
||||
<Compile Include="DS4Library\DS4State.cs" />
|
||||
<Compile Include="DS4Library\DS4StateExposed.cs" />
|
||||
<Compile Include="DS4Library\DS4Touchpad.cs" />
|
||||
<Compile Include="DS4Forms\AdvancedColorDialog.cs" />
|
||||
<Compile Include="DS4Forms\AdvancedColorDialog.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
<Compile Include="DS4Forms\DS4Form.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user