diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-07-20 23:47:46 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-07-20 23:47:46 +0200 |
| commit | bc05ad30aa7c3da5d76947e82012f50466bb5d39 (patch) | |
| tree | b74fb5c1cc7d73d930e555ad9427c3d4885379cb /gui/MainWindow.cpp | |
| parent | e178284172396ee51acb77c2daa8135b4855c12b (diff) | |
| download | MultiMC-bc05ad30aa7c3da5d76947e82012f50466bb5d39.tar MultiMC-bc05ad30aa7c3da5d76947e82012f50466bb5d39.tar.gz MultiMC-bc05ad30aa7c3da5d76947e82012f50466bb5d39.tar.lz MultiMC-bc05ad30aa7c3da5d76947e82012f50466bb5d39.tar.xz MultiMC-bc05ad30aa7c3da5d76947e82012f50466bb5d39.zip | |
Rework the settings dialog. Rework all of it. Thoroughly.
Also introduces the ColumnResizer from:
https://github.com/agateau/columnresizer/
Diffstat (limited to 'gui/MainWindow.cpp')
| -rw-r--r-- | gui/MainWindow.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index 81ee466b..ce03d7b9 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -62,9 +62,12 @@ #include "gui/dialogs/EditAccountDialog.h" #include "gui/dialogs/NotificationDialog.h" -#include "gui/pages/global/SettingsPage.h" +#include "gui/pages/global/MultiMCPage.h" #include "gui/pages/global/ExternalToolsPage.h" #include "gui/pages/global/AccountListPage.h" +#include "pages/global/ProxyPage.h" +#include "pages/global/JavaPage.h" +#include "pages/global/MinecraftPage.h" #include "gui/ConsoleWindow.h" #include "pagedialog/PageDialog.h" @@ -250,9 +253,12 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi // set up global pages dialog { m_globalSettingsProvider = std::make_shared<GenericPageProvider>(tr("Settings")); - m_globalSettingsProvider->addPage<AccountListPage>(); - m_globalSettingsProvider->addPage<SettingsPage>(); + m_globalSettingsProvider->addPage<MultiMCPage>(); + m_globalSettingsProvider->addPage<MinecraftPage>(); + m_globalSettingsProvider->addPage<JavaPage>(); + m_globalSettingsProvider->addPage<ProxyPage>(); m_globalSettingsProvider->addPage<ExternalToolsPage>(); + m_globalSettingsProvider->addPage<AccountListPage>(); } // Update the menu when the active account changes. |