flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 12:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Display platform in title bar (easier to identify screenshot)

Browse Source
This commit is contained in:
Klaus Basan
2018-07-27 23:33:14 +02:00
parent 106ef6709e
commit 5966a1ead4
4 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackconfig/buildconfig.cpp
View File

@@ -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()

3
src/blackconfig/buildconfig.h
View File

@@ -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);

8
src/blackcore/application.cpp
View File

@@ -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

26
src/blackcore/application.h
View File

@@ -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<CCoreFacade> m_coreFacade; //!< core facade if any
QScopedPointer<CSetupReader> m_setupReader; //!< setup reader
QScopedPointer<CWebDataServices> m_webDataServices; //!< web data services
QScopedPointer<Db::CNetworkWatchdog> m_networkWatchDog; //!< checking DB/internet access
QScopedPointer<BlackMisc::CFileLogger> m_fileLogger; //!< file logger
QPointer<CCookieManager> 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<CCoreFacade> m_coreFacade; //!< core facade if any
QScopedPointer<CSetupReader> m_setupReader; //!< setup reader
QScopedPointer<CWebDataServices> m_webDataServices; //!< web data services
QScopedPointer<Db::CNetworkWatchdog> m_networkWatchDog; //!< checking DB/internet access
QScopedPointer<BlackMisc::CFileLogger> m_fileLogger; //!< file logger
QPointer<CCookieManager> 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