More changes to better accommodate high contrast mode

Related to issue #158.
This commit is contained in:
Travis Nickles 2017-12-01 02:35:35 -06:00
parent bc181b3e8b
commit 8c67a48f4d
7 changed files with 605 additions and 648 deletions

View File

@ -1255,7 +1255,7 @@
this.AllowDrop = true;
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.Color.White;
this.BackColor = System.Drawing.SystemColors.Window;
this.Controls.Add(this.tabMain);
this.Controls.Add(this.pnlButton);
this.Name = "DS4Form";

View File

@ -406,10 +406,10 @@
<value>NoControl</value>
</data>
<data name="bnLight3.Location" type="System.Drawing.Point, System.Drawing">
<value>817, 89</value>
<value>816, 89</value>
</data>
<data name="bnLight3.Size" type="System.Drawing.Size, System.Drawing">
<value>76, 22</value>
<value>77, 22</value>
</data>
<data name="bnLight3.TabIndex" type="System.Int32, mscorlib">
<value>50</value>
@ -433,7 +433,7 @@
<value>NoControl</value>
</data>
<data name="pBStatus1.Location" type="System.Drawing.Point, System.Drawing">
<value>398, 34</value>
<value>397, 34</value>
</data>
<data name="pBStatus1.Size" type="System.Drawing.Size, System.Drawing">
<value>39, 20</value>
@ -535,7 +535,7 @@
<value>NoControl</value>
</data>
<data name="bnEditC3.Location" type="System.Drawing.Point, System.Drawing">
<value>777, 89</value>
<value>776, 89</value>
</data>
<data name="bnEditC3.Size" type="System.Drawing.Size, System.Drawing">
<value>34, 22</value>
@ -565,7 +565,7 @@
<value>NoControl</value>
</data>
<data name="bnEditC4.Location" type="System.Drawing.Point, System.Drawing">
<value>777, 117</value>
<value>776, 117</value>
</data>
<data name="bnEditC4.Size" type="System.Drawing.Size, System.Drawing">
<value>34, 22</value>
@ -664,7 +664,7 @@
<value>None</value>
</data>
<data name="cBController1.Location" type="System.Drawing.Point, System.Drawing">
<value>660, 33</value>
<value>659, 33</value>
</data>
<data name="cBController1.Size" type="System.Drawing.Size, System.Drawing">
<value>111, 21</value>
@ -691,7 +691,7 @@
<value>NoControl</value>
</data>
<data name="bnEditC2.Location" type="System.Drawing.Point, System.Drawing">
<value>777, 61</value>
<value>776, 61</value>
</data>
<data name="bnEditC2.Size" type="System.Drawing.Size, System.Drawing">
<value>34, 22</value>
@ -718,7 +718,7 @@
<value>None</value>
</data>
<data name="cBController2.Location" type="System.Drawing.Point, System.Drawing">
<value>660, 61</value>
<value>659, 61</value>
</data>
<data name="cBController2.Size" type="System.Drawing.Size, System.Drawing">
<value>111, 21</value>
@ -742,7 +742,7 @@
<value>None</value>
</data>
<data name="cBController3.Location" type="System.Drawing.Point, System.Drawing">
<value>660, 89</value>
<value>659, 89</value>
</data>
<data name="cBController3.Size" type="System.Drawing.Size, System.Drawing">
<value>111, 21</value>
@ -769,7 +769,7 @@
<value>NoControl</value>
</data>
<data name="bnEditC1.Location" type="System.Drawing.Point, System.Drawing">
<value>777, 33</value>
<value>776, 33</value>
</data>
<data name="bnEditC1.Size" type="System.Drawing.Size, System.Drawing">
<value>34, 22</value>
@ -796,7 +796,7 @@
<value>None</value>
</data>
<data name="cBController4.Location" type="System.Drawing.Point, System.Drawing">
<value>660, 117</value>
<value>659, 117</value>
</data>
<data name="cBController4.Size" type="System.Drawing.Size, System.Drawing">
<value>111, 21</value>
@ -829,7 +829,7 @@
<value>NoControl</value>
</data>
<data name="lbSelectedProfile.Location" type="System.Drawing.Point, System.Drawing">
<value>661, 7</value>
<value>660, 7</value>
</data>
<data name="lbSelectedProfile.Size" type="System.Drawing.Size, System.Drawing">
<value>109, 15</value>
@ -901,7 +901,7 @@
<value>NoControl</value>
</data>
<data name="lbStatus.Location" type="System.Drawing.Point, System.Drawing">
<value>394, 7</value>
<value>393, 7</value>
</data>
<data name="lbStatus.Size" type="System.Drawing.Size, System.Drawing">
<value>47, 15</value>
@ -937,7 +937,7 @@
<value>NoControl</value>
</data>
<data name="lbBattery.Location" type="System.Drawing.Point, System.Drawing">
<value>500, 7</value>
<value>499, 7</value>
</data>
<data name="lbBattery.Size" type="System.Drawing.Size, System.Drawing">
<value>51, 15</value>
@ -973,7 +973,7 @@
<value>NoControl</value>
</data>
<data name="lbBatt1.Location" type="System.Drawing.Point, System.Drawing">
<value>506, 36</value>
<value>505, 36</value>
</data>
<data name="lbBatt1.Size" type="System.Drawing.Size, System.Drawing">
<value>39, 15</value>
@ -1009,7 +1009,7 @@
<value>NoControl</value>
</data>
<data name="lbBatt2.Location" type="System.Drawing.Point, System.Drawing">
<value>506, 64</value>
<value>505, 64</value>
</data>
<data name="lbBatt2.Size" type="System.Drawing.Size, System.Drawing">
<value>39, 15</value>
@ -1045,7 +1045,7 @@
<value>NoControl</value>
</data>
<data name="lbBatt3.Location" type="System.Drawing.Point, System.Drawing">
<value>506, 92</value>
<value>505, 92</value>
</data>
<data name="lbBatt3.Size" type="System.Drawing.Size, System.Drawing">
<value>39, 15</value>
@ -1081,7 +1081,7 @@
<value>NoControl</value>
</data>
<data name="lbBatt4.Location" type="System.Drawing.Point, System.Drawing">
<value>506, 120</value>
<value>505, 120</value>
</data>
<data name="lbBatt4.Size" type="System.Drawing.Size, System.Drawing">
<value>39, 15</value>
@ -1111,7 +1111,7 @@
<value>NoControl</value>
</data>
<data name="pBStatus2.Location" type="System.Drawing.Point, System.Drawing">
<value>398, 62</value>
<value>397, 62</value>
</data>
<data name="pBStatus2.Size" type="System.Drawing.Size, System.Drawing">
<value>39, 20</value>
@ -1141,7 +1141,7 @@
<value>NoControl</value>
</data>
<data name="pBStatus3.Location" type="System.Drawing.Point, System.Drawing">
<value>398, 90</value>
<value>397, 90</value>
</data>
<data name="pBStatus3.Size" type="System.Drawing.Size, System.Drawing">
<value>39, 20</value>
@ -1171,7 +1171,7 @@
<value>NoControl</value>
</data>
<data name="pBStatus4.Location" type="System.Drawing.Point, System.Drawing">
<value>398, 118</value>
<value>397, 118</value>
</data>
<data name="pBStatus4.Size" type="System.Drawing.Size, System.Drawing">
<value>39, 20</value>
@ -1204,10 +1204,10 @@
<value>NoControl</value>
</data>
<data name="bnLight1.Location" type="System.Drawing.Point, System.Drawing">
<value>817, 33</value>
<value>816, 33</value>
</data>
<data name="bnLight1.Size" type="System.Drawing.Size, System.Drawing">
<value>76, 22</value>
<value>77, 22</value>
</data>
<data name="bnLight1.TabIndex" type="System.Int32, mscorlib">
<value>50</value>
@ -1234,10 +1234,10 @@
<value>NoControl</value>
</data>
<data name="bnLight2.Location" type="System.Drawing.Point, System.Drawing">
<value>817, 61</value>
<value>816, 61</value>
</data>
<data name="bnLight2.Size" type="System.Drawing.Size, System.Drawing">
<value>76, 22</value>
<value>77, 22</value>
</data>
<data name="bnLight2.TabIndex" type="System.Int32, mscorlib">
<value>51</value>
@ -1264,10 +1264,10 @@
<value>NoControl</value>
</data>
<data name="bnLight4.Location" type="System.Drawing.Point, System.Drawing">
<value>817, 117</value>
<value>816, 117</value>
</data>
<data name="bnLight4.Size" type="System.Drawing.Size, System.Drawing">
<value>76, 22</value>
<value>77, 22</value>
</data>
<data name="bnLight4.TabIndex" type="System.Int32, mscorlib">
<value>52</value>
@ -1297,7 +1297,7 @@
<value>NoControl</value>
</data>
<data name="lbLinkProfile.Location" type="System.Drawing.Point, System.Drawing">
<value>583, 0</value>
<value>582, 0</value>
</data>
<data name="lbLinkProfile.Size" type="System.Drawing.Size, System.Drawing">
<value>67, 30</value>
@ -1336,7 +1336,7 @@
<value>NoControl</value>
</data>
<data name="linkCB1.Location" type="System.Drawing.Point, System.Drawing">
<value>609, 37</value>
<value>608, 37</value>
</data>
<data name="linkCB1.Size" type="System.Drawing.Size, System.Drawing">
<value>15, 14</value>
@ -1369,7 +1369,7 @@
<value>NoControl</value>
</data>
<data name="linkCB2.Location" type="System.Drawing.Point, System.Drawing">
<value>609, 65</value>
<value>608, 65</value>
</data>
<data name="linkCB2.Size" type="System.Drawing.Size, System.Drawing">
<value>15, 14</value>
@ -1402,7 +1402,7 @@
<value>NoControl</value>
</data>
<data name="linkCB3.Location" type="System.Drawing.Point, System.Drawing">
<value>609, 93</value>
<value>608, 93</value>
</data>
<data name="linkCB3.Size" type="System.Drawing.Size, System.Drawing">
<value>15, 14</value>
@ -1435,7 +1435,7 @@
<value>NoControl</value>
</data>
<data name="linkCB4.Location" type="System.Drawing.Point, System.Drawing">
<value>609, 121</value>
<value>608, 121</value>
</data>
<data name="linkCB4.Size" type="System.Drawing.Size, System.Drawing">
<value>15, 14</value>
@ -1483,7 +1483,7 @@
<value>0</value>
</data>
<data name="tLPControllers.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="bnLight3" Row="3" RowSpan="1" Column="6" ColumnSpan="1" /&gt;&lt;Control Name="pBStatus1" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="lbPad1" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="lbPad2" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="bnEditC3" Row="3" RowSpan="1" Column="5" ColumnSpan="1" /&gt;&lt;Control Name="bnEditC4" Row="4" RowSpan="1" Column="5" ColumnSpan="1" /&gt;&lt;Control Name="lbPad3" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="lbPad4" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="cBController1" Row="1" RowSpan="1" Column="4" ColumnSpan="1" /&gt;&lt;Control Name="bnEditC2" Row="2" RowSpan="1" Column="5" ColumnSpan="1" /&gt;&lt;Control Name="cBController2" Row="2" RowSpan="1" Column="4" ColumnSpan="1" /&gt;&lt;Control Name="cBController3" Row="3" RowSpan="1" Column="4" ColumnSpan="1" /&gt;&lt;Control Name="bnEditC1" Row="1" RowSpan="1" Column="5" ColumnSpan="1" /&gt;&lt;Control Name="cBController4" Row="4" RowSpan="1" Column="4" ColumnSpan="1" /&gt;&lt;Control Name="lbSelectedProfile" Row="0" RowSpan="1" Column="4" ColumnSpan="1" /&gt;&lt;Control Name="lbID" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="lbStatus" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="lbBattery" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="lbBatt1" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="lbBatt2" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="lbBatt3" Row="3" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="lbBatt4" Row="4" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="pBStatus2" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="pBStatus3" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="pBStatus4" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="bnLight1" Row="1" RowSpan="1" Column="6" ColumnSpan="1" /&gt;&lt;Control Name="bnLight2" Row="2" RowSpan="1" Column="6" ColumnSpan="1" /&gt;&lt;Control Name="bnLight4" Row="4" RowSpan="1" Column="6" ColumnSpan="1" /&gt;&lt;Control Name="lbLinkProfile" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;Control Name="linkCB1" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;Control Name="linkCB2" Row="2" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;Control Name="linkCB3" Row="3" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;Control Name="linkCB4" Row="4" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,62.29144,Percent,20.02225,Percent,17.68632,Absolute,80,AutoSize,0,AutoSize,0,Absolute,80" /&gt;&lt;Rows Styles="AutoSize,0,Percent,25,Percent,25,Percent,25,Percent,25" /&gt;&lt;/TableLayoutSettings&gt;</value>
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="bnLight3" Row="3" RowSpan="1" Column="6" ColumnSpan="1" /&gt;&lt;Control Name="pBStatus1" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="lbPad1" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="lbPad2" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="bnEditC3" Row="3" RowSpan="1" Column="5" ColumnSpan="1" /&gt;&lt;Control Name="bnEditC4" Row="4" RowSpan="1" Column="5" ColumnSpan="1" /&gt;&lt;Control Name="lbPad3" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="lbPad4" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="cBController1" Row="1" RowSpan="1" Column="4" ColumnSpan="1" /&gt;&lt;Control Name="bnEditC2" Row="2" RowSpan="1" Column="5" ColumnSpan="1" /&gt;&lt;Control Name="cBController2" Row="2" RowSpan="1" Column="4" ColumnSpan="1" /&gt;&lt;Control Name="cBController3" Row="3" RowSpan="1" Column="4" ColumnSpan="1" /&gt;&lt;Control Name="bnEditC1" Row="1" RowSpan="1" Column="5" ColumnSpan="1" /&gt;&lt;Control Name="cBController4" Row="4" RowSpan="1" Column="4" ColumnSpan="1" /&gt;&lt;Control Name="lbSelectedProfile" Row="0" RowSpan="1" Column="4" ColumnSpan="1" /&gt;&lt;Control Name="lbID" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="lbStatus" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="lbBattery" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="lbBatt1" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="lbBatt2" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="lbBatt3" Row="3" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="lbBatt4" Row="4" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="pBStatus2" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="pBStatus3" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="pBStatus4" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="bnLight1" Row="1" RowSpan="1" Column="6" ColumnSpan="1" /&gt;&lt;Control Name="bnLight2" Row="2" RowSpan="1" Column="6" ColumnSpan="1" /&gt;&lt;Control Name="bnLight4" Row="4" RowSpan="1" Column="6" ColumnSpan="1" /&gt;&lt;Control Name="lbLinkProfile" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;Control Name="linkCB1" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;Control Name="linkCB2" Row="2" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;Control Name="linkCB3" Row="3" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;Control Name="linkCB4" Row="4" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,62.29144,Percent,20.02225,Percent,17.68632,Absolute,80,AutoSize,0,AutoSize,0,Absolute,82" /&gt;&lt;Rows Styles="AutoSize,0,Percent,25,Percent,25,Percent,25,Percent,25" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="lbNoControllers.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@ -3192,9 +3192,6 @@
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>904, 415</value>
</data>
<data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>630, 229</value>
</data>
@ -3442,7 +3439,7 @@
<value>advColorDialog</value>
</data>
<data name="&gt;&gt;advColorDialog.Type" xml:space="preserve">
<value>DS4Windows.AdvancedColorDialog, DS4Windows, Version=1.4.100.0, Culture=neutral, PublicKeyToken=null</value>
<value>DS4Windows.AdvancedColorDialog, DS4Windows, Version=1.4.101.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>DS4Form</value>

View File

@ -568,7 +568,7 @@
resources.ApplyResources(this.cBDoubleTap, "cBDoubleTap");
this.cBDoubleTap.Checked = true;
this.cBDoubleTap.CheckState = System.Windows.Forms.CheckState.Checked;
this.cBDoubleTap.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.cBDoubleTap.ForeColor = System.Drawing.SystemColors.ControlText;
this.cBDoubleTap.Name = "cBDoubleTap";
this.cBDoubleTap.UseVisualStyleBackColor = true;
this.cBDoubleTap.CheckedChanged += new System.EventHandler(this.cBDoubleTap_CheckedChanged);
@ -578,7 +578,7 @@
resources.ApplyResources(this.cBTap, "cBTap");
this.cBTap.Checked = true;
this.cBTap.CheckState = System.Windows.Forms.CheckState.Checked;
this.cBTap.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.cBTap.ForeColor = System.Drawing.SystemColors.ControlText;
this.cBTap.Name = "cBTap";
this.cBTap.UseVisualStyleBackColor = true;
this.cBTap.CheckedChanged += new System.EventHandler(this.cBTap_CheckedChanged);
@ -604,7 +604,7 @@
resources.ApplyResources(this.cBScroll, "cBScroll");
this.cBScroll.Checked = true;
this.cBScroll.CheckState = System.Windows.Forms.CheckState.Checked;
this.cBScroll.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.cBScroll.ForeColor = System.Drawing.SystemColors.ControlText;
this.cBScroll.Name = "cBScroll";
this.cBScroll.UseVisualStyleBackColor = true;
this.cBScroll.CheckedChanged += new System.EventHandler(this.cBScroll_CheckedChanged);
@ -614,7 +614,7 @@
resources.ApplyResources(this.cBSlide, "cBSlide");
this.cBSlide.Checked = true;
this.cBSlide.CheckState = System.Windows.Forms.CheckState.Checked;
this.cBSlide.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.cBSlide.ForeColor = System.Drawing.SystemColors.ControlText;
this.cBSlide.Name = "cBSlide";
this.cBSlide.UseVisualStyleBackColor = true;
this.cBSlide.CheckedChanged += new System.EventHandler(this.cBSlide_CheckedChanged);
@ -664,7 +664,7 @@
// cBlowerRCOn
//
resources.ApplyResources(this.cBlowerRCOn, "cBlowerRCOn");
this.cBlowerRCOn.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.cBlowerRCOn.ForeColor = System.Drawing.SystemColors.ControlText;
this.cBlowerRCOn.Name = "cBlowerRCOn";
this.cBlowerRCOn.UseVisualStyleBackColor = true;
this.cBlowerRCOn.CheckedChanged += new System.EventHandler(this.lowerRCOffCheckBox_CheckedChanged);
@ -672,7 +672,7 @@
// cBTouchpadJitterCompensation
//
resources.ApplyResources(this.cBTouchpadJitterCompensation, "cBTouchpadJitterCompensation");
this.cBTouchpadJitterCompensation.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.cBTouchpadJitterCompensation.ForeColor = System.Drawing.SystemColors.ControlText;
this.cBTouchpadJitterCompensation.Name = "cBTouchpadJitterCompensation";
this.cBTouchpadJitterCompensation.UseVisualStyleBackColor = true;
this.cBTouchpadJitterCompensation.CheckedChanged += new System.EventHandler(this.touchpadJitterCompensation_CheckedChanged);
@ -920,12 +920,12 @@
//
// gBTouchpad
//
this.gBTouchpad.BackColor = System.Drawing.Color.Transparent;
this.gBTouchpad.BackColor = System.Drawing.SystemColors.Control;
this.gBTouchpad.Controls.Add(this.pnlTPMouse);
this.gBTouchpad.Controls.Add(this.rBTPControls);
this.gBTouchpad.Controls.Add(this.rBTPMouse);
this.gBTouchpad.Controls.Add(this.fLPTouchSwipe);
this.gBTouchpad.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.gBTouchpad.ForeColor = System.Drawing.SystemColors.ControlText;
resources.ApplyResources(this.gBTouchpad, "gBTouchpad");
this.gBTouchpad.Name = "gBTouchpad";
this.gBTouchpad.TabStop = false;
@ -960,11 +960,13 @@
// label25
//
resources.ApplyResources(this.label25, "label25");
this.label25.ForeColor = System.Drawing.SystemColors.ControlText;
this.label25.Name = "label25";
//
// label15
//
resources.ApplyResources(this.label15, "label15");
this.label15.ForeColor = System.Drawing.SystemColors.ControlText;
this.label15.Name = "label15";
//
// touchpadInvertComboBox
@ -983,7 +985,7 @@
// cbStartTouchpadOff
//
resources.ApplyResources(this.cbStartTouchpadOff, "cbStartTouchpadOff");
this.cbStartTouchpadOff.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.cbStartTouchpadOff.ForeColor = System.Drawing.SystemColors.ControlText;
this.cbStartTouchpadOff.Name = "cbStartTouchpadOff";
this.cbStartTouchpadOff.UseVisualStyleBackColor = true;
this.cbStartTouchpadOff.CheckedChanged += new System.EventHandler(this.cbStartTouchpadOff_CheckedChanged);
@ -991,7 +993,7 @@
// rBTPControls
//
resources.ApplyResources(this.rBTPControls, "rBTPControls");
this.rBTPControls.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.rBTPControls.ForeColor = System.Drawing.SystemColors.ControlText;
this.rBTPControls.Name = "rBTPControls";
this.rBTPControls.TabStop = true;
this.rBTPControls.UseVisualStyleBackColor = true;
@ -1000,7 +1002,7 @@
// rBTPMouse
//
resources.ApplyResources(this.rBTPMouse, "rBTPMouse");
this.rBTPMouse.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.rBTPMouse.ForeColor = System.Drawing.SystemColors.ControlText;
this.rBTPMouse.Name = "rBTPMouse";
this.rBTPMouse.TabStop = true;
this.rBTPMouse.UseVisualStyleBackColor = true;
@ -1267,7 +1269,7 @@
//
// gBOther
//
this.gBOther.BackColor = System.Drawing.Color.WhiteSmoke;
this.gBOther.BackColor = System.Drawing.SystemColors.Control;
this.gBOther.Controls.Add(this.btPollRateLabel);
this.gBOther.Controls.Add(this.btPollRateComboBox);
this.gBOther.Controls.Add(this.enableTouchToggleCheckbox);
@ -1407,7 +1409,7 @@
//
// gBLightbar
//
this.gBLightbar.BackColor = System.Drawing.Color.WhiteSmoke;
this.gBLightbar.BackColor = System.Drawing.SystemColors.Control;
this.gBLightbar.Controls.Add(this.btnRainbow);
this.gBLightbar.Controls.Add(this.lbRainbowB);
this.gBLightbar.Controls.Add(this.nUDRainbowB);
@ -1519,7 +1521,7 @@
//
// gBRumble
//
this.gBRumble.BackColor = System.Drawing.Color.WhiteSmoke;
this.gBRumble.BackColor = System.Drawing.SystemColors.Control;
this.gBRumble.Controls.Add(this.lbPercentRumble);
this.gBRumble.Controls.Add(this.btnRumbleLightTest);
this.gBRumble.Controls.Add(this.btnRumbleHeavyTest);
@ -1596,6 +1598,7 @@
//
// lbL2TrackS
//
this.lbL2TrackS.BackColor = System.Drawing.Color.Transparent;
this.lbL2TrackS.Controls.Add(this.pnlSATrack);
this.lbL2TrackS.Controls.Add(this.lbL2Track);
this.lbL2TrackS.Controls.Add(this.lbRSTip);
@ -1610,7 +1613,6 @@
this.lbL2TrackS.Controls.Add(this.pnlRSTrack);
resources.ApplyResources(this.lbL2TrackS, "lbL2TrackS");
this.lbL2TrackS.Name = "lbL2TrackS";
this.lbL2TrackS.UseVisualStyleBackColor = true;
//
// pnlSATrack
//
@ -1703,7 +1705,7 @@
// tBsixaxisAccelX
//
resources.ApplyResources(this.tBsixaxisAccelX, "tBsixaxisAccelX");
this.tBsixaxisAccelX.BackColor = System.Drawing.Color.White;
this.tBsixaxisAccelX.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.tBsixaxisAccelX.Maximum = 100;
this.tBsixaxisAccelX.Minimum = -100;
this.tBsixaxisAccelX.Name = "tBsixaxisAccelX";
@ -1717,7 +1719,7 @@
// tBsixaxisGyroX
//
resources.ApplyResources(this.tBsixaxisGyroX, "tBsixaxisGyroX");
this.tBsixaxisGyroX.BackColor = System.Drawing.Color.White;
this.tBsixaxisGyroX.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.tBsixaxisGyroX.Maximum = 127;
this.tBsixaxisGyroX.Minimum = -127;
this.tBsixaxisGyroX.Name = "tBsixaxisGyroX";
@ -1731,7 +1733,7 @@
// tBsixaxisGyroY
//
resources.ApplyResources(this.tBsixaxisGyroY, "tBsixaxisGyroY");
this.tBsixaxisGyroY.BackColor = System.Drawing.Color.White;
this.tBsixaxisGyroY.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.tBsixaxisGyroY.Maximum = 127;
this.tBsixaxisGyroY.Minimum = -127;
this.tBsixaxisGyroY.Name = "tBsixaxisGyroY";
@ -1740,7 +1742,7 @@
// tBsixaxisGyroZ
//
resources.ApplyResources(this.tBsixaxisGyroZ, "tBsixaxisGyroZ");
this.tBsixaxisGyroZ.BackColor = System.Drawing.Color.White;
this.tBsixaxisGyroZ.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.tBsixaxisGyroZ.Maximum = 127;
this.tBsixaxisGyroZ.Minimum = -127;
this.tBsixaxisGyroZ.Name = "tBsixaxisGyroZ";
@ -1749,7 +1751,7 @@
// tBsixaxisAccelY
//
resources.ApplyResources(this.tBsixaxisAccelY, "tBsixaxisAccelY");
this.tBsixaxisAccelY.BackColor = System.Drawing.Color.White;
this.tBsixaxisAccelY.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.tBsixaxisAccelY.Maximum = 100;
this.tBsixaxisAccelY.Minimum = -100;
this.tBsixaxisAccelY.Name = "tBsixaxisAccelY";
@ -1758,7 +1760,7 @@
// tBsixaxisAccelZ
//
resources.ApplyResources(this.tBsixaxisAccelZ, "tBsixaxisAccelZ");
this.tBsixaxisAccelZ.BackColor = System.Drawing.Color.White;
this.tBsixaxisAccelZ.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.tBsixaxisAccelZ.Maximum = 100;
this.tBsixaxisAccelZ.Minimum = -100;
this.tBsixaxisAccelZ.Name = "tBsixaxisAccelZ";
@ -1890,7 +1892,7 @@
// tPControls
//
resources.ApplyResources(this.tPControls, "tPControls");
this.tPControls.BackColor = System.Drawing.SystemColors.WindowFrame;
this.tPControls.BackColor = System.Drawing.Color.DimGray;
this.tPControls.Controls.Add(this.lBControls);
this.tPControls.Controls.Add(this.gBTouchpad);
this.tPControls.Controls.Add(this.lbControlTip);
@ -2729,7 +2731,7 @@
//
// tPDeadzone
//
this.tPDeadzone.BackColor = System.Drawing.Color.WhiteSmoke;
this.tPDeadzone.BackColor = System.Drawing.SystemColors.Control;
this.tPDeadzone.Controls.Add(this.lbL2);
this.tPDeadzone.Controls.Add(this.nUDL2);
this.tPDeadzone.Controls.Add(this.nUDLS);
@ -2747,6 +2749,7 @@
//
// antiDeadzoneTabPage
//
this.antiDeadzoneTabPage.BackColor = System.Drawing.SystemColors.Control;
this.antiDeadzoneTabPage.Controls.Add(this.nUDSixaxisZAntiDead);
this.antiDeadzoneTabPage.Controls.Add(this.nUDSixaxisXAntiDead);
this.antiDeadzoneTabPage.Controls.Add(this.label20);
@ -2761,7 +2764,6 @@
this.antiDeadzoneTabPage.Controls.Add(this.label1);
resources.ApplyResources(this.antiDeadzoneTabPage, "antiDeadzoneTabPage");
this.antiDeadzoneTabPage.Name = "antiDeadzoneTabPage";
this.antiDeadzoneTabPage.UseVisualStyleBackColor = true;
//
// nUDSixaxisZAntiDead
//
@ -2897,6 +2899,7 @@
//
// maxZoneTabPage
//
this.maxZoneTabPage.BackColor = System.Drawing.SystemColors.Control;
this.maxZoneTabPage.Controls.Add(this.nUDSixAxisZMaxZone);
this.maxZoneTabPage.Controls.Add(this.nUDSixAxisXMaxZone);
this.maxZoneTabPage.Controls.Add(this.label18);
@ -2911,7 +2914,6 @@
this.maxZoneTabPage.Controls.Add(this.label5);
resources.ApplyResources(this.maxZoneTabPage, "maxZoneTabPage");
this.maxZoneTabPage.Name = "maxZoneTabPage";
this.maxZoneTabPage.UseVisualStyleBackColor = true;
//
// nUDSixAxisZMaxZone
//
@ -3077,6 +3079,7 @@
//
// tPOutCurve
//
this.tPOutCurve.BackColor = System.Drawing.SystemColors.Control;
this.tPOutCurve.Controls.Add(this.cBSixaxisZOutputCurve);
this.tPOutCurve.Controls.Add(this.cBSixaxisXOutputCurve);
this.tPOutCurve.Controls.Add(this.label24);
@ -3091,7 +3094,6 @@
this.tPOutCurve.Controls.Add(this.label9);
resources.ApplyResources(this.tPOutCurve, "tPOutCurve");
this.tPOutCurve.Name = "tPOutCurve";
this.tPOutCurve.UseVisualStyleBackColor = true;
//
// cBSixaxisZOutputCurve
//
@ -3205,7 +3207,7 @@
//
// tPCurve
//
this.tPCurve.BackColor = System.Drawing.Color.WhiteSmoke;
this.tPCurve.BackColor = System.Drawing.SystemColors.Control;
this.tPCurve.Controls.Add(this.nUDLSCurve);
this.tPCurve.Controls.Add(this.nUDRSCurve);
this.tPCurve.Controls.Add(this.lbRSCurve);
@ -3259,13 +3261,13 @@
//
// tpRotation
//
this.tpRotation.BackColor = System.Drawing.SystemColors.Control;
this.tpRotation.Controls.Add(this.nUDRSRotation);
this.tpRotation.Controls.Add(this.label14);
this.tpRotation.Controls.Add(this.nUDLSRotation);
this.tpRotation.Controls.Add(this.label13);
resources.ApplyResources(this.tpRotation, "tpRotation");
this.tpRotation.Name = "tpRotation";
this.tpRotation.UseVisualStyleBackColor = true;
//
// nUDRSRotation
//
@ -3312,7 +3314,7 @@
// fLPSettings
//
resources.ApplyResources(this.fLPSettings, "fLPSettings");
this.fLPSettings.BackColor = System.Drawing.Color.WhiteSmoke;
this.fLPSettings.BackColor = System.Drawing.SystemColors.Control;
this.fLPSettings.Controls.Add(this.gBLightbar);
this.fLPSettings.Controls.Add(this.gBGyro);
this.fLPSettings.Controls.Add(this.gBRumble);
@ -3323,7 +3325,7 @@
//
// gBGyro
//
this.gBGyro.BackColor = System.Drawing.Color.WhiteSmoke;
this.gBGyro.BackColor = System.Drawing.SystemColors.Control;
this.gBGyro.Controls.Add(this.rBSAControls);
this.gBGyro.Controls.Add(this.rBSAMouse);
this.gBGyro.Controls.Add(this.fLPTiltControls);
@ -3514,7 +3516,7 @@
//
// gBSensitivity
//
this.gBSensitivity.BackColor = System.Drawing.Color.WhiteSmoke;
this.gBSensitivity.BackColor = System.Drawing.SystemColors.Control;
this.gBSensitivity.Controls.Add(this.lbL2S);
this.gBSensitivity.Controls.Add(this.nUDL2S);
this.gBSensitivity.Controls.Add(this.nUDLSS);
@ -4076,7 +4078,7 @@
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.Color.WhiteSmoke;
this.BackColor = System.Drawing.SystemColors.Window;
this.Controls.Add(this.fLPSettings);
this.Controls.Add(this.tCControls);
this.MaximizeBox = false;

View File

@ -887,7 +887,7 @@ namespace DS4Windows
EnableReadings(false);
lbInputDelay.Text = Properties.Resources.InputDelay.Replace("*number*", Properties.Resources.NA);
lbInputDelay.BackColor = Color.Transparent;
lbInputDelay.ForeColor = Color.Black;
lbInputDelay.ForeColor = SystemColors.ControlText;
}
else
{
@ -1050,7 +1050,7 @@ namespace DS4Windows
else
{
lbInputDelay.BackColor = Color.Transparent;
lbInputDelay.ForeColor = Color.Black;
lbInputDelay.ForeColor = SystemColors.ControlText;
}
}
}

View File

@ -2209,7 +2209,7 @@
<value>23, 23</value>
</data>
<data name="pBProgram.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
<value>Zoom</value>
<value>AutoSize</value>
</data>
<data name="pBProgram.TabIndex" type="System.Int32, mscorlib">
<value>255</value>
@ -8822,7 +8822,7 @@ with profile</value>
<value>True</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>176</value>
<value>102</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>96, 96</value>

View File

@ -191,7 +191,6 @@
//
// cMSPrograms
//
resources.ApplyResources(this.cMSPrograms, "cMSPrograms");
this.cMSPrograms.ImageScalingSize = new System.Drawing.Size(20, 20);
this.cMSPrograms.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.addProgramsFromStartMenuToolStripMenuItem,
@ -201,35 +200,36 @@
this.browseForOtherProgramsToolStripMenuItem});
this.cMSPrograms.Name = "contextMenuStrip1";
this.cMSPrograms.ShowImageMargin = false;
resources.ApplyResources(this.cMSPrograms, "cMSPrograms");
//
// addProgramsFromStartMenuToolStripMenuItem
//
resources.ApplyResources(this.addProgramsFromStartMenuToolStripMenuItem, "addProgramsFromStartMenuToolStripMenuItem");
this.addProgramsFromStartMenuToolStripMenuItem.Name = "addProgramsFromStartMenuToolStripMenuItem";
resources.ApplyResources(this.addProgramsFromStartMenuToolStripMenuItem, "addProgramsFromStartMenuToolStripMenuItem");
this.addProgramsFromStartMenuToolStripMenuItem.Click += new System.EventHandler(this.addProgramsFromStartMenuToolStripMenuItem_Click);
//
// addSteamGamesToolStripMenuItem
//
resources.ApplyResources(this.addSteamGamesToolStripMenuItem, "addSteamGamesToolStripMenuItem");
this.addSteamGamesToolStripMenuItem.Name = "addSteamGamesToolStripMenuItem";
resources.ApplyResources(this.addSteamGamesToolStripMenuItem, "addSteamGamesToolStripMenuItem");
this.addSteamGamesToolStripMenuItem.Click += new System.EventHandler(this.addSteamGamesToolStripMenuItem_Click);
//
// addOriginGamesToolStripMenuItem
//
resources.ApplyResources(this.addOriginGamesToolStripMenuItem, "addOriginGamesToolStripMenuItem");
this.addOriginGamesToolStripMenuItem.Name = "addOriginGamesToolStripMenuItem";
resources.ApplyResources(this.addOriginGamesToolStripMenuItem, "addOriginGamesToolStripMenuItem");
this.addOriginGamesToolStripMenuItem.Click += new System.EventHandler(this.addOriginGamesToolStripMenuItem_Click);
//
// addDirectoryToolStripMenuItem
//
resources.ApplyResources(this.addDirectoryToolStripMenuItem, "addDirectoryToolStripMenuItem");
this.addDirectoryToolStripMenuItem.Name = "addDirectoryToolStripMenuItem";
resources.ApplyResources(this.addDirectoryToolStripMenuItem, "addDirectoryToolStripMenuItem");
this.addDirectoryToolStripMenuItem.Click += new System.EventHandler(this.addDirectoryToolStripMenuItem_Click);
//
// browseForOtherProgramsToolStripMenuItem
//
resources.ApplyResources(this.browseForOtherProgramsToolStripMenuItem, "browseForOtherProgramsToolStripMenuItem");
this.browseForOtherProgramsToolStripMenuItem.Name = "browseForOtherProgramsToolStripMenuItem";
resources.ApplyResources(this.browseForOtherProgramsToolStripMenuItem, "browseForOtherProgramsToolStripMenuItem");
this.browseForOtherProgramsToolStripMenuItem.Click += new System.EventHandler(this.browseForOtherProgramsToolStripMenuItem_Click);
//
// cBTurnOffDS4W
@ -243,7 +243,7 @@
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.White;
this.BackColor = System.Drawing.SystemColors.Control;
this.Controls.Add(this.cBTurnOffDS4W);
this.Controls.Add(this.pBProfilesTip);
this.Controls.Add(this.bnHideUnchecked);

File diff suppressed because it is too large Load Diff