diff --git a/libqf/libqfgui/CMakeLists.txt b/libqf/libqfgui/CMakeLists.txt index 7de63a99b..b15de96e7 100644 --- a/libqf/libqfgui/CMakeLists.txt +++ b/libqf/libqfgui/CMakeLists.txt @@ -108,7 +108,6 @@ add_library(libqfgui SHARED images/qf_gui_images.qrc images/flat/qf_gui_images_flat.qrc - images/dark/qf_gui_images_dark.qrc src/reports/widgets/printtableviewwidget/reports/qf_gui_printtablewidget_reports.qrc ) diff --git a/libqf/libqfgui/images/dark/clone-row.svg b/libqf/libqfgui/images/dark/clone-row.svg deleted file mode 100644 index dcc039720..000000000 --- a/libqf/libqfgui/images/dark/clone-row.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - -image/svg+xml diff --git a/libqf/libqfgui/images/dark/copy.svg b/libqf/libqfgui/images/dark/copy.svg deleted file mode 100644 index dbfda77b5..000000000 --- a/libqf/libqfgui/images/dark/copy.svg +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libqf/libqfgui/images/dark/cut.svg b/libqf/libqfgui/images/dark/cut.svg deleted file mode 100644 index 1d9551ada..000000000 --- a/libqf/libqfgui/images/dark/cut.svg +++ /dev/null @@ -1,60 +0,0 @@ - - - -image/svg+xml diff --git a/libqf/libqfgui/images/dark/delete-column.svg b/libqf/libqfgui/images/dark/delete-column.svg deleted file mode 100644 index 06dabb9bf..000000000 --- a/libqf/libqfgui/images/dark/delete-column.svg +++ /dev/null @@ -1,66 +0,0 @@ - - - -image/svg+xml diff --git a/libqf/libqfgui/images/dark/delete-row.svg b/libqf/libqfgui/images/dark/delete-row.svg deleted file mode 100644 index a5780ec4c..000000000 --- a/libqf/libqfgui/images/dark/delete-row.svg +++ /dev/null @@ -1,65 +0,0 @@ - - - -image/svg+xml diff --git a/libqf/libqfgui/images/dark/delete.svg b/libqf/libqfgui/images/dark/delete.svg deleted file mode 100644 index aacf76fd4..000000000 --- a/libqf/libqfgui/images/dark/delete.svg +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/libqf/libqfgui/images/dark/down.svg b/libqf/libqfgui/images/dark/down.svg deleted file mode 100644 index b41df834f..000000000 --- a/libqf/libqfgui/images/dark/down.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - -image/svg+xml diff --git a/libqf/libqfgui/images/dark/find.svg b/libqf/libqfgui/images/dark/find.svg deleted file mode 100644 index a8253e7ab..000000000 --- a/libqf/libqfgui/images/dark/find.svg +++ /dev/null @@ -1,57 +0,0 @@ - - - -image/svg+xml diff --git a/libqf/libqfgui/images/dark/home.svg b/libqf/libqfgui/images/dark/home.svg deleted file mode 100644 index 3d7aac369..000000000 --- a/libqf/libqfgui/images/dark/home.svg +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/libqf/libqfgui/images/dark/insert-column.svg b/libqf/libqfgui/images/dark/insert-column.svg deleted file mode 100644 index 6558fe049..000000000 --- a/libqf/libqfgui/images/dark/insert-column.svg +++ /dev/null @@ -1,63 +0,0 @@ - - - -image/svg+xml diff --git a/libqf/libqfgui/images/dark/insert-row.svg b/libqf/libqfgui/images/dark/insert-row.svg deleted file mode 100644 index ceb1857d0..000000000 --- a/libqf/libqfgui/images/dark/insert-row.svg +++ /dev/null @@ -1,63 +0,0 @@ - - - -image/svg+xml diff --git a/libqf/libqfgui/images/dark/left.svg b/libqf/libqfgui/images/dark/left.svg deleted file mode 100644 index 9d9e0f7c5..000000000 --- a/libqf/libqfgui/images/dark/left.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - -image/svg+xml diff --git a/libqf/libqfgui/images/dark/media-pause.svg b/libqf/libqfgui/images/dark/media-pause.svg deleted file mode 100644 index 0fc5cd17d..000000000 --- a/libqf/libqfgui/images/dark/media-pause.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - diff --git a/libqf/libqfgui/images/dark/media-play.svg b/libqf/libqfgui/images/dark/media-play.svg deleted file mode 100644 index f4e9c6c6d..000000000 --- a/libqf/libqfgui/images/dark/media-play.svg +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/libqf/libqfgui/images/dark/media-record.svg b/libqf/libqfgui/images/dark/media-record.svg deleted file mode 100644 index a9db4e83a..000000000 --- a/libqf/libqfgui/images/dark/media-record.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - diff --git a/libqf/libqfgui/images/dark/media-skip-backward.svg b/libqf/libqfgui/images/dark/media-skip-backward.svg deleted file mode 100644 index 9a90de2e5..000000000 --- a/libqf/libqfgui/images/dark/media-skip-backward.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - diff --git a/libqf/libqfgui/images/dark/media-skip-forward.svg b/libqf/libqfgui/images/dark/media-skip-forward.svg deleted file mode 100644 index 5b1bb0e74..000000000 --- a/libqf/libqfgui/images/dark/media-skip-forward.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - diff --git a/libqf/libqfgui/images/dark/media-step-backward.svg b/libqf/libqfgui/images/dark/media-step-backward.svg deleted file mode 100644 index b03ef89e0..000000000 --- a/libqf/libqfgui/images/dark/media-step-backward.svg +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - diff --git a/libqf/libqfgui/images/dark/media-step-forward.svg b/libqf/libqfgui/images/dark/media-step-forward.svg deleted file mode 100644 index 82bf89945..000000000 --- a/libqf/libqfgui/images/dark/media-step-forward.svg +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - diff --git a/libqf/libqfgui/images/dark/media-stop.svg b/libqf/libqfgui/images/dark/media-stop.svg deleted file mode 100644 index 5ecfe9d64..000000000 --- a/libqf/libqfgui/images/dark/media-stop.svg +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/libqf/libqfgui/images/dark/menu.svg b/libqf/libqfgui/images/dark/menu.svg deleted file mode 100644 index 6572dfc9c..000000000 --- a/libqf/libqfgui/images/dark/menu.svg +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/libqf/libqfgui/images/dark/new.svg b/libqf/libqfgui/images/dark/new.svg deleted file mode 100644 index 4552f293f..000000000 --- a/libqf/libqfgui/images/dark/new.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - -image/svg+xml diff --git a/libqf/libqfgui/images/dark/open.svg b/libqf/libqfgui/images/dark/open.svg deleted file mode 100644 index c38436459..000000000 --- a/libqf/libqfgui/images/dark/open.svg +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/libqf/libqfgui/images/dark/paste.svg b/libqf/libqfgui/images/dark/paste.svg deleted file mode 100644 index 49c5e7153..000000000 --- a/libqf/libqfgui/images/dark/paste.svg +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libqf/libqfgui/images/dark/printer.svg b/libqf/libqfgui/images/dark/printer.svg deleted file mode 100644 index 979e7b0fc..000000000 --- a/libqf/libqfgui/images/dark/printer.svg +++ /dev/null @@ -1,59 +0,0 @@ - - - -image/svg+xml diff --git a/libqf/libqfgui/images/dark/qf_gui_images_dark.qrc b/libqf/libqfgui/images/dark/qf_gui_images_dark.qrc deleted file mode 100644 index ca2c27e96..000000000 --- a/libqf/libqfgui/images/dark/qf_gui_images_dark.qrc +++ /dev/null @@ -1,40 +0,0 @@ - - - home.svg - new.svg - open.svg - save.svg - reload.svg - revert.svg - delete.svg - find.svg - sort-asc.svg - sort-desc.svg - insert-row.svg - insert-column.svg - clone-row.svg - delete-row.svg - delete-column.svg - copy.svg - cut.svg - paste.svg - printer.svg - settings.svg - left.svg - right.svg - up.svg - down.svg - menu.svg - zoom_fitall.svg - zoom_fitwidth.svg - zoom_fitheight.svg - media-pause.svg - media-play.svg - media-record.svg - media-skip-backward.svg - media-skip-forward.svg - media-step-backward.svg - media-step-forward.svg - media-stop.svg - - diff --git a/libqf/libqfgui/images/dark/reload.svg b/libqf/libqfgui/images/dark/reload.svg deleted file mode 100644 index 3332d7d0c..000000000 --- a/libqf/libqfgui/images/dark/reload.svg +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/libqf/libqfgui/images/dark/revert.svg b/libqf/libqfgui/images/dark/revert.svg deleted file mode 100644 index daa54b040..000000000 --- a/libqf/libqfgui/images/dark/revert.svg +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/libqf/libqfgui/images/dark/right.svg b/libqf/libqfgui/images/dark/right.svg deleted file mode 100644 index d45e9fa91..000000000 --- a/libqf/libqfgui/images/dark/right.svg +++ /dev/null @@ -1,86 +0,0 @@ - - - -image/svg+xml diff --git a/libqf/libqfgui/images/dark/save.svg b/libqf/libqfgui/images/dark/save.svg deleted file mode 100644 index 6ed35b326..000000000 --- a/libqf/libqfgui/images/dark/save.svg +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libqf/libqfgui/images/dark/settings.svg b/libqf/libqfgui/images/dark/settings.svg deleted file mode 100644 index ec2aa8575..000000000 --- a/libqf/libqfgui/images/dark/settings.svg +++ /dev/null @@ -1,66 +0,0 @@ - - - -image/svg+xml diff --git a/libqf/libqfgui/images/dark/sort-asc.svg b/libqf/libqfgui/images/dark/sort-asc.svg deleted file mode 100644 index 06716ba50..000000000 --- a/libqf/libqfgui/images/dark/sort-asc.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/libqf/libqfgui/images/dark/sort-desc.svg b/libqf/libqfgui/images/dark/sort-desc.svg deleted file mode 100644 index c272e952b..000000000 --- a/libqf/libqfgui/images/dark/sort-desc.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/libqf/libqfgui/images/dark/up.svg b/libqf/libqfgui/images/dark/up.svg deleted file mode 100644 index 0aa13f6d1..000000000 --- a/libqf/libqfgui/images/dark/up.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - -image/svg+xml diff --git a/libqf/libqfgui/images/dark/zoom_fitall.svg b/libqf/libqfgui/images/dark/zoom_fitall.svg deleted file mode 100644 index 4e132b3ff..000000000 --- a/libqf/libqfgui/images/dark/zoom_fitall.svg +++ /dev/null @@ -1,87 +0,0 @@ - - - -image/svg+xml diff --git a/libqf/libqfgui/images/dark/zoom_fitheight.svg b/libqf/libqfgui/images/dark/zoom_fitheight.svg deleted file mode 100644 index 9c0c9b2e0..000000000 --- a/libqf/libqfgui/images/dark/zoom_fitheight.svg +++ /dev/null @@ -1,71 +0,0 @@ - - - -image/svg+xml diff --git a/libqf/libqfgui/images/dark/zoom_fitwidth.svg b/libqf/libqfgui/images/dark/zoom_fitwidth.svg deleted file mode 100644 index a80a7394d..000000000 --- a/libqf/libqfgui/images/dark/zoom_fitwidth.svg +++ /dev/null @@ -1,71 +0,0 @@ - - - -image/svg+xml diff --git a/libqf/libqfgui/src/framework/partswitch.cpp b/libqf/libqfgui/src/framework/partswitch.cpp index 9fdb1b3ea..5bd1ca1bc 100644 --- a/libqf/libqfgui/src/framework/partswitch.cpp +++ b/libqf/libqfgui/src/framework/partswitch.cpp @@ -2,7 +2,6 @@ #include "partwidget.h" #include "stackedcentralwidget.h" #include "mainwindow.h" -#include "plugin.h" #include #include @@ -14,6 +13,7 @@ using namespace qf::gui::framework; PartSwitchToolButton::PartSwitchToolButton(QWidget *parent) : Super(parent), m_partIndex() { + setProperty("class", "PartSwitchToolButton"); setAutoFillBackground(false); /// musi bejt off setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); setToolButtonStyle(Qt::ToolButtonTextUnderIcon); diff --git a/libqf/libqfgui/src/style.cpp b/libqf/libqfgui/src/style.cpp index 79dd3a0ad..f7017bda3 100644 --- a/libqf/libqfgui/src/style.cpp +++ b/libqf/libqfgui/src/style.cpp @@ -10,22 +10,16 @@ #include #include #include +#include namespace qf::gui { bool isDarkTheme() { // MUST be called after QApplication instance is created - QColor window_color = QApplication::palette().color(QPalette::Window); - QColor text_color = QApplication::palette().color(QPalette::WindowText); - // qDebug() << "window:" << window_color << window_color.value() << colorDarknes(window_color); - // qDebug() << "text:" << text_color << text_color.value() << colorDarknes(text_color); - // Simple heuristic: if background is darker than text, assume dark theme - return window_color.value() < text_color.value(); + return qApp->styleHints()->colorScheme() == Qt::ColorScheme::Dark; } -static const char *PROPERTY_STYLE_INSTANCE = "qf::qmlwidget::Style::instance"; - Style::Style(QObject *parent) : QObject(parent) { @@ -106,13 +100,9 @@ Style *Style::instance() { QCoreApplication *app = QCoreApplication::instance(); if(app) { - QVariant v = app->property(PROPERTY_STYLE_INSTANCE); - auto *o = v.value(); - auto *style = qobject_cast(o); + auto *style = app->findChild({}, Qt::FindDirectChildrenOnly); if(!style) { style = new Style(app); - QVariant v = QVariant::fromValue(style); - app->setProperty(PROPERTY_STYLE_INSTANCE, v); } return style; } @@ -120,16 +110,6 @@ Style *Style::instance() return nullptr; } -void Style::setInstance(Style *style) -{ - QCoreApplication *app = QCoreApplication::instance(); - if(app) { - QVariant v = QVariant::fromValue(style); - app->setProperty(PROPERTY_STYLE_INSTANCE, v); - } - qfError() << "qf::qmlwidget::Style::instance is available only when QCoreApplication instance exists."; -} - QFileInfo Style::findFile(const QString &path, const QString &default_extension) const { QString fn = path; diff --git a/libqf/libqfgui/src/style.h b/libqf/libqfgui/src/style.h index 7e884b828..d95378a78 100644 --- a/libqf/libqfgui/src/style.h +++ b/libqf/libqfgui/src/style.h @@ -30,7 +30,6 @@ class QFGUI_DECL_EXPORT Style : public QObject QIcon icon(const QString &name, const QSize &pixmap_size = QSize()); static Style* instance(); - static void setInstance(Style *style); private: QPixmap pixmapFromSvg(const QString &file_name, const QSize &pixmap_size = QSize()) const; QFileInfo findFile(const QString &path, const QString &default_extension) const; diff --git a/libqf/libqfgui/src/tableviewtoolbar.cpp b/libqf/libqfgui/src/tableviewtoolbar.cpp index 061d27380..c64fcff44 100644 --- a/libqf/libqfgui/src/tableviewtoolbar.cpp +++ b/libqf/libqfgui/src/tableviewtoolbar.cpp @@ -41,15 +41,23 @@ TableViewToolBar::TableViewToolBar(QWidget *parent) : #endif } - - void TableViewToolBar::setTableView(TableView *table_view) { qfLogFuncFrame() << m_filterCombo; if(table_view) { - m_pendingActions = table_view->toolBarActions(); - /// cannot add actions here from QML context because of bug in Qt5.3.1 - QMetaObject::invokeMethod(this, "addPendingActions", Qt::QueuedConnection); + QList lst; + for (auto a : table_view->toolBarActions()) { + lst << a; + } + addActions(lst); + auto *lbl = new QLabel(tr("Filter")); + auto *style = Style::instance(); + QPixmap px = style->pixmap("find"); + lbl->setPixmap(px); + lbl->setProperty("class", "filterLabel"); + addWidget(lbl); + addWidget(m_filterCombo); + connect(this, &TableViewToolBar::filterStringChanged, table_view, &TableView::filterByString); connect(table_view, &TableView::filterDialogRequest, this, &TableViewToolBar::onFilterDialogRequest); if(m_filterCombo) { @@ -58,20 +66,6 @@ void TableViewToolBar::setTableView(TableView *table_view) } } -void TableViewToolBar::addPendingActions() -{ - QList lst; - Q_FOREACH(auto a, m_pendingActions) - lst << a; - addActions(lst); - auto *lbl = new QLabel(tr("Filter")); - auto *style = Style::instance(); - QPixmap px = style->pixmap("find"); - lbl->setPixmap(px); - addWidget(lbl); - addWidget(m_filterCombo); -} - void TableViewToolBar::emitFilterStringChanged() { auto s = m_filterCombo->currentText(); diff --git a/libqf/libqfgui/src/tableviewtoolbar.h b/libqf/libqfgui/src/tableviewtoolbar.h index 429338fdf..1bef7f0f8 100644 --- a/libqf/libqfgui/src/tableviewtoolbar.h +++ b/libqf/libqfgui/src/tableviewtoolbar.h @@ -42,12 +42,10 @@ class QFGUI_DECL_EXPORT TableViewToolBar : public QToolBar signals: void filterStringChanged(const QString &s); private: - Q_SLOT void addPendingActions(); - Q_SLOT void emitFilterStringChanged(); - Q_SLOT void onFilterDialogRequest(); + void emitFilterStringChanged(); + void onFilterDialogRequest(); private: qf::gui::TableView* m_tableView = nullptr; - QList m_pendingActions; FilterCombo *m_filterCombo = nullptr; }; diff --git a/quickevent/app/quickevent/plugins/Event/src/services/servicewidget.cpp b/quickevent/app/quickevent/plugins/Event/src/services/servicewidget.cpp index e37afbc28..01d47914d 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/servicewidget.cpp +++ b/quickevent/app/quickevent/plugins/Event/src/services/servicewidget.cpp @@ -10,8 +10,8 @@ ServiceWidget::ServiceWidget(QWidget *parent) : { ui->setupUi(this); - connect(ui->btPlay, &QPushButton::clicked, this, &ServiceWidget::onBtPlayClicked); - connect(ui->btShowDetail, &QPushButton::clicked, this, &ServiceWidget::showDetail); + connect(ui->btPlay, &QAbstractButton::clicked, this, &ServiceWidget::onBtPlayClicked); + connect(ui->btShowDetail, &QAbstractButton::clicked, this, &ServiceWidget::showDetail); } ServiceWidget::~ServiceWidget() diff --git a/quickevent/app/quickevent/plugins/Event/src/services/servicewidget.ui b/quickevent/app/quickevent/plugins/Event/src/services/servicewidget.ui index 627fbd80a..335d57a13 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/servicewidget.ui +++ b/quickevent/app/quickevent/plugins/Event/src/services/servicewidget.ui @@ -92,7 +92,13 @@ - + + + + 32 + 32 + + :/qf/gui/images/flat/media-play.svg:/qf/gui/images/flat/media-play.svg @@ -100,7 +106,13 @@ - + + + + 32 + 32 + + :/qf/gui/images/flat/settings.svg:/qf/gui/images/flat/settings.svg diff --git a/quickevent/app/quickevent/src/application.cpp b/quickevent/app/quickevent/src/application.cpp index 43e2bb666..58931c423 100644 --- a/quickevent/app/quickevent/src/application.cpp +++ b/quickevent/app/quickevent/src/application.cpp @@ -24,14 +24,15 @@ Application::Application(int &argc, char **argv, AppCliOptions *cli_opts) } auto *style = qf::gui::Style::instance(); - if (qf::gui::isDarkTheme()) { - style->addIconSearchPath(":/qf/gui/images/dark"); - } else { - style->addIconSearchPath(":/qf/gui/images/flat"); - } + style->addIconSearchPath(":/qf/gui/images/flat"); style->addIconSearchPath(":/qf/gui/images"); - loadStyleSheet(); + if (qf::gui::isDarkTheme()) { + loadStyleSheet(":/quickevent/style/dark.css"); + } + else { + loadStyleSheet(":/quickevent/style/default.css"); + } QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); QString http_proxy = env.value(QStringLiteral("http_proxy")); diff --git a/quickevent/app/quickevent/src/main.cpp b/quickevent/app/quickevent/src/main.cpp index 360c24c69..1fa797518 100644 --- a/quickevent/app/quickevent/src/main.cpp +++ b/quickevent/app/quickevent/src/main.cpp @@ -16,8 +16,10 @@ #include #include +namespace { NecroLog::MessageHandler old_message_handler; bool send_log_entry_recursion_lock = false; +} void send_log_entry_handler(NecroLog::Level level, const NecroLog::LogContext &context, const std::string &msg) { diff --git a/quickevent/app/quickevent/style/dark.css b/quickevent/app/quickevent/style/dark.css new file mode 100644 index 000000000..14cdd66b8 --- /dev/null +++ b/quickevent/app/quickevent/style/dark.css @@ -0,0 +1,41 @@ +QMenu,QMenuBar { + background-color: #525252; +} + +qf--gui--framework--PartSwitch { + background: #525252; +} + +QToolButton.PartSwitchToolButton { + background-color: #525252; + color: white; + padding: 2px; +} +QToolButton.PartSwitchToolButton:hover { + background-color: #858585; +} + +qf--gui--dialogs--internal--CaptionFrame { + background: darkorange; +} +QWidget#CaptionFrame { + background: darkorange; + color:black; + font-weight: bold; +} +qf--gui--dialogs--internal--CaptionFrame[alert="true"] { + background: salmon; +} + +qf--gui--dialogs--internal--CaptionFrame QLabel { + font: 14pt; + color:black; +} + +QLabel.filterLabel { + background-color: #525252; +} + +QToolButton {background-color: #656565; border-radius: 4px;} +QToolButton:hover {background-color: #b5b5b5; } +QToolButton:checked {background-color: #ffa500;} diff --git a/quickevent/app/quickevent/style/default-with-tabwidget.css b/quickevent/app/quickevent/style/default-with-tabwidget.css deleted file mode 100644 index 2a5ead776..000000000 --- a/quickevent/app/quickevent/style/default-with-tabwidget.css +++ /dev/null @@ -1,58 +0,0 @@ - QMenu,QMenuBar { - background-color: #525252; - color: white; - } -/* -QMenu::item, QMenuBar::item { - spacing: 3px; - padding: 4px 4px; - background: transparent; - border-radius: 4px; - } -*/ - QMenu::item:selected, QMenuBar::item:selected { - background: darkgray; - } - - QMenu::item:pressed, QMenuBar::item:pressed { - background: darkgray; - } - -/* Style the tab using the tab sub-control. Note that - it reads QTabBar _not_ QTabWidget - file://qt4/current/doc/html/stylesheet-examples.html#customizing-qtabwidget-and-qtabbar - */ -QTabWidget::pane { /* The tab widget frame */ - border-top: 2px solid #C2C7CB; - } - - QTabWidget::tab-bar { - left: 5px; /* move to the right by 5px */ - } - - QTabBar::tab { - background: darkgray; - border: 2px solid #C4C4C3; - border-bottom-color: #C2C7CB; /* same as the pane color */ - border-top-left-radius: 4px; - border-top-right-radius: 4px; - /*min-width: 8ex;*/ - padding: 2px; - } - - QTabBar::tab:hover { - background: #f5f5b8; - } - - QTabBar::tab:selected { - background: khaki; - } - - QTabBar::tab:selected { - border-color: #9B9B9B; - border-bottom-color: #C2C7CB; /* same as pane color */ - } - - QTabBar::tab:!selected { - margin-top: 4px; /* make non-selected tabs look smaller */ - } \ No newline at end of file diff --git a/quickevent/app/quickevent/style/default.css b/quickevent/app/quickevent/style/default.css index 36655c72e..169c9cb08 100644 --- a/quickevent/app/quickevent/style/default.css +++ b/quickevent/app/quickevent/style/default.css @@ -8,80 +8,48 @@ QMenu::item, QMenuBar::item { background-color: transparent; } - QMenu::item:disabled, QMenuBar::item:disabled { - color: gray; - } +QMenu::item:disabled, QMenuBar::item:disabled { + color: gray; +} - QMenu::item:selected, QMenuBar::item:selected { +QMenu::item:selected, QMenuBar::item:selected { color: black; background: #FDE364; - /* background: darkgray;*/ - } +} - QMenu::item:pressed, QMenuBar::item:pressed { - background: darkgray; - } +QMenu::item:pressed, QMenuBar::item:pressed { + background: darkgray; +} qf--gui--framework--PartSwitch { background: #525252; -/* background-color: #525252; */ -/* color: white; */ -/* border: 2px solid gray; */ } -qf--gui--framework--PartSwitch::handle { - /* - * background: #525252; - * background: lightgray; - */ -} - -qf--gui--framework--PartSwitch QToolButton { -/* background-color: #525252; */ +QToolButton.PartSwitchToolButton { + background-color: #525252; color: white; padding: 2px; + border: none; } - -qf--gui--framework--PartSwitch QToolButton:hover { -/* - * background: lightsteelblue; - * color: black; - * background: gray; - */ - background: #f0f0f0; - color: black; - border: 2px outset #525252; -} - -qf--gui--framework--PartSwitch QToolButton:checked { - /*background: green; - color: red;*/ - background: #f0f0f0; - color: black; - border: 1px solid #525252; +QToolButton.PartSwitchToolButton:hover { + background-color: #858585; } qf--gui--dialogs--internal--CaptionFrame { - /*background: #FDE364; yellow */ - /*background: #FFA842; orange */ -/* background: lightsteelblue; */ background: darkorange; } QWidget#CaptionFrame { - /*background: #FDE364; yellow */ - /*background: #FFA842; orange */ -/* background: lightsteelblue; */ background: darkorange; color:black; font-weight: bold; } qf--gui--dialogs--internal--CaptionFrame[alert="true"] { background: salmon; - /*background: #FFA842;*/ } qf--gui--dialogs--internal--CaptionFrame QLabel { font: 14pt; -/* color: white; */ color:black; } + +QToolButton:checked {background-color: #ffa500;} diff --git a/quickevent/app/quickevent/style/style.qrc b/quickevent/app/quickevent/style/style.qrc index b1a1010c1..723ee2773 100644 --- a/quickevent/app/quickevent/style/style.qrc +++ b/quickevent/app/quickevent/style/style.qrc @@ -1,5 +1,6 @@ default.css + dark.css