Version 1.4.0.55

Added start/stop to notification icon
Right click on the status icon in the main window to disconnect the
controller (BT only)
Rumble testing actually varies as the boost value changes (you won't
noticea  change with testing past 100%)
Better lightbar flashing, color has a better chance of changing back
after not flashing etc.
Moved source code to Github, the link is on the about page of DS4Windows
and my sig on pcsx2.net
Special feature (beta) for those who have a profile for Distance and use
the controller in X360 mode.
This commit is contained in:
jays2kings 2014-09-01 19:23:02 -04:00
parent 6694aba663
commit c0a2dccedf
12 changed files with 2882 additions and 2533 deletions

View File

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Drawing;
using DS4Library;
namespace DS4Control
{
@ -128,9 +129,16 @@ namespace DS4Control
}
}
else if (shuttingdown)
color = new DS4Color { red = 0, green = 0, blue = 0};
color = new DS4Color { red = 0, green = 0, blue = 0 };
else
color = new DS4Color { red = 32, green = 64, blue = 64 };
Color dsc = Color.FromArgb(color.red, color.green, color.blue);
if (Global.getAProfile(deviceNum).ToLower().Contains("distance"))
{ //Thing I did for Distance
float rumble = device.LeftHeavySlowRumble / 2.55f;
if (device.LeftHeavySlowRumble > 50)
color = getTransitionedColor(color, rumble);
}
DS4HapticState haptics = new DS4HapticState
{
LightBarColor = color
@ -141,10 +149,15 @@ namespace DS4Control
{
int level = device.Battery / 10;
//if (level >= 10)
//level = 0; // all values of ~0% or >~100% are rendered the same
//level = 0; // all values of ~0% or >~100% are rendered the same
haptics.LightBarFlashDurationOn = BatteryIndicatorDurations[level, 0];
haptics.LightBarFlashDurationOff = BatteryIndicatorDurations[level, 1];
}
else if (Global.getAProfile(deviceNum).ToLower().Contains("distance") && device.LeftHeavySlowRumble > 155) //also part of Distance
{
haptics.LightBarFlashDurationOff = haptics.LightBarFlashDurationOn = (byte)((-device.LeftHeavySlowRumble + 265));
haptics.LightBarExplicitlyOff = true;
}
else
{
//haptics.LightBarFlashDurationOff = haptics.LightBarFlashDurationOn = 1;
@ -156,6 +169,10 @@ namespace DS4Control
{
haptics.LightBarExplicitlyOff = true;
}
if (device.LightBarOnDuration != haptics.LightBarFlashDurationOn && device.LightBarOnDuration != 1 && haptics.LightBarFlashDurationOn == 0)
haptics.LightBarFlashDurationOff = haptics.LightBarFlashDurationOn = 1;
if (device.LightBarOnDuration == 1)
System.Threading.Thread.Sleep(5);
device.pushHapticState(haptics);
}
public static bool defualtLight = false, shuttingdown = false;
@ -214,5 +231,32 @@ namespace DS4Control
else
return new DS4Color { red = 255, green = 0, blue = 0 };
}
public static DS4Color getTransitionedColor(DS4Color c1, double ratio)
{//;
//Color cs = Color.FromArgb(c1.red, c1.green, c1.blue);
DS4Color c2 = new DS4Color { red = 255, green = 0, blue = 0 };
c1.red = applyRatio(c1.red, c2.red, ratio);
c1.green = applyRatio(c1.green, c2.green, ratio);
c1.blue = applyRatio(c1.blue, c2.blue, ratio);
return c1;
}
private static byte applyRatio(byte b1, byte b2, double r)
{
if (r > 100)
r = 100;
else if (r < 0)
r = 0;
uint ratio = (uint)r;
if (b1 > b2)
{
ratio = 100 - (uint)r;
}
byte bmax = Math.Max(b1, b2);
byte bmin = Math.Min(b1, b2);
byte bdif = (byte)(bmax - bmin);
return (byte)(bmin + (bdif * ratio / 100));
}
}
}

View File

@ -632,8 +632,8 @@ namespace DS4Control
return (byte)(bmin + (bdif * ratio / 100));
}
public static DS4Color getTransitionedColor(DS4Color c1, DS4Color c2, double ratio)
{;
Color cs = Color.FromArgb(c1.red, c1.green, c1.blue);
{//;
//Color cs = Color.FromArgb(c1.red, c1.green, c1.blue);
c1.red = applyRatio(c1.red, c2.red, ratio);
c1.green = applyRatio(c1.green, c2.green, ratio);
c1.blue = applyRatio(c1.blue, c2.blue, ratio);

View File

@ -21,6 +21,20 @@ namespace DS4Library
public byte red;
public byte green;
public byte blue;
public override bool Equals(object obj)
{
if (obj is DS4Color)
{
DS4Color dsc = ((DS4Color)obj);
return (this.red == dsc.red && this.green == dsc.green && this.blue == dsc.blue);
}
else
return false;
}
public override string ToString()
{
return ("Red: " + red + " Green: " + green + " Blue: " + blue);
}
}
public enum ConnectionType : byte { BT, USB }; // Prioritize Bluetooth when both are connected.

View File

@ -32,7 +32,7 @@ namespace ScpServer
private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
System.Diagnostics.Process.Start("https://code.google.com/r/jays2kings-ds4tool/source/list?name=jay");
System.Diagnostics.Process.Start("https://github.com/Jays2Kings/DS4Windows");
}
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)

View File

@ -369,7 +369,4 @@ si vous observez des entrées doubles en plein jeu ou si R2 met le jeu en pause
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>691, 434</value>
</data>
<data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
</root>

View File

@ -151,15 +151,15 @@
<data name="&gt;&gt;label3.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;label20.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="lbAbout.Size" type="System.Drawing.Size, System.Drawing">
<value>515, 19</value>
</data>
<data name="&gt;&gt;label15.Name" xml:space="preserve">
<value>label15</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>520, 434</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="label4.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@ -173,13 +173,16 @@
<data name="lbAbout.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft Sans Serif, 8.25pt, style=Bold</value>
</data>
<data name="label10.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
<data name="lbAbout.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="label28.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Left</value>
</data>
<data name="label29.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="tableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 31</value>
</data>
@ -207,6 +210,9 @@
<data name="label16.Size" type="System.Drawing.Size, System.Drawing">
<value>70, 13</value>
</data>
<data name="label16.Text" xml:space="preserve">
<value>Upper Touch</value>
</data>
<data name="label11.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
</data>
@ -222,9 +228,6 @@
<data name="&gt;&gt;label15.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label5.Name" xml:space="preserve">
<value>label5</value>
</data>
<data name="label31.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -258,12 +261,6 @@
<data name="label12.Size" type="System.Drawing.Size, System.Drawing">
<value>56, 13</value>
</data>
<data name="&gt;&gt;label33.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="label23.Text" xml:space="preserve">
<value>*If enabled</value>
</data>
<data name="label26.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
</data>
@ -279,6 +276,9 @@
<data name="&gt;&gt;label10.Name" xml:space="preserve">
<value>label10</value>
</data>
<data name="label15.Size" type="System.Drawing.Size, System.Drawing">
<value>176, 13</value>
</data>
<data name="label28.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -309,9 +309,6 @@
<data name="&gt;&gt;linkJhebbel.Type" xml:space="preserve">
<value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="label8.Location" type="System.Drawing.Point, System.Drawing">
<value>193, 146</value>
</data>
<data name="linkJhebbel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -321,20 +318,23 @@
<data name="label22.Text" xml:space="preserve">
<value>Cycle through profiles</value>
</data>
<data name="label10.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
</data>
<data name="&gt;&gt;label26.Name" xml:space="preserve">
<value>label26</value>
</data>
<data name="label19.Size" type="System.Drawing.Size, System.Drawing">
<value>146, 13</value>
</data>
<data name="&gt;&gt;linkDonate.Name" xml:space="preserve">
<value>linkDonate</value>
</data>
<data name="&gt;&gt;label29.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="label24.Text" xml:space="preserve">
<value>Toggle</value>
<data name="label10.Size" type="System.Drawing.Size, System.Drawing">
<value>175, 13</value>
</data>
<data name="&gt;&gt;label21.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label7.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@ -345,12 +345,12 @@
<data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
<value>19</value>
</data>
<data name="label7.Location" type="System.Drawing.Point, System.Drawing">
<value>193, 184</value>
</data>
<data name="&gt;&gt;label7.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;linkElectro.Name" xml:space="preserve">
<value>linkElectro</value>
</data>
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -378,15 +378,9 @@
<data name="linkJays2Kings.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left</value>
</data>
<data name="label23.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
<value>8</value>
</data>
<data name="label10.Size" type="System.Drawing.Size, System.Drawing">
<value>175, 13</value>
</data>
<data name="label11.Location" type="System.Drawing.Point, System.Drawing">
<value>193, 51</value>
</data>
@ -462,9 +456,6 @@
<data name="linkInhexSTER.TabIndex" type="System.Int32, mscorlib">
<value>18</value>
</data>
<data name="&gt;&gt;label30.Name" xml:space="preserve">
<value>label30</value>
</data>
<data name="label9.Location" type="System.Drawing.Point, System.Drawing">
<value>193, 165</value>
</data>
@ -480,9 +471,6 @@
<data name="label15.TabIndex" type="System.Int32, mscorlib">
<value>15</value>
</data>
<data name="&gt;&gt;label30.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="label29.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
</data>
@ -525,9 +513,6 @@
<data name="&gt;&gt;label14.ZOrder" xml:space="preserve">
<value>19</value>
</data>
<data name="label12.Text" xml:space="preserve">
<value>Multitouch</value>
</data>
<data name="linkDonate.Size" type="System.Drawing.Size, System.Drawing">
<value>94, 13</value>
</data>
@ -543,18 +528,15 @@
<data name="&gt;&gt;linkElectro.Type" xml:space="preserve">
<value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="label24.Size" type="System.Drawing.Size, System.Drawing">
<value>40, 13</value>
</data>
<data name="label30.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Left</value>
</data>
<data name="&gt;&gt;label27.ZOrder" xml:space="preserve">
<value>29</value>
<data name="linkDonate.Text" xml:space="preserve">
<value>Donate via Paypal</value>
</data>
<data name="linkDonate.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label14.TabIndex" type="System.Int32, mscorlib">
<value>16</value>
</data>
<data name="label33.Size" type="System.Drawing.Size, System.Drawing">
<value>216, 13</value>
</data>
@ -594,9 +576,6 @@
<data name="&gt;&gt;label9.Name" xml:space="preserve">
<value>label9</value>
</data>
<data name="&gt;&gt;linkElectro.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;label18.Name" xml:space="preserve">
<value>label18</value>
</data>
@ -618,8 +597,8 @@
<data name="label25.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="&gt;&gt;label7.Name" xml:space="preserve">
<value>label7</value>
<data name="label23.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="label25.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
@ -633,8 +612,8 @@
<data name="label4.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="&gt;&gt;linkInhexSTER.Parent" xml:space="preserve">
<value>$this</value>
<data name="&gt;&gt;label7.Name" xml:space="preserve">
<value>label7</value>
</data>
<data name="label1.Text" xml:space="preserve">
<value>Touch Touchpad + PS</value>
@ -645,9 +624,6 @@
<data name="label6.Size" type="System.Drawing.Size, System.Drawing">
<value>59, 13</value>
</data>
<data name="lLChangelog.TabIndex" type="System.Int32, mscorlib">
<value>20</value>
</data>
<data name="&gt;&gt;label6.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
@ -657,9 +633,6 @@
<data name="&gt;&gt;label13.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="label23.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="&gt;&gt;label32.ZOrder" xml:space="preserve">
<value>22</value>
</data>
@ -684,6 +657,9 @@
<data name="label30.Size" type="System.Drawing.Size, System.Drawing">
<value>100, 13</value>
</data>
<data name="&gt;&gt;linkInhexSTER.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="label27.Location" type="System.Drawing.Point, System.Drawing">
<value>193, 263</value>
</data>
@ -693,12 +669,15 @@
<data name="label32.Size" type="System.Drawing.Size, System.Drawing">
<value>66, 13</value>
</data>
<data name="linkDonate.Text" xml:space="preserve">
<value>Donate via Paypal</value>
<data name="&gt;&gt;lLChangelog.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="label32.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 225</value>
</data>
<data name="label16.Location" type="System.Drawing.Point, System.Drawing">
<value>193, 89</value>
</data>
<data name="label26.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 301</value>
</data>
@ -753,8 +732,8 @@
<data name="label21.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="&gt;&gt;label20.ZOrder" xml:space="preserve">
<value>0</value>
<data name="label23.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label19.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
@ -777,9 +756,6 @@
<data name="&gt;&gt;tableLayoutPanel1.Name" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="button1.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
<data name="&gt;&gt;linkElectro.ZOrder" xml:space="preserve">
<value>6</value>
</data>
@ -846,12 +822,18 @@
<data name="&gt;&gt;tableLayoutPanel1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;label1.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="label15.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label5.Size" type="System.Drawing.Size, System.Drawing">
<value>237, 13</value>
</data>
<data name="&gt;&gt;tableLayoutPanel1.Type" xml:space="preserve">
<value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label2.Parent" xml:space="preserve">
<value>$this</value>
</data>
@ -864,8 +846,8 @@
<data name="label23.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 352</value>
</data>
<data name="&gt;&gt;button1.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="&gt;&gt;label27.ZOrder" xml:space="preserve">
<value>29</value>
</data>
<data name="&gt;&gt;label2.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@ -876,30 +858,39 @@
<data name="label8.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
</data>
<data name="label14.Text" xml:space="preserve">
<value>Disconnect Controller (Only on Bluetooth)</value>
</data>
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 127</value>
</data>
<data name="lLChangelog.Size" type="System.Drawing.Size, System.Drawing">
<value>58, 13</value>
</data>
<data name="label29.Location" type="System.Drawing.Point, System.Drawing">
<value>193, 301</value>
</data>
<data name="&gt;&gt;lbAbout.Name" xml:space="preserve">
<value>lbAbout</value>
</data>
<data name="&gt;&gt;label4.Name" xml:space="preserve">
<value>label4</value>
</data>
<data name="label26.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Left</value>
</data>
<data name="&gt;&gt;label12.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="label9.Size" type="System.Drawing.Size, System.Drawing">
<value>83, 13</value>
</data>
<data name="&gt;&gt;label19.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="label31.Size" type="System.Drawing.Size, System.Drawing">
<value>324, 26</value>
</data>
<data name="label30.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 9</value>
</data>
<data name="label3.Text" xml:space="preserve">
<value>Tap then hold touchpad*</value>
</data>
@ -909,8 +900,8 @@
<data name="&gt;&gt;linkInhexSTER.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>Hotkeys</value>
<data name="&gt;&gt;label30.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;lLChangelog.Parent" xml:space="preserve">
<value>$this</value>
@ -924,8 +915,8 @@
<data name="label30.Text" xml:space="preserve">
<value>Hide DS4 Controller</value>
</data>
<data name="label16.Location" type="System.Drawing.Point, System.Drawing">
<value>193, 89</value>
<data name="label24.Text" xml:space="preserve">
<value>Toggle</value>
</data>
<data name="&gt;&gt;linkInhexSTER.Name" xml:space="preserve">
<value>linkInhexSTER</value>
@ -933,8 +924,8 @@
<data name="label17.Text" xml:space="preserve">
<value>Click left side of touchpad</value>
</data>
<data name="&gt;&gt;lLChangelog.ZOrder" xml:space="preserve">
<value>1</value>
<data name="label5.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="label13.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -957,9 +948,6 @@
<data name="label28.Size" type="System.Drawing.Size, System.Drawing">
<value>160, 13</value>
</data>
<data name="label5.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="&gt;&gt;label18.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
@ -978,9 +966,6 @@
<data name="label23.Size" type="System.Drawing.Size, System.Drawing">
<value>58, 13</value>
</data>
<data name="label20.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
</data>
<data name="&gt;&gt;label22.ZOrder" xml:space="preserve">
<value>1</value>
</data>
@ -990,12 +975,12 @@
<data name="linkJays2Kings.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
<value>12</value>
</data>
<data name="&gt;&gt;label32.Name" xml:space="preserve">
<value>label32</value>
</data>
<data name="&gt;&gt;label32.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="label6.Text" xml:space="preserve">
<value>Left Touch</value>
</data>
@ -1017,6 +1002,9 @@
<data name="&gt;&gt;label7.ZOrder" xml:space="preserve">
<value>14</value>
</data>
<data name="label24.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="&gt;&gt;label22.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
@ -1044,14 +1032,14 @@
<data name="linkJays2Kings.TabIndex" type="System.Int32, mscorlib">
<value>18</value>
</data>
<data name="lbAbout.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;label8.ZOrder" xml:space="preserve">
<value>18</value>
</data>
<data name="label14.Text" xml:space="preserve">
<value>Disconnect Controller (Only on Bluetooth)</value>
<data name="label8.Location" type="System.Drawing.Point, System.Drawing">
<value>193, 146</value>
</data>
<data name="&gt;&gt;button1.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label28.ZOrder" xml:space="preserve">
<value>28</value>
@ -1074,8 +1062,8 @@
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="&gt;&gt;tableLayoutPanel1.Type" xml:space="preserve">
<value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="&gt;&gt;linkDonate.Name" xml:space="preserve">
<value>linkDonate</value>
</data>
<data name="label10.Text" xml:space="preserve">
<value>Two fingers up/down on touchpad*</value>
@ -1086,8 +1074,8 @@
<data name="&gt;&gt;label32.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="label9.Size" type="System.Drawing.Size, System.Drawing">
<value>83, 13</value>
<data name="button1.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
<data name="linkJhebbel.Size" type="System.Drawing.Size, System.Drawing">
<value>87, 13</value>
@ -1119,14 +1107,14 @@
<data name="label31.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Left</value>
</data>
<data name="label20.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
</data>
<data name="linkElectro.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label14.TabIndex" type="System.Int32, mscorlib">
<value>16</value>
</data>
<data name="&gt;&gt;linkJays2Kings.Parent" xml:space="preserve">
<value>$this</value>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>Hotkeys</value>
</data>
<data name="label2.TabIndex" type="System.Int32, mscorlib">
<value>13</value>
@ -1146,23 +1134,29 @@
<data name="label17.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 32</value>
</data>
<data name="&gt;&gt;label1.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="lLChangelog.TabIndex" type="System.Int32, mscorlib">
<value>20</value>
</data>
<data name="label13.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>TopCenter</value>
</data>
<data name="&gt;&gt;linkDonate.Type" xml:space="preserve">
<value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="label9.Text" xml:space="preserve">
<value>Scroll Up/Down</value>
</data>
<data name="&gt;&gt;linkJays2Kings.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="label24.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>520, 434</value>
</data>
<data name="label29.Location" type="System.Drawing.Point, System.Drawing">
<value>193, 301</value>
<data name="&gt;&gt;label32.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="label9.Text" xml:space="preserve">
<value>Scroll Up/Down</value>
<data name="&gt;&gt;label4.Name" xml:space="preserve">
<value>label4</value>
</data>
<data name="label21.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
@ -1185,8 +1179,8 @@
<data name="$this.Text" xml:space="preserve">
<value>Help</value>
</data>
<data name="&gt;&gt;label21.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="label30.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Left</value>
</data>
<data name="label29.Size" type="System.Drawing.Size, System.Drawing">
<value>313, 13</value>
@ -1194,14 +1188,14 @@
<data name="linkInhexSTER.Location" type="System.Drawing.Point, System.Drawing">
<value>95, 382</value>
</data>
<data name="label27.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Left</value>
<data name="&gt;&gt;label5.Name" xml:space="preserve">
<value>label5</value>
</data>
<data name="label27.Text" xml:space="preserve">
<value>The key will remain in a "held down" state until pressed again</value>
</data>
<data name="label29.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
<data name="&gt;&gt;label33.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;label16.Name" xml:space="preserve">
<value>label16</value>
@ -1215,8 +1209,8 @@
<data name="label28.Text" xml:space="preserve">
<value>Assign multiple keys to one input</value>
</data>
<data name="label16.Text" xml:space="preserve">
<value>Upper Touch</value>
<data name="&gt;&gt;label30.Name" xml:space="preserve">
<value>label30</value>
</data>
<data name="label27.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -1239,8 +1233,8 @@
<data name="&gt;&gt;tableLayoutPanel1.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="label13.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>TopCenter</value>
<data name="label23.Text" xml:space="preserve">
<value>*If enabled</value>
</data>
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>513, 318</value>
@ -1251,11 +1245,14 @@
<data name="label22.Location" type="System.Drawing.Point, System.Drawing">
<value>193, 203</value>
</data>
<data name="label27.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Left</value>
</data>
<data name="button1.Text" xml:space="preserve">
<value>Done</value>
</data>
<data name="label15.Size" type="System.Drawing.Size, System.Drawing">
<value>176, 13</value>
<data name="label12.Text" xml:space="preserve">
<value>Multitouch</value>
</data>
<data name="lbAbout.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>TopCenter</value>
@ -1275,8 +1272,8 @@
<data name="label15.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 108</value>
</data>
<data name="&gt;&gt;linkElectro.Name" xml:space="preserve">
<value>linkElectro</value>
<data name="label7.Location" type="System.Drawing.Point, System.Drawing">
<value>193, 184</value>
</data>
<data name="label26.Text" xml:space="preserve">
<value>Scan Code</value>
@ -1290,12 +1287,15 @@
<data name="&gt;&gt;lbAbout.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
<value>12</value>
<data name="label24.Size" type="System.Drawing.Size, System.Drawing">
<value>40, 13</value>
</data>
<data name="&gt;&gt;lLChangelog.Name" xml:space="preserve">
<value>lLChangelog</value>
</data>
<data name="&gt;&gt;label14.Name" xml:space="preserve">
<value>label14</value>
</data>
<data name="label12.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -1315,8 +1315,8 @@ check if you are getting double input in games or R2 pauses games</value>
<data name="label30.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label30.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 9</value>
<data name="&gt;&gt;linkJays2Kings.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="label24.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 263</value>
@ -1324,13 +1324,10 @@ check if you are getting double input in games or R2 pauses games</value>
<data name="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="&gt;&gt;label14.Name" xml:space="preserve">
<value>label14</value>
<data name="&gt;&gt;linkElectro.Parent" xml:space="preserve">
<value>$this</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>fr-FR</value>
</metadata>
</root>

View File

@ -724,7 +724,7 @@ namespace ScpServer
{
if (((Button)sender).Text == Properties.Resources.TestText)
{
scpDevice.setRumble(255, 255, (int)nUDSixaxis.Value - 1);
scpDevice.setRumble((byte)Math.Min(255, (255 * nUDRumbleBoost.Value / 100)), (byte)Math.Min(255, (255 * nUDRumbleBoost.Value / 100)), (int)nUDSixaxis.Value - 1);
((Button)sender).Text = Properties.Resources.StopText;
}
else

View File

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

View File

@ -47,6 +47,7 @@
this.editProfileForController3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.editProfileForController4ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.startToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
@ -148,10 +149,10 @@
//
// lvDebug
//
resources.ApplyResources(this.lvDebug, "lvDebug");
this.lvDebug.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.chTime,
this.chData});
resources.ApplyResources(this.lvDebug, "lvDebug");
this.lvDebug.FullRowSelect = true;
this.lvDebug.Name = "lvDebug";
this.lvDebug.UseCompatibleStateImageBehavior = false;
@ -173,12 +174,12 @@
//
// pnlButton
//
resources.ApplyResources(this.pnlButton, "pnlButton");
this.pnlButton.BackColor = System.Drawing.SystemColors.Control;
this.pnlButton.Controls.Add(this.lBTest);
this.pnlButton.Controls.Add(this.btnStartStop);
this.pnlButton.Controls.Add(this.lbLastMessage);
this.pnlButton.Controls.Add(this.llbHelp);
resources.ApplyResources(this.pnlButton, "pnlButton");
this.pnlButton.Name = "pnlButton";
//
// lBTest
@ -223,50 +224,57 @@
//
// cMTaskbar
//
resources.ApplyResources(this.cMTaskbar, "cMTaskbar");
this.cMTaskbar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.editProfileForController1ToolStripMenuItem,
this.editProfileForController2ToolStripMenuItem,
this.editProfileForController3ToolStripMenuItem,
this.editProfileForController4ToolStripMenuItem,
this.toolStripSeparator1,
this.startToolStripMenuItem,
this.openToolStripMenuItem,
this.exitToolStripMenuItem});
this.cMTaskbar.Name = "cMTaskbar";
resources.ApplyResources(this.cMTaskbar, "cMTaskbar");
this.cMTaskbar.Tag = "25";
//
// editProfileForController1ToolStripMenuItem
//
resources.ApplyResources(this.editProfileForController1ToolStripMenuItem, "editProfileForController1ToolStripMenuItem");
this.editProfileForController1ToolStripMenuItem.Name = "editProfileForController1ToolStripMenuItem";
resources.ApplyResources(this.editProfileForController1ToolStripMenuItem, "editProfileForController1ToolStripMenuItem");
this.editProfileForController1ToolStripMenuItem.Tag = "0";
this.editProfileForController1ToolStripMenuItem.Click += new System.EventHandler(this.editMenu_Click);
//
// editProfileForController2ToolStripMenuItem
//
resources.ApplyResources(this.editProfileForController2ToolStripMenuItem, "editProfileForController2ToolStripMenuItem");
this.editProfileForController2ToolStripMenuItem.Name = "editProfileForController2ToolStripMenuItem";
resources.ApplyResources(this.editProfileForController2ToolStripMenuItem, "editProfileForController2ToolStripMenuItem");
this.editProfileForController2ToolStripMenuItem.Tag = "1";
this.editProfileForController2ToolStripMenuItem.Click += new System.EventHandler(this.editMenu_Click);
//
// editProfileForController3ToolStripMenuItem
//
resources.ApplyResources(this.editProfileForController3ToolStripMenuItem, "editProfileForController3ToolStripMenuItem");
this.editProfileForController3ToolStripMenuItem.Name = "editProfileForController3ToolStripMenuItem";
resources.ApplyResources(this.editProfileForController3ToolStripMenuItem, "editProfileForController3ToolStripMenuItem");
this.editProfileForController3ToolStripMenuItem.Tag = "2";
this.editProfileForController3ToolStripMenuItem.Click += new System.EventHandler(this.editMenu_Click);
//
// editProfileForController4ToolStripMenuItem
//
resources.ApplyResources(this.editProfileForController4ToolStripMenuItem, "editProfileForController4ToolStripMenuItem");
this.editProfileForController4ToolStripMenuItem.Name = "editProfileForController4ToolStripMenuItem";
resources.ApplyResources(this.editProfileForController4ToolStripMenuItem, "editProfileForController4ToolStripMenuItem");
this.editProfileForController4ToolStripMenuItem.Tag = "4";
this.editProfileForController4ToolStripMenuItem.Click += new System.EventHandler(this.editMenu_Click);
//
// toolStripSeparator1
//
resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1");
this.toolStripSeparator1.Name = "toolStripSeparator1";
resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1");
//
// startToolStripMenuItem
//
this.startToolStripMenuItem.Name = "startToolStripMenuItem";
resources.ApplyResources(this.startToolStripMenuItem, "startToolStripMenuItem");
this.startToolStripMenuItem.Click += new System.EventHandler(this.startToolStripMenuItem_Click);
//
// openToolStripMenuItem
//
@ -276,14 +284,14 @@
//
// exitToolStripMenuItem
//
resources.ApplyResources(this.exitToolStripMenuItem, "exitToolStripMenuItem");
this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
resources.ApplyResources(this.exitToolStripMenuItem, "exitToolStripMenuItem");
this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
//
// toolStripSeparator2
//
resources.ApplyResources(this.toolStripSeparator2, "toolStripSeparator2");
this.toolStripSeparator2.Name = "toolStripSeparator2";
resources.ApplyResources(this.toolStripSeparator2, "toolStripSeparator2");
//
// openProfiles
//
@ -292,20 +300,20 @@
//
// tabMain
//
resources.ApplyResources(this.tabMain, "tabMain");
this.tabMain.Controls.Add(this.tabControllers);
this.tabMain.Controls.Add(this.tabProfiles);
this.tabMain.Controls.Add(this.tabAutoProfiles);
this.tabMain.Controls.Add(this.tabSettings);
this.tabMain.Controls.Add(this.tabLog);
resources.ApplyResources(this.tabMain, "tabMain");
this.tabMain.Name = "tabMain";
this.tabMain.SelectedIndex = 0;
this.tabMain.SelectedIndexChanged += new System.EventHandler(this.tabMain_SelectedIndexChanged);
//
// tabControllers
//
resources.ApplyResources(this.tabControllers, "tabControllers");
this.tabControllers.Controls.Add(this.tLPControllers);
resources.ApplyResources(this.tabControllers, "tabControllers");
this.tabControllers.Name = "tabControllers";
this.tabControllers.UseVisualStyleBackColor = true;
//
@ -344,6 +352,8 @@
this.pBStatus1.InitialImage = global::ScpServer.Properties.Resources.BT;
this.pBStatus1.Name = "pBStatus1";
this.pBStatus1.TabStop = false;
this.pBStatus1.Tag = "0";
this.pBStatus1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pBStatus_MouseClick);
//
// lbPad1
//
@ -479,6 +489,8 @@
this.pBStatus2.InitialImage = global::ScpServer.Properties.Resources.BT;
this.pBStatus2.Name = "pBStatus2";
this.pBStatus2.TabStop = false;
this.pBStatus2.Tag = "1";
this.pBStatus2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pBStatus_MouseClick);
//
// pBStatus3
//
@ -486,6 +498,8 @@
this.pBStatus3.InitialImage = global::ScpServer.Properties.Resources.BT;
this.pBStatus3.Name = "pBStatus3";
this.pBStatus3.TabStop = false;
this.pBStatus3.Tag = "2";
this.pBStatus3.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pBStatus_MouseClick);
//
// pBStatus4
//
@ -493,21 +507,23 @@
this.pBStatus4.InitialImage = global::ScpServer.Properties.Resources.BT;
this.pBStatus4.Name = "pBStatus4";
this.pBStatus4.TabStop = false;
this.pBStatus4.Tag = "3";
this.pBStatus4.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pBStatus_MouseClick);
//
// tabProfiles
//
resources.ApplyResources(this.tabProfiles, "tabProfiles");
this.tabProfiles.Controls.Add(this.lBProfiles);
this.tabProfiles.Controls.Add(this.tSOptions);
this.tabProfiles.Controls.Add(this.toolStrip1);
resources.ApplyResources(this.tabProfiles, "tabProfiles");
this.tabProfiles.Name = "tabProfiles";
this.tabProfiles.UseVisualStyleBackColor = true;
//
// lBProfiles
//
resources.ApplyResources(this.lBProfiles, "lBProfiles");
this.lBProfiles.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.lBProfiles.ContextMenuStrip = this.cMProfile;
resources.ApplyResources(this.lBProfiles, "lBProfiles");
this.lBProfiles.FormattingEnabled = true;
this.lBProfiles.MultiColumn = true;
this.lBProfiles.Name = "lBProfiles";
@ -517,7 +533,6 @@
//
// cMProfile
//
resources.ApplyResources(this.cMProfile, "cMProfile");
this.cMProfile.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.editToolStripMenuItem,
this.assignToController1ToolStripMenuItem,
@ -530,6 +545,7 @@
this.importToolStripMenuItem,
this.exportToolStripMenuItem});
this.cMProfile.Name = "cMProfile";
resources.ApplyResources(this.cMProfile, "cMProfile");
//
// editToolStripMenuItem
//
@ -539,61 +555,60 @@
//
// assignToController1ToolStripMenuItem
//
resources.ApplyResources(this.assignToController1ToolStripMenuItem, "assignToController1ToolStripMenuItem");
this.assignToController1ToolStripMenuItem.Name = "assignToController1ToolStripMenuItem";
resources.ApplyResources(this.assignToController1ToolStripMenuItem, "assignToController1ToolStripMenuItem");
this.assignToController1ToolStripMenuItem.Click += new System.EventHandler(this.assignToController1ToolStripMenuItem_Click);
//
// assignToController2ToolStripMenuItem
//
resources.ApplyResources(this.assignToController2ToolStripMenuItem, "assignToController2ToolStripMenuItem");
this.assignToController2ToolStripMenuItem.Name = "assignToController2ToolStripMenuItem";
resources.ApplyResources(this.assignToController2ToolStripMenuItem, "assignToController2ToolStripMenuItem");
this.assignToController2ToolStripMenuItem.Click += new System.EventHandler(this.assignToController2ToolStripMenuItem_Click);
//
// assignToController3ToolStripMenuItem
//
resources.ApplyResources(this.assignToController3ToolStripMenuItem, "assignToController3ToolStripMenuItem");
this.assignToController3ToolStripMenuItem.Name = "assignToController3ToolStripMenuItem";
resources.ApplyResources(this.assignToController3ToolStripMenuItem, "assignToController3ToolStripMenuItem");
this.assignToController3ToolStripMenuItem.Click += new System.EventHandler(this.assignToController3ToolStripMenuItem_Click);
//
// assignToController4ToolStripMenuItem
//
resources.ApplyResources(this.assignToController4ToolStripMenuItem, "assignToController4ToolStripMenuItem");
this.assignToController4ToolStripMenuItem.Name = "assignToController4ToolStripMenuItem";
resources.ApplyResources(this.assignToController4ToolStripMenuItem, "assignToController4ToolStripMenuItem");
this.assignToController4ToolStripMenuItem.Click += new System.EventHandler(this.assignToController4ToolStripMenuItem_Click);
//
// deleteToolStripMenuItem
//
resources.ApplyResources(this.deleteToolStripMenuItem, "deleteToolStripMenuItem");
this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem";
resources.ApplyResources(this.deleteToolStripMenuItem, "deleteToolStripMenuItem");
this.deleteToolStripMenuItem.Click += new System.EventHandler(this.tsBDeleteProfle_Click);
//
// duplicateToolStripMenuItem
//
resources.ApplyResources(this.duplicateToolStripMenuItem, "duplicateToolStripMenuItem");
this.duplicateToolStripMenuItem.Name = "duplicateToolStripMenuItem";
resources.ApplyResources(this.duplicateToolStripMenuItem, "duplicateToolStripMenuItem");
this.duplicateToolStripMenuItem.Click += new System.EventHandler(this.tSBDupProfile_Click);
//
// newProfileToolStripMenuItem
//
resources.ApplyResources(this.newProfileToolStripMenuItem, "newProfileToolStripMenuItem");
this.newProfileToolStripMenuItem.Name = "newProfileToolStripMenuItem";
resources.ApplyResources(this.newProfileToolStripMenuItem, "newProfileToolStripMenuItem");
this.newProfileToolStripMenuItem.Click += new System.EventHandler(this.tsBNewProfile_Click);
//
// importToolStripMenuItem
//
resources.ApplyResources(this.importToolStripMenuItem, "importToolStripMenuItem");
this.importToolStripMenuItem.Name = "importToolStripMenuItem";
resources.ApplyResources(this.importToolStripMenuItem, "importToolStripMenuItem");
this.importToolStripMenuItem.Click += new System.EventHandler(this.tSBImportProfile_Click);
//
// exportToolStripMenuItem
//
resources.ApplyResources(this.exportToolStripMenuItem, "exportToolStripMenuItem");
this.exportToolStripMenuItem.Name = "exportToolStripMenuItem";
resources.ApplyResources(this.exportToolStripMenuItem, "exportToolStripMenuItem");
this.exportToolStripMenuItem.Click += new System.EventHandler(this.tSBExportProfile_Click);
//
// tSOptions
//
resources.ApplyResources(this.tSOptions, "tSOptions");
this.tSOptions.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
this.tSOptions.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripLabel1,
@ -602,54 +617,54 @@
this.tSBCancel,
this.toolStripSeparator3,
this.tSBKeepSize});
resources.ApplyResources(this.tSOptions, "tSOptions");
this.tSOptions.Name = "tSOptions";
this.tSOptions.ShowItemToolTips = false;
//
// toolStripLabel1
//
resources.ApplyResources(this.toolStripLabel1, "toolStripLabel1");
this.toolStripLabel1.Name = "toolStripLabel1";
resources.ApplyResources(this.toolStripLabel1, "toolStripLabel1");
//
// tSTBProfile
//
resources.ApplyResources(this.tSTBProfile, "tSTBProfile");
this.tSTBProfile.ForeColor = System.Drawing.SystemColors.GrayText;
this.tSTBProfile.Name = "tSTBProfile";
resources.ApplyResources(this.tSTBProfile, "tSTBProfile");
this.tSTBProfile.Enter += new System.EventHandler(this.tBProfile_Enter);
this.tSTBProfile.Leave += new System.EventHandler(this.tBProfile_Leave);
this.tSTBProfile.TextChanged += new System.EventHandler(this.tBProfile_TextChanged);
//
// tSBSaveProfile
//
resources.ApplyResources(this.tSBSaveProfile, "tSBSaveProfile");
this.tSBSaveProfile.AutoToolTip = false;
this.tSBSaveProfile.Image = global::ScpServer.Properties.Resources.saveprofile;
resources.ApplyResources(this.tSBSaveProfile, "tSBSaveProfile");
this.tSBSaveProfile.Name = "tSBSaveProfile";
this.tSBSaveProfile.Click += new System.EventHandler(this.tSBSaveProfile_Click);
//
// tSBCancel
//
resources.ApplyResources(this.tSBCancel, "tSBCancel");
this.tSBCancel.AutoToolTip = false;
this.tSBCancel.Image = global::ScpServer.Properties.Resources.delete;
resources.ApplyResources(this.tSBCancel, "tSBCancel");
this.tSBCancel.Name = "tSBCancel";
this.tSBCancel.Click += new System.EventHandler(this.tSBCancel_Click);
//
// toolStripSeparator3
//
resources.ApplyResources(this.toolStripSeparator3, "toolStripSeparator3");
this.toolStripSeparator3.Name = "toolStripSeparator3";
resources.ApplyResources(this.toolStripSeparator3, "toolStripSeparator3");
//
// tSBKeepSize
//
resources.ApplyResources(this.tSBKeepSize, "tSBKeepSize");
this.tSBKeepSize.Image = global::ScpServer.Properties.Resources.size;
resources.ApplyResources(this.tSBKeepSize, "tSBKeepSize");
this.tSBKeepSize.Name = "tSBKeepSize";
this.tSBKeepSize.Click += new System.EventHandler(this.tSBKeepSize_Click);
//
// toolStrip1
//
resources.ApplyResources(this.toolStrip1, "toolStrip1");
this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.tsBNewProfle,
@ -658,19 +673,20 @@
this.tSBDupProfile,
this.tSBImportProfile,
this.tSBExportProfile});
resources.ApplyResources(this.toolStrip1, "toolStrip1");
this.toolStrip1.Name = "toolStrip1";
//
// tsBNewProfle
//
resources.ApplyResources(this.tsBNewProfle, "tsBNewProfle");
this.tsBNewProfle.Image = global::ScpServer.Properties.Resources.newprofile;
resources.ApplyResources(this.tsBNewProfle, "tsBNewProfle");
this.tsBNewProfle.Name = "tsBNewProfle";
this.tsBNewProfle.Click += new System.EventHandler(this.tsBNewProfile_Click);
//
// tsBEditProfile
//
resources.ApplyResources(this.tsBEditProfile, "tsBEditProfile");
this.tsBEditProfile.Image = global::ScpServer.Properties.Resources.edit;
resources.ApplyResources(this.tsBEditProfile, "tsBEditProfile");
this.tsBEditProfile.Name = "tsBEditProfile";
this.tsBEditProfile.Click += new System.EventHandler(this.tsBNEditProfile_Click);
//
@ -688,8 +704,8 @@
//
// tSBImportProfile
//
resources.ApplyResources(this.tSBImportProfile, "tSBImportProfile");
this.tSBImportProfile.Image = global::ScpServer.Properties.Resources.import;
resources.ApplyResources(this.tSBImportProfile, "tSBImportProfile");
this.tSBImportProfile.Name = "tSBImportProfile";
this.tSBImportProfile.Click += new System.EventHandler(this.tSBImportProfile_Click);
//
@ -707,8 +723,8 @@
//
// tabSettings
//
resources.ApplyResources(this.tabSettings, "tabSettings");
this.tabSettings.Controls.Add(this.flowLayoutPanel1);
resources.ApplyResources(this.tabSettings, "tabSettings");
this.tabSettings.Name = "tabSettings";
this.tabSettings.UseVisualStyleBackColor = true;
//
@ -769,20 +785,20 @@
//
// pNUpdate
//
resources.ApplyResources(this.pNUpdate, "pNUpdate");
this.pNUpdate.Controls.Add(this.cBUpdateTime);
this.pNUpdate.Controls.Add(this.lBCheckEvery);
this.pNUpdate.Controls.Add(this.nUDUpdateTime);
resources.ApplyResources(this.pNUpdate, "pNUpdate");
this.pNUpdate.Name = "pNUpdate";
//
// cBUpdateTime
//
resources.ApplyResources(this.cBUpdateTime, "cBUpdateTime");
this.cBUpdateTime.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cBUpdateTime.FormattingEnabled = true;
this.cBUpdateTime.Items.AddRange(new object[] {
resources.GetString("cBUpdateTime.Items"),
resources.GetString("cBUpdateTime.Items1")});
resources.ApplyResources(this.cBUpdateTime, "cBUpdateTime");
this.cBUpdateTime.Name = "cBUpdateTime";
this.cBUpdateTime.SelectedIndexChanged += new System.EventHandler(this.cBUpdateTime_SelectedIndexChanged);
//
@ -853,9 +869,9 @@
//
// tabLog
//
resources.ApplyResources(this.tabLog, "tabLog");
this.tabLog.Controls.Add(this.lvDebug);
this.tabLog.Controls.Add(this.btnClear);
resources.ApplyResources(this.tabLog, "tabLog");
this.tabLog.Name = "tabLog";
this.tabLog.UseVisualStyleBackColor = true;
//
@ -865,8 +881,8 @@
//
// ScpForm
//
resources.ApplyResources(this, "$this");
this.AllowDrop = true;
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.Color.White;
this.Controls.Add(this.tabMain);
@ -1004,6 +1020,7 @@
private System.Windows.Forms.CheckBox cBNotifications;
private System.Windows.Forms.CheckBox cBDisconnectBT;
private System.Windows.Forms.CheckBox cBSwipeProfiles;
private System.Windows.Forms.ToolStripMenuItem startToolStripMenuItem;
//private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2;
}
}

View File

@ -44,6 +44,7 @@ namespace ScpServer
Options opt;
private System.Drawing.Size oldsize;
WinProgs WP;
ToolTip tt = new ToolTip();
protected void SetupArrays()
{
@ -86,7 +87,6 @@ namespace ScpServer
//CheckDrivers();
SystemEvents.PowerModeChanged += OnPowerChange;
tSOptions.Visible = false;
ToolTip tt = new ToolTip();
if (File.Exists(appdatapath + "\\Profiles.xml"))
tt.SetToolTip(linkUninstall, Properties.Resources.IfRemovingDS4Windows);
tt.SetToolTip(cBSwipeProfiles, Properties.Resources.TwoFingerSwipe);
@ -229,6 +229,7 @@ namespace ScpServer
ControllerStatusChanged(false);
if (btnStartStop.Enabled)
btnStartStop_Clicked();
startToolStripMenuItem.Text = btnStartStop.Text;
cBNotifications.Checked = Global.getNotifications();
cBSwipeProfiles.Checked = Global.getSwipeProfiles();
int checkwhen = Global.getCheckWhen();
@ -270,7 +271,7 @@ namespace ScpServer
private void test_Tick(object sender, EventArgs e)
{
lBTest.Visible = true;
lBTest.Text = rootHub.DS4Controllers[0].Latency.ToString();
lBTest.Text = rootHub.DS4Controllers[0].LeftHeavySlowRumble.ToString();
}
void Hotkeys(object sender, EventArgs e)
{
@ -580,6 +581,7 @@ namespace ScpServer
hotkeystimer.Stop();
btnStartStop.Text = Properties.Resources.StartText;
}
startToolStripMenuItem.Text = btnStartStop.Text;
}
protected void btnClear_Click(object sender, EventArgs e)
{
@ -627,9 +629,9 @@ namespace ScpServer
Pads[Index].Text = rootHub.getDS4MacAddress(Index);
switch (rootHub.getDS4Status(Index))
{
case "USB": statPB[Index].Image = Properties.Resources.USB; break;
case "BT": statPB[Index].Image = Properties.Resources.BT; break;
default: statPB[Index].Image = Properties.Resources.none; break;
case "USB": statPB[Index].Image = Properties.Resources.USB; tt.SetToolTip(statPB[Index], ""); break;
case "BT": statPB[Index].Image = Properties.Resources.BT; tt.SetToolTip(statPB[Index], "Right click to disconnect"); break;
default: statPB[Index].Image = Properties.Resources.none; tt.SetToolTip(statPB[Index], ""); break;
}
Batteries[Index].Text = rootHub.getDS4Battery(Index);
if (Pads[Index].Text != String.Empty)
@ -665,6 +667,12 @@ namespace ScpServer
notifyIcon1.Text = tooltip;
}
private void pBStatus_MouseClick(object sender, MouseEventArgs e)
{
int i = Int32.Parse(((PictureBox)sender).Tag.ToString());
if (e.Button == System.Windows.Forms.MouseButtons.Right && rootHub.getDS4Status(i) == "BT")
rootHub.DS4Controllers[i].DisconnectBT();
}
private void Enable_Controls(int device, bool on)
{
@ -903,6 +911,7 @@ namespace ScpServer
btnStartStop_Clicked(false);
btnStartStop_Clicked(false);
Global.Save();
//if (MessageBox.Show("Restart DS4Windows?", "") == System.Windows.Forms.DialogResult.OK);
}
private void startMinimizedCheckBox_CheckedChanged(object sender, EventArgs e)
@ -967,6 +976,10 @@ namespace ScpServer
WindowState = FormWindowState.Normal;
}
private void startToolStripMenuItem_Click(object sender, EventArgs e)
{
btnStartStop_Clicked();
}
private void notifyIcon1_MouseClick(object sender, MouseEventArgs e)
{
if (e.Button == System.Windows.Forms.MouseButtons.Left)
@ -1318,13 +1331,6 @@ namespace ScpServer
{
Global.setSwipeProfiles(cBSwipeProfiles.Checked);
}
private void toolStripButton1_Click(object sender, EventArgs e)
{
Global.saveColor(0, Global.loadColor(0).red, Global.loadColor(0).green, Global.loadColor(0).blue);
//Global.saveColor(0, 0, 122, 255);
//DS4LightBar.updateLightBar(rootHub.DS4Controllers[0], 0, rootHub.getDS4State(0), rootHub.ExposedState[0]);
}
}
public class ThemeUtil

View File

@ -145,6 +145,45 @@
<data name="btnClear.Text" xml:space="preserve">
<value>Effacer</value>
</data>
<data name="editProfileForController1ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>231, 22</value>
</data>
<data name="editProfileForController1ToolStripMenuItem.Text" xml:space="preserve">
<value>Éditer le Profil de la Manette 1</value>
</data>
<data name="editProfileForController2ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>231, 22</value>
</data>
<data name="editProfileForController2ToolStripMenuItem.Text" xml:space="preserve">
<value>Éditer le Profil de la Manette 2</value>
</data>
<data name="editProfileForController3ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>231, 22</value>
</data>
<data name="editProfileForController3ToolStripMenuItem.Text" xml:space="preserve">
<value>Éditer le Profil de la Manette 3</value>
</data>
<data name="editProfileForController4ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>231, 22</value>
</data>
<data name="editProfileForController4ToolStripMenuItem.Text" xml:space="preserve">
<value>Éditer le Profil de la Manette 4</value>
</data>
<data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 6</value>
</data>
<data name="openToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>231, 22</value>
</data>
<data name="openToolStripMenuItem.Text" xml:space="preserve">
<value>Ouvrir</value>
</data>
<data name="exitToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>231, 22</value>
</data>
<data name="exitToolStripMenuItem.Text" xml:space="preserve">
<value>Sortir (Souris du Milieu)</value>
</data>
<data name="cMTaskbar.Size" type="System.Drawing.Size, System.Drawing">
<value>232, 142</value>
</data>
@ -6320,84 +6359,6 @@
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
</value>
</data>
<data name="editProfileForController1ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>231, 22</value>
</data>
<data name="editProfileForController1ToolStripMenuItem.Text" xml:space="preserve">
<value>Éditer le Profil de la Manette 1</value>
</data>
<data name="editProfileForController2ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>231, 22</value>
</data>
<data name="editProfileForController2ToolStripMenuItem.Text" xml:space="preserve">
<value>Éditer le Profil de la Manette 2</value>
</data>
<data name="editProfileForController3ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>231, 22</value>
</data>
<data name="editProfileForController3ToolStripMenuItem.Text" xml:space="preserve">
<value>Éditer le Profil de la Manette 3</value>
</data>
<data name="editProfileForController4ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>231, 22</value>
</data>
<data name="editProfileForController4ToolStripMenuItem.Text" xml:space="preserve">
<value>Éditer le Profil de la Manette 4</value>
</data>
<data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 6</value>
</data>
<data name="openToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>231, 22</value>
</data>
<data name="openToolStripMenuItem.Text" xml:space="preserve">
<value>Ouvrir</value>
</data>
<data name="exitToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>231, 22</value>
</data>
<data name="exitToolStripMenuItem.Text" xml:space="preserve">
<value>Sortir (Souris du Milieu)</value>
</data>
<data name="tabControllers.Text" xml:space="preserve">
<value>Manettes</value>
</data>
<data name="toolStripLabel1.Size" type="System.Drawing.Size, System.Drawing">
<value>84, 22</value>
</data>
<data name="toolStripLabel1.Text" xml:space="preserve">
<value>Nom de Profil:</value>
</data>
<data name="tSTBProfile.Size" type="System.Drawing.Size, System.Drawing">
<value>170, 25</value>
</data>
<data name="tSBSaveProfile.Size" type="System.Drawing.Size, System.Drawing">
<value>123, 22</value>
</data>
<data name="tSBSaveProfile.Text" xml:space="preserve">
<value>Sauvegarder Profil</value>
</data>
<data name="tSBCancel.Size" type="System.Drawing.Size, System.Drawing">
<value>69, 22</value>
</data>
<data name="tSBCancel.Text" xml:space="preserve">
<value>Annuler</value>
</data>
<data name="tSBKeepSize.Size" type="System.Drawing.Size, System.Drawing">
<value>297, 22</value>
</data>
<data name="tSBKeepSize.Text" xml:space="preserve">
<value>Garder les dimensions de la fenêtre après fermeture</value>
</data>
<data name="tabProfiles.Text" xml:space="preserve">
<value>Profils</value>
</data>
<data name="tabAutoProfiles.Text" xml:space="preserve">
<value>Profils Auto</value>
</data>
<data name="tabSettings.Text" xml:space="preserve">
<value>Paramètres</value>
</data>
<data name="pBStatus1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACcAAAAUCAYAAAAOTSQ2AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
@ -6739,6 +6700,36 @@
<data name="pBStatus4.Location" type="System.Drawing.Point, System.Drawing">
<value>403, 106</value>
</data>
<data name="tabControllers.Text" xml:space="preserve">
<value>Manettes</value>
</data>
<data name="toolStripLabel1.Size" type="System.Drawing.Size, System.Drawing">
<value>84, 22</value>
</data>
<data name="toolStripLabel1.Text" xml:space="preserve">
<value>Nom de Profil:</value>
</data>
<data name="tSTBProfile.Size" type="System.Drawing.Size, System.Drawing">
<value>170, 25</value>
</data>
<data name="tSBSaveProfile.Size" type="System.Drawing.Size, System.Drawing">
<value>123, 22</value>
</data>
<data name="tSBSaveProfile.Text" xml:space="preserve">
<value>Sauvegarder Profil</value>
</data>
<data name="tSBCancel.Size" type="System.Drawing.Size, System.Drawing">
<value>69, 22</value>
</data>
<data name="tSBCancel.Text" xml:space="preserve">
<value>Annuler</value>
</data>
<data name="tSBKeepSize.Size" type="System.Drawing.Size, System.Drawing">
<value>297, 22</value>
</data>
<data name="tSBKeepSize.Text" xml:space="preserve">
<value>Garder les dimensions de la fenêtre après fermeture</value>
</data>
<data name="tsBNewProfle.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 22</value>
</data>
@ -6810,6 +6801,12 @@
<data name="tSBExportProfile.Text" xml:space="preserve">
<value>Exporter</value>
</data>
<data name="tabProfiles.Text" xml:space="preserve">
<value>Profils</value>
</data>
<data name="tabAutoProfiles.Text" xml:space="preserve">
<value>Profils Auto</value>
</data>
<data name="hideDS4CheckBox.Size" type="System.Drawing.Size, System.Drawing">
<value>137, 17</value>
</data>
@ -6834,9 +6831,6 @@
<data name="cBUpdate.Text" xml:space="preserve">
<value>Vérifier les Mises à Jour au Démarrage</value>
</data>
<data name="pNUpdate.Size" type="System.Drawing.Size, System.Drawing">
<value>198, 22</value>
</data>
<data name="cBUpdateTime.Items" xml:space="preserve">
<value>heures</value>
</data>
@ -6855,6 +6849,9 @@
<data name="nUDUpdateTime.Location" type="System.Drawing.Point, System.Drawing">
<value>85, 1</value>
</data>
<data name="pNUpdate.Size" type="System.Drawing.Size, System.Drawing">
<value>198, 22</value>
</data>
<data name="cBNotifications.Size" type="System.Drawing.Size, System.Drawing">
<value>139, 17</value>
</data>
@ -6897,4 +6894,7 @@
<data name="lnkControllers.Text" xml:space="preserve">
<value>Panneau de Configuration</value>
</data>
<data name="tabSettings.Text" xml:space="preserve">
<value>Paramètres</value>
</data>
</root>

File diff suppressed because it is too large Load Diff