Skip to content

Commit

Permalink
Version 1.4.0.7
Browse files Browse the repository at this point in the history 
Improved mapping support: can better handle the switching of controls:
ie triangle and circle/dpad and left stick/L1+R1 and L2+R2. If you have
a profile with swap buttons, they may not work until you open the
profile in settings and resave.
Servers moved to ds4winsdows.com
Remove DS4Windows from Alt+tab menu if minimized to tray (thanks
youturnjason)
Basic support for command line arguments (right now just "-stop" is
supported: starts program up without starting the ds4)
  • Loading branch information
@Jays2Kings
Jays2Kings committed Oct 13, 2014
1 parent 9b65de1 commit 0f4297b
Show file tree
Hide file tree
Showing 8 changed files with 206 additions and 187 deletions.
132 changes: 69 additions & 63 deletions DS4Control/Mapping.cs
View file

Large diffs are not rendered by default.

64 changes: 32 additions & 32 deletions DS4Tool/Options.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions DS4Tool/Options.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ public Options(DS4Control.Control bus_device, int deviceNum, string name, ScpFor
root = rt;
g = CreateGraphics();
greyscale = GreyscaleImage((Bitmap)pBRainbow.Image);
foreach (System.Windows.Forms.Control control in MainPanel.Controls)
foreach (System.Windows.Forms.Control control in SticksPanel.Controls)
if (control is Button)
if (!((Button)control).Name.Contains("btn"))
buttons.Add((Button)control);
foreach (System.Windows.Forms.Control control in SticksPanel.Controls)
foreach (System.Windows.Forms.Control control in MainPanel.Controls)
if (control is Button)
if (!((Button)control).Name.Contains("btn"))
buttons.Add((Button)control);
Expand All @@ -58,6 +58,10 @@ public Options(DS4Control.Control bus_device, int deviceNum, string name, ScpFor
if (control is Button)
if (!((Button)control).Name.Contains("sbtn"))
subbuttons.Add((Button)control);
string butts = "";
foreach (Button b in buttons)
butts += "\n" + b.Name;
//MessageBox.Show(butts);
root.lbLastMessage.ForeColor = Color.Black;
root.lbLastMessage.Text = "Hover over items to see description or more about";
foreach (System.Windows.Forms.Control control in Controls)
Expand Down
150 changes: 75 additions & 75 deletions DS4Tool/Options.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,74 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="bnL2.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>None</value>
</data>
<data name="bnL2.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
<value>Flat</value>
</data>
<data name="bnL2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="bnL2.Location" type="System.Drawing.Point, System.Drawing">
<value>31, 0</value>
</data>
<data name="bnL2.Size" type="System.Drawing.Size, System.Drawing">
<value>43, 12</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="bnL2.TabIndex" type="System.Int32, mscorlib">
<value>90</value>
</data>
<data name="bnL2.Text" xml:space="preserve">
<value>Left Trigger</value>
</data>
<data name="&gt;&gt;bnL2.Name" xml:space="preserve">
<value>bnL2</value>
</data>
<data name="&gt;&gt;bnL2.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;bnL2.Parent" xml:space="preserve">
<value>MainPanel</value>
</data>
<data name="&gt;&gt;bnL2.ZOrder" xml:space="preserve">
<value>21</value>
</data>
<data name="bnR2.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>None</value>
</data>
<data name="bnR2.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
<value>Flat</value>
</data>
<data name="bnR2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="bnR2.Location" type="System.Drawing.Point, System.Drawing">
<value>174, 0</value>
</data>
<data name="bnR2.Size" type="System.Drawing.Size, System.Drawing">
<value>40, 13</value>
</data>
<data name="bnR2.TabIndex" type="System.Int32, mscorlib">
<value>89</value>
</data>
<data name="bnR2.Text" xml:space="preserve">
<value>Right Trigger</value>
</data>
<data name="&gt;&gt;bnR2.Name" xml:space="preserve">
<value>bnR2</value>
</data>
<data name="&gt;&gt;bnR2.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;bnR2.Parent" xml:space="preserve">
<value>MainPanel</value>
</data>
<data name="&gt;&gt;bnR2.ZOrder" xml:space="preserve">
<value>22</value>
</data>
<data name="bnTouchUpper.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>None</value>
</data>
Expand All @@ -127,14 +195,12 @@
<data name="bnTouchUpper.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="bnTouchUpper.Location" type="System.Drawing.Point, System.Drawing">
<value>84, 25</value>
</data>
<data name="bnTouchUpper.Size" type="System.Drawing.Size, System.Drawing">
<value>78, 16</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="bnTouchUpper.TabIndex" type="System.Int32, mscorlib">
<value>193</value>
</data>
Expand Down Expand Up @@ -615,39 +681,6 @@
<data name="&gt;&gt;bnDown.ZOrder" xml:space="preserve">
<value>14</value>
</data>
<data name="bnL2.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>None</value>
</data>
<data name="bnL2.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
<value>Flat</value>
</data>
<data name="bnL2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="bnL2.Location" type="System.Drawing.Point, System.Drawing">
<value>31, 0</value>
</data>
<data name="bnL2.Size" type="System.Drawing.Size, System.Drawing">
<value>43, 12</value>
</data>
<data name="bnL2.TabIndex" type="System.Int32, mscorlib">
<value>90</value>
</data>
<data name="bnL2.Text" xml:space="preserve">
<value>Left Trigger</value>
</data>
<data name="&gt;&gt;bnL2.Name" xml:space="preserve">
<value>bnL2</value>
</data>
<data name="&gt;&gt;bnL2.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;bnL2.Parent" xml:space="preserve">
<value>MainPanel</value>
</data>
<data name="&gt;&gt;bnL2.ZOrder" xml:space="preserve">
<value>15</value>
</data>
<data name="bnRight.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>None</value>
</data>
Expand Down Expand Up @@ -679,40 +712,7 @@
<value>MainPanel</value>
</data>
<data name="&gt;&gt;bnRight.ZOrder" xml:space="preserve">
<value>16</value>
</data>
<data name="bnR2.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>None</value>
</data>
<data name="bnR2.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
<value>Flat</value>
</data>
<data name="bnR2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="bnR2.Location" type="System.Drawing.Point, System.Drawing">
<value>174, 0</value>
</data>
<data name="bnR2.Size" type="System.Drawing.Size, System.Drawing">
<value>40, 13</value>
</data>
<data name="bnR2.TabIndex" type="System.Int32, mscorlib">
<value>89</value>
</data>
<data name="bnR2.Text" xml:space="preserve">
<value>Right Trigger</value>
</data>
<data name="&gt;&gt;bnR2.Name" xml:space="preserve">
<value>bnR2</value>
</data>
<data name="&gt;&gt;bnR2.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;bnR2.Parent" xml:space="preserve">
<value>MainPanel</value>
</data>
<data name="&gt;&gt;bnR2.ZOrder" xml:space="preserve">
<value>17</value>
<value>15</value>
</data>
<data name="bnLeft.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>None</value>
Expand Down Expand Up @@ -745,7 +745,7 @@
<value>MainPanel</value>
</data>
<data name="&gt;&gt;bnLeft.ZOrder" xml:space="preserve">
<value>18</value>
<value>16</value>
</data>
<data name="bnL1.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>None</value>
Expand Down Expand Up @@ -778,7 +778,7 @@
<value>MainPanel</value>
</data>
<data name="&gt;&gt;bnL1.ZOrder" xml:space="preserve">
<value>19</value>
<value>17</value>
</data>
<data name="bnOptions.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>None</value>
Expand Down Expand Up @@ -811,7 +811,7 @@
<value>MainPanel</value>
</data>
<data name="&gt;&gt;bnOptions.ZOrder" xml:space="preserve">
<value>20</value>
<value>18</value>
</data>
<data name="bnPS.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>None</value>
Expand Down Expand Up @@ -844,7 +844,7 @@
<value>MainPanel</value>
</data>
<data name="&gt;&gt;bnPS.ZOrder" xml:space="preserve">
<value>21</value>
<value>19</value>
</data>
<data name="bnShare.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>None</value>
Expand Down Expand Up @@ -877,7 +877,7 @@
<value>MainPanel</value>
</data>
<data name="&gt;&gt;bnShare.ZOrder" xml:space="preserve">
<value>22</value>
<value>20</value>
</data>
<data name="MainPanel.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 42</value>
Expand Down Expand Up @@ -6784,7 +6784,7 @@ with profile</value>
<value>advColorDialog</value>
</data>
<data name="&gt;&gt;advColorDialog.Type" xml:space="preserve">
<value>ScpServer.AdvancedColorDialog, DS4Windows, Version=1.4.0.6, Culture=neutral, PublicKeyToken=null</value>
<value>ScpServer.AdvancedColorDialog, DS4Windows, Version=1.4.0.61, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>Options</value>
Expand Down
4 changes: 2 additions & 2 deletions DS4Tool/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ static class Program
/// The main entry point for the application.
/// </summary>
[STAThread]
static void Main()
static void Main(string [] args)
{
System.Runtime.GCSettings.LatencyMode = System.Runtime.GCLatencyMode.LowLatency;
try
Expand All @@ -38,7 +38,7 @@ static void Main()
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new ScpForm());
Application.Run(new ScpForm(args));
}
else
{
Expand Down
4 changes: 2 additions & 2 deletions DS4Tool/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.4.0.61")]
[assembly: AssemblyFileVersion("1.4.0.61")]
[assembly: AssemblyVersion("1.4.0.7")]
[assembly: AssemblyFileVersion("1.4.0.7")]
Loading

0 comments on commit 0f4297b

Please sign in to comment.