From 5966a1ead4ede605c332a9644f2799cd3680b18f Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 27 Jul 2018 23:33:14 +0200 Subject: [PATCH] Display platform in title bar (easier to identify screenshot) --- src/blackconfig/buildconfig.cpp | 6 ++++++ src/blackconfig/buildconfig.h | 3 +++ src/blackcore/application.cpp | 8 ++++---- src/blackcore/application.h | 26 +++++++++++++------------- 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/src/blackconfig/buildconfig.cpp b/src/blackconfig/buildconfig.cpp index 11a6800b4..5fa696721 100644 --- a/src/blackconfig/buildconfig.cpp +++ b/src/blackconfig/buildconfig.cpp @@ -226,6 +226,12 @@ namespace BlackConfig return s; } + const QString &CBuildConfig::getVersionStringPlatform() + { + static const QString s = getVersionString() + " " + getPlatformString(); + return s; + } + namespace Private { const QDateTime buildTimestampImpl() diff --git a/src/blackconfig/buildconfig.h b/src/blackconfig/buildconfig.h index 54a480bd5..01ad3c9c9 100644 --- a/src/blackconfig/buildconfig.h +++ b/src/blackconfig/buildconfig.h @@ -131,6 +131,9 @@ namespace BlackConfig //! Version as QVersionNumber static const QString &getVersionString(); + //! Version as QVersionNumber plus platform info + static const QString &getVersionStringPlatform(); + //! Turns last commit timestamp into a version number static int lastCommitTimestampAsVersionSegment(const QDateTime &lastCommitTimestamp); diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp index d4956a676..66d7b8694 100644 --- a/src/blackcore/application.cpp +++ b/src/blackcore/application.cpp @@ -467,20 +467,20 @@ namespace BlackCore { if (this->isDeveloperFlagSet() && CBuildConfig::isLocalDeveloperDebugBuild()) { - static const QString s(CBuildConfig::getVersionString() + " [dev,DEVDBG]"); + static const QString s(CBuildConfig::getVersionStringPlatform() + " [dev,DEVDBG]"); return s; } if (isDeveloperFlagSet()) { - static const QString s(CBuildConfig::getVersionString() + " [dev]"); + static const QString s(CBuildConfig::getVersionStringPlatform() + " [dev]"); return s; } if (CBuildConfig::isLocalDeveloperDebugBuild()) { - static const QString s(CBuildConfig::getVersionString() + " [DEVDBG]"); + static const QString s(CBuildConfig::getVersionStringPlatform() + " [DEVDBG]"); return s; } - return CBuildConfig::getVersionString(); + return CBuildConfig::getVersionStringPlatform(); } const QString &CApplication::swiftVersionString() const diff --git a/src/blackcore/application.h b/src/blackcore/application.h index d558e3648..5ca292b1d 100644 --- a/src/blackcore/application.h +++ b/src/blackcore/application.h @@ -609,19 +609,19 @@ namespace BlackCore //! Write meta information into the application directory so other swift versions can display them void tagApplicationDataDirectory(); - QNetworkAccessManager *m_accessManager = nullptr; //!< single network access manager - BlackMisc::CApplicationInfo m_applicationInfo; //!< Application if specified - QScopedPointer m_coreFacade; //!< core facade if any - QScopedPointer m_setupReader; //!< setup reader - QScopedPointer m_webDataServices; //!< web data services - QScopedPointer m_networkWatchDog; //!< checking DB/internet access - QScopedPointer m_fileLogger; //!< file logger - QPointer m_cookieManager; //!< single cookie manager for our access manager - const QString m_applicationName; //!< application name - QReadWriteLock m_accessManagerLock; //!< lock to make access manager access threadsafe - CCoreFacadeConfig m_coreFacadeConfig; //!< Core facade config if any - CWebReaderFlags::WebReader m_webReadersUsed; //!< Readers to be used - Db::CDatabaseReaderConfigList m_dbReaderConfig; //!< Load or used caching? + QNetworkAccessManager *m_accessManager = nullptr; //!< single network access manager + BlackMisc::CApplicationInfo m_applicationInfo; //!< Application if specified + QScopedPointer m_coreFacade; //!< core facade if any + QScopedPointer m_setupReader; //!< setup reader + QScopedPointer m_webDataServices; //!< web data services + QScopedPointer m_networkWatchDog; //!< checking DB/internet access + QScopedPointer m_fileLogger; //!< file logger + QPointer m_cookieManager; //!< single cookie manager for our access manager + const QString m_applicationName; //!< application name + QReadWriteLock m_accessManagerLock; //!< lock to make access manager access threadsafe + CCoreFacadeConfig m_coreFacadeConfig; //!< Core facade config if any + CWebReaderFlags::WebReader m_webReadersUsed; //!< Readers to be used + Db::CDatabaseReaderConfigList m_dbReaderConfig; //!< Load or used caching? bool m_useContexts = false; //!< use contexts bool m_useWebData = false; //!< use web data bool m_signalStartup = true; //!< signal startup automatically