ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5653 from Starsam80/qt-remove-settings-warning 

Qt: Remove the warning in the settings window
This commit is contained in:
shuffle2 2017-06-21 20:24:31 -07:00 committed by GitHub
parent 1c741adcc6 74df52fb2c
commit e30484e8a7
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/DolphinQt2/Config/SettingsWindow.cpp
View File

@ -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();

2
Source/Core/DolphinQt2/Config/SettingsWindow.h
View File

@ -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;
};