diff --git a/app/ui/style/style.cpp b/app/ui/style/style.cpp index 4e883261f..a63845984 100644 --- a/app/ui/style/style.cpp +++ b/app/ui/style/style.cpp @@ -38,19 +38,6 @@ QString StyleManager::current_style_; QMap StyleManager::available_themes_; QPalette StyleManager::platform_palette_; -void StyleManager::UseOSNativeStyling(QWidget *widget) -{ -#if defined(Q_OS_WINDOWS) - QStyle* s = QStyleFactory::create(QStringLiteral("windowsvista")); - widget->setStyle(s); - widget->setPalette(platform_palette_); -#elif defined(Q_OS_MAC) - QStyle* s = QStyleFactory::create(QStringLiteral("macintosh")); - widget->setStyle(s); - widget->setPalette(platform_palette_); -#endif -} - QPalette StyleManager::ParsePalette(const QString& ini_path) { QSettings ini(ini_path, QSettings::IniFormat); diff --git a/app/ui/style/style.h b/app/ui/style/style.h index 8b86914f6..83c782f52 100644 --- a/app/ui/style/style.h +++ b/app/ui/style/style.h @@ -36,8 +36,6 @@ public: static void SetStyle(const QString& style_path); - static void UseOSNativeStyling(QWidget* widget); - static const char* kDefaultStyle; static const QMap& available_themes() diff --git a/app/widget/colorlabelmenu/colorlabelmenuitem.cpp b/app/widget/colorlabelmenu/colorlabelmenuitem.cpp index f08a5c405..93ccda0b9 100644 --- a/app/widget/colorlabelmenu/colorlabelmenuitem.cpp +++ b/app/widget/colorlabelmenu/colorlabelmenuitem.cpp @@ -41,7 +41,6 @@ ColorLabelMenuItem::ColorLabelMenuItem(QWidget* parent) : layout->addWidget(box_); label_ = new QLabel(); - StyleManager::UseOSNativeStyling(label_); layout->addWidget(label_); } diff --git a/app/widget/menu/menu.cpp b/app/widget/menu/menu.cpp index 6745940b8..f1cd655c2 100644 --- a/app/widget/menu/menu.cpp +++ b/app/widget/menu/menu.cpp @@ -106,9 +106,6 @@ void Menu::Init() QPalette p = palette(); p.setColor(QPalette::Disabled, QPalette::Light, QColor(0, 0, 0, 0)); setPalette(p); - - // If a native palette is available, it should override the one above - StyleManager::UseOSNativeStyling(this); } } diff --git a/app/window/mainwindow/mainmenu.cpp b/app/window/mainwindow/mainmenu.cpp index 3492f9442..276c698a2 100644 --- a/app/window/mainwindow/mainmenu.cpp +++ b/app/window/mainwindow/mainmenu.cpp @@ -42,8 +42,6 @@ namespace olive { MainMenu::MainMenu(MainWindow *parent) : QMenuBar(parent) { - StyleManager::UseOSNativeStyling(this); - // // FILE MENU //