diff --git a/embroideryReader/nc_settings.dll b/embroideryReader/IniFile.dll similarity index 60% rename from embroideryReader/nc_settings.dll rename to embroideryReader/IniFile.dll index be8efd3..3d859a1 100644 Binary files a/embroideryReader/nc_settings.dll and b/embroideryReader/IniFile.dll differ diff --git a/embroideryReader/Properties/AssemblyInfo.cs b/embroideryReader/Properties/AssemblyInfo.cs index 7e90959..03e445d 100644 --- a/embroideryReader/Properties/AssemblyInfo.cs +++ b/embroideryReader/Properties/AssemblyInfo.cs @@ -54,5 +54,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("1.4.0.7")] -[assembly: AssemblyFileVersion("1.4.0.7")] +[assembly: AssemblyVersion("1.4.0.8")] +[assembly: AssemblyFileVersion("1.4.0.8")] diff --git a/embroideryReader/nc_Updater.dll b/embroideryReader/UpdateCheck.dll similarity index 74% rename from embroideryReader/nc_Updater.dll rename to embroideryReader/UpdateCheck.dll index 168f8b7..ad62a09 100644 Binary files a/embroideryReader/nc_Updater.dll and b/embroideryReader/UpdateCheck.dll differ diff --git a/embroideryReader/embroideryReader.csproj b/embroideryReader/embroideryReader.csproj index aafe5ec..821cff9 100644 --- a/embroideryReader/embroideryReader.csproj +++ b/embroideryReader/embroideryReader.csproj @@ -30,13 +30,9 @@ false - + False - .\nc_settings.dll - - - False - .\nc_Updater.dll + .\IniFile.dll @@ -44,6 +40,10 @@ + + False + .\UpdateCheck.dll + diff --git a/embroideryReader/frmMain.cs b/embroideryReader/frmMain.cs index 8ddc759..62fc6e5 100644 --- a/embroideryReader/frmMain.cs +++ b/embroideryReader/frmMain.cs @@ -41,7 +41,7 @@ namespace embroideryReader private Pen drawPen = Pens.Black; private Bitmap DrawArea; private PesFile.PesFile design; - private nc_settings.IniFile settings = new nc_settings.IniFile("embroideryreader.ini"); + private NJCrawford.IniFile settings = new NJCrawford.IniFile("embroideryreader.ini"); public frmMain() @@ -54,9 +54,9 @@ namespace embroideryReader { string updateLoc; updateLoc = settings.getValue("update location"); - if (String.IsNullOrEmpty(updateLoc) || updateLoc == "http://www.njcrawford.com/embreader/") + if (String.IsNullOrEmpty(updateLoc) || updateLoc == "http://www.njcrawford.com/embreader/" || updateLoc == "http://www.njcrawford.com/embroidery-reader/") { - settings.setValue("update location", "http://www.njcrawford.com/embroidery-reader/"); + settings.setValue("update location", "http://www.njcrawford.com/embroidery-reader/update.ini"); } if (settings.getValue("background color", "enabled") == "yes") { @@ -241,7 +241,7 @@ namespace embroideryReader private void checkForUpdateToolStripMenuItem_Click(object sender, EventArgs e) { - nc_Updater.IniFileUpdater updater = new nc_Updater.IniFileUpdater(settings.getValue("update location")); + NJCrawford.IniFileUpdater updater = new NJCrawford.IniFileUpdater(settings.getValue("update location")); updater.waitForInfo(); // this shouldn't be able to happen, the update location is checked at form load diff --git a/embroideryReader/frmSettingsDialog.cs b/embroideryReader/frmSettingsDialog.cs index 8805483..547aaf4 100644 --- a/embroideryReader/frmSettingsDialog.cs +++ b/embroideryReader/frmSettingsDialog.cs @@ -36,8 +36,8 @@ namespace embroideryReader public partial class frmSettingsDialog : Form { private bool colorChanged = false; - private nc_settings.IniFile _settings; - public nc_settings.IniFile settings + private NJCrawford.IniFile _settings; + public NJCrawford.IniFile settings { get {