mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 04:55:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Improve version text

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2023-12-28 16:46:55 +03:00
parent f58b54bd94
commit d33ae75bdb
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deploy/FortFirewall.iss
View File

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

2
src/ui/manager/logger.cpp
View File

@ -108,7 +108,7 @@ void Logger::setPath(const QString &path)
QString Logger::getFileTitle() const 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()); + (isService() ? " Service" : QString());
} }

3
src/ui_bin/main.cpp
View File

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

1
src/version/fort_version.h
View File

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