flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-05 09:45:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T408, function to append extra info to title

Browse Source
This commit is contained in:
Klaus Basan
2018-10-24 02:57:13 +02:00
parent d7380966de
commit c52101709a
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/blackgui/guiapplication.cpp
View File

@@ -221,9 +221,8 @@ namespace BlackGui
if (m_uiSetupCompleted) { return; } if (m_uiSetupCompleted) { return; }
m_uiSetupCompleted = true; m_uiSetupCompleted = true;
const QString name(this->getApplicationNameVersionDetailed()); const QString name = this->setExtraWindowTitle("", mainWidget);
mainWidget->setObjectName(QCoreApplication::applicationName()); mainWidget->setObjectName(QCoreApplication::applicationName());
mainWidget->setWindowTitle(name);
mainWidget->setWindowIcon(m_windowIcon); mainWidget->setWindowIcon(m_windowIcon);
mainWidget->setWindowIconText(name); mainWidget->setWindowIconText(name);
CStyleSheetUtility::setQSysInfoProperties(mainWidget, true); CStyleSheetUtility::setQSysInfoProperties(mainWidget, true);
@@ -242,13 +241,24 @@ namespace BlackGui
} }
else else
{ {
QPointer<CGuiApplication> myself(this);
connectOnce(this, &CGuiApplication::uiObjectTreeReady, this, [ = ] connectOnce(this, &CGuiApplication::uiObjectTreeReady, this, [ = ]
{ {
if (!myself) { return; }
this->addWindowFlags(flags); this->addWindowFlags(flags);
}); });
} }
} }
QString CGuiApplication::setExtraWindowTitle(const QString &extraInfo, QWidget *mainWindowWidget) const
{
QString name(this->getApplicationNameVersionDetailed());
if (!extraInfo.isEmpty()) { name = extraInfo % QStringLiteral(" ") % name; }
if (!mainWindowWidget) { return name; }
mainWindowWidget->setWindowTitle(name);
return name;
}
void CGuiApplication::setWindowIcon(const QPixmap &icon) void CGuiApplication::setWindowIcon(const QPixmap &icon)
{ {
instance()->m_windowIcon = icon; instance()->m_windowIcon = icon;

3
src/blackgui/guiapplication.h
View File

@@ -122,6 +122,9 @@ namespace BlackGui
//! Set window flag on main application window //! Set window flag on main application window
void addWindowFlags(Qt::WindowFlags flags); void addWindowFlags(Qt::WindowFlags flags);
//! Set window title
QString setExtraWindowTitle(const QString &extraInfo, QWidget *mainWindowWidget = mainApplicationWidget()) const;
//! \name print messages generated during parsing / cmd handling //! \name print messages generated during parsing / cmd handling
//! @{ //! @{
virtual bool cmdLineErrorMessage(const QString &cmdLineErrorMessage, bool retry = false) const override; virtual bool cmdLineErrorMessage(const QString &cmdLineErrorMessage, bool retry = false) const override;