diff --git a/src/blackgui/guiapplication.cpp b/src/blackgui/guiapplication.cpp index ecbb8d9cf..350688382 100644 --- a/src/blackgui/guiapplication.cpp +++ b/src/blackgui/guiapplication.cpp @@ -426,12 +426,19 @@ namespace BlackGui void CGuiApplication::addMenuForStyleSheets(QMenu &menu) { QMenu *sm = menu.addMenu("Style sheet"); - QAction *a = sm->addAction(CIcons::refresh16(), "Reload"); - bool c = connect(a, &QAction::triggered, this, [a, this]() + QAction *aReload = sm->addAction(CIcons::refresh16(), "Reload"); + bool c = connect(aReload, &QAction::triggered, this, [aReload, this]() { this->reloadStyleSheets(); }); Q_ASSERT_X(c, Q_FUNC_INFO, "Connect failed"); + + QAction *aOpen = sm->addAction(CIcons::text16(), "Open qss file"); + c = connect(aOpen, &QAction::triggered, this, [aOpen, this]() + { + this->openStandardWidgetStyleSheet(); + }); + Q_ASSERT_X(c, Q_FUNC_INFO, "Connect failed"); Q_UNUSED(c); } @@ -610,6 +617,12 @@ namespace BlackGui return m_styleSheetUtility.read(); } + bool CGuiApplication::openStandardWidgetStyleSheet() + { + const QString fn = CStyleSheetUtility::fileNameAndPathStandardWidget(); + return QDesktopServices::openUrl(QUrl::fromLocalFile(fn)); + } + bool CGuiApplication::updateFont(const QString &fontFamily, const QString &fontSize, const QString &fontStyle, const QString &fontWeight, const QString &fontColor) { return m_styleSheetUtility.updateFont(fontFamily, fontSize, fontStyle, fontWeight, fontColor); diff --git a/src/blackgui/guiapplication.h b/src/blackgui/guiapplication.h index 8cc29fb21..333f62dca 100644 --- a/src/blackgui/guiapplication.h +++ b/src/blackgui/guiapplication.h @@ -160,6 +160,9 @@ namespace BlackGui //! Reload style sheets bool reloadStyleSheets(); + //! Opens the standard stylesheet + bool openStandardWidgetStyleSheet(); + //! Update the fonts bool updateFont(const QString &fontFamily, const QString &fontSize, const QString &fontStyle, const QString &fontWeight, const QString &fontColor); @@ -231,12 +234,12 @@ namespace BlackGui QPixmap m_windowIcon; QCommandLineOption m_cmdWindowStateMinimized { "empty" }; //!< window state (minimized) QCommandLineOption m_cmdWindowMode { "empty" }; //!< window mode (flags: frameless ...) - CStyleSheetUtility m_styleSheetUtility{{}, this}; //!< style sheet utility + CStyleSheetUtility m_styleSheetUtility {{}, this}; //!< style sheet utility bool m_uiSetupCompleted = false; //!< ui setup completed QScopedPointer m_splashScreen; //!< splash screen Components::CDownloadAndInstallDialog *m_installDialog = nullptr; //!< software installation dialog Components::CApplicationCloseDialog *m_closeDialog = nullptr; //!< close dialog (no QScopedPointer because I need to set parent) - BlackMisc::CSettingReadOnly m_guiSettings{ this, &CGuiApplication::settingsChanged }; + BlackMisc::CSettingReadOnly m_guiSettings { this, &CGuiApplication::settingsChanged }; BlackMisc::CSettingReadOnly m_updateSetting { this }; //!< update notification settings //! Qt help message to formatted HTML diff --git a/src/blackgui/share/qss/stdwidget.qss b/src/blackgui/share/qss/stdwidget.qss index ebf8c8604..bd94234d5 100644 --- a/src/blackgui/share/qss/stdwidget.qss +++ b/src/blackgui/share/qss/stdwidget.qss @@ -176,6 +176,14 @@ QPushButton::disabled { qproperty-textElideMode: ElideMiddle; } +QPushButton:pressed{ background-color: lightblue; } +/** +QPushButton:focus:pressed{ background-color: black; } +QPushButton:focus{ background-color: green; } +QPushButton:hover{ background-color: red; } +QPushButton:checked{ background-color: pink; } +**/ + QProgressBar { border: 1px solid green; border-radius: 5px; diff --git a/src/blackgui/share/qss/swiftstdgui.qss b/src/blackgui/share/qss/swiftstdgui.qss index a3231ea0a..a6c7683c4 100644 --- a/src/blackgui/share/qss/swiftstdgui.qss +++ b/src/blackgui/share/qss/swiftstdgui.qss @@ -22,7 +22,7 @@ QAbstractScrollArea #qw_RemarksGenerator { background-color: transparent; backg /* in log component */ /** QAbstractScrollArea #pg_StatusPageMessages { background-color: black; } -QAbstractScrollArea #pg_StatusPageCons ole { background-color: black; } +QAbstractScrollArea #pg_StatusPageConsole { background-color: black; } **/ /* main GUI parts */ @@ -92,6 +92,10 @@ QAbstractScrollArea #pg_StatusPageCons ole { background-color: black; } color: yellow; } +#wi_MainKeypadArea QPushButton::pressed { + background-color: lightblue; +} + /* cockpit needs to come after sw_MainMiddle */ #comp_CockpitComComponent QPushButton { background-color: transparent; diff --git a/src/blackgui/stylesheetutility.cpp b/src/blackgui/stylesheetutility.cpp index 95c661e71..b57c723d8 100644 --- a/src/blackgui/stylesheetutility.cpp +++ b/src/blackgui/stylesheetutility.cpp @@ -315,6 +315,12 @@ namespace BlackGui return f; } + const QString &CStyleSheetUtility::fileNameAndPathSwiftStandardGui() + { + static const QString fn = CFileUtils::appendFilePaths(CDirectoryUtils::stylesheetsDirectory(), CStyleSheetUtility::fileNameSwiftStandardGui()); + return fn; + } + const QString &CStyleSheetUtility::fileNameInfoBar() { static const QString f(getQssFileName("infobar")); @@ -339,6 +345,12 @@ namespace BlackGui return f; } + const QString &CStyleSheetUtility::fileNameAndPathStandardWidget() + { + static const QString fn = CFileUtils::appendFilePaths(CDirectoryUtils::stylesheetsDirectory(), CStyleSheetUtility::fileNameStandardWidget()); + return fn; + } + const QString &CStyleSheetUtility::fileNameTextMessage() { static const QString f("textmessage.css"); diff --git a/src/blackgui/stylesheetutility.h b/src/blackgui/stylesheetutility.h index edfa945b9..882902b54 100644 --- a/src/blackgui/stylesheetutility.h +++ b/src/blackgui/stylesheetutility.h @@ -95,6 +95,9 @@ namespace BlackGui //! File name for standard widgets static const QString &fileNameStandardWidget(); + //! Full file path and name for standard widgets + static const QString &fileNameAndPathStandardWidget(); + //! File name textmessage.qss static const QString &fileNameTextMessage(); @@ -104,6 +107,9 @@ namespace BlackGui //! File name swift standard GUI static const QString &fileNameSwiftStandardGui(); + //! Full file path and name for swift standard GUI + static const QString &fileNameAndPathSwiftStandardGui(); + //! File name swiftcore.qss static const QString &fileNameSwiftCore();