diff --git a/DS4Control/Control.cs b/DS4Control/Control.cs index 62814cd..2dd27b9 100644 --- a/DS4Control/Control.cs +++ b/DS4Control/Control.cs @@ -84,7 +84,6 @@ namespace DS4Control x360Bus.Plugin(ind); device.Report += this.On_Report; TouchPadOn(ind, device); - LaunchProgram(ind); string filename = Path.GetFileName(Global.getAProfile(ind)); ind++; if (showlog) @@ -187,7 +186,6 @@ namespace DS4Control if (!Global.getDinputOnly(Index)) x360Bus.Plugin(Index); TouchPadOn(Index, device); - LaunchProgram(Index); string filename = Path.GetFileName(Global.getAProfile(Index)); if (System.IO.File.Exists(Global.appdatapath + "\\Profiles\\" + filename)) { @@ -208,13 +206,6 @@ namespace DS4Control return true; } - public void LaunchProgram(int ind) - { - if (Global.getLaunchProgram(ind) != string.Empty) - { - System.Diagnostics.Process.Start(Global.getLaunchProgram(ind)); - } - } public void TouchPadOn(int ind, DS4Device device) { ITouchpadBehaviour tPad = touchPad[ind]; @@ -485,9 +476,9 @@ namespace DS4Control return "nothing"; } - bool[] touchreleased = { true, true, true, true }, touchslid = { false, false, false, false }; - byte[] oldtouchvalue = { 0, 0, 0, 0 }; - int[] oldscrollvalue = { 0, 0, 0, 0 }; + public bool[] touchreleased = { true, true, true, true }, touchslid = { false, false, false, false }; + public byte[] oldtouchvalue = { 0, 0, 0, 0 }; + public int[] oldscrollvalue = { 0, 0, 0, 0 }; protected virtual void CheckForHotkeys(int deviceID, DS4State cState, DS4State pState) { DS4Device d = DS4Controllers[deviceID]; @@ -531,6 +522,14 @@ namespace DS4Control touchreleased[deviceID] = true; } + public virtual void StartTPOff(int deviceID) + { + oldtouchvalue[deviceID] = Global.getTouchSensitivity(deviceID); + oldscrollvalue[deviceID] = Global.getScrollSensitivity(deviceID); + Global.setTouchSensitivity(deviceID, 0); + Global.setScrollSensitivity(deviceID, 0); + } + public virtual string TouchpadSlide(int ind) { DS4State cState = CurrentState[ind]; diff --git a/DS4Control/DS4LightBar.cs b/DS4Control/DS4LightBar.cs index 41b43a0..b7e64cc 100644 --- a/DS4Control/DS4LightBar.cs +++ b/DS4Control/DS4LightBar.cs @@ -137,12 +137,15 @@ namespace DS4Control else color = new DS4Color { red = 0, green = 0, blue = 0 }; } - Color dsc = Color.FromArgb(color.red, color.green, color.blue); - if (Global.getAProfile(deviceNum).ToLower().Contains("distance")) + bool distanceprofile = (Global.getAProfile(deviceNum).ToLower().Contains("distance") || Global.tempprofilename[deviceNum].ToLower().Contains("distance")); + if (distanceprofile && !defualtLight) { //Thing I did for Distance float rumble = device.LeftHeavySlowRumble / 2.55f; - if (device.LeftHeavySlowRumble > 50) - color = getTransitionedColor(color, rumble); + byte max= Math.Max(color.red, Math.Max(color.green, color.blue)); + if (device.LeftHeavySlowRumble > 100) + color = getTransitionedColor(new DS4Color { green = max, red = max }, rumble, new DS4Color { red = 255 }); + else + color = getTransitionedColor(color, device.LeftHeavySlowRumble, getTransitionedColor(new DS4Color { green = max, red = max }, 39.6078f, new DS4Color { red = 255 })); } DS4HapticState haptics = new DS4HapticState { @@ -158,7 +161,7 @@ namespace DS4Control haptics.LightBarFlashDurationOn = BatteryIndicatorDurations[level, 0]; haptics.LightBarFlashDurationOff = BatteryIndicatorDurations[level, 1]; } - else if (Global.getAProfile(deviceNum).ToLower().Contains("distance") && device.LeftHeavySlowRumble > 155) //also part of Distance + else if (distanceprofile && device.LeftHeavySlowRumble > 155) //also part of Distance { haptics.LightBarFlashDurationOff = haptics.LightBarFlashDurationOn = (byte)((-device.LeftHeavySlowRumble + 265)); haptics.LightBarExplicitlyOff = true; @@ -237,10 +240,8 @@ namespace DS4Control return new DS4Color { red = 255, green = 0, blue = 0 }; } - public static DS4Color getTransitionedColor(DS4Color c1, double ratio) - {//; - //Color cs = Color.FromArgb(c1.red, c1.green, c1.blue); - DS4Color c2 = new DS4Color { red = 255, green = 0, blue = 0 }; + public static DS4Color getTransitionedColor(DS4Color c1, double ratio, DS4Color c2) + { c1.red = applyRatio(c1.red, c2.red, ratio); c1.green = applyRatio(c1.green, c2.green, ratio); c1.blue = applyRatio(c1.blue, c2.blue, ratio); @@ -254,7 +255,7 @@ namespace DS4Control else if (r < 0) r = 0; uint ratio = (uint)r; - if (b1 > b2) + if (b1 > b2)// b2 == 255) { ratio = 100 - (uint)r; } diff --git a/DS4Control/ScpUtil.cs b/DS4Control/ScpUtil.cs index b9032e9..171552e 100644 --- a/DS4Control/ScpUtil.cs +++ b/DS4Control/ScpUtil.cs @@ -84,6 +84,7 @@ namespace DS4Control protected static Int32 m_IdleTimeout = 600000; static string exepath = Directory.GetParent(Assembly.GetExecutingAssembly().Location).FullName; public static string appdatapath; + public static string[] tempprofilename = new string[5] { string.Empty, string.Empty, string.Empty, string.Empty, string.Empty }; public static void SaveWhere(string path) { @@ -239,6 +240,14 @@ namespace DS4Control { return m_Config.dinputOnly[device]; } + public static void setStartTouchpadOff(int device, bool off) + { + m_Config.startTouchpadOff[device] = off; + } + public static bool getStartTouchpadOff(int device) + { + return m_Config.startTouchpadOff[device]; + } public static void setUseExclusiveMode(bool exclusive) { m_Config.useExclusiveMode = exclusive; @@ -593,17 +602,21 @@ namespace DS4Control { return m_Config.Load(); } - public static void LoadProfile(int device, System.Windows.Forms.Control[] buttons, System.Windows.Forms.Control[] shiftbuttons) + public static void LoadProfile(int device, System.Windows.Forms.Control[] buttons, System.Windows.Forms.Control[] shiftbuttons, bool launchprogram, Control control) { - m_Config.LoadProfile(device, buttons, shiftbuttons); + m_Config.LoadProfile(device, buttons, shiftbuttons, launchprogram, control); + tempprofilename[device] = string.Empty; } - public static void LoadProfile(int device) + public static void LoadProfile(int device, bool launchprogram, Control control) { - m_Config.LoadProfile(device, null, null); + m_Config.LoadProfile(device, null, null, launchprogram, control); + tempprofilename[device] = string.Empty; + } - public static void LoadTempProfile(int device, string name) + public static void LoadTempProfile(int device, string name, bool launchprogram, Control control) { - m_Config.LoadProfile(device, null, null, appdatapath + @"\Profiles\" + name + ".xml"); + m_Config.LoadProfile(device, null, null, launchprogram, control, appdatapath + @"\Profiles\" + name + ".xml"); + tempprofilename[device] = name; } public static bool Save() { @@ -695,8 +708,10 @@ namespace DS4Control protected XmlDocument m_Xdoc = new XmlDocument(); //fifth value used to for options, not fifth controller public int[] buttonMouseSensitivity = { 25, 25, 25, 25, 25 }; - - public Boolean[] touchpadJitterCompensation = {true, true, true, true, true}; + + public bool[] flushHIDQueue = { true, true, true, true, true }; + public int[] idleDisconnectTimeout = { 0, 0, 0, 0, 0 }; + public Boolean[] touchpadJitterCompensation = { true, true, true, true, true }; public Boolean[] lowerRCOn = { false, false, false, false, false }; public Boolean[] ledAsBattery = { false, false, false, false, false }; public Boolean[] flashLedLowBattery = { false, false, false, false, false }; @@ -710,7 +725,7 @@ namespace DS4Control public bool[] doubleTap = { false, false, false, false, false }; public int[] scrollSensitivity = { 0, 0, 0, 0, 0 }; public double[] rainbow = { 0, 0, 0, 0, 0 }; - public int[] flashAt = { 30, 30, 30, 30, 30 }; + public int[] flashAt = { 0, 0, 0, 0, 0 }; public int[] shiftModifier = { 0, 0, 0, 0, 0 }; public bool[] mouseAccel = { true, true, true, true, true }; public Byte[][] m_LowLeds = new Byte[][] @@ -755,11 +770,9 @@ namespace DS4Control }; public bool[] shiftColorOn = { false, false, false, false, false }; public int[] chargingType = { 0, 0, 0, 0, 0 }; - public bool[] flushHIDQueue = { true, true, true, true, true }; - public int[] idleDisconnectTimeout = { 0, 0, 0, 0, 0 }; public string[] launchProgram = { string.Empty, string.Empty, string.Empty, string.Empty, string.Empty }; public bool[] dinputOnly = { false, false, false, false, false }; - + public bool[] startTouchpadOff = { false, false, false, false, false }; public Boolean useExclusiveMode = false; public Int32 formWidth = 782; public Int32 formHeight = 550; @@ -916,6 +929,7 @@ namespace DS4Control XmlNode xmlShiftMod = m_Xdoc.CreateNode(XmlNodeType.Element, "ShiftModifier", null); xmlShiftMod.InnerText = shiftModifier[device].ToString(); Node.AppendChild(xmlShiftMod); XmlNode xmlLaunchProgram = m_Xdoc.CreateNode(XmlNodeType.Element, "LaunchProgram", null); xmlLaunchProgram.InnerText = launchProgram[device].ToString(); Node.AppendChild(xmlLaunchProgram); XmlNode xmlDinput = m_Xdoc.CreateNode(XmlNodeType.Element, "DinputOnly", null); xmlDinput.InnerText = dinputOnly[device].ToString(); Node.AppendChild(xmlDinput); + XmlNode xmlStartTouchpadOff = m_Xdoc.CreateNode(XmlNodeType.Element, "StartTouchpadOff", null); xmlStartTouchpadOff.InnerText = startTouchpadOff[device].ToString(); Node.AppendChild(xmlStartTouchpadOff); XmlNode NodeControl = m_Xdoc.CreateNode(XmlNodeType.Element, "Control", null); XmlNode Key = m_Xdoc.CreateNode(XmlNodeType.Element, "Key", null); @@ -1179,7 +1193,7 @@ namespace DS4Control return X360Controls.Unbound; } - public Boolean LoadProfile(int device, System.Windows.Forms.Control[] buttons, System.Windows.Forms.Control[] shiftbuttons, string propath = "") + public Boolean LoadProfile(int device, System.Windows.Forms.Control[] buttons, System.Windows.Forms.Control[] shiftbuttons, bool launchprogram, Control control, string propath = "") { Boolean Loaded = true; Dictionary customMapKeyTypes = new Dictionary(); @@ -1348,10 +1362,28 @@ namespace DS4Control catch { missingSetting = true; } try { Item = m_Xdoc.SelectSingleNode("/ScpControl/ShiftModifier"); Int32.TryParse(Item.InnerText, out shiftModifier[device]); } catch { shiftModifier[device] = 0; missingSetting = true; } - try { Item = m_Xdoc.SelectSingleNode("/ScpControl/LaunchProgram"); launchProgram[device] = Item.InnerText; } + try + { + Item = m_Xdoc.SelectSingleNode("/ScpControl/LaunchProgram"); + launchProgram[device] = Item.InnerText; + if (launchprogram == true && launchProgram[device] != string.Empty) System.Diagnostics.Process.Start(launchProgram[device]); + } catch { launchProgram[device] = string.Empty; missingSetting = true; } - try { Item = m_Xdoc.SelectSingleNode("/ScpControl/DinputOnly"); Boolean.TryParse(Item.InnerText, out dinputOnly[device]); } + try + { + Item = m_Xdoc.SelectSingleNode("/ScpControl/DinputOnly"); + Boolean.TryParse(Item.InnerText, out dinputOnly[device]); + if (dinputOnly[device] == true) control.x360Bus.Unplug(device); + else control.x360Bus.Plugin(device); + } catch { missingSetting = true; } + try + { + Item = m_Xdoc.SelectSingleNode("/ScpControl/StartTouchpadOff"); + Boolean.TryParse(Item.InnerText, out startTouchpadOff[device]); + if (startTouchpadOff[device] == true) control.StartTPOff(device); + } + catch { startTouchpadOff[device] = false; missingSetting = true; } DS4KeyType keyType; UInt16 wvk; if (buttons == null) diff --git a/DS4Tool/DS4Tool.csproj b/DS4Tool/DS4Tool.csproj index a4729f3..ff70ef6 100644 --- a/DS4Tool/DS4Tool.csproj +++ b/DS4Tool/DS4Tool.csproj @@ -185,6 +185,9 @@ Options.cs + + Options.cs + Options.cs diff --git a/DS4Tool/Hotkeys.resx b/DS4Tool/Hotkeys.resx index fb52ee0..dafc2ac 100644 --- a/DS4Tool/Hotkeys.resx +++ b/DS4Tool/Hotkeys.resx @@ -117,1217 +117,1217 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - label25 - - - Macro - - - 15 + + + Bottom, Left - - 3, 244 + + 215, 407 - - 5 - - - Click touchpad with 2 fingers - - - 184, 13 - - - 141, 13 - - - Left mouse drag - - - 4 - - - tableLayoutPanel1 - - - 0 - - - 515, 19 - - - label15 + + 75, 23 - - 3 + + 8 - - 2 finger touchpad swipe left or right + + Done - - 83, 13 + + button1 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 9 + + + Bottom, Left + + + True + + + 272, 382 + + + 149, 13 + + + 18 + + + electrobrains (Branched off of) + + + linkElectro + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + Bottom, Left + + + True + + + 17, 382 + + + 60, 13 + + + 18 + + + Jays2Kings + + + linkJays2Kings + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + Bottom, Left + + + True + + + 203, 360 + + + 109, 13 + + + 13 + + + Credits/Source Code: + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 8 Microsoft Sans Serif, 8.25pt, style=Bold + + 3, 9 + + + 515, 19 + 0 - - + + DS4Windows - Jays2Kings Build (Version + + + TopCenter + + + lbAbout + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 10 + + + Bottom, Left + + + True + + + 95, 382 + + + 159, 13 + + + 18 + + + InhexSTER (Starter of DS4Tool) + + + linkInhexSTER + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + Bottom, Left + + + True + + + 429, 382 + + + 87, 13 + + + 18 + + + jhebbel (DSDCS) + + + linkJhebbel + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + True + + + 6, 352 + + + 58, 13 + + + 3 + + + *If enabled + + + label23 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + + + Left + + + True + + + 3, 301 + + + 60, 13 + + + 14 + + + Scan Code + + + label26 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 25 + + + Left + + + True + + + 193, 263 + + + 296, 13 + + + 14 + + + The key will remain in a "held down" state until pressed again + + + label27 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 29 + + + Left + + + True + + + 3, 282 + + + 37, 13 + + + 14 + + + Macro + + + label25 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 26 + + Left True - - 3, 31 + + 193, 301 - - True - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 14 - - - 8, 9 - - - tableLayoutPanel1 - - - 70, 13 - - - Upper Touch - - - 14 - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - 14 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - True - - - True - - - Left - - - tableLayoutPanel1 - - - 3, 184 - - - tableLayoutPanel1 - - - label20 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 159, 13 - - - 56, 13 - - - 14 - - - tableLayoutPanel1 - - - 193, 32 - - - Right Touch - - - label10 - - - 176, 13 - - - True - - - label21 - - - 272, 382 - - - tableLayoutPanel1 - - - 193, 225 - - - linkJays2Kings - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 9 - - - DS4Windows - Jays2Kings Build (Version - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - label11 - - - Cycle through profiles - - - 9 - - - label26 - - - 146, 13 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 175, 13 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label20" Row="10" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label22" Row="10" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label1" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label17" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label5" Row="6" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label6" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label18" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label11" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label10" Row="8" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label19" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label9" Row="8" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label12" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label3" Row="9" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label21" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label7" Row="9" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label4" Row="7" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label15" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label16" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label8" Row="7" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label14" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label30" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label31" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label32" Row="11" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label13" Row="12" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label24" Row="13" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label26" Row="15" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label25" Row="14" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label29" Row="15" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label28" Row="14" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label27" Row="13" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label33" Row="11" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0" /><Rows Styles="Absolute,32,Percent,6.666667,Percent,6.666667,Percent,6.666667,Percent,6.666667,Percent,6.666667,Percent,6.666667,Percent,6.666667,Percent,6.666667,Percent,6.666667,Percent,6.666667,Percent,6.666667,Percent,6.666667,Percent,6.666667,Percent,6.666667,Percent,6.666667" /></TableLayoutSettings> - - - 19 - - - tableLayoutPanel1 - - - linkElectro - - - True - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 18 - - - Bottom, Left - - - Left - - - True - - - label27 - - - 109, 13 - - - Bottom, Left - - - 8 - - - 193, 51 - - - Keys are interpreted differently. May be needed for certain games - - - 6, 13 - - - 20 - - - 10 - - - label17 - - - 14 - - - Jays2Kings - - - tableLayoutPanel1 - - - 201, 13 - - - 11 - - - 75, 23 - - - 203, 360 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 21 - - - Left - - - 121, 13 - - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - tableLayoutPanel1 - - - $this - - - Changelog - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 66, 13 - - - 18 - - - 193, 165 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 18 - - - label22 - - - 15 + + 313, 13 14 - - $this + + Keys are interpreted differently. May be needed for certain games - - True + + label29 - - InhexSTER (Starter of DS4Tool) - - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tableLayoutPanel1 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 27 - - label12 - - + Left - - 3, 9 - - - Pad click on lower right* - - + True - - 193, 70 - - - 19 - - - 94, 13 - - - 14 - - - label23 - - - tableLayoutPanel1 - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Donate via Paypal - - - True - - - 16 - - - 216, 13 - - - 24 - - - 116, 13 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - label8 - 193, 282 - - True + + 160, 13 - + 14 - - 16 + + Assign multiple keys to one input - - True + + label28 - + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 28 + + True 193, 108 - - label9 + + 201, 13 - - label18 - - - 26 - - - label29 - - - label1 - - - 10 - - - 6 - - - True - - - 3 - - - 14 - - - 14 - - - tableLayoutPanel1 - - - True - - - label7 - - - Touch Touchpad + PS - - - label19 - - - 59, 13 - - - tableLayoutPanel1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 22 - - - True - - - 3, 203 - - - 9 - - - linkJhebbel - - - tableLayoutPanel1 - - - Turn off touchpad movement (clicking still works) - - - 100, 13 - - - $this - - - 193, 263 - - - jhebbel (DSDCS) - - - 66, 13 - - - 1 - - - 3, 225 - - - 193, 89 - - - 3, 301 - - - 30 - - - 125, 13 - - - 193, 127 - - - 8 - - - 60, 13 - - - 193, 3 - - - label2 - - - 3, 282 - - - $this - - - 14 - - - Left - - - tableLayoutPanel1 - - - 313, 13 - - - Bottom, Left - - - 14 - - - electrobrains (Branched off of) - - - True - - - True - - - 14 - - - 429, 382 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 7 - - - Credits/Source Code: - - - tableLayoutPanel1 - - - tableLayoutPanel1 - - - 6 - - - tableLayoutPanel1 - - - 215, 407 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - 14 - - - 13 - - - 2 - - - button1 - - - Click upper part of touchpad - - - True - - - 17 - - - Right click (Best used when right side is used as a mouse button) - - - label31 - - - tableLayoutPanel1 - - - Hold an action to use another set of controls - - - $this - - - 14 - - - 25 - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 3 - - - $this - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - 237, 13 - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 422, 9 - - - 0 - - - 6, 352 - - - 29 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 14 - - - 7 + + 16 Disconnect Controller (Only on Bluetooth) - - 3, 127 + + label14 - - 58, 13 - - - 193, 301 - - - lbAbout - - - Left - - - tableLayoutPanel1 - - - 83, 13 - - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 324, 26 - - - 3, 9 - - - Tap then hold touchpad* - - - True - - - 4 - - + tableLayoutPanel1 - - $this + + 19 - - 37, 13 - - - tableLayoutPanel1 - - - Hide DS4 Controller - - - Toggle - - - linkInhexSTER - - - Click left side of touchpad - - - 4 - - + True - - 296, 13 - - - Click right side of touchpad - - - tableLayoutPanel1 - - - True - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 160, 13 - - - tableLayoutPanel1 - - - When mapping keyboard and mouse: - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - Left - - - 58, 13 - - - 1 - - - 23 - - - True - - - 12 - - - label32 - - - Left Touch - - - tableLayoutPanel1 - - - 21 - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 7 - - - 3, 70 - - - 14 - - - True - - - tableLayoutPanel1 - - - 3, 51 - - - 6 - - - label33 - - - 16 - - - Bottom, Left - - - 14 - - - PS + Options or hold PS for 10 secs - - - 18 - - - 18 - 193, 146 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 28 - - - label13 - - - 149, 13 - - - 60, 13 - - - 10 - - - 2 - - - True - - - linkDonate - - - Two fingers up/down on touchpad* - - - 0 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 8 - - - 87, 13 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 172, 13 - - - 3 - - - $this - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 108, 13 - - - 27 - - - 17, 382 - - - Left - - - 14 - - - True - - - Hotkeys - - - 13 - - - 3, 165 - - - True - - - Bottom, Left - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 3, 32 - - - 20 - - - TopCenter - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Scroll Up/Down - - - 5 - - - 520, 434 - - - tableLayoutPanel1 - - - label4 - - - 14 - - - tableLayoutPanel1 - - - True - - - 14 - - - Bottom, Left - - - Shift Modifer - - - Help - - - Left - - + 313, 13 - - 95, 382 + + 7 - - label5 + + Right click (Best used when right side is used as a mouse button) - - The key will remain in a "held down" state until pressed again + + label8 - - tableLayoutPanel1 - - - label16 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 - + + 18 + + True - - Assign multiple keys to one input + + 193, 89 - - label30 + + 70, 13 - - True + + 14 - - label3 + + Upper Touch - + + label16 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tableLayoutPanel1 - + + 17 + + + True + + + 3, 108 + + + 176, 13 + + + 15 + + + PS + Options or hold PS for 10 secs + + + label15 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tableLayoutPanel1 + + + 16 + + + True 3, 146 - + + 121, 13 + + + 3 + + + Pad click on lower right* + + + label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 15 + + + True + + + 193, 184 + + + 83, 13 + + + 6 + + + Left mouse drag + + + label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 14 + + + True + + + 3, 89 + + + 141, 13 + + + 14 + + + Click upper part of touchpad + + + label21 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 13 + + + Left + + + True + + + 3, 244 + + + 184, 13 + + + 14 + + + When mapping keyboard and mouse: + + + TopCenter + + + label13 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 23 + + + True + + + 3, 184 + + + 125, 13 + + 2 - - *If enabled + + Tap then hold touchpad* - - 513, 318 + + label3 - + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 12 + + + True + + + 193, 70 + + + 56, 13 + + + 14 + + + Multitouch + + + label12 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 11 + + + True + + + 193, 165 + + + 83, 13 + + + 10 + + + Scroll Up/Down + + + label9 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 10 + + + True + + + 3, 70 + + + 146, 13 + + + 14 + + + Click touchpad with 2 fingers + + + label19 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 9 + + + True + + + 3, 165 + + + 175, 13 + + + 9 + + + Two fingers up/down on touchpad* + + + label10 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 8 + + + True + + + 193, 51 + + + 66, 13 + + + 14 + + + Right Touch + + + label11 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 7 + + + True + + + 3, 51 + + + 135, 13 + + + 14 + + + Click right side of touchpad + + + label18 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 6 + + + True + + + 193, 32 + + + 59, 13 + + + 14 + + + Left Touch + + + label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 5 + + + True + + + 193, 127 + + + 237, 13 + + + 4 + + + Turn off touchpad movement (clicking still works) + + + label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 4 + + + True + + + 3, 32 + + + 129, 13 + + + 14 + + + Click left side of touchpad + + + label17 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 3 + + + True + + + 3, 127 + + + 116, 13 + + + 0 + + + Touch Touchpad + PS + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 2 + + True 193, 203 - + + 108, 13 + + + 14 + + + Cycle through profiles + + + label22 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 1 + + + True + + + 3, 203 + + + 172, 13 + + + 14 + + + 2 finger touchpad swipe left or right + + + label20 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 0 + + Left - - Done + + True - - Multitouch - - - TopCenter - - - label28 - - - 3, 89 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 3, 108 - - - 193, 184 - - - Scan Code - - - label24 - - - 129, 13 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3, 263 40, 13 - - lLChangelog + + 14 - - label14 + + Toggle - + + label24 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 24 + + + 2 + + + Left + + True - - label6 + + 3, 9 - - 135, 13 + + 100, 13 - + + 14 + + + Hide DS4 Controller + + + label30 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 20 + + + Left + + + True + + + 193, 3 + + + 324, 26 + + 14 Hides the DS4's regular input (Dinput) from other programs check if you are getting double input in games or R2 pauses games - + + label31 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 21 + + + Left + + True - + + 3, 225 + + + 66, 13 + + + 14 + + + Shift Modifer + + + label32 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 22 + + + Left + + + True + + + 193, 225 + + + 216, 13 + + + 14 + + + Hold an action to use another set of controls + + + label33 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 30 + + + 3, 31 + + + 16 + + + 513, 318 + + + 19 + + + tableLayoutPanel1 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - 3, 263 - - + 2 - + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label20" Row="10" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label22" Row="10" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label1" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label17" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label5" Row="6" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label6" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label18" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label11" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label10" Row="8" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label19" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label9" Row="8" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label12" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label3" Row="9" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label21" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label7" Row="9" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label4" Row="7" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label15" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label16" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label8" Row="7" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label14" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label30" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label31" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label32" Row="11" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label13" Row="12" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label24" Row="13" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label26" Row="15" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label25" Row="14" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label29" Row="15" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label28" Row="14" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label27" Row="13" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label33" Row="11" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0" /><Rows Styles="Absolute,32,Percent,6.666667,Percent,6.666667,Percent,6.666667,Percent,6.666667,Percent,6.666667,Percent,6.666667,Percent,6.666667,Percent,6.666667,Percent,6.666667,Percent,6.666667,Percent,6.666667,Percent,6.666667,Percent,6.666667,Percent,6.666667,Percent,6.666667" /></TableLayoutSettings> + + + True + + + 8, 9 + + + 58, 13 + + + 20 + + + Changelog + + + lLChangelog + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this + + 1 + + + True + + + 422, 9 + + + 94, 13 + + + 21 + + + Donate via Paypal + + + linkDonate + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + True + + 6, 13 + + + 520, 434 + + + Help + + + Hotkeys + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/DS4Tool/Options.Designer.cs b/DS4Tool/Options.Designer.cs index de3a27d..b29ea9c 100644 --- a/DS4Tool/Options.Designer.cs +++ b/DS4Tool/Options.Designer.cs @@ -122,6 +122,7 @@ this.nUDLS = new System.Windows.Forms.NumericUpDown(); this.nUDL2 = new System.Windows.Forms.NumericUpDown(); this.gBTouchpad = new System.Windows.Forms.GroupBox(); + this.cbStartTouchpadOff = new System.Windows.Forms.CheckBox(); this.gBOther = new System.Windows.Forms.GroupBox(); this.cBDinput = new System.Windows.Forms.CheckBox(); this.pBProgram = new System.Windows.Forms.PictureBox(); @@ -133,15 +134,6 @@ this.cBControllerInput = new System.Windows.Forms.CheckBox(); this.cBIdleDisconnect = new System.Windows.Forms.CheckBox(); this.gBLightbar = new System.Windows.Forms.GroupBox(); - this.btnChargingColor = new System.Windows.Forms.Button(); - this.rBColor = new System.Windows.Forms.RadioButton(); - this.rBFade = new System.Windows.Forms.RadioButton(); - this.rBNormal = new System.Windows.Forms.RadioButton(); - this.rBRainbow = new System.Windows.Forms.RadioButton(); - this.lbWhileCharging = new System.Windows.Forms.Label(); - this.lbPercentFlashBar = new System.Windows.Forms.Label(); - this.nUDflashLED = new System.Windows.Forms.NumericUpDown(); - this.lbFlashAt = new System.Windows.Forms.Label(); this.ShiftPanel = new System.Windows.Forms.Panel(); this.cBShiftLight = new System.Windows.Forms.CheckBox(); this.lbShift = new System.Windows.Forms.Label(); @@ -151,6 +143,15 @@ this.shiftRedBar = new System.Windows.Forms.TrackBar(); this.shiftGreenBar = new System.Windows.Forms.TrackBar(); this.shiftBlueBar = new System.Windows.Forms.TrackBar(); + this.btnChargingColor = new System.Windows.Forms.Button(); + this.rBColor = new System.Windows.Forms.RadioButton(); + this.rBFade = new System.Windows.Forms.RadioButton(); + this.rBNormal = new System.Windows.Forms.RadioButton(); + this.rBRainbow = new System.Windows.Forms.RadioButton(); + this.lbWhileCharging = new System.Windows.Forms.Label(); + this.lbPercentFlashBar = new System.Windows.Forms.Label(); + this.nUDflashLED = new System.Windows.Forms.NumericUpDown(); + this.lbFlashAt = new System.Windows.Forms.Label(); this.gBRumble = new System.Windows.Forms.GroupBox(); this.lbPercentRumble = new System.Windows.Forms.Label(); this.gBDeadzone = new System.Windows.Forms.GroupBox(); @@ -271,11 +272,11 @@ ((System.ComponentModel.ISupportInitialize)(this.pBProgram)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nUDSixaxis)).BeginInit(); this.gBLightbar.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.nUDflashLED)).BeginInit(); this.ShiftPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.shiftRedBar)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.shiftGreenBar)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.shiftBlueBar)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nUDflashLED)).BeginInit(); this.gBRumble.SuspendLayout(); this.gBDeadzone.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nUDSZ)).BeginInit(); @@ -1379,6 +1380,7 @@ // // gBTouchpad // + this.gBTouchpad.Controls.Add(this.cbStartTouchpadOff); this.gBTouchpad.Controls.Add(this.cBTouchpadJitterCompensation); this.gBTouchpad.Controls.Add(this.cBDoubleTap); this.gBTouchpad.Controls.Add(this.cBlowerRCOn); @@ -1392,6 +1394,13 @@ this.gBTouchpad.Name = "gBTouchpad"; this.gBTouchpad.TabStop = false; // + // cbStartTouchpadOff + // + resources.ApplyResources(this.cbStartTouchpadOff, "cbStartTouchpadOff"); + this.cbStartTouchpadOff.Name = "cbStartTouchpadOff"; + this.cbStartTouchpadOff.UseVisualStyleBackColor = true; + this.cbStartTouchpadOff.CheckedChanged += new System.EventHandler(this.cbStartTouchpadOff_CheckedChanged); + // // gBOther // this.gBOther.Controls.Add(this.cBDinput); @@ -1510,72 +1519,6 @@ this.gBLightbar.Name = "gBLightbar"; this.gBLightbar.TabStop = false; // - // btnChargingColor - // - this.btnChargingColor.BackColor = System.Drawing.Color.White; - resources.ApplyResources(this.btnChargingColor, "btnChargingColor"); - this.btnChargingColor.Name = "btnChargingColor"; - this.btnChargingColor.UseVisualStyleBackColor = false; - this.btnChargingColor.Click += new System.EventHandler(this.btnChargingColor_Click); - // - // rBColor - // - resources.ApplyResources(this.rBColor, "rBColor"); - this.rBColor.Name = "rBColor"; - this.rBColor.TabStop = true; - this.rBColor.UseVisualStyleBackColor = true; - this.rBColor.CheckedChanged += new System.EventHandler(this.rBColor_CheckedChanged); - // - // rBFade - // - resources.ApplyResources(this.rBFade, "rBFade"); - this.rBFade.Name = "rBFade"; - this.rBFade.UseVisualStyleBackColor = true; - this.rBFade.CheckedChanged += new System.EventHandler(this.rBFade_CheckedChanged); - // - // rBNormal - // - resources.ApplyResources(this.rBNormal, "rBNormal"); - this.rBNormal.Checked = true; - this.rBNormal.Name = "rBNormal"; - this.rBNormal.TabStop = true; - this.rBNormal.UseVisualStyleBackColor = true; - this.rBNormal.CheckedChanged += new System.EventHandler(this.rBNormal_CheckedChanged); - // - // rBRainbow - // - resources.ApplyResources(this.rBRainbow, "rBRainbow"); - this.rBRainbow.Name = "rBRainbow"; - this.rBRainbow.UseVisualStyleBackColor = true; - this.rBRainbow.CheckedChanged += new System.EventHandler(this.rBRainbow_CheckedChanged); - // - // lbWhileCharging - // - resources.ApplyResources(this.lbWhileCharging, "lbWhileCharging"); - this.lbWhileCharging.Name = "lbWhileCharging"; - // - // lbPercentFlashBar - // - resources.ApplyResources(this.lbPercentFlashBar, "lbPercentFlashBar"); - this.lbPercentFlashBar.Name = "lbPercentFlashBar"; - // - // nUDflashLED - // - this.nUDflashLED.Increment = new decimal(new int[] { - 10, - 0, - 0, - 0}); - resources.ApplyResources(this.nUDflashLED, "nUDflashLED"); - this.nUDflashLED.Name = "nUDflashLED"; - this.nUDflashLED.ValueChanged += new System.EventHandler(this.nUDflashLED_ValueChanged); - // - // lbFlashAt - // - resources.ApplyResources(this.lbFlashAt, "lbFlashAt"); - this.lbFlashAt.Name = "lbFlashAt"; - this.lbFlashAt.Click += new System.EventHandler(this.lbFlashAt_Click); - // // ShiftPanel // this.ShiftPanel.Controls.Add(this.cBShiftLight); @@ -1658,6 +1601,72 @@ this.shiftBlueBar.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LightBar_MouseDown); this.shiftBlueBar.MouseUp += new System.Windows.Forms.MouseEventHandler(this.Lightbar_MouseUp); // + // btnChargingColor + // + this.btnChargingColor.BackColor = System.Drawing.Color.White; + resources.ApplyResources(this.btnChargingColor, "btnChargingColor"); + this.btnChargingColor.Name = "btnChargingColor"; + this.btnChargingColor.UseVisualStyleBackColor = false; + this.btnChargingColor.Click += new System.EventHandler(this.btnChargingColor_Click); + // + // rBColor + // + resources.ApplyResources(this.rBColor, "rBColor"); + this.rBColor.Name = "rBColor"; + this.rBColor.TabStop = true; + this.rBColor.UseVisualStyleBackColor = true; + this.rBColor.CheckedChanged += new System.EventHandler(this.rBColor_CheckedChanged); + // + // rBFade + // + resources.ApplyResources(this.rBFade, "rBFade"); + this.rBFade.Name = "rBFade"; + this.rBFade.UseVisualStyleBackColor = true; + this.rBFade.CheckedChanged += new System.EventHandler(this.rBFade_CheckedChanged); + // + // rBNormal + // + resources.ApplyResources(this.rBNormal, "rBNormal"); + this.rBNormal.Checked = true; + this.rBNormal.Name = "rBNormal"; + this.rBNormal.TabStop = true; + this.rBNormal.UseVisualStyleBackColor = true; + this.rBNormal.CheckedChanged += new System.EventHandler(this.rBNormal_CheckedChanged); + // + // rBRainbow + // + resources.ApplyResources(this.rBRainbow, "rBRainbow"); + this.rBRainbow.Name = "rBRainbow"; + this.rBRainbow.UseVisualStyleBackColor = true; + this.rBRainbow.CheckedChanged += new System.EventHandler(this.rBRainbow_CheckedChanged); + // + // lbWhileCharging + // + resources.ApplyResources(this.lbWhileCharging, "lbWhileCharging"); + this.lbWhileCharging.Name = "lbWhileCharging"; + // + // lbPercentFlashBar + // + resources.ApplyResources(this.lbPercentFlashBar, "lbPercentFlashBar"); + this.lbPercentFlashBar.Name = "lbPercentFlashBar"; + // + // nUDflashLED + // + this.nUDflashLED.Increment = new decimal(new int[] { + 10, + 0, + 0, + 0}); + resources.ApplyResources(this.nUDflashLED, "nUDflashLED"); + this.nUDflashLED.Name = "nUDflashLED"; + this.nUDflashLED.ValueChanged += new System.EventHandler(this.nUDflashLED_ValueChanged); + // + // lbFlashAt + // + resources.ApplyResources(this.lbFlashAt, "lbFlashAt"); + this.lbFlashAt.Name = "lbFlashAt"; + this.lbFlashAt.Click += new System.EventHandler(this.lbFlashAt_Click); + // // gBRumble // this.gBRumble.Controls.Add(this.lbPercentRumble); @@ -2686,12 +2695,12 @@ ((System.ComponentModel.ISupportInitialize)(this.nUDSixaxis)).EndInit(); this.gBLightbar.ResumeLayout(false); this.gBLightbar.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.nUDflashLED)).EndInit(); this.ShiftPanel.ResumeLayout(false); this.ShiftPanel.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.shiftRedBar)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.shiftGreenBar)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.shiftBlueBar)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nUDflashLED)).EndInit(); this.gBRumble.ResumeLayout(false); this.gBRumble.PerformLayout(); this.gBDeadzone.ResumeLayout(false); @@ -2934,6 +2943,7 @@ private System.Windows.Forms.OpenFileDialog openFileDialog1; private System.Windows.Forms.PictureBox pBProgram; private System.Windows.Forms.CheckBox cBDinput; + private System.Windows.Forms.CheckBox cbStartTouchpadOff; } }  \ No newline at end of file diff --git a/DS4Tool/Options.cs b/DS4Tool/Options.cs index f6ed731..44c918f 100644 --- a/DS4Tool/Options.cs +++ b/DS4Tool/Options.cs @@ -58,13 +58,29 @@ namespace ScpServer if (control is Button) if (!((Button)control).Name.Contains("sbtn")) subbuttons.Add((Button)control); + root.lbLastMessage.ForeColor = Color.Black; + root.lbLastMessage.Text = "Hover over items to see description or more about"; + foreach (System.Windows.Forms.Control control in Controls) + if (control.HasChildren) + foreach (System.Windows.Forms.Control ctrl in control.Controls) + if (ctrl.HasChildren) + foreach (System.Windows.Forms.Control ctrl2 in ctrl.Controls) + if (ctrl2.HasChildren) + foreach (System.Windows.Forms.Control ctrl3 in ctrl2.Controls) + ctrl3.MouseHover += Items_MouseHover; + else + ctrl2.MouseHover += Items_MouseHover; + else + ctrl.MouseHover += Items_MouseHover; + else + control.MouseHover += Items_MouseHover; if (device < 4) nUDSixaxis.Value = deviceNum + 1; if (filename != "") { if (device == 4) Global.setAProfile(4, name); - Global.LoadProfile(device, buttons.ToArray(), subbuttons.ToArray()); + Global.LoadProfile(device, buttons.ToArray(), subbuttons.ToArray(), false, scpDevice); DS4Color color = Global.loadColor(device); redBar.Value = color.red; greenBar.Value = color.green; @@ -153,6 +169,7 @@ namespace ScpServer } cBDinput.Checked = Global.getDinputOnly(device); olddinputcheck = cBDinput.Checked; + cbStartTouchpadOff.Checked = Global.getStartTouchpadOff(device); } else Set(); @@ -161,25 +178,7 @@ namespace ScpServer foreach (Button b in subbuttons) b.MouseHover += button_MouseHover; - tp.SetToolTip(cBlowerRCOn, Properties.Resources.BestUsedRightSide); - tp.SetToolTip(cBDoubleTap, Properties.Resources.TapAndHold); - tp.SetToolTip(lbControlTip, Properties.Resources.UseControllerForMapping); - tp.SetToolTip(cBTouchpadJitterCompensation, "Use Sixaxis to help calculate touchpad movement"); - tp.SetToolTip(pBRainbow, Properties.Resources.AlwaysRainbow); - tp.SetToolTip(cBFlushHIDQueue, "Flush HID Queue after each reading"); - tp.SetToolTip(cBLightbyBattery, "Also dim light by idle timeout if on"); - tp.SetToolTip(lbGryo, "Click to see readout of Sixaxis Gyro"); - tp.SetToolTip(tBsixaxisGyroX, "GyroX, Left and Right Tilt"); - tp.SetToolTip(tBsixaxisGyroY, "GyroY, Forward and Back Tilt"); - tp.SetToolTip(tBsixaxisGyroZ, "GyroZ, Up and Down Tilt"); - tp.SetToolTip(tBsixaxisAccelX, "AccelX"); - tp.SetToolTip(tBsixaxisAccelY, "AccelY"); - tp.SetToolTip(tBsixaxisAccelZ, "AccelZ"); - tp.SetToolTip(lbEmpty, Properties.Resources.CopyFullColor); - tp.SetToolTip(lbShift, Properties.Resources.CopyFullColor); - tp.SetToolTip(lbSATip, "Click for advanced Sixaxis reading"); - tp.SetToolTip(cBDinput, Properties.Resources.DinputOnly); - tp.SetToolTip(lbFlashAt, "Click to change flash color. Black = default color"); + advColorDialog.OnUpdateColor += advColorDialog_OnUpdateColor; btnLeftStick.Enter += btnSticks_Enter; btnRightStick.Enter += btnSticks_Enter; @@ -404,6 +403,7 @@ namespace ScpServer Global.setMouseAccel(device, cBMouseAccel.Checked); Global.setShiftModifier(device, cBShiftControl.SelectedIndex); Global.setDinputOnly(device, cBDinput.Checked); + Global.setStartTouchpadOff(device, cbStartTouchpadOff.Checked); if (nUDRainbow.Value == 0) pBRainbow.Image = greyscale; else pBRainbow.Image = colored; @@ -790,12 +790,14 @@ namespace ScpServer private void Options_Closed(object sender, FormClosedEventArgs e) { for (int i = 0; i < 4; i++) - Global.LoadProfile(i); //Refreshes all profiles in case other controllers are using the same profile + Global.LoadProfile(i, false, scpDevice); //Refreshes all profiles in case other controllers are using the same profile if (olddinputcheck != cBDinput.Checked) { root.btnStartStop_Clicked(false); root.btnStartStop_Clicked(false); } + if (btnRumbleTest.Text == Properties.Resources.StopText) + scpDevice.setRumble(0, 0, (int)nUDSixaxis.Value - 1); inputtimer.Stop(); sixaxisTimer.Stop(); } @@ -864,14 +866,14 @@ namespace ScpServer lBControls.Items[26] = "RS Down : " + bnRSDown.Text; lBControls.Items[27] = "RS Left : " + bnRSLeft.Text; lBControls.Items[28] = "RS Right : " + bnRSRight.Text; - lBControls.Items[29] = "Tilt Up : " + UpdateGyroList(bnGyroZN); - lBControls.Items[30] = "Tilt Down : " + UpdateGyroList(bnGyroZP); - lBControls.Items[31] = "Tilt Left : " + UpdateGyroList(bnGyroXP); - lBControls.Items[32] = "Tilt Right : " + UpdateGyroList(bnGyroXN); - bnGyroZN.Text = "Tilt Up"; - bnGyroZP.Text = "Tilt Down"; - bnGyroXP.Text = "Tilt Left"; - bnGyroXN.Text = "Tilt Right"; + lBControls.Items[29] = Properties.Resources.TiltUp + " : " + UpdateGyroList(bnGyroZN); + lBControls.Items[30] = Properties.Resources.TiltDown + " : " + UpdateGyroList(bnGyroZP); + lBControls.Items[31] = Properties.Resources.TiltLeft + " : " + UpdateGyroList(bnGyroXP); + lBControls.Items[32] = Properties.Resources.TiltRight + " : " + UpdateGyroList(bnGyroXN); + bnGyroZN.Text = Properties.Resources.TiltUp; + bnGyroZP.Text = Properties.Resources.TiltDown; + bnGyroXP.Text = Properties.Resources.TiltLeft; + bnGyroXN.Text = Properties.Resources.TiltRight; foreach (Button b in subbuttons) if (b.Tag == null) @@ -905,14 +907,14 @@ namespace ScpServer lBShiftControls.Items[26] = "RS Down : " + sbnRSDown.Text; lBShiftControls.Items[27] = "RS Left : " + sbnRSLeft.Text; lBShiftControls.Items[28] = "RS Right : " + sbnRSRight.Text; - lBShiftControls.Items[29] = "Tilt Up : " + UpdateGyroList(sbnGyroZN); - lBShiftControls.Items[30] = "Tilt Down : " + UpdateGyroList(sbnGyroZP); - lBShiftControls.Items[31] = "Tilt Left : " + UpdateGyroList(sbnGyroXP); - lBShiftControls.Items[32] = "Tilt Right : " + UpdateGyroList(sbnGyroXN); - sbnGyroZN.Text = "Tilt Up"; - sbnGyroZP.Text = "Tilt Down"; - sbnGyroXP.Text = "Tilt Left"; - sbnGyroXN.Text = "Tilt Right"; + lBShiftControls.Items[29] = Properties.Resources.TiltUp + " : " + UpdateGyroList(sbnGyroZN); + lBShiftControls.Items[30] = Properties.Resources.TiltDown + " : " + UpdateGyroList(sbnGyroZP); + lBShiftControls.Items[31] = Properties.Resources.TiltLeft + " : " + UpdateGyroList(sbnGyroXP); + lBShiftControls.Items[32] = Properties.Resources.TiltRight + " : " + UpdateGyroList(sbnGyroXN); + sbnGyroZN.Text = Properties.Resources.TiltUp; + sbnGyroZP.Text = Properties.Resources.TiltDown; + sbnGyroXP.Text = Properties.Resources.TiltLeft; + sbnGyroXN.Text = Properties.Resources.TiltRight; } private string UpdateGyroList(Button button) @@ -1392,5 +1394,47 @@ namespace ScpServer //oldChargingColor = null; //oldLowLedColor = null; } + + private void cbStartTouchpadOff_CheckedChanged(object sender, EventArgs e) + { + Global.setStartTouchpadOff(device, cbStartTouchpadOff.Checked); + } + + private void cBDinput_MouseHover(object sender, EventArgs e) + { + root.lbLastMessage.Text = Properties.Resources.DinputOnly; + } + + private void Items_MouseHover(object sender, EventArgs e) + { + switch (((System.Windows.Forms.Control)sender).Name) + { + case "cBlowerRCOn": root.lbLastMessage.Text = Properties.Resources.BestUsedRightSide; break; + case "cBDoubleTap": root.lbLastMessage.Text = Properties.Resources.TapAndHold; break; + case "lbControlTip": root.lbLastMessage.Text = Properties.Resources.UseControllerForMapping; break; + case "cBTouchpadJitterCompensation": root.lbLastMessage.Text = "Use Sixaxis to help calculate touchpad movement"; break; + case "pBRainbow": root.lbLastMessage.Text = Properties.Resources.AlwaysRainbow; break; + case "cBFlushHIDQueue": root.lbLastMessage.Text = "Flush HID Queue after each reading"; break; + case "cBLightbyBattery": root.lbLastMessage.Text = "Also dim light by idle timeout if on"; break; + case "lbGryo": root.lbLastMessage.Text = "Click to see readout of Sixaxis Gyro"; break; + case "tBsixaxisGyroX": root.lbLastMessage.Text = "GyroX, Left and Right Tilt"; break; + case "tBsixaxisGyroY": root.lbLastMessage.Text = "GyroY, Forward and Back Tilt"; break; + case "tBsixaxisGyroZ": root.lbLastMessage.Text = "GyroZ, Up and Down Tilt"; break; + case "tBsixaxisAccelX": root.lbLastMessage.Text = "AccelX"; break; + case "tBsixaxisAccelY": root.lbLastMessage.Text = "AccelY"; break; + case "tBsixaxisAccelZ": root.lbLastMessage.Text = "AccelZ"; break; + case "lbEmpty": root.lbLastMessage.Text = Properties.Resources.CopyFullColor; break; + case "lbShift": root.lbLastMessage.Text = Properties.Resources.CopyFullColor; break; + case "lbSATip": root.lbLastMessage.Text = "Click for advanced Sixaxis reading"; break; + case "cBDinput": root.lbLastMessage.Text = Properties.Resources.DinputOnly; break; + case "lbFlashAt": root.lbLastMessage.Text = "Click to change flash color. Black = default color"; break; + case "cbStartTouchpadOff": root.lbLastMessage.Text = "Re-enable by pressing PS+Touchpad"; break; + default: root.lbLastMessage.Text = "Hover over items to see description or more about"; break; + } + if (root.lbLastMessage.Text != "Hover over items to see description or more about") + root.lbLastMessage.ForeColor = Color.Black; + else + root.lbLastMessage.ForeColor = SystemColors.GrayText; + } } } diff --git a/DS4Tool/Options.fr-FR.resx b/DS4Tool/Options.fr-FR.resx index 411e55f..1c22b90 100644 --- a/DS4Tool/Options.fr-FR.resx +++ b/DS4Tool/Options.fr-FR.resx @@ -142,7 +142,7 @@ de batterie - 350, 11 + 363, 11 68, 30 @@ -152,7 +152,7 @@ de batterie deux fois - 300, 48 + 252, 18 63, 17 @@ -160,8 +160,11 @@ deux fois Tapoter + + 319, 17 + - 141, 48 + 112, 47 80, 17 @@ -175,6 +178,9 @@ deux fois Glisser + + 198, 44 + 66, 46 @@ -190,12 +196,24 @@ deux fois Pavé tactile - - 178, 17 + + 244, 45 Autre + + 178, 17 + + + Barre lumineuse + + + 14, 13 + + + V + 408, 108 @@ -226,15 +244,6 @@ deux fois Clignoter à - - 14, 13 - - - V - - - Barre lumineuse - Vibrer diff --git a/DS4Tool/Options.fr.resx b/DS4Tool/Options.fr.resx new file mode 100644 index 0000000..14cd637 --- /dev/null +++ b/DS4Tool/Options.fr.resx @@ -0,0 +1,385 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + 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 + AElFTkSuQmCC + + + + + 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 + AElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAAJYAAACWCAYAAAA8AXHiAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH + DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp + bGUAAEjHnZZ3VFTXFofPvXd6oc0wAlKG3rvAANJ7k15FYZgZYCgDDjM0sSGiAhFFRJoiSFDEgNFQJFZE + sRAUVLAHJAgoMRhFVCxvRtaLrqy89/Ly++Osb+2z97n77L3PWhcAkqcvl5cGSwGQyhPwgzyc6RGRUXTs + AIABHmCAKQBMVka6X7B7CBDJy82FniFyAl8EAfB6WLwCcNPQM4BOB/+fpFnpfIHomAARm7M5GSwRF4g4 + JUuQLrbPipgalyxmGCVmvihBEcuJOWGRDT77LLKjmNmpPLaIxTmns1PZYu4V8bZMIUfEiK+ICzO5nCwR + 3xKxRoowlSviN+LYVA4zAwAUSWwXcFiJIjYRMYkfEuQi4uUA4EgJX3HcVyzgZAvEl3JJS8/hcxMSBXQd + li7d1NqaQffkZKVwBALDACYrmcln013SUtOZvBwAFu/8WTLi2tJFRbY0tba0NDQzMv2qUP91829K3NtF + ehn4uWcQrf+L7a/80hoAYMyJarPziy2uCoDOLQDI3fti0zgAgKSobx3Xv7oPTTwviQJBuo2xcVZWlhGX + wzISF/QP/U+Hv6GvvmckPu6P8tBdOfFMYYqALq4bKy0lTcinZ6QzWRy64Z+H+B8H/nUeBkGceA6fwxNF + hImmjMtLELWbx+YKuGk8Opf3n5r4D8P+pMW5FonS+BFQY4yA1HUqQH7tBygKESDR+8Vd/6NvvvgwIH55 + 4SqTi3P/7zf9Z8Gl4iWDm/A5ziUohM4S8jMX98TPEqABAUgCKpAHykAd6ABDYAasgC1wBG7AG/iDEBAJ + VgMWSASpgA+yQB7YBApBMdgJ9oBqUAcaQTNoBcdBJzgFzoNL4Bq4AW6D+2AUTIBnYBa8BgsQBGEhMkSB + 5CEVSBPSh8wgBmQPuUG+UBAUCcVCCRAPEkJ50GaoGCqDqqF6qBn6HjoJnYeuQIPQXWgMmoZ+h97BCEyC + qbASrAUbwwzYCfaBQ+BVcAK8Bs6FC+AdcCXcAB+FO+Dz8DX4NjwKP4PnEIAQERqiihgiDMQF8UeikHiE + j6xHipAKpAFpRbqRPuQmMorMIG9RGBQFRUcZomxRnqhQFAu1BrUeVYKqRh1GdaB6UTdRY6hZ1Ec0Ga2I + 1kfboL3QEegEdBa6EF2BbkK3oy+ib6Mn0K8xGAwNo42xwnhiIjFJmLWYEsw+TBvmHGYQM46Zw2Kx8lh9 + rB3WH8vECrCF2CrsUexZ7BB2AvsGR8Sp4Mxw7rgoHA+Xj6vAHcGdwQ3hJnELeCm8Jt4G749n43PwpfhG + fDf+On4Cv0CQJmgT7AghhCTCJkIloZVwkfCA8JJIJKoRrYmBRC5xI7GSeIx4mThGfEuSIemRXEjRJCFp + B+kQ6RzpLuklmUzWIjuSo8gC8g5yM/kC+RH5jQRFwkjCS4ItsUGiRqJDYkjiuSReUlPSSXK1ZK5kheQJ + yeuSM1J4KS0pFymm1HqpGqmTUiNSc9IUaVNpf+lU6RLpI9JXpKdksDJaMm4ybJkCmYMyF2TGKQhFneJC + YVE2UxopFykTVAxVm+pFTaIWU7+jDlBnZWVkl8mGyWbL1sielh2lITQtmhcthVZKO04bpr1borTEaQln + yfYlrUuGlszLLZVzlOPIFcm1yd2WeydPl3eTT5bfJd8p/1ABpaCnEKiQpbBf4aLCzFLqUtulrKVFS48v + vacIK+opBimuVTyo2K84p6Ss5KGUrlSldEFpRpmm7KicpFyufEZ5WoWiYq/CVSlXOavylC5Ld6Kn0Cvp + vfRZVUVVT1Whar3qgOqCmrZaqFq+WpvaQ3WCOkM9Xr1cvUd9VkNFw08jT6NF454mXpOhmai5V7NPc15L + Wytca6tWp9aUtpy2l3audov2Ax2yjoPOGp0GnVu6GF2GbrLuPt0berCehV6iXo3edX1Y31Kfq79Pf9AA + bWBtwDNoMBgxJBk6GWYathiOGdGMfI3yjTqNnhtrGEcZ7zLuM/5oYmGSYtJoct9UxtTbNN+02/R3Mz0z + llmN2S1zsrm7+QbzLvMXy/SXcZbtX3bHgmLhZ7HVosfig6WVJd+y1XLaSsMq1qrWaoRBZQQwShiXrdHW + ztYbrE9Zv7WxtBHYHLf5zdbQNtn2iO3Ucu3lnOWNy8ft1OyYdvV2o/Z0+1j7A/ajDqoOTIcGh8eO6o5s + xybHSSddpySno07PnU2c+c7tzvMuNi7rXM65Iq4erkWuA24ybqFu1W6P3NXcE9xb3Gc9LDzWepzzRHv6 + eO7yHPFS8mJ5NXvNelt5r/Pu9SH5BPtU+zz21fPl+3b7wX7efrv9HqzQXMFb0ekP/L38d/s/DNAOWBPw + YyAmMCCwJvBJkGlQXlBfMCU4JvhI8OsQ55DSkPuhOqHC0J4wybDosOaw+XDX8LLw0QjjiHUR1yIVIrmR + XVHYqLCopqi5lW4r96yciLaILoweXqW9KnvVldUKq1NWn46RjGHGnIhFx4bHHol9z/RnNjDn4rziauNm + WS6svaxnbEd2OXuaY8cp40zG28WXxU8l2CXsTphOdEisSJzhunCruS+SPJPqkuaT/ZMPJX9KCU9pS8Wl + xqae5Mnwknm9acpp2WmD6frphemja2zW7Fkzy/fhN2VAGasyugRU0c9Uv1BHuEU4lmmfWZP5Jiss60S2 + dDYvuz9HL2d7zmSue+63a1FrWWt78lTzNuWNrXNaV78eWh+3vmeD+oaCDRMbPTYe3kTYlLzpp3yT/LL8 + V5vDN3cXKBVsLBjf4rGlpVCikF84stV2a9021DbutoHt5turtn8sYhddLTYprih+X8IqufqN6TeV33za + Eb9joNSydP9OzE7ezuFdDrsOl0mX5ZaN7/bb3VFOLy8qf7UnZs+VimUVdXsJe4V7Ryt9K7uqNKp2Vr2v + Tqy+XeNc01arWLu9dn4fe9/Qfsf9rXVKdcV17w5wD9yp96jvaNBqqDiIOZh58EljWGPft4xvm5sUmoqb + PhziHRo9HHS4t9mqufmI4pHSFrhF2DJ9NProje9cv+tqNWytb6O1FR8Dx4THnn4f+/3wcZ/jPScYJ1p/ + 0Pyhtp3SXtQBdeR0zHYmdo52RXYNnvQ+2dNt293+o9GPh06pnqo5LXu69AzhTMGZT2dzz86dSz83cz7h + /HhPTM/9CxEXbvUG9g5c9Ll4+ZL7pQt9Tn1nL9tdPnXF5srJq4yrndcsr3X0W/S3/2TxU/uA5UDHdavr + XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS + fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ + tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEwAACxMBAJqcGAAACK5JREFUeF7t3T2P1FYU + xvFNlSWpaWkokLamIBISigTN5gPwDdACQqkRJVJICdTbRqKggZY6K0WiodrQIBFp6ZeOFEvO38xOZuzH + M3659tiep/hJy2F2fH3PYRjb92Xn687OttoNe2E/HITH4TC8DkfhOJyE0/AlnM3wMzH+jtfwWn6H3+U9 + eC/ek/fmGOrYkyeDE/RD+CncCc/Dm/BP+NoxjsGxOCbHpg20RbVxUmRwAr4LJPHX8Ef4O6jEbwJtoU20 + jTbSVnUOoyaDI/Vj+CX8Hv4MKqlDRFtpM23nHNS5jY4MjszP4bfwV1CJGxPOgXPhnNS5joYMjsClcDfw + pfnfoJI0ZpwT58Y5cq6qDwZNBgfsauDK611QCZkizpVz5txVnwySDA7Q9fA09HElN1ScO31AX6g+GhQZ + HJBrgc78FFRnbyP6gj6hb1SfDYIMDsCVwMf/h6A61771DX1EX6k+3CgZ3CBuHt4LU7jC6wt9RZ8N6sar + DG7IrfAiqM6z9eg7+lD1be9ksGcXw6PwMagOs+roQ/qSPlV93RsZ7NHN8DKoTrLm6FP6VvV5L2SwBzwf + exDeB9Ux1h59Sx9v5FmkDHbscngWVGdYevQ1fa5y0RkZ7NCN8CqoDrDu0Of0vcpJJ2SwI7fD26BO3LpH + 35MDlZvkZLAD94Ov+jaPHJALlaOkZDCxh+FzUCdq/SMX5ETlKhkZTOT7wCMHdXK2eeSGHKnctSaDCVwI + T4I6IRsOckSuVA5bkcGW+FfgohoPcpX8k0sGW/J/f+NDzlQuG5PBFvhSqBpuw5f0C70MNsRlrK/+xovc + JbsVIYMNcOPN96nGjxwmuYkqgzXxqMB31KeDXLZ+/CODNfBw08/+poectnpwLYMVMRzDoxSmi9w2HnIj + gxUx1kc1yKaDHKvcryWDFTA60YP0po8cNxqJKoNrMJ7aw4m3B7muPYZeBtdgsL5qgE0XOVe1UEoGV2B6 + ke9XbR9yXmtqmQyWYEKk5/1tL3JfeVKsDJZgtq06oG0PakDVRoEMCqwP4GnvRg1UWitCBgUPhbFzlYbY + yGAOy+V41Rc7Ry2sXUJJBnNYi0kdwLYXNaFqZU4GF7B6nBc9szxqYuXKgjK4wJ9WVmblp5YMzrCY6jav + +WmrURulC+7K4IyvBG2d0itEGQysLb5NS15bM9SIXIe+EJhh4Xr1RmZ51EqhhgqBGXZFUG9ilketFGqo + EAjs4zLFbUSsG9RKYe+fpT/MsEmQegOzMtTMUh0t/SGwrZkfNltd1MzSlniLRQX2zFO/aLYOtTOvpcWi + Ahsyql8yW4famdfSYlExh2xMO5PasFA783mIi4XF/sTqF8yqooYKhcXm1+rFZlVRQ4XCYmd19WKzqqih + pcJi9gXb9qsXm1VFDWUzec4Ly9+vLJXse9Z5Yd2ZBc3aopbip2+ez4JmbVFL8dM3b2ZBs7aopfhpZ2c3 + eAiypUIt7VJYewtBsxT2KKz9XNCsrX0K6yAXNGvrgMLybBxL7TGFdZgLmrV1SGF54oSl9prCOsoFzdo6 + orCOc0Gzto4prJNc0KytEwrrNBc0a+uUwvqSC5q19YXCOssFzdo6c2FZF7LC8n+Fllr2X6G/vFtq2Zd3 + 326w1LLbDb5BaqllN0j9SMdSyx7p+CG0pZY9hPawGUstGzbjgX6WWjbQz0OTLbVsaLInU1hq2WQKT/+y + 1LLpX56wainNJ6zCU+wtlfkUe3hREEtlaVEQL2NkqSwtY+SF1yyVpYXXvFSkpVBYKhJe3NbaKixuCy/H + bW3J5bj9Pcvayr5fYbGwvOWJtVG65Qm8SZM1VbpJE7ytnDW1cls5b4RpTazdCBPeutfqWrt1L7zZuNVR + ebNxeIKFVUWtFGqoEJi5G9SbmOVRK4UaKgRmLoV3Qb2R2TlqhFop1FAhsMCzd2wdakTVjg7OXA0esmxl + qA1qRNWODi54GtSbmlEbqmYyMrjgevgU1Bvb9qImqA1VMxkZzPGnluWt/LSCDOZcCx+COoBtH2qBmlC1 + MieDgq8Q7VzpleAiGRSuBD+cNmqAWlA1skQGS9wL6mC2PagBVRsFMliC2RcvgjqgTR+5z2bgVCGDK9wK + H4M6sE0XOSf3qiYkGVzjUVAHt+ki56oWSsngGhfDy6AaYNNDrsm5qoVSMljBzfA+qIbYdJBjcq1qYCUZ + rOhBUI2x6SDHKvdryWBFzCF7FlSDbPzI7XyeYF0yWMPl8Cqohtl4kVNyq3JeiQzWdCO8DaqBNj7kkpyq + XFcmgw3cDr6/NX7kkFyqHNcigw3dD5+DarANH7kjhyq3tclgCw+DarQNH7lTOW1EBlvyEJvxqTQUpg4Z + bOn78CSoE7DhIVfkTOWyMRlM4EJwcQ0fOSJXKoetyGAi/Cvwf4vDRW6Sf1Kdk8HE+FLoq8XhIBdJv6gr + MtgBLmN9n2vzyEGyWwqryGBHuPHmO/SbQ98nuflZhQx2iEcFfrbYP/q89WOaOmSwYzzc9KiI/tDXrR4o + NyGDPWA4BmN9PFiwO/Qtfdx46EsbMtgjRid6mHN69GmjkZ+pyGDPGE/NYH1fNbZHH9KXtceopyaDG8L0 + Is9bbI6+qzVFq0syuEFMiGS2rafzV0df0WeVJ5P2QQYHgPUBeOTgVW7K0Tf0UaW1FPomgwPCcjmsxeTF + 3/5HX9Ana5cS2iQZHCBWj6Mzt3lNVM6dPli5kt5QyOCAsZgqH//btFQ458o5ly4kO0QyOAKsLc7C9eyK + MMXtWTgnzo1zlOuoD50Mjgz7uLBJ0BSuJDkHzqWwN83YyOBIsa0Ze+axIeOYdoqlrbSZti9tzTZmMjgB + PB9jf2I2v2ZndbbtV0ndBNpCm2gbbdzIs7yuyeAEcfOQJN4Jz8Ob0McVJsfgWByTY9OGQd3I7IoMbond + sBf2w0Hgyusw8KX5KByHk3AavoSzGX4mxt/xGl7L7/C7vAfvxXvy3hxDHXvidnb+AyTfWAn9iVGiAAAA + AElFTkSuQmCC + + + \ No newline at end of file diff --git a/DS4Tool/Options.resx b/DS4Tool/Options.resx index 1b3078b..8bc157e 100644 --- a/DS4Tool/Options.resx +++ b/DS4Tool/Options.resx @@ -1778,7 +1778,7 @@ Click the lightbar for color picker NoControl - 349, 16 + 355, 18 No @@ -1802,7 +1802,7 @@ Click the lightbar for color picker gBTouchpad - 1 + 2 True @@ -1811,7 +1811,7 @@ Click the lightbar for color picker NoControl - 318, 46 + 258, 18 Yes @@ -1835,10 +1835,10 @@ Click the lightbar for color picker gBTouchpad - 5 + 6 - 369, 45 + 309, 17 40, 20 @@ -1856,7 +1856,7 @@ Click the lightbar for color picker gBTouchpad - 7 + 8 True @@ -1865,7 +1865,7 @@ Click the lightbar for color picker NoControl - 169, 47 + 108, 48 Yes @@ -1889,7 +1889,7 @@ Click the lightbar for color picker gBTouchpad - 8 + 9 True @@ -1922,10 +1922,10 @@ Click the lightbar for color picker gBTouchpad - 3 + 4 - 227, 45 + 166, 46 40, 20 @@ -1943,7 +1943,7 @@ Click the lightbar for color picker gBTouchpad - 6 + 7 62, 46 @@ -1964,7 +1964,7 @@ Click the lightbar for color picker gBTouchpad - 4 + 5 True @@ -2006,20 +2006,19 @@ Click the lightbar for color picker NoControl - 182, 11 + 132, 18 No - 100, 30 + 124, 17 223 - Lower Right as -Right Mouse + Lower Right as RMB cBlowerRCOn @@ -2031,7 +2030,7 @@ Right Mouse gBTouchpad - 2 + 3 True @@ -2064,7 +2063,7 @@ Right Mouse gBTouchpad - 0 + 1 True @@ -2931,6 +2930,36 @@ Right Mouse 1 + + True + + + NoControl + + + 212, 48 + + + 142, 17 + + + 233 + + + Start with Slide/Scroll off + + + cbStartTouchpadOff + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gBTouchpad + + + 0 + 2, 251 @@ -6755,7 +6784,7 @@ with profile advColorDialog - ScpServer.AdvancedColorDialog, DS4Windows, Version=1.4.0.5, Culture=neutral, PublicKeyToken=null + ScpServer.AdvancedColorDialog, DS4Windows, Version=1.4.0.6, Culture=neutral, PublicKeyToken=null Options diff --git a/DS4Tool/Properties/AssemblyInfo.cs b/DS4Tool/Properties/AssemblyInfo.cs index 01478d8..ac5695f 100644 --- a/DS4Tool/Properties/AssemblyInfo.cs +++ b/DS4Tool/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ 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.0.56")] -[assembly: AssemblyFileVersion("1.4.0.56")] +[assembly: AssemblyVersion("1.4.0.6")] +[assembly: AssemblyFileVersion("1.4.0.6")] diff --git a/DS4Tool/Properties/Resources.fr-FR.resx b/DS4Tool/Properties/Resources.fr-FR.resx index 4c38614..f6934e8 100644 --- a/DS4Tool/Properties/Resources.fr-FR.resx +++ b/DS4Tool/Properties/Resources.fr-FR.resx @@ -381,4 +381,19 @@ Turn off X360 input and only use the DS4's native input, hide ds4 must be off + + Installer les pilotes ici + + + Tilt Bas + + + Tilt Gauche + + + Tilt Droite + + + Tilt Haut + \ No newline at end of file diff --git a/DS4Tool/Properties/Resources.resx b/DS4Tool/Properties/Resources.resx index 9283aae..1e3ec56 100644 --- a/DS4Tool/Properties/Resources.resx +++ b/DS4Tool/Properties/Resources.resx @@ -529,4 +529,19 @@ Turn off X360 input and only use the DS4's native input, hide ds4 must be off + + Instal Drivers here + + + Tilt Down + + + Tilt Left + + + Tilt Right + + + Tilt Up + \ No newline at end of file diff --git a/DS4Tool/Properties/Resources1.Designer.cs b/DS4Tool/Properties/Resources1.Designer.cs index 22a9790..fa04b90 100644 --- a/DS4Tool/Properties/Resources1.Designer.cs +++ b/DS4Tool/Properties/Resources1.Designer.cs @@ -587,6 +587,15 @@ namespace ScpServer.Properties { } } + /// + /// Looks up a localized string similar to Instal Drivers here. + /// + internal static string InstallDriver { + get { + return ResourceManager.GetString("InstallDriver", resourceCulture); + } + } + /// /// Looks up a localized string similar to Keep this window size after closing. /// @@ -1166,6 +1175,42 @@ namespace ScpServer.Properties { } } + /// + /// Looks up a localized string similar to Tilt Down. + /// + internal static string TiltDown { + get { + return ResourceManager.GetString("TiltDown", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Tilt Left. + /// + internal static string TiltLeft { + get { + return ResourceManager.GetString("TiltLeft", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Tilt Right. + /// + internal static string TiltRight { + get { + return ResourceManager.GetString("TiltRight", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Tilt Up. + /// + internal static string TiltUp { + get { + return ResourceManager.GetString("TiltUp", resourceCulture); + } + } + /// /// Looks up a localized string similar to Touchpad Movement is now Off. /// diff --git a/DS4Tool/ScpForm.Designer.cs b/DS4Tool/ScpForm.Designer.cs index 2e1042a..637ff3d 100644 --- a/DS4Tool/ScpForm.Designer.cs +++ b/DS4Tool/ScpForm.Designer.cs @@ -932,7 +932,6 @@ private System.Windows.Forms.Button btnStartStop; private System.Windows.Forms.Button btnClear; private System.Windows.Forms.NotifyIcon notifyIcon1; - private System.Windows.Forms.Label lbLastMessage; private System.Windows.Forms.ContextMenuStrip cMTaskbar; private System.Windows.Forms.ToolStripMenuItem openToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem editProfileForController1ToolStripMenuItem; @@ -1021,6 +1020,7 @@ private System.Windows.Forms.CheckBox cBDisconnectBT; private System.Windows.Forms.CheckBox cBSwipeProfiles; private System.Windows.Forms.ToolStripMenuItem startToolStripMenuItem; + public System.Windows.Forms.Label lbLastMessage; //private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; } } diff --git a/DS4Tool/ScpForm.cs b/DS4Tool/ScpForm.cs index 0609d11..6da2c25 100644 --- a/DS4Tool/ScpForm.cs +++ b/DS4Tool/ScpForm.cs @@ -45,6 +45,8 @@ namespace ScpServer private System.Drawing.Size oldsize; WinProgs WP; ToolTip tt = new ToolTip(); + public String m_Profile = Directory.GetParent(Assembly.GetExecutingAssembly().Location).FullName + "\\Profiles.xml"; + protected XmlDocument m_Xdoc = new XmlDocument(); protected void SetupArrays() { @@ -222,11 +224,11 @@ namespace ScpServer RefreshProfiles(); for (int i = 0; i < 4; i++) { - Global.LoadProfile(i); + Global.LoadProfile(i, true, rootHub); } LoadP(); Global.ControllerStatusChange += ControllerStatusChange; - ControllerStatusChanged(false); + ControllerStatusChanged(); if (btnStartStop.Enabled) btnStartStop_Clicked(); startToolStripMenuItem.Text = btnStartStop.Text; @@ -271,7 +273,7 @@ namespace ScpServer private void test_Tick(object sender, EventArgs e) { lBTest.Visible = true; - lBTest.Text = rootHub.DS4Controllers[0].LeftHeavySlowRumble.ToString(); + lBTest.Text = rootHub.oldtouchvalue[0].ToString(); } void Hotkeys(object sender, EventArgs e) { @@ -303,7 +305,7 @@ namespace ScpServer for (int j = 0; j < 4; j++) if (proprofiles[j][i] != "(none)" && proprofiles[j][i] != Properties.Resources.noneProfile) { - Global.LoadTempProfile(j, proprofiles[j][i]); //j is controller index, i is filename + Global.LoadTempProfile(j, proprofiles[j][i], true, rootHub); //j is controller index, i is filename if (Global.getLaunchProgram(j) != string.Empty) Process.Start(Global.getLaunchProgram(j)); } tempprofile = name; @@ -315,7 +317,7 @@ namespace ScpServer { tempprofile = "null"; for (int j = 0; j < 4; j++) - Global.LoadProfile(j); + Global.LoadProfile(j, false, rootHub); } } if (Process.GetProcessesByName("DS4Tool").Length + Process.GetProcessesByName("DS4Windows").Length > 1) @@ -379,7 +381,7 @@ namespace ScpServer if (!File.Exists(exepath + "\\Auto Profiles.xml") && !File.Exists(appdatapath + "\\Auto Profiles.xml")) { linkSetup.LinkColor = Color.Green; - tabSettings.Text += " (Install Drivers here)"; + tabSettings.Text += " (" + Properties.Resources.InstallDriver + ")"; } } } @@ -429,13 +431,20 @@ namespace ScpServer profilenames.Add(Path.GetFileNameWithoutExtension(s)); lBProfiles.Items.Clear(); lBProfiles.Items.AddRange(profilenames.ToArray()); + if (lBProfiles.Items.Count == 0) + { + Global.SaveProfile(0, "Default", null, null); + Global.setAProfile(0, "Default"); + RefreshProfiles(); + return; + } for (int i = 0; i < 4; i++) { cbs[i].Items.Clear(); shortcuts[i].DropDownItems.Clear(); cbs[i].Items.AddRange(profilenames.ToArray()); foreach (string s in profilenames) - shortcuts[i].DropDownItems.Add(Path.GetFileNameWithoutExtension(s)); + shortcuts[i].DropDownItems.Add(s); for (int j = 0; j < cbs[i].Items.Count; j++) if (cbs[i].Items[j].ToString() == Path.GetFileNameWithoutExtension(Global.getAProfile(i))) { @@ -456,41 +465,25 @@ namespace ScpServer } catch (DirectoryNotFoundException) { - if (Global.appdatapath == Directory.GetParent(Assembly.GetExecutingAssembly().Location).FullName) - { - if (Directory.Exists(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\DS4Tool" + @"\Profiles\")) - MessageBox.Show(Properties.Resources.PleaseImport, Properties.Resources.ProfileFolderMoved); - Directory.CreateDirectory(Global.appdatapath + @"\Profiles\"); - for (int i = 0; i < 4; i++) - { - cbs[i].Text = "(" + Properties.Resources.NoProfileLoaded + ")"; - shortcuts[i].Text = Properties.Resources.ContextNew.Replace("*number*", (i + 1).ToString()); - ebns[i].Text = Properties.Resources.New; - } - } - else - { - if (Directory.Exists(Directory.GetParent(Assembly.GetExecutingAssembly().Location).FullName + @"\Profiles\")) - MessageBox.Show(Properties.Resources.PleaseImport, Properties.Resources.ProfileFolderMoved); - Directory.CreateDirectory(Global.appdatapath + @"\Profiles\"); - for (int i = 0; i < 4; i++) - { - cbs[i].Text = "(" + Properties.Resources.NoProfileLoaded + ")"; - shortcuts[i].Text = Properties.Resources.ContextNew.Replace("*number*", (i + 1).ToString()); - ebns[i].Text = Properties.Resources.New; - } - } + Directory.CreateDirectory(Global.appdatapath + @"\Profiles\"); + Global.SaveProfile(0, "Default", null, null); + Global.setAProfile(0, "Default"); + RefreshProfiles(); + return; } finally { - for (int i = 0; i < 4; i++) + if (!(cbs[0].Items.Count > 0 && cbs[0].Items[cbs[0].Items.Count - 1].ToString() == "+New Profile")) { - cbs[i].Items.Add("+New Profile"); - shortcuts[i].DropDownItems.Add("-"); - shortcuts[i].DropDownItems.Add("+New Profile"); + for (int i = 0; i < 4; i++) + { + cbs[i].Items.Add("+New Profile"); + shortcuts[i].DropDownItems.Add("-"); + shortcuts[i].DropDownItems.Add("+New Profile"); + } + RefreshAutoProfilesPage(); } - RefreshAutoProfilesPage(); - } + } } @@ -621,7 +614,7 @@ namespace ScpServer else ControllerStatusChanged(); } - protected void ControllerStatusChanged(bool program = true) + protected void ControllerStatusChanged() { String tooltip = "DS4Windows v" + FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).FileVersion; for (Int32 Index = 0; Index < Pads.Length; Index++) @@ -641,7 +634,6 @@ namespace ScpServer { Enable_Controls(Index, true); //Console.WriteLine(opt == null); - //if (program && Global.getLaunchProgram(Index) != string.Empty) Process.Start(Global.getLaunchProgram(Index)); if (opt != null) opt.inputtimer.Start(); //MinimumSize = new Size(MinimumSize.Width, 137 + 29 * Index); @@ -852,6 +844,8 @@ namespace ScpServer tSOptions.Visible = false; toolStrip1.Visible = true; toolStrip1.Enabled = true; + lbLastMessage.ForeColor = SystemColors.GrayText; + lbLastMessage.Text = lvDebug.Items[lvDebug.Items.Count - 1].SubItems[1].Text; }; oldsize = this.Size; if (dpix == 120) @@ -885,7 +879,7 @@ namespace ScpServer { ToolStripMenuItem em = (ToolStripMenuItem)sender; int i = Int32.Parse(em.Tag.ToString()); - if (em.Text == Properties.Resources.ContextEdit.Replace("*number*", (i + 1).ToString())) + if (em.Text == Properties.Resources.ContextNew.Replace("*number*", (i + 1).ToString())) ShowOptions(i, ""); else for (int t=0; t < em.DropDownItems.Count-2; t++) @@ -941,8 +935,7 @@ namespace ScpServer shortcuts[tdevice].Text = Properties.Resources.ContextEdit.Replace("*number*", (tdevice + 1).ToString()); Global.setAProfile(tdevice, cb.Items[cb.SelectedIndex].ToString()); Global.Save(); - Global.LoadProfile(tdevice); - if (Global.getLaunchProgram(tdevice) != string.Empty) Process.Start(Global.getLaunchProgram(tdevice)); + Global.LoadProfile(tdevice, true, rootHub); } else if (cb.SelectedIndex == cb.Items.Count - 1 && cb.Items.Count > 1) //if +New Profile selected ShowOptions(tdevice, ""); @@ -951,7 +944,7 @@ namespace ScpServer else ebns[tdevice].Text = Properties.Resources.EditProfile; } - ControllerStatusChanged(false); //to update profile name in notify icon + ControllerStatusChanged(); //to update profile name in notify icon } private void Profile_Changed_Menu(object sender, ToolStripItemClickedEventArgs e) diff --git a/DS4Tool/ScpForm.resx b/DS4Tool/ScpForm.resx index 189200d..945759a 100644 --- a/DS4Tool/ScpForm.resx +++ b/DS4Tool/ScpForm.resx @@ -117,6 +117,19 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Time + + + + 167 + + + Data + + + 84 + Fill @@ -131,7 +144,6 @@ 891, 330 - 0 @@ -147,93 +159,9 @@ 0 - - Time - - - 167 - - - Data - - - 84 - 17, 17 - - lBTest - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pnlButton - - - 0 - - - btnStartStop - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pnlButton - - - 1 - - - lbLastMessage - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pnlButton - - - 2 - - - llbHelp - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pnlButton - - - 3 - - - Bottom - - - 0, 385 - - - 905, 30 - - - 10 - - - pnlButton - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - Bottom, Right @@ -348,6 +276,30 @@ 3 + + Bottom + + + 0, 385 + + + 905, 30 + + + 10 + + + pnlButton + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + Bottom @@ -387,6 +339,54 @@ 339, 17 + + 214, 22 + + + Edit Profile for Controller 1 + + + 214, 22 + + + Edit Profile for Controller 2 + + + 214, 22 + + + Edit Profile for Controller 3 + + + 214, 22 + + + Edit Profile for Controller 4 + + + 211, 6 + + + 214, 22 + + + Start + + + Segoe UI, 9pt, style=Bold + + + 214, 22 + + + Open + + + 214, 22 + + + Exit (Middle Mouse) + 215, 164 @@ -6574,54 +6574,6 @@ True - - 214, 22 - - - Edit Profile for Controller 1 - - - 214, 22 - - - Edit Profile for Controller 2 - - - 214, 22 - - - Edit Profile for Controller 3 - - - 214, 22 - - - Edit Profile for Controller 4 - - - 211, 6 - - - 214, 22 - - - Start - - - Segoe UI, 9pt, style=Bold - - - 214, 22 - - - Open - - - 214, 22 - - - Exit (Middle Mouse) - 211, 6 @@ -7620,231 +7572,9 @@ 0 - - 891, 17 - - - 568, 17 - - - lBProfiles - - - System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabProfiles - - - 0 - - - tSOptions - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabProfiles - - - 1 - - - toolStrip1 - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabProfiles - - - 2 - - - 4, 22 - - - 3, 3, 3, 3 - - - 897, 359 - - - 0 - - - Profiles - - - tabProfiles - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabMain - - - 1 - - - 4, 22 - - - 897, 359 - - - 2 - - - Auto Profiles - - - tabAutoProfiles - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabMain - - - 2 - - - flowLayoutPanel1 - - - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabSettings - - - 0 - - - 4, 22 - - - 3, 3, 3, 3 - - - 897, 359 - - - 4 - - - Settings - - - tabSettings - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabMain - - - 3 - - - 4, 22 - - - 3, 3, 3, 3 - - - 897, 359 - - - 1 - - - Log - - - tabLog - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabMain - - - 4 - - - Fill - - - 0, 0 - - - 905, 385 - - - 12 - - - tabMain - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - 788, 17 - - 189, 224 - - - cMProfile - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Fill - - - Microsoft Sans Serif, 9.75pt - - - 16 - - - 3, 53 - - - 891, 303 - - - 0 - - - lBProfiles - - - System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabProfiles - - - 0 - Segoe UI, 9pt, style=Bold @@ -7908,33 +7638,48 @@ Export + + 189, 224 + + + cMProfile + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill + + + Microsoft Sans Serif, 9.75pt + + + 16 + + + 3, 53 + + + 891, 303 + + + 0 + + + lBProfiles + + + System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabProfiles + + + 0 + 891, 17 - - 3, 28 - - - 891, 25 - - - 2 - - - toolStrip2 - - - tSOptions - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabProfiles - - - 1 - 82, 22 @@ -7977,33 +7722,33 @@ Keep this window size after closing + + 3, 28 + + + 891, 25 + + + 2 + + + toolStrip2 + + + tSOptions + + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabProfiles + + + 1 + 568, 17 - - 3, 3 - - - 891, 25 - - - 1 - - - toolStrip1 - - - toolStrip1 - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabProfiles - - - 2 - Magenta @@ -8123,194 +7868,83 @@ Export Selected Profile - - True - - - hideDS4CheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - flowLayoutPanel1 - - - 0 - - - cBSwipeProfiles - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - flowLayoutPanel1 - - - 1 - - - StartWindowsCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - flowLayoutPanel1 - - - 2 - - - startMinimizedCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - flowLayoutPanel1 - - - 3 - - - cBUpdate - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - flowLayoutPanel1 - - - 4 - - - pNUpdate - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - flowLayoutPanel1 - - - 5 - - - cBNotifications - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - flowLayoutPanel1 - - - 6 - - - cBDisconnectBT - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - flowLayoutPanel1 - - - 7 - - - linkProfiles - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - flowLayoutPanel1 - - - 8 - - - lLBUpdate - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - flowLayoutPanel1 - - - 9 - - - linkSetup - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - flowLayoutPanel1 - - - 10 - - - linkUninstall - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - flowLayoutPanel1 - - - 11 - - - lnkControllers - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - flowLayoutPanel1 - - - 12 - - - Fill - - - TopDown - - + 3, 3 - - 7, 7, 0, 9 + + 891, 25 - - 891, 353 + + 1 - + + toolStrip1 + + + toolStrip1 + + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabProfiles + + + 2 + + + 4, 22 + + + 3, 3, 3, 3 + + + 897, 359 + + 0 - - flowLayoutPanel1 + + Profiles - - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabProfiles - - tabSettings + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + tabMain + + + 1 + + + 4, 22 + + + 897, 359 + + + 2 + + + Auto Profiles + + + tabAutoProfiles + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 2 + + + True True @@ -8462,66 +8096,6 @@ 4 - - cBUpdateTime - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pNUpdate - - - 0 - - - lBCheckEvery - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pNUpdate - - - 1 - - - nUDUpdateTime - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pNUpdate - - - 2 - - - False - - - 10, 125 - - - 189, 22 - - - 43 - - - pNUpdate - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - flowLayoutPanel1 - - - 5 - hours @@ -8606,6 +8180,30 @@ 2 + + False + + + 10, 125 + + + 189, 22 + + + 43 + + + pNUpdate + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flowLayoutPanel1 + + + 5 + True @@ -8807,6 +8405,114 @@ 12 + + Fill + + + TopDown + + + 3, 3 + + + 7, 7, 0, 9 + + + 891, 353 + + + 0 + + + flowLayoutPanel1 + + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabSettings + + + 0 + + + 4, 22 + + + 3, 3, 3, 3 + + + 897, 359 + + + 4 + + + Settings + + + tabSettings + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 3 + + + 4, 22 + + + 3, 3, 3, 3 + + + 897, 359 + + + 1 + + + Log + + + tabLog + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 4 + + + Fill + + + 0, 0 + + + 905, 385 + + + 12 + + + tabMain + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + 673, 17 diff --git a/DS4Tool/WelcomeDialog.Designer.cs b/DS4Tool/WelcomeDialog.Designer.cs index 318291d..526bec6 100644 --- a/DS4Tool/WelcomeDialog.Designer.cs +++ b/DS4Tool/WelcomeDialog.Designer.cs @@ -58,8 +58,8 @@ // // pictureBox1 // - resources.ApplyResources(this.pictureBox1, "pictureBox1"); this.pictureBox1.Image = global::ScpServer.Properties.Resources.Pairmode; + resources.ApplyResources(this.pictureBox1, "pictureBox1"); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.TabStop = false; // diff --git a/DS4Tool/WelcomeDialog.resx b/DS4Tool/WelcomeDialog.resx index cee90e6..fa2dbf9 100644 --- a/DS4Tool/WelcomeDialog.resx +++ b/DS4Tool/WelcomeDialog.resx @@ -117,296 +117,293 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 82, 8 + + + 155, 23 + + + + 1 + + + Step 1: Install the DS4 Driver + + + bnStep1 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + 29, 57 + + + 259, 23 + + + 1 + Step 2: If on Windows 7 or below, Install 360 Driver - - Make sure to check Force Install + + button2 - - 0 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - 3 - - - - 117, 394 - - - 312, 64 + + $this 3 - - 8 - - - WelcomeDialog - - - label1 - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - labelBluetooth2 - - - $this - - - $this - - - TopCenter - - - pictureBox1 - - - TopCenter - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TopCenter - - - 313, 39 - - - $this - - - bnFinish - - - 2 - - - $this - - - linkBluetoothSettings - - - 3 - - - 3 - - - $this - - - StretchImage - - - $this - - - 0 - - - 1 - - - 3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 36, 197 - - labelBluetooth - - - 82, 8 - - - 315, 22 - - - 5 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Step 1: Install the DS4 Driver - - - 75, 23 - - - TopCenter - - - 169, 332 - - - 1, 332 - - - 4 - - - $this - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 245, 132 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + StretchImage - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 2 - - Finish + + pictureBox1 - - 7 + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 155, 23 - - - labelUSB - - - 29, 57 - - - 4 - - - 1 - - - label2 - - - 312, 39 - - - 314, 22 - - - 93, 13 - - - 6 + + 2 1, 155 - - 1, 32 + + 312, 39 - - Welcome to DS4Windows - - - Once flashing go to your Bluetooth Settings -and Connect to "Wireless Controller" - -Once paired, you're ready. Have fun! - - - If you've used a 360 Controller on this PC, you can skip this - - - Bluetooth Settings + + 3 To set up bluetooth (optional): Hold the PS Button and Share for 3 seconds The lightbar will begin to double flash - - True + + TopCenter - - 0, 82 + + labelBluetooth - - button2 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 2 + + $this - - bnStep1 + + 1 + + + 0, 106 + + + 313, 39 + + + 3 Step 3: Connecting the DualShock 4 controller To set up wired/usb: Simply plug a micro usb into your PC and DualShock 4 - - $this + + TopCenter + + + labelUSB + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this - - 1 + + 8 - - 0, 106 + + 1, 332 - + + 312, 64 + + 3 - - 315, 421 - - - 259, 23 - - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Once flashing go to your Bluetooth Settings +and Connect to "Wireless Controller" +If asked, enter pair code "0000" +Once paired, you're ready. Have fun! TopCenter - - 96, 96 + + labelBluetooth2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this 9 + + True + + + 169, 332 + + + 93, 13 + + + 4 + + + Bluetooth Settings + + + linkBluetoothSettings + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + 1, 32 + + + 314, 22 + + + 3 + + + Make sure to check Force Install + + + TopCenter + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + + + 0, 82 + + + 315, 22 + + + 3 + + + If you've used a 360 Controller on this PC, you can skip this + + + TopCenter + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + 117, 394 + + + 75, 23 + + + 0 + + + Finish + + + bnFinish + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + True - - fr-FR - + + 96, 96 + + + 315, 421 + + + Welcome to DS4Windows + + + WelcomeDialog + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/DS4Tool/WinProgs.resx b/DS4Tool/WinProgs.resx index 480e744..711931c 100644 --- a/DS4Tool/WinProgs.resx +++ b/DS4Tool/WinProgs.resx @@ -130,9 +130,6 @@ $this - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 60, 13 @@ -158,10 +155,16 @@ 94, 23 + + + 7 + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + lBProgramPath + True @@ -222,14 +225,11 @@ True - - 663, 2 - $this - - iLIcons + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 609, 55 @@ -273,8 +273,8 @@ addProgramsFromStartMenuToolStripMenuItem - - 7 + + addSteamGamesToolStripMenuItem 60, 13 @@ -315,6 +315,9 @@ $this + + Top, Right + cBProfile3 @@ -330,11 +333,8 @@ WinProgs - - lBProgramPath - - - addSteamGamesToolStripMenuItem + + Add programs cMSPrograms @@ -348,6 +348,9 @@ 192, 22 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 6 @@ -495,8 +498,8 @@ 121, 21 - - Add programs + + iLIcons 6 @@ -507,9 +510,6 @@ 358 - - Top, Right - Remove @@ -543,11 +543,11 @@ System.Windows.Forms.ImageList, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + Top, Right - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 663, 2 7 @@ -639,16 +639,13 @@ True - - fr-FR - 143, 17 - - 17, 17 - 232, 17 + + 17, 17 + \ No newline at end of file