From a4e59cacb85540912e50d6813bbfb45e31964ecf Mon Sep 17 00:00:00 2001 From: jays2kings Date: Sat, 15 Nov 2014 16:54:14 -0500 Subject: [PATCH] Version 1.4.15 Use Touchpad swipes for controls and disable it for mouse: swipe in 4 directions to use buttons, marcos, and even use the touchpad as an analog stick (Relive the great moments of playing an FPS on a touchscreen) Mapping Stick directions to triggers now work properly --- DS4Control/Mapping.cs | 42 +- DS4Control/Mouse.cs | 106 +- DS4Control/ScpUtil.cs | 101 +- DS4Tool/Options.Designer.cs | 132 +- DS4Tool/Options.cs | 254 ++- DS4Tool/Options.resx | 1902 +++++++++------------ DS4Tool/Properties/Resources.resx | 12 + DS4Tool/Properties/Resources1.Designer.cs | 36 + 8 files changed, 1261 insertions(+), 1324 deletions(-) diff --git a/DS4Control/Mapping.cs b/DS4Control/Mapping.cs index f7001bc..2b867d2 100644 --- a/DS4Control/Mapping.cs +++ b/DS4Control/Mapping.cs @@ -1483,26 +1483,32 @@ namespace DS4Control case DS4Controls.TouchRight: return (byte)(tp != null && tp.rightDown ? 255 : 0); case DS4Controls.TouchMulti: return (byte)(tp != null && tp.multiDown ? 255 : 0); case DS4Controls.TouchUpper: return (byte)(tp != null && tp.upperDown ? 255 : 0); - case DS4Controls.LXNeg: return (byte)cState.LX; - case DS4Controls.LYNeg: return (byte)cState.LY; - case DS4Controls.RXNeg: return (byte)cState.RX; - case DS4Controls.RYNeg: return (byte)cState.RY; - case DS4Controls.LXPos: return (byte)(cState.LX - 127 < 0 ? 0 : (cState.LX - 127)); - case DS4Controls.LYPos: return (byte)(cState.LY - 123 < 0 ? 0 : (cState.LY - 123)); - case DS4Controls.RXPos: return (byte)(cState.RX - 129 < 0 ? 0 : (cState.RX - 125)); - case DS4Controls.RYPos: return (byte)(cState.RY - 125 < 0 ? 0 : (cState.RY - 127)); - case DS4Controls.L2: return (byte)cState.L2; - case DS4Controls.R2: return (byte)cState.R2; + case DS4Controls.LXNeg: return (byte)(cState.LX - 127.5f > 0 ? 0 : -(cState.LX - 127.5f) * 2); + case DS4Controls.LYNeg: return (byte)(cState.LY - 127.5f > 0 ? 0 : -(cState.LY - 127.5f) * 2); + case DS4Controls.RXNeg: return (byte)(cState.RX - 127.5f > 0 ? 0 : -(cState.RX - 127.5f) * 2); + case DS4Controls.RYNeg: return (byte)(cState.RY - 127.5f > 0 ? 0 : -(cState.RY - 127.5f) * 2); + case DS4Controls.LXPos: return (byte)(cState.LX - 127.5f < 0 ? 0 : (cState.LX - 127.5f) * 2); + case DS4Controls.LYPos: return (byte)(cState.LY - 127.5f < 0 ? 0 : (cState.LY - 127.5f) * 2); + case DS4Controls.RXPos: return (byte)(cState.RX - 127.5f < 0 ? 0 : (cState.RX - 127.5f) * 2); + case DS4Controls.RYPos: return (byte)(cState.RY - 127.5f < 0 ? 0 : (cState.RY - 127.5f) * 2); + case DS4Controls.L2: return cState.L2; + case DS4Controls.R2: return cState.R2; case DS4Controls.GyroXPos: return (byte)(eState.GyroX > SXD * 7500 ? Math.Min(255, eState.GyroX / 31) : 0); case DS4Controls.GyroXNeg: return (byte)(eState.GyroX < -SXD * 7500 ? Math.Min(255, -eState.GyroX / 31) : 0); case DS4Controls.GyroZPos: return (byte)(eState.GyroZ > SZD * 7500 ? Math.Min(255, eState.GyroZ / 31) : 0); case DS4Controls.GyroZNeg: return (byte)(eState.GyroZ < -SZD * 7500 ? Math.Min(255, -eState.GyroZ / 31) : 0); + case DS4Controls.SwipeUp: return (byte)(tp != null ? tp.swipeUpB : 0); + case DS4Controls.SwipeDown: return (byte)(tp != null ? tp.swipeDownB: 0); + case DS4Controls.SwipeLeft: return (byte)(tp != null ? tp.swipeLeftB: 0); + case DS4Controls.SwipeRight: return (byte)(tp != null ? tp.swipeRightB : 0); } return 0; } public static bool getBoolMapping(DS4Controls control, DS4State cState, DS4StateExposed eState, Mouse tp) { + //if (control == DS4Controls.Up) + //Cons switch (control) { case DS4Controls.Share: return cState.Share; @@ -1538,6 +1544,10 @@ namespace DS4Control case DS4Controls.GyroXNeg: return eState.GyroX < -5000; case DS4Controls.GyroZPos: return eState.GyroZ > 5000; case DS4Controls.GyroZNeg: return eState.GyroZ < -5000; + case DS4Controls.SwipeUp: return (tp != null && tp.swipeUp); + case DS4Controls.SwipeDown: return (tp != null && tp.swipeDown); + case DS4Controls.SwipeLeft: return (tp != null && tp.swipeLeft); + case DS4Controls.SwipeRight: return (tp != null && tp.swipeRight); } return false; } @@ -1571,8 +1581,12 @@ namespace DS4Control case DS4Controls.TouchRight: return (byte)(tp != null && tp.rightDown ? trueVal : falseVal); case DS4Controls.TouchMulti: return (byte)(tp != null && tp.multiDown ? trueVal : falseVal); case DS4Controls.TouchUpper: return (byte)(tp != null && tp.upperDown ? trueVal : falseVal); - case DS4Controls.L2: if (alt) return (byte)(127 + cState.L2 / 2); else return (byte)(127 - cState.L2 / 2); - case DS4Controls.R2: if (alt) return (byte)(127 + cState.R2 / 2); else return (byte)(127 - cState.R2 / 2); + case DS4Controls.L2: if (alt) return (byte)(127.5f + cState.L2 / 2f); else return (byte)(127.5f - cState.L2 / 2f); + case DS4Controls.R2: if (alt) return (byte)(127.5f + cState.R2 / 2f); else return (byte)(127.5f - cState.R2 / 2f); + case DS4Controls.SwipeUp: if (alt) return (byte)(tp != null ? 127.5f + tp.swipeUpB / 2f : 0); else return (byte)(tp != null ? 127.5f - tp.swipeUpB / 2f : 0); + case DS4Controls.SwipeDown: if (alt) return (byte)(tp != null ? 127.5f + tp.swipeDownB / 2f : 0); else return (byte)(tp != null ? 127.5f - tp.swipeDownB / 2f : 0); + case DS4Controls.SwipeLeft: if (alt) return (byte)(tp != null ? 127.5f + tp.swipeLeftB / 2f : 0); else return (byte)(tp != null ? 127.5f - tp.swipeLeftB / 2f : 0); + case DS4Controls.SwipeRight: if (alt) return (byte)(tp != null ? 127.5f + tp.swipeRightB / 2f : 0); else return (byte)(tp != null ? 127.5f - tp.swipeRightB / 2f : 0); case DS4Controls.GyroXPos: if (eState.GyroX > SXD * 7500) if (alt) return (byte)Math.Min(255, 127 + eState.GyroX / 62); else return (byte)Math.Max(0, 127 - eState.GyroX / 62); else return falseVal; @@ -1649,10 +1663,6 @@ namespace DS4Control case DS4Controls.RYPos: cState.RY = 127; break; case DS4Controls.L2: cState.L2 = 0; break; case DS4Controls.R2: cState.R2 = 0; break; - //case DS4Controls.TouchButton: cState.TouchLeft = false; break; - //case DS4Controls.TouchMulti: cState.Touch2 = false; break; - //case DS4Controls.TouchRight: cState.TouchRight = false; break; - //case DS4Controls.TouchUpper: cState.TouchButton = false; break; } } diff --git a/DS4Control/Mouse.cs b/DS4Control/Mouse.cs index a2d9877..90e271a 100644 --- a/DS4Control/Mouse.cs +++ b/DS4Control/Mouse.cs @@ -17,6 +17,7 @@ namespace DS4Control private readonly MouseWheel wheel; private bool tappedOnce = false, secondtouchbegin = false; public bool swipeLeft, swipeRight, swipeUp, swipeDown; + public byte swipeLeftB, swipeRightB, swipeUpB, swipeDownB, swipedB; public bool slideleft, slideright; // touch area stuff public bool leftDown, rightDown, upperDown, multiDown; @@ -38,30 +39,40 @@ namespace DS4Control public virtual void touchesMoved(object sender, TouchpadEventArgs arg) { - cursor.touchesMoved(arg); - wheel.touchesMoved(arg); - if (!(swipeUp || swipeDown || swipeLeft || swipeRight)) + if (!Global.getUseTPforControls(deviceNum)) { - if (arg.touches[0].hwX - firstTouch.hwX > 200) swipeRight = true; - if (arg.touches[0].hwX - firstTouch.hwX < -200) swipeLeft = true; - if (arg.touches[0].hwY - firstTouch.hwY > 100) swipeDown = true; - if (arg.touches[0].hwY - firstTouch.hwY < -100) swipeUp = true; + cursor.touchesMoved(arg); + wheel.touchesMoved(arg); } - /*if ((swipeUp || swipeDown || swipeLeft || swipeRight)) - Console.WriteLine("Up " + swipeUp + " Down " + swipeDown + " Left " + swipeLeft + " Right " + swipeRight);*/ - if (Math.Abs(firstTouch.hwY - arg.touches[0].hwY) < 50) - if (arg.touches.Length == 2) - if (arg.touches[0].hwX - firstTouch.hwX > 200 && !slideleft) - slideright = true; - else if (firstTouch.hwX - arg.touches[0].hwX > 200 && !slideright) - slideleft = true; + else + { + if (!(swipeUp || swipeDown || swipeLeft || swipeRight) && arg.touches.Length == 1) + { + if (arg.touches[0].hwX - firstTouch.hwX > 200) swipeRight = true; + if (arg.touches[0].hwX - firstTouch.hwX < -200) swipeLeft = true; + if (arg.touches[0].hwY - firstTouch.hwY > 150) swipeDown = true; + if (arg.touches[0].hwY - firstTouch.hwY < -150) swipeUp = true; + } + swipeUpB = (byte)Math.Min(255, Math.Max(0, (firstTouch.hwY - arg.touches[0].hwY) * 1.5f)); + swipeDownB = (byte)Math.Min(255, Math.Max(0, (arg.touches[0].hwY - firstTouch.hwY) * 1.5f)); + swipeLeftB = (byte)Math.Min(255, Math.Max(0, firstTouch.hwX - arg.touches[0].hwX)); + swipeRightB = (byte)Math.Min(255, Math.Max(0, arg.touches[0].hwX - firstTouch.hwX)); + } + if (Math.Abs(firstTouch.hwY - arg.touches[0].hwY) < 50 && arg.touches.Length == 2) + if (arg.touches[0].hwX - firstTouch.hwX > 200 && !slideleft) + slideright = true; + else if (firstTouch.hwX - arg.touches[0].hwX > 200 && !slideright) + slideleft = true; dev.getCurrentState(s); synthesizeMouseButtons(); } public virtual void touchesBegan(object sender, TouchpadEventArgs arg) { - cursor.touchesBegan(arg); - wheel.touchesBegan(arg); + if (!Global.getUseTPforControls(deviceNum)) + { + cursor.touchesBegan(arg); + wheel.touchesBegan(arg); + } pastTime = arg.timeStamp; firstTouch = arg.touches[0]; if (Global.getDoubleTap(deviceNum)) @@ -71,13 +82,14 @@ namespace DS4Control secondtouchbegin = true; } dev.getCurrentState(s); - synthesizeMouseButtons(); + synthesizeMouseButtons(); } public virtual void touchesEnded(object sender, TouchpadEventArgs arg) { slideright = slideleft = false; swipeUp = swipeDown = swipeLeft = swipeRight = false; - if (Global.getTapSensitivity(deviceNum) != 0) + swipeUpB = swipeDownB = swipeLeftB = swipeRightB = 0; + if (Global.getTapSensitivity(deviceNum) != 0 && !Global.getUseTPforControls(deviceNum)) { if (secondtouchbegin) @@ -88,14 +100,14 @@ namespace DS4Control DateTime test = arg.timeStamp; if (test <= (pastTime + TimeSpan.FromMilliseconds((double)Global.getTapSensitivity(deviceNum) * 2)) && !arg.touchButtonPressed && !tappedOnce) if (Math.Abs(firstTouch.hwX - arg.touches[0].hwX) < 10 && Math.Abs(firstTouch.hwY - arg.touches[0].hwY) < 10) - if (Global.getDoubleTap(deviceNum)) - { - tappedOnce = true; - firstTap = arg.timeStamp; - TimeofEnd = DateTime.Now; //since arg can't be used in synthesizeMouseButtons - } - else - Mapping.MapClick(deviceNum, Mapping.Click.Left); //this way no delay if disabled + if (Global.getDoubleTap(deviceNum)) + { + tappedOnce = true; + firstTap = arg.timeStamp; + TimeofEnd = DateTime.Now; //since arg can't be used in synthesizeMouseButtons + } + else + Mapping.MapClick(deviceNum, Mapping.Click.Left); //this way no delay if disabled } dev.getCurrentState(s); synthesizeMouseButtons(); @@ -115,7 +127,7 @@ namespace DS4Control { dev.getCurrentState(s); //if (s.Touch1 || s.Touch2 || s.TouchButton) - synthesizeMouseButtons(); + synthesizeMouseButtons(); } private DS4State remapped = new DS4State(); @@ -141,18 +153,21 @@ namespace DS4Control Global.getCustomKey(deviceNum, DS4Controls.TouchMulti) == 0 && multiDown) Mapping.MapClick(deviceNum, Mapping.Click.Right); - if (tappedOnce) + if (!Global.getUseTPforControls(deviceNum)) { - DateTime tester = DateTime.Now; - if (tester > (TimeofEnd + TimeSpan.FromMilliseconds((double)(Global.getTapSensitivity(deviceNum)) * 1.5))) + if (tappedOnce) + { + DateTime tester = DateTime.Now; + if (tester > (TimeofEnd + TimeSpan.FromMilliseconds((double)(Global.getTapSensitivity(deviceNum)) * 1.5))) { - Mapping.MapClick(deviceNum, Mapping.Click.Left); + Mapping.MapClick(deviceNum, Mapping.Click.Left); tappedOnce = false; } - //if it fails the method resets, and tries again with a new tester value (gives tap a delay so tap and hold can work) + //if it fails the method resets, and tries again with a new tester value (gives tap a delay so tap and hold can work) + } + if (secondtouchbegin) //if tap and hold (also works as double tap) + Mapping.MapClick(deviceNum, Mapping.Click.Left); } - if (secondtouchbegin) //if tap and hold (also works as double tap) - Mapping.MapClick(deviceNum, Mapping.Click.Left); s = remapped; //remapped.CopyTo(s); } @@ -169,37 +184,18 @@ namespace DS4Control public virtual void touchButtonDown(object sender, TouchpadEventArgs arg) { - //byte leftRumble, rightRumble; if (arg.touches == null) - { - //No touches, finger on upper portion of touchpad - //leftRumble = rightRumble = 0; upperDown = true; - } - else if (arg.touches.Length > 1 )//|| (Global.getLowerRCOn(deviceNum) && arg.touches[0].hwX > (1920 * 3) / 4 && arg.touches[0].hwY > (960 * 3) / 4)) - { - //leftRumble = rightRumble = 150; + else if (arg.touches.Length > 1) multiDown = true; - } else { if ((Global.getLowerRCOn(deviceNum) && arg.touches[0].hwX > (1920 * 3) / 4 && arg.touches[0].hwY > (960 * 3) / 4)) Mapping.MapClick(deviceNum, Mapping.Click.Right); if (isLeft(arg.touches[0])) - { leftDown = true; - //leftRumble = 25; - //rightRumble = 0; - } else if (isRight(arg.touches[0])) - { rightDown = true; - //leftRumble = 0; - //rightRumble = 25; - } - else - { - } } dev.getCurrentState(s); synthesizeMouseButtons(); diff --git a/DS4Control/ScpUtil.cs b/DS4Control/ScpUtil.cs index 984ed0e..5a3d10e 100644 --- a/DS4Control/ScpUtil.cs +++ b/DS4Control/ScpUtil.cs @@ -13,7 +13,7 @@ namespace DS4Control [Flags] public enum DS4KeyType : byte { None = 0, ScanCode = 1, Toggle = 2, Unbound = 4, Macro = 8, HoldMacro = 16, RepeatMacro = 32 }; //Increment by exponents of 2*, starting at 2^0 public enum Ds3PadId : byte { None = 0xFF, One = 0x00, Two = 0x01, Three = 0x02, Four = 0x03, All = 0x04 }; - public enum DS4Controls : byte { None, LXNeg, LXPos, LYNeg, LYPos, RXNeg, RXPos, RYNeg, RYPos, L1, L2, L3, R1, R2, R3, Square, Triangle, Circle, Cross, DpadUp, DpadRight, DpadDown, DpadLeft, PS, TouchLeft, TouchUpper, TouchMulti, TouchRight, Share, Options, GyroXPos, GyroXNeg, GyroZPos, GyroZNeg }; + public enum DS4Controls : byte { None, LXNeg, LXPos, LYNeg, LYPos, RXNeg, RXPos, RYNeg, RYPos, L1, L2, L3, R1, R2, R3, Square, Triangle, Circle, Cross, DpadUp, DpadRight, DpadDown, DpadLeft, PS, TouchLeft, TouchUpper, TouchMulti, TouchRight, Share, Options, GyroXPos, GyroXNeg, GyroZPos, GyroZNeg, SwipeLeft, SwipeRight, SwipeUp, SwipeDown }; public enum X360Controls : byte { None, LXNeg, LXPos, LYNeg, LYPos, RXNeg, RXPos, RYNeg, RYPos, LB, LT, LS, RB, RT, RS, X, Y, B, A, DpadUp, DpadRight, DpadDown, DpadLeft, Guide, Back, Start, LeftMouse, RightMouse, MiddleMouse, FourthMouse, FifthMouse, WUP, WDOWN, MouseUp, MouseDown, MouseLeft, MouseRight, Unbound }; public class DebugEventArgs : EventArgs @@ -248,6 +248,15 @@ namespace DS4Control { return m_Config.startTouchpadOff[device]; } + + public static void setUseTPforControls(int device, bool data) + { + m_Config.useTPforControls[device] = data; + } + public static bool getUseTPforControls(int device) + { + return m_Config.useTPforControls[device]; + } public static void setUseExclusiveMode(bool exclusive) { m_Config.useExclusiveMode = exclusive; @@ -773,6 +782,7 @@ namespace DS4Control 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 bool[] useTPforControls = { false, false, false, false, false }; public Boolean useExclusiveMode = false; public Int32 formWidth = 782; public Int32 formHeight = 550; @@ -930,6 +940,7 @@ namespace DS4Control 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 xmlUseTPforControls = m_Xdoc.CreateNode(XmlNodeType.Element, "UseTPforControls", null); xmlUseTPforControls.InnerText = useTPforControls[device].ToString(); Node.AppendChild(xmlUseTPforControls); XmlNode NodeControl = m_Xdoc.CreateNode(XmlNodeType.Element, "Control", null); XmlNode Key = m_Xdoc.CreateNode(XmlNodeType.Element, "Key", null); @@ -1101,6 +1112,10 @@ namespace DS4Control case "bnGyroZP": return DS4Controls.GyroZPos; case "bnGyroZN": return DS4Controls.GyroZNeg; + case "bnSwipeUp": return DS4Controls.SwipeUp; + case "bnSwipeDown": return DS4Controls.SwipeDown; + case "bnSwipeLeft": return DS4Controls.SwipeLeft; + case "bnSwipeRight": return DS4Controls.SwipeRight; case "bnShiftShare": return DS4Controls.Share; case "bnShiftL3": return DS4Controls.L3; @@ -1140,83 +1155,10 @@ namespace DS4Control case "bnShiftGyroZP": return DS4Controls.GyroZPos; case "bnShiftGyroZN": return DS4Controls.GyroZNeg; - //old name - case "sbnShare": return DS4Controls.Share; - case "sbnL3": return DS4Controls.L3; - case "sbnR3": return DS4Controls.R3; - case "sbnOptions": return DS4Controls.Options; - case "sbnUp": return DS4Controls.DpadUp; - case "sbnRight": return DS4Controls.DpadRight; - case "sbnDown": return DS4Controls.DpadDown; - case "sbnLeft": return DS4Controls.DpadLeft; - - case "sbnL1": return DS4Controls.L1; - case "sbnR1": return DS4Controls.R1; - case "sbnTriangle": return DS4Controls.Triangle; - case "sbnCircle": return DS4Controls.Circle; - case "sbnCross": return DS4Controls.Cross; - case "sbnSquare": return DS4Controls.Square; - - case "sbnPS": return DS4Controls.PS; - case "sbnLSLeft": return DS4Controls.LXNeg; - case "sbnLSUp": return DS4Controls.LYNeg; - case "sbnRSLeft": return DS4Controls.RXNeg; - case "sbnRSUp": return DS4Controls.RYNeg; - - case "sbnLSRight": return DS4Controls.LXPos; - case "sbnLSDown": return DS4Controls.LYPos; - case "sbnRSRight": return DS4Controls.RXPos; - case "sbnRSDown": return DS4Controls.RYPos; - case "sbnL2": return DS4Controls.L2; - case "sbnR2": return DS4Controls.R2; - - case "sbnTouchLeft": return DS4Controls.TouchLeft; - case "sbnTouchMulti": return DS4Controls.TouchMulti; - case "sbnTouchUpper": return DS4Controls.TouchUpper; - case "sbnTouchRight": return DS4Controls.TouchRight; - case "sbnGsyroXP": return DS4Controls.GyroXPos; - case "sbnGyroXN": return DS4Controls.GyroXNeg; - case "sbnGyroZP": return DS4Controls.GyroZPos; - case "sbnGyroZN": return DS4Controls.GyroZNeg; - //end old name - - case "bnHoldShare": return DS4Controls.Share; - case "bnHoldL3": return DS4Controls.L3; - case "bnHoldR3": return DS4Controls.R3; - case "bnHoldOptions": return DS4Controls.Options; - case "bnHoldUp": return DS4Controls.DpadUp; - case "bnHoldRight": return DS4Controls.DpadRight; - case "bnHoldDown": return DS4Controls.DpadDown; - case "bnHoldLeft": return DS4Controls.DpadLeft; - - case "bnHoldL1": return DS4Controls.L1; - case "bnHoldR1": return DS4Controls.R1; - case "bnHoldTriangle": return DS4Controls.Triangle; - case "bnHoldCircle": return DS4Controls.Circle; - case "bnHoldCross": return DS4Controls.Cross; - case "bnHoldSquare": return DS4Controls.Square; - - case "bnHoldPS": return DS4Controls.PS; - case "bnHoldLSLeft": return DS4Controls.LXNeg; - case "bnHoldLSUp": return DS4Controls.LYNeg; - case "bnHoldRSLeft": return DS4Controls.RXNeg; - case "bnHoldRSUp": return DS4Controls.RYNeg; - - case "bnHoldLSRight": return DS4Controls.LXPos; - case "bnHoldLSDown": return DS4Controls.LYPos; - case "bnHoldRSRight": return DS4Controls.RXPos; - case "bnHoldRSDown": return DS4Controls.RYPos; - case "bnHoldL2": return DS4Controls.L2; - case "bnHoldR2": return DS4Controls.R2; - - case "bnHoldTouchLeft": return DS4Controls.TouchLeft; - case "bnHoldTouchMulti": return DS4Controls.TouchMulti; - case "bnHoldTouchUpper": return DS4Controls.TouchUpper; - case "bnHoldTouchRight": return DS4Controls.TouchRight; - case "bnHoldGsyroXP": return DS4Controls.GyroXPos; - case "bnHoldGyroXN": return DS4Controls.GyroXNeg; - case "bnHoldGyroZP": return DS4Controls.GyroZPos; - case "bnHoldGyroZN": return DS4Controls.GyroZNeg; + case "bnShiftSwipeUp": return DS4Controls.SwipeUp; + case "bnShiftSwipeDown": return DS4Controls.SwipeDown; + case "bnShiftSwipeLeft": return DS4Controls.SwipeLeft; + case "bnShiftSwipeRight": return DS4Controls.SwipeRight; } return 0; } @@ -1465,6 +1407,9 @@ namespace DS4Control if (startTouchpadOff[device] == true) control.StartTPOff(device); } catch { startTouchpadOff[device] = false; missingSetting = true; } + try + { Item = m_Xdoc.SelectSingleNode("/ScpControl/UseTPforControls"); Boolean.TryParse(Item.InnerText, out useTPforControls[device]); } + catch { useTPforControls[device] = false; missingSetting = true; } DS4KeyType keyType; UInt16 wvk; if (buttons == null) diff --git a/DS4Tool/Options.Designer.cs b/DS4Tool/Options.Designer.cs index 7d45dfa..9da620c 100644 --- a/DS4Tool/Options.Designer.cs +++ b/DS4Tool/Options.Designer.cs @@ -77,6 +77,7 @@ this.gBTouchpad = new System.Windows.Forms.GroupBox(); this.cbStartTouchpadOff = new System.Windows.Forms.CheckBox(); this.gBOther = new System.Windows.Forms.GroupBox(); + this.cBTPforControls = new System.Windows.Forms.CheckBox(); this.cBDinput = new System.Windows.Forms.CheckBox(); this.pBProgram = new System.Windows.Forms.PictureBox(); this.cBLaunchProgram = new System.Windows.Forms.CheckBox(); @@ -142,6 +143,12 @@ this.tBL2 = new System.Windows.Forms.TrackBar(); this.lbSATrack = new System.Windows.Forms.Label(); this.tPShiftMod = new System.Windows.Forms.TabPage(); + this.label2 = new System.Windows.Forms.Label(); + this.fLPShiftTouchSwipe = new System.Windows.Forms.FlowLayoutPanel(); + this.bnShiftSwipeUp = new System.Windows.Forms.Button(); + this.bnShiftSwipeDown = new System.Windows.Forms.Button(); + this.bnShiftSwipeLeft = new System.Windows.Forms.Button(); + this.bnShiftSwipeRight = new System.Windows.Forms.Button(); this.lbShiftGryo = new System.Windows.Forms.Label(); this.fLPShiftTiltControls = new System.Windows.Forms.FlowLayoutPanel(); this.bnShiftGyroZN = new System.Windows.Forms.Button(); @@ -190,6 +197,12 @@ this.bnShiftLSDown = new System.Windows.Forms.Button(); this.bnShiftR3 = new System.Windows.Forms.Button(); this.tPControls = new System.Windows.Forms.TabPage(); + this.label1 = new System.Windows.Forms.Label(); + this.fLPTouchSwipe = new System.Windows.Forms.FlowLayoutPanel(); + this.bnSwipeUp = new System.Windows.Forms.Button(); + this.bnSwipeDown = new System.Windows.Forms.Button(); + this.bnSwipeLeft = new System.Windows.Forms.Button(); + this.bnSwipeRight = new System.Windows.Forms.Button(); this.lbGryo = new System.Windows.Forms.Label(); this.fLPTiltControls = new System.Windows.Forms.FlowLayoutPanel(); this.bnGyroZN = new System.Windows.Forms.Button(); @@ -286,12 +299,14 @@ ((System.ComponentModel.ISupportInitialize)(this.tBR2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tBL2)).BeginInit(); this.tPShiftMod.SuspendLayout(); + this.fLPShiftTouchSwipe.SuspendLayout(); this.fLPShiftTiltControls.SuspendLayout(); this.pnlShiftMain.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pBShiftController)).BeginInit(); this.pnlShiftSticks.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pBShiftSticks)).BeginInit(); this.tPControls.SuspendLayout(); + this.fLPTouchSwipe.SuspendLayout(); this.fLPTiltControls.SuspendLayout(); this.pnlMain.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pBController)).BeginInit(); @@ -748,7 +763,6 @@ // this.gBTouchpad.Controls.Add(this.cbStartTouchpadOff); this.gBTouchpad.Controls.Add(this.cBTouchpadJitterCompensation); - this.gBTouchpad.Controls.Add(this.cBDoubleTap); this.gBTouchpad.Controls.Add(this.cBlowerRCOn); this.gBTouchpad.Controls.Add(this.cBSlide); this.gBTouchpad.Controls.Add(this.nUDTouch); @@ -756,6 +770,7 @@ this.gBTouchpad.Controls.Add(this.nUDScroll); this.gBTouchpad.Controls.Add(this.nUDTap); this.gBTouchpad.Controls.Add(this.cBScroll); + this.gBTouchpad.Controls.Add(this.cBDoubleTap); resources.ApplyResources(this.gBTouchpad, "gBTouchpad"); this.gBTouchpad.Name = "gBTouchpad"; this.gBTouchpad.TabStop = false; @@ -769,6 +784,7 @@ // // gBOther // + this.gBOther.Controls.Add(this.cBTPforControls); this.gBOther.Controls.Add(this.cBDinput); this.gBOther.Controls.Add(this.pBProgram); this.gBOther.Controls.Add(this.cBLaunchProgram); @@ -787,6 +803,13 @@ this.gBOther.Name = "gBOther"; this.gBOther.TabStop = false; // + // cBTPforControls + // + resources.ApplyResources(this.cBTPforControls, "cBTPforControls"); + this.cBTPforControls.Name = "cBTPforControls"; + this.cBTPforControls.UseVisualStyleBackColor = true; + this.cBTPforControls.CheckedChanged += new System.EventHandler(this.cBTPforControls_CheckedChanged); + // // cBDinput // resources.ApplyResources(this.cBDinput, "cBDinput"); @@ -1345,6 +1368,8 @@ // // tPShiftMod // + this.tPShiftMod.Controls.Add(this.label2); + this.tPShiftMod.Controls.Add(this.fLPShiftTouchSwipe); this.tPShiftMod.Controls.Add(this.lbShiftGryo); this.tPShiftMod.Controls.Add(this.fLPShiftTiltControls); this.tPShiftMod.Controls.Add(this.cBShiftControl); @@ -1357,6 +1382,48 @@ this.tPShiftMod.Name = "tPShiftMod"; this.tPShiftMod.UseVisualStyleBackColor = true; // + // label2 + // + resources.ApplyResources(this.label2, "label2"); + this.label2.Name = "label2"; + // + // fLPShiftTouchSwipe + // + this.fLPShiftTouchSwipe.Controls.Add(this.bnShiftSwipeUp); + this.fLPShiftTouchSwipe.Controls.Add(this.bnShiftSwipeDown); + this.fLPShiftTouchSwipe.Controls.Add(this.bnShiftSwipeLeft); + this.fLPShiftTouchSwipe.Controls.Add(this.bnShiftSwipeRight); + resources.ApplyResources(this.fLPShiftTouchSwipe, "fLPShiftTouchSwipe"); + this.fLPShiftTouchSwipe.Name = "fLPShiftTouchSwipe"; + // + // bnShiftSwipeUp + // + resources.ApplyResources(this.bnShiftSwipeUp, "bnShiftSwipeUp"); + this.bnShiftSwipeUp.Name = "bnShiftSwipeUp"; + this.bnShiftSwipeUp.UseVisualStyleBackColor = true; + this.bnShiftSwipeUp.Click += new System.EventHandler(this.Show_ControlsBn); + // + // bnShiftSwipeDown + // + resources.ApplyResources(this.bnShiftSwipeDown, "bnShiftSwipeDown"); + this.bnShiftSwipeDown.Name = "bnShiftSwipeDown"; + this.bnShiftSwipeDown.UseVisualStyleBackColor = true; + this.bnShiftSwipeDown.Click += new System.EventHandler(this.Show_ControlsBn); + // + // bnShiftSwipeLeft + // + resources.ApplyResources(this.bnShiftSwipeLeft, "bnShiftSwipeLeft"); + this.bnShiftSwipeLeft.Name = "bnShiftSwipeLeft"; + this.bnShiftSwipeLeft.UseVisualStyleBackColor = true; + this.bnShiftSwipeLeft.Click += new System.EventHandler(this.Show_ControlsBn); + // + // bnShiftSwipeRight + // + resources.ApplyResources(this.bnShiftSwipeRight, "bnShiftSwipeRight"); + this.bnShiftSwipeRight.Name = "bnShiftSwipeRight"; + this.bnShiftSwipeRight.UseVisualStyleBackColor = true; + this.bnShiftSwipeRight.Click += new System.EventHandler(this.Show_ControlsBn); + // // lbShiftGryo // resources.ApplyResources(this.lbShiftGryo, "lbShiftGryo"); @@ -1438,7 +1505,6 @@ // lBShiftControls // this.lBShiftControls.FormattingEnabled = true; - resources.ApplyResources(this.lBShiftControls, "lBShiftControls"); this.lBShiftControls.Items.AddRange(new object[] { resources.GetString("lBShiftControls.Items"), resources.GetString("lBShiftControls.Items1"), @@ -1473,6 +1539,7 @@ resources.GetString("lBShiftControls.Items30"), resources.GetString("lBShiftControls.Items31"), resources.GetString("lBShiftControls.Items32")}); + resources.ApplyResources(this.lBShiftControls, "lBShiftControls"); this.lBShiftControls.Name = "lBShiftControls"; this.lBShiftControls.KeyDown += new System.Windows.Forms.KeyEventHandler(this.List_KeyDown); this.lBShiftControls.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.List_MouseDoubleClick); @@ -2002,6 +2069,8 @@ // // tPControls // + this.tPControls.Controls.Add(this.label1); + this.tPControls.Controls.Add(this.fLPTouchSwipe); this.tPControls.Controls.Add(this.lbGryo); this.tPControls.Controls.Add(this.fLPTiltControls); this.tPControls.Controls.Add(this.pnlMain); @@ -2012,6 +2081,48 @@ this.tPControls.Name = "tPControls"; this.tPControls.UseVisualStyleBackColor = true; // + // label1 + // + resources.ApplyResources(this.label1, "label1"); + this.label1.Name = "label1"; + // + // fLPTouchSwipe + // + this.fLPTouchSwipe.Controls.Add(this.bnSwipeUp); + this.fLPTouchSwipe.Controls.Add(this.bnSwipeDown); + this.fLPTouchSwipe.Controls.Add(this.bnSwipeLeft); + this.fLPTouchSwipe.Controls.Add(this.bnSwipeRight); + resources.ApplyResources(this.fLPTouchSwipe, "fLPTouchSwipe"); + this.fLPTouchSwipe.Name = "fLPTouchSwipe"; + // + // bnSwipeUp + // + resources.ApplyResources(this.bnSwipeUp, "bnSwipeUp"); + this.bnSwipeUp.Name = "bnSwipeUp"; + this.bnSwipeUp.UseVisualStyleBackColor = true; + this.bnSwipeUp.Click += new System.EventHandler(this.Show_ControlsBn); + // + // bnSwipeDown + // + resources.ApplyResources(this.bnSwipeDown, "bnSwipeDown"); + this.bnSwipeDown.Name = "bnSwipeDown"; + this.bnSwipeDown.UseVisualStyleBackColor = true; + this.bnSwipeDown.Click += new System.EventHandler(this.Show_ControlsBn); + // + // bnSwipeLeft + // + resources.ApplyResources(this.bnSwipeLeft, "bnSwipeLeft"); + this.bnSwipeLeft.Name = "bnSwipeLeft"; + this.bnSwipeLeft.UseVisualStyleBackColor = true; + this.bnSwipeLeft.Click += new System.EventHandler(this.Show_ControlsBn); + // + // bnSwipeRight + // + resources.ApplyResources(this.bnSwipeRight, "bnSwipeRight"); + this.bnSwipeRight.Name = "bnSwipeRight"; + this.bnSwipeRight.UseVisualStyleBackColor = true; + this.bnSwipeRight.Click += new System.EventHandler(this.Show_ControlsBn); + // // lbGryo // resources.ApplyResources(this.lbGryo, "lbGryo"); @@ -2409,7 +2520,6 @@ // lBControls // this.lBControls.FormattingEnabled = true; - resources.ApplyResources(this.lBControls, "lBControls"); this.lBControls.Items.AddRange(new object[] { resources.GetString("lBControls.Items"), resources.GetString("lBControls.Items1"), @@ -2444,6 +2554,7 @@ resources.GetString("lBControls.Items30"), resources.GetString("lBControls.Items31"), resources.GetString("lBControls.Items32")}); + resources.ApplyResources(this.lBControls, "lBControls"); this.lBControls.Name = "lBControls"; this.lBControls.DoubleClick += new System.EventHandler(this.Show_ControlsList); this.lBControls.KeyDown += new System.Windows.Forms.KeyEventHandler(this.List_KeyDown); @@ -2715,6 +2826,7 @@ ((System.ComponentModel.ISupportInitialize)(this.tBL2)).EndInit(); this.tPShiftMod.ResumeLayout(false); this.tPShiftMod.PerformLayout(); + this.fLPShiftTouchSwipe.ResumeLayout(false); this.fLPShiftTiltControls.ResumeLayout(false); this.pnlShiftMain.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pBShiftController)).EndInit(); @@ -2722,6 +2834,7 @@ ((System.ComponentModel.ISupportInitialize)(this.pBShiftSticks)).EndInit(); this.tPControls.ResumeLayout(false); this.tPControls.PerformLayout(); + this.fLPTouchSwipe.ResumeLayout(false); this.fLPTiltControls.ResumeLayout(false); this.pnlMain.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pBController)).EndInit(); @@ -2944,5 +3057,18 @@ private System.Windows.Forms.Button bnLSDown; private System.Windows.Forms.Button bnR3; private System.Windows.Forms.TabControl tabControls; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.FlowLayoutPanel fLPTouchSwipe; + private System.Windows.Forms.Button bnSwipeUp; + private System.Windows.Forms.Button bnSwipeDown; + private System.Windows.Forms.Button bnSwipeLeft; + private System.Windows.Forms.Button bnSwipeRight; + private System.Windows.Forms.CheckBox cBTPforControls; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.FlowLayoutPanel fLPShiftTouchSwipe; + private System.Windows.Forms.Button bnShiftSwipeUp; + private System.Windows.Forms.Button bnShiftSwipeDown; + private System.Windows.Forms.Button bnShiftSwipeLeft; + private System.Windows.Forms.Button bnShiftSwipeRight; } } \ No newline at end of file diff --git a/DS4Tool/Options.cs b/DS4Tool/Options.cs index fabd02b..26cf6e6 100644 --- a/DS4Tool/Options.cs +++ b/DS4Tool/Options.cs @@ -59,6 +59,9 @@ namespace ScpServer foreach (System.Windows.Forms.Control control in fLPTiltControls.Controls) if (control is Button && !((Button)control).Name.Contains("btn")) buttons.Add((Button)control); + foreach (System.Windows.Forms.Control control in fLPTouchSwipe.Controls) + if (control is Button && !((Button)control).Name.Contains("btn")) + buttons.Add((Button)control); foreach (System.Windows.Forms.Control control in pnlShiftMain.Controls) if (control is Button && !((Button)control).Name.Contains("btnShift")) subbuttons.Add((Button)control); @@ -67,11 +70,15 @@ namespace ScpServer subbuttons.Add((Button)control); foreach (System.Windows.Forms.Control control in fLPShiftTiltControls.Controls) if (control is Button && !((Button)control).Name.Contains("btnShift")) - subbuttons.Add((Button)control); + subbuttons.Add((Button)control); + foreach (System.Windows.Forms.Control control in fLPShiftTouchSwipe.Controls) + if (control is Button && !((Button)control).Name.Contains("btn")) + subbuttons.Add((Button)control); string butts = ""; foreach (Button b in buttons) butts += "\n" + b.Name; //MessageBox.Show(butts); + 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) @@ -88,11 +95,12 @@ namespace ScpServer ctrl.MouseHover += Items_MouseHover; else control.MouseHover += Items_MouseHover; + if (device < 4) nUDSixaxis.Value = deviceNum + 1; if (filename != "") { - if (device == 4) + if (device == 4) //if temp device is called Global.setAProfile(4, name); Global.LoadProfile(device, buttons.ToArray(), subbuttons.ToArray(), false, scpDevice); DS4Color color = Global.loadColor(device); @@ -185,6 +193,7 @@ namespace ScpServer cBDinput.Checked = Global.getDinputOnly(device); olddinputcheck = cBDinput.Checked; cbStartTouchpadOff.Checked = Global.getStartTouchpadOff(device); + cBTPforControls.Checked = Global.getUseTPforControls(device); } else { @@ -318,73 +327,83 @@ namespace ScpServer switch (((Button)sender).Name) { #region - case ("bnCross"): lBControls.SelectedIndex = 0; break; - case ("bnCircle"): lBControls.SelectedIndex = 1; break; - case ("bnSquare"): lBControls.SelectedIndex = 2; break; - case ("bnTriangle"): lBControls.SelectedIndex = 3; break; - case ("bnOptions"): lBControls.SelectedIndex = 4; break; - case ("bnShare"): lBControls.SelectedIndex = 5; break; - case ("bnUp"): lBControls.SelectedIndex = 6; break; - case ("bnDown"): lBControls.SelectedIndex = 7; break; - case ("bnLeft"): lBControls.SelectedIndex = 8; break; - case ("bnRight"): lBControls.SelectedIndex = 9; break; - case ("bnPS"): lBControls.SelectedIndex = 10; break; - case ("bnL1"): lBControls.SelectedIndex = 11; break; - case ("bnR1"): lBControls.SelectedIndex = 12; break; - case ("bnL2"): lBControls.SelectedIndex = 13; break; - case ("bnR2"): lBControls.SelectedIndex = 14; break; - case ("bnL3"): lBControls.SelectedIndex = 15; break; - case ("bnR3"): lBControls.SelectedIndex = 16; break; - case ("bnTouchLeft"): lBControls.SelectedIndex = 17; break; - case ("bnTouchRight"): lBControls.SelectedIndex = 18; break; - case ("bnTouchMulti"): lBControls.SelectedIndex = 19; break; - case ("bnTouchUpper"): lBControls.SelectedIndex = 20; break; - case ("bnLSUp"): lBControls.SelectedIndex = 21; break; - case ("bnLSDown"): lBControls.SelectedIndex = 22; break; - case ("bnLSLeft"): lBControls.SelectedIndex = 23; break; - case ("bnLSRight"): lBControls.SelectedIndex = 24; break; - case ("bnRSUp"): lBControls.SelectedIndex = 25; break; - case ("bnRSDown"): lBControls.SelectedIndex = 26; break; - case ("bnRSLeft"): lBControls.SelectedIndex = 27; break; - case ("bnRSRight"): lBControls.SelectedIndex = 28; break; - case ("bnGyroZN"): lBControls.SelectedIndex = 29; break; - case ("bnGyroZP"): lBControls.SelectedIndex = 30; break; - case ("bnGyroXP"): lBControls.SelectedIndex = 31; break; - case ("bnGyroXN"): lBControls.SelectedIndex = 32; break; + case "bnCross": lBControls.SelectedIndex = 0; break; + case "bnCircle": lBControls.SelectedIndex = 1; break; + case "bnSquare": lBControls.SelectedIndex = 2; break; + case "bnTriangle": lBControls.SelectedIndex = 3; break; + case "bnOptions": lBControls.SelectedIndex = 4; break; + case "bnShare": lBControls.SelectedIndex = 5; break; + case "bnUp": lBControls.SelectedIndex = 6; break; + case "bnDown": lBControls.SelectedIndex = 7; break; + case "bnLeft": lBControls.SelectedIndex = 8; break; + case "bnRight": lBControls.SelectedIndex = 9; break; + case "bnPS": lBControls.SelectedIndex = 10; break; + case "bnL1": lBControls.SelectedIndex = 11; break; + case "bnR1": lBControls.SelectedIndex = 12; break; + case "bnL2": lBControls.SelectedIndex = 13; break; + case "bnR2": lBControls.SelectedIndex = 14; break; + case "bnL3": lBControls.SelectedIndex = 15; break; + case "bnR3": lBControls.SelectedIndex = 16; break; + case "bnTouchLeft": lBControls.SelectedIndex = 17; break; + case "bnTouchRight": lBControls.SelectedIndex = 18; break; + case "bnTouchMulti": lBControls.SelectedIndex = 19; break; + case "bnTouchUpper": lBControls.SelectedIndex = 20; break; + case "bnLSUp": lBControls.SelectedIndex = 21; break; + case "bnLSDown": lBControls.SelectedIndex = 22; break; + case "bnLSLeft": lBControls.SelectedIndex = 23; break; + case "bnLSRight": lBControls.SelectedIndex = 24; break; + case "bnRSUp": lBControls.SelectedIndex = 25; break; + case "bnRSDown": lBControls.SelectedIndex = 26; break; + case "bnRSLeft": lBControls.SelectedIndex = 27; break; + case "bnRSRight": lBControls.SelectedIndex = 28; break; + case "bnGyroZN": lBControls.SelectedIndex = 29; break; + case "bnGyroZP": lBControls.SelectedIndex = 30; break; + case "bnGyroXP": lBControls.SelectedIndex = 31; break; + case "bnGyroXN": lBControls.SelectedIndex = 32; break; - case ("bnShiftCross"): lBShiftControls.SelectedIndex = 0; break; - case ("bnShiftCircle"): lBShiftControls.SelectedIndex = 1; break; - case ("bnShiftSquare"): lBShiftControls.SelectedIndex = 2; break; - case ("bnShiftTriangle"): lBShiftControls.SelectedIndex = 3; break; - case ("bnShiftOptions"): lBShiftControls.SelectedIndex = 4; break; - case ("bnShiftShare"): lBShiftControls.SelectedIndex = 5; break; - case ("bnShiftUp"): lBShiftControls.SelectedIndex = 6; break; - case ("bnShiftDown"): lBShiftControls.SelectedIndex = 7; break; - case ("bnShiftLeft"): lBShiftControls.SelectedIndex = 8; break; - case ("bnShiftRight"): lBShiftControls.SelectedIndex = 9; break; - case ("bnShiftPS"): lBShiftControls.SelectedIndex = 10; break; - case ("bnShiftL1"): lBShiftControls.SelectedIndex = 11; break; - case ("bnShiftR1"): lBShiftControls.SelectedIndex = 12; break; - case ("bnShiftL2"): lBShiftControls.SelectedIndex = 13; break; - case ("bnShiftR2"): lBShiftControls.SelectedIndex = 14; break; - case ("bnShiftL3"): lBShiftControls.SelectedIndex = 15; break; - case ("bnShiftR3"): lBShiftControls.SelectedIndex = 16; break; - case ("bnShiftTouchLeft"): lBShiftControls.SelectedIndex = 17; break; - case ("bnShiftTouchRight"): lBShiftControls.SelectedIndex = 18; break; - case ("bnShiftTouchMulti"): lBShiftControls.SelectedIndex = 19; break; - case ("bnShiftTouchUpper"): lBShiftControls.SelectedIndex = 20; break; - case ("bnShiftLSUp"): lBShiftControls.SelectedIndex = 21; break; - case ("bnShiftLSDown"): lBShiftControls.SelectedIndex = 22; break; - case ("bnShiftLSLeft"): lBShiftControls.SelectedIndex = 23; break; - case ("bnShiftLSRight"): lBShiftControls.SelectedIndex = 24; break; - case ("bnShiftRSUp"): lBShiftControls.SelectedIndex = 25; break; - case ("bnShiftRSDown"): lBShiftControls.SelectedIndex = 26; break; - case ("bnShiftRSLeft"): lBShiftControls.SelectedIndex = 27; break; - case ("bnShiftRSRight"): lBShiftControls.SelectedIndex = 28; break; - case ("bnShiftGyroZN"): lBShiftControls.SelectedIndex = 29; break; - case ("bnShiftGyroZP"): lBShiftControls.SelectedIndex = 30; break; - case ("bnShiftGyroXP"): lBShiftControls.SelectedIndex = 31; break; - case ("bnShiftGyroXN"): lBShiftControls.SelectedIndex = 32; break; + case "bnSwipeUp": lBControls.SelectedIndex = 33; break; + case "bnSwipeDown": lBControls.SelectedIndex = 34; break; + case "bnSwipeLeft": lBControls.SelectedIndex = 35; break; + case "bnSwipeRight": lBControls.SelectedIndex = 36; break; + + case "bnShiftCross": lBShiftControls.SelectedIndex = 0; break; + case "bnShiftCircle": lBShiftControls.SelectedIndex = 1; break; + case "bnShiftSquare": lBShiftControls.SelectedIndex = 2; break; + case "bnShiftTriangle": lBShiftControls.SelectedIndex = 3; break; + case "bnShiftOptions": lBShiftControls.SelectedIndex = 4; break; + case "bnShiftShare": lBShiftControls.SelectedIndex = 5; break; + case "bnShiftUp": lBShiftControls.SelectedIndex = 6; break; + case "bnShiftDown": lBShiftControls.SelectedIndex = 7; break; + case "bnShiftLeft": lBShiftControls.SelectedIndex = 8; break; + case "bnShiftRight": lBShiftControls.SelectedIndex = 9; break; + case "bnShiftPS": lBShiftControls.SelectedIndex = 10; break; + case "bnShiftL1": lBShiftControls.SelectedIndex = 11; break; + case "bnShiftR1": lBShiftControls.SelectedIndex = 12; break; + case "bnShiftL2": lBShiftControls.SelectedIndex = 13; break; + case "bnShiftR2": lBShiftControls.SelectedIndex = 14; break; + case "bnShiftL3": lBShiftControls.SelectedIndex = 15; break; + case "bnShiftR3": lBShiftControls.SelectedIndex = 16; break; + case "bnShiftTouchLeft": lBShiftControls.SelectedIndex = 17; break; + case "bnShiftTouchRight": lBShiftControls.SelectedIndex = 18; break; + case "bnShiftTouchMulti": lBShiftControls.SelectedIndex = 19; break; + case "bnShiftTouchUpper": lBShiftControls.SelectedIndex = 20; break; + case "bnShiftLSUp": lBShiftControls.SelectedIndex = 21; break; + case "bnShiftLSDown": lBShiftControls.SelectedIndex = 22; break; + case "bnShiftLSLeft": lBShiftControls.SelectedIndex = 23; break; + case "bnShiftLSRight": lBShiftControls.SelectedIndex = 24; break; + case "bnShiftRSUp": lBShiftControls.SelectedIndex = 25; break; + case "bnShiftRSDown": lBShiftControls.SelectedIndex = 26; break; + case "bnShiftRSLeft": lBShiftControls.SelectedIndex = 27; break; + case "bnShiftRSRight": lBShiftControls.SelectedIndex = 28; break; + case "bnShiftGyroZN": lBShiftControls.SelectedIndex = 29; break; + case "bnShiftGyroZP": lBShiftControls.SelectedIndex = 30; break; + case "bnShiftGyroXP": lBShiftControls.SelectedIndex = 31; break; + case "bnShiftGyroXN": lBShiftControls.SelectedIndex = 32; break; + + case "bnShiftSwipeUp": lBShiftControls.SelectedIndex = 33; break; + case "bnShiftSwipeDown": lBShiftControls.SelectedIndex = 34; break; + case "bnShiftSwipeLeft": lBShiftControls.SelectedIndex = 35; break; + case "bnShiftSwipeRight": lBShiftControls.SelectedIndex = 36; break; #endregion } } @@ -428,7 +447,12 @@ namespace ScpServer Global.setShiftModifier(device, cBShiftControl.SelectedIndex); Global.setDinputOnly(device, cBDinput.Checked); Global.setStartTouchpadOff(device, cbStartTouchpadOff.Checked); - + Global.setUseTPforControls(device, cBTPforControls.Checked); + gBTouchpad.Enabled = !cBTPforControls.Checked; + if (cBTPforControls.Checked) + tabControls.Size = new Size(tabControls.Size.Width, (int)(282 * dpiy)); + else + tabControls.Size = new Size(tabControls.Size.Width, (int)(242 * dpiy)); if (nUDRainbow.Value == 0) pBRainbow.Image = greyscale; else pBRainbow.Image = colored; } @@ -869,14 +893,25 @@ 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] = 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); + lBControls.Items[29] = Properties.Resources.TiltUp + " : " + UpdateRegButtonList(bnGyroZN); + lBControls.Items[30] = Properties.Resources.TiltDown + " : " + UpdateRegButtonList(bnGyroZP); + lBControls.Items[31] = Properties.Resources.TiltLeft + " : " + UpdateRegButtonList(bnGyroXP); + lBControls.Items[32] = Properties.Resources.TiltRight + " : " + UpdateRegButtonList(bnGyroXN); bnGyroZN.Text = Properties.Resources.TiltUp; bnGyroZP.Text = Properties.Resources.TiltDown; bnGyroXP.Text = Properties.Resources.TiltLeft; bnGyroXN.Text = Properties.Resources.TiltRight; + if (lBControls.Items.Count > 33) + { + lBControls.Items[33] = Properties.Resources.SwipeUp + " : " + UpdateRegButtonList(bnSwipeUp); + lBControls.Items[34] = Properties.Resources.SwipeDown + " : " + UpdateRegButtonList(bnSwipeDown); + lBControls.Items[35] = Properties.Resources.SwipeLeft + " : " + UpdateRegButtonList(bnSwipeLeft); + lBControls.Items[36] = Properties.Resources.SwipeRight + " : " + UpdateRegButtonList(bnSwipeRight); + bnSwipeUp.Text = Properties.Resources.SwipeUp; + bnSwipeDown.Text = Properties.Resources.SwipeDown; + bnSwipeLeft.Text = Properties.Resources.SwipeLeft; + bnSwipeRight.Text = Properties.Resources.SwipeRight; + } foreach (Button b in subbuttons) if (b.Tag == null) @@ -910,17 +945,28 @@ namespace ScpServer lBShiftControls.Items[26] = "RS Down : " + bnShiftRSDown.Text; lBShiftControls.Items[27] = "RS Left : " + bnShiftRSLeft.Text; lBShiftControls.Items[28] = "RS Right : " + bnShiftRSRight.Text; - lBShiftControls.Items[29] = Properties.Resources.TiltUp + " : " + UpdateGyroList(bnShiftGyroZN); - lBShiftControls.Items[30] = Properties.Resources.TiltDown + " : " + UpdateGyroList(bnShiftGyroZP); - lBShiftControls.Items[31] = Properties.Resources.TiltLeft + " : " + UpdateGyroList(bnShiftGyroXP); - lBShiftControls.Items[32] = Properties.Resources.TiltRight + " : " + UpdateGyroList(bnShiftGyroXN); + lBShiftControls.Items[29] = Properties.Resources.TiltUp + " : " + UpdateRegButtonList(bnShiftGyroZN); + lBShiftControls.Items[30] = Properties.Resources.TiltDown + " : " + UpdateRegButtonList(bnShiftGyroZP); + lBShiftControls.Items[31] = Properties.Resources.TiltLeft + " : " + UpdateRegButtonList(bnShiftGyroXP); + lBShiftControls.Items[32] = Properties.Resources.TiltRight + " : " + UpdateRegButtonList(bnShiftGyroXN); bnShiftGyroZN.Text = Properties.Resources.TiltUp; bnShiftGyroZP.Text = Properties.Resources.TiltDown; bnShiftGyroXP.Text = Properties.Resources.TiltLeft; bnShiftGyroXN.Text = Properties.Resources.TiltRight; + if (lBShiftControls.Items.Count > 33) + { + lBShiftControls.Items[33] = Properties.Resources.SwipeUp + " : " + UpdateRegButtonList(bnShiftSwipeUp); + lBShiftControls.Items[34] = Properties.Resources.SwipeDown + " : " + UpdateRegButtonList(bnShiftSwipeDown); + lBShiftControls.Items[35] = Properties.Resources.SwipeLeft + " : " + UpdateRegButtonList(bnShiftSwipeLeft); + lBShiftControls.Items[36] = Properties.Resources.SwipeRight + " : " + UpdateRegButtonList(bnShiftSwipeRight); + bnShiftSwipeUp.Text = Properties.Resources.SwipeUp; + bnShiftSwipeDown.Text = Properties.Resources.SwipeDown; + bnShiftSwipeLeft.Text = Properties.Resources.SwipeLeft; + bnShiftSwipeRight.Text = Properties.Resources.SwipeRight; + } } - private string UpdateGyroList(Button button) + private string UpdateRegButtonList(Button button) { if (button.Tag is String && (String)button.Tag == "Unbound") return "Unbound"; @@ -933,7 +979,7 @@ namespace ScpServer else if (button.Tag is string) return button.Tag.ToString(); else if (button.Name.StartsWith("s") && buttons[subbuttons.IndexOf(button)].Tag != null && button.Tag == null) - return "Fall Back to " + UpdateGyroList(buttons[subbuttons.IndexOf(button)]); + return "Fall Back to " + UpdateRegButtonList(buttons[subbuttons.IndexOf(button)]); else return string.Empty; } @@ -975,6 +1021,11 @@ namespace ScpServer if (lBControls.SelectedIndex == 30) Show_ControlsBn(bnGyroZP, e); if (lBControls.SelectedIndex == 31) Show_ControlsBn(bnGyroXP, e); if (lBControls.SelectedIndex == 32) Show_ControlsBn(bnGyroXN, e); + + if (lBControls.SelectedIndex == 33) Show_ControlsBn(bnSwipeUp, e); + if (lBControls.SelectedIndex == 34) Show_ControlsBn(bnSwipeDown, e); + if (lBControls.SelectedIndex == 35) Show_ControlsBn(bnSwipeLeft, e); + if (lBControls.SelectedIndex == 36) Show_ControlsBn(bnSwipeRight, e); } private void Show_ShiftControlsList(object sender, EventArgs e) @@ -1015,6 +1066,12 @@ namespace ScpServer if (lBShiftControls.SelectedIndex == 30) Show_ControlsBn(bnShiftGyroZP, e); if (lBShiftControls.SelectedIndex == 31) Show_ControlsBn(bnShiftGyroXP, e); if (lBShiftControls.SelectedIndex == 32) Show_ControlsBn(bnShiftGyroXN, e); + + + if (lBShiftControls.SelectedIndex == 33) Show_ControlsBn(bnShiftSwipeUp, e); + if (lBShiftControls.SelectedIndex == 34) Show_ControlsBn(bnShiftSwipeDown, e); + if (lBShiftControls.SelectedIndex == 35) Show_ControlsBn(bnShiftSwipeLeft, e); + if (lBShiftControls.SelectedIndex == 36) Show_ControlsBn(bnShiftSwipeRight, e); } private void List_MouseDoubleClick(object sender, MouseEventArgs e) @@ -1425,6 +1482,7 @@ namespace ScpServer 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; + case "cBTPforControls": root.lbLastMessage.Text = "This disables the Touchpad as a mouse"; 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") @@ -1432,5 +1490,43 @@ namespace ScpServer else root.lbLastMessage.ForeColor = SystemColors.GrayText; } + + private void cBTPforControls_CheckedChanged(object sender, EventArgs e) + { + Global.setUseTPforControls(device, cBTPforControls.Checked); + gBTouchpad.Enabled = !cBTPforControls.Checked; + if (cBTPforControls.Checked) + { + tabControls.Size = new Size(tabControls.Size.Width, (int)(282 * dpiy)); + lBControls.Items.Add(Properties.Resources.SwipeUp + " : " + UpdateRegButtonList(bnSwipeUp)); + lBControls.Items.Add(Properties.Resources.SwipeDown + " : " + UpdateRegButtonList(bnSwipeDown)); + lBControls.Items.Add(Properties.Resources.SwipeLeft + " : " + UpdateRegButtonList(bnSwipeLeft)); + lBControls.Items.Add(Properties.Resources.SwipeRight + " : " + UpdateRegButtonList(bnSwipeRight)); + bnSwipeUp.Text = Properties.Resources.SwipeUp; + bnSwipeDown.Text = Properties.Resources.SwipeDown; + bnSwipeLeft.Text = Properties.Resources.SwipeLeft; + bnSwipeRight.Text = Properties.Resources.SwipeRight; + lBShiftControls.Items.Add(Properties.Resources.SwipeUp + " : " + UpdateRegButtonList(bnShiftSwipeUp)); + lBShiftControls.Items.Add(Properties.Resources.SwipeDown + " : " + UpdateRegButtonList(bnShiftSwipeDown)); + lBShiftControls.Items.Add(Properties.Resources.SwipeLeft + " : " + UpdateRegButtonList(bnShiftSwipeLeft)); + lBShiftControls.Items.Add(Properties.Resources.SwipeRight + " : " + UpdateRegButtonList(bnShiftSwipeRight)); + bnShiftSwipeUp.Text = Properties.Resources.SwipeUp; + bnShiftSwipeDown.Text = Properties.Resources.SwipeDown; + bnShiftSwipeLeft.Text = Properties.Resources.SwipeLeft; + bnShiftSwipeRight.Text = Properties.Resources.SwipeRight; + } + else + { + tabControls.Size = new Size(tabControls.Size.Width, (int)(242 * dpiy)); + lBControls.Items.RemoveAt(36); + lBControls.Items.RemoveAt(35); + lBControls.Items.RemoveAt(34); + lBControls.Items.RemoveAt(33); + lBShiftControls.Items.RemoveAt(36); + lBShiftControls.Items.RemoveAt(35); + lBShiftControls.Items.RemoveAt(34); + lBShiftControls.Items.RemoveAt(33); + } + } } } diff --git a/DS4Tool/Options.resx b/DS4Tool/Options.resx index fba3816..823a1bb 100644 --- a/DS4Tool/Options.resx +++ b/DS4Tool/Options.resx @@ -126,13 +126,10 @@ - 66, 13 - - - 5, 5, 5, 5 + 44, 9 - 19, 19 + 13, 13 @@ -151,13 +148,10 @@ 0 - 271, 24 - - - 5, 5, 5, 5 + 181, 16 - 59, 26 + 39, 20 167 @@ -178,13 +172,10 @@ NoControl - 239, 26 - - - 5, 5, 5, 5 + 159, 17 - 24, 24 + 16, 16 StretchImage @@ -211,13 +202,10 @@ NoControl - 487, 6 - - - 5, 5, 5, 5 + 325, 4 - 150, 30 + 100, 20 12 @@ -241,13 +229,10 @@ NoControl - 294, 6 - - - 5, 5, 5, 5 + 196, 4 - 150, 30 + 100, 20 11 @@ -271,13 +256,10 @@ NoControl - 109, 6 - - - 5, 5, 5, 5 + 73, 4 - 150, 30 + 100, 20 10 @@ -301,13 +283,10 @@ NoControl - 474, 25 - - - 5, 5, 5, 5 + 316, 17 - 165, 24 + 111, 17 162 @@ -334,13 +313,10 @@ NoControl - 462, 11 - - - 5, 0, 5, 0 + 308, 7 - 20, 20 + 14, 13 160 @@ -367,13 +343,10 @@ NoControl - 270, 11 - - - 5, 0, 5, 0 + 180, 7 - 22, 20 + 15, 13 159 @@ -400,13 +373,10 @@ NoControl - 335, 29 - - - 5, 0, 5, 0 + 223, 19 - 81, 20 + 59, 13 157 @@ -433,13 +403,10 @@ NoControl - 86, 11 - - - 5, 0, 5, 0 + 57, 7 - 21, 20 + 15, 13 158 @@ -466,16 +433,13 @@ NoControl - 533, 26 - - - 5, 5, 5, 5 + 109, 78 No - 117, 24 + 82, 17 226 @@ -493,7 +457,7 @@ gBTouchpad - 2 + 9 True @@ -502,16 +466,13 @@ NoControl - 386, 26 - - - 5, 5, 5, 5 + 11, 78 Yes - 62, 24 + 45, 17 230 @@ -529,16 +490,13 @@ gBTouchpad - 6 + 5 - 463, 25 - - - 5, 5, 5, 5 + 63, 78 - 60, 26 + 40, 20 227 @@ -553,7 +511,7 @@ gBTouchpad - 8 + 7 True @@ -562,16 +520,13 @@ NoControl - 162, 72 - - - 5, 5, 5, 5 + 108, 48 Yes - 74, 24 + 52, 17 231 @@ -589,7 +544,7 @@ gBTouchpad - 9 + 8 True @@ -598,16 +553,13 @@ NoControl - 11, 72 - - - 5, 5, 5, 5 + 7, 48 Yes - 70, 24 + 49, 17 232 @@ -625,16 +577,13 @@ gBTouchpad - 4 + 3 - 250, 70 - - - 5, 5, 5, 5 + 167, 47 - 60, 26 + 40, 20 228 @@ -649,16 +598,13 @@ gBTouchpad - 7 + 6 - 94, 70 - - - 5, 5, 5, 5 + 63, 47 - 60, 26 + 40, 20 229 @@ -673,7 +619,7 @@ gBTouchpad - 5 + 4 True @@ -682,13 +628,10 @@ NoControl - 7, 26 - - - 5, 0, 5, 0 + 5, 17 - 135, 20 + 92, 13 206 @@ -709,7 +652,7 @@ gBOther - 10 + 11 True @@ -718,16 +661,13 @@ NoControl - 198, 26 - - - 5, 5, 5, 5 + 304, 79 No - 181, 24 + 124, 17 223 @@ -745,7 +685,7 @@ gBTouchpad - 3 + 2 True @@ -754,16 +694,13 @@ NoControl - 18, 26 - - - 5, 5, 5, 5 + 12, 17 No - 177, 24 + 118, 17 224 @@ -790,13 +727,10 @@ NoControl - 11, 25 - - - 5, 0, 5, 0 + 7, 17 - 27, 20 + 19, 13 196 @@ -823,13 +757,10 @@ NoControl - 132, 25 - - - 5, 0, 5, 0 + 88, 17 - 30, 20 + 21, 13 197 @@ -856,13 +787,10 @@ NoControl - 245, 70 - - - 5, 0, 5, 0 + 163, 47 - 42, 20 + 28, 13 200 @@ -880,16 +808,13 @@ gBOther - 13 + 14 - 163, 66 - - - 5, 5, 5, 5 + 109, 44 - 74, 26 + 49, 20 201 @@ -904,16 +829,13 @@ gBOther - 8 + 9 - 167, 23 - - - 5, 5, 5, 5 + 111, 15 - 74, 26 + 49, 20 202 @@ -940,16 +862,13 @@ NoControl - 535, 24 - - - 5, 5, 5, 5 + 357, 73 Yes - 107, 24 + 73, 17 198 @@ -968,16 +887,13 @@ gBOther - 12 + 13 - 22, 23 - - - 5, 5, 5, 5 + 15, 15 - 65, 26 + 43, 20 211 @@ -998,13 +914,10 @@ NoControl - 22, 59 - - - 5, 5, 5, 5 + 15, 39 - 96, 35 + 64, 23 214 @@ -1031,13 +944,10 @@ NoControl - 11, 11 - - - 5, 0, 5, 0 + 7, 7 - 38, 20 + 26, 13 225 @@ -1064,13 +974,10 @@ NoControl - 86, 13 - - - 5, 0, 5, 0 + 57, 9 - 21, 20 + 15, 13 158 @@ -1097,13 +1004,10 @@ NoControl - 270, 13 - - - 5, 0, 5, 0 + 180, 9 - 22, 20 + 15, 13 159 @@ -1130,13 +1034,10 @@ NoControl - 462, 13 - - - 5, 0, 5, 0 + 308, 9 - 20, 20 + 14, 13 160 @@ -1163,13 +1064,10 @@ NoControl - 109, 7 - - - 5, 5, 5, 5 + 73, 5 - 150, 30 + 100, 20 10 @@ -1193,13 +1091,10 @@ NoControl - 294, 7 - - - 5, 5, 5, 5 + 196, 5 - 150, 30 + 100, 20 11 @@ -1223,13 +1118,10 @@ NoControl - 487, 7 - - - 5, 5, 5, 5 + 325, 5 - 150, 30 + 100, 20 12 @@ -1253,13 +1145,10 @@ NoControl - 11, 13 - - - 5, 0, 5, 0 + 7, 9 - 58, 20 + 39, 13 225 @@ -1280,13 +1169,10 @@ 7 - 2, 62 - - - 5, 5, 5, 5 + 1, 41 - 653, 43 + 435, 29 235 @@ -1304,13 +1190,10 @@ 14 - 2, 108 - - - 5, 5, 5, 5 + 1, 72 - 653, 43 + 435, 29 234 @@ -1334,13 +1217,10 @@ NoControl - 132, 70 - - - 5, 0, 5, 0 + 88, 47 - 32, 20 + 22, 13 197 @@ -1367,13 +1247,10 @@ NoControl - 10, 70 - - - 5, 0, 5, 0 + 7, 47 - 29, 20 + 20, 13 196 @@ -1394,16 +1271,13 @@ 7 - 167, 65 - - - 5, 5, 5, 5 + 111, 43 No - 74, 26 + 49, 20 203 @@ -1421,13 +1295,10 @@ 9 - 163, 24 - - - 5, 5, 5, 5 + 109, 16 - 74, 26 + 49, 20 241 @@ -1442,19 +1313,16 @@ gBOther - 11 + 12 - 47, 66 - - - 5, 5, 5, 5 + 31, 44 No - 74, 26 + 49, 20 203 @@ -1472,16 +1340,13 @@ 11 - 47, 23 - - - 5, 5, 5, 5 + 31, 15 No - 74, 26 + 49, 20 203 @@ -1505,13 +1370,10 @@ NoControl - 318, 72 - - - 5, 5, 5, 5 + 212, 48 - 207, 24 + 142, 17 233 @@ -1532,16 +1394,10 @@ 0 - 2, 377 - - - 5, 5, 5, 5 - - - 5, 5, 5, 5 + 3, 251 - 655, 106 + 435, 106 246 @@ -1561,6 +1417,41 @@ 4 + + True + + + NoControl + + + 315, 36 + + + Yes + + + 115, 30 + + + 257 + + + Use Touchpad +Swipes for controls + + + + cBTPforControls + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gBOther + + + 0 + True @@ -1568,16 +1459,13 @@ NoControl - 493, 109 - - - 5, 5, 5, 5 + 329, 102 Yes - 147, 24 + 101, 17 256 @@ -1595,19 +1483,16 @@ gBOther - 0 + 1 NoControl - 610, 59 - - - 5, 5, 5, 5 + 189, 96 - 35, 35 + 23, 23 Zoom @@ -1625,7 +1510,7 @@ gBOther - 1 + 2 True @@ -1634,16 +1519,13 @@ NoControl - 336, 58 - - - 5, 5, 5, 5 + 6, 96 Yes - 156, 44 + 107, 30 254 @@ -1662,7 +1544,7 @@ with profile gBOther - 2 + 3 Zoom @@ -1674,13 +1556,10 @@ with profile NoControl - 503, 61 - - - 5, 5, 5, 5 + 117, 98 - 101, 35 + 67, 23 253 @@ -1698,7 +1577,7 @@ with profile gBOther - 3 + 4 True @@ -1707,13 +1586,10 @@ with profile NoControl - 11, 113 - - - 5, 0, 5, 0 + 7, 75 - 110, 20 + 73, 13 252 @@ -1731,7 +1607,7 @@ with profile gBOther - 4 + 5 True @@ -1740,13 +1616,10 @@ with profile NoControl - 254, 25 - - - 5, 5, 5, 5 + 169, 17 - 175, 24 + 120, 17 251 @@ -1764,16 +1637,13 @@ with profile gBOther - 5 + 6 - 122, 109 - - - 5, 5, 5, 5 + 81, 73 - 43, 26 + 29, 20 250 @@ -1788,7 +1658,7 @@ with profile gBOther - 6 + 7 True @@ -1797,16 +1667,13 @@ with profile NoControl - 175, 110 - - - 5, 5, 5, 5 + 117, 73 Yes - 209, 24 + 142, 17 242 @@ -1824,7 +1691,7 @@ with profile gBOther - 7 + 8 True @@ -1833,16 +1700,13 @@ with profile NoControl - 10, 67 - - - 5, 5, 5, 5 + 7, 45 Yes - 145, 24 + 100, 17 232 @@ -1860,19 +1724,13 @@ with profile gBOther - 9 + 10 - 667, 338 - - - 5, 5, 5, 5 - - - 5, 5, 5, 5 + 445, 225 - 654, 143 + 436, 132 247 @@ -1899,13 +1757,10 @@ with profile NoControl - 587, 162 - - - 5, 5, 5, 5 + 391, 108 - 19, 19 + 13, 13 49 @@ -1932,13 +1787,10 @@ with profile NoControl - 504, 158 - - - 5, 5, 5, 5 + 336, 105 - 71, 24 + 49, 17 238 @@ -1965,13 +1817,10 @@ with profile NoControl - 238, 158 - - - 5, 5, 5, 5 + 159, 105 - 145, 24 + 99, 17 237 @@ -1998,13 +1847,10 @@ with profile NoControl - 145, 158 - - - 5, 5, 5, 5 + 97, 105 - 84, 24 + 58, 17 237 @@ -2031,13 +1877,10 @@ with profile NoControl - 395, 158 - - - 5, 5, 5, 5 + 263, 105 - 96, 24 + 67, 17 237 @@ -2064,13 +1907,10 @@ with profile NoControl - 13, 162 - - - 5, 0, 5, 0 + 9, 108 - 120, 20 + 82, 13 236 @@ -2097,13 +1937,10 @@ with profile NoControl - 146, 26 - - - 5, 0, 5, 0 + 99, 17 - 23, 20 + 15, 13 207 @@ -2124,13 +1961,10 @@ with profile 6 - 82, 24 - - - 5, 5, 5, 5 + 55, 16 - 65, 26 + 43, 20 167 @@ -2154,13 +1988,10 @@ with profile NoControl - 13, 26 - - - 5, 0, 5, 0 + 9, 17 - 66, 20 + 44, 13 207 @@ -2187,13 +2018,10 @@ with profile NoControl - 12, 12 - - - 5, 5, 5, 5 + 8, 8 - 262, 24 + 176, 17 226 @@ -2220,13 +2048,10 @@ with profile NoControl - 11, 49 - - - 5, 0, 5, 0 + 7, 33 - 46, 20 + 31, 13 225 @@ -2253,13 +2078,10 @@ with profile NoControl - 86, 49 - - - 5, 0, 5, 0 + 57, 33 - 21, 20 + 15, 13 158 @@ -2286,13 +2108,10 @@ with profile NoControl - 270, 49 - - - 5, 0, 5, 0 + 180, 33 - 22, 20 + 15, 13 159 @@ -2319,13 +2138,10 @@ with profile NoControl - 462, 49 - - - 5, 0, 5, 0 + 308, 33 - 20, 20 + 14, 13 160 @@ -2352,13 +2168,10 @@ with profile NoControl - 109, 46 - - - 5, 5, 5, 5 + 73, 31 - 150, 30 + 100, 20 10 @@ -2382,13 +2195,10 @@ with profile NoControl - 294, 46 - - - 5, 5, 5, 5 + 196, 31 - 150, 30 + 100, 20 11 @@ -2412,13 +2222,10 @@ with profile NoControl - 487, 46 - - - 5, 5, 5, 5 + 325, 31 - 150, 30 + 100, 20 12 @@ -2436,13 +2243,10 @@ with profile 7 - 2, 62 - - - 5, 5, 5, 5 + 1, 41 - 653, 90 + 435, 60 235 @@ -2463,16 +2267,10 @@ with profile 13 - 665, 127 - - - 5, 5, 5, 5 - - - 5, 5, 5, 5 + 443, 85 - 658, 193 + 439, 129 247 @@ -2499,13 +2297,10 @@ with profile NoControl - 95, 25 - - - 5, 0, 5, 0 + 63, 17 - 23, 20 + 15, 13 207 @@ -2526,16 +2321,10 @@ with profile 0 - 667, 18 - - - 5, 5, 5, 5 - - - 5, 5, 5, 5 + 445, 12 - 133, 101 + 89, 67 247 @@ -2562,13 +2351,10 @@ with profile NoControl - 252, 24 - - - 5, 0, 5, 0 + 168, 16 - 72, 20 + 49, 13 197 @@ -2595,13 +2381,10 @@ with profile NoControl - 252, 67 - - - 5, 0, 5, 0 + 168, 45 - 71, 20 + 49, 13 197 @@ -2622,16 +2405,13 @@ with profile 3 - 335, 65 - - - 5, 5, 5, 5 + 223, 43 No - 74, 26 + 49, 20 203 @@ -2649,13 +2429,10 @@ with profile 6 - 335, 22 - - - 5, 5, 5, 5 + 223, 15 - 74, 26 + 49, 20 202 @@ -2673,16 +2450,10 @@ with profile 8 - 901, 17 - - - 5, 5, 5, 5 - - - 5, 5, 5, 5 + 601, 11 - 422, 101 + 281, 67 248 @@ -2712,13 +2483,10 @@ with profile NoControl - 107, 37 - - - 5, 5, 5, 5 + 71, 25 - 74, 29 + 49, 19 219 @@ -2742,13 +2510,10 @@ with profile NoControl - 121, 6 - - - 5, 0, 5, 0 + 81, 4 - 48, 20 + 34, 13 215 @@ -2775,13 +2540,10 @@ with profile NoControl - 5, 36 - - - 5, 5, 5, 5 + 3, 24 - 74, 29 + 49, 19 222 @@ -2805,13 +2567,10 @@ with profile NoControl - 19, 7 - - - 5, 0, 5, 0 + 13, 5 - 43, 20 + 29, 13 216 @@ -2838,13 +2597,10 @@ with profile NoControl - 5, 73 - - - 5, 5, 5, 5 + 3, 49 - 74, 29 + 49, 19 221 @@ -2868,13 +2624,10 @@ with profile NoControl - 5, 119 - - - 5, 5, 5, 5 + 3, 79 - 74, 29 + 49, 19 220 @@ -2898,13 +2651,10 @@ with profile NoControl - 108, 73 - - - 5, 5, 5, 5 + 72, 49 - 74, 29 + 49, 19 218 @@ -2928,13 +2678,10 @@ with profile NoControl - 107, 119 - - - 5, 5, 5, 5 + 71, 79 - 74, 29 + 49, 19 217 @@ -2952,13 +2699,10 @@ with profile 7 - 450, 132 - - - 5, 5, 5, 5 + 300, 88 - 187, 187 + 125, 125 236 @@ -2985,13 +2729,10 @@ with profile NoControl - 474, 49 - - - 5, 0, 5, 0 + 316, 33 - 27, 20 + 19, 13 216 @@ -3018,13 +2759,10 @@ with profile NoControl - 168, 13 - - - 5, 5, 5, 5 + 112, 9 - 14, 14 + 9, 9 243 @@ -3051,13 +2789,10 @@ with profile NoControl - 542, 226 - - - 5, 5, 5, 5 + 361, 151 - 5, 5 + 3, 3 237 @@ -3087,13 +2822,10 @@ with profile NoControl - 317, 223 - - - 5, 5, 5, 5 + 211, 149 - 5, 5 + 3, 3 237 @@ -3117,13 +2849,10 @@ with profile NoControl - 226, 84 - - - 5, 0, 5, 0 + 151, 56 - 187, 46 + 125, 31 216 @@ -3153,13 +2882,10 @@ with profile NoControl - 10, 11 - - - 5, 0, 5, 0 + 7, 7 - 145, 20 + 100, 13 216 @@ -3189,13 +2915,10 @@ with profile NoControl - 577, 49 - - - 5, 0, 5, 0 + 385, 33 - 30, 20 + 21, 13 216 @@ -3222,13 +2945,10 @@ with profile NoControl - 10, 84 - - - 5, 0, 5, 0 + 7, 56 - 187, 46 + 125, 31 216 @@ -3255,13 +2975,10 @@ with profile NoControl - 450, 84 - - - 5, 0, 5, 0 + 300, 56 - 187, 46 + 125, 31 216 @@ -3294,13 +3011,10 @@ with profile NoControl - 101, 223 - - - 5, 5, 5, 5 + 67, 149 - 5, 5 + 3, 3 237 @@ -3412,13 +3126,10 @@ with profile NoControl - 522, 204 - - - 5, 5, 5, 5 + 348, 136 - 47, 47 + 31, 31 StretchImage @@ -3530,13 +3241,10 @@ with profile NoControl - 311, 218 - - - 5, 5, 5, 5 + 207, 145 - 14, 14 + 9, 9 StretchImage @@ -3563,13 +3271,10 @@ with profile NoControl - 226, 132 - - - 5, 0, 5, 0 + 151, 88 - 187, 187 + 125, 125 239 @@ -3681,13 +3386,10 @@ with profile NoControl - 95, 218 - - - 5, 5, 5, 5 + 63, 145 - 14, 14 + 9, 9 StretchImage @@ -3714,13 +3416,10 @@ with profile NoControl - 7, 132 - - - 5, 0, 5, 0 + 5, 88 - 187, 187 + 125, 125 239 @@ -3750,10 +3449,7 @@ with profile NoControl - 547, 5 - - - 5, 5, 5, 5 + 365, 3 Vertical @@ -3762,7 +3458,7 @@ with profile Yes - 37, 74 + 25, 49 244 @@ -3789,10 +3485,7 @@ with profile NoControl - 497, 5 - - - 5, 5, 5, 5 + 331, 3 Vertical @@ -3804,7 +3497,7 @@ with profile True - 37, 74 + 25, 49 244 @@ -3825,13 +3518,10 @@ with profile NoControl - 450, 132 - - - 5, 0, 5, 0 + 300, 88 - 187, 187 + 125, 125 239 @@ -3852,16 +3542,13 @@ with profile 18 - 4, 29 - - - 5, 5, 5, 5 + 4, 22 - 5, 5, 5, 5 + 3, 3, 3, 3 - 646, 329 + 428, 216 2 @@ -3881,6 +3568,166 @@ with profile 2 + + True + + + NoControl + + + 5, 221 + + + 59, 26 + + + 257 + + + Touchpad +Swipes: + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tPShiftMod + + + 0 + + + NoControl + + + 3, 3 + + + 80, 23 + + + 250 + + + Swipe Up + + + bnShiftSwipeUp + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + fLPShiftTouchSwipe + + + 0 + + + NoControl + + + 89, 3 + + + 80, 23 + + + 250 + + + Swipe Down + + + bnShiftSwipeDown + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + fLPShiftTouchSwipe + + + 1 + + + NoControl + + + 175, 3 + + + 80, 23 + + + 250 + + + Swipe Left + + + bnShiftSwipeLeft + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + fLPShiftTouchSwipe + + + 2 + + + NoControl + + + 261, 3 + + + 80, 23 + + + 250 + + + Swipe Right + + + bnShiftSwipeRight + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + fLPShiftTouchSwipe + + + 3 + + + 72, 219 + + + 351, 31 + + + 258 + + + fLPShiftTouchSwipe + + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tPShiftMod + + + 1 + True @@ -3888,13 +3735,10 @@ with profile NoControl - 7, 288 - - - 5, 0, 5, 0 + 5, 192 - 99, 20 + 67, 13 255 @@ -3912,19 +3756,16 @@ with profile tPShiftMod - 0 + 2 NoControl - 5, 5 - - - 5, 5, 5, 5 + 3, 3 - 120, 35 + 80, 23 250 @@ -3948,13 +3789,10 @@ with profile NoControl - 135, 5 - - - 5, 5, 5, 5 + 89, 3 - 120, 35 + 80, 23 250 @@ -3978,13 +3816,10 @@ with profile NoControl - 265, 5 - - - 5, 5, 5, 5 + 175, 3 - 120, 35 + 80, 23 250 @@ -4008,13 +3843,10 @@ with profile NoControl - 395, 5 - - - 5, 5, 5, 5 + 261, 3 - 120, 35 + 80, 23 250 @@ -4035,13 +3867,10 @@ with profile 3 - 108, 277 - - - 5, 5, 5, 5 + 72, 185 - 526, 47 + 351, 31 256 @@ -4056,7 +3885,7 @@ with profile tPShiftMod - 1 + 3 (nothing)/shift off @@ -4140,13 +3969,10 @@ with profile Touchpad (not clicked in) - 119, 5 - - - 5, 5, 5, 5 + 79, 3 - 215, 28 + 145, 21 192 @@ -4161,10 +3987,7 @@ with profile tPShiftMod - 2 - - - 20 + 4 Cross : @@ -4266,13 +4089,10 @@ with profile Sixaxis Right : - 385, 11 - - - 5, 5, 5, 5 + 257, 7 - 251, 244 + 169, 173 188 @@ -4287,7 +4107,7 @@ with profile tPShiftMod - 3 + 5 True @@ -4296,13 +4116,10 @@ with profile NoControl - 66, 10 - - - 5, 0, 5, 0 + 44, 7 - 42, 20 + 29, 13 189 @@ -4323,7 +4140,7 @@ with profile tPShiftMod - 4 + 6 True @@ -4332,13 +4149,10 @@ with profile NoControl - 126, 36 - - - 5, 0, 5, 0 + 84, 24 - 157, 20 + 105, 13 189 @@ -4359,7 +4173,7 @@ with profile tPShiftMod - 5 + 7 Stretch @@ -4373,11 +4187,8 @@ with profile 0, 0 - - 5, 5, 5, 5 - - 367, 198 + 245, 132 StretchImage @@ -4407,13 +4218,10 @@ with profile NoControl - 126, 37 - - - 5, 5, 5, 5 + 84, 25 - 118, 24 + 79, 16 193 @@ -4443,13 +4251,10 @@ with profile NoControl - 126, 60 - - - 5, 5, 5, 5 + 84, 40 - 37, 53 + 25, 35 191 @@ -4479,13 +4284,10 @@ with profile NoControl - 209, 60 - - - 5, 5, 5, 5 + 139, 40 - 35, 50 + 23, 33 190 @@ -4515,13 +4317,10 @@ with profile NoControl - 163, 60 - - - 5, 5, 5, 5 + 109, 40 - 46, 50 + 31, 33 192 @@ -4551,13 +4350,10 @@ with profile NoControl - 263, 19 - - - 5, 5, 5, 5 + 175, 13 - 65, 23 + 43, 15 87 @@ -4587,13 +4383,10 @@ with profile NoControl - 281, 114 - - - 5, 5, 5, 5 + 187, 76 - 29, 25 + 19, 17 74 @@ -4623,13 +4416,10 @@ with profile NoControl - 312, 90 - - - 5, 5, 5, 5 + 208, 60 - 24, 25 + 16, 17 71 @@ -4659,13 +4449,10 @@ with profile NoControl - 226, 134 - - - 5, 5, 5, 5 + 151, 89 - 42, 42 + 28, 28 91 @@ -4695,13 +4482,10 @@ with profile NoControl - 259, 91 - - - 5, 5, 5, 5 + 173, 61 - 23, 22 + 15, 15 72 @@ -4731,13 +4515,10 @@ with profile NoControl - 126, 10 - - - 5, 5, 5, 5 + 84, 7 - 118, 29 + 79, 19 91 @@ -4767,13 +4548,10 @@ with profile NoControl - 282, 67 - - - 5, 5, 5, 5 + 188, 45 - 30, 24 + 20, 16 73 @@ -4803,13 +4581,10 @@ with profile NoControl - 66, 72 - - - 5, 5, 5, 5 + 44, 48 - 17, 23 + 11, 15 80 @@ -4839,13 +4614,10 @@ with profile NoControl - 106, 134 - - - 5, 5, 5, 5 + 71, 89 - 42, 42 + 28, 28 91 @@ -4875,13 +4647,10 @@ with profile NoControl - 66, 109 - - - 5, 5, 5, 5 + 44, 73 - 18, 18 + 12, 12 81 @@ -4911,13 +4680,10 @@ with profile NoControl - 47, 0 - - - 5, 5, 5, 5 + 31, 0 - 65, 18 + 43, 12 90 @@ -4947,13 +4713,10 @@ with profile NoControl - 83, 91 - - - 5, 5, 5, 5 + 55, 61 - 22, 22 + 15, 15 82 @@ -4983,13 +4746,10 @@ with profile NoControl - 262, 0 - - - 5, 5, 5, 5 + 175, 0 - 60, 19 + 40, 13 89 @@ -5019,13 +4779,10 @@ with profile NoControl - 47, 91 - - - 5, 5, 5, 5 + 31, 61 - 22, 18 + 15, 12 83 @@ -5055,13 +4812,10 @@ with profile NoControl - 47, 19 - - - 5, 5, 5, 5 + 31, 13 - 65, 23 + 43, 15 88 @@ -5091,13 +4845,10 @@ with profile NoControl - 251, 49 - - - 5, 5, 5, 5 + 167, 33 - 17, 31 + 11, 21 84 @@ -5127,13 +4878,10 @@ with profile NoControl - 173, 131 - - - 5, 5, 5, 5 + 115, 87 - 26, 26 + 17, 17 86 @@ -5163,13 +4911,10 @@ with profile NoControl - 107, 49 - - - 5, 5, 5, 5 + 71, 33 - 17, 26 + 11, 17 85 @@ -5190,13 +4935,10 @@ with profile 22 - 10, 62 - - - 5, 5, 5, 5 + 7, 41 - 373, 205 + 249, 137 190 @@ -5211,19 +4953,16 @@ with profile tPShiftMod - 6 + 8 NoControl - 107, 13 - - - 5, 5, 5, 5 + 71, 9 - 158, 35 + 105, 23 184 @@ -5252,11 +4991,8 @@ with profile 0, 1 - - 5, 5, 5, 5 - - 367, 198 + 245, 132 StretchImage @@ -5286,13 +5022,10 @@ with profile NoControl - 54, 138 - - - 5, 5, 5, 5 + 36, 92 - 35, 35 + 23, 23 163 @@ -5322,13 +5055,10 @@ with profile NoControl - 274, 174 - - - 5, 5, 5, 5 + 183, 116 - 35, 17 + 23, 11 172 @@ -5358,13 +5088,10 @@ with profile NoControl - 54, 115 - - - 5, 5, 5, 5 + 36, 77 - 35, 17 + 23, 11 167 @@ -5394,13 +5121,10 @@ with profile NoControl - 274, 118 - - - 5, 5, 5, 5 + 183, 79 - 35, 17 + 23, 11 171 @@ -5430,13 +5154,10 @@ with profile NoControl - 31, 138 - - - 5, 5, 5, 5 + 21, 92 - 17, 35 + 11, 23 164 @@ -5466,13 +5187,10 @@ with profile NoControl - 314, 138 - - - 5, 5, 5, 5 + 209, 92 - 19, 35 + 13, 23 170 @@ -5502,13 +5220,10 @@ with profile NoControl - 97, 138 - - - 5, 5, 5, 5 + 65, 92 - 17, 35 + 11, 23 165 @@ -5538,13 +5253,10 @@ with profile NoControl - 247, 138 - - - 5, 5, 5, 5 + 165, 92 - 17, 35 + 11, 23 169 @@ -5574,13 +5286,10 @@ with profile NoControl - 54, 180 - - - 5, 5, 5, 5 + 36, 120 - 35, 17 + 23, 11 166 @@ -5610,13 +5319,10 @@ with profile NoControl - 274, 138 - - - 5, 5, 5, 5 + 183, 92 - 35, 35 + 23, 23 168 @@ -5637,13 +5343,10 @@ with profile 11 - 10, 62 - - - 5, 5, 5, 5 + 7, 41 - 373, 214 + 249, 143 191 @@ -5661,19 +5364,16 @@ with profile tPShiftMod - 7 + 9 - 4, 29 - - - 5, 5, 5, 5 + 4, 22 - 5, 5, 5, 5 + 3, 3, 3, 3 - 646, 329 + 428, 216 1 @@ -5693,6 +5393,166 @@ with profile 1 + + True + + + NoControl + + + 5, 221 + + + 59, 26 + + + 255 + + + Touchpad +Swipes: + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tPControls + + + 0 + + + NoControl + + + 3, 3 + + + 80, 23 + + + 250 + + + Swipe Up + + + bnSwipeUp + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + fLPTouchSwipe + + + 0 + + + NoControl + + + 89, 3 + + + 80, 23 + + + 250 + + + Swipe Down + + + bnSwipeDown + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + fLPTouchSwipe + + + 1 + + + NoControl + + + 175, 3 + + + 80, 23 + + + 250 + + + Swipe Left + + + bnSwipeLeft + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + fLPTouchSwipe + + + 2 + + + NoControl + + + 261, 3 + + + 80, 23 + + + 250 + + + Swipe Right + + + bnSwipeRight + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + fLPTouchSwipe + + + 3 + + + 72, 219 + + + 351, 31 + + + 256 + + + fLPTouchSwipe + + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tPControls + + + 1 + True @@ -5700,13 +5560,10 @@ with profile NoControl - 7, 288 - - - 5, 0, 5, 0 + 5, 192 - 99, 20 + 67, 13 253 @@ -5724,19 +5581,16 @@ with profile tPControls - 0 + 2 NoControl - 5, 5 - - - 5, 5, 5, 5 + 3, 3 - 120, 35 + 80, 23 250 @@ -5760,13 +5614,10 @@ with profile NoControl - 135, 5 - - - 5, 5, 5, 5 + 89, 3 - 120, 35 + 80, 23 250 @@ -5790,13 +5641,10 @@ with profile NoControl - 265, 5 - - - 5, 5, 5, 5 + 175, 3 - 120, 35 + 80, 23 250 @@ -5820,13 +5668,10 @@ with profile NoControl - 395, 5 - - - 5, 5, 5, 5 + 261, 3 - 120, 35 + 80, 23 250 @@ -5847,13 +5692,10 @@ with profile 3 - 108, 277 - - - 5, 5, 5, 5 + 72, 185 - 526, 47 + 351, 31 254 @@ -5868,7 +5710,7 @@ with profile tPControls - 1 + 3 Stretch @@ -5882,11 +5724,8 @@ with profile 0, 0 - - 5, 5, 5, 5 - - 367, 198 + 245, 132 StretchImage @@ -5916,13 +5755,10 @@ with profile NoControl - 126, 37 - - - 5, 5, 5, 5 + 84, 25 - 118, 24 + 79, 16 193 @@ -5952,13 +5788,10 @@ with profile NoControl - 126, 60 - - - 5, 5, 5, 5 + 84, 40 - 37, 53 + 25, 35 191 @@ -5988,13 +5821,10 @@ with profile NoControl - 209, 60 - - - 5, 5, 5, 5 + 139, 40 - 35, 50 + 23, 33 190 @@ -6024,13 +5854,10 @@ with profile NoControl - 163, 60 - - - 5, 5, 5, 5 + 109, 40 - 46, 50 + 31, 33 192 @@ -6060,13 +5887,10 @@ with profile NoControl - 263, 19 - - - 5, 5, 5, 5 + 175, 13 - 65, 23 + 43, 15 87 @@ -6096,13 +5920,10 @@ with profile NoControl - 281, 114 - - - 5, 5, 5, 5 + 187, 76 - 29, 25 + 19, 17 74 @@ -6132,13 +5953,10 @@ with profile NoControl - 312, 90 - - - 5, 5, 5, 5 + 208, 60 - 24, 25 + 16, 17 71 @@ -6168,13 +5986,10 @@ with profile NoControl - 226, 134 - - - 5, 5, 5, 5 + 151, 89 - 42, 42 + 28, 28 91 @@ -6204,13 +6019,10 @@ with profile NoControl - 259, 91 - - - 5, 5, 5, 5 + 173, 61 - 23, 22 + 15, 15 72 @@ -6240,13 +6052,10 @@ with profile NoControl - 126, 10 - - - 5, 5, 5, 5 + 84, 7 - 118, 29 + 79, 19 91 @@ -6276,13 +6085,10 @@ with profile NoControl - 282, 67 - - - 5, 5, 5, 5 + 188, 45 - 30, 24 + 20, 16 73 @@ -6312,13 +6118,10 @@ with profile NoControl - 66, 72 - - - 5, 5, 5, 5 + 44, 48 - 17, 23 + 11, 15 80 @@ -6348,13 +6151,10 @@ with profile NoControl - 106, 134 - - - 5, 5, 5, 5 + 71, 89 - 42, 42 + 28, 28 91 @@ -6384,13 +6184,10 @@ with profile NoControl - 66, 109 - - - 5, 5, 5, 5 + 44, 73 - 18, 18 + 12, 12 81 @@ -6420,13 +6217,10 @@ with profile NoControl - 83, 91 - - - 5, 5, 5, 5 + 55, 61 - 22, 22 + 15, 15 82 @@ -6456,13 +6250,10 @@ with profile NoControl - 47, 91 - - - 5, 5, 5, 5 + 31, 61 - 22, 18 + 15, 12 83 @@ -6492,13 +6283,10 @@ with profile NoControl - 47, 19 - - - 5, 5, 5, 5 + 31, 13 - 65, 23 + 43, 15 88 @@ -6528,13 +6316,10 @@ with profile NoControl - 251, 49 - - - 5, 5, 5, 5 + 167, 33 - 17, 31 + 11, 21 84 @@ -6564,13 +6349,10 @@ with profile NoControl - 173, 131 - - - 5, 5, 5, 5 + 115, 87 - 26, 26 + 17, 17 86 @@ -6600,13 +6382,10 @@ with profile NoControl - 107, 49 - - - 5, 5, 5, 5 + 71, 33 - 17, 26 + 11, 17 85 @@ -6636,13 +6415,10 @@ with profile NoControl - 47, 0 - - - 5, 5, 5, 5 + 31, 0 - 65, 18 + 43, 12 90 @@ -6672,13 +6448,10 @@ with profile NoControl - 262, 0 - - - 5, 5, 5, 5 + 175, 0 - 60, 19 + 40, 13 89 @@ -6699,13 +6472,10 @@ with profile 22 - 10, 62 - - - 5, 5, 5, 5 + 7, 41 - 373, 205 + 249, 137 185 @@ -6720,10 +6490,7 @@ with profile tPControls - 2 - - - 20 + 4 Cross : @@ -6825,13 +6592,10 @@ with profile Sixaxis Right : - 385, 11 - - - 5, 5, 5, 5 + 257, 7 - 251, 244 + 169, 173 180 @@ -6846,19 +6610,16 @@ with profile tPControls - 3 + 5 NoControl - 36, 7 - - - 5, 0, 5, 0 + 24, 5 - 329, 38 + 219, 25 181 @@ -6880,19 +6641,16 @@ Click the lightbar for color picker tPControls - 4 + 6 NoControl - 107, 13 - - - 5, 5, 5, 5 + 71, 9 - 158, 35 + 105, 23 184 @@ -6921,11 +6679,8 @@ Click the lightbar for color picker 0, 1 - - 5, 5, 5, 5 - - 367, 198 + 245, 132 StretchImage @@ -6955,13 +6710,10 @@ Click the lightbar for color picker NoControl - 54, 138 - - - 5, 5, 5, 5 + 36, 92 - 35, 35 + 23, 23 163 @@ -6991,13 +6743,10 @@ Click the lightbar for color picker NoControl - 274, 174 - - - 5, 5, 5, 5 + 183, 116 - 35, 17 + 23, 11 172 @@ -7027,13 +6776,10 @@ Click the lightbar for color picker NoControl - 54, 115 - - - 5, 5, 5, 5 + 36, 77 - 35, 17 + 23, 11 167 @@ -7063,13 +6809,10 @@ Click the lightbar for color picker NoControl - 274, 118 - - - 5, 5, 5, 5 + 183, 79 - 35, 17 + 23, 11 171 @@ -7099,13 +6842,10 @@ Click the lightbar for color picker NoControl - 31, 138 - - - 5, 5, 5, 5 + 21, 92 - 17, 35 + 11, 23 164 @@ -7135,13 +6875,10 @@ Click the lightbar for color picker NoControl - 314, 138 - - - 5, 5, 5, 5 + 209, 92 - 19, 35 + 13, 23 170 @@ -7171,13 +6908,10 @@ Click the lightbar for color picker NoControl - 97, 138 - - - 5, 5, 5, 5 + 65, 92 - 17, 35 + 11, 23 165 @@ -7207,13 +6941,10 @@ Click the lightbar for color picker NoControl - 247, 138 - - - 5, 5, 5, 5 + 165, 92 - 17, 35 + 11, 23 169 @@ -7243,13 +6974,10 @@ Click the lightbar for color picker NoControl - 54, 180 - - - 5, 5, 5, 5 + 36, 120 - 35, 17 + 23, 11 166 @@ -7279,13 +7007,10 @@ Click the lightbar for color picker NoControl - 274, 138 - - - 5, 5, 5, 5 + 183, 92 - 35, 35 + 23, 23 168 @@ -7306,13 +7031,10 @@ Click the lightbar for color picker 11 - 10, 62 - - - 5, 5, 5, 5 + 7, 41 - 373, 214 + 249, 143 187 @@ -7330,19 +7052,16 @@ Click the lightbar for color picker tPControls - 5 + 7 - 4, 29 - - - 5, 5, 5, 5 + 4, 22 - 5, 5, 5, 5 + 3, 3, 3, 3 - 646, 329 + 428, 216 0 @@ -7363,13 +7082,10 @@ Click the lightbar for color picker 0 - 5, 5 - - - 5, 5, 5, 5 + 3, 3 - 654, 362 + 436, 242 253 @@ -7393,22 +7109,22 @@ Click the lightbar for color picker True - 144, 144 + 96, 96 True - 1320, 464 + 890, 361 - - 5, 5, 5, 5 + + NoControl - 1347, 525 + 906, 400 - 140, 124 + 99, 96 Profile Options @@ -7423,7 +7139,7 @@ Click the lightbar for color picker advColorDialog - ScpServer.AdvancedColorDialog, DS4Windows, Version=1.4.0.9, Culture=neutral, PublicKeyToken=null + ScpServer.AdvancedColorDialog, DS4Windows, Version=1.4.15.0, Culture=neutral, PublicKeyToken=null Options diff --git a/DS4Tool/Properties/Resources.resx b/DS4Tool/Properties/Resources.resx index 160431d..a2f6d9f 100644 --- a/DS4Tool/Properties/Resources.resx +++ b/DS4Tool/Properties/Resources.resx @@ -553,4 +553,16 @@ Install Failed, Please Retry + + Swipe Down + + + Swipe Left + + + Swipe Right + + + Swipe Up + \ No newline at end of file diff --git a/DS4Tool/Properties/Resources1.Designer.cs b/DS4Tool/Properties/Resources1.Designer.cs index f075499..8a64250 100644 --- a/DS4Tool/Properties/Resources1.Designer.cs +++ b/DS4Tool/Properties/Resources1.Designer.cs @@ -1176,6 +1176,33 @@ namespace ScpServer.Properties { } } + /// + /// Looks up a localized string similar to Swipe Down. + /// + internal static string SwipeDown { + get { + return ResourceManager.GetString("SwipeDown", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Swipe Left. + /// + internal static string SwipeLeft { + get { + return ResourceManager.GetString("SwipeLeft", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Swipe Right. + /// + internal static string SwipeRight { + get { + return ResourceManager.GetString("SwipeRight", resourceCulture); + } + } + /// /// Looks up a localized string similar to Swipe Touchpad to change profiles. /// @@ -1185,6 +1212,15 @@ namespace ScpServer.Properties { } } + /// + /// Looks up a localized string similar to Swipe Up. + /// + internal static string SwipeUp { + get { + return ResourceManager.GetString("SwipeUp", resourceCulture); + } + } + /// /// Looks up a localized string similar to Tap and hold to drag, slight delay with single taps. ///