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

refs #485, moved stylesheet utility into CGuiApplication

Browse Source
This commit is contained in:
Klaus Basan
2016-03-13 19:25:31 +00:00
committed by Mathew Sutcliffe
parent b73562b33c
commit 18a907086d
19 changed files with 73 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackgui/components/hotkeydialog.cpp
View File

@@ -1,6 +1,6 @@
#include "hotkeydialog.h"
#include "ui_hotkeydialog.h"
#include "blackgui/stylesheetutility.h"
#include "blackgui/guiapplication.h"
#include "blackmisc/input/hotkeycombination.h"
#include "blackmisc/icon.h"
#include "blackmisc/logmessage.h"
@@ -74,7 +74,7 @@ namespace BlackGui
void CHotkeyDialog::initStyleSheet()
{
const QString s = CStyleSheetUtility::instance().styles(
const QString s = sGui->getStyleSheetUtility().styles(
{
CStyleSheetUtility::fileNameFonts(),
CStyleSheetUtility::fileNameStandardWidget()

3
src/blackgui/components/navigatordialog.cpp
View File

@@ -101,7 +101,7 @@ namespace BlackGui
void CNavigatorDialog::ps_onStyleSheetsChanged()
{
const QString fn(CStyleSheetUtility::fileNameNavigator());
const QString qss(CStyleSheetUtility::instance().style(fn));
const QString qss(sGui->getStyleSheetUtility().style(fn));
this->setStyleSheet(qss);
this->repaint();
}
@@ -201,6 +201,5 @@ namespace BlackGui
QString frameLessActionText = this->isFrameless() ? "Normal window" : "Frameless";
contextMenu->addAction(BlackMisc::CIcons::tableSheet16(), frameLessActionText, this, SLOT(toggleFrameless()));
}
} // ns
} // ns

9
src/blackgui/components/settingscomponent.cpp
View File

@@ -51,7 +51,7 @@ namespace BlackGui
this->ui->cb_SettingsGuiFontStyle->setCurrentText(CStyleSheetUtility::fontAsCombinedWeightStyle(font));
this->ui->cb_SettingsGuiFont->setCurrentFont(font);
this->ui->cb_SettingsGuiFontSize->setCurrentText(QString::number(font.pointSize()));
this->m_fontColor = QColor(CStyleSheetUtility::instance().fontColor());
this->m_fontColor = QColor(sGui->getStyleSheetUtility().fontColor());
this->ui->le_SettingsGuiFontColor->setText(this->m_fontColor.name());
bool connected = this->connect(this->ui->cb_SettingsGuiFont, SIGNAL(currentFontChanged(QFont)), this, SLOT(ps_fontChanged()));
Q_ASSERT(connected);
@@ -91,9 +91,6 @@ namespace BlackGui
return this->ui->hs_SettingsGuiUserRefreshTime->value();
}
/*
* Set tab
*/
void CSettingsComponent::setSettingsTab(CSettingsComponent::SettingTab tab)
{
this->setCurrentIndex(static_cast<int>(tab));
@@ -107,10 +104,10 @@ namespace BlackGui
QString fontColor = this->m_fontColor.name();
if (!this->m_fontColor.isValid() || this->m_fontColor.name().isEmpty())
{
fontColor = CStyleSheetUtility::instance().fontColor();
fontColor = sGui->getStyleSheetUtility().fontColor();
}
this->ui->le_SettingsGuiFontColor->setText(fontColor);
bool ok = CStyleSheetUtility::instance().updateFonts(fontFamily, fontSize, CStyleSheetUtility::fontStyle(fontStyleCombined), CStyleSheetUtility::fontWeight(fontStyleCombined), fontColor);
bool ok = sGui->updateFonts(fontFamily, fontSize, CStyleSheetUtility::fontStyle(fontStyleCombined), CStyleSheetUtility::fontWeight(fontStyleCombined), fontColor);
if (ok)
{
CLogMessage(this).info("Updated font style");