From b258eac215c791b2a8eed10cecbbf9551c87f0b9 Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Mon, 22 Nov 2021 03:55:16 +0100 Subject: NOISSUE continue reshuffling the codebase --- CMakeLists.txt | 2 + launcher/Application.cpp | 58 +- launcher/CMakeLists.txt | 484 +++-- launcher/ColorCache.cpp | 35 - launcher/ColorCache.h | 119 -- launcher/ColumnResizer.cpp | 199 -- launcher/ColumnResizer.h | 41 - launcher/GuiUtil.cpp | 131 -- launcher/GuiUtil.h | 11 - launcher/InstancePageProvider.h | 32 +- launcher/InstanceWindow.cpp | 236 --- launcher/InstanceWindow.h | 73 - launcher/JavaCommon.cpp | 2 +- launcher/LaunchController.cpp | 29 +- launcher/MainWindow.cpp | 1945 ------------------- launcher/MainWindow.h | 221 --- launcher/dialogs/AboutDialog.cpp | 149 -- launcher/dialogs/AboutDialog.h | 47 - launcher/dialogs/AboutDialog.ui | 316 ---- launcher/dialogs/CopyInstanceDialog.cpp | 144 -- launcher/dialogs/CopyInstanceDialog.h | 58 - launcher/dialogs/CopyInstanceDialog.ui | 182 -- launcher/dialogs/CustomMessageBox.cpp | 35 - launcher/dialogs/CustomMessageBox.h | 26 - launcher/dialogs/EditAccountDialog.cpp | 61 - launcher/dialogs/EditAccountDialog.h | 56 - launcher/dialogs/EditAccountDialog.ui | 94 - launcher/dialogs/ExportInstanceDialog.cpp | 482 ----- launcher/dialogs/ExportInstanceDialog.h | 54 - launcher/dialogs/ExportInstanceDialog.ui | 83 - launcher/dialogs/IconPickerDialog.cpp | 163 -- launcher/dialogs/IconPickerDialog.h | 49 - launcher/dialogs/IconPickerDialog.ui | 67 - launcher/dialogs/LoginDialog.cpp | 119 -- launcher/dialogs/LoginDialog.h | 59 - launcher/dialogs/LoginDialog.ui | 77 - launcher/dialogs/MSALoginDialog.cpp | 141 -- launcher/dialogs/MSALoginDialog.h | 63 - launcher/dialogs/MSALoginDialog.ui | 65 - launcher/dialogs/NewComponentDialog.cpp | 106 -- launcher/dialogs/NewComponentDialog.h | 48 - launcher/dialogs/NewComponentDialog.ui | 101 - launcher/dialogs/NewInstanceDialog.cpp | 255 --- launcher/dialogs/NewInstanceDialog.h | 80 - launcher/dialogs/NewInstanceDialog.ui | 87 - launcher/dialogs/NotificationDialog.cpp | 86 - launcher/dialogs/NotificationDialog.h | 44 - launcher/dialogs/NotificationDialog.ui | 85 - launcher/dialogs/ProfileSelectDialog.cpp | 116 -- launcher/dialogs/ProfileSelectDialog.h | 90 - launcher/dialogs/ProfileSelectDialog.ui | 62 - launcher/dialogs/ProfileSetupDialog.cpp | 250 --- launcher/dialogs/ProfileSetupDialog.h | 88 - launcher/dialogs/ProfileSetupDialog.ui | 74 - launcher/dialogs/ProgressDialog.cpp | 196 -- launcher/dialogs/ProgressDialog.h | 71 - launcher/dialogs/ProgressDialog.ui | 66 - launcher/dialogs/SkinUploadDialog.cpp | 155 -- launcher/dialogs/SkinUploadDialog.h | 29 - launcher/dialogs/SkinUploadDialog.ui | 97 - launcher/dialogs/UpdateDialog.cpp | 182 -- launcher/dialogs/UpdateDialog.h | 67 - launcher/dialogs/UpdateDialog.ui | 91 - launcher/dialogs/VersionSelectDialog.cpp | 141 -- launcher/dialogs/VersionSelectDialog.h | 78 - launcher/instanceview/AccessibleInstanceView.cpp | 778 -------- launcher/instanceview/AccessibleInstanceView.h | 6 - launcher/instanceview/AccessibleInstanceView_p.h | 118 -- launcher/instanceview/InstanceDelegate.cpp | 428 ----- launcher/instanceview/InstanceDelegate.h | 39 - launcher/instanceview/InstanceProxyModel.cpp | 71 - launcher/instanceview/InstanceProxyModel.h | 35 - launcher/instanceview/InstanceView.cpp | 1010 ---------- launcher/instanceview/InstanceView.h | 153 -- launcher/instanceview/VisualGroup.cpp | 317 ---- launcher/instanceview/VisualGroup.h | 106 -- launcher/java/launch/CheckJava.cpp | 139 -- launcher/java/launch/CheckJava.h | 45 - launcher/launch/steps/CheckJava.cpp | 139 ++ launcher/launch/steps/CheckJava.h | 45 + launcher/main.cpp | 4 - launcher/minecraft/MinecraftInstance.cpp | 2 +- launcher/pagedialog/PageDialog.cpp | 61 - launcher/pagedialog/PageDialog.h | 35 - launcher/pages/BasePage.h | 58 - launcher/pages/BasePageContainer.h | 10 - launcher/pages/BasePageProvider.h | 68 - launcher/pages/global/AccountListPage.cpp | 259 --- launcher/pages/global/AccountListPage.h | 85 - launcher/pages/global/AccountListPage.ui | 129 -- launcher/pages/global/CustomCommandsPage.cpp | 51 - launcher/pages/global/CustomCommandsPage.h | 55 - launcher/pages/global/ExternalToolsPage.cpp | 233 --- launcher/pages/global/ExternalToolsPage.h | 74 - launcher/pages/global/ExternalToolsPage.ui | 194 -- launcher/pages/global/JavaPage.cpp | 153 -- launcher/pages/global/JavaPage.h | 72 - launcher/pages/global/JavaPage.ui | 260 --- launcher/pages/global/LanguagePage.cpp | 51 - launcher/pages/global/LanguagePage.h | 60 - launcher/pages/global/LauncherPage.cpp | 466 ----- launcher/pages/global/LauncherPage.h | 103 -- launcher/pages/global/LauncherPage.ui | 584 ------ launcher/pages/global/MinecraftPage.cpp | 91 - launcher/pages/global/MinecraftPage.h | 70 - launcher/pages/global/MinecraftPage.ui | 196 -- launcher/pages/global/PasteEEPage.cpp | 81 - launcher/pages/global/PasteEEPage.h | 62 - launcher/pages/global/PasteEEPage.ui | 128 -- launcher/pages/global/ProxyPage.cpp | 106 -- launcher/pages/global/ProxyPage.h | 66 - launcher/pages/global/ProxyPage.ui | 203 -- launcher/pages/instance/GameOptionsPage.cpp | 37 - launcher/pages/instance/GameOptionsPage.h | 63 - launcher/pages/instance/GameOptionsPage.ui | 88 - launcher/pages/instance/InstanceSettingsPage.cpp | 338 ---- launcher/pages/instance/InstanceSettingsPage.h | 76 - launcher/pages/instance/InstanceSettingsPage.ui | 548 ------ launcher/pages/instance/LegacyUpgradePage.cpp | 50 - launcher/pages/instance/LegacyUpgradePage.h | 64 - launcher/pages/instance/LegacyUpgradePage.ui | 47 - launcher/pages/instance/LogPage.cpp | 328 ---- launcher/pages/instance/LogPage.h | 86 - launcher/pages/instance/LogPage.ui | 182 -- launcher/pages/instance/ModFolderPage.cpp | 363 ---- launcher/pages/instance/ModFolderPage.h | 119 -- launcher/pages/instance/ModFolderPage.ui | 164 -- launcher/pages/instance/NotesPage.cpp | 21 - launcher/pages/instance/NotesPage.h | 60 - launcher/pages/instance/NotesPage.ui | 49 - launcher/pages/instance/OtherLogsPage.cpp | 313 ---- launcher/pages/instance/OtherLogsPage.h | 81 - launcher/pages/instance/OtherLogsPage.ui | 150 -- launcher/pages/instance/ResourcePackPage.h | 23 - launcher/pages/instance/ScreenshotsPage.cpp | 422 ----- launcher/pages/instance/ScreenshotsPage.h | 89 - launcher/pages/instance/ScreenshotsPage.ui | 87 - launcher/pages/instance/ServersPage.cpp | 768 -------- launcher/pages/instance/ServersPage.h | 94 - launcher/pages/instance/ServersPage.ui | 194 -- launcher/pages/instance/ShaderPackPage.h | 22 - launcher/pages/instance/TexturePackPage.h | 22 - launcher/pages/instance/VersionPage.cpp | 642 ------- launcher/pages/instance/VersionPage.h | 104 -- launcher/pages/instance/VersionPage.ui | 285 --- launcher/pages/instance/WorldListPage.cpp | 408 ---- launcher/pages/instance/WorldListPage.h | 99 - launcher/pages/instance/WorldListPage.ui | 161 -- launcher/pages/modplatform/ImportPage.cpp | 130 -- launcher/pages/modplatform/ImportPage.h | 70 - launcher/pages/modplatform/ImportPage.ui | 52 - launcher/pages/modplatform/VanillaPage.cpp | 103 -- launcher/pages/modplatform/VanillaPage.h | 75 - launcher/pages/modplatform/VanillaPage.ui | 169 -- .../modplatform/atlauncher/AtlFilterModel.cpp | 81 - .../pages/modplatform/atlauncher/AtlFilterModel.h | 34 - .../pages/modplatform/atlauncher/AtlListModel.cpp | 193 -- .../pages/modplatform/atlauncher/AtlListModel.h | 52 - .../atlauncher/AtlOptionalModDialog.cpp | 209 --- .../modplatform/atlauncher/AtlOptionalModDialog.h | 66 - .../modplatform/atlauncher/AtlOptionalModDialog.ui | 65 - launcher/pages/modplatform/atlauncher/AtlPage.cpp | 169 -- launcher/pages/modplatform/atlauncher/AtlPage.h | 86 - launcher/pages/modplatform/atlauncher/AtlPage.ui | 92 - launcher/pages/modplatform/flame/FlameModel.cpp | 258 --- launcher/pages/modplatform/flame/FlameModel.h | 76 - launcher/pages/modplatform/flame/FlamePage.cpp | 185 -- launcher/pages/modplatform/flame/FlamePage.h | 80 - launcher/pages/modplatform/flame/FlamePage.ui | 90 - launcher/pages/modplatform/ftb/FtbFilterModel.cpp | 76 - launcher/pages/modplatform/ftb/FtbFilterModel.h | 35 - launcher/pages/modplatform/ftb/FtbListModel.cpp | 278 --- launcher/pages/modplatform/ftb/FtbListModel.h | 61 - launcher/pages/modplatform/ftb/FtbPage.cpp | 150 -- launcher/pages/modplatform/ftb/FtbPage.h | 83 - launcher/pages/modplatform/ftb/FtbPage.ui | 79 - .../pages/modplatform/legacy_ftb/ListModel.cpp | 259 --- launcher/pages/modplatform/legacy_ftb/ListModel.h | 78 - launcher/pages/modplatform/legacy_ftb/Page.cpp | 369 ---- launcher/pages/modplatform/legacy_ftb/Page.h | 119 -- launcher/pages/modplatform/legacy_ftb/Page.ui | 135 -- launcher/pages/modplatform/technic/TechnicData.h | 42 - .../pages/modplatform/technic/TechnicModel.cpp | 237 --- launcher/pages/modplatform/technic/TechnicModel.h | 70 - launcher/pages/modplatform/technic/TechnicPage.cpp | 198 -- launcher/pages/modplatform/technic/TechnicPage.h | 78 - launcher/pages/modplatform/technic/TechnicPage.ui | 95 - launcher/setupwizard/AnalyticsWizardPage.cpp | 63 - launcher/setupwizard/AnalyticsWizardPage.h | 25 - launcher/setupwizard/BaseWizardPage.h | 33 - launcher/setupwizard/JavaWizardPage.cpp | 96 - launcher/setupwizard/JavaWizardPage.h | 29 - launcher/setupwizard/LanguageWizardPage.cpp | 49 - launcher/setupwizard/LanguageWizardPage.h | 26 - launcher/setupwizard/SetupWizard.cpp | 89 - launcher/setupwizard/SetupWizard.h | 45 - launcher/themes/BrightTheme.cpp | 56 - launcher/themes/BrightTheme.h | 19 - launcher/themes/CustomTheme.cpp | 244 --- launcher/themes/CustomTheme.h | 31 - launcher/themes/DarkTheme.cpp | 55 - launcher/themes/DarkTheme.h | 18 - launcher/themes/FusionTheme.cpp | 6 - launcher/themes/FusionTheme.h | 11 - launcher/themes/ITheme.cpp | 47 - launcher/themes/ITheme.h | 27 - launcher/themes/SystemTheme.cpp | 83 - launcher/themes/SystemTheme.h | 24 - launcher/ui/ColorCache.cpp | 35 + launcher/ui/ColorCache.h | 119 ++ launcher/ui/GuiUtil.cpp | 136 ++ launcher/ui/GuiUtil.h | 11 + launcher/ui/InstanceWindow.cpp | 237 +++ launcher/ui/InstanceWindow.h | 76 + launcher/ui/MainWindow.cpp | 1949 ++++++++++++++++++++ launcher/ui/MainWindow.h | 221 +++ launcher/ui/dialogs/AboutDialog.cpp | 149 ++ launcher/ui/dialogs/AboutDialog.h | 47 + launcher/ui/dialogs/AboutDialog.ui | 316 ++++ launcher/ui/dialogs/CopyInstanceDialog.cpp | 144 ++ launcher/ui/dialogs/CopyInstanceDialog.h | 58 + launcher/ui/dialogs/CopyInstanceDialog.ui | 182 ++ launcher/ui/dialogs/CustomMessageBox.cpp | 35 + launcher/ui/dialogs/CustomMessageBox.h | 26 + launcher/ui/dialogs/EditAccountDialog.cpp | 61 + launcher/ui/dialogs/EditAccountDialog.h | 56 + launcher/ui/dialogs/EditAccountDialog.ui | 94 + launcher/ui/dialogs/ExportInstanceDialog.cpp | 482 +++++ launcher/ui/dialogs/ExportInstanceDialog.h | 54 + launcher/ui/dialogs/ExportInstanceDialog.ui | 83 + launcher/ui/dialogs/IconPickerDialog.cpp | 163 ++ launcher/ui/dialogs/IconPickerDialog.h | 49 + launcher/ui/dialogs/IconPickerDialog.ui | 67 + launcher/ui/dialogs/LoginDialog.cpp | 119 ++ launcher/ui/dialogs/LoginDialog.h | 59 + launcher/ui/dialogs/LoginDialog.ui | 77 + launcher/ui/dialogs/MSALoginDialog.cpp | 141 ++ launcher/ui/dialogs/MSALoginDialog.h | 63 + launcher/ui/dialogs/MSALoginDialog.ui | 65 + launcher/ui/dialogs/NewComponentDialog.cpp | 106 ++ launcher/ui/dialogs/NewComponentDialog.h | 48 + launcher/ui/dialogs/NewComponentDialog.ui | 101 + launcher/ui/dialogs/NewInstanceDialog.cpp | 255 +++ launcher/ui/dialogs/NewInstanceDialog.h | 80 + launcher/ui/dialogs/NewInstanceDialog.ui | 87 + launcher/ui/dialogs/NotificationDialog.cpp | 86 + launcher/ui/dialogs/NotificationDialog.h | 44 + launcher/ui/dialogs/NotificationDialog.ui | 85 + launcher/ui/dialogs/ProfileSelectDialog.cpp | 115 ++ launcher/ui/dialogs/ProfileSelectDialog.h | 90 + launcher/ui/dialogs/ProfileSelectDialog.ui | 62 + launcher/ui/dialogs/ProfileSetupDialog.cpp | 250 +++ launcher/ui/dialogs/ProfileSetupDialog.h | 88 + launcher/ui/dialogs/ProfileSetupDialog.ui | 74 + launcher/ui/dialogs/ProgressDialog.cpp | 196 ++ launcher/ui/dialogs/ProgressDialog.h | 71 + launcher/ui/dialogs/ProgressDialog.ui | 66 + launcher/ui/dialogs/SkinUploadDialog.cpp | 155 ++ launcher/ui/dialogs/SkinUploadDialog.h | 29 + launcher/ui/dialogs/SkinUploadDialog.ui | 97 + launcher/ui/dialogs/UpdateDialog.cpp | 182 ++ launcher/ui/dialogs/UpdateDialog.h | 67 + launcher/ui/dialogs/UpdateDialog.ui | 91 + launcher/ui/dialogs/VersionSelectDialog.cpp | 141 ++ launcher/ui/dialogs/VersionSelectDialog.h | 78 + .../ui/instanceview/AccessibleInstanceView.cpp | 778 ++++++++ launcher/ui/instanceview/AccessibleInstanceView.h | 6 + .../ui/instanceview/AccessibleInstanceView_p.h | 118 ++ launcher/ui/instanceview/InstanceDelegate.cpp | 428 +++++ launcher/ui/instanceview/InstanceDelegate.h | 39 + launcher/ui/instanceview/InstanceProxyModel.cpp | 71 + launcher/ui/instanceview/InstanceProxyModel.h | 35 + launcher/ui/instanceview/InstanceView.cpp | 1010 ++++++++++ launcher/ui/instanceview/InstanceView.h | 153 ++ launcher/ui/instanceview/VisualGroup.cpp | 317 ++++ launcher/ui/instanceview/VisualGroup.h | 106 ++ launcher/ui/pagedialog/PageDialog.cpp | 62 + launcher/ui/pagedialog/PageDialog.h | 35 + launcher/ui/pages/BasePage.h | 58 + launcher/ui/pages/BasePageContainer.h | 10 + launcher/ui/pages/BasePageProvider.h | 68 + launcher/ui/pages/global/AccountListPage.cpp | 260 +++ launcher/ui/pages/global/AccountListPage.h | 85 + launcher/ui/pages/global/AccountListPage.ui | 129 ++ launcher/ui/pages/global/CustomCommandsPage.cpp | 51 + launcher/ui/pages/global/CustomCommandsPage.h | 55 + launcher/ui/pages/global/ExternalToolsPage.cpp | 233 +++ launcher/ui/pages/global/ExternalToolsPage.h | 74 + launcher/ui/pages/global/ExternalToolsPage.ui | 194 ++ launcher/ui/pages/global/JavaPage.cpp | 153 ++ launcher/ui/pages/global/JavaPage.h | 72 + launcher/ui/pages/global/JavaPage.ui | 260 +++ launcher/ui/pages/global/LanguagePage.cpp | 51 + launcher/ui/pages/global/LanguagePage.h | 60 + launcher/ui/pages/global/LauncherPage.cpp | 466 +++++ launcher/ui/pages/global/LauncherPage.h | 103 ++ launcher/ui/pages/global/LauncherPage.ui | 584 ++++++ launcher/ui/pages/global/MinecraftPage.cpp | 91 + launcher/ui/pages/global/MinecraftPage.h | 70 + launcher/ui/pages/global/MinecraftPage.ui | 196 ++ launcher/ui/pages/global/PasteEEPage.cpp | 81 + launcher/ui/pages/global/PasteEEPage.h | 62 + launcher/ui/pages/global/PasteEEPage.ui | 128 ++ launcher/ui/pages/global/ProxyPage.cpp | 106 ++ launcher/ui/pages/global/ProxyPage.h | 66 + launcher/ui/pages/global/ProxyPage.ui | 203 ++ launcher/ui/pages/instance/GameOptionsPage.cpp | 37 + launcher/ui/pages/instance/GameOptionsPage.h | 63 + launcher/ui/pages/instance/GameOptionsPage.ui | 88 + .../ui/pages/instance/InstanceSettingsPage.cpp | 341 ++++ launcher/ui/pages/instance/InstanceSettingsPage.h | 76 + launcher/ui/pages/instance/InstanceSettingsPage.ui | 548 ++++++ launcher/ui/pages/instance/LegacyUpgradePage.cpp | 51 + launcher/ui/pages/instance/LegacyUpgradePage.h | 64 + launcher/ui/pages/instance/LegacyUpgradePage.ui | 47 + launcher/ui/pages/instance/LogPage.cpp | 330 ++++ launcher/ui/pages/instance/LogPage.h | 86 + launcher/ui/pages/instance/LogPage.ui | 182 ++ launcher/ui/pages/instance/ModFolderPage.cpp | 366 ++++ launcher/ui/pages/instance/ModFolderPage.h | 120 ++ launcher/ui/pages/instance/ModFolderPage.ui | 164 ++ launcher/ui/pages/instance/NotesPage.cpp | 21 + launcher/ui/pages/instance/NotesPage.h | 60 + launcher/ui/pages/instance/NotesPage.ui | 49 + launcher/ui/pages/instance/OtherLogsPage.cpp | 314 ++++ launcher/ui/pages/instance/OtherLogsPage.h | 81 + launcher/ui/pages/instance/OtherLogsPage.ui | 150 ++ launcher/ui/pages/instance/ResourcePackPage.h | 23 + launcher/ui/pages/instance/ScreenshotsPage.cpp | 423 +++++ launcher/ui/pages/instance/ScreenshotsPage.h | 89 + launcher/ui/pages/instance/ScreenshotsPage.ui | 87 + launcher/ui/pages/instance/ServersPage.cpp | 768 ++++++++ launcher/ui/pages/instance/ServersPage.h | 94 + launcher/ui/pages/instance/ServersPage.ui | 194 ++ launcher/ui/pages/instance/ShaderPackPage.h | 22 + launcher/ui/pages/instance/TexturePackPage.h | 22 + launcher/ui/pages/instance/VersionPage.cpp | 641 +++++++ launcher/ui/pages/instance/VersionPage.h | 104 ++ launcher/ui/pages/instance/VersionPage.ui | 285 +++ launcher/ui/pages/instance/WorldListPage.cpp | 412 +++++ launcher/ui/pages/instance/WorldListPage.h | 99 + launcher/ui/pages/instance/WorldListPage.ui | 161 ++ launcher/ui/pages/modplatform/ImportPage.cpp | 132 ++ launcher/ui/pages/modplatform/ImportPage.h | 70 + launcher/ui/pages/modplatform/ImportPage.ui | 52 + launcher/ui/pages/modplatform/VanillaPage.cpp | 103 ++ launcher/ui/pages/modplatform/VanillaPage.h | 75 + launcher/ui/pages/modplatform/VanillaPage.ui | 169 ++ .../modplatform/atlauncher/AtlFilterModel.cpp | 81 + .../pages/modplatform/atlauncher/AtlFilterModel.h | 34 + .../pages/modplatform/atlauncher/AtlListModel.cpp | 193 ++ .../ui/pages/modplatform/atlauncher/AtlListModel.h | 52 + .../atlauncher/AtlOptionalModDialog.cpp | 209 +++ .../modplatform/atlauncher/AtlOptionalModDialog.h | 66 + .../modplatform/atlauncher/AtlOptionalModDialog.ui | 65 + .../ui/pages/modplatform/atlauncher/AtlPage.cpp | 171 ++ launcher/ui/pages/modplatform/atlauncher/AtlPage.h | 86 + .../ui/pages/modplatform/atlauncher/AtlPage.ui | 92 + launcher/ui/pages/modplatform/flame/FlameModel.cpp | 258 +++ launcher/ui/pages/modplatform/flame/FlameModel.h | 76 + launcher/ui/pages/modplatform/flame/FlamePage.cpp | 186 ++ launcher/ui/pages/modplatform/flame/FlamePage.h | 80 + launcher/ui/pages/modplatform/flame/FlamePage.ui | 90 + .../ui/pages/modplatform/ftb/FtbFilterModel.cpp | 76 + launcher/ui/pages/modplatform/ftb/FtbFilterModel.h | 35 + launcher/ui/pages/modplatform/ftb/FtbListModel.cpp | 278 +++ launcher/ui/pages/modplatform/ftb/FtbListModel.h | 61 + launcher/ui/pages/modplatform/ftb/FtbPage.cpp | 150 ++ launcher/ui/pages/modplatform/ftb/FtbPage.h | 83 + launcher/ui/pages/modplatform/ftb/FtbPage.ui | 79 + .../ui/pages/modplatform/legacy_ftb/ListModel.cpp | 259 +++ .../ui/pages/modplatform/legacy_ftb/ListModel.h | 78 + launcher/ui/pages/modplatform/legacy_ftb/Page.cpp | 371 ++++ launcher/ui/pages/modplatform/legacy_ftb/Page.h | 119 ++ launcher/ui/pages/modplatform/legacy_ftb/Page.ui | 135 ++ .../ui/pages/modplatform/technic/TechnicData.h | 42 + .../ui/pages/modplatform/technic/TechnicModel.cpp | 237 +++ .../ui/pages/modplatform/technic/TechnicModel.h | 70 + .../ui/pages/modplatform/technic/TechnicPage.cpp | 201 ++ .../ui/pages/modplatform/technic/TechnicPage.h | 78 + .../ui/pages/modplatform/technic/TechnicPage.ui | 95 + launcher/ui/setupwizard/AnalyticsWizardPage.cpp | 63 + launcher/ui/setupwizard/AnalyticsWizardPage.h | 25 + launcher/ui/setupwizard/BaseWizardPage.h | 33 + launcher/ui/setupwizard/JavaWizardPage.cpp | 98 + launcher/ui/setupwizard/JavaWizardPage.h | 29 + launcher/ui/setupwizard/LanguageWizardPage.cpp | 49 + launcher/ui/setupwizard/LanguageWizardPage.h | 26 + launcher/ui/setupwizard/SetupWizard.cpp | 89 + launcher/ui/setupwizard/SetupWizard.h | 45 + launcher/ui/themes/BrightTheme.cpp | 56 + launcher/ui/themes/BrightTheme.h | 19 + launcher/ui/themes/CustomTheme.cpp | 244 +++ launcher/ui/themes/CustomTheme.h | 31 + launcher/ui/themes/DarkTheme.cpp | 55 + launcher/ui/themes/DarkTheme.h | 18 + launcher/ui/themes/FusionTheme.cpp | 6 + launcher/ui/themes/FusionTheme.h | 11 + launcher/ui/themes/ITheme.cpp | 47 + launcher/ui/themes/ITheme.h | 27 + launcher/ui/themes/SystemTheme.cpp | 83 + launcher/ui/themes/SystemTheme.h | 24 + launcher/ui/widgets/Common.cpp | 27 + launcher/ui/widgets/Common.h | 6 + launcher/ui/widgets/CustomCommands.cpp | 49 + launcher/ui/widgets/CustomCommands.h | 43 + launcher/ui/widgets/CustomCommands.ui | 107 ++ launcher/ui/widgets/DropLabel.cpp | 41 + launcher/ui/widgets/DropLabel.h | 20 + launcher/ui/widgets/FocusLineEdit.cpp | 25 + launcher/ui/widgets/FocusLineEdit.h | 17 + launcher/ui/widgets/IconLabel.cpp | 43 + launcher/ui/widgets/IconLabel.h | 26 + launcher/ui/widgets/InstanceCardWidget.ui | 58 + launcher/ui/widgets/JavaSettingsWidget.cpp | 432 +++++ launcher/ui/widgets/JavaSettingsWidget.h | 102 + launcher/ui/widgets/LabeledToolButton.cpp | 115 ++ launcher/ui/widgets/LabeledToolButton.h | 40 + launcher/ui/widgets/LanguageSelectionWidget.cpp | 66 + launcher/ui/widgets/LanguageSelectionWidget.h | 41 + launcher/ui/widgets/LineSeparator.cpp | 37 + launcher/ui/widgets/LineSeparator.h | 18 + launcher/ui/widgets/LogView.cpp | 144 ++ launcher/ui/widgets/LogView.h | 36 + launcher/ui/widgets/MCModInfoFrame.cpp | 168 ++ launcher/ui/widgets/MCModInfoFrame.h | 52 + launcher/ui/widgets/MCModInfoFrame.ui | 92 + launcher/ui/widgets/ModListView.cpp | 66 + launcher/ui/widgets/ModListView.h | 25 + launcher/ui/widgets/PageContainer.cpp | 240 +++ launcher/ui/widgets/PageContainer.h | 89 + launcher/ui/widgets/PageContainer_p.h | 123 ++ launcher/ui/widgets/ProgressWidget.cpp | 73 + launcher/ui/widgets/ProgressWidget.h | 32 + launcher/ui/widgets/VersionListView.cpp | 163 ++ launcher/ui/widgets/VersionListView.h | 56 + launcher/ui/widgets/VersionSelectWidget.cpp | 205 ++ launcher/ui/widgets/VersionSelectWidget.h | 81 + launcher/ui/widgets/WideBar.cpp | 116 ++ launcher/ui/widgets/WideBar.h | 26 + launcher/widgets/Common.cpp | 27 - launcher/widgets/Common.h | 6 - launcher/widgets/CustomCommands.cpp | 49 - launcher/widgets/CustomCommands.h | 43 - launcher/widgets/CustomCommands.ui | 107 -- launcher/widgets/DropLabel.cpp | 41 - launcher/widgets/DropLabel.h | 20 - launcher/widgets/FocusLineEdit.cpp | 25 - launcher/widgets/FocusLineEdit.h | 17 - launcher/widgets/IconLabel.cpp | 43 - launcher/widgets/IconLabel.h | 26 - launcher/widgets/InstanceCardWidget.ui | 58 - launcher/widgets/JavaSettingsWidget.cpp | 429 ----- launcher/widgets/JavaSettingsWidget.h | 102 - launcher/widgets/LabeledToolButton.cpp | 115 -- launcher/widgets/LabeledToolButton.h | 40 - launcher/widgets/LanguageSelectionWidget.cpp | 66 - launcher/widgets/LanguageSelectionWidget.h | 41 - launcher/widgets/LineSeparator.cpp | 37 - launcher/widgets/LineSeparator.h | 18 - launcher/widgets/LogView.cpp | 144 -- launcher/widgets/LogView.h | 36 - launcher/widgets/MCModInfoFrame.cpp | 167 -- launcher/widgets/MCModInfoFrame.h | 52 - launcher/widgets/MCModInfoFrame.ui | 92 - launcher/widgets/ModListView.cpp | 66 - launcher/widgets/ModListView.h | 25 - launcher/widgets/PageContainer.cpp | 239 --- launcher/widgets/PageContainer.h | 89 - launcher/widgets/PageContainer_p.h | 123 -- launcher/widgets/ProgressWidget.cpp | 73 - launcher/widgets/ProgressWidget.h | 32 - launcher/widgets/VersionListView.cpp | 163 -- launcher/widgets/VersionListView.h | 56 - launcher/widgets/VersionSelectWidget.cpp | 202 -- launcher/widgets/VersionSelectWidget.h | 81 - launcher/widgets/WideBar.cpp | 116 -- launcher/widgets/WideBar.h | 26 - 478 files changed, 31332 insertions(+), 31584 deletions(-) delete mode 100644 launcher/ColorCache.cpp delete mode 100644 launcher/ColorCache.h delete mode 100644 launcher/ColumnResizer.cpp delete mode 100644 launcher/ColumnResizer.h delete mode 100644 launcher/GuiUtil.cpp delete mode 100644 launcher/GuiUtil.h delete mode 100644 launcher/InstanceWindow.cpp delete mode 100644 launcher/InstanceWindow.h delete mode 100644 launcher/MainWindow.cpp delete mode 100644 launcher/MainWindow.h delete mode 100644 launcher/dialogs/AboutDialog.cpp delete mode 100644 launcher/dialogs/AboutDialog.h delete mode 100644 launcher/dialogs/AboutDialog.ui delete mode 100644 launcher/dialogs/CopyInstanceDialog.cpp delete mode 100644 launcher/dialogs/CopyInstanceDialog.h delete mode 100644 launcher/dialogs/CopyInstanceDialog.ui delete mode 100644 launcher/dialogs/CustomMessageBox.cpp delete mode 100644 launcher/dialogs/CustomMessageBox.h delete mode 100644 launcher/dialogs/EditAccountDialog.cpp delete mode 100644 launcher/dialogs/EditAccountDialog.h delete mode 100644 launcher/dialogs/EditAccountDialog.ui delete mode 100644 launcher/dialogs/ExportInstanceDialog.cpp delete mode 100644 launcher/dialogs/ExportInstanceDialog.h delete mode 100644 launcher/dialogs/ExportInstanceDialog.ui delete mode 100644 launcher/dialogs/IconPickerDialog.cpp delete mode 100644 launcher/dialogs/IconPickerDialog.h delete mode 100644 launcher/dialogs/IconPickerDialog.ui delete mode 100644 launcher/dialogs/LoginDialog.cpp delete mode 100644 launcher/dialogs/LoginDialog.h delete mode 100644 launcher/dialogs/LoginDialog.ui delete mode 100644 launcher/dialogs/MSALoginDialog.cpp delete mode 100644 launcher/dialogs/MSALoginDialog.h delete mode 100644 launcher/dialogs/MSALoginDialog.ui delete mode 100644 launcher/dialogs/NewComponentDialog.cpp delete mode 100644 launcher/dialogs/NewComponentDialog.h delete mode 100644 launcher/dialogs/NewComponentDialog.ui delete mode 100644 launcher/dialogs/NewInstanceDialog.cpp delete mode 100644 launcher/dialogs/NewInstanceDialog.h delete mode 100644 launcher/dialogs/NewInstanceDialog.ui delete mode 100644 launcher/dialogs/NotificationDialog.cpp delete mode 100644 launcher/dialogs/NotificationDialog.h delete mode 100644 launcher/dialogs/NotificationDialog.ui delete mode 100644 launcher/dialogs/ProfileSelectDialog.cpp delete mode 100644 launcher/dialogs/ProfileSelectDialog.h delete mode 100644 launcher/dialogs/ProfileSelectDialog.ui delete mode 100644 launcher/dialogs/ProfileSetupDialog.cpp delete mode 100644 launcher/dialogs/ProfileSetupDialog.h delete mode 100644 launcher/dialogs/ProfileSetupDialog.ui delete mode 100644 launcher/dialogs/ProgressDialog.cpp delete mode 100644 launcher/dialogs/ProgressDialog.h delete mode 100644 launcher/dialogs/ProgressDialog.ui delete mode 100644 launcher/dialogs/SkinUploadDialog.cpp delete mode 100644 launcher/dialogs/SkinUploadDialog.h delete mode 100644 launcher/dialogs/SkinUploadDialog.ui delete mode 100644 launcher/dialogs/UpdateDialog.cpp delete mode 100644 launcher/dialogs/UpdateDialog.h delete mode 100644 launcher/dialogs/UpdateDialog.ui delete mode 100644 launcher/dialogs/VersionSelectDialog.cpp delete mode 100644 launcher/dialogs/VersionSelectDialog.h delete mode 100644 launcher/instanceview/AccessibleInstanceView.cpp delete mode 100644 launcher/instanceview/AccessibleInstanceView.h delete mode 100644 launcher/instanceview/AccessibleInstanceView_p.h delete mode 100644 launcher/instanceview/InstanceDelegate.cpp delete mode 100644 launcher/instanceview/InstanceDelegate.h delete mode 100644 launcher/instanceview/InstanceProxyModel.cpp delete mode 100644 launcher/instanceview/InstanceProxyModel.h delete mode 100644 launcher/instanceview/InstanceView.cpp delete mode 100644 launcher/instanceview/InstanceView.h delete mode 100644 launcher/instanceview/VisualGroup.cpp delete mode 100644 launcher/instanceview/VisualGroup.h delete mode 100644 launcher/java/launch/CheckJava.cpp delete mode 100644 launcher/java/launch/CheckJava.h create mode 100644 launcher/launch/steps/CheckJava.cpp create mode 100644 launcher/launch/steps/CheckJava.h delete mode 100644 launcher/pagedialog/PageDialog.cpp delete mode 100644 launcher/pagedialog/PageDialog.h delete mode 100644 launcher/pages/BasePage.h delete mode 100644 launcher/pages/BasePageContainer.h delete mode 100644 launcher/pages/BasePageProvider.h delete mode 100644 launcher/pages/global/AccountListPage.cpp delete mode 100644 launcher/pages/global/AccountListPage.h delete mode 100644 launcher/pages/global/AccountListPage.ui delete mode 100644 launcher/pages/global/CustomCommandsPage.cpp delete mode 100644 launcher/pages/global/CustomCommandsPage.h delete mode 100644 launcher/pages/global/ExternalToolsPage.cpp delete mode 100644 launcher/pages/global/ExternalToolsPage.h delete mode 100644 launcher/pages/global/ExternalToolsPage.ui delete mode 100644 launcher/pages/global/JavaPage.cpp delete mode 100644 launcher/pages/global/JavaPage.h delete mode 100644 launcher/pages/global/JavaPage.ui delete mode 100644 launcher/pages/global/LanguagePage.cpp delete mode 100644 launcher/pages/global/LanguagePage.h delete mode 100644 launcher/pages/global/LauncherPage.cpp delete mode 100644 launcher/pages/global/LauncherPage.h delete mode 100644 launcher/pages/global/LauncherPage.ui delete mode 100644 launcher/pages/global/MinecraftPage.cpp delete mode 100644 launcher/pages/global/MinecraftPage.h delete mode 100644 launcher/pages/global/MinecraftPage.ui delete mode 100644 launcher/pages/global/PasteEEPage.cpp delete mode 100644 launcher/pages/global/PasteEEPage.h delete mode 100644 launcher/pages/global/PasteEEPage.ui delete mode 100644 launcher/pages/global/ProxyPage.cpp delete mode 100644 launcher/pages/global/ProxyPage.h delete mode 100644 launcher/pages/global/ProxyPage.ui delete mode 100644 launcher/pages/instance/GameOptionsPage.cpp delete mode 100644 launcher/pages/instance/GameOptionsPage.h delete mode 100644 launcher/pages/instance/GameOptionsPage.ui delete mode 100644 launcher/pages/instance/InstanceSettingsPage.cpp delete mode 100644 launcher/pages/instance/InstanceSettingsPage.h delete mode 100644 launcher/pages/instance/InstanceSettingsPage.ui delete mode 100644 launcher/pages/instance/LegacyUpgradePage.cpp delete mode 100644 launcher/pages/instance/LegacyUpgradePage.h delete mode 100644 launcher/pages/instance/LegacyUpgradePage.ui delete mode 100644 launcher/pages/instance/LogPage.cpp delete mode 100644 launcher/pages/instance/LogPage.h delete mode 100644 launcher/pages/instance/LogPage.ui delete mode 100644 launcher/pages/instance/ModFolderPage.cpp delete mode 100644 launcher/pages/instance/ModFolderPage.h delete mode 100644 launcher/pages/instance/ModFolderPage.ui delete mode 100644 launcher/pages/instance/NotesPage.cpp delete mode 100644 launcher/pages/instance/NotesPage.h delete mode 100644 launcher/pages/instance/NotesPage.ui delete mode 100644 launcher/pages/instance/OtherLogsPage.cpp delete mode 100644 launcher/pages/instance/OtherLogsPage.h delete mode 100644 launcher/pages/instance/OtherLogsPage.ui delete mode 100644 launcher/pages/instance/ResourcePackPage.h delete mode 100644 launcher/pages/instance/ScreenshotsPage.cpp delete mode 100644 launcher/pages/instance/ScreenshotsPage.h delete mode 100644 launcher/pages/instance/ScreenshotsPage.ui delete mode 100644 launcher/pages/instance/ServersPage.cpp delete mode 100644 launcher/pages/instance/ServersPage.h delete mode 100644 launcher/pages/instance/ServersPage.ui delete mode 100644 launcher/pages/instance/ShaderPackPage.h delete mode 100644 launcher/pages/instance/TexturePackPage.h delete mode 100644 launcher/pages/instance/VersionPage.cpp delete mode 100644 launcher/pages/instance/VersionPage.h delete mode 100644 launcher/pages/instance/VersionPage.ui delete mode 100644 launcher/pages/instance/WorldListPage.cpp delete mode 100644 launcher/pages/instance/WorldListPage.h delete mode 100644 launcher/pages/instance/WorldListPage.ui delete mode 100644 launcher/pages/modplatform/ImportPage.cpp delete mode 100644 launcher/pages/modplatform/ImportPage.h delete mode 100644 launcher/pages/modplatform/ImportPage.ui delete mode 100644 launcher/pages/modplatform/VanillaPage.cpp delete mode 100644 launcher/pages/modplatform/VanillaPage.h delete mode 100644 launcher/pages/modplatform/VanillaPage.ui delete mode 100644 launcher/pages/modplatform/atlauncher/AtlFilterModel.cpp delete mode 100644 launcher/pages/modplatform/atlauncher/AtlFilterModel.h delete mode 100644 launcher/pages/modplatform/atlauncher/AtlListModel.cpp delete mode 100644 launcher/pages/modplatform/atlauncher/AtlListModel.h delete mode 100644 launcher/pages/modplatform/atlauncher/AtlOptionalModDialog.cpp delete mode 100644 launcher/pages/modplatform/atlauncher/AtlOptionalModDialog.h delete mode 100644 launcher/pages/modplatform/atlauncher/AtlOptionalModDialog.ui delete mode 100644 launcher/pages/modplatform/atlauncher/AtlPage.cpp delete mode 100644 launcher/pages/modplatform/atlauncher/AtlPage.h delete mode 100644 launcher/pages/modplatform/atlauncher/AtlPage.ui delete mode 100644 launcher/pages/modplatform/flame/FlameModel.cpp delete mode 100644 launcher/pages/modplatform/flame/FlameModel.h delete mode 100644 launcher/pages/modplatform/flame/FlamePage.cpp delete mode 100644 launcher/pages/modplatform/flame/FlamePage.h delete mode 100644 launcher/pages/modplatform/flame/FlamePage.ui delete mode 100644 launcher/pages/modplatform/ftb/FtbFilterModel.cpp delete mode 100644 launcher/pages/modplatform/ftb/FtbFilterModel.h delete mode 100644 launcher/pages/modplatform/ftb/FtbListModel.cpp delete mode 100644 launcher/pages/modplatform/ftb/FtbListModel.h delete mode 100644 launcher/pages/modplatform/ftb/FtbPage.cpp delete mode 100644 launcher/pages/modplatform/ftb/FtbPage.h delete mode 100644 launcher/pages/modplatform/ftb/FtbPage.ui delete mode 100644 launcher/pages/modplatform/legacy_ftb/ListModel.cpp delete mode 100644 launcher/pages/modplatform/legacy_ftb/ListModel.h delete mode 100644 launcher/pages/modplatform/legacy_ftb/Page.cpp delete mode 100644 launcher/pages/modplatform/legacy_ftb/Page.h delete mode 100644 launcher/pages/modplatform/legacy_ftb/Page.ui delete mode 100644 launcher/pages/modplatform/technic/TechnicData.h delete mode 100644 launcher/pages/modplatform/technic/TechnicModel.cpp delete mode 100644 launcher/pages/modplatform/technic/TechnicModel.h delete mode 100644 launcher/pages/modplatform/technic/TechnicPage.cpp delete mode 100644 launcher/pages/modplatform/technic/TechnicPage.h delete mode 100644 launcher/pages/modplatform/technic/TechnicPage.ui delete mode 100644 launcher/setupwizard/AnalyticsWizardPage.cpp delete mode 100644 launcher/setupwizard/AnalyticsWizardPage.h delete mode 100644 launcher/setupwizard/BaseWizardPage.h delete mode 100644 launcher/setupwizard/JavaWizardPage.cpp delete mode 100644 launcher/setupwizard/JavaWizardPage.h delete mode 100644 launcher/setupwizard/LanguageWizardPage.cpp delete mode 100644 launcher/setupwizard/LanguageWizardPage.h delete mode 100644 launcher/setupwizard/SetupWizard.cpp delete mode 100644 launcher/setupwizard/SetupWizard.h delete mode 100644 launcher/themes/BrightTheme.cpp delete mode 100644 launcher/themes/BrightTheme.h delete mode 100644 launcher/themes/CustomTheme.cpp delete mode 100644 launcher/themes/CustomTheme.h delete mode 100644 launcher/themes/DarkTheme.cpp delete mode 100644 launcher/themes/DarkTheme.h delete mode 100644 launcher/themes/FusionTheme.cpp delete mode 100644 launcher/themes/FusionTheme.h delete mode 100644 launcher/themes/ITheme.cpp delete mode 100644 launcher/themes/ITheme.h delete mode 100644 launcher/themes/SystemTheme.cpp delete mode 100644 launcher/themes/SystemTheme.h create mode 100644 launcher/ui/ColorCache.cpp create mode 100644 launcher/ui/ColorCache.h create mode 100644 launcher/ui/GuiUtil.cpp create mode 100644 launcher/ui/GuiUtil.h create mode 100644 launcher/ui/InstanceWindow.cpp create mode 100644 launcher/ui/InstanceWindow.h create mode 100644 launcher/ui/MainWindow.cpp create mode 100644 launcher/ui/MainWindow.h create mode 100644 launcher/ui/dialogs/AboutDialog.cpp create mode 100644 launcher/ui/dialogs/AboutDialog.h create mode 100644 launcher/ui/dialogs/AboutDialog.ui create mode 100644 launcher/ui/dialogs/CopyInstanceDialog.cpp create mode 100644 launcher/ui/dialogs/CopyInstanceDialog.h create mode 100644 launcher/ui/dialogs/CopyInstanceDialog.ui create mode 100644 launcher/ui/dialogs/CustomMessageBox.cpp create mode 100644 launcher/ui/dialogs/CustomMessageBox.h create mode 100644 launcher/ui/dialogs/EditAccountDialog.cpp create mode 100644 launcher/ui/dialogs/EditAccountDialog.h create mode 100644 launcher/ui/dialogs/EditAccountDialog.ui create mode 100644 launcher/ui/dialogs/ExportInstanceDialog.cpp create mode 100644 launcher/ui/dialogs/ExportInstanceDialog.h create mode 100644 launcher/ui/dialogs/ExportInstanceDialog.ui create mode 100644 launcher/ui/dialogs/IconPickerDialog.cpp create mode 100644 launcher/ui/dialogs/IconPickerDialog.h create mode 100644 launcher/ui/dialogs/IconPickerDialog.ui create mode 100644 launcher/ui/dialogs/LoginDialog.cpp create mode 100644 launcher/ui/dialogs/LoginDialog.h create mode 100644 launcher/ui/dialogs/LoginDialog.ui create mode 100644 launcher/ui/dialogs/MSALoginDialog.cpp create mode 100644 launcher/ui/dialogs/MSALoginDialog.h create mode 100644 launcher/ui/dialogs/MSALoginDialog.ui create mode 100644 launcher/ui/dialogs/NewComponentDialog.cpp create mode 100644 launcher/ui/dialogs/NewComponentDialog.h create mode 100644 launcher/ui/dialogs/NewComponentDialog.ui create mode 100644 launcher/ui/dialogs/NewInstanceDialog.cpp create mode 100644 launcher/ui/dialogs/NewInstanceDialog.h create mode 100644 launcher/ui/dialogs/NewInstanceDialog.ui create mode 100644 launcher/ui/dialogs/NotificationDialog.cpp create mode 100644 launcher/ui/dialogs/NotificationDialog.h create mode 100644 launcher/ui/dialogs/NotificationDialog.ui create mode 100644 launcher/ui/dialogs/ProfileSelectDialog.cpp create mode 100644 launcher/ui/dialogs/ProfileSelectDialog.h create mode 100644 launcher/ui/dialogs/ProfileSelectDialog.ui create mode 100644 launcher/ui/dialogs/ProfileSetupDialog.cpp create mode 100644 launcher/ui/dialogs/ProfileSetupDialog.h create mode 100644 launcher/ui/dialogs/ProfileSetupDialog.ui create mode 100644 launcher/ui/dialogs/ProgressDialog.cpp create mode 100644 launcher/ui/dialogs/ProgressDialog.h create mode 100644 launcher/ui/dialogs/ProgressDialog.ui create mode 100644 launcher/ui/dialogs/SkinUploadDialog.cpp create mode 100644 launcher/ui/dialogs/SkinUploadDialog.h create mode 100644 launcher/ui/dialogs/SkinUploadDialog.ui create mode 100644 launcher/ui/dialogs/UpdateDialog.cpp create mode 100644 launcher/ui/dialogs/UpdateDialog.h create mode 100644 launcher/ui/dialogs/UpdateDialog.ui create mode 100644 launcher/ui/dialogs/VersionSelectDialog.cpp create mode 100644 launcher/ui/dialogs/VersionSelectDialog.h create mode 100644 launcher/ui/instanceview/AccessibleInstanceView.cpp create mode 100644 launcher/ui/instanceview/AccessibleInstanceView.h create mode 100644 launcher/ui/instanceview/AccessibleInstanceView_p.h create mode 100644 launcher/ui/instanceview/InstanceDelegate.cpp create mode 100644 launcher/ui/instanceview/InstanceDelegate.h create mode 100644 launcher/ui/instanceview/InstanceProxyModel.cpp create mode 100644 launcher/ui/instanceview/InstanceProxyModel.h create mode 100644 launcher/ui/instanceview/InstanceView.cpp create mode 100644 launcher/ui/instanceview/InstanceView.h create mode 100644 launcher/ui/instanceview/VisualGroup.cpp create mode 100644 launcher/ui/instanceview/VisualGroup.h create mode 100644 launcher/ui/pagedialog/PageDialog.cpp create mode 100644 launcher/ui/pagedialog/PageDialog.h create mode 100644 launcher/ui/pages/BasePage.h create mode 100644 launcher/ui/pages/BasePageContainer.h create mode 100644 launcher/ui/pages/BasePageProvider.h create mode 100644 launcher/ui/pages/global/AccountListPage.cpp create mode 100644 launcher/ui/pages/global/AccountListPage.h create mode 100644 launcher/ui/pages/global/AccountListPage.ui create mode 100644 launcher/ui/pages/global/CustomCommandsPage.cpp create mode 100644 launcher/ui/pages/global/CustomCommandsPage.h create mode 100644 launcher/ui/pages/global/ExternalToolsPage.cpp create mode 100644 launcher/ui/pages/global/ExternalToolsPage.h create mode 100644 launcher/ui/pages/global/ExternalToolsPage.ui create mode 100644 launcher/ui/pages/global/JavaPage.cpp create mode 100644 launcher/ui/pages/global/JavaPage.h create mode 100644 launcher/ui/pages/global/JavaPage.ui create mode 100644 launcher/ui/pages/global/LanguagePage.cpp create mode 100644 launcher/ui/pages/global/LanguagePage.h create mode 100644 launcher/ui/pages/global/LauncherPage.cpp create mode 100644 launcher/ui/pages/global/LauncherPage.h create mode 100644 launcher/ui/pages/global/LauncherPage.ui create mode 100644 launcher/ui/pages/global/MinecraftPage.cpp create mode 100644 launcher/ui/pages/global/MinecraftPage.h create mode 100644 launcher/ui/pages/global/MinecraftPage.ui create mode 100644 launcher/ui/pages/global/PasteEEPage.cpp create mode 100644 launcher/ui/pages/global/PasteEEPage.h create mode 100644 launcher/ui/pages/global/PasteEEPage.ui create mode 100644 launcher/ui/pages/global/ProxyPage.cpp create mode 100644 launcher/ui/pages/global/ProxyPage.h create mode 100644 launcher/ui/pages/global/ProxyPage.ui create mode 100644 launcher/ui/pages/instance/GameOptionsPage.cpp create mode 100644 launcher/ui/pages/instance/GameOptionsPage.h create mode 100644 launcher/ui/pages/instance/GameOptionsPage.ui create mode 100644 launcher/ui/pages/instance/InstanceSettingsPage.cpp create mode 100644 launcher/ui/pages/instance/InstanceSettingsPage.h create mode 100644 launcher/ui/pages/instance/InstanceSettingsPage.ui create mode 100644 launcher/ui/pages/instance/LegacyUpgradePage.cpp create mode 100644 launcher/ui/pages/instance/LegacyUpgradePage.h create mode 100644 launcher/ui/pages/instance/LegacyUpgradePage.ui create mode 100644 launcher/ui/pages/instance/LogPage.cpp create mode 100644 launcher/ui/pages/instance/LogPage.h create mode 100644 launcher/ui/pages/instance/LogPage.ui create mode 100644 launcher/ui/pages/instance/ModFolderPage.cpp create mode 100644 launcher/ui/pages/instance/ModFolderPage.h create mode 100644 launcher/ui/pages/instance/ModFolderPage.ui create mode 100644 launcher/ui/pages/instance/NotesPage.cpp create mode 100644 launcher/ui/pages/instance/NotesPage.h create mode 100644 launcher/ui/pages/instance/NotesPage.ui create mode 100644 launcher/ui/pages/instance/OtherLogsPage.cpp create mode 100644 launcher/ui/pages/instance/OtherLogsPage.h create mode 100644 launcher/ui/pages/instance/OtherLogsPage.ui create mode 100644 launcher/ui/pages/instance/ResourcePackPage.h create mode 100644 launcher/ui/pages/instance/ScreenshotsPage.cpp create mode 100644 launcher/ui/pages/instance/ScreenshotsPage.h create mode 100644 launcher/ui/pages/instance/ScreenshotsPage.ui create mode 100644 launcher/ui/pages/instance/ServersPage.cpp create mode 100644 launcher/ui/pages/instance/ServersPage.h create mode 100644 launcher/ui/pages/instance/ServersPage.ui create mode 100644 launcher/ui/pages/instance/ShaderPackPage.h create mode 100644 launcher/ui/pages/instance/TexturePackPage.h create mode 100644 launcher/ui/pages/instance/VersionPage.cpp create mode 100644 launcher/ui/pages/instance/VersionPage.h create mode 100644 launcher/ui/pages/instance/VersionPage.ui create mode 100644 launcher/ui/pages/instance/WorldListPage.cpp create mode 100644 launcher/ui/pages/instance/WorldListPage.h create mode 100644 launcher/ui/pages/instance/WorldListPage.ui create mode 100644 launcher/ui/pages/modplatform/ImportPage.cpp create mode 100644 launcher/ui/pages/modplatform/ImportPage.h create mode 100644 launcher/ui/pages/modplatform/ImportPage.ui create mode 100644 launcher/ui/pages/modplatform/VanillaPage.cpp create mode 100644 launcher/ui/pages/modplatform/VanillaPage.h create mode 100644 launcher/ui/pages/modplatform/VanillaPage.ui create mode 100644 launcher/ui/pages/modplatform/atlauncher/AtlFilterModel.cpp create mode 100644 launcher/ui/pages/modplatform/atlauncher/AtlFilterModel.h create mode 100644 launcher/ui/pages/modplatform/atlauncher/AtlListModel.cpp create mode 100644 launcher/ui/pages/modplatform/atlauncher/AtlListModel.h create mode 100644 launcher/ui/pages/modplatform/atlauncher/AtlOptionalModDialog.cpp create mode 100644 launcher/ui/pages/modplatform/atlauncher/AtlOptionalModDialog.h create mode 100644 launcher/ui/pages/modplatform/atlauncher/AtlOptionalModDialog.ui create mode 100644 launcher/ui/pages/modplatform/atlauncher/AtlPage.cpp create mode 100644 launcher/ui/pages/modplatform/atlauncher/AtlPage.h create mode 100644 launcher/ui/pages/modplatform/atlauncher/AtlPage.ui create mode 100644 launcher/ui/pages/modplatform/flame/FlameModel.cpp create mode 100644 launcher/ui/pages/modplatform/flame/FlameModel.h create mode 100644 launcher/ui/pages/modplatform/flame/FlamePage.cpp create mode 100644 launcher/ui/pages/modplatform/flame/FlamePage.h create mode 100644 launcher/ui/pages/modplatform/flame/FlamePage.ui create mode 100644 launcher/ui/pages/modplatform/ftb/FtbFilterModel.cpp create mode 100644 launcher/ui/pages/modplatform/ftb/FtbFilterModel.h create mode 100644 launcher/ui/pages/modplatform/ftb/FtbListModel.cpp create mode 100644 launcher/ui/pages/modplatform/ftb/FtbListModel.h create mode 100644 launcher/ui/pages/modplatform/ftb/FtbPage.cpp create mode 100644 launcher/ui/pages/modplatform/ftb/FtbPage.h create mode 100644 launcher/ui/pages/modplatform/ftb/FtbPage.ui create mode 100644 launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp create mode 100644 launcher/ui/pages/modplatform/legacy_ftb/ListModel.h create mode 100644 launcher/ui/pages/modplatform/legacy_ftb/Page.cpp create mode 100644 launcher/ui/pages/modplatform/legacy_ftb/Page.h create mode 100644 launcher/ui/pages/modplatform/legacy_ftb/Page.ui create mode 100644 launcher/ui/pages/modplatform/technic/TechnicData.h create mode 100644 launcher/ui/pages/modplatform/technic/TechnicModel.cpp create mode 100644 launcher/ui/pages/modplatform/technic/TechnicModel.h create mode 100644 launcher/ui/pages/modplatform/technic/TechnicPage.cpp create mode 100644 launcher/ui/pages/modplatform/technic/TechnicPage.h create mode 100644 launcher/ui/pages/modplatform/technic/TechnicPage.ui create mode 100644 launcher/ui/setupwizard/AnalyticsWizardPage.cpp create mode 100644 launcher/ui/setupwizard/AnalyticsWizardPage.h create mode 100644 launcher/ui/setupwizard/BaseWizardPage.h create mode 100644 launcher/ui/setupwizard/JavaWizardPage.cpp create mode 100644 launcher/ui/setupwizard/JavaWizardPage.h create mode 100644 launcher/ui/setupwizard/LanguageWizardPage.cpp create mode 100644 launcher/ui/setupwizard/LanguageWizardPage.h create mode 100644 launcher/ui/setupwizard/SetupWizard.cpp create mode 100644 launcher/ui/setupwizard/SetupWizard.h create mode 100644 launcher/ui/themes/BrightTheme.cpp create mode 100644 launcher/ui/themes/BrightTheme.h create mode 100644 launcher/ui/themes/CustomTheme.cpp create mode 100644 launcher/ui/themes/CustomTheme.h create mode 100644 launcher/ui/themes/DarkTheme.cpp create mode 100644 launcher/ui/themes/DarkTheme.h create mode 100644 launcher/ui/themes/FusionTheme.cpp create mode 100644 launcher/ui/themes/FusionTheme.h create mode 100644 launcher/ui/themes/ITheme.cpp create mode 100644 launcher/ui/themes/ITheme.h create mode 100644 launcher/ui/themes/SystemTheme.cpp create mode 100644 launcher/ui/themes/SystemTheme.h create mode 100644 launcher/ui/widgets/Common.cpp create mode 100644 launcher/ui/widgets/Common.h create mode 100644 launcher/ui/widgets/CustomCommands.cpp create mode 100644 launcher/ui/widgets/CustomCommands.h create mode 100644 launcher/ui/widgets/CustomCommands.ui create mode 100644 launcher/ui/widgets/DropLabel.cpp create mode 100644 launcher/ui/widgets/DropLabel.h create mode 100644 launcher/ui/widgets/FocusLineEdit.cpp create mode 100644 launcher/ui/widgets/FocusLineEdit.h create mode 100644 launcher/ui/widgets/IconLabel.cpp create mode 100644 launcher/ui/widgets/IconLabel.h create mode 100644 launcher/ui/widgets/InstanceCardWidget.ui create mode 100644 launcher/ui/widgets/JavaSettingsWidget.cpp create mode 100644 launcher/ui/widgets/JavaSettingsWidget.h create mode 100644 launcher/ui/widgets/LabeledToolButton.cpp create mode 100644 launcher/ui/widgets/LabeledToolButton.h create mode 100644 launcher/ui/widgets/LanguageSelectionWidget.cpp create mode 100644 launcher/ui/widgets/LanguageSelectionWidget.h create mode 100644 launcher/ui/widgets/LineSeparator.cpp create mode 100644 launcher/ui/widgets/LineSeparator.h create mode 100644 launcher/ui/widgets/LogView.cpp create mode 100644 launcher/ui/widgets/LogView.h create mode 100644 launcher/ui/widgets/MCModInfoFrame.cpp create mode 100644 launcher/ui/widgets/MCModInfoFrame.h create mode 100644 launcher/ui/widgets/MCModInfoFrame.ui create mode 100644 launcher/ui/widgets/ModListView.cpp create mode 100644 launcher/ui/widgets/ModListView.h create mode 100644 launcher/ui/widgets/PageContainer.cpp create mode 100644 launcher/ui/widgets/PageContainer.h create mode 100644 launcher/ui/widgets/PageContainer_p.h create mode 100644 launcher/ui/widgets/ProgressWidget.cpp create mode 100644 launcher/ui/widgets/ProgressWidget.h create mode 100644 launcher/ui/widgets/VersionListView.cpp create mode 100644 launcher/ui/widgets/VersionListView.h create mode 100644 launcher/ui/widgets/VersionSelectWidget.cpp create mode 100644 launcher/ui/widgets/VersionSelectWidget.h create mode 100644 launcher/ui/widgets/WideBar.cpp create mode 100644 launcher/ui/widgets/WideBar.h delete mode 100644 launcher/widgets/Common.cpp delete mode 100644 launcher/widgets/Common.h delete mode 100644 launcher/widgets/CustomCommands.cpp delete mode 100644 launcher/widgets/CustomCommands.h delete mode 100644 launcher/widgets/CustomCommands.ui delete mode 100644 launcher/widgets/DropLabel.cpp delete mode 100644 launcher/widgets/DropLabel.h delete mode 100644 launcher/widgets/FocusLineEdit.cpp delete mode 100644 launcher/widgets/FocusLineEdit.h delete mode 100644 launcher/widgets/IconLabel.cpp delete mode 100644 launcher/widgets/IconLabel.h delete mode 100644 launcher/widgets/InstanceCardWidget.ui delete mode 100644 launcher/widgets/JavaSettingsWidget.cpp delete mode 100644 launcher/widgets/JavaSettingsWidget.h delete mode 100644 launcher/widgets/LabeledToolButton.cpp delete mode 100644 launcher/widgets/LabeledToolButton.h delete mode 100644 launcher/widgets/LanguageSelectionWidget.cpp delete mode 100644 launcher/widgets/LanguageSelectionWidget.h delete mode 100644 launcher/widgets/LineSeparator.cpp delete mode 100644 launcher/widgets/LineSeparator.h delete mode 100644 launcher/widgets/LogView.cpp delete mode 100644 launcher/widgets/LogView.h delete mode 100644 launcher/widgets/MCModInfoFrame.cpp delete mode 100644 launcher/widgets/MCModInfoFrame.h delete mode 100644 launcher/widgets/MCModInfoFrame.ui delete mode 100644 launcher/widgets/ModListView.cpp delete mode 100644 launcher/widgets/ModListView.h delete mode 100644 launcher/widgets/PageContainer.cpp delete mode 100644 launcher/widgets/PageContainer.h delete mode 100644 launcher/widgets/PageContainer_p.h delete mode 100644 launcher/widgets/ProgressWidget.cpp delete mode 100644 launcher/widgets/ProgressWidget.h delete mode 100644 launcher/widgets/VersionListView.cpp delete mode 100644 launcher/widgets/VersionListView.h delete mode 100644 launcher/widgets/VersionSelectWidget.cpp delete mode 100644 launcher/widgets/VersionSelectWidget.h delete mode 100644 launcher/widgets/WideBar.cpp delete mode 100644 launcher/widgets/WideBar.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 0cf93758..5e3022ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,6 +24,8 @@ endif() ##################################### Set CMake options ##################################### set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/") diff --git a/launcher/Application.cpp b/launcher/Application.cpp index 7a266213..37724038 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -1,36 +1,42 @@ #include "Application.h" #include "BuildConfig.h" -#include "MainWindow.h" -#include "InstanceWindow.h" -#include "instanceview/AccessibleInstanceView.h" -#include +#include "ui/MainWindow.h" +#include "ui/InstanceWindow.h" -#include "pages/BasePageProvider.h" -#include "pages/global/LauncherPage.h" -#include "pages/global/MinecraftPage.h" -#include "pages/global/JavaPage.h" -#include "pages/global/LanguagePage.h" -#include "pages/global/ProxyPage.h" -#include "pages/global/ExternalToolsPage.h" -#include "pages/global/AccountListPage.h" -#include "pages/global/PasteEEPage.h" -#include "pages/global/CustomCommandsPage.h" - -#include "themes/ITheme.h" -#include "themes/SystemTheme.h" -#include "themes/DarkTheme.h" -#include "themes/BrightTheme.h" -#include "themes/CustomTheme.h" +#include "ui/instanceview/AccessibleInstanceView.h" -#include "ApplicationMessage.h" +#include "ui/pages/BasePageProvider.h" +#include "ui/pages/global/LauncherPage.h" +#include "ui/pages/global/MinecraftPage.h" +#include "ui/pages/global/JavaPage.h" +#include "ui/pages/global/LanguagePage.h" +#include "ui/pages/global/ProxyPage.h" +#include "ui/pages/global/ExternalToolsPage.h" +#include "ui/pages/global/AccountListPage.h" +#include "ui/pages/global/PasteEEPage.h" +#include "ui/pages/global/CustomCommandsPage.h" + +#include "ui/themes/ITheme.h" +#include "ui/themes/SystemTheme.h" +#include "ui/themes/DarkTheme.h" +#include "ui/themes/BrightTheme.h" +#include "ui/themes/CustomTheme.h" + +#include "ui/setupwizard/SetupWizard.h" +#include "ui/setupwizard/LanguageWizardPage.h" +#include "ui/setupwizard/JavaWizardPage.h" +#include "ui/setupwizard/AnalyticsWizardPage.h" + +#include "ui/dialogs/CustomMessageBox.h" -#include "setupwizard/SetupWizard.h" -#include "setupwizard/LanguageWizardPage.h" -#include "setupwizard/JavaWizardPage.h" -#include "setupwizard/AnalyticsWizardPage.h" +#include "ui/pagedialog/PageDialog.h" + +#include "ApplicationMessage.h" #include + +#include #include #include #include @@ -41,7 +47,6 @@ #include #include -#include "dialogs/CustomMessageBox.h" #include "InstanceList.h" #include @@ -71,7 +76,6 @@ #include #include -#include "pagedialog/PageDialog.h" #include diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index f2f42ab0..601f3b11 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -128,6 +128,8 @@ set(NET_SOURCES # Game launch logic set(LAUNCH_SOURCES + launch/steps/CheckJava.cpp + launch/steps/CheckJava.h launch/steps/LookupServerAddress.cpp launch/steps/LookupServerAddress.h launch/steps/PostLaunchCommand.cpp @@ -419,9 +421,6 @@ add_unit_test(INIFile ) set(JAVA_SOURCES - # Java related code - java/launch/CheckJava.cpp - java/launch/CheckJava.h java/JavaChecker.h java/JavaChecker.cpp java/JavaCheckerJob.h @@ -568,20 +567,27 @@ SET(LAUNCHER_SOURCES # GUI - general utilities DesktopServices.h DesktopServices.cpp - GuiUtil.h - GuiUtil.cpp - ColumnResizer.h - ColumnResizer.cpp VersionProxyModel.h VersionProxyModel.cpp - ColorCache.h - ColorCache.cpp HoeDown.h # Super secret! KonamiCode.h KonamiCode.cpp + # Bundled resources + resources/backgrounds/backgrounds.qrc + resources/multimc/multimc.qrc + resources/pe_dark/pe_dark.qrc + resources/pe_light/pe_light.qrc + resources/pe_colored/pe_colored.qrc + resources/pe_blue/pe_blue.qrc + resources/OSX/OSX.qrc + resources/iOS/iOS.qrc + resources/flat/flat.qrc + resources/documents/documents.qrc + ../${Launcher_Branding_LogoQRC} + # Icons icons/MMCIcon.h icons/MMCIcon.cpp @@ -589,39 +595,43 @@ SET(LAUNCHER_SOURCES icons/IconList.cpp # GUI - windows - MainWindow.h - MainWindow.cpp - InstanceWindow.h - InstanceWindow.cpp + ui/GuiUtil.h + ui/GuiUtil.cpp + ui/ColorCache.h + ui/ColorCache.cpp + ui/MainWindow.h + ui/MainWindow.cpp + ui/InstanceWindow.h + ui/InstanceWindow.cpp # FIXME: maybe find a better home for this. SkinUtils.cpp SkinUtils.h # GUI - setup wizard - setupwizard/SetupWizard.h - setupwizard/SetupWizard.cpp - setupwizard/AnalyticsWizardPage.cpp - setupwizard/AnalyticsWizardPage.h - setupwizard/BaseWizardPage.h - setupwizard/JavaWizardPage.cpp - setupwizard/JavaWizardPage.h - setupwizard/LanguageWizardPage.cpp - setupwizard/LanguageWizardPage.h + ui/setupwizard/SetupWizard.h + ui/setupwizard/SetupWizard.cpp + ui/setupwizard/AnalyticsWizardPage.cpp + ui/setupwizard/AnalyticsWizardPage.h + ui/setupwizard/BaseWizardPage.h + ui/setupwizard/JavaWizardPage.cpp + ui/setupwizard/JavaWizardPage.h + ui/setupwizard/LanguageWizardPage.cpp + ui/setupwizard/LanguageWizardPage.h # GUI - themes - themes/FusionTheme.cpp - themes/FusionTheme.h - themes/BrightTheme.cpp - themes/BrightTheme.h - themes/CustomTheme.cpp - themes/CustomTheme.h - themes/DarkTheme.cpp - themes/DarkTheme.h - themes/ITheme.cpp - themes/ITheme.h - themes/SystemTheme.cpp - themes/SystemTheme.h + ui/themes/FusionTheme.cpp + ui/themes/FusionTheme.h + ui/themes/BrightTheme.cpp + ui/themes/BrightTheme.h + ui/themes/CustomTheme.cpp + ui/themes/CustomTheme.h + ui/themes/DarkTheme.cpp + ui/themes/DarkTheme.h + ui/themes/ITheme.cpp + ui/themes/ITheme.h + ui/themes/SystemTheme.cpp + ui/themes/SystemTheme.h # Processes LaunchController.h @@ -635,255 +645,183 @@ SET(LAUNCHER_SOURCES JavaCommon.cpp # GUI - paged dialog base - pages/BasePage.h - pages/BasePageContainer.h - pages/BasePageProvider.h + ui/pages/BasePage.h + ui/pages/BasePageContainer.h + ui/pages/BasePageProvider.h # GUI - instance pages - pages/instance/GameOptionsPage.cpp - pages/instance/GameOptionsPage.h - pages/instance/VersionPage.cpp - pages/instance/VersionPage.h - pages/instance/TexturePackPage.h - pages/instance/ResourcePackPage.h - pages/instance/ShaderPackPage.h - pages/instance/ModFolderPage.cpp - pages/instance/ModFolderPage.h - pages/instance/NotesPage.cpp - pages/instance/NotesPage.h - pages/instance/LogPage.cpp - pages/instance/LogPage.h - pages/instance/InstanceSetting