The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2025-01-11 15:59:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Version 1.4.0.87

Browse Source 
Fixed Touchpad still mouse clicking when set to a key
For first time users: The ds4 driver (virtual bus) will silently and
automatically install after clicking step one in the setup window
This commit is contained in:
jays2kings 2014-11-03 22:44:55 -05:00
parent ac11a33814
commit 676a98e399
20 changed files with 735 additions and 698 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
DS4Control/Mouse.cs
View File

@ -115,13 +115,25 @@ namespace DS4Control
private DS4State remapped = new DS4State(); private DS4State remapped = new DS4State();
private void synthesizeMouseButtons() private void synthesizeMouseButtons()
{ {
if (Global.getCustomButton(deviceNum, DS4Controls.TouchLeft) == X360Controls.None && leftDown) if (Global.getCustomButton(deviceNum, DS4Controls.TouchLeft) == X360Controls.None &&
Global.getShiftCustomMacro(deviceNum, DS4Controls.TouchLeft) == "0" &&
Global.getShiftCustomKey(deviceNum, DS4Controls.TouchLeft) == 0 &&
leftDown)
Mapping.MapClick(deviceNum, Mapping.Click.Left); Mapping.MapClick(deviceNum, Mapping.Click.Left);
if (Global.getCustomButton(deviceNum, DS4Controls.TouchUpper) == X360Controls.None && upperDown) if (Global.getCustomButton(deviceNum, DS4Controls.TouchUpper) == X360Controls.None &&
Global.getShiftCustomMacro(deviceNum, DS4Controls.TouchUpper) == "0" &&
Global.getShiftCustomKey(deviceNum, DS4Controls.TouchUpper) == 0 &&
upperDown)
Mapping.MapClick(deviceNum, Mapping.Click.Middle); Mapping.MapClick(deviceNum, Mapping.Click.Middle);
if (Global.getCustomButton(deviceNum, DS4Controls.TouchRight) == X360Controls.None && rightDown) if (Global.getCustomButton(deviceNum, DS4Controls.TouchRight) == X360Controls.None &&
Global.getShiftCustomMacro(deviceNum, DS4Controls.TouchRight) == "0" &&
Global.getShiftCustomKey(deviceNum, DS4Controls.TouchRight) == 0 &&
rightDown)
Mapping.MapClick(deviceNum, Mapping.Click.Left); Mapping.MapClick(deviceNum, Mapping.Click.Left);
if (Global.getCustomButton(deviceNum, DS4Controls.TouchMulti) == X360Controls.None && multiDown) if (Global.getCustomButton(deviceNum, DS4Controls.TouchMulti) == X360Controls.None &&
Global.getShiftCustomMacro(deviceNum, DS4Controls.TouchMulti) == "0" &&
Global.getShiftCustomKey(deviceNum, DS4Controls.TouchMulti) == 0 &&
multiDown)
Mapping.MapClick(deviceNum, Mapping.Click.Right); Mapping.MapClick(deviceNum, Mapping.Click.Right);
if (tappedOnce) if (tappedOnce)
{ {

11
DS4Tool/DS4Tool.csproj
View File

@ -73,6 +73,9 @@
<PropertyGroup> <PropertyGroup>
<SignManifests>true</SignManifests> <SignManifests>true</SignManifests>
</PropertyGroup> </PropertyGroup>
<PropertyGroup>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
@ -172,6 +175,7 @@
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="KBM360.resx"> <EmbeddedResource Include="KBM360.resx">
<DependentUpon>KBM360.cs</DependentUpon> <DependentUpon>KBM360.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="MessageTextBox.fr-FR.resx"> <EmbeddedResource Include="MessageTextBox.fr-FR.resx">
<DependentUpon>MessageTextBox.cs</DependentUpon> <DependentUpon>MessageTextBox.cs</DependentUpon>
@ -350,6 +354,13 @@
</COMReference> </COMReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PostBuildEvent>ilmerge /targetplatform:"v4,C:\Windows\Microsoft.NET\Framework\v4.0.30319" /out:Build\DS4Windows.exe DS4Windows.exe HidLibrary.dll DS4Control.dll DS4Library.dll</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">

22
DS4Tool/Hotkeys.Designer.cs generated
View File

@ -29,7 +29,7 @@
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Hotkeys)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Hotkeys));
this.button1 = new System.Windows.Forms.Button(); this.btnDone = new System.Windows.Forms.Button();
this.linkElectro = new System.Windows.Forms.LinkLabel(); this.linkElectro = new System.Windows.Forms.LinkLabel();
this.linkJays2Kings = new System.Windows.Forms.LinkLabel(); this.linkJays2Kings = new System.Windows.Forms.LinkLabel();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
@ -74,13 +74,13 @@
this.tableLayoutPanel1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// button1 // btnDone
// //
resources.ApplyResources(this.button1, "button1"); resources.ApplyResources(this.btnDone, "btnDone");
this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.btnDone.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.button1.Name = "button1"; this.btnDone.Name = "btnDone";
this.button1.UseVisualStyleBackColor = true; this.btnDone.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click); this.btnDone.Click += new System.EventHandler(this.button1_Click);
// //
// linkElectro // linkElectro
// //
@ -332,10 +332,10 @@
// //
// Hotkeys // Hotkeys
// //
this.AcceptButton = this.button1; this.AcceptButton = this.btnDone;
resources.ApplyResources(this, "$this"); resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.button1; this.CancelButton = this.btnDone;
this.Controls.Add(this.linkDonate); this.Controls.Add(this.linkDonate);
this.Controls.Add(this.lLChangelog); this.Controls.Add(this.lLChangelog);
this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.tableLayoutPanel1);
@ -345,7 +345,7 @@
this.Controls.Add(this.linkElectro); this.Controls.Add(this.linkElectro);
this.Controls.Add(this.label23); this.Controls.Add(this.label23);
this.Controls.Add(this.label2); this.Controls.Add(this.label2);
this.Controls.Add(this.button1); this.Controls.Add(this.btnDone);
this.Controls.Add(this.lbAbout); this.Controls.Add(this.lbAbout);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.MaximizeBox = false; this.MaximizeBox = false;
@ -360,7 +360,7 @@
#endregion #endregion
private System.Windows.Forms.Button button1; private System.Windows.Forms.Button btnDone;
private System.Windows.Forms.LinkLabel linkElectro; private System.Windows.Forms.LinkLabel linkElectro;
private System.Windows.Forms.LinkLabel linkJays2Kings; private System.Windows.Forms.LinkLabel linkJays2Kings;
private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label2;

2
DS4Tool/Hotkeys.fr-FR.resx
View File

@ -121,7 +121,7 @@
<data name="button1.Location" type="System.Drawing.Point, System.Drawing"> <data name="button1.Location" type="System.Drawing.Point, System.Drawing">
<value>300, 410</value> <value>300, 410</value>
</data> </data>
<data name="button1.Text" xml:space="preserve"> <data name="btnDone.Text" xml:space="preserve">
<value>Fait</value> <value>Fait</value>
</data> </data>
<data name="linkElectro.Location" type="System.Drawing.Point, System.Drawing"> <data name="linkElectro.Location" type="System.Drawing.Point, System.Drawing">

20
DS4Tool/Hotkeys.resx
View File

@ -118,33 +118,33 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="button1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> <data name="btnDone.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left</value> <value>Bottom, Left</value>
</data> </data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="button1.Location" type="System.Drawing.Point, System.Drawing"> <data name="btnDone.Location" type="System.Drawing.Point, System.Drawing">
<value>215, 407</value> <value>215, 407</value>
</data> </data>
<data name="button1.Size" type="System.Drawing.Size, System.Drawing"> <data name="btnDone.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value> <value>75, 23</value>
</data> </data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="button1.TabIndex" type="System.Int32, mscorlib"> <data name="btnDone.TabIndex" type="System.Int32, mscorlib">
<value>8</value> <value>8</value>
</data> </data>
<data name="button1.Text" xml:space="preserve"> <data name="btnDone.Text" xml:space="preserve">
<value>Done</value> <value>Done</value>
</data> </data>
<data name="&gt;&gt;button1.Name" xml:space="preserve"> <data name="&gt;&gt;btnDone.Name" xml:space="preserve">
<value>button1</value> <value>btnDone</value>
</data> </data>
<data name="&gt;&gt;button1.Type" xml:space="preserve"> <data name="&gt;&gt;btnDone.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="&gt;&gt;button1.Parent" xml:space="preserve"> <data name="&gt;&gt;btnDone.Parent" xml:space="preserve">
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;button1.ZOrder" xml:space="preserve"> <data name="&gt;&gt;btnDone.ZOrder" xml:space="preserve">
<value>9</value> <value>9</value>
</data> </data>
<data name="linkElectro.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> <data name="linkElectro.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">

162
DS4Tool/KBM360.Designer.cs generated
View File

@ -61,10 +61,10 @@
this.button35 = new System.Windows.Forms.Button(); this.button35 = new System.Windows.Forms.Button();
this.button39 = new System.Windows.Forms.Button(); this.button39 = new System.Windows.Forms.Button();
this.button38 = new System.Windows.Forms.Button(); this.button38 = new System.Windows.Forms.Button();
this.bnPREVTRACK = new System.Windows.Forms.Button(); this.btnPREVTRACK = new System.Windows.Forms.Button();
this.bnNEXTTRACK = new System.Windows.Forms.Button(); this.btnNEXTTRACK = new System.Windows.Forms.Button();
this.bnPLAYPAUSE = new System.Windows.Forms.Button(); this.btnPLAYPAUSE = new System.Windows.Forms.Button();
this.bnSTOP = new System.Windows.Forms.Button(); this.btnSTOP = new System.Windows.Forms.Button();
this.button34 = new System.Windows.Forms.Button(); this.button34 = new System.Windows.Forms.Button();
this.btnSCL = new System.Windows.Forms.Button(); this.btnSCL = new System.Windows.Forms.Button();
this.btnDEL = new System.Windows.Forms.Button(); this.btnDEL = new System.Windows.Forms.Button();
@ -146,10 +146,10 @@
this.btnW = new System.Windows.Forms.Button(); this.btnW = new System.Windows.Forms.Button();
this.button33 = new System.Windows.Forms.Button(); this.button33 = new System.Windows.Forms.Button();
this.button30 = new System.Windows.Forms.Button(); this.button30 = new System.Windows.Forms.Button();
this.bnMOUSERIGHT = new System.Windows.Forms.Button(); this.btnMOUSERIGHT = new System.Windows.Forms.Button();
this.bnMOUSELEFT = new System.Windows.Forms.Button(); this.btnMOUSELEFT = new System.Windows.Forms.Button();
this.bnMOUSEDOWN = new System.Windows.Forms.Button(); this.btnMOUSEDOWN = new System.Windows.Forms.Button();
this.bnMOUSEUP = new System.Windows.Forms.Button(); this.btnMOUSEUP = new System.Windows.Forms.Button();
this.btnLEFTMOUSE = new System.Windows.Forms.Button(); this.btnLEFTMOUSE = new System.Windows.Forms.Button();
this.btnQ = new System.Windows.Forms.Button(); this.btnQ = new System.Windows.Forms.Button();
this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.pictureBox2 = new System.Windows.Forms.PictureBox();
@ -183,7 +183,7 @@
this.X360Label = new System.Windows.Forms.Label(); this.X360Label = new System.Windows.Forms.Label();
this.KBMlabel = new System.Windows.Forms.Label(); this.KBMlabel = new System.Windows.Forms.Label();
this.lBMacroOn = new System.Windows.Forms.Label(); this.lBMacroOn = new System.Windows.Forms.Label();
this.btnMacro = new System.Windows.Forms.Button(); this.bnMacro = new System.Windows.Forms.Button();
this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.btnFallBack = new System.Windows.Forms.Button(); this.btnFallBack = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
@ -443,37 +443,37 @@
this.button38.Tag = "175"; this.button38.Tag = "175";
this.button38.UseVisualStyleBackColor = true; this.button38.UseVisualStyleBackColor = true;
// //
// bnPREVTRACK // btnPREVTRACK
// //
resources.ApplyResources(this.bnPREVTRACK, "bnPREVTRACK"); resources.ApplyResources(this.btnPREVTRACK, "btnPREVTRACK");
this.bnPREVTRACK.Name = "bnPREVTRACK"; this.btnPREVTRACK.Name = "btnPREVTRACK";
this.bnPREVTRACK.TabStop = false; this.btnPREVTRACK.TabStop = false;
this.bnPREVTRACK.Tag = "177"; this.btnPREVTRACK.Tag = "177";
this.bnPREVTRACK.UseVisualStyleBackColor = true; this.btnPREVTRACK.UseVisualStyleBackColor = true;
// //
// bnNEXTTRACK // btnNEXTTRACK
// //
resources.ApplyResources(this.bnNEXTTRACK, "bnNEXTTRACK"); resources.ApplyResources(this.btnNEXTTRACK, "btnNEXTTRACK");
this.bnNEXTTRACK.Name = "bnNEXTTRACK"; this.btnNEXTTRACK.Name = "btnNEXTTRACK";
this.bnNEXTTRACK.TabStop = false; this.btnNEXTTRACK.TabStop = false;
this.bnNEXTTRACK.Tag = "176"; this.btnNEXTTRACK.Tag = "176";
this.bnNEXTTRACK.UseVisualStyleBackColor = true; this.btnNEXTTRACK.UseVisualStyleBackColor = true;
// //
// bnPLAYPAUSE // btnPLAYPAUSE
// //
resources.ApplyResources(this.bnPLAYPAUSE, "bnPLAYPAUSE"); resources.ApplyResources(this.btnPLAYPAUSE, "btnPLAYPAUSE");
this.bnPLAYPAUSE.Name = "bnPLAYPAUSE"; this.btnPLAYPAUSE.Name = "btnPLAYPAUSE";
this.bnPLAYPAUSE.TabStop = false; this.btnPLAYPAUSE.TabStop = false;
this.bnPLAYPAUSE.Tag = "179"; this.btnPLAYPAUSE.Tag = "179";
this.bnPLAYPAUSE.UseVisualStyleBackColor = true; this.btnPLAYPAUSE.UseVisualStyleBackColor = true;
// //
// bnSTOP // btnSTOP
// //
resources.ApplyResources(this.bnSTOP, "bnSTOP"); resources.ApplyResources(this.btnSTOP, "btnSTOP");
this.bnSTOP.Name = "bnSTOP"; this.btnSTOP.Name = "btnSTOP";
this.bnSTOP.TabStop = false; this.btnSTOP.TabStop = false;
this.bnSTOP.Tag = "178"; this.btnSTOP.Tag = "178";
this.bnSTOP.UseVisualStyleBackColor = true; this.btnSTOP.UseVisualStyleBackColor = true;
// //
// button34 // button34
// //
@ -1122,37 +1122,37 @@
this.button30.Tag = "4th Mouse Button"; this.button30.Tag = "4th Mouse Button";
this.button30.UseVisualStyleBackColor = true; this.button30.UseVisualStyleBackColor = true;
// //
// bnMOUSERIGHT // btnMOUSERIGHT
// //
resources.ApplyResources(this.bnMOUSERIGHT, "bnMOUSERIGHT"); resources.ApplyResources(this.btnMOUSERIGHT, "btnMOUSERIGHT");
this.bnMOUSERIGHT.Name = "bnMOUSERIGHT"; this.btnMOUSERIGHT.Name = "btnMOUSERIGHT";
this.bnMOUSERIGHT.TabStop = false; this.btnMOUSERIGHT.TabStop = false;
this.bnMOUSERIGHT.Tag = "Mouse Right"; this.btnMOUSERIGHT.Tag = "Mouse Right";
this.bnMOUSERIGHT.UseVisualStyleBackColor = true; this.btnMOUSERIGHT.UseVisualStyleBackColor = true;
// //
// bnMOUSELEFT // btnMOUSELEFT
// //
resources.ApplyResources(this.bnMOUSELEFT, "bnMOUSELEFT"); resources.ApplyResources(this.btnMOUSELEFT, "btnMOUSELEFT");
this.bnMOUSELEFT.Name = "bnMOUSELEFT"; this.btnMOUSELEFT.Name = "btnMOUSELEFT";
this.bnMOUSELEFT.TabStop = false; this.btnMOUSELEFT.TabStop = false;
this.bnMOUSELEFT.Tag = "Mouse Left"; this.btnMOUSELEFT.Tag = "Mouse Left";
this.bnMOUSELEFT.UseVisualStyleBackColor = true; this.btnMOUSELEFT.UseVisualStyleBackColor = true;
// //
// bnMOUSEDOWN // btnMOUSEDOWN
// //
resources.ApplyResources(this.bnMOUSEDOWN, "bnMOUSEDOWN"); resources.ApplyResources(this.btnMOUSEDOWN, "btnMOUSEDOWN");
this.bnMOUSEDOWN.Name = "bnMOUSEDOWN"; this.btnMOUSEDOWN.Name = "btnMOUSEDOWN";
this.bnMOUSEDOWN.TabStop = false; this.btnMOUSEDOWN.TabStop = false;
this.bnMOUSEDOWN.Tag = "Mouse Down"; this.btnMOUSEDOWN.Tag = "Mouse Down";
this.bnMOUSEDOWN.UseVisualStyleBackColor = true; this.btnMOUSEDOWN.UseVisualStyleBackColor = true;
// //
// bnMOUSEUP // btnMOUSEUP
// //
resources.ApplyResources(this.bnMOUSEUP, "bnMOUSEUP"); resources.ApplyResources(this.btnMOUSEUP, "btnMOUSEUP");
this.bnMOUSEUP.Name = "bnMOUSEUP"; this.btnMOUSEUP.Name = "btnMOUSEUP";
this.bnMOUSEUP.TabStop = false; this.btnMOUSEUP.TabStop = false;
this.bnMOUSEUP.Tag = "Mouse Up"; this.btnMOUSEUP.Tag = "Mouse Up";
this.bnMOUSEUP.UseVisualStyleBackColor = true; this.btnMOUSEUP.UseVisualStyleBackColor = true;
// //
// btnLEFTMOUSE // btnLEFTMOUSE
// //
@ -1432,13 +1432,13 @@
resources.ApplyResources(this.lBMacroOn, "lBMacroOn"); resources.ApplyResources(this.lBMacroOn, "lBMacroOn");
this.lBMacroOn.Name = "lBMacroOn"; this.lBMacroOn.Name = "lBMacroOn";
// //
// btnMacro // bnMacro
// //
resources.ApplyResources(this.btnMacro, "btnMacro"); resources.ApplyResources(this.bnMacro, "bnMacro");
this.btnMacro.Name = "btnMacro"; this.bnMacro.Name = "bnMacro";
this.btnMacro.TabStop = false; this.bnMacro.TabStop = false;
this.btnMacro.UseVisualStyleBackColor = true; this.bnMacro.UseVisualStyleBackColor = true;
this.btnMacro.Click += new System.EventHandler(this.btnMacro_Click); this.bnMacro.Click += new System.EventHandler(this.btnMacro_Click);
// //
// pictureBox1 // pictureBox1
// //
@ -1471,7 +1471,7 @@
this.Controls.Add(this.btnRSR); this.Controls.Add(this.btnRSR);
this.Controls.Add(this.btnRSD); this.Controls.Add(this.btnRSD);
this.Controls.Add(this.btnRSL); this.Controls.Add(this.btnRSL);
this.Controls.Add(this.btnMacro); this.Controls.Add(this.bnMacro);
this.Controls.Add(this.lBMacroOn); this.Controls.Add(this.lBMacroOn);
this.Controls.Add(this.KBMlabel); this.Controls.Add(this.KBMlabel);
this.Controls.Add(this.X360Label); this.Controls.Add(this.X360Label);
@ -1520,10 +1520,10 @@
this.Controls.Add(this.button35); this.Controls.Add(this.button35);
this.Controls.Add(this.button39); this.Controls.Add(this.button39);
this.Controls.Add(this.button38); this.Controls.Add(this.button38);
this.Controls.Add(this.bnPREVTRACK); this.Controls.Add(this.btnPREVTRACK);
this.Controls.Add(this.bnNEXTTRACK); this.Controls.Add(this.btnNEXTTRACK);
this.Controls.Add(this.bnPLAYPAUSE); this.Controls.Add(this.btnPLAYPAUSE);
this.Controls.Add(this.bnSTOP); this.Controls.Add(this.btnSTOP);
this.Controls.Add(this.button34); this.Controls.Add(this.button34);
this.Controls.Add(this.btnSCL); this.Controls.Add(this.btnSCL);
this.Controls.Add(this.btnDEL); this.Controls.Add(this.btnDEL);
@ -1605,10 +1605,10 @@
this.Controls.Add(this.btnW); this.Controls.Add(this.btnW);
this.Controls.Add(this.button33); this.Controls.Add(this.button33);
this.Controls.Add(this.button30); this.Controls.Add(this.button30);
this.Controls.Add(this.bnMOUSERIGHT); this.Controls.Add(this.btnMOUSERIGHT);
this.Controls.Add(this.bnMOUSELEFT); this.Controls.Add(this.btnMOUSELEFT);
this.Controls.Add(this.bnMOUSEDOWN); this.Controls.Add(this.btnMOUSEDOWN);
this.Controls.Add(this.bnMOUSEUP); this.Controls.Add(this.btnMOUSEUP);
this.Controls.Add(this.btnLEFTMOUSE); this.Controls.Add(this.btnLEFTMOUSE);
this.Controls.Add(this.btnQ); this.Controls.Add(this.btnQ);
this.Controls.Add(this.pictureBox2); this.Controls.Add(this.pictureBox2);
@ -1662,10 +1662,10 @@
private System.Windows.Forms.Button button35; private System.Windows.Forms.Button button35;
private System.Windows.Forms.Button button39; private System.Windows.Forms.Button button39;
private System.Windows.Forms.Button button38; private System.Windows.Forms.Button button38;
private System.Windows.Forms.Button bnPREVTRACK; private System.Windows.Forms.Button btnPREVTRACK;
private System.Windows.Forms.Button bnNEXTTRACK; private System.Windows.Forms.Button btnNEXTTRACK;
private System.Windows.Forms.Button bnPLAYPAUSE; private System.Windows.Forms.Button btnPLAYPAUSE;
private System.Windows.Forms.Button bnSTOP; private System.Windows.Forms.Button btnSTOP;
private System.Windows.Forms.Button button34; private System.Windows.Forms.Button button34;
private System.Windows.Forms.Button btnSCL; private System.Windows.Forms.Button btnSCL;
private System.Windows.Forms.Button btnDEL; private System.Windows.Forms.Button btnDEL;
@ -1747,10 +1747,10 @@
private System.Windows.Forms.Button btnW; private System.Windows.Forms.Button btnW;
private System.Windows.Forms.Button button33; private System.Windows.Forms.Button button33;
private System.Windows.Forms.Button button30; private System.Windows.Forms.Button button30;
private System.Windows.Forms.Button bnMOUSERIGHT; private System.Windows.Forms.Button btnMOUSERIGHT;
private System.Windows.Forms.Button bnMOUSELEFT; private System.Windows.Forms.Button btnMOUSELEFT;
private System.Windows.Forms.Button bnMOUSEDOWN; private System.Windows.Forms.Button btnMOUSEDOWN;
private System.Windows.Forms.Button bnMOUSEUP; private System.Windows.Forms.Button btnMOUSEUP;
private System.Windows.Forms.Button btnLEFTMOUSE; private System.Windows.Forms.Button btnLEFTMOUSE;
private System.Windows.Forms.Button btnQ; private System.Windows.Forms.Button btnQ;
private System.Windows.Forms.PictureBox pictureBox2; private System.Windows.Forms.PictureBox pictureBox2;
@ -1783,7 +1783,7 @@
private System.Windows.Forms.Button button3; private System.Windows.Forms.Button button3;
private System.Windows.Forms.Label X360Label; private System.Windows.Forms.Label X360Label;
private System.Windows.Forms.Label KBMlabel; private System.Windows.Forms.Label KBMlabel;
private System.Windows.Forms.Button btnMacro; private System.Windows.Forms.Button bnMacro;
public System.Windows.Forms.Label lBMacroOn; public System.Windows.Forms.Label lBMacroOn;
private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.Button btnFallBack; private System.Windows.Forms.Button btnFallBack;

14
DS4Tool/KBM360.cs
View File

@ -29,7 +29,9 @@ namespace ScpServer
cbScanCode.Checked = button.Font.Bold; cbScanCode.Checked = button.Font.Bold;
//cBMacro.Checked = button.Font.Underline; //cBMacro.Checked = button.Font.Underline;
lBMacroOn.Visible = button.Font.Underline; lBMacroOn.Visible = button.Font.Underline;
if (button.Name.StartsWith("bnHold")) if (button.Name.StartsWith("bn"))
Text = Properties.Resources.SelectActionTitle.Replace("*action*", button.Name.Substring(2));
else if (button.Name.StartsWith("bnHold"))
{ {
Text = Properties.Resources.SelectActionTitle.Replace("*action*", button.Name.Substring(6)); Text = Properties.Resources.SelectActionTitle.Replace("*action*", button.Name.Substring(6));
btnFallBack.Text = "Disable"; btnFallBack.Text = "Disable";
@ -39,17 +41,15 @@ namespace ScpServer
Text = Properties.Resources.SelectActionTitle.Replace("*action*", button.Name.Substring(7)); Text = Properties.Resources.SelectActionTitle.Replace("*action*", button.Name.Substring(7));
btnFallBack.Text = "Fall Back"; btnFallBack.Text = "Fall Back";
} }
else if (button.Name.StartsWith("bn"))
Text = Properties.Resources.SelectActionTitle.Replace("*action*", button.Name.Substring(2));
foreach (System.Windows.Forms.Control control in this.Controls) foreach (System.Windows.Forms.Control control in this.Controls)
if (control is Button) if (control is Button)
((Button)control).Click += anybtn_Click; ((Button)control).Click += anybtn_Click;
if (button.Name.Contains("Touch")) if (button.Name.Contains("Touch"))
{ {
bnMOUSEDOWN.Visible = false; btnMOUSEDOWN.Visible = false;
bnMOUSELEFT.Visible = false; btnMOUSELEFT.Visible = false;
bnMOUSERIGHT.Visible = false; btnMOUSERIGHT.Visible = false;
bnMOUSEUP.Visible = false; btnMOUSEUP.Visible = false;
} }
ActiveControl = null; ActiveControl = null;
} }

3
DS4Tool/KBM360.fr-FR.resx
View File

@ -164,9 +164,6 @@ ionner une clé en la tapant</value>
<data name="lBMacroOn.Text" xml:space="preserve"> <data name="lBMacroOn.Text" xml:space="preserve">
<value>Macro activé, choisir une touche pour désactiver, fermer cette page pour sauvegarder</value> <value>Macro activé, choisir une touche pour désactiver, fermer cette page pour sauvegarder</value>
</data> </data>
<data name="btnMacro.Text" xml:space="preserve">
<value>Enregistrer un macro</value>
</data>
<data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAAx4AAAEYCAYAAADS/CAKAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH iVBORw0KGgoAAAANSUhEUgAAAx4AAAEYCAYAAADS/CAKAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH

929
DS4Tool/KBM360.resx
View File

File diff suppressed because it is too large Load Diff

38
DS4Tool/MessageTextBox.Designer.cs generated
View File

@ -29,17 +29,17 @@
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MessageTextBox)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MessageTextBox));
this.button1 = new System.Windows.Forms.Button(); this.btnSave = new System.Windows.Forms.Button();
this.tBProfile = new System.Windows.Forms.TextBox(); this.tBProfile = new System.Windows.Forms.TextBox();
this.button2 = new System.Windows.Forms.Button(); this.btnCancel = new System.Windows.Forms.Button();
this.SuspendLayout(); this.SuspendLayout();
// //
// button1 // btnSave
// //
resources.ApplyResources(this.button1, "button1"); resources.ApplyResources(this.btnSave, "btnSave");
this.button1.Name = "button1"; this.btnSave.Name = "btnSave";
this.button1.UseVisualStyleBackColor = true; this.btnSave.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click); this.btnSave.Click += new System.EventHandler(this.button1_Click);
// //
// tBProfile // tBProfile
// //
@ -50,24 +50,24 @@
this.tBProfile.Enter += new System.EventHandler(this.tBProfile_Enter); this.tBProfile.Enter += new System.EventHandler(this.tBProfile_Enter);
this.tBProfile.Leave += new System.EventHandler(this.tBProfile_Leave); this.tBProfile.Leave += new System.EventHandler(this.tBProfile_Leave);
// //
// button2 // btnCancel
// //
resources.ApplyResources(this.button2, "button2"); resources.ApplyResources(this.btnCancel, "btnCancel");
this.button2.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.button2.Name = "button2"; this.btnCancel.Name = "btnCancel";
this.button2.UseVisualStyleBackColor = true; this.btnCancel.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click); this.btnCancel.Click += new System.EventHandler(this.button2_Click);
// //
// MessageTextBox // MessageTextBox
// //
this.AcceptButton = this.button1; this.AcceptButton = this.btnSave;
resources.ApplyResources(this, "$this"); resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242)))));
this.CancelButton = this.button2; this.CancelButton = this.btnCancel;
this.Controls.Add(this.button2); this.Controls.Add(this.btnCancel);
this.Controls.Add(this.tBProfile); this.Controls.Add(this.tBProfile);
this.Controls.Add(this.button1); this.Controls.Add(this.btnSave);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
@ -80,8 +80,8 @@
#endregion #endregion
private System.Windows.Forms.Button button1; private System.Windows.Forms.Button btnSave;
private System.Windows.Forms.TextBox tBProfile; private System.Windows.Forms.TextBox tBProfile;
private System.Windows.Forms.Button button2; private System.Windows.Forms.Button btnCancel;
} }
} }

4
DS4Tool/MessageTextBox.fr-FR.resx
View File

@ -124,7 +124,7 @@
<data name="button1.Size" type="System.Drawing.Size, System.Drawing"> <data name="button1.Size" type="System.Drawing.Size, System.Drawing">
<value>76, 23</value> <value>76, 23</value>
</data> </data>
<data name="button1.Text" xml:space="preserve"> <data name="btnSave.Text" xml:space="preserve">
<value>Sauvegarder</value> <value>Sauvegarder</value>
</data> </data>
<data name="tBProfile.Size" type="System.Drawing.Size, System.Drawing"> <data name="tBProfile.Size" type="System.Drawing.Size, System.Drawing">
@ -133,7 +133,7 @@
<data name="tBProfile.Text" xml:space="preserve"> <data name="tBProfile.Text" xml:space="preserve">
<value>&lt;écrire un nouveau nom ici&gt;</value> <value>&lt;écrire un nouveau nom ici&gt;</value>
</data> </data>
<data name="button2.Text" xml:space="preserve"> <data name="btnCancel.Text" xml:space="preserve">
<value>Annuler</value> <value>Annuler</value>
</data> </data>
</root> </root>

144
DS4Tool/MessageTextBox.resx
View File

@ -117,112 +117,112 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="button2.TabIndex" type="System.Int32, mscorlib">
<value>240</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="tBProfile.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms"> <data name="btnSave.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Center</value> <value>Top</value>
</data>
<data name="&gt;&gt;button2.ZOrder" xml:space="preserve">
<value>0</value>
</data> </data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing"> <data name="btnSave.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 13</value> <value>195, 5</value>
</data> </data>
<data name="button2.Size" type="System.Drawing.Size, System.Drawing"> <data name="btnSave.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value> <value>75, 23</value>
</data> </data>
<data name="&gt;&gt;$this.Type" xml:space="preserve"> <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <data name="btnSave.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data> </data>
<data name="&gt;&gt;button2.Name" xml:space="preserve"> <data name="btnSave.Text" xml:space="preserve">
<value>button2</value> <value>Save</value>
</data> </data>
<data name="&gt;&gt;$this.Name" xml:space="preserve"> <data name="&gt;&gt;btnSave.Name" xml:space="preserve">
<value>MessageTextBox</value> <value>btnSave</value>
</data> </data>
<data name="&gt;&gt;button2.Type" xml:space="preserve"> <data name="&gt;&gt;btnSave.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="button1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> <data name="&gt;&gt;btnSave.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnSave.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="tBProfile.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top</value> <value>Top</value>
</data> </data>
<data name="tBProfile.Location" type="System.Drawing.Point, System.Drawing"> <data name="tBProfile.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 7</value> <value>12, 7</value>
</data> </data>
<data name="tBProfile.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top</value>
</data>
<data name="&gt;&gt;tBProfile.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>359, 35</value>
</data>
<data name="tBProfile.Size" type="System.Drawing.Size, System.Drawing"> <data name="tBProfile.Size" type="System.Drawing.Size, System.Drawing">
<value>177, 20</value> <value>177, 20</value>
</data> </data>
<data name="button2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top</value>
</data>
<data name="button1.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
</data>
<data name="&gt;&gt;tBProfile.Name" xml:space="preserve">
<value>tBProfile</value>
</data>
<data name="&gt;&gt;tBProfile.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;button1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="tBProfile.TabIndex" type="System.Int32, mscorlib"> <data name="tBProfile.TabIndex" type="System.Int32, mscorlib">
<value>239</value> <value>239</value>
</data> </data>
<data name="tBProfile.Text" xml:space="preserve"> <data name="tBProfile.Text" xml:space="preserve">
<value>&lt;type new name here&gt;</value> <value>&lt;type new name here&gt;</value>
</data> </data>
<data name="&gt;&gt;button1.ZOrder" xml:space="preserve"> <data name="tBProfile.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
<value>2</value> <value>Center</value>
</data> </data>
<data name="button1.TabIndex" type="System.Int32, mscorlib"> <data name="&gt;&gt;tBProfile.Name" xml:space="preserve">
<value>2</value> <value>tBProfile</value>
</data>
<data name="&gt;&gt;button1.Name" xml:space="preserve">
<value>button1</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="button1.Text" xml:space="preserve">
<value>Save</value>
</data> </data>
<data name="&gt;&gt;tBProfile.Type" xml:space="preserve"> <data name="&gt;&gt;tBProfile.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="button1.Location" type="System.Drawing.Point, System.Drawing"> <data name="&gt;&gt;tBProfile.Parent" xml:space="preserve">
<value>195, 5</value> <value>$this</value>
</data>
<data name="&gt;&gt;tBProfile.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="btnCancel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top</value>
</data>
<data name="btnCancel.Location" type="System.Drawing.Point, System.Drawing">
<value>276, 5</value>
</data>
<data name="btnCancel.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
</data>
<data name="btnCancel.TabIndex" type="System.Int32, mscorlib">
<value>240</value>
</data>
<data name="btnCancel.Text" xml:space="preserve">
<value>Cancel</value>
</data>
<data name="&gt;&gt;btnCancel.Name" xml:space="preserve">
<value>btnCancel</value>
</data>
<data name="&gt;&gt;btnCancel.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;btnCancel.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnCancel.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>fr-FR</value>
</metadata>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>6, 13</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>359, 35</value>
</data> </data>
<data name="$this.Text" xml:space="preserve"> <data name="$this.Text" xml:space="preserve">
<value>Type name of New Profile</value> <value>Type name of New Profile</value>
</data> </data>
<data name="button2.Location" type="System.Drawing.Point, System.Drawing"> <data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>276, 5</value> <value>MessageTextBox</value>
</data> </data>
<data name="button2.Text" xml:space="preserve"> <data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>Cancel</value> <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="&gt;&gt;button2.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> </root>

4
DS4Tool/Properties/AssemblyInfo.cs
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 // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.4.0.85")] [assembly: AssemblyVersion("1.4.0.87")]
[assembly: AssemblyFileVersion("1.4.0.85")] [assembly: AssemblyFileVersion("1.4.0.87")]

3
DS4Tool/Properties/Resources.fr-FR.resx
View File

@ -396,4 +396,7 @@
<data name="TiltUp" xml:space="preserve"> <data name="TiltUp" xml:space="preserve">
<value>Tilt Haut</value> <value>Tilt Haut</value>
</data> </data>
<data name="Installing" xml:space="preserve">
<value>l'installation de ...</value>
</data>
</root> </root>

3
DS4Tool/Properties/Resources.resx
View File

@ -544,4 +544,7 @@
<data name="TiltUp" xml:space="preserve"> <data name="TiltUp" xml:space="preserve">
<value>Tilt Up</value> <value>Tilt Up</value>
</data> </data>
<data name="Installing" xml:space="preserve">
<value>Installing...</value>
</data>
</root> </root>

11
DS4Tool/Properties/Resources1.Designer.cs generated
View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.34209 // Runtime Version:4.0.30319.0
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@ -596,6 +596,15 @@ namespace ScpServer.Properties {
} }
} }
/// <summary>
/// Looks up a localized string similar to Installing....
/// </summary>
internal static string Installing {
get {
return ResourceManager.GetString("Installing", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Keep this window size after closing. /// Looks up a localized string similar to Keep this window size after closing.
/// </summary> /// </summary>

8
DS4Tool/ScpForm.cs
View File

@ -87,16 +87,12 @@ namespace ScpServer
arguements = args; arguements = args;
ThemeUtil.SetTheme(lvDebug); ThemeUtil.SetTheme(lvDebug);
SetupArrays(); SetupArrays();
//CheckDrivers();
SystemEvents.PowerModeChanged += OnPowerChange; SystemEvents.PowerModeChanged += OnPowerChange;
tSOptions.Visible = false; tSOptions.Visible = false;
if (File.Exists(appdatapath + "\\Profiles.xml")) if (File.Exists(appdatapath + "\\Profiles.xml"))
tt.SetToolTip(linkUninstall, Properties.Resources.IfRemovingDS4Windows); tt.SetToolTip(linkUninstall, Properties.Resources.IfRemovingDS4Windows);
tt.SetToolTip(cBSwipeProfiles, Properties.Resources.TwoFingerSwipe); tt.SetToolTip(cBSwipeProfiles, Properties.Resources.TwoFingerSwipe);
{ {
var AppCollectionThread = new System.Threading.Thread(() => CheckDrivers());
AppCollectionThread.IsBackground = true;
AppCollectionThread.Start();
if (File.Exists(exepath + "\\Auto Profiles.xml") if (File.Exists(exepath + "\\Auto Profiles.xml")
&& File.Exists(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\DS4Tool\\Auto Profiles.xml")) && File.Exists(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\DS4Tool\\Auto Profiles.xml"))
new SaveWhere(true).ShowDialog(); new SaveWhere(true).ShowDialog();
@ -110,6 +106,9 @@ namespace ScpServer
new SaveWhere(false).ShowDialog(); new SaveWhere(false).ShowDialog();
} }
var AppCollectionThread = new System.Threading.Thread(() => CheckDrivers());
AppCollectionThread.IsBackground = true;
AppCollectionThread.Start();
if (String.IsNullOrEmpty(Global.appdatapath)) if (String.IsNullOrEmpty(Global.appdatapath))
{ {
@ -378,6 +377,7 @@ namespace ScpServer
{ {
WelcomeDialog wd = new WelcomeDialog(); WelcomeDialog wd = new WelcomeDialog();
wd.ShowDialog(); wd.ShowDialog();
wd.FormClosing += delegate { btnStartStop_Click(null, null); btnStartStop_Click(null, null); };
} }
} }
catch catch

2
DS4Tool/ScpForm.resx
View File

@ -7732,7 +7732,7 @@
<value>2</value> <value>2</value>
</data> </data>
<data name="tSOptions.Text" xml:space="preserve"> <data name="tSOptions.Text" xml:space="preserve">
<value>toolStrip2</value> <value>Profile Options</value>
</data> </data>
<data name="&gt;&gt;tSOptions.Name" xml:space="preserve"> <data name="&gt;&gt;tSOptions.Name" xml:space="preserve">
<value>tSOptions</value> <value>tSOptions</value>

7
DS4Tool/WelcomeDialog.cs
View File

@ -74,8 +74,13 @@ namespace ScpServer
//Made here as starting the scpdriver.exe via process.start, the program looks for file from where it was called, not where the exe is //Made here as starting the scpdriver.exe via process.start, the program looks for file from where it was called, not where the exe is
catch { } catch { }
if (File.Exists(exepath + "\\ScpDriver.exe")) if (File.Exists(exepath + "\\ScpDriver.exe"))
try { Process.Start(exepath + "\\ScpDriver.exe"); } try
{
Process.Start(exepath + "\\ScpDriver.exe", "si");
bnStep1.Text = Properties.Resources.Installing;
}
catch { Process.Start(Global.appdatapath + "\\Virtual Bus Driver"); } catch { Process.Start(Global.appdatapath + "\\Virtual Bus Driver"); }
Timer timer = new Timer(); Timer timer = new Timer();
timer.Start(); timer.Start();
timer.Tick += timer_Tick; timer.Tick += timer_Tick;

22
DS4Tool/WelcomeDialog.resx
View File

@ -144,7 +144,7 @@
<value>4</value> <value>4</value>
</data> </data>
<data name="button2.Location" type="System.Drawing.Point, System.Drawing"> <data name="button2.Location" type="System.Drawing.Point, System.Drawing">
<value>29, 57</value> <value>29, 63</value>
</data> </data>
<data name="button2.Size" type="System.Drawing.Size, System.Drawing"> <data name="button2.Size" type="System.Drawing.Size, System.Drawing">
<value>259, 23</value> <value>259, 23</value>
@ -172,7 +172,7 @@
<value /> <value />
</data> </data>
<data name="pictureBox1.Location" type="System.Drawing.Point, System.Drawing"> <data name="pictureBox1.Location" type="System.Drawing.Point, System.Drawing">
<value>36, 197</value> <value>36, 203</value>
</data> </data>
<data name="pictureBox1.Size" type="System.Drawing.Size, System.Drawing"> <data name="pictureBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>245, 132</value> <value>245, 132</value>
@ -196,7 +196,7 @@
<value>2</value> <value>2</value>
</data> </data>
<data name="labelBluetooth.Location" type="System.Drawing.Point, System.Drawing"> <data name="labelBluetooth.Location" type="System.Drawing.Point, System.Drawing">
<value>1, 155</value> <value>1, 161</value>
</data> </data>
<data name="labelBluetooth.Size" type="System.Drawing.Size, System.Drawing"> <data name="labelBluetooth.Size" type="System.Drawing.Size, System.Drawing">
<value>312, 39</value> <value>312, 39</value>
@ -225,7 +225,7 @@ The lightbar will begin to double flash</value>
<value>1</value> <value>1</value>
</data> </data>
<data name="labelUSB.Location" type="System.Drawing.Point, System.Drawing"> <data name="labelUSB.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 106</value> <value>0, 112</value>
</data> </data>
<data name="labelUSB.Size" type="System.Drawing.Size, System.Drawing"> <data name="labelUSB.Size" type="System.Drawing.Size, System.Drawing">
<value>313, 39</value> <value>313, 39</value>
@ -254,7 +254,7 @@ Simply plug a micro usb into your PC and DualShock 4</value>
<value>8</value> <value>8</value>
</data> </data>
<data name="labelBluetooth2.Location" type="System.Drawing.Point, System.Drawing"> <data name="labelBluetooth2.Location" type="System.Drawing.Point, System.Drawing">
<value>1, 332</value> <value>1, 338</value>
</data> </data>
<data name="labelBluetooth2.Size" type="System.Drawing.Size, System.Drawing"> <data name="labelBluetooth2.Size" type="System.Drawing.Size, System.Drawing">
<value>312, 64</value> <value>312, 64</value>
@ -287,7 +287,7 @@ Once paired, you're ready. Have fun!</value>
<value>True</value> <value>True</value>
</data> </data>
<data name="linkBluetoothSettings.Location" type="System.Drawing.Point, System.Drawing"> <data name="linkBluetoothSettings.Location" type="System.Drawing.Point, System.Drawing">
<value>169, 332</value> <value>169, 338</value>
</data> </data>
<data name="linkBluetoothSettings.Size" type="System.Drawing.Size, System.Drawing"> <data name="linkBluetoothSettings.Size" type="System.Drawing.Size, System.Drawing">
<value>93, 13</value> <value>93, 13</value>
@ -314,13 +314,13 @@ Once paired, you're ready. Have fun!</value>
<value>1, 32</value> <value>1, 32</value>
</data> </data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing"> <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
<value>314, 22</value> <value>314, 32</value>
</data> </data>
<data name="label1.TabIndex" type="System.Int32, mscorlib"> <data name="label1.TabIndex" type="System.Int32, mscorlib">
<value>3</value> <value>3</value>
</data> </data>
<data name="label1.Text" xml:space="preserve"> <data name="label1.Text" xml:space="preserve">
<value>Make sure to check Force Install</value> <value>If this window reappears after installing, you may need to reboot your pc or wait 10-15mins for Windows to notice the driver</value>
</data> </data>
<data name="label1.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing"> <data name="label1.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>TopCenter</value> <value>TopCenter</value>
@ -338,7 +338,7 @@ Once paired, you're ready. Have fun!</value>
<value>7</value> <value>7</value>
</data> </data>
<data name="label2.Location" type="System.Drawing.Point, System.Drawing"> <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 82</value> <value>0, 88</value>
</data> </data>
<data name="label2.Size" type="System.Drawing.Size, System.Drawing"> <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
<value>315, 22</value> <value>315, 22</value>
@ -365,7 +365,7 @@ Once paired, you're ready. Have fun!</value>
<value>6</value> <value>6</value>
</data> </data>
<data name="bnFinish.Location" type="System.Drawing.Point, System.Drawing"> <data name="bnFinish.Location" type="System.Drawing.Point, System.Drawing">
<value>117, 394</value> <value>117, 400</value>
</data> </data>
<data name="bnFinish.Size" type="System.Drawing.Size, System.Drawing"> <data name="bnFinish.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value> <value>75, 23</value>
@ -395,7 +395,7 @@ Once paired, you're ready. Have fun!</value>
<value>96, 96</value> <value>96, 96</value>
</data> </data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing"> <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>315, 421</value> <value>315, 428</value>
</data> </data>
<data name="$this.Text" xml:space="preserve"> <data name="$this.Text" xml:space="preserve">
<value>Welcome to DS4Windows</value> <value>Welcome to DS4Windows</value>