summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-07-20 23:47:46 +0200
committerPetr Mrázek <peterix@gmail.com>2014-07-20 23:47:46 +0200
commitbc05ad30aa7c3da5d76947e82012f50466bb5d39 (patch)
treeb74fb5c1cc7d73d930e555ad9427c3d4885379cb /CMakeLists.txt
parente178284172396ee51acb77c2daa8135b4855c12b (diff)
downloadMultiMC-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 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt29
1 files changed, 21 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7cae21dd..7efd42e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -283,6 +283,8 @@ SET(MULTIMC_SOURCES
# GUI - general utilities
gui/GuiUtil.h
gui/GuiUtil.cpp
+ gui/ColumnResizer.h
+ gui/ColumnResizer.cpp
# GUI - windows
gui/MainWindow.h
@@ -312,14 +314,20 @@ 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 - global settings pages
gui/pages/global/AccountListPage.cpp
gui/pages/global/AccountListPage.h
+ gui/pages/global/ExternalToolsPage.cpp
+ gui/pages/global/ExternalToolsPage.h
+ gui/pages/global/JavaPage.cpp
+ gui/pages/global/JavaPage.h
+ gui/pages/global/MinecraftPage.cpp
+ gui/pages/global/MinecraftPage.h
+ gui/pages/global/MultiMCPage.cpp
+ gui/pages/global/MultiMCPage.h
+ gui/pages/global/ProxyPage.cpp
+ gui/pages/global/ProxyPage.h
# GUI - dialogs
gui/dialogs/AboutDialog.cpp
@@ -648,9 +656,14 @@ 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
+
+ # Global settings pages
gui/pages/global/AccountListPage.ui
+ gui/pages/global/ExternalToolsPage.ui
+ gui/pages/global/JavaPage.ui
+ gui/pages/global/MinecraftPage.ui
+ gui/pages/global/MultiMCPage.ui
+ gui/pages/global/ProxyPage.ui
# Dialogs
gui/dialogs/CopyInstanceDialog.ui