diff --git a/PesFile/IncrementVersionNumber.exe b/PesFile/IncrementVersionNumber.exe index f382118..dfac251 100644 Binary files a/PesFile/IncrementVersionNumber.exe and b/PesFile/IncrementVersionNumber.exe differ diff --git a/embroideryReader/EmbroideryReaderSettings.cs b/embroideryReader/EmbroideryReaderSettings.cs index d650f3a..ce18b1b 100644 --- a/embroideryReader/EmbroideryReaderSettings.cs +++ b/embroideryReader/EmbroideryReaderSettings.cs @@ -31,7 +31,7 @@ namespace embroideryReader { public class EmbroideryReaderSettings { - private nc_settings.IniFile settings; + private NJCrawford.IniFile settings; private const String SETTING_UPDATE_LOCATION = "update location"; @@ -56,12 +56,15 @@ namespace embroideryReader private const String VALUE_TRUE = "true"; private const String VALUE_FALSE = "false"; + private const String UPDATE_URL = "http://www.njcrawford.com/updates/embroidery-reader.ini"; + private const String SETTINGS_FILENAME = "embroideryreader.ini"; + public EmbroideryReaderSettings() { - settings = new nc_settings.IniFile("embroideryreader.ini"); - if (String.IsNullOrEmpty(updateLocation)) + settings = new NJCrawford.IniFile(SETTINGS_FILENAME); + if (!String.IsNullOrEmpty(updateLocation)) { - updateLocation = "http://www.njcrawford.com/updates/embroidery-reader.ini"; + settings.setValue(SETTING_UPDATE_LOCATION, null); } } @@ -69,11 +72,7 @@ namespace embroideryReader { get { - return settings.getValue(SETTING_UPDATE_LOCATION); - } - set - { - settings.setValue(SETTING_UPDATE_LOCATION, value); + return UPDATE_URL; } } diff --git a/embroideryReader/IncrementVersionNumber.exe b/embroideryReader/IncrementVersionNumber.exe index f382118..dfac251 100644 Binary files a/embroideryReader/IncrementVersionNumber.exe and b/embroideryReader/IncrementVersionNumber.exe differ diff --git a/embroideryReader/IniFile.dll b/embroideryReader/IniFile.dll index 3d859a1..24f2ce9 100644 Binary files a/embroideryReader/IniFile.dll and b/embroideryReader/IniFile.dll differ diff --git a/embroideryReader/Properties/AssemblyInfo.cs b/embroideryReader/Properties/AssemblyInfo.cs index 449f985..01aee4e 100644 --- a/embroideryReader/Properties/AssemblyInfo.cs +++ b/embroideryReader/Properties/AssemblyInfo.cs @@ -35,7 +35,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Embroidery Reader")] -[assembly: AssemblyCopyright("Copyright © Nathan Crawford 2009")] +[assembly: AssemblyCopyright("Copyright © Nathan Crawford 2010")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -54,5 +54,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("3.1.0.16")] -[assembly: AssemblyFileVersion("3.1.0.16")] +[assembly: AssemblyVersion("1.3.0.17")] +[assembly: AssemblyFileVersion("1.3.0.17")] diff --git a/embroideryReader/embroideryReader-2005.csproj b/embroideryReader/embroideryReader-2005.csproj index 5ddb015..f0df0c7 100644 --- a/embroideryReader/embroideryReader-2005.csproj +++ b/embroideryReader/embroideryReader-2005.csproj @@ -65,6 +65,7 @@ frmTextbox.cs + Designer diff --git a/embroideryReader/embroideryReader-2008.csproj b/embroideryReader/embroideryReader-2008.csproj index bcbfd2c..2be909a 100644 --- a/embroideryReader/embroideryReader-2008.csproj +++ b/embroideryReader/embroideryReader-2008.csproj @@ -2,7 +2,7 @@ Debug AnyCPU - 8.0.50727 + 9.0.30729 2.0 {0A9A24AD-60F0-4664-BCC6-2B98B3E8B565} WinExe @@ -52,6 +52,7 @@ + Form diff --git a/embroideryReader/frmMain.cs b/embroideryReader/frmMain.cs index 8c894fa..96ed08e 100644 --- a/embroideryReader/frmMain.cs +++ b/embroideryReader/frmMain.cs @@ -212,7 +212,7 @@ namespace embroideryReader private void checkForUpdateToolStripMenuItem_Click(object sender, EventArgs e) { - NJCrawford.UpdateCheck updater = new NJCrawford.UpdateCheck(UPDATE_URL, null, null); + NJCrawford.UpdateCheck updater = new NJCrawford.UpdateCheck(settings.updateLocation, null, null); updater.waitForInfo(); if (updater.GetLastError() != "") diff --git a/embroideryThumbs/embroideryThumbs-2008.csproj b/embroideryThumbs/embroideryThumbs-2008.csproj index 94d4c6d..19fec08 100644 --- a/embroideryThumbs/embroideryThumbs-2008.csproj +++ b/embroideryThumbs/embroideryThumbs-2008.csproj @@ -2,7 +2,7 @@ Debug AnyCPU - 8.0.50727 + 9.0.30729 2.0 {978B855C-C9CD-4A5E-A335-9ED8DD3E001A} Library @@ -24,7 +24,7 @@ DEBUG;TRACE prompt 4 - true + false true