Version 10.55

Dimming by idle timeout synced with color/dim by Battery % setting
Swipe to cycle through profiles can now be disabled.

Version 10.52
Input by DS4 in profile settings now turns off when off that tab
Able to use edit button to open that profile settings, even when profile settings are  already open open.

Version 10.51
Fix for BT disconnecting while DS4Windows is running, and Disconnect BT when stopping is checked.

Version 10.5
Support for Left/Right Shift, Control, Alt in macros
Better support of Tab and media keys (note: media keys can not be held between actions)
Option to disconnect controller from BT if stopping/closing DS4Windows
Spelling fixes
Start of support for other languages, starting with very barebones support for Spanish, If anyone can help with translations of your language, please PM me here or email me here with translations for as much text as you can. Here is a link to all the text that appears in DS4Windows in English
This commit is contained in:
jays2kings 2014-06-21 14:00:28 -04:00
parent ea5c9694fb
commit edd7cf9403
20 changed files with 9715 additions and 837 deletions

View File

@ -127,10 +127,15 @@ namespace DS4Control
for (int i = 0; i < DS4Controllers.Length; i++) for (int i = 0; i < DS4Controllers.Length; i++)
{ {
if (DS4Controllers[i] != null) if (DS4Controllers[i] != null)
{ {
DS4LightBar.defualtLight = true; if (Global.getDCBTatStop() && !DS4Controllers[i].Charging && showlog)
DS4LightBar.updateLightBar(DS4Controllers[i], i); DS4Controllers[i].DisconnectBT();
System.Threading.Thread.Sleep(50); else
{
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. CurrentState[i].Battery = PreviousState[i].Battery = 0; // Reset for the next connection's initial status change.
x360Bus.Unplug(i); x360Bus.Unplug(i);
anyUnplugged = true; anyUnplugged = true;
@ -574,7 +579,6 @@ namespace DS4Control
public DS4State getDS4StateMapped(int ind) public DS4State getDS4StateMapped(int ind)
{ {
return MappedState[ind]; return MappedState[ind];
} }
} }
} }

View File

@ -75,7 +75,7 @@ namespace DS4Control
color = Global.loadColor(deviceNum); color = Global.loadColor(deviceNum);
} }
if (Global.getIdleDisconnectTimeout(deviceNum) > 0 && (!device.Charging || device.Battery >= 100)) if (Global.getIdleDisconnectTimeout(deviceNum) > 0 && Global.getLedAsBatteryIndicator(deviceNum) && (!device.Charging || device.Battery >= 100))
{//Fade lightbar by idle time {//Fade lightbar by idle time
TimeSpan timeratio = new TimeSpan(DateTime.UtcNow.Ticks - device.lastActive.Ticks); TimeSpan timeratio = new TimeSpan(DateTime.UtcNow.Ticks - device.lastActive.Ticks);
double botratio = timeratio.TotalMilliseconds; double botratio = timeratio.TotalMilliseconds;

View File

@ -200,6 +200,7 @@ namespace DS4Control
{ {
oldnow = DateTime.UtcNow; oldnow = DateTime.UtcNow;
InputMethods.performKeyPress(kvp.Key); InputMethods.performKeyPress(kvp.Key);
Console.WriteLine(((System.Windows.Forms.Keys)kvp.Key).ToString());
pressagain = false; pressagain = false;
keyshelddown = kvp.Key; keyshelddown = kvp.Key;
} }
@ -240,7 +241,7 @@ namespace DS4Control
if (gkp.previous.scanCodeCount != 0) // use the last type of VK/SC if (gkp.previous.scanCodeCount != 0) // use the last type of VK/SC
{ {
InputMethods.performSCKeyRelease(kvp.Key); InputMethods.performSCKeyRelease(kvp.Key);
InputMethods.performKeyRelease(kvp.Key); //InputMethods.performKeyRelease(kvp.Key);
pressagain = false; pressagain = false;
} }
else else

View File

@ -279,6 +279,26 @@ namespace DS4Control
{ {
return m_Config.notifications; return m_Config.notifications;
} }
public static void setDCBTatStop(bool data)
{
m_Config.disconnectBTAtStop = data;
}
public static bool getDCBTatStop()
{
return m_Config.disconnectBTAtStop;
}
public static void setSwipeProfiles(bool data)
{
m_Config.swipeProfiles = data;
}
public static bool getSwipeProfiles()
{
return m_Config.swipeProfiles;
}
// New settings // New settings
public static void saveLowColor(int device, byte red, byte green, byte blue) public static void saveLowColor(int device, byte red, byte green, byte blue)
{ {
@ -614,6 +634,8 @@ namespace DS4Control
public DateTime lastChecked; public DateTime lastChecked;
public int CheckWhen = 1; public int CheckWhen = 1;
public bool notifications = true; public bool notifications = true;
public bool disconnectBTAtStop = false;
public bool swipeProfiles = true;
public Dictionary<DS4Controls, DS4KeyType>[] customMapKeyTypes = { null, null, null, null, null }; public Dictionary<DS4Controls, DS4KeyType>[] customMapKeyTypes = { null, null, null, null, null };
public Dictionary<DS4Controls, UInt16>[] customMapKeys = { null, null, null, null, null }; public Dictionary<DS4Controls, UInt16>[] customMapKeys = { null, null, null, null, null };
public Dictionary<DS4Controls, String>[] customMapMacros = { null, null, null, null, null }; public Dictionary<DS4Controls, String>[] customMapMacros = { null, null, null, null, null };
@ -1229,6 +1251,12 @@ namespace DS4Control
catch { missingSetting = true; } catch { missingSetting = true; }
try { Item = m_Xdoc.SelectSingleNode("/Profile/Notifications"); Boolean.TryParse(Item.InnerText, out notifications); } try { Item = m_Xdoc.SelectSingleNode("/Profile/Notifications"); Boolean.TryParse(Item.InnerText, out notifications); }
catch { missingSetting = true; } catch { missingSetting = true; }
try { Item = m_Xdoc.SelectSingleNode("/Profile/Notifications"); Boolean.TryParse(Item.InnerText, out notifications); }
catch { missingSetting = true; }
try { Item = m_Xdoc.SelectSingleNode("/Profile/DisconnectBTAtStop"); Boolean.TryParse(Item.InnerText, out disconnectBTAtStop); }
catch { missingSetting = true; }
try { Item = m_Xdoc.SelectSingleNode("/Profile/SwipeProfiles"); Boolean.TryParse(Item.InnerText, out swipeProfiles); }
catch { missingSetting = true; }
} }
} }
catch { } catch { }
@ -1240,45 +1268,42 @@ namespace DS4Control
{ {
Boolean Saved = true; Boolean Saved = true;
//try XmlNode Node;
{
XmlNode Node;
m_Xdoc.RemoveAll(); m_Xdoc.RemoveAll();
Node = m_Xdoc.CreateXmlDeclaration("1.0", "utf-8", String.Empty); Node = m_Xdoc.CreateXmlDeclaration("1.0", "utf-8", String.Empty);
m_Xdoc.AppendChild(Node); m_Xdoc.AppendChild(Node);
Node = m_Xdoc.CreateComment(String.Format(" Profile Configuration Data. {0} ", DateTime.Now)); Node = m_Xdoc.CreateComment(String.Format(" Profile Configuration Data. {0} ", DateTime.Now));
m_Xdoc.AppendChild(Node); m_Xdoc.AppendChild(Node);
Node = m_Xdoc.CreateWhitespace("\r\n"); Node = m_Xdoc.CreateWhitespace("\r\n");
m_Xdoc.AppendChild(Node); m_Xdoc.AppendChild(Node);
Node = m_Xdoc.CreateNode(XmlNodeType.Element, "Profile", null); Node = m_Xdoc.CreateNode(XmlNodeType.Element, "Profile", null);
XmlNode xmlUseExclNode = m_Xdoc.CreateNode(XmlNodeType.Element, "useExclusiveMode", null); xmlUseExclNode.InnerText = useExclusiveMode.ToString(); Node.AppendChild(xmlUseExclNode); XmlNode xmlUseExclNode = m_Xdoc.CreateNode(XmlNodeType.Element, "useExclusiveMode", null); xmlUseExclNode.InnerText = useExclusiveMode.ToString(); Node.AppendChild(xmlUseExclNode);
XmlNode xmlStartMinimized = m_Xdoc.CreateNode(XmlNodeType.Element, "startMinimized", null); xmlStartMinimized.InnerText = startMinimized.ToString(); Node.AppendChild(xmlStartMinimized); XmlNode xmlStartMinimized = m_Xdoc.CreateNode(XmlNodeType.Element, "startMinimized", null); xmlStartMinimized.InnerText = startMinimized.ToString(); Node.AppendChild(xmlStartMinimized);
XmlNode xmlFormWidth = m_Xdoc.CreateNode(XmlNodeType.Element, "formWidth", null); xmlFormWidth.InnerText = formWidth.ToString(); Node.AppendChild(xmlFormWidth); XmlNode xmlFormWidth = m_Xdoc.CreateNode(XmlNodeType.Element, "formWidth", null); xmlFormWidth.InnerText = formWidth.ToString(); Node.AppendChild(xmlFormWidth);
XmlNode xmlFormHeight = m_Xdoc.CreateNode(XmlNodeType.Element, "formHeight", null); xmlFormHeight.InnerText = formHeight.ToString(); Node.AppendChild(xmlFormHeight); XmlNode xmlFormHeight = m_Xdoc.CreateNode(XmlNodeType.Element, "formHeight", null); xmlFormHeight.InnerText = formHeight.ToString(); Node.AppendChild(xmlFormHeight);
XmlNode xmlController1 = m_Xdoc.CreateNode(XmlNodeType.Element, "Controller1", null); xmlController1.InnerText = profilePath[0]; Node.AppendChild(xmlController1);
XmlNode xmlController2 = m_Xdoc.CreateNode(XmlNodeType.Element, "Controller2", null); xmlController2.InnerText = profilePath[1]; Node.AppendChild(xmlController2);
XmlNode xmlController3 = m_Xdoc.CreateNode(XmlNodeType.Element, "Controller3", null); xmlController3.InnerText = profilePath[2]; Node.AppendChild(xmlController3);
XmlNode xmlController4 = m_Xdoc.CreateNode(XmlNodeType.Element, "Controller4", null); xmlController4.InnerText = profilePath[3]; Node.AppendChild(xmlController4);
XmlNode xmlVersion = m_Xdoc.CreateNode(XmlNodeType.Element, "DS4Version", null); xmlVersion.InnerText = version.ToString(); Node.AppendChild(xmlVersion); XmlNode xmlController1 = m_Xdoc.CreateNode(XmlNodeType.Element, "Controller1", null); xmlController1.InnerText = profilePath[0]; Node.AppendChild(xmlController1);
XmlNode xmlLastChecked = m_Xdoc.CreateNode(XmlNodeType.Element, "LastChecked", null); xmlLastChecked.InnerText = lastChecked.ToString(); Node.AppendChild(xmlLastChecked); XmlNode xmlController2 = m_Xdoc.CreateNode(XmlNodeType.Element, "Controller2", null); xmlController2.InnerText = profilePath[1]; Node.AppendChild(xmlController2);
XmlNode xmlCheckWhen = m_Xdoc.CreateNode(XmlNodeType.Element, "CheckWhen", null); xmlCheckWhen.InnerText = CheckWhen.ToString(); Node.AppendChild(xmlCheckWhen); XmlNode xmlController3 = m_Xdoc.CreateNode(XmlNodeType.Element, "Controller3", null); xmlController3.InnerText = profilePath[2]; Node.AppendChild(xmlController3);
XmlNode xmlNotifications = m_Xdoc.CreateNode(XmlNodeType.Element, "Notifications", null); xmlNotifications.InnerText = notifications.ToString(); Node.AppendChild(xmlNotifications); XmlNode xmlController4 = m_Xdoc.CreateNode(XmlNodeType.Element, "Controller4", null); xmlController4.InnerText = profilePath[3]; Node.AppendChild(xmlController4);
m_Xdoc.AppendChild(Node);
try { m_Xdoc.Save(m_Profile); } XmlNode xmlVersion = m_Xdoc.CreateNode(XmlNodeType.Element, "DS4Version", null); xmlVersion.InnerText = version.ToString(); Node.AppendChild(xmlVersion);
catch (UnauthorizedAccessException) { Saved = false; } XmlNode xmlLastChecked = m_Xdoc.CreateNode(XmlNodeType.Element, "LastChecked", null); xmlLastChecked.InnerText = lastChecked.ToString(); Node.AppendChild(xmlLastChecked);
} XmlNode xmlCheckWhen = m_Xdoc.CreateNode(XmlNodeType.Element, "CheckWhen", null); xmlCheckWhen.InnerText = CheckWhen.ToString(); Node.AppendChild(xmlCheckWhen);
//catch { Saved = false; } XmlNode xmlNotifications = m_Xdoc.CreateNode(XmlNodeType.Element, "Notifications", null); xmlNotifications.InnerText = notifications.ToString(); Node.AppendChild(xmlNotifications);
XmlNode xmlDisconnectBT = m_Xdoc.CreateNode(XmlNodeType.Element, "DisconnectBTAtStop", null); xmlDisconnectBT.InnerText = disconnectBTAtStop.ToString(); Node.AppendChild(xmlDisconnectBT);
XmlNode xmlSwipeProfiles = m_Xdoc.CreateNode(XmlNodeType.Element, "SwipeProfiles", null); xmlSwipeProfiles.InnerText = swipeProfiles.ToString(); Node.AppendChild(xmlSwipeProfiles);
m_Xdoc.AppendChild(Node);
try { m_Xdoc.Save(m_Profile); }
catch (UnauthorizedAccessException) { Saved = false; }
return Saved; return Saved;
} }
} }

View File

@ -12,6 +12,7 @@
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<IsWebBootstrapper>true</IsWebBootstrapper> <IsWebBootstrapper>true</IsWebBootstrapper>
<TargetFrameworkProfile />
<PublishUrl>C:\Users\Jonathan\Dropbox\Public\DS4 Tool\</PublishUrl> <PublishUrl>C:\Users\Jonathan\Dropbox\Public\DS4 Tool\</PublishUrl>
<Install>true</Install> <Install>true</Install>
<InstallFrom>Web</InstallFrom> <InstallFrom>Web</InstallFrom>
@ -31,7 +32,6 @@
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted> <PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled> <BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
@ -133,11 +133,6 @@
<Compile Include="RecordBox.Designer.cs"> <Compile Include="RecordBox.Designer.cs">
<DependentUpon>RecordBox.cs</DependentUpon> <DependentUpon>RecordBox.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Resource.es.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resource.es.resx</DependentUpon>
</Compile>
<Compile Include="SaveWhere.cs"> <Compile Include="SaveWhere.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
@ -179,20 +174,20 @@
<DependentUpon>Options.cs</DependentUpon> <DependentUpon>Options.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx"> <EmbeddedResource Include="Properties\Resources.resx">
<Generator>PublicResXFileCodeGenerator</Generator> <Generator>ResXFileCodeGenerator</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
<LastGenOutput>Resources1.Designer.cs</LastGenOutput> <LastGenOutput>Resources1.Designer.cs</LastGenOutput>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="RecordBox.resx"> <EmbeddedResource Include="RecordBox.resx">
<DependentUpon>RecordBox.cs</DependentUpon> <DependentUpon>RecordBox.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Resource.es.resx"> <EmbeddedResource Include="Properties\Resources.es.resx" />
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resource.es.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="SaveWhere.resx"> <EmbeddedResource Include="SaveWhere.resx">
<DependentUpon>SaveWhere.cs</DependentUpon> <DependentUpon>SaveWhere.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="ScpForm.es.resx">
<DependentUpon>ScpForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ScpForm.resx"> <EmbeddedResource Include="ScpForm.resx">
<DependentUpon>ScpForm.cs</DependentUpon> <DependentUpon>ScpForm.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>

View File

@ -197,7 +197,7 @@
this.label29.Name = "label29"; this.label29.Name = "label29";
this.label29.Size = new System.Drawing.Size(313, 13); this.label29.Size = new System.Drawing.Size(313, 13);
this.label29.TabIndex = 14; this.label29.TabIndex = 14;
this.label29.Text = "Keys are interperted differently. May be needed for certain games"; this.label29.Text = "Keys are interpreted differently. May be needed for certain games";
// //
// label28 // label28
// //
@ -360,9 +360,9 @@
this.label5.AutoSize = true; this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(193, 127); this.label5.Location = new System.Drawing.Point(193, 127);
this.label5.Name = "label5"; this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(231, 13); this.label5.Size = new System.Drawing.Size(237, 13);
this.label5.TabIndex = 4; this.label5.TabIndex = 4;
this.label5.Text = "Turn off touchpad movment (clicking still works)"; this.label5.Text = "Turn off touchpad movement (clicking still works)";
// //
// label17 // label17
// //
@ -483,7 +483,7 @@
this.label31.Name = "label31"; this.label31.Name = "label31";
this.label31.Size = new System.Drawing.Size(324, 26); this.label31.Size = new System.Drawing.Size(324, 26);
this.label31.TabIndex = 14; this.label31.TabIndex = 14;
this.label31.Text = "Hides the DS4\'s regular input (Dinput) from other progrmas\r\ncheck if you are gett" + this.label31.Text = "Hides the DS4\'s regular input (Dinput) from other programs\r\ncheck if you are gett" +
"ing double input in games or R2 pauses games"; "ing double input in games or R2 pauses games";
// //
// lLChangelog // lLChangelog

View File

@ -2000,9 +2000,9 @@
this.lBMacroOn.AutoSize = true; this.lBMacroOn.AutoSize = true;
this.lBMacroOn.Location = new System.Drawing.Point(10, 6); this.lBMacroOn.Location = new System.Drawing.Point(10, 6);
this.lBMacroOn.Name = "lBMacroOn"; this.lBMacroOn.Name = "lBMacroOn";
this.lBMacroOn.Size = new System.Drawing.Size(173, 13); this.lBMacroOn.Size = new System.Drawing.Size(322, 13);
this.lBMacroOn.TabIndex = 319; this.lBMacroOn.TabIndex = 319;
this.lBMacroOn.Text = "Macro On, Choose a key to disable"; this.lBMacroOn.Text = "Macro On, Choose a key to disable, else close this window to save";
this.lBMacroOn.Visible = false; this.lBMacroOn.Visible = false;
// //
// btnMacro // btnMacro

View File

@ -73,7 +73,7 @@
this.blueBar = new System.Windows.Forms.TrackBar(); this.blueBar = new System.Windows.Forms.TrackBar();
this.greenBar = new System.Windows.Forms.TrackBar(); this.greenBar = new System.Windows.Forms.TrackBar();
this.redBar = new System.Windows.Forms.TrackBar(); this.redBar = new System.Windows.Forms.TrackBar();
this.batteryLed = new System.Windows.Forms.CheckBox(); this.cBLightbyBattery = new System.Windows.Forms.CheckBox();
this.lBBlue = new System.Windows.Forms.Label(); this.lBBlue = new System.Windows.Forms.Label();
this.lBGreen = new System.Windows.Forms.Label(); this.lBGreen = new System.Windows.Forms.Label();
this.lBspc = new System.Windows.Forms.Label(); this.lBspc = new System.Windows.Forms.Label();
@ -87,14 +87,14 @@
this.nUDTouch = new System.Windows.Forms.NumericUpDown(); this.nUDTouch = new System.Windows.Forms.NumericUpDown();
this.lBButtonMouseSens = new System.Windows.Forms.Label(); this.lBButtonMouseSens = new System.Windows.Forms.Label();
this.cBlowerRCOn = new System.Windows.Forms.CheckBox(); this.cBlowerRCOn = new System.Windows.Forms.CheckBox();
this.touchpadJitterCompensation = new System.Windows.Forms.CheckBox(); this.cBTouchpadJitterCompensation = new System.Windows.Forms.CheckBox();
this.lBL2 = new System.Windows.Forms.Label(); this.lBL2 = new System.Windows.Forms.Label();
this.lBR2 = new System.Windows.Forms.Label(); this.lBR2 = new System.Windows.Forms.Label();
this.lBIdleMinutes = new System.Windows.Forms.Label(); this.lBIdleMinutes = new System.Windows.Forms.Label();
this.nUDIdleDisconnect = new System.Windows.Forms.NumericUpDown(); this.nUDIdleDisconnect = new System.Windows.Forms.NumericUpDown();
this.nUDR2 = new System.Windows.Forms.NumericUpDown(); this.nUDR2 = new System.Windows.Forms.NumericUpDown();
this.tBsixaxisAccelZ = new System.Windows.Forms.TrackBar(); this.tBsixaxisAccelZ = new System.Windows.Forms.TrackBar();
this.flushHIDQueue = new System.Windows.Forms.CheckBox(); this.cBFlushHIDQueue = new System.Windows.Forms.CheckBox();
this.tBsixaxisAccelY = new System.Windows.Forms.TrackBar(); this.tBsixaxisAccelY = new System.Windows.Forms.TrackBar();
this.leftMotorLabel = new System.Windows.Forms.Label(); this.leftMotorLabel = new System.Windows.Forms.Label();
this.tBsixaxisAccelX = new System.Windows.Forms.TrackBar(); this.tBsixaxisAccelX = new System.Windows.Forms.TrackBar();
@ -133,17 +133,14 @@
this.gBOther = new System.Windows.Forms.GroupBox(); this.gBOther = new System.Windows.Forms.GroupBox();
this.nUDSixaxis = new System.Windows.Forms.NumericUpDown(); this.nUDSixaxis = new System.Windows.Forms.NumericUpDown();
this.cBControllerInput = new System.Windows.Forms.CheckBox(); this.cBControllerInput = new System.Windows.Forms.CheckBox();
this.nUDHideMouse = new System.Windows.Forms.NumericUpDown();
this.cBHideCursor = new System.Windows.Forms.CheckBox();
this.cBIdleDisconnect = new System.Windows.Forms.CheckBox(); this.cBIdleDisconnect = new System.Windows.Forms.CheckBox();
this.lBMouseMins = new System.Windows.Forms.Label();
this.gBLightbar = new System.Windows.Forms.GroupBox(); this.gBLightbar = new System.Windows.Forms.GroupBox();
this.btnChargingColor = new System.Windows.Forms.Button(); this.btnChargingColor = new System.Windows.Forms.Button();
this.rBColor = new System.Windows.Forms.RadioButton(); this.rBColor = new System.Windows.Forms.RadioButton();
this.rBFade = new System.Windows.Forms.RadioButton(); this.rBFade = new System.Windows.Forms.RadioButton();
this.rBNormal = new System.Windows.Forms.RadioButton(); this.rBNormal = new System.Windows.Forms.RadioButton();
this.rBRainbow = new System.Windows.Forms.RadioButton(); this.rBRainbow = new System.Windows.Forms.RadioButton();
this.label2 = new System.Windows.Forms.Label(); this.lbWhileCharging = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.lBFlashAt = new System.Windows.Forms.Label(); this.lBFlashAt = new System.Windows.Forms.Label();
this.nUDflashLED = new System.Windows.Forms.NumericUpDown(); this.nUDflashLED = new System.Windows.Forms.NumericUpDown();
@ -187,7 +184,6 @@
this.gBTouchpad.SuspendLayout(); this.gBTouchpad.SuspendLayout();
this.gBOther.SuspendLayout(); this.gBOther.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.nUDSixaxis)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nUDSixaxis)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nUDHideMouse)).BeginInit();
this.gBLightbar.SuspendLayout(); this.gBLightbar.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.nUDflashLED)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nUDflashLED)).BeginInit();
this.gBRumble.SuspendLayout(); this.gBRumble.SuspendLayout();
@ -1028,16 +1024,16 @@
this.redBar.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LightBar_MouseDown); this.redBar.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LightBar_MouseDown);
this.redBar.MouseUp += new System.Windows.Forms.MouseEventHandler(this.Lightbar_MouseUp); this.redBar.MouseUp += new System.Windows.Forms.MouseEventHandler(this.Lightbar_MouseUp);
// //
// batteryLed // cBLightbyBattery
// //
this.batteryLed.AutoSize = true; this.cBLightbyBattery.AutoSize = true;
this.batteryLed.Location = new System.Drawing.Point(316, 17); this.cBLightbyBattery.Location = new System.Drawing.Point(316, 17);
this.batteryLed.Name = "batteryLed"; this.cBLightbyBattery.Name = "cBLightbyBattery";
this.batteryLed.Size = new System.Drawing.Size(111, 17); this.cBLightbyBattery.Size = new System.Drawing.Size(111, 17);
this.batteryLed.TabIndex = 162; this.cBLightbyBattery.TabIndex = 162;
this.batteryLed.Text = "Color by Battery %"; this.cBLightbyBattery.Text = "Color by Battery %";
this.batteryLed.UseVisualStyleBackColor = true; this.cBLightbyBattery.UseVisualStyleBackColor = true;
this.batteryLed.CheckedChanged += new System.EventHandler(this.ledAsBatteryIndicator_CheckedChanged); this.cBLightbyBattery.CheckedChanged += new System.EventHandler(this.ledAsBatteryIndicator_CheckedChanged);
// //
// lBBlue // lBBlue
// //
@ -1212,19 +1208,19 @@
this.cBlowerRCOn.UseVisualStyleBackColor = true; this.cBlowerRCOn.UseVisualStyleBackColor = true;
this.cBlowerRCOn.CheckedChanged += new System.EventHandler(this.lowerRCOffCheckBox_CheckedChanged); this.cBlowerRCOn.CheckedChanged += new System.EventHandler(this.lowerRCOffCheckBox_CheckedChanged);
// //
// touchpadJitterCompensation // cBTouchpadJitterCompensation
// //
this.touchpadJitterCompensation.AutoSize = true; this.cBTouchpadJitterCompensation.AutoSize = true;
this.touchpadJitterCompensation.Checked = true; this.cBTouchpadJitterCompensation.Checked = true;
this.touchpadJitterCompensation.CheckState = System.Windows.Forms.CheckState.Checked; this.cBTouchpadJitterCompensation.CheckState = System.Windows.Forms.CheckState.Checked;
this.touchpadJitterCompensation.Location = new System.Drawing.Point(42, 17); this.cBTouchpadJitterCompensation.Location = new System.Drawing.Point(42, 17);
this.touchpadJitterCompensation.Name = "touchpadJitterCompensation"; this.cBTouchpadJitterCompensation.Name = "cBTouchpadJitterCompensation";
this.touchpadJitterCompensation.RightToLeft = System.Windows.Forms.RightToLeft.No; this.cBTouchpadJitterCompensation.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.touchpadJitterCompensation.Size = new System.Drawing.Size(118, 17); this.cBTouchpadJitterCompensation.Size = new System.Drawing.Size(118, 17);
this.touchpadJitterCompensation.TabIndex = 224; this.cBTouchpadJitterCompensation.TabIndex = 224;
this.touchpadJitterCompensation.Text = "Jitter Compensation"; this.cBTouchpadJitterCompensation.Text = "Jitter Compensation";
this.touchpadJitterCompensation.UseVisualStyleBackColor = true; this.cBTouchpadJitterCompensation.UseVisualStyleBackColor = true;
this.touchpadJitterCompensation.CheckedChanged += new System.EventHandler(this.touchpadJitterCompensation_CheckedChanged); this.cBTouchpadJitterCompensation.CheckedChanged += new System.EventHandler(this.touchpadJitterCompensation_CheckedChanged);
// //
// lBL2 // lBL2
// //
@ -1299,18 +1295,18 @@
this.tBsixaxisAccelZ.TabIndex = 217; this.tBsixaxisAccelZ.TabIndex = 217;
this.tBsixaxisAccelZ.TickFrequency = 16384; this.tBsixaxisAccelZ.TickFrequency = 16384;
// //
// flushHIDQueue // cBFlushHIDQueue
// //
this.flushHIDQueue.AccessibleName = "flushHIDQueue"; this.cBFlushHIDQueue.AccessibleName = "flushHIDQueue";
this.flushHIDQueue.AutoSize = true; this.cBFlushHIDQueue.AutoSize = true;
this.flushHIDQueue.Location = new System.Drawing.Point(306, 45); this.cBFlushHIDQueue.Location = new System.Drawing.Point(306, 48);
this.flushHIDQueue.Name = "flushHIDQueue"; this.cBFlushHIDQueue.Name = "cBFlushHIDQueue";
this.flushHIDQueue.RightToLeft = System.Windows.Forms.RightToLeft.Yes; this.cBFlushHIDQueue.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
this.flushHIDQueue.Size = new System.Drawing.Size(73, 17); this.cBFlushHIDQueue.Size = new System.Drawing.Size(73, 17);
this.flushHIDQueue.TabIndex = 198; this.cBFlushHIDQueue.TabIndex = 198;
this.flushHIDQueue.Text = "Flush HID\r\n"; this.cBFlushHIDQueue.Text = "Flush HID\r\n";
this.flushHIDQueue.UseVisualStyleBackColor = true; this.cBFlushHIDQueue.UseVisualStyleBackColor = true;
this.flushHIDQueue.CheckedChanged += new System.EventHandler(this.flushHIDQueue_CheckedChanged); this.cBFlushHIDQueue.CheckedChanged += new System.EventHandler(this.flushHIDQueue_CheckedChanged);
// //
// tBsixaxisAccelY // tBsixaxisAccelY
// //
@ -1745,7 +1741,7 @@
// //
// gBTouchpad // gBTouchpad
// //
this.gBTouchpad.Controls.Add(this.touchpadJitterCompensation); this.gBTouchpad.Controls.Add(this.cBTouchpadJitterCompensation);
this.gBTouchpad.Controls.Add(this.cBDoubleTap); this.gBTouchpad.Controls.Add(this.cBDoubleTap);
this.gBTouchpad.Controls.Add(this.cBlowerRCOn); this.gBTouchpad.Controls.Add(this.cBlowerRCOn);
this.gBTouchpad.Controls.Add(this.cBSlide); this.gBTouchpad.Controls.Add(this.cBSlide);
@ -1765,14 +1761,11 @@
// //
this.gBOther.Controls.Add(this.nUDSixaxis); this.gBOther.Controls.Add(this.nUDSixaxis);
this.gBOther.Controls.Add(this.cBControllerInput); this.gBOther.Controls.Add(this.cBControllerInput);
this.gBOther.Controls.Add(this.nUDHideMouse);
this.gBOther.Controls.Add(this.nUDIdleDisconnect); this.gBOther.Controls.Add(this.nUDIdleDisconnect);
this.gBOther.Controls.Add(this.cBHideCursor);
this.gBOther.Controls.Add(this.cBIdleDisconnect); this.gBOther.Controls.Add(this.cBIdleDisconnect);
this.gBOther.Controls.Add(this.lBButtonMouseSens); this.gBOther.Controls.Add(this.lBButtonMouseSens);
this.gBOther.Controls.Add(this.numUDMouseSens); this.gBOther.Controls.Add(this.numUDMouseSens);
this.gBOther.Controls.Add(this.lBMouseMins); this.gBOther.Controls.Add(this.cBFlushHIDQueue);
this.gBOther.Controls.Add(this.flushHIDQueue);
this.gBOther.Controls.Add(this.lBIdleMinutes); this.gBOther.Controls.Add(this.lBIdleMinutes);
this.gBOther.Location = new System.Drawing.Point(7, 220); this.gBOther.Location = new System.Drawing.Point(7, 220);
this.gBOther.Name = "gBOther"; this.gBOther.Name = "gBOther";
@ -1816,34 +1809,6 @@
this.cBControllerInput.Text = "Use a DS4 to map"; this.cBControllerInput.Text = "Use a DS4 to map";
this.cBControllerInput.UseVisualStyleBackColor = true; this.cBControllerInput.UseVisualStyleBackColor = true;
// //
// nUDHideMouse
//
this.nUDHideMouse.DecimalPlaces = 1;
this.nUDHideMouse.Location = new System.Drawing.Point(182, 14);
this.nUDHideMouse.Maximum = new decimal(new int[] {
60,
0,
0,
0});
this.nUDHideMouse.Name = "nUDHideMouse";
this.nUDHideMouse.Size = new System.Drawing.Size(50, 20);
this.nUDHideMouse.TabIndex = 201;
this.nUDHideMouse.Visible = false;
//
// cBHideCursor
//
this.cBHideCursor.AutoSize = true;
this.cBHideCursor.Checked = true;
this.cBHideCursor.CheckState = System.Windows.Forms.CheckState.Checked;
this.cBHideCursor.Location = new System.Drawing.Point(167, 14);
this.cBHideCursor.Name = "cBHideCursor";
this.cBHideCursor.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
this.cBHideCursor.Size = new System.Drawing.Size(105, 17);
this.cBHideCursor.TabIndex = 232;
this.cBHideCursor.Text = "Hide Cursor after";
this.cBHideCursor.UseVisualStyleBackColor = true;
this.cBHideCursor.Visible = false;
//
// cBIdleDisconnect // cBIdleDisconnect
// //
this.cBIdleDisconnect.AutoSize = true; this.cBIdleDisconnect.AutoSize = true;
@ -1858,16 +1823,6 @@
this.cBIdleDisconnect.UseVisualStyleBackColor = true; this.cBIdleDisconnect.UseVisualStyleBackColor = true;
this.cBIdleDisconnect.CheckedChanged += new System.EventHandler(this.cBIdleDisconnect_CheckedChanged); this.cBIdleDisconnect.CheckedChanged += new System.EventHandler(this.cBIdleDisconnect_CheckedChanged);
// //
// lBMouseMins
//
this.lBMouseMins.AutoSize = true;
this.lBMouseMins.Location = new System.Drawing.Point(205, 21);
this.lBMouseMins.Name = "lBMouseMins";
this.lBMouseMins.Size = new System.Drawing.Size(28, 13);
this.lBMouseMins.TabIndex = 200;
this.lBMouseMins.Text = "mins";
this.lBMouseMins.Visible = false;
//
// gBLightbar // gBLightbar
// //
this.gBLightbar.Controls.Add(this.btnChargingColor); this.gBLightbar.Controls.Add(this.btnChargingColor);
@ -1875,7 +1830,7 @@
this.gBLightbar.Controls.Add(this.rBFade); this.gBLightbar.Controls.Add(this.rBFade);
this.gBLightbar.Controls.Add(this.rBNormal); this.gBLightbar.Controls.Add(this.rBNormal);
this.gBLightbar.Controls.Add(this.rBRainbow); this.gBLightbar.Controls.Add(this.rBRainbow);
this.gBLightbar.Controls.Add(this.label2); this.gBLightbar.Controls.Add(this.lbWhileCharging);
this.gBLightbar.Controls.Add(this.label1); this.gBLightbar.Controls.Add(this.label1);
this.gBLightbar.Controls.Add(this.lBFlashAt); this.gBLightbar.Controls.Add(this.lBFlashAt);
this.gBLightbar.Controls.Add(this.pBRainbow); this.gBLightbar.Controls.Add(this.pBRainbow);
@ -1884,7 +1839,7 @@
this.gBLightbar.Controls.Add(this.nUDRainbow); this.gBLightbar.Controls.Add(this.nUDRainbow);
this.gBLightbar.Controls.Add(this.FullPanel); this.gBLightbar.Controls.Add(this.FullPanel);
this.gBLightbar.Controls.Add(this.lBspc); this.gBLightbar.Controls.Add(this.lBspc);
this.gBLightbar.Controls.Add(this.batteryLed); this.gBLightbar.Controls.Add(this.cBLightbyBattery);
this.gBLightbar.Location = new System.Drawing.Point(440, 76); this.gBLightbar.Location = new System.Drawing.Point(440, 76);
this.gBLightbar.Name = "gBLightbar"; this.gBLightbar.Name = "gBLightbar";
this.gBLightbar.Size = new System.Drawing.Size(438, 129); this.gBLightbar.Size = new System.Drawing.Size(438, 129);
@ -1951,14 +1906,14 @@
this.rBRainbow.UseVisualStyleBackColor = true; this.rBRainbow.UseVisualStyleBackColor = true;
this.rBRainbow.CheckedChanged += new System.EventHandler(this.rBRainbow_CheckedChanged); this.rBRainbow.CheckedChanged += new System.EventHandler(this.rBRainbow_CheckedChanged);
// //
// label2 // lbWhileCharging
// //
this.label2.AutoSize = true; this.lbWhileCharging.AutoSize = true;
this.label2.Location = new System.Drawing.Point(9, 108); this.lbWhileCharging.Location = new System.Drawing.Point(9, 108);
this.label2.Name = "label2"; this.lbWhileCharging.Name = "lbWhileCharging";
this.label2.Size = new System.Drawing.Size(82, 13); this.lbWhileCharging.Size = new System.Drawing.Size(82, 13);
this.label2.TabIndex = 236; this.lbWhileCharging.TabIndex = 236;
this.label2.Text = "While Charging:"; this.lbWhileCharging.Text = "While Charging:";
// //
// label1 // label1
// //
@ -2112,7 +2067,6 @@
this.gBOther.ResumeLayout(false); this.gBOther.ResumeLayout(false);
this.gBOther.PerformLayout(); this.gBOther.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.nUDSixaxis)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nUDSixaxis)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nUDHideMouse)).EndInit();
this.gBLightbar.ResumeLayout(false); this.gBLightbar.ResumeLayout(false);
this.gBLightbar.PerformLayout(); this.gBLightbar.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.nUDflashLED)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nUDflashLED)).EndInit();
@ -2174,7 +2128,7 @@
private System.Windows.Forms.TrackBar blueBar; private System.Windows.Forms.TrackBar blueBar;
private System.Windows.Forms.TrackBar greenBar; private System.Windows.Forms.TrackBar greenBar;
private System.Windows.Forms.TrackBar redBar; private System.Windows.Forms.TrackBar redBar;
private System.Windows.Forms.CheckBox batteryLed; private System.Windows.Forms.CheckBox cBLightbyBattery;
private System.Windows.Forms.Label lBBlue; private System.Windows.Forms.Label lBBlue;
private System.Windows.Forms.Label lBGreen; private System.Windows.Forms.Label lBGreen;
private System.Windows.Forms.Label lBspc; private System.Windows.Forms.Label lBspc;
@ -2188,14 +2142,14 @@
private System.Windows.Forms.NumericUpDown nUDTouch; private System.Windows.Forms.NumericUpDown nUDTouch;
private System.Windows.Forms.Label lBButtonMouseSens; private System.Windows.Forms.Label lBButtonMouseSens;
private System.Windows.Forms.CheckBox cBlowerRCOn; private System.Windows.Forms.CheckBox cBlowerRCOn;
private System.Windows.Forms.CheckBox touchpadJitterCompensation; private System.Windows.Forms.CheckBox cBTouchpadJitterCompensation;
private System.Windows.Forms.Label lBL2; private System.Windows.Forms.Label lBL2;
private System.Windows.Forms.Label lBR2; private System.Windows.Forms.Label lBR2;
private System.Windows.Forms.Label lBIdleMinutes; private System.Windows.Forms.Label lBIdleMinutes;
private System.Windows.Forms.NumericUpDown nUDIdleDisconnect; private System.Windows.Forms.NumericUpDown nUDIdleDisconnect;
private System.Windows.Forms.NumericUpDown nUDR2; private System.Windows.Forms.NumericUpDown nUDR2;
private System.Windows.Forms.TrackBar tBsixaxisAccelZ; private System.Windows.Forms.TrackBar tBsixaxisAccelZ;
private System.Windows.Forms.CheckBox flushHIDQueue; private System.Windows.Forms.CheckBox cBFlushHIDQueue;
private System.Windows.Forms.TrackBar tBsixaxisAccelY; private System.Windows.Forms.TrackBar tBsixaxisAccelY;
private System.Windows.Forms.Label leftMotorLabel; private System.Windows.Forms.Label leftMotorLabel;
private System.Windows.Forms.TrackBar tBsixaxisAccelX; private System.Windows.Forms.TrackBar tBsixaxisAccelX;
@ -2245,13 +2199,10 @@
private System.Windows.Forms.RadioButton rBFade; private System.Windows.Forms.RadioButton rBFade;
private System.Windows.Forms.RadioButton rBNormal; private System.Windows.Forms.RadioButton rBNormal;
private System.Windows.Forms.RadioButton rBRainbow; private System.Windows.Forms.RadioButton rBRainbow;
private System.Windows.Forms.Label label2; private System.Windows.Forms.Label lbWhileCharging;
private System.Windows.Forms.Button btnChargingColor; private System.Windows.Forms.Button btnChargingColor;
private System.Windows.Forms.RadioButton rBColor; private System.Windows.Forms.RadioButton rBColor;
private System.Windows.Forms.CheckBox cBIdleDisconnect; private System.Windows.Forms.CheckBox cBIdleDisconnect;
private System.Windows.Forms.NumericUpDown nUDHideMouse;
private System.Windows.Forms.CheckBox cBHideCursor;
private System.Windows.Forms.Label lBMouseMins;
} }
} }
 

View File

@ -14,7 +14,7 @@ namespace ScpServer
public int device; public int device;
public string filename; public string filename;
Byte[] oldLedColor, oldLowLedColor, oldChargingColor; Byte[] oldLedColor, oldLowLedColor, oldChargingColor;
Timer inputtimer = new Timer(), sixaxisTimer = new Timer(); public Timer inputtimer = new Timer(), sixaxisTimer = new Timer();
public List<Button> buttons = new List<Button>(); public List<Button> buttons = new List<Button>();
private Button lastSelected; private Button lastSelected;
private int alphacolor; private int alphacolor;
@ -45,11 +45,11 @@ namespace ScpServer
greenBar.Value = color.green; greenBar.Value = color.green;
blueBar.Value = color.blue; blueBar.Value = color.blue;
batteryLed.Checked = Global.getLedAsBatteryIndicator(device); cBLightbyBattery.Checked = Global.getLedAsBatteryIndicator(device);
nUDflashLED.Value = Global.getFlashAt(device); nUDflashLED.Value = Global.getFlashAt(device);
lowBatteryPanel.Visible = batteryLed.Checked; lowBatteryPanel.Visible = cBLightbyBattery.Checked;
lbFull.Text = (batteryLed.Checked ? "Full:" : "Color:"); lbFull.Text = (cBLightbyBattery.Checked ? "Full:" : "Color:");
FullPanel.Location = (batteryLed.Checked ? new Point(FullPanel.Location.X, 42) : new Point(FullPanel.Location.X, 48)); FullPanel.Location = (cBLightbyBattery.Checked ? new Point(FullPanel.Location.X, 42) : new Point(FullPanel.Location.X, 48));
DS4Color lowColor = Global.loadLowColor(device); DS4Color lowColor = Global.loadLowColor(device);
lowRedBar.Value = lowColor.red; lowRedBar.Value = lowColor.red;
@ -68,9 +68,9 @@ namespace ScpServer
cBDoubleTap.Checked = Global.getDoubleTap(device); cBDoubleTap.Checked = Global.getDoubleTap(device);
nUDL2.Value = (decimal)Global.getLeftTriggerMiddle(device)/255; nUDL2.Value = (decimal)Global.getLeftTriggerMiddle(device)/255;
nUDR2.Value = (decimal)Global.getRightTriggerMiddle(device)/255; nUDR2.Value = (decimal)Global.getRightTriggerMiddle(device)/255;
touchpadJitterCompensation.Checked = Global.getTouchpadJitterCompensation(device); cBTouchpadJitterCompensation.Checked = Global.getTouchpadJitterCompensation(device);
cBlowerRCOn.Checked = Global.getLowerRCOn(device); cBlowerRCOn.Checked = Global.getLowerRCOn(device);
flushHIDQueue.Checked = Global.getFlushHIDQueue(device); cBFlushHIDQueue.Checked = Global.getFlushHIDQueue(device);
nUDIdleDisconnect.Value = Math.Round((decimal)(Global.getIdleDisconnectTimeout(device) / 60d), 1); nUDIdleDisconnect.Value = Math.Round((decimal)(Global.getIdleDisconnectTimeout(device) / 60d), 1);
cBIdleDisconnect.Checked = Global.getIdleDisconnectTimeout(device) > 0; cBIdleDisconnect.Checked = Global.getIdleDisconnectTimeout(device) > 0;
numUDMouseSens.Value = Global.getButtonMouseSensitivity(device); numUDMouseSens.Value = Global.getButtonMouseSensitivity(device);
@ -129,9 +129,10 @@ namespace ScpServer
tp.SetToolTip(cBlowerRCOn, "Best used with right side as a mouse function"); tp.SetToolTip(cBlowerRCOn, "Best used with right side as a mouse function");
tp.SetToolTip(cBDoubleTap, "Tap and hold to drag, slight delay with single taps"); tp.SetToolTip(cBDoubleTap, "Tap and hold to drag, slight delay with single taps");
tp.SetToolTip(lBControlTip, "You can also use your controller to change controls"); tp.SetToolTip(lBControlTip, "You can also use your controller to change controls");
tp.SetToolTip(touchpadJitterCompensation, "Use Sixaxis to help calulate touchpad movement"); tp.SetToolTip(cBTouchpadJitterCompensation, "Use Sixaxis to help calculate touchpad movement");
tp.SetToolTip(pBRainbow, "Always on Rainbow Mode"); tp.SetToolTip(pBRainbow, "Always on Rainbow Mode");
tp.SetToolTip(flushHIDQueue, "Flush HID Queue after each reading"); tp.SetToolTip(cBFlushHIDQueue, "Flush HID Queue after each reading");
tp.SetToolTip(cBLightbyBattery, "Also dim light by idle timeout if on");
advColorDialog.OnUpdateColor += advColorDialog_OnUpdateColor; advColorDialog.OnUpdateColor += advColorDialog_OnUpdateColor;
btnLeftStick.Enter += btnSticks_Enter; btnLeftStick.Enter += btnSticks_Enter;
btnRightStick.Enter += btnSticks_Enter; btnRightStick.Enter += btnSticks_Enter;
@ -239,16 +240,16 @@ namespace ScpServer
public void Set() public void Set()
{ {
lowBatteryPanel.Visible = batteryLed.Checked; lowBatteryPanel.Visible = cBLightbyBattery.Checked;
lbFull.Text = (batteryLed.Checked ? "Full:" : "Color:"); lbFull.Text = (cBLightbyBattery.Checked ? "Full:" : "Color:");
FullPanel.Location = (batteryLed.Checked ? new Point(FullPanel.Location.X, 42) : new Point(FullPanel.Location.X, 48)); FullPanel.Location = (cBLightbyBattery.Checked ? new Point(FullPanel.Location.X, 42) : new Point(FullPanel.Location.X, 48));
Global.saveColor(device, (byte)redBar.Value, (byte)greenBar.Value, (byte)blueBar.Value); Global.saveColor(device, (byte)redBar.Value, (byte)greenBar.Value, (byte)blueBar.Value);
Global.saveLowColor(device, (byte)lowRedBar.Value, (byte)lowGreenBar.Value, (byte)lowBlueBar.Value); Global.saveLowColor(device, (byte)lowRedBar.Value, (byte)lowGreenBar.Value, (byte)lowBlueBar.Value);
Global.setLeftTriggerMiddle(device, (byte)Math.Round((nUDL2.Value * 255), 0)); Global.setLeftTriggerMiddle(device, (byte)Math.Round((nUDL2.Value * 255), 0));
Global.setRightTriggerMiddle(device, (byte)Math.Round((nUDR2.Value * 255), 0)); Global.setRightTriggerMiddle(device, (byte)Math.Round((nUDR2.Value * 255), 0));
Global.saveRumbleBoost(device, (byte)nUDRumbleBoost.Value); Global.saveRumbleBoost(device, (byte)nUDRumbleBoost.Value);
Global.setTouchSensitivity(device, (byte)nUDTouch.Value); Global.setTouchSensitivity(device, (byte)nUDTouch.Value);
Global.setTouchpadJitterCompensation(device, touchpadJitterCompensation.Checked); Global.setTouchpadJitterCompensation(device, cBTouchpadJitterCompensation.Checked);
Global.setLowerRCOn(device, cBlowerRCOn.Checked); Global.setLowerRCOn(device, cBlowerRCOn.Checked);
Global.setScrollSensitivity(device, (byte)nUDScroll.Value); Global.setScrollSensitivity(device, (byte)nUDScroll.Value);
Global.setDoubleTap(device, cBDoubleTap.Checked); Global.setDoubleTap(device, cBDoubleTap.Checked);
@ -566,10 +567,10 @@ namespace ScpServer
} }
private void ledAsBatteryIndicator_CheckedChanged(object sender, EventArgs e) private void ledAsBatteryIndicator_CheckedChanged(object sender, EventArgs e)
{ {
Global.setLedAsBatteryIndicator(device, batteryLed.Checked); Global.setLedAsBatteryIndicator(device, cBLightbyBattery.Checked);
lowBatteryPanel.Visible = batteryLed.Checked; lowBatteryPanel.Visible = cBLightbyBattery.Checked;
FullPanel.Location = (batteryLed.Checked ? new Point(FullPanel.Location.X, 42) : new Point(FullPanel.Location.X, 48)); FullPanel.Location = (cBLightbyBattery.Checked ? new Point(FullPanel.Location.X, 42) : new Point(FullPanel.Location.X, 48));
lbFull.Text = (batteryLed.Checked ? "Full:" : "Color:"); lbFull.Text = (cBLightbyBattery.Checked ? "Full:" : "Color:");
} }
private void lowerRCOffCheckBox_CheckedChanged(object sender, EventArgs e) private void lowerRCOffCheckBox_CheckedChanged(object sender, EventArgs e)
@ -579,12 +580,12 @@ namespace ScpServer
private void touchpadJitterCompensation_CheckedChanged(object sender, EventArgs e) private void touchpadJitterCompensation_CheckedChanged(object sender, EventArgs e)
{ {
Global.setTouchpadJitterCompensation(device, touchpadJitterCompensation.Checked); Global.setTouchpadJitterCompensation(device, cBTouchpadJitterCompensation.Checked);
} }
private void flushHIDQueue_CheckedChanged(object sender, EventArgs e) private void flushHIDQueue_CheckedChanged(object sender, EventArgs e)
{ {
Global.setFlushHIDQueue(device, flushHIDQueue.Checked); Global.setFlushHIDQueue(device, cBFlushHIDQueue.Checked);
} }
private void nUDIdleDisconnect_ValueChanged(object sender, EventArgs e) private void nUDIdleDisconnect_ValueChanged(object sender, EventArgs e)
@ -785,14 +786,14 @@ namespace ScpServer
{ {
//pBRainbow.Location = new Point(216 - 78, pBRainbow.Location.Y); //pBRainbow.Location = new Point(216 - 78, pBRainbow.Location.Y);
pBController.BackgroundImage = Properties.Resources.rainbowC; pBController.BackgroundImage = Properties.Resources.rainbowC;
batteryLed.Text = "Dim by Battery %"; cBLightbyBattery.Text = "Dim by Battery %";
} }
else else
{ {
lowBatteryPanel.Enabled = batteryLed.Checked; lowBatteryPanel.Enabled = cBLightbyBattery.Checked;
//pBRainbow.Location = new Point(216, pBRainbow.Location.Y); //pBRainbow.Location = new Point(216, pBRainbow.Location.Y);
pBController.BackgroundImage = null; pBController.BackgroundImage = null;
batteryLed.Text = "Color by Battery %"; cBLightbyBattery.Text = "Color by Battery %";
} }
lBspc.Enabled = on; lBspc.Enabled = on;
lowBatteryPanel.Enabled = !on; lowBatteryPanel.Enabled = !on;

View File

@ -120,4 +120,10 @@
<data name="Disconnected" xml:space="preserve"> <data name="Disconnected" xml:space="preserve">
<value>Desconectado</value> <value>Desconectado</value>
</data> </data>
<data name="StartText" xml:space="preserve">
<value>Empiezo</value>
</data>
<data name="StopText" xml:space="preserve">
<value>Deténgase</value>
</data>
</root> </root>

View File

@ -256,4 +256,13 @@
<data name="_360_fades" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="_360_fades" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\360 fades.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\360 fades.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="Disconnected" xml:space="preserve">
<value>Disconnected</value>
</data>
<data name="StartText" xml:space="preserve">
<value>Start</value>
</data>
<data name="StopText" xml:space="preserve">
<value>Stop</value>
</data>
</root> </root>

View File

@ -22,7 +22,7 @@ namespace ScpServer.Properties {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class Resources { internal class Resources {
private static global::System.Resources.ResourceManager resourceMan; private static global::System.Resources.ResourceManager resourceMan;
@ -36,7 +36,7 @@ namespace ScpServer.Properties {
/// Returns the cached ResourceManager instance used by this class. /// Returns the cached ResourceManager instance used by this class.
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
public static global::System.Resources.ResourceManager ResourceManager { internal static global::System.Resources.ResourceManager ResourceManager {
get { get {
if (object.ReferenceEquals(resourceMan, null)) { if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ScpServer.Properties.Resources", typeof(Resources).Assembly); global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ScpServer.Properties.Resources", typeof(Resources).Assembly);
@ -51,7 +51,7 @@ namespace ScpServer.Properties {
/// resource lookups using this strongly typed resource class. /// resource lookups using this strongly typed resource class.
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
public static global::System.Globalization.CultureInfo Culture { internal static global::System.Globalization.CultureInfo Culture {
get { get {
return resourceCulture; return resourceCulture;
} }
@ -63,7 +63,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap _360_fades { internal static System.Drawing.Bitmap _360_fades {
get { get {
object obj = ResourceManager.GetObject("_360_fades", resourceCulture); object obj = ResourceManager.GetObject("_360_fades", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -73,7 +73,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap A { internal static System.Drawing.Bitmap A {
get { get {
object obj = ResourceManager.GetObject("A", resourceCulture); object obj = ResourceManager.GetObject("A", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -83,7 +83,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap B { internal static System.Drawing.Bitmap B {
get { get {
object obj = ResourceManager.GetObject("B", resourceCulture); object obj = ResourceManager.GetObject("B", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -93,7 +93,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap BACK { internal static System.Drawing.Bitmap BACK {
get { get {
object obj = ResourceManager.GetObject("BACK", resourceCulture); object obj = ResourceManager.GetObject("BACK", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -103,7 +103,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap BT { internal static System.Drawing.Bitmap BT {
get { get {
object obj = ResourceManager.GetObject("BT", resourceCulture); object obj = ResourceManager.GetObject("BT", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -113,7 +113,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap copy { internal static System.Drawing.Bitmap copy {
get { get {
object obj = ResourceManager.GetObject("copy", resourceCulture); object obj = ResourceManager.GetObject("copy", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -123,17 +123,26 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap delete { internal static System.Drawing.Bitmap delete {
get { get {
object obj = ResourceManager.GetObject("delete", resourceCulture); object obj = ResourceManager.GetObject("delete", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
} }
} }
/// <summary>
/// Looks up a localized string similar to Disconnected.
/// </summary>
internal static string Disconnected {
get {
return ResourceManager.GetString("Disconnected", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap DOWN { internal static System.Drawing.Bitmap DOWN {
get { get {
object obj = ResourceManager.GetObject("DOWN", resourceCulture); object obj = ResourceManager.GetObject("DOWN", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -143,7 +152,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
/// </summary> /// </summary>
public static System.Drawing.Icon DS4 { internal static System.Drawing.Icon DS4 {
get { get {
object obj = ResourceManager.GetObject("DS4", resourceCulture); object obj = ResourceManager.GetObject("DS4", resourceCulture);
return ((System.Drawing.Icon)(obj)); return ((System.Drawing.Icon)(obj));
@ -153,7 +162,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap DS4_Controller { internal static System.Drawing.Bitmap DS4_Controller {
get { get {
object obj = ResourceManager.GetObject("DS4_Controller", resourceCulture); object obj = ResourceManager.GetObject("DS4_Controller", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -163,7 +172,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap edit { internal static System.Drawing.Bitmap edit {
get { get {
object obj = ResourceManager.GetObject("edit", resourceCulture); object obj = ResourceManager.GetObject("edit", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -173,7 +182,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap export { internal static System.Drawing.Bitmap export {
get { get {
object obj = ResourceManager.GetObject("export", resourceCulture); object obj = ResourceManager.GetObject("export", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -183,7 +192,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap import { internal static System.Drawing.Bitmap import {
get { get {
object obj = ResourceManager.GetObject("import", resourceCulture); object obj = ResourceManager.GetObject("import", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -193,7 +202,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap LB { internal static System.Drawing.Bitmap LB {
get { get {
object obj = ResourceManager.GetObject("LB", resourceCulture); object obj = ResourceManager.GetObject("LB", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -203,7 +212,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap LEFT { internal static System.Drawing.Bitmap LEFT {
get { get {
object obj = ResourceManager.GetObject("LEFT", resourceCulture); object obj = ResourceManager.GetObject("LEFT", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -213,7 +222,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap LeftTouch { internal static System.Drawing.Bitmap LeftTouch {
get { get {
object obj = ResourceManager.GetObject("LeftTouch", resourceCulture); object obj = ResourceManager.GetObject("LeftTouch", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -223,7 +232,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap LS { internal static System.Drawing.Bitmap LS {
get { get {
object obj = ResourceManager.GetObject("LS", resourceCulture); object obj = ResourceManager.GetObject("LS", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -233,7 +242,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap LSD { internal static System.Drawing.Bitmap LSD {
get { get {
object obj = ResourceManager.GetObject("LSD", resourceCulture); object obj = ResourceManager.GetObject("LSD", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -243,7 +252,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap LSL { internal static System.Drawing.Bitmap LSL {
get { get {
object obj = ResourceManager.GetObject("LSL", resourceCulture); object obj = ResourceManager.GetObject("LSL", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -253,7 +262,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap LSR { internal static System.Drawing.Bitmap LSR {
get { get {
object obj = ResourceManager.GetObject("LSR", resourceCulture); object obj = ResourceManager.GetObject("LSR", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -263,7 +272,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap LSU { internal static System.Drawing.Bitmap LSU {
get { get {
object obj = ResourceManager.GetObject("LSU", resourceCulture); object obj = ResourceManager.GetObject("LSU", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -273,7 +282,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap LT { internal static System.Drawing.Bitmap LT {
get { get {
object obj = ResourceManager.GetObject("LT", resourceCulture); object obj = ResourceManager.GetObject("LT", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -283,7 +292,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap mouse { internal static System.Drawing.Bitmap mouse {
get { get {
object obj = ResourceManager.GetObject("mouse", resourceCulture); object obj = ResourceManager.GetObject("mouse", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -293,7 +302,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap MultiTouch { internal static System.Drawing.Bitmap MultiTouch {
get { get {
object obj = ResourceManager.GetObject("MultiTouch", resourceCulture); object obj = ResourceManager.GetObject("MultiTouch", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -303,7 +312,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap newprofile { internal static System.Drawing.Bitmap newprofile {
get { get {
object obj = ResourceManager.GetObject("newprofile", resourceCulture); object obj = ResourceManager.GetObject("newprofile", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -313,7 +322,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap none { internal static System.Drawing.Bitmap none {
get { get {
object obj = ResourceManager.GetObject("none", resourceCulture); object obj = ResourceManager.GetObject("none", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -323,7 +332,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap Pairmode { internal static System.Drawing.Bitmap Pairmode {
get { get {
object obj = ResourceManager.GetObject("Pairmode", resourceCulture); object obj = ResourceManager.GetObject("Pairmode", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -333,7 +342,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap rainbow { internal static System.Drawing.Bitmap rainbow {
get { get {
object obj = ResourceManager.GetObject("rainbow", resourceCulture); object obj = ResourceManager.GetObject("rainbow", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -343,7 +352,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap rainbowC { internal static System.Drawing.Bitmap rainbowC {
get { get {
object obj = ResourceManager.GetObject("rainbowC", resourceCulture); object obj = ResourceManager.GetObject("rainbowC", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -353,7 +362,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap RB { internal static System.Drawing.Bitmap RB {
get { get {
object obj = ResourceManager.GetObject("RB", resourceCulture); object obj = ResourceManager.GetObject("RB", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -363,7 +372,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap RIGHT { internal static System.Drawing.Bitmap RIGHT {
get { get {
object obj = ResourceManager.GetObject("RIGHT", resourceCulture); object obj = ResourceManager.GetObject("RIGHT", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -373,7 +382,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap RightTouch { internal static System.Drawing.Bitmap RightTouch {
get { get {
object obj = ResourceManager.GetObject("RightTouch", resourceCulture); object obj = ResourceManager.GetObject("RightTouch", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -383,7 +392,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap RS { internal static System.Drawing.Bitmap RS {
get { get {
object obj = ResourceManager.GetObject("RS", resourceCulture); object obj = ResourceManager.GetObject("RS", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -393,7 +402,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap RSD { internal static System.Drawing.Bitmap RSD {
get { get {
object obj = ResourceManager.GetObject("RSD", resourceCulture); object obj = ResourceManager.GetObject("RSD", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -403,7 +412,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap RSL { internal static System.Drawing.Bitmap RSL {
get { get {
object obj = ResourceManager.GetObject("RSL", resourceCulture); object obj = ResourceManager.GetObject("RSL", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -413,7 +422,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap RSR { internal static System.Drawing.Bitmap RSR {
get { get {
object obj = ResourceManager.GetObject("RSR", resourceCulture); object obj = ResourceManager.GetObject("RSR", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -423,7 +432,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap RSU { internal static System.Drawing.Bitmap RSU {
get { get {
object obj = ResourceManager.GetObject("RSU", resourceCulture); object obj = ResourceManager.GetObject("RSU", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -433,7 +442,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap RT { internal static System.Drawing.Bitmap RT {
get { get {
object obj = ResourceManager.GetObject("RT", resourceCulture); object obj = ResourceManager.GetObject("RT", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -443,7 +452,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap saveprofile { internal static System.Drawing.Bitmap saveprofile {
get { get {
object obj = ResourceManager.GetObject("saveprofile", resourceCulture); object obj = ResourceManager.GetObject("saveprofile", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -453,27 +462,45 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap START { internal static System.Drawing.Bitmap START {
get { get {
object obj = ResourceManager.GetObject("START", resourceCulture); object obj = ResourceManager.GetObject("START", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
} }
} }
/// <summary>
/// Looks up a localized string similar to Start.
/// </summary>
internal static string StartText {
get {
return ResourceManager.GetString("StartText", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap sticks { internal static System.Drawing.Bitmap sticks {
get { get {
object obj = ResourceManager.GetObject("sticks", resourceCulture); object obj = ResourceManager.GetObject("sticks", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
} }
} }
/// <summary>
/// Looks up a localized string similar to Stop.
/// </summary>
internal static string StopText {
get {
return ResourceManager.GetString("StopText", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap UP { internal static System.Drawing.Bitmap UP {
get { get {
object obj = ResourceManager.GetObject("UP", resourceCulture); object obj = ResourceManager.GetObject("UP", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -483,7 +510,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap UpperTouch { internal static System.Drawing.Bitmap UpperTouch {
get { get {
object obj = ResourceManager.GetObject("UpperTouch", resourceCulture); object obj = ResourceManager.GetObject("UpperTouch", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -493,7 +520,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap USB { internal static System.Drawing.Bitmap USB {
get { get {
object obj = ResourceManager.GetObject("USB", resourceCulture); object obj = ResourceManager.GetObject("USB", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -503,7 +530,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap X { internal static System.Drawing.Bitmap X {
get { get {
object obj = ResourceManager.GetObject("X", resourceCulture); object obj = ResourceManager.GetObject("X", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
@ -513,7 +540,7 @@ namespace ScpServer.Properties {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
public static System.Drawing.Bitmap Y { internal static System.Drawing.Bitmap Y {
get { get {
object obj = ResourceManager.GetObject("Y", resourceCulture); object obj = ResourceManager.GetObject("Y", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));

View File

@ -5,6 +5,7 @@ using System.Data;
using System.Diagnostics; using System.Diagnostics;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
@ -21,6 +22,7 @@ namespace ScpServer
{ {
kbm = op; kbm = op;
InitializeComponent(); InitializeComponent();
if (op != null)
if (kbm.macrorepeat) if (kbm.macrorepeat)
cBStyle.SelectedIndex = 1; cBStyle.SelectedIndex = 1;
else else
@ -61,20 +63,24 @@ namespace ScpServer
pnlMouseButtons.Visible = !on; pnlMouseButtons.Visible = !on;
} }
[DllImport("user32.dll")]
private static extern short GetAsyncKeyState(Keys key);
private void anyKeyDown(object sender, KeyEventArgs e) private void anyKeyDown(object sender, KeyEventArgs e)
{ {
if (btnRecord.Text == "Stop") if (btnRecord.Text == "Stop")
{ {
int value = WhichKey(e, 0);
int count = 0; int count = 0;
foreach (int i in macros) foreach (int i in macros)
{ {
if (i == e.KeyValue) if (i == value)
count++; count++;
} }
if (macros.Count == 0) if (macros.Count == 0)
{ {
macros.Add(e.KeyValue); macros.Add(value);
lVMacros.Items.Add(e.KeyCode.ToString(), 0); lVMacros.Items.Add(((Keys)value).ToString(), 0);
if (cBRecordDelays.Checked) if (cBRecordDelays.Checked)
{ {
sw.Reset(); sw.Reset();
@ -90,35 +96,86 @@ namespace ScpServer
sw.Reset(); sw.Reset();
sw.Start(); sw.Start();
} }
macros.Add(e.KeyValue); macros.Add(value);
lVMacros.Items.Add(e.KeyCode.ToString(), 0); lVMacros.Items.Add(((Keys)value).ToString(), 0);
} }
lVMacros.Items[lVMacros.Items.Count - 1].EnsureVisible(); lVMacros.Items[lVMacros.Items.Count - 1].EnsureVisible();
} }
else else if (e.KeyValue == 27)
Close();
}
private int WhichKey(KeyEventArgs e, int keystate)
{
if (keystate == 1)
{ {
if (e.KeyValue == 27) if (e.KeyCode == Keys.ShiftKey)
Close(); {
for (int i = macros.Count - 1; i >= 0; i--)
if (macros[i] == 160)
return 160;
else if (macros[i] == 161)
return 161;
}
else if (e.KeyCode == Keys.ControlKey)
{
for (int i = macros.Count - 1; i >= 0; i--)
if (macros[i] == 162)
return 162;
else if (macros[i] == 163)
return 163;
}
else if (e.KeyCode == Keys.Menu)
{
for (int i = macros.Count - 1; i >= 0; i--)
if (macros[i] == 164)
return 164;
else if (macros[i] == 165)
return 165;
}
return e.KeyValue;
} }
else
if (e.KeyCode == Keys.ShiftKey)
{
if (Convert.ToBoolean(GetAsyncKeyState(Keys.LShiftKey)))
return 160;
if (Convert.ToBoolean(GetAsyncKeyState(Keys.RShiftKey)))
return 161;
}
else if (e.KeyCode == Keys.ControlKey)
{
if (Convert.ToBoolean(GetAsyncKeyState(Keys.LControlKey)))
return 162;
if (Convert.ToBoolean(GetAsyncKeyState(Keys.RControlKey)))
return 163;
}
else if (e.KeyCode == Keys.Menu)
{
e.Handled = true;
if (Convert.ToBoolean(GetAsyncKeyState(Keys.LMenu)))
return 164;
if (Convert.ToBoolean(GetAsyncKeyState(Keys.RMenu)))
return 165;
}
return e.KeyValue;
} }
private void anyKeyUp(object sender, KeyEventArgs e) private void anyKeyUp(object sender, KeyEventArgs e)
{ {
if (btnRecord.Text == "Stop" && macros.Count != 0 && !e.KeyCode.ToString().Contains("Media")) if (btnRecord.Text == "Stop" && macros.Count != 0)
{ {
int value = WhichKey(e, 1);
if (cBRecordDelays.Checked) if (cBRecordDelays.Checked)
{ {
macros.Add((int)sw.ElapsedMilliseconds + 300); macros.Add((int)sw.ElapsedMilliseconds + 300);
lVMacros.Items.Add("Wait " + sw.ElapsedMilliseconds + "ms", 2); lVMacros.Items.Add("Wait " + sw.ElapsedMilliseconds + "ms", 2);
macros.Add(e.KeyValue);
sw.Reset(); sw.Reset();
sw.Start(); sw.Start();
} }
else macros.Add(value);
{ lVMacros.Items.Add(((Keys)value).ToString(), 1);
macros.Add(e.KeyValue);
}
lVMacros.Items.Add(e.KeyCode.ToString(), 1);
lVMacros.Items[lVMacros.Items.Count - 1].EnsureVisible(); lVMacros.Items[lVMacros.Items.Count - 1].EnsureVisible();
} }
} }
@ -248,11 +305,19 @@ namespace ScpServer
case Keys.Left: case Keys.Left:
case Keys.Up: case Keys.Up:
case Keys.Down: case Keys.Down:
case Keys.Tab:
case Keys.MediaPlayPause:
case Keys.MediaPreviousTrack:
case Keys.MediaNextTrack:
return true; return true;
case Keys.Shift | Keys.Right: case Keys.Shift | Keys.Right:
case Keys.Shift | Keys.Left: case Keys.Shift | Keys.Left:
case Keys.Shift | Keys.Up: case Keys.Shift | Keys.Up:
case Keys.Shift | Keys.Down: case Keys.Shift | Keys.Down:
case Keys.Shift | Keys.Tab:
case Keys.Shift | Keys.MediaPlayPause:
case Keys.Shift | Keys.MediaPreviousTrack:
case Keys.Shift | Keys.MediaNextTrack:
return true; return true;
} }
return base.IsInputKey(keyData); return base.IsInputKey(keyData);
@ -266,6 +331,10 @@ namespace ScpServer
case Keys.Right: case Keys.Right:
case Keys.Up: case Keys.Up:
case Keys.Down: case Keys.Down:
case Keys.Tab:
case Keys.MediaPlayPause:
case Keys.MediaPreviousTrack:
case Keys.MediaNextTrack:
if (e.Shift) if (e.Shift)
{ {

View File

View File

@ -45,7 +45,7 @@
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(177, 39); this.label4.Size = new System.Drawing.Size(177, 39);
this.label4.TabIndex = 9; this.label4.TabIndex = 9;
this.label4.Text = "For those who prefer a regular install\r\nSettings saved at \r\n%appdata%/ds4tool"; this.label4.Text = "For those who prefer a regular install\r\nSettings saved at\r\n%appdata%/ds4tool";
this.label4.TextAlign = System.Drawing.ContentAlignment.TopCenter; this.label4.TextAlign = System.Drawing.ContentAlignment.TopCenter;
// //
// label3 // label3
@ -56,8 +56,8 @@
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(195, 39); this.label3.Size = new System.Drawing.Size(195, 39);
this.label3.TabIndex = 10; this.label3.TabIndex = 10;
this.label3.Text = "For those who prefer a portable program\r\nNote: this option does not\r\n work if in " + this.label3.Text = "For those who prefer a portable program\r\nNote: this option does not\r\nwork if in a" +
"an admin folder w/o UAC"; "n admin folder w/o UAC";
this.label3.TextAlign = System.Drawing.ContentAlignment.TopCenter; this.label3.TextAlign = System.Drawing.ContentAlignment.TopCenter;
// //
// bnAppdataFolder // bnAppdataFolder

File diff suppressed because it is too large Load Diff

View File

@ -17,7 +17,7 @@ namespace ScpServer
{ {
public partial class ScpForm : Form public partial class ScpForm : Form
{ {
double version = 10.45; double version = 10.55;
private DS4Control.Control rootHub; private DS4Control.Control rootHub;
delegate void LogDebugDelegate(DateTime Time, String Data); delegate void LogDebugDelegate(DateTime Time, String Data);
@ -88,6 +88,7 @@ namespace ScpServer
ToolTip tt = new ToolTip(); ToolTip tt = new ToolTip();
if (File.Exists(appdatapath + "\\Profiles.xml")) if (File.Exists(appdatapath + "\\Profiles.xml"))
tt.SetToolTip(linkUninstall, "If removing DS4Windows, You can delete the settings following the profile folder link"); tt.SetToolTip(linkUninstall, "If removing DS4Windows, You can delete the settings following the profile folder link");
tt.SetToolTip(cBSwipeProfiles, "2 finger swipe touchpad left or right to change profiles");
} }
public static string GetTopWindowName() public static string GetTopWindowName()
@ -216,6 +217,7 @@ namespace ScpServer
if (btnStartStop.Enabled) if (btnStartStop.Enabled)
btnStartStop_Clicked(); btnStartStop_Clicked();
cBNotifications.Checked = Global.getNotifications(); cBNotifications.Checked = Global.getNotifications();
cBSwipeProfiles.Checked = Global.getSwipeProfiles();
int checkwhen = Global.getCheckWhen(); int checkwhen = Global.getCheckWhen();
cBUpdate.Checked = checkwhen > 0; cBUpdate.Checked = checkwhen > 0;
if (checkwhen > 23) if (checkwhen > 23)
@ -256,26 +258,26 @@ namespace ScpServer
{ {
lBTest.Visible = true; lBTest.Visible = true;
lBTest.Text = Mapping.getByteMapping(DS4Controls.R1, rootHub.getDS4State(0)).ToString() + " " + rootHub.getDS4StateMapped(0).R2.ToString(); lBTest.Text = Mapping.getByteMapping(DS4Controls.R1, rootHub.getDS4State(0)).ToString() + " " + rootHub.getDS4StateMapped(0).R2.ToString();
//lBTest.Text = rootHub.getDS4StateMapped(0).L2.ToString();
} }
void Hotkeys(object sender, EventArgs e) void Hotkeys(object sender, EventArgs e)
{ {
for (int i = 0; i < 4; i++) if (Global.getSwipeProfiles())
{ for (int i = 0; i < 4; i++)
string slide = rootHub.TouchpadSlide(i); {
if (slide == "left") string slide = rootHub.TouchpadSlide(i);
if (cbs[i].SelectedIndex <= 0) if (slide == "left")
cbs[i].SelectedIndex = cbs[i].Items.Count - 2; if (cbs[i].SelectedIndex <= 0)
else cbs[i].SelectedIndex = cbs[i].Items.Count - 2;
cbs[i].SelectedIndex--; else
else if (slide == "right") cbs[i].SelectedIndex--;
if (cbs[i].SelectedIndex == cbs[i].Items.Count - 2) else if (slide == "right")
cbs[i].SelectedIndex = 0; if (cbs[i].SelectedIndex == cbs[i].Items.Count - 2)
else cbs[i].SelectedIndex = 0;
cbs[i].SelectedIndex++; else
if (slide.Contains("t")) cbs[i].SelectedIndex++;
ShowNotification(this, "Controller " + (i + 1) + " is now using Profile \"" + cbs[i].Text + "\""); if (slide.Contains("t"))
} ShowNotification(this, "Controller " + (i + 1) + " is now using Profile \"" + cbs[i].Text + "\"");
}
//Check for process for auto profiles //Check for process for auto profiles
if (tempprofile == "null") if (tempprofile == "null")
@ -299,7 +301,7 @@ namespace ScpServer
Global.LoadProfile(j); Global.LoadProfile(j);
} }
} }
if (Process.GetProcessesByName("DS4Tool").Length + Process.GetProcessesByName("DS4Windows").Length > 1) if (Process.GetProcessesByName("DS4Tool").Length + Process.GetProcessesByName("DS4Windows").Length > 1)
{//The second process closes and this one comes in focus {//The second process closes and this one comes in focus
Show(); Show();
WindowState = FormWindowState.Normal; WindowState = FormWindowState.Normal;
@ -582,18 +584,18 @@ namespace ScpServer
} }
protected void btnStartStop_Clicked() protected void btnStartStop_Clicked()
{ {
if (btnStartStop.Text == "Start") if (btnStartStop.Text == Properties.Resources.StartText)
{ {
rootHub.Start(); rootHub.Start();
hotkeystimer.Start(); hotkeystimer.Start();
btnStartStop.Text = "Stop"; btnStartStop.Text = Properties.Resources.StopText;
} }
else if (btnStartStop.Text == "Stop") else if (btnStartStop.Text == Properties.Resources.StopText)
{ {
rootHub.Stop(); rootHub.Stop();
hotkeystimer.Stop(); hotkeystimer.Stop();
btnStartStop.Text = "Start"; btnStartStop.Text = Properties.Resources.StartText;
} }
} }
protected void btnClear_Click(object sender, EventArgs e) protected void btnClear_Click(object sender, EventArgs e)
@ -658,7 +660,7 @@ namespace ScpServer
} }
else else
{ {
Pads[Index].Text = "Disconnected"; Pads[Index].Text = Properties.Resources.Disconnected;
Enable_Controls(Index, false); Enable_Controls(Index, false);
shortcuts[Index].Enabled = false; shortcuts[Index].Enabled = false;
} }
@ -811,60 +813,59 @@ namespace ScpServer
} }
} }
} }
private void ShowOptions(int devID, string profile) private void ShowOptions(int devID, string profile)
{ {
if (opt == null) if (opt != null)
opt.Close();
Show();
WindowState = FormWindowState.Normal;
toolStrip1.Enabled = false;
tSOptions.Visible = true;
toolStrip1.Visible = false;
if (profile != "")
tSTBProfile.Text = profile;
else
tSTBProfile.Text = "<type profile name here>";
opt = new Options(rootHub, devID, profile, this);
opt.Text = "Options for Controller " + (devID + 1);
opt.Icon = this.Icon;
opt.TopLevel = false;
opt.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
opt.Visible = true;
opt.Dock = DockStyle.Fill;
tabProfiles.Controls.Add(opt);
lBProfiles.SendToBack();
toolStrip1.SendToBack();
tSOptions.SendToBack();
FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
opt.FormClosed += delegate
{ {
this.Show(); opt = null;
WindowState = FormWindowState.Normal; RefreshProfiles();
toolStrip1.Enabled = false; FormBorderStyle = System.Windows.Forms.FormBorderStyle.Sizable;
tSOptions.Visible = true; this.Size = oldsize;
toolStrip1.Visible = false; oldsize = new System.Drawing.Size(0, 0);
if (profile != "") tSOptions.Visible = false;
tSTBProfile.Text = profile; toolStrip1.Visible = true;
else toolStrip1.Enabled = true;
tSTBProfile.Text = "<type profile name here>"; };
opt = new Options(rootHub, devID, profile, this); oldsize = this.Size;
opt.Text = "Options for Controller " + (devID + 1); if (dpix == 120)
opt.Icon = this.Icon; {
opt.TopLevel = false; if (this.Size.Height < 518)
opt.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Size = new System.Drawing.Size(this.Size.Width, 518);
opt.Visible = true; if (this.Size.Width < 1125)
opt.Dock = DockStyle.Fill; this.Size = new System.Drawing.Size(1125, this.Size.Height);
tabProfiles.Controls.Add(opt);
lBProfiles.SendToBack();
toolStrip1.SendToBack();
tSOptions.SendToBack();
FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
opt.FormClosed += delegate
{
opt = null;
RefreshProfiles();
FormBorderStyle = System.Windows.Forms.FormBorderStyle.Sizable;
this.Size = oldsize;
oldsize = new System.Drawing.Size(0, 0);
tSOptions.Visible = false;
toolStrip1.Visible = true;
toolStrip1.Enabled = true;
};
oldsize = this.Size;
if (dpix == 120)
{
if (this.Size.Height < 518)
this.Size = new System.Drawing.Size(this.Size.Width, 518);
if (this.Size.Width < 1125)
this.Size = new System.Drawing.Size(1125, this.Size.Height);
}
else
{
if (this.Size.Height < 418)
this.Size = new System.Drawing.Size(this.Size.Width, 418);
if (this.Size.Width < 910)
this.Size = new System.Drawing.Size(910, this.Size.Height);
}
tabMain.SelectedIndex = 1;
} }
else
{
if (this.Size.Height < 418)
this.Size = new System.Drawing.Size(this.Size.Width, 418);
if (this.Size.Width < 910)
this.Size = new System.Drawing.Size(910, this.Size.Height);
}
tabMain.SelectedIndex = 1;
} }
private void editButtons_Click(object sender, EventArgs e) private void editButtons_Click(object sender, EventArgs e)
@ -1031,6 +1032,11 @@ namespace ScpServer
private void tabMain_SelectedIndexChanged(object sender, EventArgs e) private void tabMain_SelectedIndexChanged(object sender, EventArgs e)
{ {
lbLastMessage.Visible = tabMain.SelectedIndex != 2; lbLastMessage.Visible = tabMain.SelectedIndex != 2;
if (opt != null)
if (tabMain.SelectedIndex != 1)
opt.inputtimer.Stop();
else
opt.inputtimer.Start();
} }
private void lBProfiles_MouseDown(object sender, MouseEventArgs e) private void lBProfiles_MouseDown(object sender, MouseEventArgs e)
@ -1202,6 +1208,11 @@ namespace ScpServer
wct.DownloadFileCompleted += wct_DownloadFileCompleted; wct.DownloadFileCompleted += wct_DownloadFileCompleted;
} }
private void cBDisconnectBT_CheckedChanged(object sender, EventArgs e)
{
Global.setDCBTatStop(cBDisconnectBT.Checked);
}
void wct_DownloadFileCompleted(object sender, System.ComponentModel.AsyncCompletedEventArgs e) void wct_DownloadFileCompleted(object sender, System.ComponentModel.AsyncCompletedEventArgs e)
{ {
Global.setLastChecked(DateTime.Now); Global.setLastChecked(DateTime.Now);
@ -1301,6 +1312,11 @@ namespace ScpServer
rootHub.Stop(); rootHub.Stop();
} }
} }
private void cBSwipeProfiles_CheckedChanged(object sender, EventArgs e)
{
Global.setSwipeProfiles(cBSwipeProfiles.Checked);
}
} }
public class ThemeUtil public class ThemeUtil

6679
DS4Tool/ScpForm.es.resx Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -57,7 +57,7 @@
this.button2.Name = "button2"; this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(259, 23); this.button2.Size = new System.Drawing.Size(259, 23);
this.button2.TabIndex = 1; this.button2.TabIndex = 1;
this.button2.Text = "Step 2: If on Windows 7 or below, Install 360 Drvier"; this.button2.Text = "Step 2: If on Windows 7 or below, Install 360 Driver";
this.button2.UseVisualStyleBackColor = true; this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click); this.button2.Click += new System.EventHandler(this.button2_Click);
// //
@ -89,7 +89,7 @@
this.labelUSB.Size = new System.Drawing.Size(313, 39); this.labelUSB.Size = new System.Drawing.Size(313, 39);
this.labelUSB.TabIndex = 3; this.labelUSB.TabIndex = 3;
this.labelUSB.Text = "Step 3: Connecting the DualShock 4 controller\r\nTo set up wired/usb:\r\nSimply plug " + this.labelUSB.Text = "Step 3: Connecting the DualShock 4 controller\r\nTo set up wired/usb:\r\nSimply plug " +
"a mirco usb into your PC and DualShock 4"; "a micro usb into your PC and DualShock 4";
this.labelUSB.TextAlign = System.Drawing.ContentAlignment.TopCenter; this.labelUSB.TextAlign = System.Drawing.ContentAlignment.TopCenter;
// //
// labelBluetooth2 // labelBluetooth2
@ -99,7 +99,7 @@
this.labelBluetooth2.Size = new System.Drawing.Size(312, 64); this.labelBluetooth2.Size = new System.Drawing.Size(312, 64);
this.labelBluetooth2.TabIndex = 3; this.labelBluetooth2.TabIndex = 3;
this.labelBluetooth2.Text = "Once flashing go to your Bluetooth Settings\r\nand Connect to \"Wireless Controller\"" + this.labelBluetooth2.Text = "Once flashing go to your Bluetooth Settings\r\nand Connect to \"Wireless Controller\"" +
"\r\n\r\nAfter paired, you\'re ready. Have fun!"; "\r\n\r\nOnce paired, you\'re ready. Have fun!";
this.labelBluetooth2.TextAlign = System.Drawing.ContentAlignment.TopCenter; this.labelBluetooth2.TextAlign = System.Drawing.ContentAlignment.TopCenter;
// //
// linkBluetoothSettings // linkBluetoothSettings