From 18a907086d54b5331b307b381031baaf325ad4c5 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 13 Mar 2016 19:25:31 +0000 Subject: [PATCH] refs #485, moved stylesheet utility into CGuiApplication --- src/blackgui/components/hotkeydialog.cpp | 4 ++-- src/blackgui/components/navigatordialog.cpp | 3 +-- src/blackgui/components/settingscomponent.cpp | 9 +++----- src/blackgui/dockwidget.cpp | 5 ++-- src/blackgui/dockwidgetinfobar.cpp | 3 ++- src/blackgui/dropsite.cpp | 4 ++-- src/blackgui/filters/filterdialog.cpp | 10 ++++---- src/blackgui/filters/filterwidget.cpp | 7 +++--- src/blackgui/guiapplication.cpp | 23 +++++++++++++------ src/blackgui/guiapplication.h | 16 +++++++++---- src/blackgui/infoarea.cpp | 9 ++++---- src/blackgui/overlaymessages.cpp | 4 ++-- src/blackgui/stylesheetutility.cpp | 20 ++++++---------- src/blackgui/stylesheetutility.h | 11 ++++----- src/blackgui/textmessagetextedit.cpp | 7 +++--- src/swiftcore/swiftcore.cpp | 2 +- src/swiftdata/swiftdata.cpp | 2 +- src/swiftguistandard/swiftguistdinit.cpp | 2 +- src/swiftlauncher/swiftlauncher.cpp | 2 +- 19 files changed, 73 insertions(+), 70 deletions(-) diff --git a/src/blackgui/components/hotkeydialog.cpp b/src/blackgui/components/hotkeydialog.cpp index 3a4286eb1..24254b294 100644 --- a/src/blackgui/components/hotkeydialog.cpp +++ b/src/blackgui/components/hotkeydialog.cpp @@ -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() diff --git a/src/blackgui/components/navigatordialog.cpp b/src/blackgui/components/navigatordialog.cpp index d28c39e12..c0323c199 100644 --- a/src/blackgui/components/navigatordialog.cpp +++ b/src/blackgui/components/navigatordialog.cpp @@ -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 diff --git a/src/blackgui/components/settingscomponent.cpp b/src/blackgui/components/settingscomponent.cpp index 27d5fa45c..124b543cd 100644 --- a/src/blackgui/components/settingscomponent.cpp +++ b/src/blackgui/components/settingscomponent.cpp @@ -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(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"); diff --git a/src/blackgui/dockwidget.cpp b/src/blackgui/dockwidget.cpp index 19319b94e..98c3cf7b4 100644 --- a/src/blackgui/dockwidget.cpp +++ b/src/blackgui/dockwidget.cpp @@ -11,6 +11,7 @@ #include "blackmisc/icons.h" #include "blackmisc/logmessage.h" #include "blackgui/stylesheetutility.h" +#include "blackgui/guiapplication.h" #include "blackgui/guiutility.h" #include #include @@ -35,7 +36,7 @@ namespace BlackGui // connect connect(this, &QDockWidget::topLevelChanged, this, &CDockWidget::ps_onTopLevelChanged); - connect(&CStyleSheetUtility::instance(), &CStyleSheetUtility::styleSheetsChanged, this, &CDockWidget::ps_onStyleSheetsChanged); + connect(sGui, &CGuiApplication::styleSheetsChanged, this, &CDockWidget::ps_onStyleSheetsChanged); connect(this, &QDockWidget::visibilityChanged, this, &CDockWidget::ps_onVisibilityChanged); } @@ -284,7 +285,7 @@ namespace BlackGui { QString sectionUsed(section.isEmpty() ? this->objectName() : section); if (sectionUsed.isEmpty()) { return false; } - const QSettings *settings = CStyleSheetUtility::instance().iniFile(); + const QSettings *settings = sGui->getStyleSheetUtility().iniFile(); Q_ASSERT_X(settings, "CDockWidget::setMarginsFromSettings", "Missing ini settings"); if (!settings) { return false; } diff --git a/src/blackgui/dockwidgetinfobar.cpp b/src/blackgui/dockwidgetinfobar.cpp index 24ec58ab9..1a273516d 100644 --- a/src/blackgui/dockwidgetinfobar.cpp +++ b/src/blackgui/dockwidgetinfobar.cpp @@ -10,6 +10,7 @@ #include "guiutility.h" #include "dockwidgetinfobar.h" #include "components/maininfoareacomponent.h" +#include "guiapplication.h" #include "stylesheetutility.h" #include "blackmisc/icons.h" @@ -36,7 +37,7 @@ namespace BlackGui void CDockWidgetInfoBar::ps_onStyleSheetsChanged() { if (!this->objectName().isEmpty()) { this->setMarginsFromSettings(); } - QString st = CStyleSheetUtility::instance().style(CStyleSheetUtility::fileNameInfoBar()); + QString st = sGui->getStyleSheetUtility().style(CStyleSheetUtility::fileNameInfoBar()); this->setStyleSheet(st); } } diff --git a/src/blackgui/dropsite.cpp b/src/blackgui/dropsite.cpp index 1b93e86cd..f15e2d124 100644 --- a/src/blackgui/dropsite.cpp +++ b/src/blackgui/dropsite.cpp @@ -8,7 +8,7 @@ */ #include "dropsite.h" -#include "stylesheetutility.h" +#include "guiapplication.h" #include using namespace BlackMisc; @@ -21,7 +21,7 @@ namespace BlackGui setAlignment(Qt::AlignCenter); setAcceptDrops(true); this->setInfoText(tr("")); - connect(&CStyleSheetUtility::instance(), &CStyleSheetUtility::styleSheetsChanged, this, &CDropSite::ps_onStyleSheetsChanged); + connect(sGui, &CGuiApplication::styleSheetsChanged, this, &CDropSite::ps_onStyleSheetsChanged); this->ps_onStyleSheetsChanged(); } diff --git a/src/blackgui/filters/filterdialog.cpp b/src/blackgui/filters/filterdialog.cpp index c7df2b108..175842d2f 100644 --- a/src/blackgui/filters/filterdialog.cpp +++ b/src/blackgui/filters/filterdialog.cpp @@ -8,7 +8,7 @@ */ #include "filterdialog.h" -#include "blackgui/stylesheetutility.h" +#include "blackgui/guiapplication.h" namespace BlackGui { @@ -17,8 +17,8 @@ namespace BlackGui CFilterDialog::CFilterDialog(QWidget *parent) : QDialog(parent, Qt::Tool) { this->setWindowTitle("Filter dialog"); - ps_onStyleSheetChanged(); - connect(&CStyleSheetUtility::instance(), &CStyleSheetUtility::styleSheetsChanged, this, &CFilterDialog::ps_onStyleSheetChanged); + this->ps_onStyleSheetChanged(); + connect(sGui, &CGuiApplication::styleSheetsChanged, this, &CFilterDialog::ps_onStyleSheetChanged); } CFilterDialog::~CFilterDialog() @@ -26,11 +26,9 @@ namespace BlackGui void CFilterDialog::ps_onStyleSheetChanged() { - const QString qss = CStyleSheetUtility::instance().style(CStyleSheetUtility::fileNameFilterDialog()); + const QString qss = sGui->getStyleSheetUtility().style(CStyleSheetUtility::fileNameFilterDialog()); this->setStyleSheet(qss); } } // namespace } // namespace - - diff --git a/src/blackgui/filters/filterwidget.cpp b/src/blackgui/filters/filterwidget.cpp index fb7837089..ef01e6bb6 100644 --- a/src/blackgui/filters/filterwidget.cpp +++ b/src/blackgui/filters/filterwidget.cpp @@ -9,6 +9,7 @@ #include "filterwidget.h" #include "blackgui/stylesheetutility.h" +#include "blackgui/guiapplication.h" namespace BlackGui { @@ -18,7 +19,7 @@ namespace BlackGui { this->setWindowTitle("Filter widget"); ps_onStyleSheetChanged(); - connect(&CStyleSheetUtility::instance(), &CStyleSheetUtility::styleSheetsChanged, this, &CFilterWidget::ps_onStyleSheetChanged); + connect(sGui, &CGuiApplication::styleSheetsChanged, this, &CFilterWidget::ps_onStyleSheetChanged); } CFilterWidget::~CFilterWidget() @@ -41,7 +42,7 @@ namespace BlackGui void CFilterWidget::ps_onStyleSheetChanged() { - const QString qss = CStyleSheetUtility::instance().style(CStyleSheetUtility::fileNameFilterDialog()); + const QString qss = sGui->getStyleSheetUtility().style(CStyleSheetUtility::fileNameFilterDialog()); this->setStyleSheet(qss); } @@ -64,5 +65,3 @@ namespace BlackGui } // namespace } // namespace - - diff --git a/src/blackgui/guiapplication.cpp b/src/blackgui/guiapplication.cpp index aee11bf0e..e77c01889 100644 --- a/src/blackgui/guiapplication.cpp +++ b/src/blackgui/guiapplication.cpp @@ -41,7 +41,7 @@ namespace BlackGui CGuiApplication::CGuiApplication(const QString &applicationName, const QPixmap &icon) : CApplication(applicationName) { setWindowIcon(icon); - connect(&CStyleSheetUtility::instance(), &CStyleSheetUtility::styleSheetsChanged, this, &CGuiApplication::styleSheetsChanged); + connect(sGui, &CGuiApplication::styleSheetsChanged, this, &CGuiApplication::styleSheetsChanged); sGui = this; } @@ -242,11 +242,6 @@ namespace BlackGui return m->displayTextInConsole(text); } - bool CGuiApplication::reloadStyleSheets() const - { - return CStyleSheetUtility::instance().read(); - } - void CGuiApplication::addMenuForSettingsAndCache(QMenu &menu) { QMenu *sm = menu.addMenu(CIcons::appSettings16(), "Settings"); @@ -417,6 +412,21 @@ namespace BlackGui Q_ASSERT_X(c, Q_FUNC_INFO, "Connect failed"); } + const CStyleSheetUtility &CGuiApplication::getStyleSheetUtility() const + { + return this->m_styleSheetUtility; + } + + bool CGuiApplication::reloadStyleSheets() + { + return m_styleSheetUtility.read(); + } + + bool CGuiApplication::updateFonts(const QString &fontFamily, const QString &fontSize, const QString &fontStyle, const QString &fontWeight, const QString &fontColor) + { + return m_styleSheetUtility.updateFonts(fontFamily, fontSize, fontStyle, fontWeight, fontColor); + } + void CGuiApplication::cmdLineHelpMessage() { if (CProject::isRunningOnWindowsNtPlatform()) @@ -447,7 +457,6 @@ namespace BlackGui bool CGuiApplication::parsingHookIn() { - // void return true; } diff --git a/src/blackgui/guiapplication.h b/src/blackgui/guiapplication.h index a4876085a..df08d81b3 100644 --- a/src/blackgui/guiapplication.h +++ b/src/blackgui/guiapplication.h @@ -15,6 +15,7 @@ #include "blackcore/application.h" #include "blackgui/mainwindowaccess.h" #include "blackgui/enableforframelesswindow.h" +#include "blackgui/stylesheetutility.h" #include "blackgui/blackguiexport.h" #include #include @@ -83,9 +84,6 @@ namespace BlackGui //! Allow the GUI to refresh by processing events, call the event loop void processEventsToRefreshGui() const; - //! Reload style sheets - bool reloadStyleSheets() const; - //! Init the main application window based on information in this application void initMainApplicationWindow(QWidget *mainWindow) const; @@ -116,6 +114,15 @@ namespace BlackGui //! Window operations void addMenuWindow(QMenu &menu); + //! Style sheet handling + const CStyleSheetUtility &getStyleSheetUtility() const; + + //! Reload style sheets + bool reloadStyleSheets(); + + //! Update the fonts + bool updateFonts(const QString &fontFamily, const QString &fontSize, const QString &fontStyle, const QString &fontWeight, const QString &fontColor); + //! Set icon //! \note Pixmap requires a valid QApplication, so it cannot be passed as constructor parameter static void setWindowIcon(const QPixmap &icon); @@ -151,7 +158,8 @@ namespace BlackGui QPixmap m_windowIcon; QCommandLineOption m_cmdWindowStateMinimized { "empty" }; //!< window state (minimized) QCommandLineOption m_cmdWindowMode { "empty" }; //!< window mode (flags: frameless ...) - QScopedPointer m_splashScreen; //!< splash screen + CStyleSheetUtility m_styleSheetUtility{{}, this}; //!< style sheet utility + QScopedPointer m_splashScreen; //!< splash screen //! Qt help message to formatted HTML static QString beautifyHelpMessage(const QString &helpText); diff --git a/src/blackgui/infoarea.cpp b/src/blackgui/infoarea.cpp index 2d5241c9d..90feaad14 100644 --- a/src/blackgui/infoarea.cpp +++ b/src/blackgui/infoarea.cpp @@ -9,6 +9,7 @@ #include "infoarea.h" #include "stylesheetutility.h" +#include "guiapplication.h" #include "guiutility.h" #include "blackmisc/icons.h" #include "blackmisc/logmessage.h" @@ -52,7 +53,7 @@ namespace BlackGui // context menu this->setContextMenuPolicy(Qt::CustomContextMenu); connect(this, &CInfoArea::customContextMenuRequested, this, &CInfoArea::ps_showContextMenu); - connect(&CStyleSheetUtility::instance(), &CStyleSheetUtility::styleSheetsChanged, this, &CInfoArea::ps_onStyleSheetChanged); + connect(sGui, &CGuiApplication::styleSheetsChanged, this, &CInfoArea::ps_onStyleSheetChanged); // initial style sheet setting this->ps_onStyleSheetChanged(); @@ -477,7 +478,7 @@ namespace BlackGui // if we have > 1 docked widgets, we have a tab bar if (this->m_tabBar) { - QString qss = CStyleSheetUtility::instance().style(CStyleSheetUtility::fileNameDockWidgetTab()); + QString qss = sGui->getStyleSheetUtility().style(CStyleSheetUtility::fileNameDockWidgetTab()); this->m_tabBar->setStyleSheet(qss); this->m_tabBar->setObjectName("comp_MainInfoAreaDockWidgetTab"); this->m_tabBar->setMovable(false); @@ -585,7 +586,7 @@ namespace BlackGui { // with Qt 5.5 still needed const QString section(this->objectName()); - const QSettings *settings = CStyleSheetUtility::instance().iniFile(); + const QSettings *settings = sGui->getStyleSheetUtility().iniFile(); if (settings && !section.isEmpty()) { for (CDockWidgetInfoArea *dw : this->m_dockWidgetInfoAreas) @@ -753,7 +754,7 @@ namespace BlackGui this->iniFileBasedSettings(); if (this->m_tabBar) { - QString qss = CStyleSheetUtility::instance().style(CStyleSheetUtility::fileNameDockWidgetTab()); + QString qss = sGui->getStyleSheetUtility().style(CStyleSheetUtility::fileNameDockWidgetTab()); this->m_tabBar->setStyleSheet(qss); } } diff --git a/src/blackgui/overlaymessages.cpp b/src/blackgui/overlaymessages.cpp index 3586bc841..4e9bd181d 100644 --- a/src/blackgui/overlaymessages.cpp +++ b/src/blackgui/overlaymessages.cpp @@ -8,7 +8,7 @@ */ #include "blackgui/overlaymessages.h" -#include "blackgui/stylesheetutility.h" +#include "blackgui/guiapplication.h" #include "ui_overlaymessages.h" #include @@ -24,7 +24,7 @@ namespace BlackGui ui(new Ui::COverlayMessages) { this->init(w, h); - connect(&CStyleSheetUtility::instance(), &CStyleSheetUtility::styleSheetsChanged, this, &COverlayMessages::ps_onStyleSheetsChanged); + connect(sGui, &CGuiApplication::styleSheetsChanged, this, &COverlayMessages::ps_onStyleSheetsChanged); connect(this->ui->pb_Ok, &QPushButton::clicked, this, &COverlayMessages::ps_okClicked); connect(this->ui->pb_Cancel, &QPushButton::clicked, this, &COverlayMessages::ps_cancelClicked); diff --git a/src/blackgui/stylesheetutility.cpp b/src/blackgui/stylesheetutility.cpp index 8e0ac1d22..4df8493b8 100644 --- a/src/blackgui/stylesheetutility.cpp +++ b/src/blackgui/stylesheetutility.cpp @@ -82,13 +82,13 @@ namespace BlackGui return w.append(" ").append(s); } - QString CStyleSheetUtility::fontColor() + QString CStyleSheetUtility::fontColor() const { - QString s = this->style(fileNameFonts()).toLower(); + const QString s = this->style(fileNameFonts()).toLower(); if (!s.contains("color:")) return "red"; QRegExp rx("color:\\s*(#*\\w+);"); rx.indexIn(s); - QString c = rx.cap(1); + const QString c = rx.cap(1); return c.isEmpty() ? "red" : c; } @@ -197,7 +197,7 @@ namespace BlackGui { static const QString n("normal"); QString c = combinedStyleAndWeight.toLower(); - foreach(QString s, fontStyles()) + foreach (QString s, fontStyles()) { if (c.contains(s)) { @@ -211,7 +211,7 @@ namespace BlackGui { static const QString n("normal"); QString c = combinedStyleAndWeight.toLower(); - foreach(QString w, fontWeights()) + foreach (QString w, fontWeights()) { if (c.contains(w)) { @@ -221,12 +221,6 @@ namespace BlackGui return n; } - CStyleSheetUtility &CStyleSheetUtility::instance() - { - static CStyleSheetUtility r; - return r; - } - const QString &CStyleSheetUtility::fileNameFonts() { static const QString f("fonts.qss"); @@ -301,13 +295,13 @@ namespace BlackGui const QStringList &CStyleSheetUtility::fontWeights() { - static const QStringList w( {"bold", "semibold", "light", "black", "normal"}); + static const QStringList w({"bold", "semibold", "light", "black", "normal"}); return w; } const QStringList &CStyleSheetUtility::fontStyles() { - static const QStringList s( {"italic", "oblique", "normal"}); + static const QStringList s({"italic", "oblique", "normal"}); return s; } diff --git a/src/blackgui/stylesheetutility.h b/src/blackgui/stylesheetutility.h index 302562926..32973177d 100644 --- a/src/blackgui/stylesheetutility.h +++ b/src/blackgui/stylesheetutility.h @@ -48,7 +48,10 @@ namespace BlackGui bool updateFonts(const QString &fontFamily, const QString &fontSize, const QString &fontStyle, const QString &fontWeight, const QString &fontColor); //! Current font color from style sheet - QString fontColor(); + QString fontColor() const; + + //! Read the *.qss files + bool read(); //! GUI ini file data const QSettings *iniFile() const { return m_iniFile.data(); } @@ -59,9 +62,6 @@ namespace BlackGui //! Get the font weight static QString fontWeight(const QString &combinedStyleAndWeight); - //! Central reader - static CStyleSheetUtility &instance(); - //! File name fonts.qss static const QString &fileNameFonts(); @@ -135,9 +135,6 @@ namespace BlackGui void styleSheetsChanged(); private: - //! Read the *.qss files - bool read(); - QMap m_styleSheets; //!< filename, stylesheet QScopedPointer m_iniFile; diff --git a/src/blackgui/textmessagetextedit.cpp b/src/blackgui/textmessagetextedit.cpp index 5f5fbaba5..05f4a66a2 100644 --- a/src/blackgui/textmessagetextedit.cpp +++ b/src/blackgui/textmessagetextedit.cpp @@ -10,15 +10,14 @@ #include "textmessagetextedit.h" #include "blackmisc/iconlist.h" #include "stylesheetutility.h" +#include "guiapplication.h" #include using namespace BlackMisc; -using namespace BlackGui; using namespace BlackMisc::Network; namespace BlackGui { - CTextMessageTextEdit::CTextMessageTextEdit(QWidget *parent) : QTextEdit(parent) { this->m_textDocument = new QTextDocument(this); @@ -50,7 +49,7 @@ namespace BlackGui connect(this, &QTextEdit::customContextMenuRequested, this, &CTextMessageTextEdit::ps_showContextMenuForTextEdit); // style sheet - connect(&CStyleSheetUtility::instance(), &CStyleSheetUtility::styleSheetsChanged, this, &CTextMessageTextEdit::ps_onStyleSheetChanged); + connect(sGui, &CGuiApplication::styleSheetsChanged, this, &CTextMessageTextEdit::ps_onStyleSheetChanged); ps_onStyleSheetChanged(); } @@ -168,7 +167,7 @@ namespace BlackGui void CTextMessageTextEdit::ps_onStyleSheetChanged() { Q_ASSERT(this->m_textDocument); - QString style(CStyleSheetUtility::instance().style(CStyleSheetUtility::fileNameTextMessage())); + QString style(sGui->getStyleSheetUtility().style(CStyleSheetUtility::fileNameTextMessage())); this->m_textDocument->setDefaultStyleSheet(style); } diff --git a/src/swiftcore/swiftcore.cpp b/src/swiftcore/swiftcore.cpp index 86d998604..cad99a330 100644 --- a/src/swiftcore/swiftcore.cpp +++ b/src/swiftcore/swiftcore.cpp @@ -50,7 +50,7 @@ CSwiftCore::CSwiftCore(QWidget *parent) : void CSwiftCore::initStyleSheet() { - const QString s = CStyleSheetUtility::instance().styles( + const QString s = sGui->getStyleSheetUtility().styles( { CStyleSheetUtility::fileNameFonts(), CStyleSheetUtility::fileNameStandardWidget(), diff --git a/src/swiftdata/swiftdata.cpp b/src/swiftdata/swiftdata.cpp index 018103793..22c73f0bd 100644 --- a/src/swiftdata/swiftdata.cpp +++ b/src/swiftdata/swiftdata.cpp @@ -41,7 +41,7 @@ CSwiftData::CSwiftData(QWidget *parent) : void CSwiftData::initStyleSheet() { - const QString s = CStyleSheetUtility::instance().styles( + const QString s = sGui->getStyleSheetUtility().styles( { CStyleSheetUtility::fileNameFonts(), CStyleSheetUtility::fileNameStandardWidget(), diff --git a/src/swiftguistandard/swiftguistdinit.cpp b/src/swiftguistandard/swiftguistdinit.cpp index 161b2f65a..978125d15 100644 --- a/src/swiftguistandard/swiftguistdinit.cpp +++ b/src/swiftguistandard/swiftguistdinit.cpp @@ -127,7 +127,7 @@ void SwiftGuiStd::init() void SwiftGuiStd::initStyleSheet() { - const QString s = CStyleSheetUtility::instance().styles( + const QString s = sGui->getStyleSheetUtility().styles( { CStyleSheetUtility::fileNameFonts(), CStyleSheetUtility::fileNameStandardWidget(), diff --git a/src/swiftlauncher/swiftlauncher.cpp b/src/swiftlauncher/swiftlauncher.cpp index cf5ac69aa..51d056655 100644 --- a/src/swiftlauncher/swiftlauncher.cpp +++ b/src/swiftlauncher/swiftlauncher.cpp @@ -134,7 +134,7 @@ void CSwiftLauncher::init() void CSwiftLauncher::initStyleSheet() { - const QString s = CStyleSheetUtility::instance().styles( + const QString s = sGui->getStyleSheetUtility().styles( { CStyleSheetUtility::fileNameFonts(), CStyleSheetUtility::fileNameStandardWidget(),