From 6f0cad625319e3fb685e08047f7eea028cd23a2c Mon Sep 17 00:00:00 2001 From: Travis Nickles Date: Thu, 9 Nov 2017 02:09:13 -0600 Subject: [PATCH] Restore event handler. Move version log message --- DS4Windows/DS4Forms/DS4Form.Designer.cs | 1 + DS4Windows/DS4Forms/DS4Form.cs | 7 +-- DS4Windows/DS4Forms/DS4Form.resx | 66 ++++++++++++------------- 3 files changed, 38 insertions(+), 36 deletions(-) diff --git a/DS4Windows/DS4Forms/DS4Form.Designer.cs b/DS4Windows/DS4Forms/DS4Form.Designer.cs index f8a2fdb..c1b746a 100644 --- a/DS4Windows/DS4Forms/DS4Form.Designer.cs +++ b/DS4Windows/DS4Forms/DS4Form.Designer.cs @@ -1230,6 +1230,7 @@ resources.ApplyResources(this.btnClear, "btnClear"); this.btnClear.Name = "btnClear"; this.btnClear.UseVisualStyleBackColor = true; + this.btnClear.Click += new System.EventHandler(this.btnClear_Click); // // saveProfiles // diff --git a/DS4Windows/DS4Forms/DS4Form.cs b/DS4Windows/DS4Forms/DS4Form.cs index 92b500a..4f2b4ca 100644 --- a/DS4Windows/DS4Forms/DS4Form.cs +++ b/DS4Windows/DS4Forms/DS4Form.cs @@ -315,6 +315,10 @@ namespace DS4Windows autoProfilesTimer.Elapsed += CheckAutoProfiles; autoProfilesTimer.Interval = 1000; + FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location); + string version = fvi.FileVersion; + Log.LogToGui("DS4Windows version " + version, false); + LoadP(); LoadLinkedProfiles(); @@ -335,9 +339,6 @@ namespace DS4Windows hotkeysTimer.Start(); } - FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location); - string version = fvi.FileVersion; - Log.LogToGui("DS4Windows version " + version, false); if (btnStartStop.Enabled && start) btnStartStop_Clicked(); diff --git a/DS4Windows/DS4Forms/DS4Form.resx b/DS4Windows/DS4Forms/DS4Form.resx index 856691e..b8f3006 100644 --- a/DS4Windows/DS4Forms/DS4Form.resx +++ b/DS4Windows/DS4Forms/DS4Form.resx @@ -439,10 +439,10 @@ NoControl - 789, 89 + 788, 89 - 104, 22 + 105, 22 50 @@ -466,7 +466,7 @@ NoControl - 359, 34 + 358, 34 39, 20 @@ -568,7 +568,7 @@ NoControl - 749, 89 + 748, 89 34, 22 @@ -598,7 +598,7 @@ NoControl - 749, 117 + 748, 117 34, 22 @@ -697,7 +697,7 @@ None - 632, 33 + 631, 33 111, 21 @@ -724,7 +724,7 @@ NoControl - 749, 61 + 748, 61 34, 22 @@ -751,7 +751,7 @@ None - 632, 61 + 631, 61 111, 21 @@ -775,7 +775,7 @@ None - 632, 89 + 631, 89 111, 21 @@ -802,7 +802,7 @@ NoControl - 749, 33 + 748, 33 34, 22 @@ -829,7 +829,7 @@ None - 632, 117 + 631, 117 111, 21 @@ -862,7 +862,7 @@ NoControl - 633, 7 + 632, 7 109, 15 @@ -934,7 +934,7 @@ NoControl - 355, 7 + 354, 7 47, 15 @@ -970,7 +970,7 @@ NoControl - 467, 7 + 466, 7 51, 15 @@ -1006,7 +1006,7 @@ NoControl - 473, 36 + 472, 36 39, 15 @@ -1042,7 +1042,7 @@ NoControl - 473, 64 + 472, 64 39, 15 @@ -1078,7 +1078,7 @@ NoControl - 473, 92 + 472, 92 39, 15 @@ -1114,7 +1114,7 @@ NoControl - 473, 120 + 472, 120 39, 15 @@ -1144,7 +1144,7 @@ NoControl - 359, 62 + 358, 62 39, 20 @@ -1174,7 +1174,7 @@ NoControl - 359, 90 + 358, 90 39, 20 @@ -1204,7 +1204,7 @@ NoControl - 359, 118 + 358, 118 39, 20 @@ -1237,10 +1237,10 @@ NoControl - 789, 33 + 788, 33 - 104, 22 + 105, 22 50 @@ -1267,10 +1267,10 @@ NoControl - 789, 61 + 788, 61 - 104, 22 + 105, 22 51 @@ -1297,10 +1297,10 @@ NoControl - 789, 117 + 788, 117 - 104, 22 + 105, 22 52 @@ -1330,7 +1330,7 @@ NoControl - 555, 0 + 554, 0 67, 30 @@ -1369,7 +1369,7 @@ NoControl - 581, 37 + 580, 37 15, 14 @@ -1402,7 +1402,7 @@ NoControl - 581, 65 + 580, 65 15, 14 @@ -1435,7 +1435,7 @@ NoControl - 581, 93 + 580, 93 15, 14 @@ -1468,7 +1468,7 @@ NoControl - 581, 121 + 580, 121 15, 14 @@ -1516,7 +1516,7 @@ 1 - <?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,58.35329,Percent,21.22288,Percent,20.42383,Absolute,80,AutoSize,0,Absolute,40,Absolute,108" /><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,58.35329,Percent,21.22288,Percent,20.42383,Absolute,80,AutoSize,0,Absolute,40,Absolute,110" /><Rows Styles="AutoSize,0,Percent,25,Percent,25,Percent,25,Percent,25" /></TableLayoutSettings> Fill