diff --git a/app/ui/style/css/icons.qrc b/app/ui/style/css/icons.qrc deleted file mode 100644 index 29fbe4aa6..000000000 --- a/app/ui/style/css/icons.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - olive-dark.css - - diff --git a/app/ui/style/css/olive-dark.css b/app/ui/style/css/olive-dark.css index 713692a38..16c4143a9 100644 --- a/app/ui/style/css/olive-dark.css +++ b/app/ui/style/css/olive-dark.css @@ -81,7 +81,7 @@ QPushButton::checked { background: #191919; } -/* Ensure QMenu separators are dark enough */ +/* Ensure QMenu separators stand out */ QMenu::separator { - background: #191919; + background: #353535; } diff --git a/app/ui/style/css/olive-light.css b/app/ui/style/css/olive-light.css index 07d7d2b99..cc2dd3bc4 100644 --- a/app/ui/style/css/olive-light.css +++ b/app/ui/style/css/olive-light.css @@ -81,7 +81,7 @@ QPushButton::checked { background: #f0f0f0; } -/* Ensure QMenu separators are dark enough */ +/* Ensure QMenu separators stand out */ QMenu::separator { - background: #f0f0f0; + background: #d0d0d0; } diff --git a/app/ui/style/css/olive-mid.css b/app/ui/style/css/olive-mid.css index 92c84eaba..fba368a26 100644 --- a/app/ui/style/css/olive-mid.css +++ b/app/ui/style/css/olive-mid.css @@ -81,7 +81,7 @@ QPushButton::checked { background: #c0c0c0; } -/* Ensure QMenu separators are dark enough */ +/* Ensure QMenu separators stand out */ QMenu::separator { - background: #c0c0c0; + background: #808080; } diff --git a/app/ui/style/style.cpp b/app/ui/style/style.cpp index f83c19d7b..555e874aa 100644 --- a/app/ui/style/style.cpp +++ b/app/ui/style/style.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -35,20 +36,11 @@ void olive::style::AppSetDefault() QFile css_file(":/css/olive-dark.css"); if (css_file.open(QFile::ReadOnly | QFile::Text)) { + // Read in entire CSS from file and set as the application stylesheet QTextStream css_ts(&css_file); qApp->setStyleSheet(css_ts.readAll()); + + css_file.close(); } } - -void olive::style::WidgetSetNative(QWidget *w) -{ -#ifdef Q_OS_WIN - w->setStyleSheet(""); - w->setPalette(w->style()->standardPalette()); - w->setStyleSheet(QString()); - w->setStyle(QStyleFactory::create("windowsvista")); -#else - Q_UNUSED(w) -#endif -} diff --git a/app/ui/style/style.h b/app/ui/style/style.h index 568479414..baeb1119b 100644 --- a/app/ui/style/style.h +++ b/app/ui/style/style.h @@ -35,19 +35,6 @@ namespace style { */ void AppSetDefault(); -/** - * @brief (Windows only) Sets a widget to use the OS' native styling (windowsvista) - * - * Used primarily to set menus to the default Windows style. It was thought this would look better on Windows than the - * cross-platform styled menus and provide a more "native" experience. Unfortunately the only way to do this (when the - * application style is set) is to manually set the menus to not use the application style, thus this function. - * - * @param w - * - * Widget to set to native styling - */ -void WidgetSetNative(QWidget *w); - } } diff --git a/app/widget/menu/menu.cpp b/app/widget/menu/menu.cpp index fcda61383..9e8723570 100644 --- a/app/widget/menu/menu.cpp +++ b/app/widget/menu/menu.cpp @@ -25,8 +25,6 @@ Menu::Menu(QMenuBar *bar, const QObject* receiver, const char* member) : QMenu(bar) { - SetStyling(); - bar->addMenu(this); if (receiver != nullptr) { @@ -37,8 +35,6 @@ Menu::Menu(QMenuBar *bar, const QObject* receiver, const char* member) : Menu::Menu(Menu *menu, const QObject *receiver, const char *member) : QMenu(menu) { - SetStyling(); - menu->addMenu(this); if (receiver != nullptr) { @@ -85,10 +81,3 @@ void Menu::SetBooleanAction(QAction *a, bool* boolean) a->setChecked(*boolean); a->setProperty("boolptr", reinterpret_cast(boolean)); } - -void Menu::SetStyling() -{ - //if (olive::config.use_native_menu_styling) { - olive::style::WidgetSetNative(this); - //} -} diff --git a/app/widget/menu/menu.h b/app/widget/menu/menu.h index c85acbe1c..a6c6514fa 100644 --- a/app/widget/menu/menu.h +++ b/app/widget/menu/menu.h @@ -44,7 +44,7 @@ public: static void SetBooleanAction(QAction* a, bool *boolean); private: - void SetStyling(); + }; #endif // WIDGETMENU_H diff --git a/app/window/mainwindow/mainmenu.cpp b/app/window/mainwindow/mainmenu.cpp index 36b1425f9..49887e30e 100644 --- a/app/window/mainwindow/mainmenu.cpp +++ b/app/window/mainwindow/mainmenu.cpp @@ -24,6 +24,7 @@ #include "core.h" #include "tool/tool.h" +#include "ui/style/style.h" #include "widget/menu/menushared.h" MainMenu::MainMenu(QWidget *parent) :