Merge branch 'jay' into vigem-udpserver

DS4Windows/DS4Control/ScpUtil.cs

@@ -500,6 +500,12 @@ namespace DS4Windows
             get { return m_Config.startMinimized; }
         }
 
+        public static bool MinToTaskbar
+        {
+            set { m_Config.minToTaskbar = value; }
+            get { return m_Config.minToTaskbar; }
+        }
+
         public static int FormWidth
         {
             set { m_Config.formWidth = value; }
@@ -1431,6 +1437,7 @@ namespace DS4Windows
         public int formLocationX = 0;
         public int formLocationY = 0;
         public Boolean startMinimized = false;
+        public Boolean minToTaskbar = false;
         public DateTime lastChecked;
         public int CheckWhen = 1;
         public int notifications = 2;
@@ -2881,6 +2888,8 @@ namespace DS4Windows
                     catch { missingSetting = true; }
                     try { Item = m_Xdoc.SelectSingleNode("/Profile/startMinimized"); Boolean.TryParse(Item.InnerText, out startMinimized); }
                     catch { missingSetting = true; }
+                    try { Item = m_Xdoc.SelectSingleNode("/Profile/minimizeToTaskbar"); Boolean.TryParse(Item.InnerText, out minToTaskbar); }
+                    catch { missingSetting = true; }
                     try { Item = m_Xdoc.SelectSingleNode("/Profile/formWidth"); Int32.TryParse(Item.InnerText, out formWidth); }
                     catch { missingSetting = true; }
                     try { Item = m_Xdoc.SelectSingleNode("/Profile/formHeight"); Int32.TryParse(Item.InnerText, out formHeight); }
@@ -3018,6 +3027,7 @@ namespace DS4Windows
 
             XmlNode xmlUseExclNode = m_Xdoc.CreateNode(XmlNodeType.Element, "useExclusiveMode", null); xmlUseExclNode.InnerText = useExclusiveMode.ToString(); Node.AppendChild(xmlUseExclNode);
             XmlNode xmlStartMinimized = m_Xdoc.CreateNode(XmlNodeType.Element, "startMinimized", null); xmlStartMinimized.InnerText = startMinimized.ToString(); Node.AppendChild(xmlStartMinimized);
+            XmlNode xmlminToTaskbar = m_Xdoc.CreateNode(XmlNodeType.Element, "minimizeToTaskbar", null); xmlminToTaskbar.InnerText = minToTaskbar.ToString(); Node.AppendChild(xmlminToTaskbar);
             XmlNode xmlFormWidth = m_Xdoc.CreateNode(XmlNodeType.Element, "formWidth", null); xmlFormWidth.InnerText = formWidth.ToString(); Node.AppendChild(xmlFormWidth);
             XmlNode xmlFormHeight = m_Xdoc.CreateNode(XmlNodeType.Element, "formHeight", null); xmlFormHeight.InnerText = formHeight.ToString(); Node.AppendChild(xmlFormHeight);
             XmlNode xmlFormLocationX = m_Xdoc.CreateNode(XmlNodeType.Element, "formLocationX", null); xmlFormLocationX.InnerText = formLocationX.ToString(); Node.AppendChild(xmlFormLocationX);

DS4Windows/DS4Forms/DS4Form.Designer.cs

@@ -44,6 +44,12 @@
             this.editProfileForController2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.editProfileForController3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.editProfileForController4ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+            this.disconToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.discon1toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.discon2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.discon3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.discon4ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.startToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -126,7 +132,6 @@
             this.runStartTaskRadio = new System.Windows.Forms.RadioButton();
             this.label1 = new System.Windows.Forms.Label();
             this.runStartProgRadio = new System.Windows.Forms.RadioButton();
-            this.startMinimizedCheckBox = new System.Windows.Forms.CheckBox();
             this.panel1 = new System.Windows.Forms.Panel();
             this.lbNotifications = new System.Windows.Forms.Label();
             this.cBoxNotifications = new System.Windows.Forms.ComboBox();
@@ -135,6 +140,8 @@
             this.nUDLatency = new System.Windows.Forms.NumericUpDown();
             this.lbMsLatency = new System.Windows.Forms.Label();
             this.cBFlashWhenLate = new System.Windows.Forms.CheckBox();
+            this.startMinimizedCheckBox = new System.Windows.Forms.CheckBox();
+            this.mintoTaskCheckBox = new System.Windows.Forms.CheckBox();
             this.cBCloseMini = new System.Windows.Forms.CheckBox();
             this.cBQuickCharge = new System.Windows.Forms.CheckBox();
             this.cBUseWhiteIcon = new System.Windows.Forms.CheckBox();
@@ -272,6 +279,8 @@
             this.editProfileForController2ToolStripMenuItem,
             this.editProfileForController3ToolStripMenuItem,
             this.editProfileForController4ToolStripMenuItem,
+            this.toolStripSeparator4,
+            this.disconToolStripMenuItem,
             this.toolStripSeparator1,
             this.startToolStripMenuItem,
             this.openToolStripMenuItem,
@@ -309,6 +318,49 @@
             this.editProfileForController4ToolStripMenuItem.Tag = "4";
             this.editProfileForController4ToolStripMenuItem.Click += new System.EventHandler(this.editMenu_Click);
             // 
+            // toolStripSeparator4
+            // 
+            this.toolStripSeparator4.Name = "toolStripSeparator4";
+            resources.ApplyResources(this.toolStripSeparator4, "toolStripSeparator4");
+            // 
+            // disconToolStripMenuItem
+            // 
+            this.disconToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.discon1toolStripMenuItem,
+            this.discon2ToolStripMenuItem,
+            this.discon3ToolStripMenuItem,
+            this.discon4ToolStripMenuItem});
+            this.disconToolStripMenuItem.Name = "disconToolStripMenuItem";
+            resources.ApplyResources(this.disconToolStripMenuItem, "disconToolStripMenuItem");
+            // 
+            // discon1toolStripMenuItem
+            // 
+            this.discon1toolStripMenuItem.Name = "discon1toolStripMenuItem";
+            resources.ApplyResources(this.discon1toolStripMenuItem, "discon1toolStripMenuItem");
+            this.discon1toolStripMenuItem.Tag = "0";
+            this.discon1toolStripMenuItem.Click += new System.EventHandler(this.DiscontoolStripMenuItem_Click);
+            // 
+            // discon2ToolStripMenuItem
+            // 
+            this.discon2ToolStripMenuItem.Name = "discon2ToolStripMenuItem";
+            resources.ApplyResources(this.discon2ToolStripMenuItem, "discon2ToolStripMenuItem");
+            this.discon2ToolStripMenuItem.Tag = "1";
+            this.discon2ToolStripMenuItem.Click += new System.EventHandler(this.DiscontoolStripMenuItem_Click);
+            // 
+            // discon3ToolStripMenuItem
+            // 
+            this.discon3ToolStripMenuItem.Name = "discon3ToolStripMenuItem";
+            resources.ApplyResources(this.discon3ToolStripMenuItem, "discon3ToolStripMenuItem");
+            this.discon3ToolStripMenuItem.Tag = "2";
+            this.discon3ToolStripMenuItem.Click += new System.EventHandler(this.DiscontoolStripMenuItem_Click);
+            // 
+            // discon4ToolStripMenuItem
+            // 
+            this.discon4ToolStripMenuItem.Name = "discon4ToolStripMenuItem";
+            resources.ApplyResources(this.discon4ToolStripMenuItem, "discon4ToolStripMenuItem");
+            this.discon4ToolStripMenuItem.Tag = "3";
+            this.discon4ToolStripMenuItem.Click += new System.EventHandler(this.DiscontoolStripMenuItem_Click);
+            // 
             // toolStripSeparator1
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
@@ -895,10 +947,11 @@
             this.fLPSettings.Controls.Add(this.cBSwipeProfiles);
             this.fLPSettings.Controls.Add(this.StartWindowsCheckBox);
             this.fLPSettings.Controls.Add(this.runStartupPanel);
-            this.fLPSettings.Controls.Add(this.startMinimizedCheckBox);
             this.fLPSettings.Controls.Add(this.panel1);
             this.fLPSettings.Controls.Add(this.cBDisconnectBT);
             this.fLPSettings.Controls.Add(this.panel2);
+            this.fLPSettings.Controls.Add(this.startMinimizedCheckBox);
+            this.fLPSettings.Controls.Add(this.mintoTaskCheckBox);
             this.fLPSettings.Controls.Add(this.cBCloseMini);
             this.fLPSettings.Controls.Add(this.cBQuickCharge);
             this.fLPSettings.Controls.Add(this.cBUseWhiteIcon);
@@ -970,13 +1023,6 @@
             this.runStartProgRadio.UseVisualStyleBackColor = false;
             this.runStartProgRadio.Click += new System.EventHandler(this.runStartProgRadio_Click);
             // 
-            // startMinimizedCheckBox
-            // 
-            resources.ApplyResources(this.startMinimizedCheckBox, "startMinimizedCheckBox");
-            this.startMinimizedCheckBox.Name = "startMinimizedCheckBox";
-            this.startMinimizedCheckBox.UseVisualStyleBackColor = true;
-            this.startMinimizedCheckBox.CheckedChanged += new System.EventHandler(this.startMinimizedCheckBox_CheckedChanged);
-            // 
             // panel1
             // 
             this.panel1.Controls.Add(this.lbNotifications);
@@ -1046,6 +1092,19 @@
             this.cBFlashWhenLate.UseVisualStyleBackColor = false;
             this.cBFlashWhenLate.CheckedChanged += new System.EventHandler(this.cBFlashWhenLate_CheckedChanged);
             // 
+            // startMinimizedCheckBox
+            // 
+            resources.ApplyResources(this.startMinimizedCheckBox, "startMinimizedCheckBox");
+            this.startMinimizedCheckBox.Name = "startMinimizedCheckBox";
+            this.startMinimizedCheckBox.UseVisualStyleBackColor = true;
+            this.startMinimizedCheckBox.CheckedChanged += new System.EventHandler(this.startMinimizedCheckBox_CheckedChanged);
+            // 
+            // mintoTaskCheckBox
+            // 
+            resources.ApplyResources(this.mintoTaskCheckBox, "mintoTaskCheckBox");
+            this.mintoTaskCheckBox.Name = "mintoTaskCheckBox";
+            this.mintoTaskCheckBox.UseVisualStyleBackColor = true;
+            // 
             // cBCloseMini
             // 
             resources.ApplyResources(this.cBCloseMini, "cBCloseMini");
@@ -1491,6 +1550,13 @@
         private System.Windows.Forms.LinkLabel hidGuardRegLinkLabel;
         private System.Windows.Forms.Label linkSplitLabel;
         private System.Windows.Forms.ToolStripMenuItem openProgramFolderToolStripMenuItem;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
+        private System.Windows.Forms.ToolStripMenuItem disconToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem discon1toolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem discon2ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem discon3ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem discon4ToolStripMenuItem;
+        private System.Windows.Forms.CheckBox mintoTaskCheckBox;
         //private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2;
     }
 }

DS4Windows/DS4Forms/DS4Form.cs

@@ -33,6 +33,7 @@ namespace DS4Windows
         private Button[] lights;
         private PictureBox[] statPB;
         private ToolStripMenuItem[] shortcuts;
+        private ToolStripMenuItem[] disconnectShortcuts;
         protected CheckBox[] linkedProfileCB;
         WebClient wc = new WebClient();
         NonFormTimer hotkeysTimer = new NonFormTimer();
@@ -51,11 +52,9 @@ namespace DS4Windows
         public Size oldsize;
         public bool mAllowVisible;
         bool contextclose;
-        string logFile = appdatapath + @"\DS4Service.log";
         bool turnOffTemp;
         bool runningBat;
         private bool changingService;
-        public bool ChangingService => changingService;
         Dictionary<Control, string> hoverTextDict = new Dictionary<Control, string>();
         // 0 index is used for application version text. 1 - 4 indices are used for controller status
         string[] notifyText = new string[5]
@@ -101,7 +100,6 @@ namespace DS4Windows
             Global.SetCulture(UseLang);
 
             InitializeComponent();
-            ThemeUtil.SetTheme(lvDebug);
 
             bnEditC1.Tag = 0;
             bnEditC2.Tag = 1;
@@ -124,6 +122,11 @@ namespace DS4Windows
                 (ToolStripMenuItem)notifyIcon1.ContextMenuStrip.Items[1],
                 (ToolStripMenuItem)notifyIcon1.ContextMenuStrip.Items[2],
                 (ToolStripMenuItem)notifyIcon1.ContextMenuStrip.Items[3] };
+            disconnectShortcuts = new ToolStripMenuItem[4]
+            {
+                discon1toolStripMenuItem, discon2ToolStripMenuItem,
+                discon3ToolStripMenuItem, discon4ToolStripMenuItem
+            };
 
             linkedProfileCB = new CheckBox[4] { linkCB1, linkCB2, linkCB3, linkCB4 };
 
@@ -154,7 +157,6 @@ namespace DS4Windows
             Program.rootHub.Debug += On_Debug;
 
             Log.GuiLog += On_Debug;
-            logFile = appdatapath + "\\DS4Windows.log";
             Log.TrayIconLog += ShowNotification;
 
             Directory.CreateDirectory(appdatapath);
@@ -210,6 +212,10 @@ namespace DS4Windows
             startMinimizedCheckBox.CheckedChanged -= startMinimizedCheckBox_CheckedChanged;
             startMinimizedCheckBox.Checked = StartMinimized;
             startMinimizedCheckBox.CheckedChanged += startMinimizedCheckBox_CheckedChanged;
+
+            mintoTaskCheckBox.Checked = Global.MinToTaskbar;
+            mintoTaskCheckBox.CheckedChanged += MintoTaskCheckBox_CheckedChanged;
+
             cBCloseMini.Checked = CloseMini;
 
             cBFlashWhenLate.Checked = FlashWhenLate;
@@ -870,14 +876,14 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
 
         protected void Form_Resize(object sender, EventArgs e)
         {
-            if (FormWindowState.Minimized == WindowState)
+            if (FormWindowState.Minimized == WindowState && !MinToTaskbar)
             {
                 Hide();
                 ShowInTaskbar = false;
                 FormBorderStyle = FormBorderStyle.None;
             }
 
-            else if (FormWindowState.Normal == WindowState)
+            else if (FormWindowState.Normal == WindowState && !MinToTaskbar)
             {
                 //mAllowVisible = true;
                 Show();
@@ -1283,6 +1289,8 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
             shortcuts[device].Visible = on;
             Batteries[device].Visible = on;
             linkedProfileCB[device].Visible = on;
+            disconnectShortcuts[device].Visible = on &&
+                Program.rootHub.DS4Controllers[device].ConnectionType != ConnectionType.USB;
         }
 
         protected void On_Debug(object sender, DebugEventArgs e)
@@ -1436,7 +1444,7 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
             //opt.Dock = DockStyle.Fill;
             //lBProfiles.SendToBack();
             //toolStrip1.SendToBack();
-            tSOptions.SendToBack();
+            //tSOptions.SendToBack();
             opt.BringToFront();
             oldsize = Size;
             {
@@ -2485,6 +2493,30 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
             catch { }
         }
 
+        private void DiscontoolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            ToolStripMenuItem item = (ToolStripMenuItem)sender;
+            int i = Convert.ToInt32(item.Tag);
+            DS4Device d = Program.rootHub.DS4Controllers[i];
+            if (d != null)
+            {
+                if (d.ConnectionType == ConnectionType.BT && !d.Charging)
+                {
+                    d.DisconnectBT();
+                }
+                else if (d.ConnectionType == ConnectionType.SONYWA && !d.Charging)
+                {
+                    d.DisconnectDongle();
+                }
+            }
+        }
+
+        private void MintoTaskCheckBox_CheckedChanged(object sender, EventArgs e)
+        {
+            MinToTaskbar = mintoTaskCheckBox.Checked;
+            Save();
+        }
+
         private void cBFlashWhenLate_CheckedChanged(object sender, EventArgs e)
         {
             FlashWhenLate = cBFlashWhenLate.Checked;
@@ -2497,28 +2529,4 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
             FlashWhenLateAt = (int)Math.Round(nUDLatency.Value);
         }
     }
-
-    public class ThemeUtil
-    {
-        [DllImport("UxTheme", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        private static extern int SetWindowTheme(IntPtr hWnd, String appName, String partList);
-
-        public static void SetTheme(ListView lv)
-        {
-            try
-            {
-                SetWindowTheme(lv.Handle, "Explorer", null);
-            }
-            catch { }
-        }
-
-        public static void SetTheme(TreeView tv)
-        {
-            try
-            {
-                SetWindowTheme(tv.Handle, "Explorer", null);
-            }
-            catch { }
-        }
-    }
 }

DS4Windows/DS4Forms/DS4Form.resx

@@ -345,6 +345,39 @@
   <data name="editProfileForController4ToolStripMenuItem.Text" xml:space="preserve">
     <value>Edit Profile for Controller 4</value>
   </data>
+  <data name="toolStripSeparator4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>211, 6</value>
+  </data>
+  <data name="discon1toolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>198, 22</value>
+  </data>
+  <data name="discon1toolStripMenuItem.Text" xml:space="preserve">
+    <value>Disconnect Controller 1</value>
+  </data>
+  <data name="discon2ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>198, 22</value>
+  </data>
+  <data name="discon2ToolStripMenuItem.Text" xml:space="preserve">
+    <value>Disconnect Controller 2</value>
+  </data>
+  <data name="discon3ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>198, 22</value>
+  </data>
+  <data name="discon3ToolStripMenuItem.Text" xml:space="preserve">
+    <value>Disconnect Controller 3</value>
+  </data>
+  <data name="discon4ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>198, 22</value>
+  </data>
+  <data name="discon4ToolStripMenuItem.Text" xml:space="preserve">
+    <value>Disconnect Controller 4</value>
+  </data>
+  <data name="disconToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>214, 22</value>
+  </data>
+  <data name="disconToolStripMenuItem.Text" xml:space="preserve">
+    <value>Disconnect Menu</value>
+  </data>
   <data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
     <value>211, 6</value>
   </data>
@@ -376,7 +409,7 @@
     <value>Exit (Middle Mouse)</value>
   </data>
   <data name="cMTaskbar.Size" type="System.Drawing.Size, System.Drawing">
-    <value>215, 186</value>
+    <value>215, 214</value>
   </data>
   <data name="&gt;&gt;cMTaskbar.Name" xml:space="preserve">
     <value>cMTaskbar</value>
@@ -412,10 +445,10 @@
     <value>NoControl</value>
   </data>
   <data name="bnLight3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>790, 89</value>
+    <value>780, 89</value>
   </data>
   <data name="bnLight3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>103, 22</value>
+    <value>113, 22</value>
   </data>
   <data name="bnLight3.TabIndex" type="System.Int32, mscorlib">
     <value>50</value>
@@ -439,7 +472,7 @@
     <value>NoControl</value>
   </data>
   <data name="pBStatus1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>378, 34</value>
+    <value>371, 34</value>
   </data>
   <data name="pBStatus1.Size" type="System.Drawing.Size, System.Drawing">
     <value>39, 20</value>
@@ -541,7 +574,7 @@
     <value>NoControl</value>
   </data>
   <data name="bnEditC3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>750, 89</value>
+    <value>740, 89</value>
   </data>
   <data name="bnEditC3.Size" type="System.Drawing.Size, System.Drawing">
     <value>34, 22</value>
@@ -571,7 +604,7 @@
     <value>NoControl</value>
   </data>
   <data name="bnEditC4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>750, 117</value>
+    <value>740, 117</value>
   </data>
   <data name="bnEditC4.Size" type="System.Drawing.Size, System.Drawing">
     <value>34, 22</value>
@@ -670,7 +703,7 @@
     <value>None</value>
   </data>
   <data name="cBController1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>633, 33</value>
+    <value>623, 33</value>
   </data>
   <data name="cBController1.Size" type="System.Drawing.Size, System.Drawing">
     <value>111, 21</value>
@@ -697,7 +730,7 @@
     <value>NoControl</value>
   </data>
   <data name="bnEditC2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>750, 61</value>
+    <value>740, 61</value>
   </data>
   <data name="bnEditC2.Size" type="System.Drawing.Size, System.Drawing">
     <value>34, 22</value>
@@ -724,7 +757,7 @@
     <value>None</value>
   </data>
   <data name="cBController2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>633, 61</value>
+    <value>623, 61</value>
   </data>
   <data name="cBController2.Size" type="System.Drawing.Size, System.Drawing">
     <value>111, 21</value>
@@ -748,7 +781,7 @@
     <value>None</value>
   </data>
   <data name="cBController3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>633, 89</value>
+    <value>623, 89</value>
   </data>
   <data name="cBController3.Size" type="System.Drawing.Size, System.Drawing">
     <value>111, 21</value>
@@ -775,7 +808,7 @@
     <value>NoControl</value>
   </data>
   <data name="bnEditC1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>750, 33</value>
+    <value>740, 33</value>
   </data>
   <data name="bnEditC1.Size" type="System.Drawing.Size, System.Drawing">
     <value>34, 22</value>
@@ -802,7 +835,7 @@
     <value>None</value>
   </data>
   <data name="cBController4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>633, 117</value>
+    <value>623, 117</value>
   </data>
   <data name="cBController4.Size" type="System.Drawing.Size, System.Drawing">
     <value>111, 21</value>
@@ -835,7 +868,7 @@
     <value>NoControl</value>
   </data>
   <data name="lbSelectedProfile.Location" type="System.Drawing.Point, System.Drawing">
-    <value>634, 7</value>
+    <value>624, 7</value>
   </data>
   <data name="lbSelectedProfile.Size" type="System.Drawing.Size, System.Drawing">
     <value>109, 15</value>
@@ -907,7 +940,7 @@
     <value>NoControl</value>
   </data>
   <data name="lbStatus.Location" type="System.Drawing.Point, System.Drawing">
-    <value>374, 7</value>
+    <value>367, 7</value>
   </data>
   <data name="lbStatus.Size" type="System.Drawing.Size, System.Drawing">
     <value>47, 15</value>
@@ -943,7 +976,7 @@
     <value>NoControl</value>
   </data>
   <data name="lbBattery.Location" type="System.Drawing.Point, System.Drawing">
-    <value>476, 7</value>
+    <value>467, 7</value>
   </data>
   <data name="lbBattery.Size" type="System.Drawing.Size, System.Drawing">
     <value>51, 15</value>
@@ -979,7 +1012,7 @@
     <value>NoControl</value>
   </data>
   <data name="lbBatt1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>482, 36</value>
+    <value>473, 36</value>
   </data>
   <data name="lbBatt1.Size" type="System.Drawing.Size, System.Drawing">
     <value>39, 15</value>
@@ -1015,7 +1048,7 @@
     <value>NoControl</value>
   </data>
   <data name="lbBatt2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>482, 64</value>
+    <value>473, 64</value>
   </data>
   <data name="lbBatt2.Size" type="System.Drawing.Size, System.Drawing">
     <value>39, 15</value>
@@ -1051,7 +1084,7 @@
     <value>NoControl</value>
   </data>
   <data name="lbBatt3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>482, 92</value>
+    <value>473, 92</value>
   </data>
   <data name="lbBatt3.Size" type="System.Drawing.Size, System.Drawing">
     <value>39, 15</value>
@@ -1087,7 +1120,7 @@
     <value>NoControl</value>
   </data>
   <data name="lbBatt4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>482, 120</value>
+    <value>473, 120</value>
   </data>
   <data name="lbBatt4.Size" type="System.Drawing.Size, System.Drawing">
     <value>39, 15</value>
@@ -1117,7 +1150,7 @@
     <value>NoControl</value>
   </data>
   <data name="pBStatus2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>378, 62</value>
+    <value>371, 62</value>
   </data>
   <data name="pBStatus2.Size" type="System.Drawing.Size, System.Drawing">
     <value>39, 20</value>
@@ -1147,7 +1180,7 @@
     <value>NoControl</value>
   </data>
   <data name="pBStatus3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>378, 90</value>
+    <value>371, 90</value>
   </data>
   <data name="pBStatus3.Size" type="System.Drawing.Size, System.Drawing">
     <value>39, 20</value>
@@ -1177,7 +1210,7 @@
     <value>NoControl</value>
   </data>
   <data name="pBStatus4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>378, 118</value>
+    <value>371, 118</value>
   </data>
   <data name="pBStatus4.Size" type="System.Drawing.Size, System.Drawing">
     <value>39, 20</value>
@@ -1210,10 +1243,10 @@
     <value>NoControl</value>
   </data>
   <data name="bnLight1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>790, 33</value>
+    <value>780, 33</value>
   </data>
   <data name="bnLight1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>103, 22</value>
+    <value>113, 22</value>
   </data>
   <data name="bnLight1.TabIndex" type="System.Int32, mscorlib">
     <value>50</value>
@@ -1240,10 +1273,10 @@
     <value>NoControl</value>
   </data>
   <data name="bnLight2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>790, 61</value>
+    <value>780, 61</value>
   </data>
   <data name="bnLight2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>103, 22</value>
+    <value>113, 22</value>
   </data>
   <data name="bnLight2.TabIndex" type="System.Int32, mscorlib">
     <value>51</value>
@@ -1270,10 +1303,10 @@
     <value>NoControl</value>
   </data>
   <data name="bnLight4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>790, 117</value>
+    <value>780, 117</value>
   </data>
   <data name="bnLight4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>103, 22</value>
+    <value>113, 22</value>
   </data>
   <data name="bnLight4.TabIndex" type="System.Int32, mscorlib">
     <value>52</value>
@@ -1303,7 +1336,7 @@
     <value>NoControl</value>
   </data>
   <data name="lbLinkProfile.Location" type="System.Drawing.Point, System.Drawing">
-    <value>556, 0</value>
+    <value>546, 0</value>
   </data>
   <data name="lbLinkProfile.Size" type="System.Drawing.Size, System.Drawing">
     <value>67, 30</value>
@@ -1342,7 +1375,7 @@
     <value>NoControl</value>
   </data>
   <data name="linkCB1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>582, 37</value>
+    <value>572, 37</value>
   </data>
   <data name="linkCB1.Size" type="System.Drawing.Size, System.Drawing">
     <value>15, 14</value>
@@ -1375,7 +1408,7 @@
     <value>NoControl</value>
   </data>
   <data name="linkCB2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>582, 65</value>
+    <value>572, 65</value>
   </data>
   <data name="linkCB2.Size" type="System.Drawing.Size, System.Drawing">
     <value>15, 14</value>
@@ -1408,7 +1441,7 @@
     <value>NoControl</value>
   </data>
   <data name="linkCB3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>582, 93</value>
+    <value>572, 93</value>
   </data>
   <data name="linkCB3.Size" type="System.Drawing.Size, System.Drawing">
     <value>15, 14</value>
@@ -1441,7 +1474,7 @@
     <value>NoControl</value>
   </data>
   <data name="linkCB4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>582, 121</value>
+    <value>572, 121</value>
   </data>
   <data name="linkCB4.Size" type="System.Drawing.Size, System.Drawing">
     <value>15, 14</value>
@@ -1489,7 +1522,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,107" /&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,117" /&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>
@@ -2127,39 +2160,6 @@
   <data name="&gt;&gt;runStartupPanel.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
-  <data name="startMinimizedCheckBox.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="startMinimizedCheckBox.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
-    <value>None</value>
-  </data>
-  <data name="startMinimizedCheckBox.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="startMinimizedCheckBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 165</value>
-  </data>
-  <data name="startMinimizedCheckBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>97, 17</value>
-  </data>
-  <data name="startMinimizedCheckBox.TabIndex" type="System.Int32, mscorlib">
-    <value>40</value>
-  </data>
-  <data name="startMinimizedCheckBox.Text" xml:space="preserve">
-    <value>Start Minimized</value>
-  </data>
-  <data name="&gt;&gt;startMinimizedCheckBox.Name" xml:space="preserve">
-    <value>startMinimizedCheckBox</value>
-  </data>
-  <data name="&gt;&gt;startMinimizedCheckBox.Type" xml:space="preserve">
-    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;startMinimizedCheckBox.Parent" xml:space="preserve">
-    <value>fLPSettings</value>
-  </data>
-  <data name="&gt;&gt;startMinimizedCheckBox.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
   <data name="lbNotifications.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -2224,7 +2224,7 @@
     <value>1</value>
   </data>
   <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 188</value>
+    <value>10, 165</value>
   </data>
   <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
     <value>213, 22</value>
@@ -2242,7 +2242,7 @@
     <value>fLPSettings</value>
   </data>
   <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>4</value>
   </data>
   <data name="cBDisconnectBT.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2254,7 +2254,7 @@
     <value>NoControl</value>
   </data>
   <data name="cBDisconnectBT.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 216</value>
+    <value>10, 193</value>
   </data>
   <data name="cBDisconnectBT.Size" type="System.Drawing.Size, System.Drawing">
     <value>194, 17</value>
@@ -2275,7 +2275,7 @@
     <value>fLPSettings</value>
   </data>
   <data name="&gt;&gt;cBDisconnectBT.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>5</value>
   </data>
   <data name="nUDLatency.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Right</value>
@@ -2368,7 +2368,7 @@
     <value>2</value>
   </data>
   <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 239</value>
+    <value>10, 216</value>
   </data>
   <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
     <value>258, 22</value>
@@ -2386,8 +2386,74 @@
     <value>fLPSettings</value>
   </data>
   <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <data name="startMinimizedCheckBox.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="startMinimizedCheckBox.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
+    <value>None</value>
+  </data>
+  <data name="startMinimizedCheckBox.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="startMinimizedCheckBox.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 244</value>
+  </data>
+  <data name="startMinimizedCheckBox.Size" type="System.Drawing.Size, System.Drawing">
+    <value>97, 17</value>
+  </data>
+  <data name="startMinimizedCheckBox.TabIndex" type="System.Int32, mscorlib">
+    <value>40</value>
+  </data>
+  <data name="startMinimizedCheckBox.Text" xml:space="preserve">
+    <value>Start Minimized</value>
+  </data>
+  <data name="&gt;&gt;startMinimizedCheckBox.Name" xml:space="preserve">
+    <value>startMinimizedCheckBox</value>
+  </data>
+  <data name="&gt;&gt;startMinimizedCheckBox.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;startMinimizedCheckBox.Parent" xml:space="preserve">
+    <value>fLPSettings</value>
+  </data>
+  <data name="&gt;&gt;startMinimizedCheckBox.ZOrder" xml:space="preserve">
     <value>7</value>
   </data>
+  <data name="mintoTaskCheckBox.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="mintoTaskCheckBox.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
+    <value>None</value>
+  </data>
+  <data name="mintoTaskCheckBox.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="mintoTaskCheckBox.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 267</value>
+  </data>
+  <data name="mintoTaskCheckBox.Size" type="System.Drawing.Size, System.Drawing">
+    <value>120, 17</value>
+  </data>
+  <data name="mintoTaskCheckBox.TabIndex" type="System.Int32, mscorlib">
+    <value>61</value>
+  </data>
+  <data name="mintoTaskCheckBox.Text" xml:space="preserve">
+    <value>Minimize to Taskbar</value>
+  </data>
+  <data name="&gt;&gt;mintoTaskCheckBox.Name" xml:space="preserve">
+    <value>mintoTaskCheckBox</value>
+  </data>
+  <data name="&gt;&gt;mintoTaskCheckBox.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;mintoTaskCheckBox.Parent" xml:space="preserve">
+    <value>fLPSettings</value>
+  </data>
+  <data name="&gt;&gt;mintoTaskCheckBox.ZOrder" xml:space="preserve">
+    <value>8</value>
+  </data>
   <data name="cBCloseMini.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -2398,7 +2464,7 @@
     <value>NoControl</value>
   </data>
   <data name="cBCloseMini.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 267</value>
+    <value>10, 290</value>
   </data>
   <data name="cBCloseMini.Size" type="System.Drawing.Size, System.Drawing">
     <value>100, 17</value>
@@ -2419,7 +2485,7 @@
     <value>fLPSettings</value>
   </data>
   <data name="&gt;&gt;cBCloseMini.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>9</value>
   </data>
   <data name="cBQuickCharge.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2431,7 +2497,7 @@
     <value>NoControl</value>
   </data>
   <data name="cBQuickCharge.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 290</value>
+    <value>10, 313</value>
   </data>
   <data name="cBQuickCharge.Size" type="System.Drawing.Size, System.Drawing">
     <value>91, 17</value>
@@ -2452,7 +2518,7 @@
     <value>fLPSettings</value>
   </data>
   <data name="&gt;&gt;cBQuickCharge.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>10</value>
   </data>
   <data name="cBUseWhiteIcon.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2464,7 +2530,7 @@
     <value>NoControl</value>
   </data>
   <data name="cBUseWhiteIcon.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 312</value>
+    <value>273, 9</value>
   </data>
   <data name="cBUseWhiteIcon.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -2488,7 +2554,7 @@
     <value>fLPSettings</value>
   </data>
   <data name="&gt;&gt;cBUseWhiteIcon.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>11</value>
   </data>
   <data name="cBUpdate.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2500,7 +2566,7 @@
     <value>NoControl</value>
   </data>
   <data name="cBUpdate.Location" type="System.Drawing.Point, System.Drawing">
-    <value>274, 10</value>
+    <value>274, 31</value>
   </data>
   <data name="cBUpdate.Size" type="System.Drawing.Size, System.Drawing">
     <value>164, 17</value>
@@ -2521,7 +2587,7 @@
     <value>fLPSettings</value>
   </data>
   <data name="&gt;&gt;cBUpdate.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>12</value>
   </data>
   <data name="cBUpdateTime.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Right</value>
@@ -2614,7 +2680,7 @@
     <value>False</value>
   </data>
   <data name="pNUpdate.Location" type="System.Drawing.Point, System.Drawing">
-    <value>274, 33</value>
+    <value>274, 54</value>
   </data>
   <data name="pNUpdate.Size" type="System.Drawing.Size, System.Drawing">
     <value>189, 22</value>
@@ -2632,7 +2698,7 @@
     <value>fLPSettings</value>
   </data>
   <data name="&gt;&gt;pNUpdate.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>13</value>
   </data>
   <data name="lbUseXIPorts.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Left</value>
@@ -2725,7 +2791,7 @@
     <value>2</value>
   </data>
   <data name="pnlXIPorts.Location" type="System.Drawing.Point, System.Drawing">
-    <value>274, 61</value>
+    <value>274, 82</value>
   </data>
   <data name="pnlXIPorts.Size" type="System.Drawing.Size, System.Drawing">
     <value>186, 22</value>
@@ -2743,7 +2809,7 @@
     <value>fLPSettings</value>
   </data>
   <data name="&gt;&gt;pnlXIPorts.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>14</value>
   </data>
   <data name="languagePackComboBox1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2755,7 +2821,7 @@
     <value>Use language pack</value>
   </data>
   <data name="languagePackComboBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>274, 89</value>
+    <value>274, 110</value>
   </data>
   <data name="languagePackComboBox1.Size" type="System.Drawing.Size, System.Drawing">
     <value>260, 27</value>
@@ -2767,13 +2833,13 @@
     <value>languagePackComboBox1</value>
   </data>
   <data name="&gt;&gt;languagePackComboBox1.Type" xml:space="preserve">
-    <value>DS4Windows.DS4Forms.LanguagePackComboBox, DS4Windows, Version=1.4.110.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DS4Windows.DS4Forms.LanguagePackComboBox, DS4Windows, Version=1.4.119.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;languagePackComboBox1.Parent" xml:space="preserve">
     <value>fLPSettings</value>
   </data>
   <data name="&gt;&gt;languagePackComboBox1.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>15</value>
   </data>
   <data name="flowLayoutPanel1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2937,6 +3003,9 @@
   <data name="linkSplitLabel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Left, Right</value>
   </data>
+  <data name="linkSplitLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="linkSplitLabel.Location" type="System.Drawing.Point, System.Drawing">
     <value>7, 73</value>
   </data>
@@ -2964,6 +3033,9 @@
   <data name="hidGuardWhiteList.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <data name="hidGuardWhiteList.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="hidGuardWhiteList.Location" type="System.Drawing.Point, System.Drawing">
     <value>7, 77</value>
   </data>
@@ -2991,6 +3063,9 @@
   <data name="clrHidGuardWlistLinkLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <data name="clrHidGuardWlistLinkLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="clrHidGuardWlistLinkLabel.Location" type="System.Drawing.Point, System.Drawing">
     <value>7, 90</value>
   </data>
@@ -3018,6 +3093,9 @@
   <data name="hidGuardRegLinkLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <data name="hidGuardRegLinkLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="hidGuardRegLinkLabel.Location" type="System.Drawing.Point, System.Drawing">
     <value>7, 103</value>
   </data>
@@ -3046,7 +3124,7 @@
     <value>TopDown</value>
   </data>
   <data name="flowLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>274, 122</value>
+    <value>274, 143</value>
   </data>
   <data name="flowLayoutPanel1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>4, 4, 4, 4</value>
@@ -3067,7 +3145,7 @@
     <value>fLPSettings</value>
   </data>
   <data name="&gt;&gt;flowLayoutPanel1.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>16</value>
   </data>
   <data name="fLPSettings.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
@@ -3357,6 +3435,42 @@
   <data name="&gt;&gt;editProfileForController4ToolStripMenuItem.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;toolStripSeparator4.Name" xml:space="preserve">
+    <value>toolStripSeparator4</value>
+  </data>
+  <data name="&gt;&gt;toolStripSeparator4.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;disconToolStripMenuItem.Name" xml:space="preserve">
+    <value>disconToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;disconToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;discon1toolStripMenuItem.Name" xml:space="preserve">
+    <value>discon1toolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;discon1toolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;discon2ToolStripMenuItem.Name" xml:space="preserve">
+    <value>discon2ToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;discon2ToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;discon3ToolStripMenuItem.Name" xml:space="preserve">
+    <value>discon3ToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;discon3ToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;discon4ToolStripMenuItem.Name" xml:space="preserve">
+    <value>discon4ToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;discon4ToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;toolStripSeparator1.Name" xml:space="preserve">
     <value>toolStripSeparator1</value>
   </data>
@@ -3559,7 +3673,7 @@
     <value>advColorDialog</value>
   </data>
   <data name="&gt;&gt;advColorDialog.Type" xml:space="preserve">
-    <value>DS4Windows.AdvancedColorDialog, DS4Windows, Version=1.4.110.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DS4Windows.AdvancedColorDialog, DS4Windows, Version=1.4.119.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>DS4Form</value>

DS4Windows/DS4Forms/Options.Designer.cs

@@ -3580,10 +3580,10 @@
             65536});
             resources.ApplyResources(this.nUDL2S, "nUDL2S");
             this.nUDL2S.Maximum = new decimal(new int[] {
-            50,
+            10,
             0,
             0,
-            65536});
+            0});
             this.nUDL2S.Minimum = new decimal(new int[] {
             1,
             0,
@@ -3607,10 +3607,10 @@
             65536});
             resources.ApplyResources(this.nUDLSS, "nUDLSS");
             this.nUDLSS.Maximum = new decimal(new int[] {
-            15,
+            5,
             0,
             0,
-            65536});
+            0});
             this.nUDLSS.Minimum = new decimal(new int[] {
             5,
             0,
@@ -3639,10 +3639,10 @@
             65536});
             resources.ApplyResources(this.nUDR2S, "nUDR2S");
             this.nUDR2S.Maximum = new decimal(new int[] {
-            50,
+            10,
             0,
             0,
-            65536});
+            0});
             this.nUDR2S.Minimum = new decimal(new int[] {
             1,
             0,
@@ -3671,10 +3671,10 @@
             65536});
             resources.ApplyResources(this.nUDRSS, "nUDRSS");
             this.nUDRSS.Maximum = new decimal(new int[] {
-            15,
+            5,
             0,
             0,
-            65536});
+            0});
             this.nUDRSS.Minimum = new decimal(new int[] {
             5,
             0,
@@ -3703,10 +3703,10 @@
             65536});
             resources.ApplyResources(this.nUDSXS, "nUDSXS");
             this.nUDSXS.Maximum = new decimal(new int[] {
-            15,
+            5,
             0,
             0,
-            65536});
+            0});
             this.nUDSXS.Minimum = new decimal(new int[] {
             5,
             0,
@@ -3740,10 +3740,10 @@
             65536});
             resources.ApplyResources(this.nUDSZS, "nUDSZS");
             this.nUDSZS.Maximum = new decimal(new int[] {
-            15,
+            5,
             0,
             0,
-            65536});
+            0});
             this.nUDSZS.Minimum = new decimal(new int[] {
             5,
             0,

DS4Windows/DS4Library/DS4Audio.cs

@@ -62,7 +62,7 @@ namespace DS4Windows.DS4Library
                     endpointVolume = interfacePointer as IAudioEndpointVolume;
                     endpointVolume.RegisterControlChangeNotify(this);
                 }
-                else if (deviceName.Contains("(Wireless Controller)"))
+                else if (deviceName.Contains("Wireless Controller"))
                 {
                     object interfacePointer;
                     Marshal.ThrowExceptionForHR(audioDevice.Activate(ref IID_IAudioEndpointVolume, ClsCtx.ALL, IntPtr.Zero, out interfacePointer));

DS4Windows/DS4Library/DS4Device.cs

@@ -114,6 +114,8 @@ namespace DS4Windows
     {
         internal const int BT_OUTPUT_REPORT_LENGTH = 78;
         internal const int BT_INPUT_REPORT_LENGTH = 547;
+        internal const int BT_OUTPUT_CHANGE_LENGTH = 13;
+        internal const int USB_OUTPUT_CHANGE_LENGTH = 11;
         // Use large value for worst case scenario
         internal const int READ_STREAM_TIMEOUT = 3000;
         // Isolated BT report can have latency as high as 15 ms
@@ -641,7 +643,7 @@ namespace DS4Windows
                             Monitor.Wait(outReportBuffer);
                             fixed (byte* byteR = outputReport, byteB = outReportBuffer)
                             {
-                                for (int i = 0, arlen = outputReport.Length; i < arlen; i++)
+                                for (int i = 0, arlen = BT_OUTPUT_CHANGE_LENGTH; i < arlen; i++)
                                     byteR[i] = byteB[i];
                             }
                             //outReportBuffer.CopyTo(outputReport, 0);
@@ -1139,7 +1141,7 @@ namespace DS4Windows
 
                     fixed (byte* byteR = outputReport, byteB = outReportBuffer)
                     {
-                        for (int i = 0, arlen = 13; !change && i < arlen; i++)
+                        for (int i = 0, arlen = BT_OUTPUT_CHANGE_LENGTH; !change && i < arlen; i++)
                             change = byteR[i] != byteB[i];
                     }
                 }
@@ -1158,7 +1160,7 @@ namespace DS4Windows
 
                     fixed (byte* byteR = outputReport, byteB = outReportBuffer)
                     {
-                        for (int i = 0, arlen = 11; !change && i < arlen; i++)
+                        for (int i = 0, arlen = USB_OUTPUT_CHANGE_LENGTH; !change && i < arlen; i++)
                             change = byteR[i] != byteB[i];
                     }
 
@@ -1182,9 +1184,10 @@ namespace DS4Windows
                         if (usingBT)
                         {
                             Monitor.Enter(outputReport);
-                            outReportBuffer.CopyTo(outputReport, 0);
                         }
 
+                        outReportBuffer.CopyTo(outputReport, 0);
+
                         try
                         {
                             if (!writeOutput())

DS4Windows/Program.cs

@@ -38,7 +38,6 @@ namespace DS4Windows
                 if (s == "driverinstall" || s == "-driverinstall")
                 {
                     Application.EnableVisualStyles();
-                    Application.SetCompatibleTextRenderingDefault(false);
                     Application.Run(new WelcomeDialog(true));
                     return;
                 }
@@ -107,7 +106,6 @@ namespace DS4Windows
                 rootHub.createHidGuardKey();
                 //rootHub = new ControlService();
                 Application.EnableVisualStyles();
-                Application.SetCompatibleTextRenderingDefault(false);
                 Application.Run(new DS4Form(args));
                 rootHub.removeHidGuardKey();
             //mutex.ReleaseMutex();

DS4Windows/Properties/AssemblyInfo.cs

@@ -33,7 +33,7 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.119")]
+[assembly: AssemblyVersion("1.4.120")]
-[assembly: AssemblyFileVersion("1.4.119")]
+[assembly: AssemblyFileVersion("1.4.120")]
 [assembly: NeutralResourcesLanguage("en")]
 

README.md

@@ -60,6 +60,5 @@ Bitcoin: 1DnMJwjdd7JRfHJap2mmTmADYm38SzR2z9
 Dogecoin: D9fhbXp9bCHEhuS8vX1BmVu6t7Y2nVNUCK  
 Litecoin: La5mniW7SFMH2RhqDgUty3RwkBSYbjbnJ6  
 Monero: 49RvRMiMewaeez1Y2auxHmfMaAUYfhUpBem4ohzRJd9b5acPcxzh1icjnhZfjnYd1S7NQ57reQ7cP1swGre3rpfzUgJhEB7  
-MakerSupport: https://www.makersupport.com/Ryochan7  
 PayPal: https://paypal.me/ryochan7
 

contributors.txt

@@ -1,3 +1,5 @@
 Travis Nickles (Ryochan7)
 Korney Czukowski (czukowski)
+jdfeng
+Yuki-nyan