From 98e155c318f9e5e7a28135704bac0ac75e5c8ee3 Mon Sep 17 00:00:00 2001 From: Travis Nickles Date: Sat, 20 Oct 2018 03:31:32 -0500 Subject: [PATCH] Tweaked main form class --- DS4Windows/DS4Forms/DS4Form.Designer.cs | 6 +- DS4Windows/DS4Forms/DS4Form.resx | 76 ++++++++++++------------- 2 files changed, 40 insertions(+), 42 deletions(-) diff --git a/DS4Windows/DS4Forms/DS4Form.Designer.cs b/DS4Windows/DS4Forms/DS4Form.Designer.cs index 259a012..e677699 100644 --- a/DS4Windows/DS4Forms/DS4Form.Designer.cs +++ b/DS4Windows/DS4Forms/DS4Form.Designer.cs @@ -1257,13 +1257,16 @@ // // languagePackComboBox1 // + this.languagePackComboBox1.AutoValidate = System.Windows.Forms.AutoValidate.Disable; + this.languagePackComboBox1.BackColor = System.Drawing.SystemColors.Window; + this.languagePackComboBox1.CausesValidation = false; resources.ApplyResources(this.languagePackComboBox1, "languagePackComboBox1"); this.languagePackComboBox1.Name = "languagePackComboBox1"; this.languagePackComboBox1.SelectedValueChanged += new System.EventHandler(this.languagePackComboBox1_SelectedValueChanged); // // flowLayoutPanel1 // - resources.ApplyResources(this.flowLayoutPanel1, "flowLayoutPanel1"); + this.flowLayoutPanel1.BackColor = System.Drawing.SystemColors.Window; this.flowLayoutPanel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.flowLayoutPanel1.Controls.Add(this.linkProfiles); this.flowLayoutPanel1.Controls.Add(this.lnkControllers); @@ -1274,6 +1277,7 @@ this.flowLayoutPanel1.Controls.Add(this.hidGuardWhiteList); this.flowLayoutPanel1.Controls.Add(this.clrHidGuardWlistLinkLabel); this.flowLayoutPanel1.Controls.Add(this.hidGuardRegLinkLabel); + resources.ApplyResources(this.flowLayoutPanel1, "flowLayoutPanel1"); this.flowLayoutPanel1.ForeColor = System.Drawing.SystemColors.ControlText; this.flowLayoutPanel1.Name = "flowLayoutPanel1"; // diff --git a/DS4Windows/DS4Forms/DS4Form.resx b/DS4Windows/DS4Forms/DS4Form.resx index aae55fa..b514f70 100644 --- a/DS4Windows/DS4Forms/DS4Form.resx +++ b/DS4Windows/DS4Forms/DS4Form.resx @@ -445,10 +445,10 @@ NoControl - 766, 89 + 764, 89 - 127, 22 + 129, 22 50 @@ -472,7 +472,7 @@ NoControl - 361, 34 + 360, 34 39, 20 @@ -574,7 +574,7 @@ NoControl - 726, 89 + 724, 89 34, 22 @@ -604,7 +604,7 @@ NoControl - 726, 117 + 724, 117 34, 22 @@ -703,7 +703,7 @@ None - 609, 33 + 607, 33 111, 21 @@ -730,7 +730,7 @@ NoControl - 726, 61 + 724, 61 34, 22 @@ -757,7 +757,7 @@ None - 609, 61 + 607, 61 111, 21 @@ -781,7 +781,7 @@ None - 609, 89 + 607, 89 111, 21 @@ -808,7 +808,7 @@ NoControl - 726, 33 + 724, 33 34, 22 @@ -835,7 +835,7 @@ None - 609, 117 + 607, 117 111, 21 @@ -868,7 +868,7 @@ NoControl - 610, 7 + 608, 7 109, 15 @@ -940,7 +940,7 @@ NoControl - 357, 7 + 356, 7 47, 15 @@ -976,7 +976,7 @@ NoControl - 454, 7 + 452, 7 51, 15 @@ -1012,7 +1012,7 @@ NoControl - 460, 36 + 458, 36 39, 15 @@ -1048,7 +1048,7 @@ NoControl - 460, 64 + 458, 64 39, 15 @@ -1084,7 +1084,7 @@ NoControl - 460, 92 + 458, 92 39, 15 @@ -1120,7 +1120,7 @@ NoControl - 460, 120 + 458, 120 39, 15 @@ -1150,7 +1150,7 @@ NoControl - 361, 62 + 360, 62 39, 20 @@ -1180,7 +1180,7 @@ NoControl - 361, 90 + 360, 90 39, 20 @@ -1210,7 +1210,7 @@ NoControl - 361, 118 + 360, 118 39, 20 @@ -1243,10 +1243,10 @@ NoControl - 766, 33 + 764, 33 - 127, 22 + 129, 22 50 @@ -1273,10 +1273,10 @@ NoControl - 766, 61 + 764, 61 - 127, 22 + 129, 22 51 @@ -1303,10 +1303,10 @@ NoControl - 766, 117 + 764, 117 - 127, 22 + 129, 22 52 @@ -1336,7 +1336,7 @@ NoControl - 532, 0 + 530, 0 67, 30 @@ -1375,7 +1375,7 @@ NoControl - 558, 37 + 556, 37 15, 14 @@ -1408,7 +1408,7 @@ NoControl - 558, 65 + 556, 65 15, 14 @@ -1441,7 +1441,7 @@ NoControl - 558, 93 + 556, 93 15, 14 @@ -1474,7 +1474,7 @@ NoControl - 558, 121 + 556, 121 15, 14 @@ -1522,7 +1522,7 @@ 0 - <?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,132" /><Rows Styles="AutoSize,0,Percent,25,Percent,25,Percent,25,Percent,25" /></TableLayoutSettings> + <?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,134" /><Rows Styles="AutoSize,0,Percent,25,Percent,25,Percent,25,Percent,25" /></TableLayoutSettings> Fill @@ -2910,9 +2910,6 @@ 15 - - True - No (English UI) @@ -2932,7 +2929,7 @@ languagePackComboBox1 - DS4Windows.DS4Forms.LanguagePackComboBox, DS4Windows, Version=1.5.2.0, Culture=neutral, PublicKeyToken=null + DS4Windows.DS4Forms.LanguagePackComboBox, DS4Windows, Version=1.5.12.0, Culture=neutral, PublicKeyToken=null fLPSettings @@ -2940,9 +2937,6 @@ 16 - - True - True @@ -3772,7 +3766,7 @@ advColorDialog - DS4Windows.AdvancedColorDialog, DS4Windows, Version=1.5.2.0, Culture=neutral, PublicKeyToken=null + DS4Windows.AdvancedColorDialog, DS4Windows, Version=1.5.12.0, Culture=neutral, PublicKeyToken=null DS4Form