mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-30 11:55:35 +08:00
Style sheet improvements
* button clicked shown in different style (better user experience) * menu toopen main style sheet
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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");
|
||||
|
||||
@@ -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();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user