diff options
| author | Jan Dalheimer <jan@dalheimer.de> | 2014-07-16 00:13:40 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-07-20 15:01:02 +0200 |
| commit | e178284172396ee51acb77c2daa8135b4855c12b (patch) | |
| tree | d37c3d95355073997b023c6bdf34072d3bb468b0 /CMakeLists.txt | |
| parent | c91adfb3d18b124b36cf19bcb89973a66c9ef1c9 (diff) | |
| download | MultiMC-e178284172396ee51acb77c2daa8135b4855c12b.tar MultiMC-e178284172396ee51acb77c2daa8135b4855c12b.tar.gz MultiMC-e178284172396ee51acb77c2daa8135b4855c12b.tar.lz MultiMC-e178284172396ee51acb77c2daa8135b4855c12b.tar.xz MultiMC-e178284172396ee51acb77c2daa8135b4855c12b.zip | |
Merge global settings and accounts into a pagedialog
Also split external tools into it's own page
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ac497f46..7cae21dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -312,12 +312,18 @@ SET(MULTIMC_SOURCES gui/pages/ScreenshotsPage.h gui/pages/OtherLogsPage.cpp gui/pages/OtherLogsPage.h + gui/pages/global/SettingsPage.cpp + gui/pages/global/SettingsPage.h + gui/pages/global/ExternalToolsPage.cpp + gui/pages/global/ExternalToolsPage.h + gui/pages/global/BaseSettingsPage.cpp + gui/pages/global/BaseSettingsPage.h + gui/pages/global/AccountListPage.cpp + gui/pages/global/AccountListPage.h # GUI - dialogs gui/dialogs/AboutDialog.cpp gui/dialogs/AboutDialog.h - gui/dialogs/AccountListDialog.cpp - gui/dialogs/AccountListDialog.h gui/dialogs/AccountSelectDialog.cpp gui/dialogs/AccountSelectDialog.h gui/dialogs/CopyInstanceDialog.cpp @@ -342,8 +348,6 @@ SET(MULTIMC_SOURCES gui/pagedialog/PageDialog.h gui/dialogs/ProgressDialog.cpp gui/dialogs/ProgressDialog.h - gui/dialogs/SettingsDialog.cpp - gui/dialogs/SettingsDialog.h gui/dialogs/UpdateDialog.cpp gui/dialogs/UpdateDialog.h gui/dialogs/VersionSelectDialog.cpp @@ -644,9 +648,11 @@ SET(MULTIMC_UIS gui/pages/NotesPage.ui gui/pages/ScreenshotsPage.ui gui/pages/OtherLogsPage.ui + gui/pages/global/SettingsPage.ui + gui/pages/global/ExternalToolsPage.ui + gui/pages/global/AccountListPage.ui # Dialogs - gui/dialogs/SettingsDialog.ui gui/dialogs/CopyInstanceDialog.ui gui/dialogs/NewInstanceDialog.ui gui/dialogs/AboutDialog.ui @@ -654,7 +660,6 @@ SET(MULTIMC_UIS gui/dialogs/LwjglSelectDialog.ui gui/dialogs/ProgressDialog.ui gui/dialogs/IconPickerDialog.ui - gui/dialogs/AccountListDialog.ui gui/dialogs/AccountSelectDialog.ui gui/dialogs/EditAccountDialog.ui gui/dialogs/LoginDialog.ui |