diff --git a/DS4Control/Control.cs b/DS4Control/Control.cs
index 74c8bd3..fb97a37 100644
--- a/DS4Control/Control.cs
+++ b/DS4Control/Control.cs
@@ -325,7 +325,7 @@ namespace DS4Control
{
battery = d.Battery + "%";
}
- return (d.ConnectionType + " " + battery + " (" + System.IO.Path.GetFileNameWithoutExtension(Global.getAProfile(index)) + ")");//.Substring(0,30);
+ return (d.ConnectionType + " " + battery);
}
else
return Properties.Resources.NoneText;
diff --git a/DS4Tool/DS4Tool.csproj b/DS4Tool/DS4Tool.csproj
index 8801b71..5e242d1 100644
--- a/DS4Tool/DS4Tool.csproj
+++ b/DS4Tool/DS4Tool.csproj
@@ -198,6 +198,9 @@
+
+ SaveWhere.cs
+
SaveWhere.cs
diff --git a/DS4Tool/Properties/AssemblyInfo.cs b/DS4Tool/Properties/AssemblyInfo.cs
index 223167e..797c38f 100644
--- a/DS4Tool/Properties/AssemblyInfo.cs
+++ b/DS4Tool/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 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.3")]
-[assembly: AssemblyFileVersion("1.4.0.3")]
+[assembly: AssemblyVersion("1.4.0.32")]
+[assembly: AssemblyFileVersion("1.4.0.32")]
diff --git a/DS4Tool/SaveWhere.Designer.cs b/DS4Tool/SaveWhere.Designer.cs
index 3ca1079..9aecc87 100644
--- a/DS4Tool/SaveWhere.Designer.cs
+++ b/DS4Tool/SaveWhere.Designer.cs
@@ -28,6 +28,7 @@
///
private void InitializeComponent()
{
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SaveWhere));
this.label4 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.bnAppdataFolder = new System.Windows.Forms.Button();
@@ -39,86 +40,53 @@
//
// label4
//
+ resources.ApplyResources(this.label4, "label4");
this.label4.ForeColor = System.Drawing.SystemColors.GrayText;
- this.label4.Location = new System.Drawing.Point(206, 89);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(177, 69);
- this.label4.TabIndex = 9;
- this.label4.Text = "Pour ceux préférant une installation normale, les paramètres sont sauvegardés à %" +
- "appdata%/ds4tool";
- this.label4.TextAlign = System.Drawing.ContentAlignment.TopCenter;
//
// label3
//
+ resources.ApplyResources(this.label3, "label3");
this.label3.ForeColor = System.Drawing.SystemColors.GrayText;
- this.label3.Location = new System.Drawing.Point(5, 89);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(195, 69);
- this.label3.TabIndex = 10;
- this.label3.Text = "Pour ceux qui préfèrent une application portable Note: Cette option ne fonctionne" +
- " point si dans un dossier admin sans UAC (contrôle de compte d\'utilisateur)";
- this.label3.TextAlign = System.Drawing.ContentAlignment.TopCenter;
//
// bnAppdataFolder
//
- this.bnAppdataFolder.Location = new System.Drawing.Point(222, 63);
+ resources.ApplyResources(this.bnAppdataFolder, "bnAppdataFolder");
this.bnAppdataFolder.Name = "bnAppdataFolder";
- this.bnAppdataFolder.Size = new System.Drawing.Size(140, 23);
- this.bnAppdataFolder.TabIndex = 7;
- this.bnAppdataFolder.Text = "Appdata";
this.bnAppdataFolder.UseVisualStyleBackColor = true;
this.bnAppdataFolder.Click += new System.EventHandler(this.bnAppdataFolder_Click);
//
// bnPrgmFolder
//
- this.bnPrgmFolder.Location = new System.Drawing.Point(32, 63);
+ resources.ApplyResources(this.bnPrgmFolder, "bnPrgmFolder");
this.bnPrgmFolder.Name = "bnPrgmFolder";
- this.bnPrgmFolder.Size = new System.Drawing.Size(140, 23);
- this.bnPrgmFolder.TabIndex = 8;
- this.bnPrgmFolder.Text = "Dossier de l\'application";
this.bnPrgmFolder.UseVisualStyleBackColor = true;
this.bnPrgmFolder.Click += new System.EventHandler(this.bnPrgmFolder_Click);
//
// lbPickWhere
//
+ resources.ApplyResources(this.lbPickWhere, "lbPickWhere");
this.lbPickWhere.ForeColor = System.Drawing.SystemColors.ControlText;
- this.lbPickWhere.Location = new System.Drawing.Point(1, 33);
this.lbPickWhere.Name = "lbPickWhere";
- this.lbPickWhere.Size = new System.Drawing.Size(386, 27);
- this.lbPickWhere.TabIndex = 10;
- this.lbPickWhere.Text = "Choisissez l\'emplacement auquel vous voulez que vos paramètres et profiles soient" +
- " sauvegardes, ";
- this.lbPickWhere.TextAlign = System.Drawing.ContentAlignment.TopCenter;
//
// lbMultiSaves
//
- this.lbMultiSaves.AutoSize = true;
+ resources.ApplyResources(this.lbMultiSaves, "lbMultiSaves");
this.lbMultiSaves.ForeColor = System.Drawing.SystemColors.ControlText;
- this.lbMultiSaves.Location = new System.Drawing.Point(9, 8);
this.lbMultiSaves.Name = "lbMultiSaves";
- this.lbMultiSaves.Size = new System.Drawing.Size(243, 13);
- this.lbMultiSaves.TabIndex = 10;
- this.lbMultiSaves.Text = "Multiples emplacements de sauvegarde supprimés";
- this.lbMultiSaves.TextAlign = System.Drawing.ContentAlignment.TopCenter;
- this.lbMultiSaves.Visible = false;
//
// cBDeleteOther
//
- this.cBDeleteOther.AutoSize = true;
- this.cBDeleteOther.Location = new System.Drawing.Point(240, 0);
+ resources.ApplyResources(this.cBDeleteOther, "cBDeleteOther");
this.cBDeleteOther.Name = "cBDeleteOther";
- this.cBDeleteOther.Size = new System.Drawing.Size(147, 30);
- this.cBDeleteOther.TabIndex = 11;
- this.cBDeleteOther.Text = "Ne pas encore supprimer \r\nles autres paramètres";
this.cBDeleteOther.UseVisualStyleBackColor = true;
- this.cBDeleteOther.Visible = false;
//
// SaveWhere
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ControlLightLight;
- this.ClientSize = new System.Drawing.Size(389, 161);
this.Controls.Add(this.cBDeleteOther);
this.Controls.Add(this.label4);
this.Controls.Add(this.lbMultiSaves);
@@ -130,7 +98,6 @@
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "SaveWhere";
- this.Text = "DS4Windows";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.SaveWhere_FormClosing);
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/DS4Tool/SaveWhere.cs b/DS4Tool/SaveWhere.cs
index 304c882..3e21b07 100644
--- a/DS4Tool/SaveWhere.cs
+++ b/DS4Tool/SaveWhere.cs
@@ -26,7 +26,7 @@ namespace ScpServer
lbMultiSaves.Visible = multisaves;
cBDeleteOther.Visible = multisaves;
if (multisaves)
- lbPickWhere.Text += "other location files will be deleted";
+ lbPickWhere.Text += ", other location files will be deleted";
if (Global.AdminNeeded())
bnPrgmFolder.Enabled = false;
}
diff --git a/DS4Tool/SaveWhere.fr-FR.resx b/DS4Tool/SaveWhere.fr-FR.resx
new file mode 100644
index 0000000..78eb946
--- /dev/null
+++ b/DS4Tool/SaveWhere.fr-FR.resx
@@ -0,0 +1,152 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ Pour ceux préférant une installation normale, les paramètres sont sauvegardés à %appdata%/ds4tool
+
+
+ Pour ceux qui préfèrent une application portable Note: Cette option ne fonctionne point si dans un dossier admin sans UAC (contrôle de compte d'utilisateur)
+
+
+ Dossier de l'application
+
+
+ Choisissez l'emplacement auquel vous voulez que vos paramètres et profiles soient sauvegardes
+
+
+
+ 243, 13
+
+
+ Multiples emplacements de sauvegarde supprimés
+
+
+ 243, 0
+
+
+ 144, 30
+
+
+ Ne pas encore supprimer
+les autres paramètres
+
+
+ 389, 157
+
+
\ No newline at end of file
diff --git a/DS4Tool/SaveWhere.resx b/DS4Tool/SaveWhere.resx
index 1af7de1..599e863 100644
--- a/DS4Tool/SaveWhere.resx
+++ b/DS4Tool/SaveWhere.resx
@@ -117,4 +117,220 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 9, 8
+
+
+ bnPrgmFolder
+
+
+ cBDeleteOther
+
+
+ 386, 27
+
+
+
+ 11
+
+
+ 0
+
+
+ Multiple save locations detected
+
+
+ SaveWhere
+
+
+ True
+
+
+ 140, 23
+
+
+ 5
+
+
+ $this
+
+
+ 9
+
+
+ 195, 69
+
+
+ 6, 13
+
+
+ label3
+
+
+ $this
+
+
+ 5, 89
+
+
+ 32, 63
+
+
+ 6
+
+
+ 2
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 159, 13
+
+
+ True
+
+
+ TopCenter
+
+
+ Don't Delete the
+other settings yet
+
+
+ $this
+
+
+ label4
+
+
+ For those who prefer a regular install Settings saved at %appdata%/ds4tool
+
+
+ $this
+
+
+ TopCenter
+
+
+ TopCenter
+
+
+ Pick where you want settings and profiles to be saved
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ For those who prefer a portable program Note: this option does not work if in an admin folder w/o UAC
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TopCenter
+
+
+ $this
+
+
+ 281, 0
+
+
+ 1
+
+
+ 10
+
+
+ Program Folder
+
+
+ bnAppdataFolder
+
+
+ False
+
+
+ 8
+
+
+ 3
+
+
+ 7
+
+
+ lbPickWhere
+
+
+ 10
+
+
+ 10
+
+
+ 206, 89
+
+
+ $this
+
+
+ 177, 69
+
+
+ $this
+
+
+ 222, 63
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ DS4Windows
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ lbMultiSaves
+
+
+ 389, 136
+
+
+ False
+
+
+ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 1, 33
+
+
+ 140, 23
+
+
+ 4
+
+
+ 106, 30
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ Appdata
+
+
+ True
+
+
+ fr-FR
+
\ No newline at end of file
diff --git a/DS4Tool/ScpForm.cs b/DS4Tool/ScpForm.cs
index e4668dd..5596436 100644
--- a/DS4Tool/ScpForm.cs
+++ b/DS4Tool/ScpForm.cs
@@ -382,7 +382,7 @@ namespace ScpServer
if (version.Replace(',', '.').CompareTo(File.ReadAllText(Global.appdatapath + "\\version.txt")) == -1)//CompareVersions();
if (MessageBox.Show(Properties.Resources.DownloadVersion.Replace("*number*", newversion), Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question) == System.Windows.Forms.DialogResult.Yes)
{
- if (!File.Exists(exepath + "\\DS4Updater.exe") || (File.Exists(exepath + "\\DS4Updater.exe")
+ if (!File.Exists(exepath + "\\DS4Updater.exe") || (File.Exists(exepath + "\\DS4Updater.exe")
&& (FileVersionInfo.GetVersionInfo(exepath + "\\DS4Updater.exe").FileVersion.CompareTo("1.1.0.0") == -1)))
{
Uri url2 = new Uri("https://dl.dropboxusercontent.com/u/16364552/DS4Windows/DS4Updater.exe");
@@ -395,15 +395,12 @@ namespace ScpServer
Process.Start("https://www.dropbox.com/s/tlqtdkdumdo0yir/DS4Updater.exe");
}
}
- if (Global.appdatapath == exepath)
- {
- Process p = new Process();
- p.StartInfo.FileName = exepath + "\\DS4Updater.exe";
- if (Global.AdminNeeded())
- p.StartInfo.Verb = "runas";
- p.Start();
- Close();
- }
+ Process p = new Process();
+ p.StartInfo.FileName = exepath + "\\DS4Updater.exe";
+ if (Global.AdminNeeded())
+ p.StartInfo.Verb = "runas";
+ p.Start();
+ Close();
}
else
File.Delete(Global.appdatapath + "\\version.txt");
@@ -653,7 +650,10 @@ namespace ScpServer
tooltip += "\n" + (Index + 1) + ": " + rootHub.getShortDS4ControllerInfo(Index); // Carefully stay under the 63 character limit.
}
btnClear.Enabled = lvDebug.Items.Count > 0;
- notifyIcon1.Text = tooltip;
+ if (tooltip.Length > 63)
+ notifyIcon1.Text = tooltip.Substring(0,63);
+ else
+ notifyIcon1.Text = tooltip;
}
@@ -1232,15 +1232,12 @@ namespace ScpServer
Process.Start("https://www.dropbox.com/s/tlqtdkdumdo0yir/DS4Updater.exe");
}
}
- if (Global.appdatapath == exepath)
- {
- Process p = new Process();
- p.StartInfo.FileName = exepath + "\\DS4Updater.exe";
- if (Global.AdminNeeded())
- p.StartInfo.Verb = "runas";
- p.Start();
- Close();
- }
+ Process p = new Process();
+ p.StartInfo.FileName = exepath + "\\DS4Updater.exe";
+ if (Global.AdminNeeded())
+ p.StartInfo.Verb = "runas";
+ p.Start();
+ Close();
}
else
File.Delete(Global.appdatapath + "\\version.txt");