Version 1.4.0.32

Separated Translation on Save where dialog box
Fix updating when settings are in appdata
shortened notification icon's popup text to avoid crashes
This commit is contained in:
jays2kings 2014-08-18 01:18:46 -04:00
parent f3d63fb505
commit af09299803
8 changed files with 401 additions and 66 deletions

View File

@ -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;

View File

@ -198,6 +198,9 @@
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.es.resx" />
<EmbeddedResource Include="Properties\Resources.fr-FR.resx" />
<EmbeddedResource Include="SaveWhere.fr-FR.resx">
<DependentUpon>SaveWhere.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="SaveWhere.resx">
<DependentUpon>SaveWhere.cs</DependentUpon>
</EmbeddedResource>

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
// 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")]

View File

@ -28,6 +28,7 @@
/// </summary>
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();

View File

@ -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;
}

View File

@ -0,0 +1,152 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="label4.Text" xml:space="preserve">
<value>Pour ceux préférant une installation normale, les paramètres sont sauvegardés à %appdata%/ds4tool</value>
</data>
<data name="label3.Text" xml:space="preserve">
<value>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)</value>
</data>
<data name="bnPrgmFolder.Text" xml:space="preserve">
<value>Dossier de l'application</value>
</data>
<data name="lbPickWhere.Text" xml:space="preserve">
<value>Choisissez l'emplacement auquel vous voulez que vos paramètres et profiles soient sauvegardes</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="lbMultiSaves.Size" type="System.Drawing.Size, System.Drawing">
<value>243, 13</value>
</data>
<data name="lbMultiSaves.Text" xml:space="preserve">
<value>Multiples emplacements de sauvegarde supprimés</value>
</data>
<data name="cBDeleteOther.Location" type="System.Drawing.Point, System.Drawing">
<value>243, 0</value>
</data>
<data name="cBDeleteOther.Size" type="System.Drawing.Size, System.Drawing">
<value>144, 30</value>
</data>
<data name="cBDeleteOther.Text" xml:space="preserve">
<value>Ne pas encore supprimer
les autres paramètres</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>389, 157</value>
</data>
</root>

View File

@ -117,4 +117,220 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="lbMultiSaves.Location" type="System.Drawing.Point, System.Drawing">
<value>9, 8</value>
</data>
<data name="&gt;&gt;bnPrgmFolder.Name" xml:space="preserve">
<value>bnPrgmFolder</value>
</data>
<data name="&gt;&gt;cBDeleteOther.Name" xml:space="preserve">
<value>cBDeleteOther</value>
</data>
<data name="lbPickWhere.Size" type="System.Drawing.Size, System.Drawing">
<value>386, 27</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="cBDeleteOther.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
</data>
<data name="&gt;&gt;cBDeleteOther.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="lbMultiSaves.Text" xml:space="preserve">
<value>Multiple save locations detected</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>SaveWhere</value>
</data>
<data name="lbMultiSaves.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="bnAppdataFolder.Size" type="System.Drawing.Size, System.Drawing">
<value>140, 23</value>
</data>
<data name="&gt;&gt;bnAppdataFolder.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="&gt;&gt;label3.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="label4.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
</data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
<value>195, 69</value>
</data>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>6, 13</value>
</data>
<data name="&gt;&gt;label3.Name" xml:space="preserve">
<value>label3</value>
</data>
<data name="&gt;&gt;lbMultiSaves.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="label3.Location" type="System.Drawing.Point, System.Drawing">
<value>5, 89</value>
</data>
<data name="bnPrgmFolder.Location" type="System.Drawing.Point, System.Drawing">
<value>32, 63</value>
</data>
<data name="&gt;&gt;bnPrgmFolder.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="&gt;&gt;lbMultiSaves.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="&gt;&gt;bnPrgmFolder.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="lbMultiSaves.Size" type="System.Drawing.Size, System.Drawing">
<value>159, 13</value>
</data>
<data name="cBDeleteOther.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label3.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>TopCenter</value>
</data>
<data name="cBDeleteOther.Text" xml:space="preserve">
<value>Don't Delete the
other settings yet</value>
</data>
<data name="&gt;&gt;bnAppdataFolder.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;label4.Name" xml:space="preserve">
<value>label4</value>
</data>
<data name="label4.Text" xml:space="preserve">
<value>For those who prefer a regular install Settings saved at %appdata%/ds4tool</value>
</data>
<data name="&gt;&gt;bnPrgmFolder.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="lbPickWhere.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>TopCenter</value>
</data>
<data name="lbMultiSaves.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>TopCenter</value>
</data>
<data name="lbPickWhere.Text" xml:space="preserve">
<value>Pick where you want settings and profiles to be saved</value>
</data>
<data name="&gt;&gt;cBDeleteOther.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="label3.Text" xml:space="preserve">
<value>For those who prefer a portable program Note: this option does not work if in an admin folder w/o UAC</value>
</data>
<data name="&gt;&gt;label4.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="label4.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>TopCenter</value>
</data>
<data name="&gt;&gt;label4.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="cBDeleteOther.Location" type="System.Drawing.Point, System.Drawing">
<value>281, 0</value>
</data>
<data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="lbPickWhere.TabIndex" type="System.Int32, mscorlib">
<value>10</value>
</data>
<data name="bnPrgmFolder.Text" xml:space="preserve">
<value>Program Folder</value>
</data>
<data name="&gt;&gt;bnAppdataFolder.Name" xml:space="preserve">
<value>bnAppdataFolder</value>
</data>
<data name="cBDeleteOther.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="bnPrgmFolder.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
<data name="&gt;&gt;lbPickWhere.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="bnAppdataFolder.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
</data>
<data name="&gt;&gt;lbPickWhere.Name" xml:space="preserve">
<value>lbPickWhere</value>
</data>
<data name="label3.TabIndex" type="System.Int32, mscorlib">
<value>10</value>
</data>
<data name="lbMultiSaves.TabIndex" type="System.Int32, mscorlib">
<value>10</value>
</data>
<data name="label4.Location" type="System.Drawing.Point, System.Drawing">
<value>206, 89</value>
</data>
<data name="&gt;&gt;lbPickWhere.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="label4.Size" type="System.Drawing.Size, System.Drawing">
<value>177, 69</value>
</data>
<data name="&gt;&gt;cBDeleteOther.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="bnAppdataFolder.Location" type="System.Drawing.Point, System.Drawing">
<value>222, 63</value>
</data>
<data name="&gt;&gt;lbPickWhere.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="$this.Text" xml:space="preserve">
<value>DS4Windows</value>
</data>
<data name="&gt;&gt;lbMultiSaves.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="&gt;&gt;bnAppdataFolder.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;lbMultiSaves.Name" xml:space="preserve">
<value>lbMultiSaves</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>389, 136</value>
</data>
<data name="lbMultiSaves.Visible" type="System.Boolean, mscorlib">
<value>False</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>
<data name="lbPickWhere.Location" type="System.Drawing.Point, System.Drawing">
<value>1, 33</value>
</data>
<data name="bnPrgmFolder.Size" type="System.Drawing.Size, System.Drawing">
<value>140, 23</value>
</data>
<data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="cBDeleteOther.Size" type="System.Drawing.Size, System.Drawing">
<value>106, 30</value>
</data>
<data name="&gt;&gt;label3.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="bnAppdataFolder.Text" xml:space="preserve">
<value>Appdata</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>

View File

@ -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");