diff --git a/DS4Control/Control.cs b/DS4Control/Control.cs index 3852930..69afe6b 100644 --- a/DS4Control/Control.cs +++ b/DS4Control/Control.cs @@ -68,6 +68,7 @@ namespace DS4Control DS4Devices.findControllers(); IEnumerable devices = DS4Devices.getDS4Controllers(); int ind = 0; + DS4LightBar.defualtLight = false; foreach (DS4Device device in devices) { if (showlog) @@ -126,25 +127,15 @@ namespace DS4Control for (int i = 0; i < DS4Controllers.Length; i++) { if (DS4Controllers[i] != null) - { - double oldrainbow = Global.getRainbow(i); - bool oldbatt = Global.getLedAsBatteryIndicator(i); - DS4Color oldcolor = Global.loadColor(i); - while (Global.loadColor(i).red != 32 || Global.loadColor(i).green != 64 || Global.loadColor(i).blue != 64 || Global.getRainbow(i) != 0 || Global.getLedAsBatteryIndicator(i) != false) - { - Global.setRainbow(i, 0); - Global.setLedAsBatteryIndicator(i, false); - Global.saveColor(i, 32, 64, 64); //Make Lightbar light blue like default bluetooth color - System.Threading.Thread.Sleep(5); - } + { + DS4LightBar.defualtLight = true; + DS4LightBar.updateLightBar(DS4Controllers[i], i); + System.Threading.Thread.Sleep(50); CurrentState[i].Battery = PreviousState[i].Battery = 0; // Reset for the next connection's initial status change. x360Bus.Unplug(i); anyUnplugged = true; DS4Controllers[i] = null; touchPad[i] = null; - Global.setRainbow(i, oldrainbow); //Set back settings once ds4windows stops, so when reconnecting it shows right colors - Global.setLedAsBatteryIndicator(i, oldbatt); - Global.saveColor(i, oldcolor.red, oldcolor.green, oldcolor.blue); } } if (anyUnplugged) @@ -246,12 +237,8 @@ namespace DS4Control } catch (TimeoutException) { - //Global.setUseExclusiveMode(!Global.getUseExclusiveMode()); Stop(false); Start(false); - //Global.setUseExclusiveMode(!Global.getUseExclusiveMode()); - //Stop(false); - //Start(false); } } @@ -422,6 +409,7 @@ namespace DS4Control // Update the GUI/whatever. DS4LightBar.updateLightBar(device, ind); + //DS4LightBar.defualtLight(device, ind); x360Bus.Parse(cState, processingData[ind].Report, ind); // We push the translated Xinput state, and simultaneously we diff --git a/DS4Control/DS4LightBar.cs b/DS4Control/DS4LightBar.cs index a8ad79c..808b140 100644 --- a/DS4Control/DS4LightBar.cs +++ b/DS4Control/DS4LightBar.cs @@ -5,7 +5,7 @@ using System.Text; using DS4Library; namespace DS4Control { - class DS4LightBar + public class DS4LightBar { private readonly static byte[/* Light On duration */, /* Light Off duration */] BatteryIndicatorDurations = { @@ -25,69 +25,74 @@ namespace DS4Control static DateTime oldnow = DateTime.UtcNow; public static void updateLightBar(DS4Device device, int deviceNum) { - DS4Color color; - if (Global.getRainbow(deviceNum) > 0) - {// Display rainbow - DateTime now = DateTime.UtcNow; - if (now >= oldnow + TimeSpan.FromMilliseconds(10)) //update by the millisecond that way it's a smooth transtion - { - oldnow = now; - if (device.Charging) - counters[deviceNum] -= 1.5 * 3 / Global.getRainbow(deviceNum); - else - counters[deviceNum] += 1.5 * 3 / Global.getRainbow(deviceNum); - } - if (counters[deviceNum] < 0) - counters[deviceNum] = 180000; - if (Global.getLedAsBatteryIndicator(deviceNum)) - color = HuetoRGB((float)counters[deviceNum] % 360, (byte)(2.55 * device.Battery)); - else - color = HuetoRGB((float)counters[deviceNum] % 360, 255); - - } - else if (Global.getLedAsBatteryIndicator(deviceNum)) + DS4Color color; + if (!defualtLight) { - if (device.Charging == false || device.Battery >= 100) // when charged, don't show the charging animation - { - DS4Color fullColor = new DS4Color + if (Global.getRainbow(deviceNum) > 0) + {// Display rainbow + DateTime now = DateTime.UtcNow; + if (now >= oldnow + TimeSpan.FromMilliseconds(10)) //update by the millisecond that way it's a smooth transtion { - red = Global.loadColor(deviceNum).red, - green = Global.loadColor(deviceNum).green, - blue = Global.loadColor(deviceNum).blue - }; + oldnow = now; + if (device.Charging) + counters[deviceNum] -= 1.5 * 3 / Global.getRainbow(deviceNum); + else + counters[deviceNum] += 1.5 * 3 / Global.getRainbow(deviceNum); + } + if (counters[deviceNum] < 0) + counters[deviceNum] = 180000; + if (Global.getLedAsBatteryIndicator(deviceNum)) + color = HuetoRGB((float)counters[deviceNum] % 360, (byte)(2.55 * device.Battery)); + else + color = HuetoRGB((float)counters[deviceNum] % 360, 255); - color = Global.loadLowColor(deviceNum); - DS4Color lowColor = new DS4Color - { - red = color.red, - green = color.green, - blue = color.blue - }; - - color = Global.getTransitionedColor(lowColor, fullColor, (uint)device.Battery); } - else // Display rainbow when charging. + else if (Global.getLedAsBatteryIndicator(deviceNum)) { - counters[deviceNum] += .167; - color = HuetoRGB((float)counters[deviceNum] % 360, 255); + if (device.Charging == false || device.Battery >= 100) // when charged, don't show the charging animation + { + DS4Color fullColor = new DS4Color + { + red = Global.loadColor(deviceNum).red, + green = Global.loadColor(deviceNum).green, + blue = Global.loadColor(deviceNum).blue + }; + + color = Global.loadLowColor(deviceNum); + DS4Color lowColor = new DS4Color + { + red = color.red, + green = color.green, + blue = color.blue + }; + + color = Global.getTransitionedColor(lowColor, fullColor, (uint)device.Battery); + } + else // Display rainbow when charging. + { + counters[deviceNum] += .167; + color = HuetoRGB((float)counters[deviceNum] % 360, 255); + } + } + else + { + color = Global.loadColor(deviceNum); + } + + if (Global.getIdleDisconnectTimeout(deviceNum) > 0 && (!device.Charging || device.Battery >= 100)) + {//Fade lightbar by idle time + TimeSpan timeratio = new TimeSpan(DateTime.UtcNow.Ticks - device.lastActive.Ticks); + double botratio = timeratio.TotalMilliseconds; + double topratio = TimeSpan.FromSeconds(Global.getIdleDisconnectTimeout(deviceNum)).TotalMilliseconds; + double ratio = ((botratio / topratio) * 100); + if (ratio >= 50 && ratio <= 100) + color = Global.getTransitionedColor(color, new DS4Color { red = 0, green = 0, blue = 0 }, (uint)((ratio - 50) * 2)); + else if (ratio >= 100) + color = Global.getTransitionedColor(color, new DS4Color { red = 0, green = 0, blue = 0 }, 100); } } else - { - color = Global.loadColor(deviceNum); - } - - if (Global.getIdleDisconnectTimeout(deviceNum) > 0 && (!device.Charging || device.Battery >= 100)) - {//Fade lightbar by idle time - TimeSpan timeratio = new TimeSpan(DateTime.UtcNow.Ticks - device.lastActive.Ticks); - double botratio = timeratio.TotalMilliseconds; - double topratio = TimeSpan.FromSeconds(Global.getIdleDisconnectTimeout(deviceNum)).TotalMilliseconds; - double ratio = ((botratio / topratio) * 100); - if (ratio >= 50 && ratio <= 100) - color = Global.getTransitionedColor(color, new DS4Color { red = 0, green = 0, blue = 0 }, (uint)((ratio-50)*2)); - else if (ratio >= 100) - color = Global.getTransitionedColor(color, new DS4Color { red = 0, green = 0, blue = 0 }, 100); - } + color = new DS4Color { red = 32, green = 64, blue = 64 }; DS4HapticState haptics = new DS4HapticState { LightBarColor = color @@ -105,6 +110,7 @@ namespace DS4Control else { haptics.LightBarFlashDurationOff = haptics.LightBarFlashDurationOn = 0; + haptics.LightBarExplicitlyOff = true; } } else @@ -112,7 +118,9 @@ namespace DS4Control haptics.LightBarExplicitlyOff = true; } device.pushHapticState(haptics); + } + public static bool defualtLight = false; public static DS4Color HuetoRGB(float hue, byte sat) { diff --git a/DS4Tool/Hotkeys.Designer.cs b/DS4Tool/Hotkeys.Designer.cs index 2663ad5..97c613c 100644 --- a/DS4Tool/Hotkeys.Designer.cs +++ b/DS4Tool/Hotkeys.Designer.cs @@ -28,18 +28,7 @@ /// private void InitializeComponent() { - this.label1 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.label7 = new System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); this.button1 = new System.Windows.Forms.Button(); - this.label9 = new System.Windows.Forms.Label(); - this.label10 = new System.Windows.Forms.Label(); - this.label13 = new System.Windows.Forms.Label(); - this.label14 = new System.Windows.Forms.Label(); - this.label15 = new System.Windows.Forms.Label(); this.linkProfiles = new System.Windows.Forms.LinkLabel(); this.linkElectro = new System.Windows.Forms.LinkLabel(); this.linkJays2Kings = new System.Windows.Forms.LinkLabel(); @@ -48,87 +37,46 @@ this.linkInhexSTER = new System.Windows.Forms.LinkLabel(); this.linkJhebbel = new System.Windows.Forms.LinkLabel(); this.linkUninstall = new System.Windows.Forms.LinkLabel(); - this.label6 = new System.Windows.Forms.Label(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.label24 = new System.Windows.Forms.Label(); - this.label20 = new System.Windows.Forms.Label(); - this.label22 = new System.Windows.Forms.Label(); - this.label17 = new System.Windows.Forms.Label(); - this.label18 = new System.Windows.Forms.Label(); - this.label11 = new System.Windows.Forms.Label(); - this.label19 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); - this.label21 = new System.Windows.Forms.Label(); - this.label16 = new System.Windows.Forms.Label(); - this.label28 = new System.Windows.Forms.Label(); - this.label29 = new System.Windows.Forms.Label(); - this.label25 = new System.Windows.Forms.Label(); - this.label27 = new System.Windows.Forms.Label(); - this.label26 = new System.Windows.Forms.Label(); this.label23 = new System.Windows.Forms.Label(); this.lLBUpdate = new System.Windows.Forms.LinkLabel(); + this.label26 = new System.Windows.Forms.Label(); + this.label27 = new System.Windows.Forms.Label(); + this.label25 = new System.Windows.Forms.Label(); + this.label29 = new System.Windows.Forms.Label(); + this.label28 = new System.Windows.Forms.Label(); + this.label14 = new System.Windows.Forms.Label(); + this.label8 = new System.Windows.Forms.Label(); + this.label16 = new System.Windows.Forms.Label(); + this.label15 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.label21 = new System.Windows.Forms.Label(); + this.label13 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); + this.label9 = new System.Windows.Forms.Label(); + this.label19 = new System.Windows.Forms.Label(); + this.label10 = new System.Windows.Forms.Label(); + this.label11 = new System.Windows.Forms.Label(); + this.label18 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.label17 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.label22 = new System.Windows.Forms.Label(); + this.label20 = new System.Windows.Forms.Label(); + this.label24 = new System.Windows.Forms.Label(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.label30 = new System.Windows.Forms.Label(); + this.label31 = new System.Windows.Forms.Label(); this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(3, 110); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(108, 13); - this.label1.TabIndex = 0; - this.label1.Text = "Click Touchpad + PS"; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(3, 176); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(125, 13); - this.label3.TabIndex = 2; - this.label3.Text = "Tap then hold touchpad*"; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(3, 132); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(121, 13); - this.label4.TabIndex = 3; - this.label4.Text = "Pad click on lower right*"; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(193, 110); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(231, 13); - this.label5.TabIndex = 4; - this.label5.Text = "Turn off touchpad movment (clicking still works)"; - // - // label7 - // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(193, 176); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(83, 13); - this.label7.TabIndex = 6; - this.label7.Text = "Left mouse drag"; - // - // label8 - // - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(193, 132); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(313, 13); - this.label8.TabIndex = 7; - this.label8.Text = "Right click (Best used when right side is used as a mouse button)"; - // // button1 // this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.button1.Location = new System.Drawing.Point(215, 399); + this.button1.Location = new System.Drawing.Point(215, 386); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(75, 23); this.button1.TabIndex = 8; @@ -136,58 +84,11 @@ this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.button1_Click); // - // label9 - // - this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(193, 154); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(83, 13); - this.label9.TabIndex = 10; - this.label9.Text = "Scroll Up/Down"; - // - // label10 - // - this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(3, 154); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(175, 13); - this.label10.TabIndex = 9; - this.label10.Text = "Two fingers up/down on touchpad*"; - // - // label13 - // - this.label13.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(3, 224); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(184, 13); - this.label13.TabIndex = 14; - this.label13.Text = "When mapping keyboard and mouse:"; - this.label13.TextAlign = System.Drawing.ContentAlignment.TopCenter; - // - // label14 - // - this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(193, 88); - this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(201, 13); - this.label14.TabIndex = 16; - this.label14.Text = "Disconnect Controller (Only on Bluetooth)"; - // - // label15 - // - this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(3, 88); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(103, 13); - this.label15.TabIndex = 15; - this.label15.Text = "PS Button + Options"; - // // linkProfiles // this.linkProfiles.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.linkProfiles.AutoSize = true; - this.linkProfiles.Location = new System.Drawing.Point(378, 404); + this.linkProfiles.Location = new System.Drawing.Point(378, 391); this.linkProfiles.Name = "linkProfiles"; this.linkProfiles.Size = new System.Drawing.Size(94, 13); this.linkProfiles.TabIndex = 17; @@ -199,7 +100,7 @@ // this.linkElectro.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.linkElectro.AutoSize = true; - this.linkElectro.Location = new System.Drawing.Point(272, 374); + this.linkElectro.Location = new System.Drawing.Point(272, 361); this.linkElectro.Name = "linkElectro"; this.linkElectro.Size = new System.Drawing.Size(149, 13); this.linkElectro.TabIndex = 18; @@ -211,7 +112,7 @@ // this.linkJays2Kings.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.linkJays2Kings.AutoSize = true; - this.linkJays2Kings.Location = new System.Drawing.Point(17, 374); + this.linkJays2Kings.Location = new System.Drawing.Point(17, 361); this.linkJays2Kings.Name = "linkJays2Kings"; this.linkJays2Kings.Size = new System.Drawing.Size(60, 13); this.linkJays2Kings.TabIndex = 18; @@ -223,7 +124,7 @@ // this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(203, 352); + this.label2.Location = new System.Drawing.Point(203, 339); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(109, 13); this.label2.TabIndex = 13; @@ -243,7 +144,7 @@ // this.linkInhexSTER.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.linkInhexSTER.AutoSize = true; - this.linkInhexSTER.Location = new System.Drawing.Point(95, 374); + this.linkInhexSTER.Location = new System.Drawing.Point(95, 361); this.linkInhexSTER.Name = "linkInhexSTER"; this.linkInhexSTER.Size = new System.Drawing.Size(159, 13); this.linkInhexSTER.TabIndex = 18; @@ -255,7 +156,7 @@ // this.linkJhebbel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.linkJhebbel.AutoSize = true; - this.linkJhebbel.Location = new System.Drawing.Point(450, 374); + this.linkJhebbel.Location = new System.Drawing.Point(450, 361); this.linkJhebbel.Name = "linkJhebbel"; this.linkJhebbel.Size = new System.Drawing.Size(41, 13); this.linkJhebbel.TabIndex = 18; @@ -267,7 +168,7 @@ // this.linkUninstall.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.linkUninstall.AutoSize = true; - this.linkUninstall.Location = new System.Drawing.Point(35, 404); + this.linkUninstall.Location = new System.Drawing.Point(35, 391); this.linkUninstall.Name = "linkUninstall"; this.linkUninstall.Size = new System.Drawing.Size(106, 13); this.linkUninstall.TabIndex = 17; @@ -275,208 +176,6 @@ this.linkUninstall.Text = "Uninstall VBus Driver"; this.linkUninstall.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkUninstall_LinkClicked); // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(193, 0); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(59, 13); - this.label6.TabIndex = 14; - this.label6.Text = "Left Touch"; - // - // tableLayoutPanel1 - // - this.tableLayoutPanel1.ColumnCount = 2; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.Controls.Add(this.label24, 0, 11); - this.tableLayoutPanel1.Controls.Add(this.label20, 0, 9); - this.tableLayoutPanel1.Controls.Add(this.label22, 1, 9); - this.tableLayoutPanel1.Controls.Add(this.label1, 0, 5); - this.tableLayoutPanel1.Controls.Add(this.label17, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.label5, 1, 5); - this.tableLayoutPanel1.Controls.Add(this.label6, 1, 0); - this.tableLayoutPanel1.Controls.Add(this.label18, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.label11, 1, 1); - this.tableLayoutPanel1.Controls.Add(this.label10, 0, 7); - this.tableLayoutPanel1.Controls.Add(this.label19, 0, 2); - this.tableLayoutPanel1.Controls.Add(this.label9, 1, 7); - this.tableLayoutPanel1.Controls.Add(this.label12, 1, 2); - this.tableLayoutPanel1.Controls.Add(this.label3, 0, 8); - this.tableLayoutPanel1.Controls.Add(this.label13, 0, 10); - this.tableLayoutPanel1.Controls.Add(this.label21, 0, 3); - this.tableLayoutPanel1.Controls.Add(this.label7, 1, 8); - this.tableLayoutPanel1.Controls.Add(this.label4, 0, 6); - this.tableLayoutPanel1.Controls.Add(this.label15, 0, 4); - this.tableLayoutPanel1.Controls.Add(this.label16, 1, 3); - this.tableLayoutPanel1.Controls.Add(this.label8, 1, 6); - this.tableLayoutPanel1.Controls.Add(this.label14, 1, 4); - this.tableLayoutPanel1.Controls.Add(this.label28, 1, 12); - this.tableLayoutPanel1.Controls.Add(this.label29, 1, 11); - this.tableLayoutPanel1.Controls.Add(this.label25, 0, 12); - this.tableLayoutPanel1.Controls.Add(this.label27, 1, 13); - this.tableLayoutPanel1.Controls.Add(this.label26, 0, 13); - this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 31); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 14; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142856F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142856F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142856F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142856F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142856F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142856F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142856F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142856F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142856F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142856F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142856F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142856F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142856F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142856F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(513, 318); - this.tableLayoutPanel1.TabIndex = 19; - // - // label24 - // - this.label24.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label24.AutoSize = true; - this.label24.Location = new System.Drawing.Point(3, 246); - this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(40, 13); - this.label24.TabIndex = 14; - this.label24.Text = "Toggle"; - // - // label20 - // - this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(3, 198); - this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(172, 13); - this.label20.TabIndex = 14; - this.label20.Text = "L1+R1+Touchpad Slide left or right"; - // - // label22 - // - this.label22.AutoSize = true; - this.label22.Location = new System.Drawing.Point(193, 198); - this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(108, 13); - this.label22.TabIndex = 14; - this.label22.Text = "Cycle through profiles"; - // - // label17 - // - this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(3, 0); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(129, 13); - this.label17.TabIndex = 14; - this.label17.Text = "Click left side of touchpad"; - // - // label18 - // - this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(3, 22); - this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(135, 13); - this.label18.TabIndex = 14; - this.label18.Text = "Click right side of touchpad"; - // - // label11 - // - this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(193, 22); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(66, 13); - this.label11.TabIndex = 14; - this.label11.Text = "Right Touch"; - // - // label19 - // - this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(3, 44); - this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(146, 13); - this.label19.TabIndex = 14; - this.label19.Text = "Click touchpad with 2 fingers "; - // - // label12 - // - this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(193, 44); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(56, 13); - this.label12.TabIndex = 14; - this.label12.Text = "Multitouch"; - // - // label21 - // - this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(3, 66); - this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(141, 13); - this.label21.TabIndex = 14; - this.label21.Text = "Click upper part of touchpad"; - // - // label16 - // - this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(193, 66); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(70, 13); - this.label16.TabIndex = 14; - this.label16.Text = "Upper Touch"; - // - // label28 - // - this.label28.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label28.AutoSize = true; - this.label28.Location = new System.Drawing.Point(193, 268); - this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(160, 13); - this.label28.TabIndex = 14; - this.label28.Text = "Assign multiple keys to one input"; - // - // label29 - // - this.label29.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label29.AutoSize = true; - this.label29.Location = new System.Drawing.Point(193, 246); - this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(313, 13); - this.label29.TabIndex = 14; - this.label29.Text = "Keys are interperted differently. May be needed for certain games"; - // - // label25 - // - this.label25.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label25.AutoSize = true; - this.label25.Location = new System.Drawing.Point(3, 268); - this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(37, 13); - this.label25.TabIndex = 14; - this.label25.Text = "Macro"; - // - // label27 - // - this.label27.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label27.AutoSize = true; - this.label27.Location = new System.Drawing.Point(193, 295); - this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(296, 13); - this.label27.TabIndex = 14; - this.label27.Text = "The key will remain in a \"held down\" state until pressed again"; - // - // label26 - // - this.label26.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label26.AutoSize = true; - this.label26.Location = new System.Drawing.Point(3, 295); - this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(60, 13); - this.label26.TabIndex = 14; - this.label26.Text = "Scan Code"; - // // label23 // this.label23.AutoSize = true; @@ -488,7 +187,6 @@ // // lLBUpdate // - this.lLBUpdate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.lLBUpdate.AutoSize = true; this.lLBUpdate.Location = new System.Drawing.Point(6, 9); this.lLBUpdate.Name = "lLBUpdate"; @@ -497,6 +195,333 @@ this.lLBUpdate.TabStop = true; this.lLBUpdate.Text = "Check for Updates"; this.lLBUpdate.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lLBUpdate_LinkClicked); + // + // label26 + // + this.label26.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label26.AutoSize = true; + this.label26.Location = new System.Drawing.Point(3, 282); + this.label26.Name = "label26"; + this.label26.Size = new System.Drawing.Size(60, 13); + this.label26.TabIndex = 14; + this.label26.Text = "Scan Code"; + // + // label27 + // + this.label27.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label27.AutoSize = true; + this.label27.Location = new System.Drawing.Point(193, 282); + this.label27.Name = "label27"; + this.label27.Size = new System.Drawing.Size(296, 13); + this.label27.TabIndex = 14; + this.label27.Text = "The key will remain in a \"held down\" state until pressed again"; + // + // label25 + // + this.label25.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label25.AutoSize = true; + this.label25.Location = new System.Drawing.Point(3, 263); + this.label25.Name = "label25"; + this.label25.Size = new System.Drawing.Size(37, 13); + this.label25.TabIndex = 14; + this.label25.Text = "Macro"; + // + // label29 + // + this.label29.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label29.AutoSize = true; + this.label29.Location = new System.Drawing.Point(193, 244); + this.label29.Name = "label29"; + this.label29.Size = new System.Drawing.Size(313, 13); + this.label29.TabIndex = 14; + this.label29.Text = "Keys are interperted differently. May be needed for certain games"; + // + // label28 + // + this.label28.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label28.AutoSize = true; + this.label28.Location = new System.Drawing.Point(193, 263); + this.label28.Name = "label28"; + this.label28.Size = new System.Drawing.Size(160, 13); + this.label28.TabIndex = 14; + this.label28.Text = "Assign multiple keys to one input"; + // + // label14 + // + this.label14.AutoSize = true; + this.label14.Location = new System.Drawing.Point(193, 108); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(201, 13); + this.label14.TabIndex = 16; + this.label14.Text = "Disconnect Controller (Only on Bluetooth)"; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(193, 146); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(313, 13); + this.label8.TabIndex = 7; + this.label8.Text = "Right click (Best used when right side is used as a mouse button)"; + // + // label16 + // + this.label16.AutoSize = true; + this.label16.Location = new System.Drawing.Point(193, 89); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(70, 13); + this.label16.TabIndex = 14; + this.label16.Text = "Upper Touch"; + // + // label15 + // + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(3, 108); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(103, 13); + this.label15.TabIndex = 15; + this.label15.Text = "PS Button + Options"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(3, 146); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(121, 13); + this.label4.TabIndex = 3; + this.label4.Text = "Pad click on lower right*"; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(193, 184); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(83, 13); + this.label7.TabIndex = 6; + this.label7.Text = "Left mouse drag"; + // + // label21 + // + this.label21.AutoSize = true; + this.label21.Location = new System.Drawing.Point(3, 89); + this.label21.Name = "label21"; + this.label21.Size = new System.Drawing.Size(141, 13); + this.label21.TabIndex = 14; + this.label21.Text = "Click upper part of touchpad"; + // + // label13 + // + this.label13.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label13.AutoSize = true; + this.label13.Location = new System.Drawing.Point(3, 225); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(184, 13); + this.label13.TabIndex = 14; + this.label13.Text = "When mapping keyboard and mouse:"; + this.label13.TextAlign = System.Drawing.ContentAlignment.TopCenter; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(3, 184); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(125, 13); + this.label3.TabIndex = 2; + this.label3.Text = "Tap then hold touchpad*"; + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Location = new System.Drawing.Point(193, 70); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(56, 13); + this.label12.TabIndex = 14; + this.label12.Text = "Multitouch"; + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(193, 165); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(83, 13); + this.label9.TabIndex = 10; + this.label9.Text = "Scroll Up/Down"; + // + // label19 + // + this.label19.AutoSize = true; + this.label19.Location = new System.Drawing.Point(3, 70); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(146, 13); + this.label19.TabIndex = 14; + this.label19.Text = "Click touchpad with 2 fingers "; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.Location = new System.Drawing.Point(3, 165); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(175, 13); + this.label10.TabIndex = 9; + this.label10.Text = "Two fingers up/down on touchpad*"; + // + // label11 + // + this.label11.AutoSize = true; + this.label11.Location = new System.Drawing.Point(193, 51); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(66, 13); + this.label11.TabIndex = 14; + this.label11.Text = "Right Touch"; + // + // label18 + // + this.label18.AutoSize = true; + this.label18.Location = new System.Drawing.Point(3, 51); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(135, 13); + this.label18.TabIndex = 14; + this.label18.Text = "Click right side of touchpad"; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(193, 32); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(59, 13); + this.label6.TabIndex = 14; + this.label6.Text = "Left Touch"; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(193, 127); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(231, 13); + this.label5.TabIndex = 4; + this.label5.Text = "Turn off touchpad movment (clicking still works)"; + // + // label17 + // + this.label17.AutoSize = true; + this.label17.Location = new System.Drawing.Point(3, 32); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(129, 13); + this.label17.TabIndex = 14; + this.label17.Text = "Click left side of touchpad"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(3, 127); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(108, 13); + this.label1.TabIndex = 0; + this.label1.Text = "Click Touchpad + PS"; + // + // label22 + // + this.label22.AutoSize = true; + this.label22.Location = new System.Drawing.Point(193, 203); + this.label22.Name = "label22"; + this.label22.Size = new System.Drawing.Size(108, 13); + this.label22.TabIndex = 14; + this.label22.Text = "Cycle through profiles"; + // + // label20 + // + this.label20.AutoSize = true; + this.label20.Location = new System.Drawing.Point(3, 203); + this.label20.Name = "label20"; + this.label20.Size = new System.Drawing.Size(172, 13); + this.label20.TabIndex = 14; + this.label20.Text = "L1+R1+Touchpad Slide left or right"; + // + // label24 + // + this.label24.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label24.AutoSize = true; + this.label24.Location = new System.Drawing.Point(3, 244); + this.label24.Name = "label24"; + this.label24.Size = new System.Drawing.Size(40, 13); + this.label24.TabIndex = 14; + this.label24.Text = "Toggle"; + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.ColumnCount = 2; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.Controls.Add(this.label24, 0, 12); + this.tableLayoutPanel1.Controls.Add(this.label20, 0, 10); + this.tableLayoutPanel1.Controls.Add(this.label22, 1, 10); + this.tableLayoutPanel1.Controls.Add(this.label1, 0, 6); + this.tableLayoutPanel1.Controls.Add(this.label17, 0, 1); + this.tableLayoutPanel1.Controls.Add(this.label5, 1, 6); + this.tableLayoutPanel1.Controls.Add(this.label6, 1, 1); + this.tableLayoutPanel1.Controls.Add(this.label18, 0, 2); + this.tableLayoutPanel1.Controls.Add(this.label11, 1, 2); + this.tableLayoutPanel1.Controls.Add(this.label10, 0, 8); + this.tableLayoutPanel1.Controls.Add(this.label19, 0, 3); + this.tableLayoutPanel1.Controls.Add(this.label9, 1, 8); + this.tableLayoutPanel1.Controls.Add(this.label12, 1, 3); + this.tableLayoutPanel1.Controls.Add(this.label3, 0, 9); + this.tableLayoutPanel1.Controls.Add(this.label13, 0, 11); + this.tableLayoutPanel1.Controls.Add(this.label21, 0, 4); + this.tableLayoutPanel1.Controls.Add(this.label7, 1, 9); + this.tableLayoutPanel1.Controls.Add(this.label4, 0, 7); + this.tableLayoutPanel1.Controls.Add(this.label15, 0, 5); + this.tableLayoutPanel1.Controls.Add(this.label16, 1, 4); + this.tableLayoutPanel1.Controls.Add(this.label8, 1, 7); + this.tableLayoutPanel1.Controls.Add(this.label14, 1, 5); + this.tableLayoutPanel1.Controls.Add(this.label28, 1, 13); + this.tableLayoutPanel1.Controls.Add(this.label29, 1, 12); + this.tableLayoutPanel1.Controls.Add(this.label25, 0, 13); + this.tableLayoutPanel1.Controls.Add(this.label27, 1, 14); + this.tableLayoutPanel1.Controls.Add(this.label26, 0, 14); + this.tableLayoutPanel1.Controls.Add(this.label30, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.label31, 1, 0); + this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 31); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 15; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142857F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142857F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142857F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142857F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142857F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142857F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142857F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142857F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142857F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142857F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142857F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142857F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142857F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.142857F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(513, 299); + this.tableLayoutPanel1.TabIndex = 19; + // + // label30 + // + this.label30.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label30.AutoSize = true; + this.label30.Location = new System.Drawing.Point(3, 9); + this.label30.Name = "label30"; + this.label30.Size = new System.Drawing.Size(100, 13); + this.label30.TabIndex = 14; + this.label30.Text = "Hide DS4 Controller"; + // + // label31 + // + this.label31.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label31.AutoSize = true; + this.label31.Location = new System.Drawing.Point(193, 3); + this.label31.Name = "label31"; + this.label31.Size = new System.Drawing.Size(292, 26); + this.label31.TabIndex = 14; + this.label31.Text = "Hides the DS4\'s regular input (Dinput) from other progrmas\r\nIf you are getting do" + + "uble input in Steam or games, check this"; // // Hotkeys // @@ -504,7 +529,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.button1; - this.ClientSize = new System.Drawing.Size(520, 426); + this.ClientSize = new System.Drawing.Size(520, 413); this.Controls.Add(this.lLBUpdate); this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.linkJhebbel); @@ -531,18 +556,7 @@ #endregion - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.Label label8; private System.Windows.Forms.Button button1; - private System.Windows.Forms.Label label9; - private System.Windows.Forms.Label label10; - private System.Windows.Forms.Label label13; - private System.Windows.Forms.Label label14; - private System.Windows.Forms.Label label15; private System.Windows.Forms.LinkLabel linkProfiles; private System.Windows.Forms.LinkLabel linkElectro; private System.Windows.Forms.LinkLabel linkJays2Kings; @@ -551,24 +565,37 @@ private System.Windows.Forms.LinkLabel linkInhexSTER; private System.Windows.Forms.LinkLabel linkJhebbel; private System.Windows.Forms.LinkLabel linkUninstall; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private System.Windows.Forms.Label label21; - private System.Windows.Forms.Label label16; - private System.Windows.Forms.Label label19; - private System.Windows.Forms.Label label12; - private System.Windows.Forms.Label label18; - private System.Windows.Forms.Label label17; - private System.Windows.Forms.Label label11; - private System.Windows.Forms.Label label20; - private System.Windows.Forms.Label label22; private System.Windows.Forms.Label label23; - private System.Windows.Forms.Label label24; - private System.Windows.Forms.Label label25; + private System.Windows.Forms.LinkLabel lLBUpdate; private System.Windows.Forms.Label label26; private System.Windows.Forms.Label label27; - private System.Windows.Forms.Label label28; + private System.Windows.Forms.Label label25; private System.Windows.Forms.Label label29; - private System.Windows.Forms.LinkLabel lLBUpdate; + private System.Windows.Forms.Label label28; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.Label label16; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label21; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label12; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.Label label19; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.Label label18; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label17; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label22; + private System.Windows.Forms.Label label20; + private System.Windows.Forms.Label label24; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + private System.Windows.Forms.Label label30; + private System.Windows.Forms.Label label31; } } \ No newline at end of file diff --git a/DS4Tool/ScpForm.Designer.cs b/DS4Tool/ScpForm.Designer.cs index 2d5cefd..ef0f82d 100644 --- a/DS4Tool/ScpForm.Designer.cs +++ b/DS4Tool/ScpForm.Designer.cs @@ -92,7 +92,6 @@ this.tSBExportProfile = new System.Windows.Forms.ToolStripButton(); this.lBProfiles = new System.Windows.Forms.ListBox(); this.cMProfile = new System.Windows.Forms.ContextMenuStrip(this.components); - this.newProfileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.assignToController1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.assignToController2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -100,6 +99,7 @@ this.assignToController4ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.duplicateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.newProfileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.importToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tabLog = new System.Windows.Forms.TabPage(); @@ -390,7 +390,7 @@ this.tLPControllers.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 23.34039F)); this.tLPControllers.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25.31077F)); this.tLPControllers.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 117F)); - this.tLPControllers.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 45F)); + this.tLPControllers.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 48F)); this.tLPControllers.Controls.Add(this.pBStatus1, 1, 1); this.tLPControllers.Controls.Add(this.lbPad1, 0, 1); this.tLPControllers.Controls.Add(this.lbPad2, 0, 2); @@ -432,7 +432,7 @@ this.pBStatus1.Anchor = System.Windows.Forms.AnchorStyles.None; this.pBStatus1.Image = ((System.Drawing.Image)(resources.GetObject("pBStatus1.Image"))); this.pBStatus1.InitialImage = global::ScpServer.Properties.Resources.BT; - this.pBStatus1.Location = new System.Drawing.Point(373, 19); + this.pBStatus1.Location = new System.Drawing.Point(370, 19); this.pBStatus1.Name = "pBStatus1"; this.pBStatus1.Size = new System.Drawing.Size(39, 20); this.pBStatus1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; @@ -464,7 +464,7 @@ // bnEditC3 // this.bnEditC3.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.bnEditC3.Location = new System.Drawing.Point(742, 76); + this.bnEditC3.Location = new System.Drawing.Point(739, 76); this.bnEditC3.Name = "bnEditC3"; this.bnEditC3.Size = new System.Drawing.Size(40, 23); this.bnEditC3.TabIndex = 43; @@ -476,7 +476,7 @@ // bnEditC4 // this.bnEditC4.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.bnEditC4.Location = new System.Drawing.Point(742, 105); + this.bnEditC4.Location = new System.Drawing.Point(739, 105); this.bnEditC4.Name = "bnEditC4"; this.bnEditC4.Size = new System.Drawing.Size(40, 23); this.bnEditC4.TabIndex = 43; @@ -511,7 +511,7 @@ // this.cBController1.Anchor = System.Windows.Forms.AnchorStyles.Left; this.cBController1.FormattingEnabled = true; - this.cBController1.Location = new System.Drawing.Point(625, 19); + this.cBController1.Location = new System.Drawing.Point(622, 19); this.cBController1.Name = "cBController1"; this.cBController1.Size = new System.Drawing.Size(111, 21); this.cBController1.TabIndex = 42; @@ -521,7 +521,7 @@ // bnEditC2 // this.bnEditC2.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.bnEditC2.Location = new System.Drawing.Point(742, 47); + this.bnEditC2.Location = new System.Drawing.Point(739, 47); this.bnEditC2.Name = "bnEditC2"; this.bnEditC2.Size = new System.Drawing.Size(40, 23); this.bnEditC2.TabIndex = 43; @@ -534,7 +534,7 @@ // this.cBController2.Anchor = System.Windows.Forms.AnchorStyles.Left; this.cBController2.FormattingEnabled = true; - this.cBController2.Location = new System.Drawing.Point(625, 48); + this.cBController2.Location = new System.Drawing.Point(622, 48); this.cBController2.Name = "cBController2"; this.cBController2.Size = new System.Drawing.Size(111, 21); this.cBController2.TabIndex = 42; @@ -545,7 +545,7 @@ // this.cBController3.Anchor = System.Windows.Forms.AnchorStyles.Left; this.cBController3.FormattingEnabled = true; - this.cBController3.Location = new System.Drawing.Point(625, 77); + this.cBController3.Location = new System.Drawing.Point(622, 77); this.cBController3.Name = "cBController3"; this.cBController3.Size = new System.Drawing.Size(111, 21); this.cBController3.TabIndex = 42; @@ -555,7 +555,7 @@ // bnEditC1 // this.bnEditC1.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.bnEditC1.Location = new System.Drawing.Point(742, 18); + this.bnEditC1.Location = new System.Drawing.Point(739, 18); this.bnEditC1.Name = "bnEditC1"; this.bnEditC1.Size = new System.Drawing.Size(40, 23); this.bnEditC1.TabIndex = 43; @@ -568,7 +568,7 @@ // this.cBController4.Anchor = System.Windows.Forms.AnchorStyles.Left; this.cBController4.FormattingEnabled = true; - this.cBController4.Location = new System.Drawing.Point(625, 106); + this.cBController4.Location = new System.Drawing.Point(622, 106); this.cBController4.Name = "cBController4"; this.cBController4.Size = new System.Drawing.Size(111, 21); this.cBController4.TabIndex = 42; @@ -580,7 +580,7 @@ this.label2.Anchor = System.Windows.Forms.AnchorStyles.None; this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(626, 0); + this.label2.Location = new System.Drawing.Point(623, 0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(109, 15); this.label2.TabIndex = 45; @@ -588,6 +588,7 @@ // // label3 // + this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label3.AutoSize = true; this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label3.Location = new System.Drawing.Point(3, 0); @@ -601,7 +602,7 @@ this.label4.Anchor = System.Windows.Forms.AnchorStyles.None; this.label4.AutoSize = true; this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label4.Location = new System.Drawing.Point(369, 0); + this.label4.Location = new System.Drawing.Point(366, 0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(47, 15); this.label4.TabIndex = 45; @@ -612,7 +613,7 @@ this.label5.Anchor = System.Windows.Forms.AnchorStyles.None; this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label5.Location = new System.Drawing.Point(518, 0); + this.label5.Location = new System.Drawing.Point(515, 0); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(51, 15); this.label5.TabIndex = 45; @@ -623,7 +624,7 @@ this.lBBatt1.Anchor = System.Windows.Forms.AnchorStyles.None; this.lBBatt1.AutoSize = true; this.lBBatt1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lBBatt1.Location = new System.Drawing.Point(524, 22); + this.lBBatt1.Location = new System.Drawing.Point(521, 22); this.lBBatt1.Name = "lBBatt1"; this.lBBatt1.Size = new System.Drawing.Size(39, 15); this.lBBatt1.TabIndex = 44; @@ -634,7 +635,7 @@ this.lBBatt2.Anchor = System.Windows.Forms.AnchorStyles.None; this.lBBatt2.AutoSize = true; this.lBBatt2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lBBatt2.Location = new System.Drawing.Point(524, 51); + this.lBBatt2.Location = new System.Drawing.Point(521, 51); this.lBBatt2.Name = "lBBatt2"; this.lBBatt2.Size = new System.Drawing.Size(39, 15); this.lBBatt2.TabIndex = 44; @@ -645,7 +646,7 @@ this.lBBatt3.Anchor = System.Windows.Forms.AnchorStyles.None; this.lBBatt3.AutoSize = true; this.lBBatt3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lBBatt3.Location = new System.Drawing.Point(524, 80); + this.lBBatt3.Location = new System.Drawing.Point(521, 80); this.lBBatt3.Name = "lBBatt3"; this.lBBatt3.Size = new System.Drawing.Size(39, 15); this.lBBatt3.TabIndex = 44; @@ -656,7 +657,7 @@ this.lBBatt4.Anchor = System.Windows.Forms.AnchorStyles.None; this.lBBatt4.AutoSize = true; this.lBBatt4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lBBatt4.Location = new System.Drawing.Point(524, 109); + this.lBBatt4.Location = new System.Drawing.Point(521, 109); this.lBBatt4.Name = "lBBatt4"; this.lBBatt4.Size = new System.Drawing.Size(39, 15); this.lBBatt4.TabIndex = 44; @@ -667,7 +668,7 @@ this.pBStatus2.Anchor = System.Windows.Forms.AnchorStyles.None; this.pBStatus2.Image = ((System.Drawing.Image)(resources.GetObject("pBStatus2.Image"))); this.pBStatus2.InitialImage = global::ScpServer.Properties.Resources.BT; - this.pBStatus2.Location = new System.Drawing.Point(373, 48); + this.pBStatus2.Location = new System.Drawing.Point(370, 48); this.pBStatus2.Name = "pBStatus2"; this.pBStatus2.Size = new System.Drawing.Size(39, 20); this.pBStatus2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; @@ -679,7 +680,7 @@ this.pBStatus3.Anchor = System.Windows.Forms.AnchorStyles.None; this.pBStatus3.Image = ((System.Drawing.Image)(resources.GetObject("pBStatus3.Image"))); this.pBStatus3.InitialImage = global::ScpServer.Properties.Resources.BT; - this.pBStatus3.Location = new System.Drawing.Point(373, 77); + this.pBStatus3.Location = new System.Drawing.Point(370, 77); this.pBStatus3.Name = "pBStatus3"; this.pBStatus3.Size = new System.Drawing.Size(39, 20); this.pBStatus3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; @@ -691,7 +692,7 @@ this.pBStatus4.Anchor = System.Windows.Forms.AnchorStyles.None; this.pBStatus4.Image = ((System.Drawing.Image)(resources.GetObject("pBStatus4.Image"))); this.pBStatus4.InitialImage = global::ScpServer.Properties.Resources.BT; - this.pBStatus4.Location = new System.Drawing.Point(373, 106); + this.pBStatus4.Location = new System.Drawing.Point(370, 106); this.pBStatus4.Name = "pBStatus4"; this.pBStatus4.Size = new System.Drawing.Size(39, 20); this.pBStatus4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; @@ -805,7 +806,6 @@ this.lBProfiles.Name = "lBProfiles"; this.lBProfiles.Size = new System.Drawing.Size(780, 272); this.lBProfiles.TabIndex = 0; - this.lBProfiles.MouseClick += new System.Windows.Forms.MouseEventHandler(this.lBProfiles_MouseClick); this.lBProfiles.KeyDown += new System.Windows.Forms.KeyEventHandler(this.lBProfiles_KeyDown); this.lBProfiles.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.lBProfiles_MouseDoubleClick); this.lBProfiles.MouseDown += new System.Windows.Forms.MouseEventHandler(this.lBProfiles_MouseDown); @@ -813,7 +813,6 @@ // cMProfile // this.cMProfile.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.newProfileToolStripMenuItem, this.editToolStripMenuItem, this.assignToController1ToolStripMenuItem, this.assignToController2ToolStripMenuItem, @@ -821,18 +820,11 @@ this.assignToController4ToolStripMenuItem, this.deleteToolStripMenuItem, this.duplicateToolStripMenuItem, + this.newProfileToolStripMenuItem, this.importToolStripMenuItem, this.exportToolStripMenuItem}); this.cMProfile.Name = "cMProfile"; - this.cMProfile.ShowImageMargin = false; - this.cMProfile.Size = new System.Drawing.Size(164, 246); - // - // newProfileToolStripMenuItem - // - this.newProfileToolStripMenuItem.Name = "newProfileToolStripMenuItem"; - this.newProfileToolStripMenuItem.Size = new System.Drawing.Size(188, 22); - this.newProfileToolStripMenuItem.Text = "New Profile"; - this.newProfileToolStripMenuItem.Click += new System.EventHandler(this.tsBNewProfile_Click); + this.cMProfile.Size = new System.Drawing.Size(189, 246); // // editToolStripMenuItem // @@ -882,7 +874,14 @@ this.duplicateToolStripMenuItem.Name = "duplicateToolStripMenuItem"; this.duplicateToolStripMenuItem.Size = new System.Drawing.Size(188, 22); this.duplicateToolStripMenuItem.Text = "Duplicate (Ctrl+C)"; - this.duplicateToolStripMenuItem.Click += new System.EventHandler(this.tsBDeleteProfle_Click); + this.duplicateToolStripMenuItem.Click += new System.EventHandler(this.tSBDupProfile_Click); + // + // newProfileToolStripMenuItem + // + this.newProfileToolStripMenuItem.Name = "newProfileToolStripMenuItem"; + this.newProfileToolStripMenuItem.Size = new System.Drawing.Size(188, 22); + this.newProfileToolStripMenuItem.Text = "New Profile"; + this.newProfileToolStripMenuItem.Click += new System.EventHandler(this.tsBNewProfile_Click); // // importToolStripMenuItem // @@ -925,6 +924,7 @@ // // ScpForm // + this.AllowDrop = true; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.White; @@ -936,6 +936,8 @@ this.Text = "DS4Windows 1.0 Beta J2K Build"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form_Close); this.Load += new System.EventHandler(this.Form_Load); + this.DragDrop += new System.Windows.Forms.DragEventHandler(this.ScpForm_DragDrop); + this.DragEnter += new System.Windows.Forms.DragEventHandler(this.ScpForm_DragEnter); this.Resize += new System.EventHandler(this.Form_Resize); this.pnlButton.ResumeLayout(false); this.pnlButton.PerformLayout(); diff --git a/DS4Tool/ScpForm.cs b/DS4Tool/ScpForm.cs index 4856ebf..4f40dec 100644 --- a/DS4Tool/ScpForm.cs +++ b/DS4Tool/ScpForm.cs @@ -15,7 +15,7 @@ namespace ScpServer { public partial class ScpForm : Form { - double version = 9.15; + double version = 9.2; private DS4Control.Control rootHub; delegate void LogDebugDelegate(DateTime Time, String Data); @@ -25,7 +25,7 @@ namespace ScpServer protected PictureBox[] statPB; protected ToolStripMenuItem[] shortcuts; WebClient wc = new WebClient(); - Timer test = new Timer(), processcheck = new Timer(); + Timer test = new Timer(), hotkeystimer = new Timer(); #region Aero /*[StructLayout(LayoutKind.Sequential)] public struct MARGINS @@ -102,8 +102,6 @@ namespace ScpServer ThemeUtil.SetTheme(lvDebug); SetupArrays(); - foreach (ToolStripMenuItem t in shortcuts) - t.DropDownItemClicked += Profile_Changed_Menu; CheckDrivers(); } @@ -119,6 +117,9 @@ namespace ScpServer Global.Load(); Global.setVersion(version); Global.Save(); + + foreach (ToolStripMenuItem t in shortcuts) + t.DropDownItemClicked += Profile_Changed_Menu; hideDS4CheckBox.CheckedChanged -= hideDS4CheckBox_CheckedChanged; hideDS4CheckBox.Checked = Global.getUseExclusiveMode(); hideDS4CheckBox.CheckedChanged += hideDS4CheckBox_CheckedChanged; @@ -162,14 +163,30 @@ namespace ScpServer WP.Enabled = false; tabAutoProfiles.Controls.Add(WP); //test.Start(); - //processcheck.Start(); - processcheck.Tick += processcheck_Tick; + hotkeystimer.Start(); + hotkeystimer.Tick += Hotkeys; test.Tick += test_Tick; } - void processcheck_Tick(object sender, EventArgs e) + + void Hotkeys(object sender, EventArgs e) { - //Process[] processes = Process.GetProcessesByName(""); + for (int i = 0; i < 4; i++) + { + string slide = rootHub.TouchpadSlide(i); + if (slide == "left") + if (cbs[i].SelectedIndex <= 0) + cbs[i].SelectedIndex = cbs[i].Items.Count - 2; + else + cbs[i].SelectedIndex--; + else if (slide == "right") + if (cbs[i].SelectedIndex == cbs[i].Items.Count - 2) + cbs[i].SelectedIndex = 0; + else + cbs[i].SelectedIndex++; + if (slide.Contains("t")) + ShowNotification(this, "Controller " + (i + 1) + " is now using Profile \"" + cbs[i].Text + "\""); + } } private void test_Tick(object sender, EventArgs e) @@ -303,9 +320,6 @@ namespace ScpServer shortcuts[i].Text = "Make Profile for Controller " + (i + 1); ebns[i].Text = "New"; } - cbs[i].Items.Add("+New Profile"); - shortcuts[i].DropDownItems.Add("-"); - shortcuts[i].DropDownItems.Add("+New Profile"); } } catch (DirectoryNotFoundException) @@ -318,6 +332,12 @@ namespace ScpServer cbs[i].Text = "(No Profile Loaded)"; shortcuts[i].Text = "Make Profile for Controller " + (i + 1); ebns[i].Text = "New"; + } + } + finally + { + for (int i = 0; i < 4; i++) + { cbs[i].Items.Add("+New Profile"); shortcuts[i].DropDownItems.Add("-"); shortcuts[i].DropDownItems.Add("+New Profile"); @@ -401,7 +421,7 @@ namespace ScpServer } else if (btnStartStop.Text == "Stop") - { + { rootHub.Stop(); btnStartStop.Text = "Start"; } @@ -460,18 +480,12 @@ namespace ScpServer { Enable_Controls(Index, true); MinimumSize = new Size(MinimumSize.Width, 161 + 29 * Index); - rootHub.DS4Controllers[Index].Report += ScpForm_Report; } } else { Pads[Index].Text = "Disconnected"; Enable_Controls(Index, false); - /*if (opt != null && opt.device == Index) - { - opt.Close(); - opt = null; - }*/ shortcuts[Index].Enabled = false; } if (rootHub.getShortDS4ControllerInfo(Index) != "None") @@ -499,27 +513,6 @@ namespace ScpServer Hotkeys(sender, e); } - void Hotkeys(object sender, EventArgs e) - { - //DS4Device device = (DS4Device)sender; - for (int i = 0; i < 4; i++) - { - string slide = rootHub.TouchpadSlide(0); - if (slide == "left") - if (cbs[i].SelectedIndex <= 0) - cbs[i].SelectedIndex = cbs[0].Items.Count - 2; - else - cbs[i].SelectedIndex--; - else if (slide == "right") - if (cbs[i].SelectedIndex == cbs[0].Items.Count - 2) - cbs[i].SelectedIndex = 0; - else - cbs[i].SelectedIndex++; - if (slide.Contains("t")) - ShowNotification(this, "Controller " + (i + 1) + " is now using Profile \"" + cbs[i].Text + "\""); - } - } - protected void On_Debug(object sender, DS4Control.DebugEventArgs e) { LogDebug(e.Time, e.Data); @@ -731,7 +724,7 @@ namespace ScpServer MessageBox.Show(((ListView)sender).FocusedItem.SubItems[1].Text, "Log"); } - private void Profile_Changed(object sender, EventArgs e) + private void Profile_Changed(object sender, EventArgs e) //cbs[i] changed { ComboBox cb = (ComboBox)sender; int tdevice = Int32.Parse(cb.Tag.ToString()); @@ -756,7 +749,7 @@ namespace ScpServer else ebns[tdevice].Text = "Edit"; } - ControllerStatusChanged(); + ControllerStatusChanged(); //to update profile name in notify icon } private void Profile_Changed_Menu(object sender, ToolStripItemClickedEventArgs e) @@ -765,20 +758,7 @@ namespace ScpServer int tdevice = Int32.Parse(tS.Tag.ToString()); if (!(e.ClickedItem is ToolStripSeparator)) if (e.ClickedItem != tS.DropDownItems[tS.DropDownItems.Count - 1]) //if +New Profile not selected - if (((ToolStripMenuItem)e.ClickedItem).Checked) - ShowOptions(tdevice, e.ClickedItem.Text); - else - { - for (int i = 0; i < tS.DropDownItems.Count; i++) - if (!(shortcuts[tdevice].DropDownItems[i] is ToolStripSeparator)) - ((ToolStripMenuItem)tS.DropDownItems[i]).Checked = false; - ((ToolStripMenuItem)e.ClickedItem).Checked = true; - shortcuts[tdevice].Text = "Edit Profile for Controller " + (tdevice + 1); - cbs[tdevice].SelectedIndex = tS.DropDownItems.IndexOf(e.ClickedItem); - Global.setAProfile(tdevice, e.ClickedItem.Text); - Global.Save(); - Global.LoadProfile(tdevice); - } + cbs[tdevice].SelectedIndex = tS.DropDownItems.IndexOf(e.ClickedItem); else //if +New Profile selected ShowOptions(tdevice, ""); } @@ -826,12 +806,6 @@ namespace ScpServer KeyLoc.DeleteValue("DS4Tool", false); } - private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - WinProgs WP = new WinProgs(profilenames.ToArray()); - WP.ShowDialog(); - } - private void tabMain_SelectedIndexChanged(object sender, EventArgs e) { lbLastMessage.Visible = tabMain.SelectedIndex != 2; @@ -853,6 +827,71 @@ namespace ScpServer } + private void lBProfiles_MouseDown(object sender, MouseEventArgs e) + { + lBProfiles.SelectedIndex = lBProfiles.IndexFromPoint(e.X, e.Y); + if (e.Button == System.Windows.Forms.MouseButtons.Right) + { + if (lBProfiles.SelectedIndex < 0) + { + cMProfile.ShowImageMargin = false; + assignToController1ToolStripMenuItem.Visible = false; + assignToController2ToolStripMenuItem.Visible = false; + assignToController3ToolStripMenuItem.Visible = false; + assignToController4ToolStripMenuItem.Visible = false; + deleteToolStripMenuItem.Visible = false; + editToolStripMenuItem.Visible = false; + duplicateToolStripMenuItem.Visible = false; + exportToolStripMenuItem.Visible = false; + } + else + { + cMProfile.ShowImageMargin = true; + assignToController1ToolStripMenuItem.Visible = true; + assignToController2ToolStripMenuItem.Visible = true; + assignToController3ToolStripMenuItem.Visible = true; + assignToController4ToolStripMenuItem.Visible = true; + ToolStripMenuItem[] assigns = { assignToController1ToolStripMenuItem, + assignToController2ToolStripMenuItem, + assignToController3ToolStripMenuItem, + assignToController4ToolStripMenuItem }; + for (int i = 0; i < 4; i++) + { + if (lBProfiles.SelectedIndex == cbs[i].SelectedIndex) + assigns[i].Checked = true; + else + assigns[i].Checked = false; + } + deleteToolStripMenuItem.Visible = true; + editToolStripMenuItem.Visible = true; + duplicateToolStripMenuItem.Visible = true; + exportToolStripMenuItem.Visible = true; + } + } + } + + private void ScpForm_DragDrop(object sender, DragEventArgs e) + { + bool therewasanxml = false; + string[] files = (string[])e.Data.GetData(DataFormats.FileDrop, false); + for (int i = 0; i < files.Length; i++) + if (files[i].EndsWith(".xml")) + { + File.Copy(files[i], Global.appdatapath + "\\Profiles\\" + Path.GetFileName(files[i]), true); + therewasanxml = true; + } + if (therewasanxml) + RefreshProfiles(); + } + + private void ScpForm_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(DataFormats.FileDrop)) + e.Effect = DragDropEffects.Copy; // Okay + else + e.Effect = DragDropEffects.None; // Unknown data, ignore it + } + protected void Form_Close(object sender, FormClosingEventArgs e) { if (oldsize == new System.Drawing.Size(0, 0)) @@ -868,45 +907,6 @@ namespace ScpServer Global.Save(); rootHub.Stop(); } - - private void lBProfiles_MouseClick(object sender, MouseEventArgs e) - { - //lBProfiles.SelectedIndex = lBProfiles.IndexFromPoint(e.X, e.Y); - //if (e.Button == System.Windows.Forms.MouseButtons.Right) - { - // - } - } - - private void lBProfiles_MouseDown(object sender, MouseEventArgs e) - { - lBProfiles.SelectedIndex = lBProfiles.IndexFromPoint(e.X, e.Y); - if (e.Button == System.Windows.Forms.MouseButtons.Right) - { - if (lBProfiles.SelectedIndex < 0) - { - assignToController1ToolStripMenuItem.Visible = false; - assignToController2ToolStripMenuItem.Visible = false; - assignToController3ToolStripMenuItem.Visible = false; - assignToController4ToolStripMenuItem.Visible = false; - deleteToolStripMenuItem.Visible = false; - editToolStripMenuItem.Visible = false; - duplicateToolStripMenuItem.Visible = false; - exportToolStripMenuItem.Visible = false; - } - else - { - assignToController1ToolStripMenuItem.Visible = true; - assignToController2ToolStripMenuItem.Visible = true; - assignToController3ToolStripMenuItem.Visible = true; - assignToController4ToolStripMenuItem.Visible = true; - deleteToolStripMenuItem.Visible = true; - editToolStripMenuItem.Visible = true; - duplicateToolStripMenuItem.Visible = true; - exportToolStripMenuItem.Visible = true; - } - } - } } public class ThemeUtil diff --git a/DS4Tool/ScpForm.resx b/DS4Tool/ScpForm.resx index 1861e27..fa8cd45 100644 --- a/DS4Tool/ScpForm.resx +++ b/DS4Tool/ScpForm.resx @@ -6302,12 +6302,6 @@ 449, 17 - - 568, 17 - - - 788, 17 - iVBORw0KGgoAAAANSUhEUgAAACcAAAAUCAYAAAAOTSQ2AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH @@ -6532,6 +6526,9 @@ 1WDefQHxFbbcLCQjmgAAAABJRU5ErkJggg== + + 568, 17 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -6567,6 +6564,9 @@ AABJRU5ErkJggg== + + 788, 17 + 673, 17