UI: Improve version text

deploy/FortFirewall.iss

@@ -22,6 +22,7 @@ AppMutex={#APP_NAME},{#APP_BASE}
 AppName={#APP_NAME}
 AppVersion={#APP_VERSION_STR}
 VersionInfoVersion={#APP_VERSION_STR}
+VersionInfoProductTextVersion={#APP_VERSION_STR}{#APP_VERSION_BUILD_STR}
 AppVerName={#APP_NAME}
 AppCopyright={#APP_LEGALCOPYRIGHT}
 AppPublisher={#APP_PUBLISHER}
@@ -34,7 +35,7 @@ AlwaysShowDirOnReadyPage=yes
 AlwaysShowGroupOnReadyPage=yes
 AllowNoIcons=yes
 OutputDir=out
-OutputBaseFilename={#APP_BASE}-{#APP_VERSION_STR}
+OutputBaseFilename={#APP_BASE}-{#APP_VERSION_STR}{#APP_VERSION_BUILD_STR}
 Uninstallable=not IsTaskSelected('portable')
 UninstallFilesDir={app}\uninst
 UninstallDisplayIcon={uninstallexe}

src/ui/manager/logger.cpp

@@ -108,7 +108,7 @@ void Logger::setPath(const QString &path)
 
 QString Logger::getFileTitle() const
 {
-    return QLatin1String(APP_NAME) + " v" + APP_VERSION_STR
+    return QLatin1String(APP_NAME) + " v" + APP_VERSION_STR + APP_VERSION_BUILD_STR
             + (isService() ? " Service" : QString());
 }
 

src/ui_bin/main.cpp

@@ -66,7 +66,7 @@ void setupCrashHandler(CrashHandler &crashHandler, const FortSettings &settings)
 
     FileUtil::removeOldFiles(dumpPath, fileNamePrefix, fileNameSuffix, CRASH_KEEP_FILES);
 
-    crashHandler.setFileNamePrefix(fileNamePrefix + APP_VERSION_STR + '_');
+    crashHandler.setFileNamePrefix(fileNamePrefix + APP_VERSION_STR + APP_VERSION_BUILD_STR + '_');
     crashHandler.setFileNameSuffix(fileNameSuffix);
     crashHandler.install(dumpPath);
 }
@@ -85,6 +85,7 @@ int main(int argc, char *argv[])
     QApplication::setApplicationName(APP_NAME);
     QApplication::setApplicationVersion(APP_VERSION_STR);
     QApplication::setApplicationDisplayName(QLatin1String(APP_NAME) + " v" + APP_VERSION_STR
+            + APP_VERSION_BUILD_STR
             + (settings.isPortable() ? QLatin1String(" Portable") : QString()));
 
     // Process (un)install arguments

src/version/fort_version.h

@@ -5,6 +5,7 @@
 #define APP_VERSION_MINOR	10
 #define APP_VERSION_PATCH	5
 #define APP_VERSION_STR		"3.10.5"
+#define APP_VERSION_BUILD_STR	"-test3"
 #define APP_VERSION		0x031005
 
 #define APP_NAME		"Fort Firewall"