From ad9f707cdadfeb301e4bdf43ad88cbfb8d8d03b4 Mon Sep 17 00:00:00 2001 From: Travis Nickles Date: Mon, 24 Apr 2017 08:28:51 -0700 Subject: [PATCH] Remove attempt to show shield icon --- DS4Windows/DS4Forms/DS4Form.Designer.cs | 11 --- DS4Windows/DS4Forms/DS4Form.cs | 2 - DS4Windows/DS4Forms/DS4Form.resx | 92 +++++++++---------------- 3 files changed, 31 insertions(+), 74 deletions(-) diff --git a/DS4Windows/DS4Forms/DS4Form.Designer.cs b/DS4Windows/DS4Forms/DS4Form.Designer.cs index c631a3b..f64d894 100644 --- a/DS4Windows/DS4Forms/DS4Form.Designer.cs +++ b/DS4Windows/DS4Forms/DS4Form.Designer.cs @@ -119,7 +119,6 @@ this.cBSwipeProfiles = new System.Windows.Forms.CheckBox(); this.StartWindowsCheckBox = new System.Windows.Forms.CheckBox(); this.runStartupPanel = new System.Windows.Forms.Panel(); - this.uacTaskButton = new System.Windows.Forms.Button(); this.runStartTaskRadio = new System.Windows.Forms.RadioButton(); this.label1 = new System.Windows.Forms.Label(); this.runStartProgRadio = new System.Windows.Forms.RadioButton(); @@ -894,21 +893,12 @@ // runStartupPanel // this.runStartupPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.runStartupPanel.Controls.Add(this.uacTaskButton); this.runStartupPanel.Controls.Add(this.runStartTaskRadio); this.runStartupPanel.Controls.Add(this.label1); this.runStartupPanel.Controls.Add(this.runStartProgRadio); resources.ApplyResources(this.runStartupPanel, "runStartupPanel"); this.runStartupPanel.Name = "runStartupPanel"; // - // uacTaskButton - // - this.uacTaskButton.FlatAppearance.BorderSize = 0; - resources.ApplyResources(this.uacTaskButton, "uacTaskButton"); - this.uacTaskButton.ForeColor = System.Drawing.SystemColors.ControlLightLight; - this.uacTaskButton.Name = "uacTaskButton"; - this.uacTaskButton.UseVisualStyleBackColor = true; - // // runStartTaskRadio // resources.ApplyResources(this.runStartTaskRadio, "runStartTaskRadio"); @@ -1389,7 +1379,6 @@ private System.Windows.Forms.Label label1; private System.Windows.Forms.RadioButton runStartProgRadio; private System.Windows.Forms.RadioButton runStartTaskRadio; - private System.Windows.Forms.Button uacTaskButton; //private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; } } diff --git a/DS4Windows/DS4Forms/DS4Form.cs b/DS4Windows/DS4Forms/DS4Form.cs index 02326f7..1fee932 100644 --- a/DS4Windows/DS4Forms/DS4Form.cs +++ b/DS4Windows/DS4Forms/DS4Form.cs @@ -377,8 +377,6 @@ namespace DS4Windows appShortcutToStartup(); changeStartupRoutine(); } - - SendMessage(uacTaskButton.Handle, BCM_SETSHIELD, 0, 1); } UpdateTheUpdater(); diff --git a/DS4Windows/DS4Forms/DS4Form.resx b/DS4Windows/DS4Forms/DS4Form.resx index 86c1808..6c79bcd 100644 --- a/DS4Windows/DS4Forms/DS4Form.resx +++ b/DS4Windows/DS4Forms/DS4Form.resx @@ -475,10 +475,10 @@ NoControl - 828, 74 + 826, 74 - 65, 22 + 67, 22 50 @@ -502,7 +502,7 @@ NoControl - 395, 19 + 394, 19 39, 20 @@ -604,7 +604,7 @@ NoControl - 785, 74 + 783, 74 37, 22 @@ -634,7 +634,7 @@ NoControl - 785, 102 + 783, 102 37, 22 @@ -733,7 +733,7 @@ None - 668, 18 + 666, 18 111, 21 @@ -760,7 +760,7 @@ NoControl - 785, 46 + 783, 46 37, 22 @@ -787,7 +787,7 @@ None - 668, 46 + 666, 46 111, 21 @@ -811,7 +811,7 @@ None - 668, 74 + 666, 74 111, 21 @@ -838,7 +838,7 @@ NoControl - 785, 18 + 783, 18 37, 22 @@ -865,7 +865,7 @@ None - 668, 102 + 666, 102 111, 21 @@ -898,7 +898,7 @@ NoControl - 669, 0 + 667, 0 109, 15 @@ -970,7 +970,7 @@ NoControl - 391, 0 + 390, 0 47, 15 @@ -1006,7 +1006,7 @@ NoControl - 559, 0 + 557, 0 51, 15 @@ -1042,7 +1042,7 @@ NoControl - 565, 21 + 563, 21 39, 15 @@ -1078,7 +1078,7 @@ NoControl - 565, 49 + 563, 49 39, 15 @@ -1114,7 +1114,7 @@ NoControl - 565, 77 + 563, 77 39, 15 @@ -1150,7 +1150,7 @@ NoControl - 565, 105 + 563, 105 39, 15 @@ -1180,7 +1180,7 @@ NoControl - 395, 47 + 394, 47 39, 20 @@ -1210,7 +1210,7 @@ NoControl - 395, 75 + 394, 75 39, 20 @@ -1240,7 +1240,7 @@ NoControl - 395, 103 + 394, 103 39, 20 @@ -1273,10 +1273,10 @@ NoControl - 828, 18 + 826, 18 - 65, 22 + 67, 22 50 @@ -1303,10 +1303,10 @@ NoControl - 828, 46 + 826, 46 - 65, 22 + 67, 22 51 @@ -1333,10 +1333,10 @@ NoControl - 828, 102 + 826, 102 - 65, 22 + 67, 22 52 @@ -1381,7 +1381,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,69" /><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,72" /><Rows Styles="AutoSize,0,Percent,25,Percent,25,Percent,25,Percent,25" /></TableLayoutSettings> Fill @@ -1875,36 +1875,6 @@ 2 - - System - - - NoControl - - - 65, 51 - - - 43, 23 - - - 3 - - - - - - uacTaskButton - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - runStartupPanel - - - 0 - True @@ -1933,7 +1903,7 @@ runStartupPanel - 1 + 0 True @@ -1963,7 +1933,7 @@ runStartupPanel - 2 + 1 True @@ -1993,7 +1963,7 @@ runStartupPanel - 3 + 2 10, 79