diff --git a/DS4Windows/DS4Control/ControlService.cs b/DS4Windows/DS4Control/ControlService.cs index 5618376..60a8d30 100644 --- a/DS4Windows/DS4Control/ControlService.cs +++ b/DS4Windows/DS4Control/ControlService.cs @@ -188,7 +188,7 @@ namespace DS4Windows Monitor.Pulse(busThrLck); } - public void ChangeUDPStatus(bool state) + public void ChangeUDPStatus(bool state, bool openPort=true) { if (state && _udpServer == null) { @@ -196,19 +196,26 @@ namespace DS4Windows TestQueueBus(() => { _udpServer = new UdpServer(GetPadDetailForIdx); - var UDP_SERVER_PORT = Global.getUDPServerPortNum(); - - try + if (openPort) { - _udpServer.Start(UDP_SERVER_PORT); - LogDebug("UDP server listening on port " + UDP_SERVER_PORT); - } - catch (System.Net.Sockets.SocketException ex) - { - var errMsg = String.Format("Couldn't start UDP server on port {0}, outside applications won't be able to access pad data ({1})", UDP_SERVER_PORT, ex.SocketErrorCode); + // Change thread affinity of object to have normal priority + Task.Run(() => + { + var UDP_SERVER_PORT = Global.getUDPServerPortNum(); - LogDebug(errMsg, true); - AppLogger.LogToTray(errMsg, true, true); + try + { + _udpServer.Start(UDP_SERVER_PORT); + LogDebug("UDP server listening on port " + UDP_SERVER_PORT); + } + catch (System.Net.Sockets.SocketException ex) + { + var errMsg = String.Format("Couldn't start UDP server on port {0}, outside applications won't be able to access pad data ({1})", UDP_SERVER_PORT, ex.SocketErrorCode); + + LogDebug(errMsg, true); + AppLogger.LogToTray(errMsg, true, true); + } + }).Wait(); } udpChangeStatus = false; @@ -353,7 +360,7 @@ namespace DS4Windows if (isUsingUDPServer() && _udpServer == null) { - ChangeUDPStatus(true); + ChangeUDPStatus(true, false); while (udpChangeStatus == true) { Thread.SpinWait(500); @@ -465,6 +472,25 @@ namespace DS4Windows } running = true; + + if (_udpServer != null) + { + //var UDP_SERVER_PORT = 26760; + var UDP_SERVER_PORT = Global.getUDPServerPortNum(); + + try + { + _udpServer.Start(UDP_SERVER_PORT); + LogDebug("UDP server listening on port " + UDP_SERVER_PORT); + } + catch (System.Net.Sockets.SocketException ex) + { + var errMsg = String.Format("Couldn't start UDP server on port {0}, outside applications won't be able to access pad data ({1})", UDP_SERVER_PORT, ex.SocketErrorCode); + + LogDebug(errMsg, true); + AppLogger.LogToTray(errMsg, true, true); + } + } } else { diff --git a/DS4Windows/DS4Control/InputMethods.cs b/DS4Windows/DS4Control/InputMethods.cs index c90516c..0d0555e 100644 --- a/DS4Windows/DS4Control/InputMethods.cs +++ b/DS4Windows/DS4Control/InputMethods.cs @@ -5,156 +5,137 @@ namespace DS4Windows { class InputMethods { - private static INPUT[] sendInputs = new INPUT[2]; // will allow for keyboard + mouse/tablet input within one SendInput call, or two mouse events - private static object lockob = new object(); - public static void MoveCursorBy(int x, int y) { - lock (lockob) + if (x != 0 || y != 0) { - if (x != 0 || y != 0) - { - sendInputs[0].Type = INPUT_MOUSE; - sendInputs[0].Data.Mouse.ExtraInfo = IntPtr.Zero; - sendInputs[0].Data.Mouse.Flags = MOUSEEVENTF_MOVE; - sendInputs[0].Data.Mouse.MouseData = 0; - sendInputs[0].Data.Mouse.Time = 0; - sendInputs[0].Data.Mouse.X = x; - sendInputs[0].Data.Mouse.Y = y; - uint result = SendInput(1, sendInputs, Marshal.SizeOf(sendInputs[0])); - } + INPUT[] tempInput = new INPUT[1]; + tempInput[0].Type = INPUT_MOUSE; + tempInput[0].Data.Mouse.ExtraInfo = IntPtr.Zero; + tempInput[0].Data.Mouse.Flags = MOUSEEVENTF_MOVE; + tempInput[0].Data.Mouse.MouseData = 0; + tempInput[0].Data.Mouse.Time = 0; + tempInput[0].Data.Mouse.X = x; + tempInput[0].Data.Mouse.Y = y; + uint result = SendInput(1, tempInput, Marshal.SizeOf(tempInput[0])); } } public static void MouseWheel(int vertical, int horizontal) { - lock (lockob) + INPUT[] tempInput = new INPUT[2]; + uint inputs = 0; + if (vertical != 0) { - uint inputs = 0; - if (vertical != 0) - { - sendInputs[inputs].Type = INPUT_MOUSE; - sendInputs[inputs].Data.Mouse.ExtraInfo = IntPtr.Zero; - sendInputs[inputs].Data.Mouse.Flags = MOUSEEVENTF_WHEEL; - sendInputs[inputs].Data.Mouse.MouseData = (uint)vertical; - sendInputs[inputs].Data.Mouse.Time = 0; - sendInputs[inputs].Data.Mouse.X = 0; - sendInputs[inputs].Data.Mouse.Y = 0; - inputs++; - } - - if (horizontal != 0) - { - sendInputs[inputs].Type = INPUT_MOUSE; - sendInputs[inputs].Data.Mouse.ExtraInfo = IntPtr.Zero; - sendInputs[inputs].Data.Mouse.Flags = MOUSEEVENTF_HWHEEL; - sendInputs[inputs].Data.Mouse.MouseData = (uint)horizontal; - sendInputs[inputs].Data.Mouse.Time = 0; - sendInputs[inputs].Data.Mouse.X = 0; - sendInputs[inputs].Data.Mouse.Y = 0; - inputs++; - } - - SendInput(inputs, sendInputs, (int)inputs * Marshal.SizeOf(sendInputs[0])); + tempInput[inputs].Type = INPUT_MOUSE; + tempInput[inputs].Data.Mouse.ExtraInfo = IntPtr.Zero; + tempInput[inputs].Data.Mouse.Flags = MOUSEEVENTF_WHEEL; + tempInput[inputs].Data.Mouse.MouseData = (uint)vertical; + tempInput[inputs].Data.Mouse.Time = 0; + tempInput[inputs].Data.Mouse.X = 0; + tempInput[inputs].Data.Mouse.Y = 0; + inputs++; } + + if (horizontal != 0) + { + tempInput[inputs].Type = INPUT_MOUSE; + tempInput[inputs].Data.Mouse.ExtraInfo = IntPtr.Zero; + tempInput[inputs].Data.Mouse.Flags = MOUSEEVENTF_HWHEEL; + tempInput[inputs].Data.Mouse.MouseData = (uint)horizontal; + tempInput[inputs].Data.Mouse.Time = 0; + tempInput[inputs].Data.Mouse.X = 0; + tempInput[inputs].Data.Mouse.Y = 0; + inputs++; + } + + SendInput(inputs, tempInput, (int)inputs * Marshal.SizeOf(tempInput[0])); } public static void MouseEvent(uint mouseButton) { - lock (lockob) - { - sendInputs[0].Type = INPUT_MOUSE; - sendInputs[0].Data.Mouse.ExtraInfo = IntPtr.Zero; - sendInputs[0].Data.Mouse.Flags = mouseButton; - sendInputs[0].Data.Mouse.MouseData = 0; - sendInputs[0].Data.Mouse.Time = 0; - sendInputs[0].Data.Mouse.X = 0; - sendInputs[0].Data.Mouse.Y = 0; - uint result = SendInput(1, sendInputs, Marshal.SizeOf(sendInputs[0])); - } + INPUT[] tempInput = new INPUT[1]; + tempInput[0].Type = INPUT_MOUSE; + tempInput[0].Data.Mouse.ExtraInfo = IntPtr.Zero; + tempInput[0].Data.Mouse.Flags = mouseButton; + tempInput[0].Data.Mouse.MouseData = 0; + tempInput[0].Data.Mouse.Time = 0; + tempInput[0].Data.Mouse.X = 0; + tempInput[0].Data.Mouse.Y = 0; + uint result = SendInput(1, tempInput, Marshal.SizeOf(tempInput[0])); } public static void MouseEvent(uint mouseButton, int type) { - lock (lockob) - { - sendInputs[0].Type = INPUT_MOUSE; - sendInputs[0].Data.Mouse.ExtraInfo = IntPtr.Zero; - sendInputs[0].Data.Mouse.Flags = mouseButton; - sendInputs[0].Data.Mouse.MouseData = (uint)type; - sendInputs[0].Data.Mouse.Time = 0; - sendInputs[0].Data.Mouse.X = 0; - sendInputs[0].Data.Mouse.Y = 0; - uint result = SendInput(1, sendInputs, Marshal.SizeOf(sendInputs[0])); - } + INPUT[] tempInput = new INPUT[1]; + tempInput[0].Type = INPUT_MOUSE; + tempInput[0].Data.Mouse.ExtraInfo = IntPtr.Zero; + tempInput[0].Data.Mouse.Flags = mouseButton; + tempInput[0].Data.Mouse.MouseData = (uint)type; + tempInput[0].Data.Mouse.Time = 0; + tempInput[0].Data.Mouse.X = 0; + tempInput[0].Data.Mouse.Y = 0; + uint result = SendInput(1, tempInput, Marshal.SizeOf(tempInput[0])); } public static void performSCKeyPress(ushort key) { - lock (lockob) - { - sendInputs[0].Type = INPUT_KEYBOARD; - sendInputs[0].Data.Keyboard.ExtraInfo = IntPtr.Zero; - sendInputs[0].Data.Keyboard.Flags = KEYEVENTF_SCANCODE; - sendInputs[0].Data.Keyboard.Scan = MapVirtualKey(key, MAPVK_VK_TO_VSC); - sendInputs[0].Data.Keyboard.Time = 0; - sendInputs[0].Data.Keyboard.Vk = key; - uint result = SendInput(1, sendInputs, Marshal.SizeOf(sendInputs[0])); - } + INPUT[] tempInput = new INPUT[1]; + tempInput[0].Type = INPUT_KEYBOARD; + tempInput[0].Data.Keyboard.ExtraInfo = IntPtr.Zero; + tempInput[0].Data.Keyboard.Flags = KEYEVENTF_SCANCODE; + tempInput[0].Data.Keyboard.Scan = MapVirtualKey(key, MAPVK_VK_TO_VSC); + tempInput[0].Data.Keyboard.Time = 0; + tempInput[0].Data.Keyboard.Vk = key; + uint result = SendInput(1, tempInput, Marshal.SizeOf(tempInput[0])); } public static void performKeyPress(ushort key) { - lock (lockob) - { - ushort scancode = scancodeFromVK(key); - bool extended = (scancode & 0x100) != 0; - uint curflags = extended ? KEYEVENTF_EXTENDEDKEY : 0; + INPUT[] tempInput = new INPUT[1]; + ushort scancode = scancodeFromVK(key); + bool extended = (scancode & 0x100) != 0; + uint curflags = extended ? KEYEVENTF_EXTENDEDKEY : 0; - sendInputs[0].Type = INPUT_KEYBOARD; - sendInputs[0].Data.Keyboard.ExtraInfo = IntPtr.Zero; - sendInputs[0].Data.Keyboard.Flags = curflags; - sendInputs[0].Data.Keyboard.Scan = scancode; - //sendInputs[0].Data.Keyboard.Flags = 1; - //sendInputs[0].Data.Keyboard.Scan = 0; - sendInputs[0].Data.Keyboard.Time = 0; - sendInputs[0].Data.Keyboard.Vk = key; - uint result = SendInput(1, sendInputs, Marshal.SizeOf(sendInputs[0])); - } + tempInput[0].Type = INPUT_KEYBOARD; + tempInput[0].Data.Keyboard.ExtraInfo = IntPtr.Zero; + tempInput[0].Data.Keyboard.Flags = curflags; + tempInput[0].Data.Keyboard.Scan = scancode; + //sendInputs[0].Data.Keyboard.Flags = 1; + //sendInputs[0].Data.Keyboard.Scan = 0; + tempInput[0].Data.Keyboard.Time = 0; + tempInput[0].Data.Keyboard.Vk = key; + uint result = SendInput(1, tempInput, Marshal.SizeOf(tempInput[0])); } public static void performSCKeyRelease(ushort key) { - lock (lockob) - { - sendInputs[0].Type = INPUT_KEYBOARD; - sendInputs[0].Data.Keyboard.ExtraInfo = IntPtr.Zero; - sendInputs[0].Data.Keyboard.Flags = KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP; - sendInputs[0].Data.Keyboard.Scan = MapVirtualKey(key, MAPVK_VK_TO_VSC); - sendInputs[0].Data.Keyboard.Time = 0; - //sendInputs[0].Data.Keyboard.Vk = MapVirtualKey(key, MAPVK_VK_TO_VSC); - uint result = SendInput(1, sendInputs, Marshal.SizeOf(sendInputs[0])); - } + INPUT[] tempInput = new INPUT[1]; + tempInput[0].Type = INPUT_KEYBOARD; + tempInput[0].Data.Keyboard.ExtraInfo = IntPtr.Zero; + tempInput[0].Data.Keyboard.Flags = KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP; + tempInput[0].Data.Keyboard.Scan = MapVirtualKey(key, MAPVK_VK_TO_VSC); + tempInput[0].Data.Keyboard.Time = 0; + //sendInputs[0].Data.Keyboard.Vk = MapVirtualKey(key, MAPVK_VK_TO_VSC); + uint result = SendInput(1, tempInput, Marshal.SizeOf(tempInput[0])); } public static void performKeyRelease(ushort key) { - lock (lockob) - { - ushort scancode = scancodeFromVK(key); - bool extended = (scancode & 0x100) != 0; - uint curflags = extended ? KEYEVENTF_EXTENDEDKEY : 0; + INPUT[] tempInput = new INPUT[1]; + ushort scancode = scancodeFromVK(key); + bool extended = (scancode & 0x100) != 0; + uint curflags = extended ? KEYEVENTF_EXTENDEDKEY : 0; - sendInputs[0].Type = INPUT_KEYBOARD; - sendInputs[0].Data.Keyboard.ExtraInfo = IntPtr.Zero; - sendInputs[0].Data.Keyboard.Flags = curflags | KEYEVENTF_KEYUP; - sendInputs[0].Data.Keyboard.Scan = scancode; - //sendInputs[0].Data.Keyboard.Flags = KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP; - //sendInputs[0].Data.Keyboard.Scan = 0; - sendInputs[0].Data.Keyboard.Time = 0; - sendInputs[0].Data.Keyboard.Vk = key; - uint result = SendInput(1, sendInputs, Marshal.SizeOf(sendInputs[0])); - } + tempInput[0].Type = INPUT_KEYBOARD; + tempInput[0].Data.Keyboard.ExtraInfo = IntPtr.Zero; + tempInput[0].Data.Keyboard.Flags = curflags | KEYEVENTF_KEYUP; + tempInput[0].Data.Keyboard.Scan = scancode; + //sendInputs[0].Data.Keyboard.Flags = KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP; + //sendInputs[0].Data.Keyboard.Scan = 0; + tempInput[0].Data.Keyboard.Time = 0; + tempInput[0].Data.Keyboard.Vk = key; + uint result = SendInput(1, tempInput, Marshal.SizeOf(tempInput[0])); } private static ushort scancodeFromVK(uint vkey) diff --git a/DS4Windows/DS4Control/Mapping.cs b/DS4Windows/DS4Control/Mapping.cs index 32671b7..b4f7219 100644 --- a/DS4Windows/DS4Control/Mapping.cs +++ b/DS4Windows/DS4Control/Mapping.cs @@ -779,28 +779,28 @@ namespace DS4Windows if (absX <= 0.4) { - outputX = 0.481 * absX; + outputX = 0.54 * absX; } else if (absX <= 0.75) { - outputX = absX - 0.2076; + outputX = absX - 0.184; } else if (absX > 0.75) { - outputX = (absX * 1.8304) - 0.8304; + outputX = (absX * 1.736) - 0.736; } if (absY <= 0.4) { - outputY = 0.481 * absY; + outputY = 0.54 * absY; } else if (absY <= 0.75) { - outputY = absY - 0.2076; + outputY = absY - 0.184; } else if (absY > 0.75) { - outputY = (absY * 1.8304) - 0.8304; + outputY = (absY * 1.736) - 0.736; } dState.LX = (byte)(outputX * signX * 127.5 + 127.5); @@ -839,28 +839,28 @@ namespace DS4Windows if (absX <= 0.4) { - outputX = 0.481 * absX; + outputX = 0.545 * absX; } else if (absX <= 0.75) { - outputX = absX - 0.2076; + outputX = absX - 0.182; } else if (absX > 0.75) { - outputX = (absX * 1.8304) - 0.8304; + outputX = (absX * 1.728) - 0.728; } if (absY <= 0.4) { - outputY = 0.481 * absY; + outputY = 0.545 * absY; } else if (absY <= 0.75) { - outputY = absY - 0.2076; + outputY = absY - 0.182; } else if (absY > 0.75) { - outputY = (absY * 1.8304) - 0.8304; + outputY = (absY * 1.728) - 0.728; } dState.RX = (byte)(outputX * signX * 127.5 + 127.5); diff --git a/DS4Windows/DS4Control/ScpDevice.Designer.cs b/DS4Windows/DS4Control/ScpDevice.Designer.cs deleted file mode 100644 index f1f8f1e..0000000 --- a/DS4Windows/DS4Control/ScpDevice.Designer.cs +++ /dev/null @@ -1,36 +0,0 @@ -namespace DS4Windows -{ - partial class ScpDevice - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - components = new System.ComponentModel.Container(); - } - - #endregion - } -} diff --git a/DS4Windows/DS4Control/ScpDevice.cs b/DS4Windows/DS4Control/ScpDevice.cs index bc22c4b..19eabfa 100644 --- a/DS4Windows/DS4Control/ScpDevice.cs +++ b/DS4Windows/DS4Control/ScpDevice.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.ComponentModel; using System.Runtime.InteropServices; using System.Security; @@ -9,7 +8,7 @@ using Microsoft.Win32.SafeHandles; namespace DS4Windows { [SuppressUnmanagedCodeSecurity] - public partial class ScpDevice : Component + public class ScpDevice { public virtual Boolean IsActive { @@ -21,23 +20,8 @@ namespace DS4Windows get { return m_Path; } } - - public ScpDevice() - { - InitializeComponent(); - } - - public ScpDevice(IContainer container) - { - container.Add(this); - - InitializeComponent(); - } - public ScpDevice(String Class) { - InitializeComponent(); - this.m_Class = new Guid(Class); } diff --git a/DS4Windows/DS4Control/X360Device.cs b/DS4Windows/DS4Control/X360Device.cs index e3dd1fb..f5f02f8 100644 --- a/DS4Windows/DS4Control/X360Device.cs +++ b/DS4Windows/DS4Control/X360Device.cs @@ -1,13 +1,12 @@ using System; using System.Collections.Generic; -using System.ComponentModel; using System.Runtime.InteropServices; using Microsoft.Win32.SafeHandles; namespace DS4Windows { - public partial class X360Device : ScpDevice + public class X360Device : ScpDevice { private const String DS3_BUS_CLASS_GUID = "{F679F562-3164-42CE-A4DB-E7DDBE723909}"; private const int CONTROLLER_OFFSET = 1; // Device 0 is the virtual USB hub itself, and we leave devices 1-10 available for other software (like the Scarlet.Crush DualShock driver itself) @@ -41,18 +40,8 @@ namespace DS4Windows public X360Device() : base(DS3_BUS_CLASS_GUID) { - InitializeComponent(); } - public X360Device(IContainer container) - : base(DS3_BUS_CLASS_GUID) - { - container.Add(this); - - InitializeComponent(); - } - - /* public override Boolean Open(int Instance = 0) { if (base.Open(Instance)) diff --git a/DS4Windows/DS4Control/X360Device.designer.cs b/DS4Windows/DS4Control/X360Device.designer.cs deleted file mode 100644 index e4bb678..0000000 --- a/DS4Windows/DS4Control/X360Device.designer.cs +++ /dev/null @@ -1,36 +0,0 @@ -namespace DS4Windows -{ - partial class X360Device - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - components = new System.ComponentModel.Container(); - } - - #endregion - } -} diff --git a/DS4Windows/DS4Forms/DS4Form.Designer.cs b/DS4Windows/DS4Forms/DS4Form.Designer.cs index dcfd142..5057ff0 100644 --- a/DS4Windows/DS4Forms/DS4Form.Designer.cs +++ b/DS4Windows/DS4Forms/DS4Form.Designer.cs @@ -1374,7 +1374,6 @@ this.Controls.Add(this.pnlButton); this.Name = "DS4Form"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ScpForm_Closing); - this.Resize += new System.EventHandler(this.Form_Resize); this.pnlButton.ResumeLayout(false); this.pnlButton.PerformLayout(); this.cMTaskbar.ResumeLayout(false); diff --git a/DS4Windows/DS4Forms/DS4Form.cs b/DS4Windows/DS4Forms/DS4Form.cs index 56e24da..a2c90cf 100644 --- a/DS4Windows/DS4Forms/DS4Form.cs +++ b/DS4Windows/DS4Forms/DS4Form.cs @@ -396,6 +396,8 @@ namespace DS4Windows } instance = this; + this.Resize += Form_Resize; + this.LocationChanged += TrackLocationChanged; Form_Resize(null, null); if (btnStartStop.Enabled && start) TaskRunner.Delay(50).ContinueWith((t) => this.BeginInvoke((System.Action)(() => BtnStartStop_Clicked()))); @@ -941,9 +943,24 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question FormBorderStyle = FormBorderStyle.Sizable; } + if (WindowState != FormWindowState.Minimized) + { + FormWidth = Width; + FormHeight = Height; + } + chData.AutoResize(ColumnHeaderAutoResizeStyle.HeaderSize); } + private void TrackLocationChanged(object sender, EventArgs e) + { + if (WindowState != FormWindowState.Minimized) + { + FormLocationX = Location.X; + FormLocationY = Location.Y; + } + } + private void BtnStartStop_Click(object sender, EventArgs e) { BtnStartStop_Clicked(); @@ -2178,19 +2195,6 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question DS4LightBar.shuttingdown = true; } - if (oldsize == new Size(0, 0)) - { - FormWidth = this.Width; - FormHeight = this.Height; - } - else - { - FormWidth = oldsize.Width; - FormHeight = oldsize.Height; - } - - FormLocationX = Location.X > 0 ? Location.X : 0; - FormLocationY = Location.Y > 0 ? Location.Y : 0; Global.ControllerRemoved -= ControllerRemovedChange; if (!string.IsNullOrEmpty(appdatapath)) diff --git a/DS4Windows/DS4Forms/DS4Form.resx b/DS4Windows/DS4Forms/DS4Form.resx index 02b5bb8..a1f161f 100644 --- a/DS4Windows/DS4Forms/DS4Form.resx +++ b/DS4Windows/DS4Forms/DS4Form.resx @@ -445,10 +445,10 @@ NoControl - 748, 89 + 746, 89 - 145, 22 + 147, 22 50 @@ -472,7 +472,7 @@ NoControl - 348, 34 + 347, 34 39, 20 @@ -574,7 +574,7 @@ NoControl - 708, 89 + 706, 89 34, 22 @@ -604,7 +604,7 @@ NoControl - 708, 117 + 706, 117 34, 22 @@ -703,7 +703,7 @@ None - 591, 33 + 589, 33 111, 21 @@ -730,7 +730,7 @@ NoControl - 708, 61 + 706, 61 34, 22 @@ -757,7 +757,7 @@ None - 591, 61 + 589, 61 111, 21 @@ -781,7 +781,7 @@ None - 591, 89 + 589, 89 111, 21 @@ -808,7 +808,7 @@ NoControl - 708, 33 + 706, 33 34, 22 @@ -835,7 +835,7 @@ None - 591, 117 + 589, 117 111, 21 @@ -868,7 +868,7 @@ NoControl - 592, 7 + 590, 7 109, 15 @@ -940,7 +940,7 @@ NoControl - 344, 7 + 343, 7 47, 15 @@ -976,7 +976,7 @@ NoControl - 437, 7 + 436, 7 51, 15 @@ -1012,7 +1012,7 @@ NoControl - 443, 36 + 442, 36 39, 15 @@ -1048,7 +1048,7 @@ NoControl - 443, 64 + 442, 64 39, 15 @@ -1084,7 +1084,7 @@ NoControl - 443, 92 + 442, 92 39, 15 @@ -1120,7 +1120,7 @@ NoControl - 443, 120 + 442, 120 39, 15 @@ -1150,7 +1150,7 @@ NoControl - 348, 62 + 347, 62 39, 20 @@ -1180,7 +1180,7 @@ NoControl - 348, 90 + 347, 90 39, 20 @@ -1210,7 +1210,7 @@ NoControl - 348, 118 + 347, 118 39, 20 @@ -1243,10 +1243,10 @@ NoControl - 748, 33 + 746, 33 - 145, 22 + 147, 22 50 @@ -1273,10 +1273,10 @@ NoControl - 748, 61 + 746, 61 - 145, 22 + 147, 22 51 @@ -1303,10 +1303,10 @@ NoControl - 748, 117 + 746, 117 - 145, 22 + 147, 22 52 @@ -1336,7 +1336,7 @@ NoControl - 514, 0 + 512, 0 67, 30 @@ -1375,7 +1375,7 @@ NoControl - 540, 37 + 538, 37 15, 14 @@ -1408,7 +1408,7 @@ NoControl - 540, 65 + 538, 65 15, 14 @@ -1441,7 +1441,7 @@ NoControl - 540, 93 + 538, 93 15, 14 @@ -1474,7 +1474,7 @@ NoControl - 540, 121 + 538, 121 15, 14 @@ -1522,7 +1522,7 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="bnLight3" Row="3" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="pBStatus1" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="lbPad1" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lbPad2" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="bnEditC3" Row="3" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="bnEditC4" Row="4" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="lbPad3" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lbPad4" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="cBController1" Row="1" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="bnEditC2" Row="2" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="cBController2" Row="2" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="cBController3" Row="3" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="bnEditC1" Row="1" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="cBController4" Row="4" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="lbSelectedProfile" Row="0" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="lbID" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lbStatus" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="lbBattery" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt1" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt2" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt3" Row="3" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt4" Row="4" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="pBStatus2" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="pBStatus3" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="pBStatus4" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="bnLight1" Row="1" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="bnLight2" Row="2" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="bnLight4" Row="4" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="lbLinkProfile" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB1" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB2" Row="2" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB3" Row="3" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB4" Row="4" RowSpan="1" Column="3" ColumnSpan="1" /></Controls><Columns Styles="Percent,62.29144,Percent,20.02225,Percent,17.68632,Absolute,80,AutoSize,0,AutoSize,0,Absolute,150" /><Rows Styles="AutoSize,0,Percent,25,Percent,25,Percent,25,Percent,25" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="bnLight3" Row="3" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="pBStatus1" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="lbPad1" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lbPad2" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="bnEditC3" Row="3" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="bnEditC4" Row="4" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="lbPad3" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lbPad4" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="cBController1" Row="1" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="bnEditC2" Row="2" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="cBController2" Row="2" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="cBController3" Row="3" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="bnEditC1" Row="1" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="cBController4" Row="4" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="lbSelectedProfile" Row="0" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="lbID" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lbStatus" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="lbBattery" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt1" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt2" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt3" Row="3" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt4" Row="4" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="pBStatus2" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="pBStatus3" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="pBStatus4" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="bnLight1" Row="1" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="bnLight2" Row="2" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="bnLight4" Row="4" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="lbLinkProfile" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB1" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB2" Row="2" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB3" Row="3" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB4" Row="4" RowSpan="1" Column="3" ColumnSpan="1" /></Controls><Columns Styles="Percent,62.29144,Percent,20.02225,Percent,17.68632,Absolute,80,AutoSize,0,AutoSize,0,Absolute,151" /><Rows Styles="AutoSize,0,Percent,25,Percent,25,Percent,25,Percent,25" /></TableLayoutSettings> Fill @@ -2935,7 +2935,7 @@ languagePackComboBox1 - DS4Windows.DS4Forms.LanguagePackComboBox, DS4Windows, Version=1.5.15.0, Culture=neutral, PublicKeyToken=null + DS4Windows.DS4Forms.LanguagePackComboBox, DS4Windows, Version=1.5.17.0, Culture=neutral, PublicKeyToken=null fLPSettings @@ -3652,7 +3652,7 @@ advColorDialog - DS4Windows.AdvancedColorDialog, DS4Windows, Version=1.5.15.0, Culture=neutral, PublicKeyToken=null + DS4Windows.AdvancedColorDialog, DS4Windows, Version=1.5.17.0, Culture=neutral, PublicKeyToken=null DS4Form diff --git a/DS4Windows/DS4Forms/LanguagePackComboBox.cs b/DS4Windows/DS4Forms/LanguagePackComboBox.cs index e065aca..c8668b3 100644 --- a/DS4Windows/DS4Forms/LanguagePackComboBox.cs +++ b/DS4Windows/DS4Forms/LanguagePackComboBox.cs @@ -39,7 +39,9 @@ namespace DS4Windows.DS4Forms [System.Diagnostics.CodeAnalysis.SuppressMessage("InvariantCultureText_Changed call will complete when ready, no need for a warning", "CS4014:Await.Warning")] set { InvariantCultureTextValue = value; +#pragma warning disable CS4014 InvariantCultureText_Changed(value); +#pragma warning restore CS4014 } } diff --git a/DS4Windows/DS4Windows.csproj b/DS4Windows/DS4Windows.csproj index 19f3d1d..62a7842 100644 --- a/DS4Windows/DS4Windows.csproj +++ b/DS4Windows/DS4Windows.csproj @@ -1,5 +1,5 @@  - + Debug @@ -56,18 +56,9 @@ DS4Windows.Program - Resources\DS4W.ico - - - - - - - - app.manifest @@ -132,7 +123,6 @@ - @@ -150,20 +140,10 @@ - - Component - - - ScpDevice.cs - + - - Component - - - X360Device.cs - + UserControl @@ -253,6 +233,7 @@ + DS4Form.cs Designer @@ -1078,7 +1059,7 @@ - ResXFileCodeGenerator + PublicResXFileCodeGenerator Designer Resources.Designer.cs @@ -1093,20 +1074,11 @@ - - SettingsSingleFileGenerator - Settings.Designer.cs - True True Resources.resx - - True - Settings.settings - True - diff --git a/DS4Windows/Properties/AssemblyInfo.cs b/DS4Windows/Properties/AssemblyInfo.cs index a5b21be..c9c88e6 100644 --- a/DS4Windows/Properties/AssemblyInfo.cs +++ b/DS4Windows/Properties/AssemblyInfo.cs @@ -33,7 +33,7 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.5.17")] -[assembly: AssemblyFileVersion("1.5.17")] +[assembly: AssemblyVersion("1.5.18")] +[assembly: AssemblyFileVersion("1.5.18")] [assembly: NeutralResourcesLanguage("en")] diff --git a/DS4Windows/Properties/Resources.Designer.cs b/DS4Windows/Properties/Resources.Designer.cs index 2f233d7..9ff5cf5 100644 --- a/DS4Windows/Properties/Resources.Designer.cs +++ b/DS4Windows/Properties/Resources.Designer.cs @@ -22,7 +22,7 @@ namespace DS4Windows.Properties { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { + public class Resources { private static global::System.Resources.ResourceManager resourceMan; @@ -36,7 +36,7 @@ namespace DS4Windows.Properties { /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { + public static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DS4Windows.Properties.Resources", typeof(Resources).Assembly); @@ -51,7 +51,7 @@ namespace DS4Windows.Properties { /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { + public static global::System.Globalization.CultureInfo Culture { get { return resourceCulture; } @@ -63,7 +63,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap _360_highlight { + public static System.Drawing.Bitmap _360_highlight { get { object obj = ResourceManager.GetObject("_360_highlight", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -73,7 +73,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap _360_map { + public static System.Drawing.Bitmap _360_map { get { object obj = ResourceManager.GetObject("_360_map", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -83,7 +83,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap _checked { + public static System.Drawing.Bitmap _checked { get { object obj = ResourceManager.GetObject("_checked", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -93,7 +93,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap A { + public static System.Drawing.Bitmap A { get { object obj = ResourceManager.GetObject("A", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -103,7 +103,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Name of this action already exists. /// - internal static string ActionExists { + public static string ActionExists { get { return ResourceManager.GetString("ActionExists", resourceCulture); } @@ -112,7 +112,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Adding to list.... /// - internal static string AddingToList { + public static string AddingToList { get { return ResourceManager.GetString("AddingToList", resourceCulture); } @@ -121,7 +121,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Add Programs. /// - internal static string AddPrograms { + public static string AddPrograms { get { return ResourceManager.GetString("AddPrograms", resourceCulture); } @@ -130,7 +130,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to A location must be picked to continue. /// - internal static string ALocactionNeeded { + public static string ALocactionNeeded { get { return ResourceManager.GetString("ALocactionNeeded", resourceCulture); } @@ -139,7 +139,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Always Rainbow Mode. /// - internal static string AlwaysRainbow { + public static string AlwaysRainbow { get { return ResourceManager.GetString("AlwaysRainbow", resourceCulture); } @@ -148,7 +148,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Assign to Controller *number*. /// - internal static string AssignProfile { + public static string AssignProfile { get { return ResourceManager.GetString("AssignProfile", resourceCulture); } @@ -157,7 +157,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap B { + public static System.Drawing.Bitmap B { get { object obj = ResourceManager.GetObject("B", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -167,7 +167,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap BACK { + public static System.Drawing.Bitmap BACK { get { object obj = ResourceManager.GetObject("BACK", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -177,7 +177,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Battery: *number*%. /// - internal static string Battery { + public static string Battery { get { return ResourceManager.GetString("Battery", resourceCulture); } @@ -186,7 +186,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Best used with right side as a mouse function. /// - internal static string BestUsedRightSide { + public static string BestUsedRightSide { get { return ResourceManager.GetString("BestUsedRightSide", resourceCulture); } @@ -195,7 +195,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Browse.... /// - internal static string Browse { + public static string Browse { get { return ResourceManager.GetString("Browse", resourceCulture); } @@ -204,7 +204,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap BT { + public static System.Drawing.Bitmap BT { get { object obj = ResourceManager.GetObject("BT", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -214,7 +214,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Determines the poll rate used for the DS4 hardware when connected via Bluetooth. /// - internal static string BTPollRate { + public static string BTPollRate { get { return ResourceManager.GetString("BTPollRate", resourceCulture); } @@ -223,7 +223,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Cannot move files to new location, Please rename the DS4Tool folder to "DS4Windows". /// - internal static string CannotMoveFiles { + public static string CannotMoveFiles { get { return ResourceManager.GetString("CannotMoveFiles", resourceCulture); } @@ -232,7 +232,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Cannot write at current location. Copy Settings to appdata?. /// - internal static string CannotWriteHere { + public static string CannotWriteHere { get { return ResourceManager.GetString("CannotWriteHere", resourceCulture); } @@ -241,7 +241,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Charge the battery. /// - internal static string ChargeController { + public static string ChargeController { get { return ResourceManager.GetString("ChargeController", resourceCulture); } @@ -250,7 +250,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Charged. /// - internal static string Charged { + public static string Charged { get { return ResourceManager.GetString("Charged", resourceCulture); } @@ -259,7 +259,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Charging: *number*%. /// - internal static string Charging { + public static string Charging { get { return ResourceManager.GetString("Charging", resourceCulture); } @@ -268,7 +268,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Check Battery. /// - internal static string CheckBattery { + public static string CheckBattery { get { return ResourceManager.GetString("CheckBattery", resourceCulture); } @@ -277,7 +277,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to This will disconnect all your connected controllers. Proceed?. /// - internal static string CloseConfirm { + public static string CloseConfirm { get { return ResourceManager.GetString("CloseConfirm", resourceCulture); } @@ -286,7 +286,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Close DS4Windows?. /// - internal static string CloseDS4W { + public static string CloseDS4W { get { return ResourceManager.GetString("CloseDS4W", resourceCulture); } @@ -295,7 +295,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Close DS4Windows via the notification icon. /// - internal static string CloseMinimize { + public static string CloseMinimize { get { return ResourceManager.GetString("CloseMinimize", resourceCulture); } @@ -304,7 +304,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Color. /// - internal static string Color { + public static string Color { get { return ResourceManager.GetString("Color", resourceCulture); } @@ -313,7 +313,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Color by Battery %. /// - internal static string ColorByBattery { + public static string ColorByBattery { get { return ResourceManager.GetString("ColorByBattery", resourceCulture); } @@ -322,7 +322,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Confirm.... /// - internal static string Confirm { + public static string Confirm { get { return ResourceManager.GetString("Confirm", resourceCulture); } @@ -331,7 +331,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Connecting.... /// - internal static string Connecting { + public static string Connecting { get { return ResourceManager.GetString("Connecting", resourceCulture); } @@ -340,7 +340,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Edit Profile for Controller *number*. /// - internal static string ContextEdit { + public static string ContextEdit { get { return ResourceManager.GetString("ContextEdit", resourceCulture); } @@ -349,7 +349,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Make Profile for Controller *number*. /// - internal static string ContextNew { + public static string ContextNew { get { return ResourceManager.GetString("ContextNew", resourceCulture); } @@ -358,7 +358,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Controller *Mac address* was removed or lost connection. /// - internal static string ControllerWasRemoved { + public static string ControllerWasRemoved { get { return ResourceManager.GetString("ControllerWasRemoved", resourceCulture); } @@ -367,7 +367,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap copy { + public static System.Drawing.Bitmap copy { get { object obj = ResourceManager.GetObject("copy", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -377,7 +377,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Copy complete, please relaunch DS4Windows and remove settings from Program Directory. /// - internal static string CopyComplete { + public static string CopyComplete { get { return ResourceManager.GetString("CopyComplete", resourceCulture); } @@ -386,7 +386,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Click to copy the full color. /// - internal static string CopyFullColor { + public static string CopyFullColor { get { return ResourceManager.GetString("CopyFullColor", resourceCulture); } @@ -395,7 +395,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Warning: Could not open DS4 *Mac address* exclusively.. /// - internal static string CouldNotOpenDS4 { + public static string CouldNotOpenDS4 { get { return ResourceManager.GetString("CouldNotOpenDS4", resourceCulture); } @@ -404,7 +404,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to day. /// - internal static string Day { + public static string Day { get { return ResourceManager.GetString("Day", resourceCulture); } @@ -413,7 +413,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to days. /// - internal static string Days { + public static string Days { get { return ResourceManager.GetString("Days", resourceCulture); } @@ -422,7 +422,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap delete { + public static System.Drawing.Bitmap delete { get { object obj = ResourceManager.GetObject("delete", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -432,7 +432,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Delete Profile?. /// - internal static string DeleteProfile { + public static string DeleteProfile { get { return ResourceManager.GetString("DeleteProfile", resourceCulture); } @@ -441,7 +441,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Dim by Battery %. /// - internal static string DimByBattery { + public static string DimByBattery { get { return ResourceManager.GetString("DimByBattery", resourceCulture); } @@ -450,7 +450,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Turn off X360 input and only use the DS4's native input, hide ds4 must be off (Wired Only). /// - internal static string DinputOnly { + public static string DinputOnly { get { return ResourceManager.GetString("DinputOnly", resourceCulture); } @@ -459,7 +459,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Disconnect BT. /// - internal static string DisconnectBT { + public static string DisconnectBT { get { return ResourceManager.GetString("DisconnectBT", resourceCulture); } @@ -468,7 +468,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Disconnected. /// - internal static string Disconnected { + public static string Disconnected { get { return ResourceManager.GetString("Disconnected", resourceCulture); } @@ -477,7 +477,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap DOWN { + public static System.Drawing.Bitmap DOWN { get { object obj = ResourceManager.GetObject("DOWN", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -487,7 +487,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Downloading *number*%. /// - internal static string Downloading { + public static string Downloading { get { return ResourceManager.GetString("Downloading", resourceCulture); } @@ -496,7 +496,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Download Version *number* now?. /// - internal static string DownloadVersion { + public static string DownloadVersion { get { return ResourceManager.GetString("DownloadVersion", resourceCulture); } @@ -505,7 +505,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Down. /// - internal static string DownText { + public static string DownText { get { return ResourceManager.GetString("DownText", resourceCulture); } @@ -514,7 +514,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// - internal static System.Drawing.Icon DS4 { + public static System.Drawing.Icon DS4 { get { object obj = ResourceManager.GetObject("DS4", resourceCulture); return ((System.Drawing.Icon)(obj)); @@ -524,7 +524,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap DS4_Config { + public static System.Drawing.Bitmap DS4_Config { get { object obj = ResourceManager.GetObject("DS4_Config", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -534,7 +534,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap DS4_Config_Circle { + public static System.Drawing.Bitmap DS4_Config_Circle { get { object obj = ResourceManager.GetObject("DS4_Config_Circle", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -544,7 +544,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap DS4_Config_Cross { + public static System.Drawing.Bitmap DS4_Config_Cross { get { object obj = ResourceManager.GetObject("DS4_Config_Cross", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -554,7 +554,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap DS4_Config_Down { + public static System.Drawing.Bitmap DS4_Config_Down { get { object obj = ResourceManager.GetObject("DS4_Config_Down", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -564,7 +564,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap DS4_Config_L1 { + public static System.Drawing.Bitmap DS4_Config_L1 { get { object obj = ResourceManager.GetObject("DS4_Config_L1", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -574,7 +574,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap DS4_Config_L2 { + public static System.Drawing.Bitmap DS4_Config_L2 { get { object obj = ResourceManager.GetObject("DS4_Config_L2", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -584,7 +584,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap DS4_Config_Left { + public static System.Drawing.Bitmap DS4_Config_Left { get { object obj = ResourceManager.GetObject("DS4_Config_Left", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -594,7 +594,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap DS4_Config_LS { + public static System.Drawing.Bitmap DS4_Config_LS { get { object obj = ResourceManager.GetObject("DS4_Config_LS", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -604,7 +604,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap DS4_Config_Options { + public static System.Drawing.Bitmap DS4_Config_Options { get { object obj = ResourceManager.GetObject("DS4_Config_Options", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -614,7 +614,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap DS4_Config_PS { + public static System.Drawing.Bitmap DS4_Config_PS { get { object obj = ResourceManager.GetObject("DS4_Config_PS", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -624,7 +624,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap DS4_Config_R1 { + public static System.Drawing.Bitmap DS4_Config_R1 { get { object obj = ResourceManager.GetObject("DS4_Config_R1", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -634,7 +634,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap DS4_Config_R2 { + public static System.Drawing.Bitmap DS4_Config_R2 { get { object obj = ResourceManager.GetObject("DS4_Config_R2", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -644,7 +644,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap DS4_Config_Right { + public static System.Drawing.Bitmap DS4_Config_Right { get { object obj = ResourceManager.GetObject("DS4_Config_Right", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -654,7 +654,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap DS4_Config_RS { + public static System.Drawing.Bitmap DS4_Config_RS { get { object obj = ResourceManager.GetObject("DS4_Config_RS", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -664,7 +664,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap DS4_Config_Share { + public static System.Drawing.Bitmap DS4_Config_Share { get { object obj = ResourceManager.GetObject("DS4_Config_Share", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -674,7 +674,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap DS4_Config_Square { + public static System.Drawing.Bitmap DS4_Config_Square { get { object obj = ResourceManager.GetObject("DS4_Config_Square", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -684,7 +684,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap DS4_Config_TouchLeft { + public static System.Drawing.Bitmap DS4_Config_TouchLeft { get { object obj = ResourceManager.GetObject("DS4_Config_TouchLeft", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -694,7 +694,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap DS4_Config_TouchMulti { + public static System.Drawing.Bitmap DS4_Config_TouchMulti { get { object obj = ResourceManager.GetObject("DS4_Config_TouchMulti", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -704,7 +704,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap DS4_Config_TouchRight { + public static System.Drawing.Bitmap DS4_Config_TouchRight { get { object obj = ResourceManager.GetObject("DS4_Config_TouchRight", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -714,7 +714,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap DS4_Config_TouchUpper { + public static System.Drawing.Bitmap DS4_Config_TouchUpper { get { object obj = ResourceManager.GetObject("DS4_Config_TouchUpper", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -724,7 +724,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap DS4_Config_Triangle { + public static System.Drawing.Bitmap DS4_Config_Triangle { get { object obj = ResourceManager.GetObject("DS4_Config_Triangle", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -734,7 +734,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap DS4_Config_Up { + public static System.Drawing.Bitmap DS4_Config_Up { get { object obj = ResourceManager.GetObject("DS4_Config_Up", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -744,7 +744,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap DS4_Controller { + public static System.Drawing.Bitmap DS4_Controller { get { object obj = ResourceManager.GetObject("DS4_Controller", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -754,7 +754,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap DS4_lightbar { + public static System.Drawing.Bitmap DS4_lightbar { get { object obj = ResourceManager.GetObject("DS4_lightbar", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -764,7 +764,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to DS4Windows Update Available!. /// - internal static string DS4Update { + public static string DS4Update { get { return ResourceManager.GetString("DS4Update", resourceCulture); } @@ -773,7 +773,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// - internal static System.Drawing.Icon DS4W { + public static System.Drawing.Icon DS4W { get { object obj = ResourceManager.GetObject("DS4W", resourceCulture); return ((System.Drawing.Icon)(obj)); @@ -783,7 +783,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// - internal static System.Drawing.Icon DS4W___White { + public static System.Drawing.Icon DS4W___White { get { object obj = ResourceManager.GetObject("DS4W___White", resourceCulture); return ((System.Drawing.Icon)(obj)); @@ -793,7 +793,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to DS4Windows cannot edit settings here, This will now close. /// - internal static string DS4WindowsCannotEditHere { + public static string DS4WindowsCannotEditHere { get { return ResourceManager.GetString("DS4WindowsCannotEditHere", resourceCulture); } @@ -802,7 +802,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap edit { + public static System.Drawing.Bitmap edit { get { object obj = ResourceManager.GetObject("edit", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -812,7 +812,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Edit. /// - internal static string EditProfile { + public static string EditProfile { get { return ResourceManager.GetString("EditProfile", resourceCulture); } @@ -821,7 +821,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. /// - internal static System.IO.UnmanagedMemoryStream EE { + public static System.IO.UnmanagedMemoryStream EE { get { return ResourceManager.GetStream("EE", resourceCulture); } @@ -830,7 +830,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap export { + public static System.Drawing.Bitmap export { get { object obj = ResourceManager.GetObject("export", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -840,7 +840,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Fall Back. /// - internal static string FallBack { + public static string FallBack { get { return ResourceManager.GetString("FallBack", resourceCulture); } @@ -849,7 +849,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Fall Back to *button*. /// - internal static string FallBackTo { + public static string FallBackTo { get { return ResourceManager.GetString("FallBackTo", resourceCulture); } @@ -858,7 +858,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to 5th Mouse Button Down. /// - internal static string FifthMouseDown { + public static string FifthMouseDown { get { return ResourceManager.GetString("FifthMouseDown", resourceCulture); } @@ -867,7 +867,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to 5th Mouse Button Up. /// - internal static string FifthMouseUp { + public static string FifthMouseUp { get { return ResourceManager.GetString("FifthMouseUp", resourceCulture); } @@ -876,7 +876,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Click to change flash color. Black = default color. /// - internal static string FlashAtTip { + public static string FlashAtTip { get { return ResourceManager.GetString("FlashAtTip", resourceCulture); } @@ -885,7 +885,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Flush HID. /// - internal static string FlushHID { + public static string FlushHID { get { return ResourceManager.GetString("FlushHID", resourceCulture); } @@ -894,7 +894,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Flush HID Queue after each reading. /// - internal static string FlushHIDTip { + public static string FlushHIDTip { get { return ResourceManager.GetString("FlushHIDTip", resourceCulture); } @@ -903,7 +903,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Found Controller:. /// - internal static string FoundController { + public static string FoundController { get { return ResourceManager.GetString("FoundController", resourceCulture); } @@ -912,7 +912,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to 4th Mouse Button Down. /// - internal static string FourthMouseDown { + public static string FourthMouseDown { get { return ResourceManager.GetString("FourthMouseDown", resourceCulture); } @@ -921,7 +921,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to 4th Mouse Button Up. /// - internal static string FourthMouseUp { + public static string FourthMouseUp { get { return ResourceManager.GetString("FourthMouseUp", resourceCulture); } @@ -930,7 +930,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Full. /// - internal static string Full { + public static string Full { get { return ResourceManager.GetString("Full", resourceCulture); } @@ -939,7 +939,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Click to see readout of Sixaxis Gyro. /// - internal static string GyroReadout { + public static string GyroReadout { get { return ResourceManager.GetString("GyroReadout", resourceCulture); } @@ -948,7 +948,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Check to have gyro active while trigger is active. Uncheck to disable gyro while trigger is active.. /// - internal static string GyroTriggerBehavior { + public static string GyroTriggerBehavior { get { return ResourceManager.GetString("GyroTriggerBehavior", resourceCulture); } @@ -957,7 +957,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to GyroX, Left and Right Tilt. /// - internal static string GyroX { + public static string GyroX { get { return ResourceManager.GetString("GyroX", resourceCulture); } @@ -966,7 +966,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to GyroY, Forward and Back Tilt. /// - internal static string GyroY { + public static string GyroY { get { return ResourceManager.GetString("GyroY", resourceCulture); } @@ -975,7 +975,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to GyroZ, Up and Down Tilt. /// - internal static string GyroZ { + public static string GyroZ { get { return ResourceManager.GetString("GyroZ", resourceCulture); } @@ -984,7 +984,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to hour. /// - internal static string Hour { + public static string Hour { get { return ResourceManager.GetString("Hour", resourceCulture); } @@ -993,7 +993,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to hours. /// - internal static string Hours { + public static string Hours { get { return ResourceManager.GetString("Hours", resourceCulture); } @@ -1002,7 +1002,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Hover over items to see description or more about. /// - internal static string HoverOverItems { + public static string HoverOverItems { get { return ResourceManager.GetString("HoverOverItems", resourceCulture); } @@ -1011,7 +1011,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to If removing DS4Windows, You can delete the settings following the profile folder link. /// - internal static string IfRemovingDS4Windows { + public static string IfRemovingDS4Windows { get { return ResourceManager.GetString("IfRemovingDS4Windows", resourceCulture); } @@ -1020,7 +1020,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap import { + public static System.Drawing.Bitmap import { get { object obj = ResourceManager.GetObject("import", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1030,7 +1030,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Input Delay: *number*ms. /// - internal static string InputDelay { + public static string InputDelay { get { return ResourceManager.GetString("InputDelay", resourceCulture); } @@ -1039,7 +1039,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Install Complete. /// - internal static string InstallComplete { + public static string InstallComplete { get { return ResourceManager.GetString("InstallComplete", resourceCulture); } @@ -1048,7 +1048,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Install Drivers here. /// - internal static string InstallDriver { + public static string InstallDriver { get { return ResourceManager.GetString("InstallDriver", resourceCulture); } @@ -1057,7 +1057,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Install Failed, Please Retry. /// - internal static string InstallFailed { + public static string InstallFailed { get { return ResourceManager.GetString("InstallFailed", resourceCulture); } @@ -1066,7 +1066,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Installing.... /// - internal static string Installing { + public static string Installing { get { return ResourceManager.GetString("Installing", resourceCulture); } @@ -1075,7 +1075,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Use Sixaxis to help calculate touchpad movement. /// - internal static string Jitter { + public static string Jitter { get { return ResourceManager.GetString("Jitter", resourceCulture); } @@ -1084,7 +1084,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Keep this window size after closing. /// - internal static string KeepThisSize { + public static string KeepThisSize { get { return ResourceManager.GetString("KeepThisSize", resourceCulture); } @@ -1093,7 +1093,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Language pack change will take effect after DS4Windows application is restarted.. /// - internal static string LanguagePackApplyRestartRequired { + public static string LanguagePackApplyRestartRequired { get { return ResourceManager.GetString("LanguagePackApplyRestartRequired", resourceCulture); } @@ -1102,7 +1102,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Controller *number*'s latency now under 10ms. /// - internal static string LatencyNotOverTen { + public static string LatencyNotOverTen { get { return ResourceManager.GetString("LatencyNotOverTen", resourceCulture); } @@ -1111,7 +1111,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Controller *number*'s latency over 10ms. /// - internal static string LatencyOverTen { + public static string LatencyOverTen { get { return ResourceManager.GetString("LatencyOverTen", resourceCulture); } @@ -1120,7 +1120,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Launch *program*. /// - internal static string LaunchProgram { + public static string LaunchProgram { get { return ResourceManager.GetString("LaunchProgram", resourceCulture); } @@ -1129,7 +1129,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap LB { + public static System.Drawing.Bitmap LB { get { object obj = ResourceManager.GetObject("LB", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1139,7 +1139,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap LEFT { + public static System.Drawing.Bitmap LEFT { get { object obj = ResourceManager.GetObject("LEFT", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1149,7 +1149,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap left_touch { + public static System.Drawing.Bitmap left_touch { get { object obj = ResourceManager.GetObject("left_touch", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1159,7 +1159,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Also dim light by idle timeout if enabled when DS4 is fully charged. /// - internal static string LightByBatteryTip { + public static string LightByBatteryTip { get { return ResourceManager.GetString("LightByBatteryTip", resourceCulture); } @@ -1168,7 +1168,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Loading.... /// - internal static string Loading { + public static string Loading { get { return ResourceManager.GetString("Loading", resourceCulture); } @@ -1177,7 +1177,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Load *profile*. /// - internal static string LoadProfile { + public static string LoadProfile { get { return ResourceManager.GetString("LoadProfile", resourceCulture); } @@ -1186,7 +1186,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap LS { + public static System.Drawing.Bitmap LS { get { object obj = ResourceManager.GetObject("LS", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1196,7 +1196,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap LSD { + public static System.Drawing.Bitmap LSD { get { object obj = ResourceManager.GetObject("LSD", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1206,7 +1206,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap LSL { + public static System.Drawing.Bitmap LSL { get { object obj = ResourceManager.GetObject("LSL", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1216,7 +1216,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap LSR { + public static System.Drawing.Bitmap LSR { get { object obj = ResourceManager.GetObject("LSR", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1226,7 +1226,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap LSU { + public static System.Drawing.Bitmap LSU { get { object obj = ResourceManager.GetObject("LSU", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1236,7 +1236,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap LT { + public static System.Drawing.Bitmap LT { get { object obj = ResourceManager.GetObject("LT", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1246,7 +1246,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Macro. /// - internal static string Macro { + public static string Macro { get { return ResourceManager.GetString("Macro", resourceCulture); } @@ -1255,7 +1255,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Macro Recorded. /// - internal static string MacroRecorded { + public static string MacroRecorded { get { return ResourceManager.GetString("MacroRecorded", resourceCulture); } @@ -1264,7 +1264,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Make a New Profile. /// - internal static string MakeNewProfile { + public static string MakeNewProfile { get { return ResourceManager.GetString("MakeNewProfile", resourceCulture); } @@ -1273,7 +1273,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap mouse { + public static System.Drawing.Bitmap mouse { get { object obj = ResourceManager.GetObject("mouse", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1283,7 +1283,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Mutli-Action Button. /// - internal static string MultiAction { + public static string MultiAction { get { return ResourceManager.GetString("MultiAction", resourceCulture); } @@ -1292,7 +1292,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to N/A. /// - internal static string NA { + public static string NA { get { return ResourceManager.GetString("NA", resourceCulture); } @@ -1301,7 +1301,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to New. /// - internal static string New { + public static string New { get { return ResourceManager.GetString("New", resourceCulture); } @@ -1310,7 +1310,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap newprofile { + public static System.Drawing.Bitmap newprofile { get { object obj = ResourceManager.GetObject("newprofile", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1320,7 +1320,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to No macro was recorded. /// - internal static string NoMacroRecorded { + public static string NoMacroRecorded { get { return ResourceManager.GetString("NoMacroRecorded", resourceCulture); } @@ -1329,7 +1329,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap none { + public static System.Drawing.Bitmap none { get { object obj = ResourceManager.GetObject("none", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1339,7 +1339,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to (none). /// - internal static string noneProfile { + public static string noneProfile { get { return ResourceManager.GetString("noneProfile", resourceCulture); } @@ -1348,7 +1348,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to none. /// - internal static string NoneText { + public static string NoneText { get { return ResourceManager.GetString("NoneText", resourceCulture); } @@ -1357,7 +1357,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to No Profile Loaded. /// - internal static string NoProfileLoaded { + public static string NoProfileLoaded { get { return ResourceManager.GetString("NoProfileLoaded", resourceCulture); } @@ -1366,7 +1366,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Controller *number* is not using a profile. /// - internal static string NotUsingProfile { + public static string NotUsingProfile { get { return ResourceManager.GetString("NotUsingProfile", resourceCulture); } @@ -1375,7 +1375,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Not valid. /// - internal static string NotValid { + public static string NotValid { get { return ResourceManager.GetString("NotValid", resourceCulture); } @@ -1384,7 +1384,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Opening Installer. /// - internal static string OpeningInstaller { + public static string OpeningInstaller { get { return ResourceManager.GetString("OpeningInstaller", resourceCulture); } @@ -1393,7 +1393,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Please Open ScpDriver.exe. /// - internal static string OpenScpDriver { + public static string OpenScpDriver { get { return ResourceManager.GetString("OpenScpDriver", resourceCulture); } @@ -1402,7 +1402,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to , other location files will be deleted. /// - internal static string OtherFileLocation { + public static string OtherFileLocation { get { return ResourceManager.GetString("OtherFileLocation", resourceCulture); } @@ -1411,7 +1411,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Pairmode { + public static System.Drawing.Bitmap Pairmode { get { object obj = ResourceManager.GetObject("Pairmode", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1421,7 +1421,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Please Download the Updater now, and place it in the programs folder, then check for update again. /// - internal static string PleaseDownloadUpdater { + public static string PleaseDownloadUpdater { get { return ResourceManager.GetString("PleaseDownloadUpdater", resourceCulture); } @@ -1430,7 +1430,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Please import or make a profile. /// - internal static string PleaseImport { + public static string PleaseImport { get { return ResourceManager.GetString("PleaseImport", resourceCulture); } @@ -1439,7 +1439,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to New Profile. /// - internal static string PlusNewProfile { + public static string PlusNewProfile { get { return ResourceManager.GetString("PlusNewProfile", resourceCulture); } @@ -1448,7 +1448,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to *Profile name* cannot be restored.. /// - internal static string ProfileCannotRestore { + public static string ProfileCannotRestore { get { return ResourceManager.GetString("ProfileCannotRestore", resourceCulture); } @@ -1457,7 +1457,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Profile Folder Moved to program folder. /// - internal static string ProfileFolderMoved { + public static string ProfileFolderMoved { get { return ResourceManager.GetString("ProfileFolderMoved", resourceCulture); } @@ -1466,7 +1466,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Programs. /// - internal static string Programs { + public static string Programs { get { return ResourceManager.GetString("Programs", resourceCulture); } @@ -1475,16 +1475,16 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to EXPERIMENTAL: Auto-Disable BT when connecting to USB. /// - internal static string QuickCharge { + public static string QuickCharge { get { return ResourceManager.GetString("QuickCharge", resourceCulture); } } /// - /// Looks up a localized string similar to You must quit other applications like Steam, Uplay before activating the 'Hide DS4 Controller' option.". + /// Looks up a localized string similar to You must quit other applications like Steam, Uplay, NVIDIA IN-GAME before activating the 'Hide DS4 Controller' option.. /// - internal static string QuitOtherPrograms { + public static string QuitOtherPrograms { get { return ResourceManager.GetString("QuitOtherPrograms", resourceCulture); } @@ -1493,7 +1493,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap rainbow { + public static System.Drawing.Bitmap rainbow { get { object obj = ResourceManager.GetObject("rainbow", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1503,7 +1503,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap rainbowC { + public static System.Drawing.Bitmap rainbowC { get { object obj = ResourceManager.GetObject("rainbowC", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1513,7 +1513,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap RB { + public static System.Drawing.Bitmap RB { get { object obj = ResourceManager.GetObject("RB", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1523,7 +1523,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Record. /// - internal static string RecordText { + public static string RecordText { get { return ResourceManager.GetString("RecordText", resourceCulture); } @@ -1532,7 +1532,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap RIGHT { + public static System.Drawing.Bitmap RIGHT { get { object obj = ResourceManager.GetObject("RIGHT", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1542,7 +1542,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap right_touch { + public static System.Drawing.Bitmap right_touch { get { object obj = ResourceManager.GetObject("right_touch", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1552,7 +1552,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Right Click to set presets for a set of controls. /// - internal static string RightClickPresets { + public static string RightClickPresets { get { return ResourceManager.GetString("RightClickPresets", resourceCulture); } @@ -1561,7 +1561,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap RS { + public static System.Drawing.Bitmap RS { get { object obj = ResourceManager.GetObject("RS", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1571,7 +1571,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap RSD { + public static System.Drawing.Bitmap RSD { get { object obj = ResourceManager.GetObject("RSD", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1581,7 +1581,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap RSL { + public static System.Drawing.Bitmap RSL { get { object obj = ResourceManager.GetObject("RSL", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1591,7 +1591,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap RSR { + public static System.Drawing.Bitmap RSR { get { object obj = ResourceManager.GetObject("RSR", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1601,7 +1601,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap RSU { + public static System.Drawing.Bitmap RSU { get { object obj = ResourceManager.GetObject("RSU", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1611,7 +1611,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap RT { + public static System.Drawing.Bitmap RT { get { object obj = ResourceManager.GetObject("RT", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1621,7 +1621,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Tells Windows to start DS4Windows after login. /// - internal static string RunAtStartup { + public static string RunAtStartup { get { return ResourceManager.GetString("RunAtStartup", resourceCulture); } @@ -1630,7 +1630,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap saveprofile { + public static System.Drawing.Bitmap saveprofile { get { object obj = ResourceManager.GetObject("saveprofile", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1640,7 +1640,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Save Recorded Macro?. /// - internal static string SaveRecordedMacro { + public static string SaveRecordedMacro { get { return ResourceManager.GetString("SaveRecordedMacro", resourceCulture); } @@ -1649,7 +1649,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Scan Code. /// - internal static string ScanCode { + public static string ScanCode { get { return ResourceManager.GetString("ScanCode", resourceCulture); } @@ -1658,7 +1658,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Searching for controllers.... /// - internal static string SearchingController { + public static string SearchingController { get { return ResourceManager.GetString("SearchingController", resourceCulture); } @@ -1667,7 +1667,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Select an action for *action*. /// - internal static string SelectActionTitle { + public static string SelectActionTitle { get { return ResourceManager.GetString("SelectActionTitle", resourceCulture); } @@ -1676,7 +1676,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Select a macro. /// - internal static string SelectMacro { + public static string SelectMacro { get { return ResourceManager.GetString("SelectMacro", resourceCulture); } @@ -1685,7 +1685,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Set Regular Trigger. /// - internal static string SetRegularTrigger { + public static string SetRegularTrigger { get { return ResourceManager.GetString("SetRegularTrigger", resourceCulture); } @@ -1694,7 +1694,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Set Unload Trigger. /// - internal static string SetUnloadTrigger { + public static string SetUnloadTrigger { get { return ResourceManager.GetString("SetUnloadTrigger", resourceCulture); } @@ -1703,7 +1703,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Shortcuts. /// - internal static string Shortcuts { + public static string Shortcuts { get { return ResourceManager.GetString("Shortcuts", resourceCulture); } @@ -1712,7 +1712,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Click for advanced Sixaxis reading. /// - internal static string SixAxisReading { + public static string SixAxisReading { get { return ResourceManager.GetString("SixAxisReading", resourceCulture); } @@ -1721,7 +1721,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap size { + public static System.Drawing.Bitmap size { get { object obj = ResourceManager.GetObject("size", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1731,7 +1731,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap START { + public static System.Drawing.Bitmap START { get { object obj = ResourceManager.GetObject("START", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -1741,7 +1741,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Starting.... /// - internal static string Starting { + public static string Starting { get { return ResourceManager.GetString("Starting", resourceCulture); } @@ -1750,7 +1750,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Start. /// - internal static string StartText { + public static string StartText { get { return ResourceManager.GetString("StartText", resourceCulture); } @@ -1759,7 +1759,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Step 1: Install the DS4 Driver. /// - internal static string Step1 { + public static string Step1 { get { return ResourceManager.GetString("Step1", resourceCulture); } @@ -1768,7 +1768,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Stop Heavy. /// - internal static string StopHText { + public static string StopHText { get { return ResourceManager.GetString("StopHText", resourceCulture); } @@ -1777,7 +1777,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Stop Light. /// - internal static string StopLText { + public static string StopLText { get { return ResourceManager.GetString("StopLText", resourceCulture); } @@ -1786,7 +1786,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Stopped DS4Windows. /// - internal static string StoppedDS4Windows { + public static string StoppedDS4Windows { get { return ResourceManager.GetString("StoppedDS4Windows", resourceCulture); } @@ -1795,7 +1795,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Stopping DS4 Controllers. /// - internal static string StoppingDS4 { + public static string StoppingDS4 { get { return ResourceManager.GetString("StoppingDS4", resourceCulture); } @@ -1804,7 +1804,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Stopping X360 Controllers. /// - internal static string StoppingX360 { + public static string StoppingX360 { get { return ResourceManager.GetString("StoppingX360", resourceCulture); } @@ -1813,7 +1813,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Stop. /// - internal static string StopText { + public static string StopText { get { return ResourceManager.GetString("StopText", resourceCulture); } @@ -1822,7 +1822,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Swipe Down. /// - internal static string SwipeDown { + public static string SwipeDown { get { return ResourceManager.GetString("SwipeDown", resourceCulture); } @@ -1831,7 +1831,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Swipe Left. /// - internal static string SwipeLeft { + public static string SwipeLeft { get { return ResourceManager.GetString("SwipeLeft", resourceCulture); } @@ -1840,7 +1840,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Swipe Right. /// - internal static string SwipeRight { + public static string SwipeRight { get { return ResourceManager.GetString("SwipeRight", resourceCulture); } @@ -1849,7 +1849,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Swipe Touchpad to change profiles. /// - internal static string SwipeTouchpad { + public static string SwipeTouchpad { get { return ResourceManager.GetString("SwipeTouchpad", resourceCulture); } @@ -1858,7 +1858,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Swipe Up. /// - internal static string SwipeUp { + public static string SwipeUp { get { return ResourceManager.GetString("SwipeUp", resourceCulture); } @@ -1867,7 +1867,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Tap and hold to drag, slight delay with single taps. /// - internal static string TapAndHold { + public static string TapAndHold { get { return ResourceManager.GetString("TapAndHold", resourceCulture); } @@ -1876,7 +1876,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Test Heavy. /// - internal static string TestHText { + public static string TestHText { get { return ResourceManager.GetString("TestHText", resourceCulture); } @@ -1885,7 +1885,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Test Light. /// - internal static string TestLText { + public static string TestLText { get { return ResourceManager.GetString("TestLText", resourceCulture); } @@ -1894,7 +1894,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Test. /// - internal static string TestText { + public static string TestText { get { return ResourceManager.GetString("TestText", resourceCulture); } @@ -1903,7 +1903,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Text Document (*.txt). /// - internal static string TextDocs { + public static string TextDocs { get { return ResourceManager.GetString("TextDocs", resourceCulture); } @@ -1912,7 +1912,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Tilt Down. /// - internal static string TiltDown { + public static string TiltDown { get { return ResourceManager.GetString("TiltDown", resourceCulture); } @@ -1921,7 +1921,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Tilt Left. /// - internal static string TiltLeft { + public static string TiltLeft { get { return ResourceManager.GetString("TiltLeft", resourceCulture); } @@ -1930,7 +1930,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Tilt Right. /// - internal static string TiltRight { + public static string TiltRight { get { return ResourceManager.GetString("TiltRight", resourceCulture); } @@ -1939,7 +1939,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Tilt Up. /// - internal static string TiltUp { + public static string TiltUp { get { return ResourceManager.GetString("TiltUp", resourceCulture); } @@ -1948,7 +1948,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Touchpad Movement is now Off. /// - internal static string TouchpadMovementOff { + public static string TouchpadMovementOff { get { return ResourceManager.GetString("TouchpadMovementOff", resourceCulture); } @@ -1957,7 +1957,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Touchpad Movement is now On. /// - internal static string TouchpadMovementOn { + public static string TouchpadMovementOn { get { return ResourceManager.GetString("TouchpadMovementOn", resourceCulture); } @@ -1966,7 +1966,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Re-enable by pressing PS+Touchpad. /// - internal static string TouchpadOffTip { + public static string TouchpadOffTip { get { return ResourceManager.GetString("TouchpadOffTip", resourceCulture); } @@ -1975,7 +1975,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to 2 finger touchpad swipe left or right. /// - internal static string TwoFingerSwipe { + public static string TwoFingerSwipe { get { return ResourceManager.GetString("TwoFingerSwipe", resourceCulture); } @@ -1984,7 +1984,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to type new name here. /// - internal static string TypeNewName { + public static string TypeNewName { get { return ResourceManager.GetString("TypeNewName", resourceCulture); } @@ -1993,7 +1993,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to type profile name here. /// - internal static string TypeProfileName { + public static string TypeProfileName { get { return ResourceManager.GetString("TypeProfileName", resourceCulture); } @@ -2002,7 +2002,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to You need to run DS4Windows as the Administrator in order to activate this mode.. /// - internal static string UACTask { + public static string UACTask { get { return ResourceManager.GetString("UACTask", resourceCulture); } @@ -2011,7 +2011,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Unassigned. /// - internal static string Unassigned { + public static string Unassigned { get { return ResourceManager.GetString("Unassigned", resourceCulture); } @@ -2020,7 +2020,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap UP { + public static System.Drawing.Bitmap UP { get { object obj = ResourceManager.GetObject("UP", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -2030,7 +2030,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Up. /// - internal static string UpText { + public static string UpText { get { return ResourceManager.GetString("UpText", resourceCulture); } @@ -2039,7 +2039,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to You are up to date. /// - internal static string UpToDate { + public static string UpToDate { get { return ResourceManager.GetString("UpToDate", resourceCulture); } @@ -2048,7 +2048,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap USB { + public static System.Drawing.Bitmap USB { get { object obj = ResourceManager.GetObject("USB", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -2058,7 +2058,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to You can also use your controller to change controls. /// - internal static string UseControllerForMapping { + public static string UseControllerForMapping { get { return ResourceManager.GetString("UseControllerForMapping", resourceCulture); } @@ -2067,7 +2067,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Using Exclusive Mode. /// - internal static string UsingExclusive { + public static string UsingExclusive { get { return ResourceManager.GetString("UsingExclusive", resourceCulture); } @@ -2076,7 +2076,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Controller *number* is using Profile “*Profile name*". /// - internal static string UsingProfile { + public static string UsingProfile { get { return ResourceManager.GetString("UsingProfile", resourceCulture); } @@ -2085,7 +2085,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Using Shared Mode. /// - internal static string UsingShared { + public static string UsingShared { get { return ResourceManager.GetString("UsingShared", resourceCulture); } @@ -2094,7 +2094,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to This disables the Touchpad as a mouse. /// - internal static string UsingTPSwipes { + public static string UsingTPSwipes { get { return ResourceManager.GetString("UsingTPSwipes", resourceCulture); } @@ -2103,7 +2103,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Please enter a valid name. /// - internal static string ValidName { + public static string ValidName { get { return ResourceManager.GetString("ValidName", resourceCulture); } @@ -2112,7 +2112,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Wait *number*ms. /// - internal static string WaitMS { + public static string WaitMS { get { return ResourceManager.GetString("WaitMS", resourceCulture); } @@ -2121,7 +2121,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Will Keep. /// - internal static string WillKeep { + public static string WillKeep { get { return ResourceManager.GetString("WillKeep", resourceCulture); } @@ -2130,7 +2130,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap X { + public static System.Drawing.Bitmap X { get { object obj = ResourceManager.GetObject("X", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -2140,7 +2140,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to Use higher ports if you get conflicts in other emulating X360 programs, such as SCP's tool. /// - internal static string XinputPorts { + public static string XinputPorts { get { return ResourceManager.GetString("XinputPorts", resourceCulture); } @@ -2149,7 +2149,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized string similar to XML Files (*.xml). /// - internal static string XMLFiles { + public static string XMLFiles { get { return ResourceManager.GetString("XMLFiles", resourceCulture); } @@ -2158,7 +2158,7 @@ namespace DS4Windows.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Y { + public static System.Drawing.Bitmap Y { get { object obj = ResourceManager.GetObject("Y", resourceCulture); return ((System.Drawing.Bitmap)(obj)); diff --git a/DS4Windows/Properties/Resources.resx b/DS4Windows/Properties/Resources.resx index f04a78a..ba05651 100644 --- a/DS4Windows/Properties/Resources.resx +++ b/DS4Windows/Properties/Resources.resx @@ -566,7 +566,7 @@ EXPERIMENTAL: Auto-Disable BT when connecting to USB - You must quit other applications like Steam, Uplay before activating the 'Hide DS4 Controller' option." + You must quit other applications like Steam, Uplay, NVIDIA IN-GAME before activating the 'Hide DS4 Controller' option. ..\Resources\rainbow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/DS4Windows/Properties/Settings.Designer.cs b/DS4Windows/Properties/Settings.Designer.cs deleted file mode 100644 index 8249a9b..0000000 --- a/DS4Windows/Properties/Settings.Designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace DS4Windows.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - } -} diff --git a/DS4Windows/Properties/Settings.settings b/DS4Windows/Properties/Settings.settings deleted file mode 100644 index 3964565..0000000 --- a/DS4Windows/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/DS4Windows/Settings.cs b/DS4Windows/Settings.cs new file mode 100644 index 0000000..f2827e0 --- /dev/null +++ b/DS4Windows/Settings.cs @@ -0,0 +1,28 @@ +namespace DS4Windows.Properties { + + + // This class allows you to handle specific events on the settings class: + // The SettingChanging event is raised before a setting's value is changed. + // The PropertyChanged event is raised after a setting's value is changed. + // The SettingsLoaded event is raised after the setting values are loaded. + // The SettingsSaving event is raised before the setting values are saved. + public sealed partial class Settings { + + public Settings() { + // // To add event handlers for saving and changing settings, uncomment the lines below: + // + // this.SettingChanging += this.SettingChangingEventHandler; + // + // this.SettingsSaving += this.SettingsSavingEventHandler; + // + } + + private void SettingChangingEventHandler(object sender, System.Configuration.SettingChangingEventArgs e) { + // Add code to handle the SettingChangingEvent event here. + } + + private void SettingsSavingEventHandler(object sender, System.ComponentModel.CancelEventArgs e) { + // Add code to handle the SettingsSaving event here. + } + } +}