flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-07 02:35:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #635, init metadata in CApplication / CGuiApplication

Browse Source
This commit is contained in:
Klaus Basan
2016-04-02 16:09:36 +02:00
parent a4e7ccd25c
commit 63ddcc5d7c
4 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/blackgui/guiapplication.cpp
View File

@@ -39,12 +39,14 @@ namespace BlackGui
return l;
}
CGuiApplication::CGuiApplication(const QString &applicationName, const QPixmap &icon) : CApplication(applicationName)
CGuiApplication::CGuiApplication(const QString &applicationName, const QPixmap &icon) :
CApplication(applicationName, false)
{
if (!sGui)
{
registerMetadata();
setWindowIcon(icon);
CGuiApplication::registerMetadata();
CApplication::init(false); // base class without metadata
this->setWindowIcon(icon);
sGui = this;
connect(sGui, &CGuiApplication::styleSheetsChanged, this, &CGuiApplication::styleSheetsChanged);
}
@@ -55,6 +57,12 @@ namespace BlackGui
sGui = nullptr;
}
void CGuiApplication::registerMetadata()
{
CApplication::registerMetadata();
BlackGui::registerMetadata();
}
void CGuiApplication::addWindowModeOption()
{
this->m_cmdWindowMode = QCommandLineOption(QStringList() << "w" << "window",

3
src/blackgui/guiapplication.h
View File

@@ -158,6 +158,9 @@ namespace BlackGui
//! Handle paring of special GUI cmd arguments
virtual bool parsingHookIn() override;
//! Register metadata
static void registerMetadata();
private:
QPixmap m_windowIcon;
QCommandLineOption m_cmdWindowStateMinimized { "empty" }; //!< window state (minimized)