From 74df52fb2c371a2fc80b6c3203f1d43e050f48eb Mon Sep 17 00:00:00 2001 From: Starsam80 Date: Tue, 20 Jun 2017 16:00:49 -0600 Subject: [PATCH] Qt: Remove the warning in the settings window --- .../Core/DolphinQt2/Config/SettingsWindow.cpp | 18 +----------------- Source/Core/DolphinQt2/Config/SettingsWindow.h | 2 -- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/Source/Core/DolphinQt2/Config/SettingsWindow.cpp b/Source/Core/DolphinQt2/Config/SettingsWindow.cpp index eb906c9ed7..c6d903c3a6 100644 --- a/Source/Core/DolphinQt2/Config/SettingsWindow.cpp +++ b/Source/Core/DolphinQt2/Config/SettingsWindow.cpp @@ -26,7 +26,6 @@ SettingsWindow::SettingsWindow(QWidget* parent) : QDialog(parent) // Main Layout QVBoxLayout* layout = new QVBoxLayout; QHBoxLayout* content = new QHBoxLayout; - QVBoxLayout* content_inner = new QVBoxLayout; // Content's widgets { // Category list @@ -36,12 +35,7 @@ SettingsWindow::SettingsWindow(QWidget* parent) : QDialog(parent) // Actual Settings UI SetupSettingsWidget(); - MakeUnfinishedWarning(); - - content_inner->addWidget(m_warning_group); - content_inner->addWidget(m_settings_outer); - - content->addLayout(content_inner); + content->addWidget(m_settings_outer); } // Add content to layout before dialog buttons. @@ -66,16 +60,6 @@ void SettingsWindow::SetupSettingsWidget() m_settings_outer->addWidget(new PathPane); } -void SettingsWindow::MakeUnfinishedWarning() -{ - m_warning_group = new QGroupBox(tr("Warning")); - QHBoxLayout* m_warning_group_layout = new QHBoxLayout; - QLabel* warning_text = new QLabel(tr("Some categories and settings will not work.\n" - "This Settings Window is under active development.")); - m_warning_group_layout->addWidget(warning_text); - m_warning_group->setLayout(m_warning_group_layout); -} - void SettingsWindow::AddCategoryToList(const QString& title, const std::string& icon_name) { QString dir = Settings::Instance().GetThemeDir(); diff --git a/Source/Core/DolphinQt2/Config/SettingsWindow.h b/Source/Core/DolphinQt2/Config/SettingsWindow.h index d83400791b..c50b741203 100644 --- a/Source/Core/DolphinQt2/Config/SettingsWindow.h +++ b/Source/Core/DolphinQt2/Config/SettingsWindow.h @@ -24,10 +24,8 @@ public slots: private: void MakeCategoryList(); - void MakeUnfinishedWarning(); void AddCategoryToList(const QString& title, const std::string& icon_name); void SetupSettingsWidget(); QStackedWidget* m_settings_outer; QListWidget* m_categories; - QGroupBox* m_warning_group; };