Skip to content
This repository was archived by the owner on Oct 24, 2021. It is now read-only.

Commit fa639ba

Browse files
Jays2KingsJays2Kings
committed
Version 1.4.321
Changed the Rainbow button to an actual button For using the sixaxis as a mouse, changed none to Always on, also better movement for the gyro when the sensitivity is lowered Updated Hebrew, Chinese (Traditional), Itilian, Chinese (Simplified)
1 parent f567bfb commit fa639ba

41 files changed

Lines changed: 4575 additions & 4702 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎DS4Windows/DS4Control/Mouse.cs‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ public Mouse(int deviceID, DS4Device d)
3434

3535
public virtual void sixaxisMoved(object sender, SixAxisEventArgs arg)
3636
{
37-
if (Global.UseSAforMouse[deviceNum])
37+
if (Global.UseSAforMouse[deviceNum] && Global.GyroSensitivity[deviceNum] > 0)
3838
{
3939
bool triggeractivated = true;
4040
int i = 0;
4141
string[] ss = Global.SATriggers[deviceNum].Split(',');
42-
//List<DS4Controls> ds4C = new List<DS4Controls>();
43-
foreach (string s in ss)
44-
if (!(int.TryParse(s, out i) && getDS4ControlsByName(i)))
45-
triggeractivated = false;
42+
if (!string.IsNullOrEmpty(ss[0]))
43+
foreach (string s in ss)
44+
if (!(int.TryParse(s, out i) && getDS4ControlsByName(i)))
45+
triggeractivated = false;
4646
if (triggeractivated)
4747
cursor.sixaxisMoved(arg);
4848
dev.getCurrentState(s);
@@ -53,6 +53,7 @@ private bool getDS4ControlsByName(int key)
5353
{
5454
switch (key)
5555
{
56+
case -1: return true;
5657
case 0: return s.Cross;
5758
case 1: return s.Circle;
5859
case 2: return s.Square;
@@ -71,6 +72,7 @@ private bool getDS4ControlsByName(int key)
7172
case 15: return s.Touch2;
7273
case 16: return s.Options;
7374
case 17: return s.Share;
75+
case 18: return s.PS;
7476
}
7577
return false;
7678
}

‎DS4Windows/DS4Control/MouseCursor.cs‎

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -28,35 +28,20 @@ public virtual void sixaxisMoved(SixAxisEventArgs arg)
2828
int deltaX = 0, deltaY = 0;
2929
deltaX = -arg.sixAxis.accelX;
3030
deltaY = -arg.sixAxis.accelY;
31+
//Console.WriteLine(arg.sixAxis.deltaX);
32+
3133
double coefficient = Global.GyroSensitivity[deviceNumber] / 100f;
32-
// Collect rounding errors instead of losing motion.
34+
//Collect rounding errors instead of losing motion.
3335
double xMotion = coefficient * deltaX;
34-
if (xMotion > 0.0)
35-
{
36-
if (horizontalRemainder > 0.0)
37-
xMotion += horizontalRemainder;
38-
}
39-
else if (xMotion < 0.0)
40-
{
41-
if (horizontalRemainder < 0.0)
42-
xMotion += horizontalRemainder;
43-
}
36+
xMotion += hRemainder;
4437
int xAction = (int)xMotion;
45-
hRemainder = xMotion - xAction;
46-
38+
hRemainder += xMotion - xAction;
39+
hRemainder -= (int)hRemainder;
4740
double yMotion = coefficient * deltaY;
48-
if (yMotion > 0.0)
49-
{
50-
if (verticalRemainder > 0.0)
51-
yMotion += verticalRemainder;
52-
}
53-
else if (yMotion < 0.0)
54-
{
55-
if (verticalRemainder < 0.0)
56-
yMotion += verticalRemainder;
57-
}
41+
yMotion += vRemainder;
5842
int yAction = (int)yMotion;
59-
vRemainder = yMotion - yAction;
43+
vRemainder += yMotion - yAction;
44+
vRemainder -= (int)vRemainder;
6045
if (Global.GyroInvert[deviceNumber] == 2 || Global.GyroInvert[deviceNumber] == 3)
6146
xAction *= -1;
6247
if (Global.GyroInvert[deviceNumber] == 1 || Global.GyroInvert[deviceNumber] == 3)

‎DS4Windows/DS4Forms/DS4Form.Designer.cs‎

Lines changed: 50 additions & 132 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎DS4Windows/DS4Forms/DS4Form.ar.resx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6743,7 +6743,7 @@
67436743
<value>171, 26</value>
67446744
</data>
67456745
<data name="duplicateToolStripMenuItem.Text" xml:space="preserve">
6746-
<value>تكرير (Ctrl+C)</value>
6746+
<value>تكرير (Ctrl+D)</value>
67476747
</data>
67486748
<data name="newProfileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
67496749
<value>171, 26</value>
@@ -6845,7 +6845,7 @@
68456845
<value>كرر</value>
68466846
</data>
68476847
<data name="tSBDupProfile.ToolTipText" xml:space="preserve">
6848-
<value>كرر السجل المحدد (Ctrl+C)</value>
6848+
<value>كرر السجل المحدد (Ctrl+D)</value>
68496849
</data>
68506850
<data name="tSBImportProfile.Size" type="System.Drawing.Size, System.Drawing">
68516851
<value>77, 24</value>

‎DS4Windows/DS4Forms/DS4Form.cs‎

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ public DS4Form(string[] args)
329329
hotkeysTimer.Start();
330330
hotkeysTimer.Tick += Hotkeys;
331331
test.Tick += test_Tick;
332-
if (!System.IO.Directory.Exists(appdatapath + "\\Virtual Bus Driver"))
332+
if (!Directory.Exists(appdatapath + "\\Virtual Bus Driver"))
333333
linkUninstall.Visible = false;
334334
if (File.Exists(Environment.GetFolderPath(Environment.SpecialFolder.Startup) + "\\DS4Windows.lnk"))
335335
{
@@ -357,23 +357,6 @@ private async void UpdateTheUpdater()
357357
File.Move(exepath + "\\Update Files\\DS4Updater.exe", exepath + "\\DS4Updater.exe");
358358
Directory.Delete(exepath + "\\Update Files");
359359
}
360-
if(FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).FileBuildPart == 32 &&
361-
(!File.Exists(exepath + "\\DS4Updater.exe") ||
362-
(File.Exists(exepath + "\\DS4Updater.exe") && FileVersionInfo.GetVersionInfo(exepath + "\\DS4Updater.exe").FileBuildPart < 32)))
363-
{
364-
Uri url2 = new Uri("https://github.com/Jays2Kings/DS4Windows/releases/download/v1.4.32/DS4Updater.exe");
365-
WebClient wc2 = new WebClient();
366-
if (appdatapath == exepath || !AdminNeeded())
367-
{
368-
File.Delete(exepath + "\\DS4Updater.exe");
369-
wc2.DownloadFileAsync(url2, exepath + "\\DS4Updater.exe");
370-
}
371-
else
372-
{
373-
MessageBox.Show(Properties.Resources.PleaseDownloadUpdater);
374-
Process.Start("https://github.com/Jays2Kings/DS4Windows/releases/download/v1.4.32/DS4Updater.exe");
375-
}
376-
}
377360
}
378361

379362
void NewVersion()
@@ -480,9 +463,9 @@ private void OnPowerChange(object s, PowerModeChangedEventArgs e)
480463

481464
private void test_Tick(object sender, EventArgs e)
482465
{
483-
/*testing values
466+
//testing values
484467
lbTest.Visible = true;
485-
lbTest.Text = Program.rootHub.oldtouchvalue[0].ToString();//*/
468+
lbTest.Text = ((int)(Program.rootHub.ExposedState[0].AccelX * 2) / 2f).ToString();
486469
}
487470
void Hotkeys(object sender, EventArgs e)
488471
{
@@ -932,13 +915,13 @@ private void lBProfiles_MouseDoubleClick(object sender, MouseEventArgs e)
932915

933916
private void lBProfiles_KeyDown(object sender, KeyEventArgs e)
934917
{
935-
if (lBProfiles.SelectedIndex >= 0 && opt == null)
918+
if (lBProfiles.SelectedIndex >= 0 && !opt.Visible)
936919
{
937920
if (e.KeyValue == 13)
938921
ShowOptions(4, lBProfiles.SelectedItem.ToString());
939922
if (e.KeyValue == 46)
940923
tsBDeleteProfle_Click(this, e);
941-
if (e.KeyValue == 67 && e.Modifiers == Keys.Control)
924+
if (e.KeyValue == 68 && e.Modifiers == Keys.Control)
942925
tSBDupProfile_Click(this, e);
943926
}
944927

‎DS4Windows/DS4Forms/DS4Form.de-DE.resx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6744,7 +6744,7 @@
67446744
<value>226, 26</value>
67456745
</data>
67466746
<data name="duplicateToolStripMenuItem.Text" xml:space="preserve">
6747-
<value>Kopieren (Strg+C)</value>
6747+
<value>Kopieren (Strg+D)</value>
67486748
</data>
67496749
<data name="newProfileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
67506750
<value>226, 26</value>

‎DS4Windows/DS4Forms/DS4Form.es.resx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6743,7 +6743,7 @@
67436743
<value>240, 24</value>
67446744
</data>
67456745
<data name="duplicateToolStripMenuItem.Text" xml:space="preserve">
6746-
<value>Duplicar (Ctrl+C)</value>
6746+
<value>Duplicar (Ctrl+D)</value>
67476747
</data>
67486748
<data name="newProfileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
67496749
<value>240, 24</value>
@@ -6851,7 +6851,7 @@
68516851
<value>Duplicar</value>
68526852
</data>
68536853
<data name="tSBDupProfile.ToolTipText" xml:space="preserve">
6854-
<value>Duplicar perfil seleccionado (Ctrl+C)</value>
6854+
<value>Duplicar perfil seleccionado (Ctrl+D)</value>
68556855
</data>
68566856
<data name="tSBImportProfile.Size" type="System.Drawing.Size, System.Drawing">
68576857
<value>91, 24</value>

‎DS4Windows/DS4Forms/DS4Form.fr-FR.resx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6773,7 +6773,7 @@
67736773
<value>206, 26</value>
67746774
</data>
67756775
<data name="duplicateToolStripMenuItem.Text" xml:space="preserve">
6776-
<value>Dupliquer (Ctrl+C)</value>
6776+
<value>Dupliquer (Ctrl+D)</value>
67776777
</data>
67786778
<data name="newProfileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
67796779
<value>206, 26</value>

‎DS4Windows/DS4Forms/DS4Form.he.resx‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
<value>זמן</value>
122122
</data>
123123
<data name="chData.Text" xml:space="preserve">
124-
<value>דאטה</value>
124+
<value>נתונים</value>
125125
</data>
126126
<data name="btnStartStop.Text" xml:space="preserve">
127127
<value>התחל</value>
@@ -6366,7 +6366,7 @@
63666366
<value>בקרים</value>
63676367
</data>
63686368
<data name="btnConnectDS4Win10.Text" xml:space="preserve">
6369-
<value>התחבר ל-DS4 בלעדית</value>
6369+
<value>התחבר ל-DS4 בלעדית (ניסיוני)</value>
63706370
</data>
63716371
<data name="bnLight3.Location" type="System.Drawing.Point, System.Drawing">
63726372
<value>1085, 94</value>
@@ -6716,37 +6716,37 @@
67166716
<value>186, 26</value>
67176717
</data>
67186718
<data name="assignToController1ToolStripMenuItem.Text" xml:space="preserve">
6719-
<value>הגדר בבקר 1</value>
6719+
<value>הגדר כבקר 1</value>
67206720
</data>
67216721
<data name="assignToController2ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
67226722
<value>186, 26</value>
67236723
</data>
67246724
<data name="assignToController2ToolStripMenuItem.Text" xml:space="preserve">
6725-
<value>הגדר בבקר 2</value>
6725+
<value>הגדר כבקר 2</value>
67266726
</data>
67276727
<data name="assignToController3ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
67286728
<value>186, 26</value>
67296729
</data>
67306730
<data name="assignToController3ToolStripMenuItem.Text" xml:space="preserve">
6731-
<value>הגדר בבקר 3</value>
6731+
<value>הגדר כבקר 3</value>
67326732
</data>
67336733
<data name="assignToController4ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
67346734
<value>186, 26</value>
67356735
</data>
67366736
<data name="assignToController4ToolStripMenuItem.Text" xml:space="preserve">
6737-
<value>הגדר בבקר 4</value>
6737+
<value>הגדר כבקר 4</value>
67386738
</data>
67396739
<data name="deleteToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
67406740
<value>186, 26</value>
67416741
</data>
67426742
<data name="deleteToolStripMenuItem.Text" xml:space="preserve">
6743-
<value>מחיקה (Delete)</value>
6743+
<value>מחק (Delete)</value>
67446744
</data>
67456745
<data name="duplicateToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
67466746
<value>186, 26</value>
67476747
</data>
67486748
<data name="duplicateToolStripMenuItem.Text" xml:space="preserve">
6749-
<value>שכפל (Ctrl+C)</value>
6749+
<value>שכפל (Ctrl+D)</value>
67506750
</data>
67516751
<data name="newProfileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
67526752
<value>186, 26</value>
@@ -6851,7 +6851,7 @@
68516851
<value>שכפל</value>
68526852
</data>
68536853
<data name="tSBDupProfile.ToolTipText" xml:space="preserve">
6854-
<value>שכפל את הפרופיל הנבחר</value>
6854+
<value>שכפל את הפרופיל הנבחר (Ctrl+D)</value>
68556855
</data>
68566856
<data name="tSBImportProfile.Size" type="System.Drawing.Size, System.Drawing">
68576857
<value>60, 24</value>
@@ -6860,7 +6860,7 @@
68606860
<value>ייבא</value>
68616861
</data>
68626862
<data name="tSBImportProfile.ToolTipText" xml:space="preserve">
6863-
<value>ייבא את הפרופיל הנבחר</value>
6863+
<value>ייבא פרופיל/ים</value>
68646864
</data>
68656865
<data name="tSBExportProfile.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
68666866
<value>
@@ -6940,7 +6940,7 @@
69406940
<value>224, 21</value>
69416941
</data>
69426942
<data name="cBDisconnectBT.Text" xml:space="preserve">
6943-
<value>נתק Bluetooth בעת השימוש בבקר</value>
6943+
<value>נתק Bluetooth בעת הסגירה</value>
69446944
</data>
69456945
<data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
69466946
<value>269, 28</value>
@@ -7065,4 +7065,7 @@
70657065
<data name="useCustomColorToolStripMenuItem.Text" xml:space="preserve">
70667066
<value>שימוש בצבע מסוים</value>
70677067
</data>
7068+
<data name="cBCloseMini.Text" xml:space="preserve">
7069+
<value>סגירה ממזערת</value>
7070+
</data>
70687071
</root>

‎DS4Windows/DS4Forms/DS4Form.it-IT.resx‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6737,7 +6737,7 @@
67376737
<value>233, 26</value>
67386738
</data>
67396739
<data name="duplicateToolStripMenuItem.Text" xml:space="preserve">
6740-
<value>Duplica (Ctrl+C)</value>
6740+
<value>Duplica (Ctrl+D)</value>
67416741
</data>
67426742
<data name="newProfileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
67436743
<value>233, 26</value>
@@ -6845,7 +6845,7 @@
68456845
<value>Duplica</value>
68466846
</data>
68476847
<data name="tSBDupProfile.ToolTipText" xml:space="preserve">
6848-
<value>Duplica Profilo Selezionato (Ctrl+C)</value>
6848+
<value>Duplica Profilo Selezionato (Ctrl+D)</value>
68496849
</data>
68506850
<data name="tSBImportProfile.Size" type="System.Drawing.Size, System.Drawing">
68516851
<value>86, 24</value>
@@ -7035,4 +7035,31 @@
70357035
<data name="tabLog.Text" xml:space="preserve">
70367036
<value>Registro</value>
70377037
</data>
7038+
<data name="btnConnectDS4Win10.Text" xml:space="preserve">
7039+
<value>Connetti Solo DS4 (sperimentale)</value>
7040+
</data>
7041+
<data name="cBoxNotifications.Items" xml:space="preserve">
7042+
<value>Nessuno</value>
7043+
</data>
7044+
<data name="cBoxNotifications.Items1" xml:space="preserve">
7045+
<value>Solo Avvisi</value>
7046+
</data>
7047+
<data name="cBoxNotifications.Items2" xml:space="preserve">
7048+
<value>Tutto</value>
7049+
</data>
7050+
<data name="chData.Text" xml:space="preserve">
7051+
<value>Data</value>
7052+
</data>
7053+
<data name="lbID.Text" xml:space="preserve">
7054+
<value>ID</value>
7055+
</data>
7056+
<data name="llbHelp.Text" xml:space="preserve">
7057+
<value>Hotkeys/About</value>
7058+
</data>
7059+
<data name="useCustomColorToolStripMenuItem.Text" xml:space="preserve">
7060+
<value>Usa Colore Personalizzato</value>
7061+
</data>
7062+
<data name="useProfileColorToolStripMenuItem.Text" xml:space="preserve">
7063+
<value>Usa Colore Profilo</value>
7064+
</data>
70387065
</root>

0 commit comments

Comments
 (0)