From b370d57bc310b8e74015a7ef710c68487b8e77be Mon Sep 17 00:00:00 2001 From: Travis Nickles Date: Wed, 17 May 2017 02:10:15 -0700 Subject: [PATCH] Make Import Profile button enabled at all times --- DS4Windows/DS4Forms/DS4Form.Designer.cs | 2 +- DS4Windows/DS4Forms/DS4Form.cs | 2 +- DS4Windows/DS4Forms/DS4Form.resx | 59 ++++++++++++------------- 3 files changed, 30 insertions(+), 33 deletions(-) diff --git a/DS4Windows/DS4Forms/DS4Form.Designer.cs b/DS4Windows/DS4Forms/DS4Form.Designer.cs index a4e7b5a..a1deceb 100644 --- a/DS4Windows/DS4Forms/DS4Form.Designer.cs +++ b/DS4Windows/DS4Forms/DS4Form.Designer.cs @@ -817,8 +817,8 @@ // // tSBImportProfile // - resources.ApplyResources(this.tSBImportProfile, "tSBImportProfile"); this.tSBImportProfile.Image = global::DS4Windows.Properties.Resources.import; + resources.ApplyResources(this.tSBImportProfile, "tSBImportProfile"); this.tSBImportProfile.Name = "tSBImportProfile"; this.tSBImportProfile.Click += new System.EventHandler(this.tSBImportProfile_Click); // diff --git a/DS4Windows/DS4Forms/DS4Form.cs b/DS4Windows/DS4Forms/DS4Form.cs index c08ea29..c2ca70a 100644 --- a/DS4Windows/DS4Forms/DS4Form.cs +++ b/DS4Windows/DS4Forms/DS4Form.cs @@ -2243,7 +2243,7 @@ namespace DS4Windows tsBEditProfile.Enabled = false; tsBDeleteProfile.Enabled = false; tSBDupProfile.Enabled = false; - tSBImportProfile.Enabled = false; + tSBImportProfile.Enabled = true; tSBExportProfile.Enabled = false; } } diff --git a/DS4Windows/DS4Forms/DS4Form.resx b/DS4Windows/DS4Forms/DS4Form.resx index bcbcbcb..2b2d924 100644 --- a/DS4Windows/DS4Forms/DS4Form.resx +++ b/DS4Windows/DS4Forms/DS4Form.resx @@ -469,10 +469,10 @@ NoControl - 815, 74 + 813, 74 - 78, 22 + 80, 22 50 @@ -496,7 +496,7 @@ NoControl - 387, 19 + 386, 19 39, 20 @@ -598,7 +598,7 @@ NoControl - 772, 74 + 770, 74 37, 22 @@ -628,7 +628,7 @@ NoControl - 772, 102 + 770, 102 37, 22 @@ -727,7 +727,7 @@ None - 655, 18 + 653, 18 111, 21 @@ -754,7 +754,7 @@ NoControl - 772, 46 + 770, 46 37, 22 @@ -781,7 +781,7 @@ None - 655, 46 + 653, 46 111, 21 @@ -805,7 +805,7 @@ None - 655, 74 + 653, 74 111, 21 @@ -832,7 +832,7 @@ NoControl - 772, 18 + 770, 18 37, 22 @@ -859,7 +859,7 @@ None - 655, 102 + 653, 102 111, 21 @@ -892,7 +892,7 @@ NoControl - 656, 0 + 654, 0 109, 15 @@ -964,7 +964,7 @@ NoControl - 383, 0 + 382, 0 47, 15 @@ -1000,7 +1000,7 @@ NoControl - 547, 0 + 546, 0 51, 15 @@ -1036,7 +1036,7 @@ NoControl - 553, 21 + 552, 21 39, 15 @@ -1072,7 +1072,7 @@ NoControl - 553, 49 + 552, 49 39, 15 @@ -1108,7 +1108,7 @@ NoControl - 553, 77 + 552, 77 39, 15 @@ -1144,7 +1144,7 @@ NoControl - 553, 105 + 552, 105 39, 15 @@ -1174,7 +1174,7 @@ NoControl - 387, 47 + 386, 47 39, 20 @@ -1204,7 +1204,7 @@ NoControl - 387, 75 + 386, 75 39, 20 @@ -1234,7 +1234,7 @@ NoControl - 387, 103 + 386, 103 39, 20 @@ -1267,10 +1267,10 @@ NoControl - 815, 18 + 813, 18 - 78, 22 + 80, 22 50 @@ -1297,10 +1297,10 @@ NoControl - 815, 46 + 813, 46 - 78, 22 + 80, 22 51 @@ -1327,10 +1327,10 @@ NoControl - 815, 102 + 813, 102 - 78, 22 + 80, 22 52 @@ -1375,7 +1375,7 @@ 1 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="bnLight3" Row="3" RowSpan="1" Column="5" 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="4" ColumnSpan="1" /><Control Name="bnEditC4" Row="4" RowSpan="1" Column="4" 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="3" ColumnSpan="1" /><Control Name="bnEditC2" Row="2" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="cBController2" Row="2" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="cBController3" Row="3" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="bnEditC1" Row="1" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="cBController4" Row="4" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="lbSelectedProfile" Row="0" RowSpan="1" Column="3" 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="5" ColumnSpan="1" /><Control Name="bnLight2" Row="2" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="bnLight4" Row="4" RowSpan="1" Column="5" ColumnSpan="1" /></Controls><Columns Styles="Percent,48.95498,Percent,26.82658,Percent,24.21844,AutoSize,0,AutoSize,0,Absolute,83" /><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="5" 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="4" ColumnSpan="1" /><Control Name="bnEditC4" Row="4" RowSpan="1" Column="4" 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="3" ColumnSpan="1" /><Control Name="bnEditC2" Row="2" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="cBController2" Row="2" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="cBController3" Row="3" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="bnEditC1" Row="1" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="cBController4" Row="4" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="lbSelectedProfile" Row="0" RowSpan="1" Column="3" 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="5" ColumnSpan="1" /><Control Name="bnLight2" Row="2" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="bnLight4" Row="4" RowSpan="1" Column="5" ColumnSpan="1" /></Controls><Columns Styles="Percent,48.95498,Percent,26.82658,Percent,24.21844,AutoSize,0,AutoSize,0,Absolute,84" /><Rows Styles="AutoSize,0,Percent,25,Percent,25,Percent,25,Percent,25" /></TableLayoutSettings> Fill @@ -1671,9 +1671,6 @@ Dupliacate Selected Profile (Ctrl+D) - - False - Magenta