WinGui: Update the GUI to handle the version information correctly after the git...

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Interfaces/IHandBrakeInstance.cs b/win/CS/HandBrake.ApplicationServices/Interop/Interfaces/IHandBrakeInstance.cs
index 8230e66207356501b2fa8bd8d760420ff353d082..0c231cbac70dd835201c65847a0c48ea675e299c 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/Interfaces/IHandBrakeInstance.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Interfaces/IHandBrakeInstance.cs
@@ -58,6 +58,16 @@ namespace HandBrake.ApplicationServices.Interop.Interfaces
         /// </summary>\r
         JsonScanObject Titles { get; }\r
 \r
+        /// <summary>\r
+        /// Gets the HandBrake version string.\r
+        /// </summary>\r
+        string Version { get; }\r
+\r
+        /// <summary>\r
+        /// Gets the HandBrake build number.\r
+        /// </summary>\r
+        int Build { get; }\r
+\r
         #endregion\r
 \r
         #region Public Methods\r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/VersionHelper.cs b/win/CS/HandBrake.ApplicationServices/Utilities/VersionHelper.cs
index b1a90d3e0848c04b884a6a83cbe61310c8820915..47673c112f434ca9c958f6a4cb1c4cf5b914141d 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/VersionHelper.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/VersionHelper.cs
@@ -12,6 +12,9 @@ namespace HandBrake.ApplicationServices.Utilities
     using System;\r
     using System.Reflection;\r
 \r
+    using HandBrake.ApplicationServices.Interop;\r
+    using HandBrake.ApplicationServices.Interop.Interfaces;\r
+\r
     /// <summary>\r
     /// Version Utility\r
     /// </summary>\r
@@ -26,7 +29,10 @@ namespace HandBrake.ApplicationServices.Utilities
         public static string GetVersion()\r
         {\r
             Version version = Assembly.GetEntryAssembly().GetName().Version;\r
-            return IsNightly() ? string.Format("svn{0} (Nightly Build)", version.Revision) : string.Format("{0}.{1}.{2}.{3}", version.Major, version.Minor, version.Build, version.Revision);\r
+\r
+            IHandBrakeInstance instance = HandBrakeInstanceManager.GetScanInstance(1);\r
+       \r
+            return IsNightly() ? string.Format("Nightly {0} ({1})", instance.Version, instance.Build) : string.Format("{0}.{1}.{2}.{3}", version.Major, version.Minor, version.Build, version.Revision);\r
         }\r
 \r
         /// <summary>\r

diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi
index 4ae8fd1e65949c7af4971726add2279527785716..a39055fe3518a98bf437d2c9c6012a10f8dff671 100644 (file)
--- a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi
+++ b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi
@@ -9,7 +9,7 @@
 ; HM NIS Edit Wizard helper defines\r
 !define PRODUCT_NAME "HandBrake"\r
 !define PRODUCT_VERSION "Nightly"\r
-!define PRODUCT_VERSION_NUMBER "0.10.3.Nightly"\r
+!define PRODUCT_VERSION_NUMBER "Nightly"\r
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\HandBrake.exe"\r
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"\r
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"\r

diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
index 1459a52cd4e186862f6802fd642e43f8dc2c2b76..76746b032e3a3158a7bf463dd34aa4bea6732b91 100644 (file)
--- a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
@@ -9,7 +9,7 @@
 ; HM NIS Edit Wizard helper defines\r
 !define PRODUCT_NAME "HandBrake"\r
 !define PRODUCT_VERSION "Nightly"\r
-!define PRODUCT_VERSION_NUMBER "0.10.3.Nightly"\r
+!define PRODUCT_VERSION_NUMBER "Nightly"\r
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\HandBrake.exe"\r
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"\r
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"\r