Skip to content

Commit

Permalink
Version 1.4.231
Browse files Browse the repository at this point in the history 
Fixed charging light not saving (thanks tehmantra)
Truly finished Italian Translation
  • Loading branch information
@Jays2Kings
Jays2Kings committed Feb 10, 2015
1 parent 7d7d5d7 commit 0cb77ad
Show file tree
Hide file tree
Showing 9 changed files with 8,819 additions and 8,349 deletions.
174 changes: 122 additions & 52 deletions DS4Windows/DS4Form.Designer.cs
View file

Large diffs are not rendered by default.

409 changes: 289 additions & 120 deletions DS4Windows/DS4Form.it-IT.resx
View file

Large diffs are not rendered by default.

16,442 changes: 8,327 additions & 8,115 deletions DS4Windows/DS4Form.resx
View file

Large diffs are not rendered by default.

48 changes: 24 additions & 24 deletions DS4Windows/Hotkeys.de-DE.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,30 +142,6 @@
<data name="linkDonate.Text" xml:space="preserve">
<value>Spenden via Paypal</value>
</data>
<data name="tPHotkeys.Size" type="System.Drawing.Size, System.Drawing">
<value>574, 352</value>
</data>
<data name="tPHotkeys.Text" xml:space="preserve">
<value>Makros</value>
</data>
<data name="lbTranslators.Size" type="System.Drawing.Size, System.Drawing">
<value>61, 13</value>
</data>
<data name="lbTranslators.Text" xml:space="preserve">
<value>Übersetzer:</value>
</data>
<data name="lbLinkText.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 336</value>
</data>
<data name="tPCredits.Size" type="System.Drawing.Size, System.Drawing">
<value>574, 352</value>
</data>
<data name="tCAbout.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 19</value>
</data>
<data name="tCAbout.Size" type="System.Drawing.Size, System.Drawing">
<value>582, 378</value>
</data>
<data name="lbHotkeys.Size" type="System.Drawing.Size, System.Drawing">
<value>551, 458</value>
</data>
Expand Down Expand Up @@ -204,6 +180,30 @@ Scan Code: Tasten werden unterschiedlich interpretiert. Nur für manche Spiele n

*Falls aktiviert</value>
</data>
<data name="tPHotkeys.Size" type="System.Drawing.Size, System.Drawing">
<value>574, 352</value>
</data>
<data name="tPHotkeys.Text" xml:space="preserve">
<value>Makros</value>
</data>
<data name="lbTranslators.Size" type="System.Drawing.Size, System.Drawing">
<value>61, 13</value>
</data>
<data name="lbTranslators.Text" xml:space="preserve">
<value>Übersetzer:</value>
</data>
<data name="lbLinkText.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 336</value>
</data>
<data name="tPCredits.Size" type="System.Drawing.Size, System.Drawing">
<value>574, 352</value>
</data>
<data name="tCAbout.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 19</value>
</data>
<data name="tCAbout.Size" type="System.Drawing.Size, System.Drawing">
<value>582, 378</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>582, 397</value>
</data>
Expand Down
34 changes: 21 additions & 13 deletions DS4Windows/Hotkeys.it-IT.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,15 +136,6 @@
<data name="linkDonate.Text" xml:space="preserve">
<value>Donazioni via Paypal</value>
</data>
<data name="tCAbout.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 19</value>
</data>
<data name="tCAbout.Size" type="System.Drawing.Size, System.Drawing">
<value>563, 412</value>
</data>
<data name="tPHotkeys.Size" type="System.Drawing.Size, System.Drawing">
<value>555, 386</value>
</data>
<data name="lbHotkeys.Size" type="System.Drawing.Size, System.Drawing">
<value>532, 476</value>
</data>
Expand Down Expand Up @@ -183,14 +174,31 @@ Scansiona Codice: I Tasti sono interpretati differentemente. Potrebbe essere nec

*Se abilitato</value>
</data>
<data name="tPHotkeys.Size" type="System.Drawing.Size, System.Drawing">
<value>555, 386</value>
</data>
<data name="lbTranslators.Size" type="System.Drawing.Size, System.Drawing">
<value>52, 13</value>
</data>
<data name="lbTranslators.Text" xml:space="preserve">
<value>Traduttori</value>
</data>
<data name="lbLinkText.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 370</value>
</data>
<data name="tPCredits.Size" type="System.Drawing.Size, System.Drawing">
<value>555, 386</value>
</data>
<data name="tPCredits.Text" xml:space="preserve">
<value>Crediti</value>
</data>
<data name="tCAbout.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 19</value>
</data>
<data name="tCAbout.Size" type="System.Drawing.Size, System.Drawing">
<value>563, 412</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>563, 431</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
</root>
44 changes: 22 additions & 22 deletions DS4Windows/Hotkeys.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@
<data name="linkDonate.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lbTranslators.Text" xml:space="preserve">
<value>Translators:</value>
<data name="&gt;&gt;lbGerman.Parent" xml:space="preserve">
<value>tLPTranslators</value>
</data>
<data name="&gt;&gt;lbHotkeys.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
Expand Down Expand Up @@ -354,8 +354,8 @@
<data name="lbTranslators.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>Hotkeys</value>
<data name="lbLinkText.Size" type="System.Drawing.Size, System.Drawing">
<value>103, 13</value>
</data>
<data name="linkInhexSTER.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
Expand All @@ -369,9 +369,6 @@
<data name="linkElectro.TabIndex" type="System.Int32, mscorlib">
<value>18</value>
</data>
<data name="&gt;&gt;lbItalianT.Parent" xml:space="preserve">
<value>tLPTranslators</value>
</data>
<data name="lbLinkText.Text" xml:space="preserve">
<value>Links displayed here</value>
</data>
Expand All @@ -393,9 +390,6 @@
<data name="tPHotkeys.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="lbLinkText.Size" type="System.Drawing.Size, System.Drawing">
<value>103, 13</value>
</data>
<data name="&gt;&gt;lbRussian.ZOrder" xml:space="preserve">
<value>4</value>
</data>
Expand Down Expand Up @@ -429,6 +423,9 @@
<data name="linkJays2Kings.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>Hotkeys</value>
</data>
<data name="lbAbout.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
Expand All @@ -450,6 +447,9 @@
<data name="&gt;&gt;linkInhexSTER.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>507, 428</value>
</data>
<data name="lbRussian.Text" xml:space="preserve">
<value>Russian/ру́сский язы́к</value>
</data>
Expand Down Expand Up @@ -558,21 +558,21 @@
<data name="tPCredits.Size" type="System.Drawing.Size, System.Drawing">
<value>559, 383</value>
</data>
<data name="lbRussian.TabIndex" type="System.Int32, mscorlib">
<value>13</value>
<data name="&gt;&gt;lbItalianT.Parent" xml:space="preserve">
<value>tLPTranslators</value>
</data>
<data name="tCAbout.Size" type="System.Drawing.Size, System.Drawing">
<value>567, 409</value>
</data>
<data name="&gt;&gt;lbGerman.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="lbRussian.TabIndex" type="System.Int32, mscorlib">
<value>13</value>
</data>
<data name="&gt;&gt;lbRussian.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="tLPTranslators.Location" type="System.Drawing.Point, System.Drawing">
<value>2, 109</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
Expand Down Expand Up @@ -633,14 +633,14 @@
<data name="linkDonate.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
</data>
<data name="&gt;&gt;lbGerman.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="lbTranslators.Text" xml:space="preserve">
<value>Translators:</value>
</data>
<data name="linkSourceCode.Size" type="System.Drawing.Size, System.Drawing">
<value>69, 13</value>
</data>
<data name="&gt;&gt;lbGerman.Parent" xml:space="preserve">
<value>tLPTranslators</value>
<data name="tLPTranslators.Location" type="System.Drawing.Point, System.Drawing">
<value>2, 109</value>
</data>
<data name="&gt;&gt;linkJays2Kings.Type" xml:space="preserve">
<value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
Expand Down Expand Up @@ -782,13 +782,13 @@ Scan Code: Keys are interpreted differently. May be needed for certain games
<data name="&gt;&gt;linkSourceCode.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>507, 428</value>
<data name="&gt;&gt;lbGerman.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</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>de-DE</value>
<value>it-IT</value>
</metadata>
</root>
4 changes: 3 additions & 1 deletion DS4Windows/Options.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,7 @@ public void Set()
Global.MainColor[device] = new DS4Color((byte)tBRedBar.Value, (byte)tBGreenBar.Value, (byte)tBBlueBar.Value);
Global.LowColor[device] = new DS4Color((byte)tBLowRedBar.Value, (byte)tBLowGreenBar.Value, (byte)tBLowBlueBar.Value);
Global.ShiftColor[device] = new DS4Color((byte)tBShiftRedBar.Value, (byte)tBShiftGreenBar.Value, (byte)tBShiftBlueBar.Value);
Global.ChargingColor[device] = new DS4Color(btnChargingColor.BackColor);
Global.FlashType[device] = (byte)cBFlashType.SelectedIndex;
if (btnFlashColor.BackColor != pBController.BackColor)
Global.FlashColor[device] = new DS4Color(btnFlashColor.BackColor);
Expand Down Expand Up @@ -723,7 +724,8 @@ private void btnChargingColor_Click(object sender, EventArgs e)
btnChargingColor.BackColor = advColorDialog.Color;
}
if (device < 4)
DS4LightBar.forcelight[device] = false;
DS4LightBar.forcelight[device] = false;
Global.ChargingColor[device] = new DS4Color(btnChargingColor.BackColor);
}
private void advColorDialog_OnUpdateColor(object sender, EventArgs e)
{
Expand Down
4 changes: 2 additions & 2 deletions 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.23")]
[assembly: AssemblyFileVersion("1.4.23")]
[assembly: AssemblyVersion("1.4.231")]
[assembly: AssemblyFileVersion("1.4.231")]
9 changes: 9 additions & 0 deletions Properties/Resources.it-IT.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -513,4 +513,13 @@
<data name="XinputPorts" xml:space="preserve">
<value>Usa porte più alte se ricevi conflitti in altri programmi emulatori X360, come il tool SCP</value>
</data>
<data name="LatencyNotOverTen" xml:space="preserve">
<value>Latenza del Controller *number* ora inferiore a 10ms</value>
</data>
<data name="LatencyOverTen" xml:space="preserve">
<value>Latenza del Controller *number* superiore a 10ms</value>
</data>
<data name="NotUsingProfile" xml:space="preserve">
<value>Il Controller *number* non sta utilizzando alcun profilo</value>
</data>
</root>

0 comments on commit 0cb77ad

Please sign in to comment.