From 4a7ea34011f24ffb462e9b77512c381c5e18b263 Mon Sep 17 00:00:00 2001 From: Nathan Crawford Date: Sat, 1 Aug 2009 15:23:30 +0000 Subject: [PATCH] Misc commit from desktop. Must have forgotten to commit after working on it last time. --- PesFile/Properties/AssemblyInfo.cs | 4 ++-- embroideryReader/Properties/AssemblyInfo.cs | 4 ++-- embroideryReader/frmMain.cs | 10 +++++----- embroideryThumbs/IncrementVersionNumber.exe | Bin 0 -> 28672 bytes embroideryThumbs/Properties/AssemblyInfo.cs | 6 +++--- embroideryThumbs/embroideryThumbs.csproj | 4 ++++ install/embreader.nsi | 2 ++ install/update.ini | 2 +- 8 files changed, 19 insertions(+), 13 deletions(-) create mode 100644 embroideryThumbs/IncrementVersionNumber.exe diff --git a/PesFile/Properties/AssemblyInfo.cs b/PesFile/Properties/AssemblyInfo.cs index b78812b..f7ea353 100644 --- a/PesFile/Properties/AssemblyInfo.cs +++ b/PesFile/Properties/AssemblyInfo.cs @@ -55,5 +55,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.1.0.0")] -[assembly: AssemblyFileVersion("1.1.0.0")] +[assembly: AssemblyVersion("1.1.0.1")] +[assembly: AssemblyFileVersion("1.1.0.1")] diff --git a/embroideryReader/Properties/AssemblyInfo.cs b/embroideryReader/Properties/AssemblyInfo.cs index 48a1a79..7e90959 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.5")] -[assembly: AssemblyFileVersion("1.4.0.5")] +[assembly: AssemblyVersion("1.4.0.7")] +[assembly: AssemblyFileVersion("1.4.0.7")] diff --git a/embroideryReader/frmMain.cs b/embroideryReader/frmMain.cs index 5f09409..8ddc759 100644 --- a/embroideryReader/frmMain.cs +++ b/embroideryReader/frmMain.cs @@ -249,9 +249,13 @@ namespace embroideryReader { MessageBox.Show("Cannot check for update because the 'update location'" + Environment.NewLine + "setting has been removed from the settings file."); } + else if (updater.GetLastError() != "") + { + MessageBox.Show("Encountered an error while checking for updates: " + updater.GetLastError()); + } else if (updater.IsUpdateAvailable()) { - if (MessageBox.Show("Version " + updater.VersionAvailable() + " was released on " + updater.getReleaseDate().ToStringShortDate() + "." + Environment.NewLine + "You have version " + currentVersion() + ". Would you like to go to the Embroidery Reader website to download or find out more about the new version?", "New version available", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + if (MessageBox.Show("Version " + updater.VersionAvailable() + " was released on " + updater.getReleaseDate().ToShortDateString() + "." + Environment.NewLine + "You have version " + currentVersion() + ". Would you like to go to the Embroidery Reader website to download or find out more about the new version?", "New version available", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { try { @@ -271,10 +275,6 @@ namespace embroideryReader //} } } - else if (updater.GetLastError() != "") - { - MessageBox.Show("Encountered an error while checking for updates: " + updater.GetLastError()); - } else { MessageBox.Show("No updates are available right now." + Environment.NewLine + "(Latest version is " + updater.VersionAvailable() + ", you have version " + currentVersion() + ")"); diff --git a/embroideryThumbs/IncrementVersionNumber.exe b/embroideryThumbs/IncrementVersionNumber.exe new file mode 100644 index 0000000000000000000000000000000000000000..20da81f8298804821b5e915cbd971d5538275980 GIT binary patch literal 28672 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 literal 0 HcmV?d00001 diff --git a/embroideryThumbs/Properties/AssemblyInfo.cs b/embroideryThumbs/Properties/AssemblyInfo.cs index 3036582..742266f 100644 --- a/embroideryThumbs/Properties/AssemblyInfo.cs +++ b/embroideryThumbs/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -using System.Reflection; +using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.0.0.2")] +[assembly: AssemblyFileVersion("1.0.0.2")] diff --git a/embroideryThumbs/embroideryThumbs.csproj b/embroideryThumbs/embroideryThumbs.csproj index 5d7bce9..6e3bfdf 100644 --- a/embroideryThumbs/embroideryThumbs.csproj +++ b/embroideryThumbs/embroideryThumbs.csproj @@ -54,4 +54,8 @@ --> + + "$(ProjectDir)\IncrementVersionNumber.exe" --prebuild + "$(ProjectDir)\IncrementVersionNumber.exe" --postbuild + \ No newline at end of file diff --git a/install/embreader.nsi b/install/embreader.nsi index d0d7d86..197623a 100644 --- a/install/embreader.nsi +++ b/install/embreader.nsi @@ -52,6 +52,7 @@ Section "Embroidery Reader ${VERSION} (required)" File "nc_settings.dll" File "PesFile.dll" File "nc_Updater.dll" + File "embroideryThumbs.dll" ; Write the installation path into the registry WriteRegStr HKLM "SOFTWARE\Embroidery Reader" "Install_Dir" "$INSTDIR" @@ -161,6 +162,7 @@ Section "Uninstall" Delete $INSTDIR\embroideryreader.ini Delete $INSTDIR\PesFile.dll Delete $INSTDIR\nc_Updater.dll + Delete $INSTDIR\embroideryThumbs.dll ; Remove obsolete files from previous versions, if they exist Delete $INSTDIR\UpdateInstaller.exe diff --git a/install/update.ini b/install/update.ini index ef9d9b9..2652440 100644 --- a/install/update.ini +++ b/install/update.ini @@ -1 +1 @@ -version=1.4.0.0 +version=1.4.0.5