flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 11:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Style sheet improvements

Browse Source 
* button clicked shown in different style (better user experience)
* menu toopen main style sheet
This commit is contained in:
Klaus Basan
2017-09-27 02:59:55 +02:00
parent 40bc75a98c
commit f2820ba5a5
6 changed files with 51 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/blackgui/guiapplication.cpp
View File

@@ -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);

7
src/blackgui/guiapplication.h
View File

@@ -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<QSplashScreen> 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<Settings::TGeneralGui> m_guiSettings{ this, &CGuiApplication::settingsChanged };
BlackMisc::CSettingReadOnly<Settings::TGeneralGui> m_guiSettings { this, &CGuiApplication::settingsChanged };
BlackMisc::CSettingReadOnly<Settings::TUpdateNotificationSettings> m_updateSetting { this }; //!< update notification settings
//! Qt help message to formatted HTML

8
src/blackgui/share/qss/stdwidget.qss
View File

@@ -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;

6
src/blackgui/share/qss/swiftstdgui.qss
View File

@@ -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;

12
src/blackgui/stylesheetutility.cpp
View File

@@ -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");

6
src/blackgui/stylesheetutility.h
View File

@@ -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();