Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin
This commit is contained in:
commit
47af33ff6f
74 changed files with 3084 additions and 3904 deletions
|
@ -909,7 +909,6 @@ SET(LAUNCHER_SOURCES
|
|||
ui/pages/instance/NotesPage.h
|
||||
ui/pages/instance/LogPage.cpp
|
||||
ui/pages/instance/LogPage.h
|
||||
ui/pages/instance/InstanceSettingsPage.cpp
|
||||
ui/pages/instance/InstanceSettingsPage.h
|
||||
ui/pages/instance/ScreenshotsPage.cpp
|
||||
ui/pages/instance/ScreenshotsPage.h
|
||||
|
@ -923,17 +922,12 @@ SET(LAUNCHER_SOURCES
|
|||
# GUI - global settings pages
|
||||
ui/pages/global/AccountListPage.cpp
|
||||
ui/pages/global/AccountListPage.h
|
||||
ui/pages/global/CustomCommandsPage.cpp
|
||||
ui/pages/global/CustomCommandsPage.h
|
||||
ui/pages/global/EnvironmentVariablesPage.cpp
|
||||
ui/pages/global/EnvironmentVariablesPage.h
|
||||
ui/pages/global/ExternalToolsPage.cpp
|
||||
ui/pages/global/ExternalToolsPage.h
|
||||
ui/pages/global/JavaPage.cpp
|
||||
ui/pages/global/JavaPage.h
|
||||
ui/pages/global/LanguagePage.cpp
|
||||
ui/pages/global/LanguagePage.h
|
||||
ui/pages/global/MinecraftPage.cpp
|
||||
ui/pages/global/MinecraftPage.h
|
||||
ui/pages/global/LauncherPage.cpp
|
||||
ui/pages/global/LauncherPage.h
|
||||
|
@ -1031,8 +1025,6 @@ SET(LAUNCHER_SOURCES
|
|||
ui/dialogs/CopyInstanceDialog.h
|
||||
ui/dialogs/CustomMessageBox.cpp
|
||||
ui/dialogs/CustomMessageBox.h
|
||||
ui/dialogs/EditAccountDialog.cpp
|
||||
ui/dialogs/EditAccountDialog.h
|
||||
ui/dialogs/ExportInstanceDialog.cpp
|
||||
ui/dialogs/ExportInstanceDialog.h
|
||||
ui/dialogs/ExportPackDialog.cpp
|
||||
|
@ -1097,8 +1089,8 @@ SET(LAUNCHER_SOURCES
|
|||
ui/widgets/FocusLineEdit.h
|
||||
ui/widgets/IconLabel.cpp
|
||||
ui/widgets/IconLabel.h
|
||||
ui/widgets/JavaSettingsWidget.cpp
|
||||
ui/widgets/JavaSettingsWidget.h
|
||||
ui/widgets/JavaWizardWidget.cpp
|
||||
ui/widgets/JavaWizardWidget.h
|
||||
ui/widgets/LabeledToolButton.cpp
|
||||
ui/widgets/LabeledToolButton.h
|
||||
ui/widgets/LanguageSelectionWidget.cpp
|
||||
|
@ -1134,6 +1126,10 @@ SET(LAUNCHER_SOURCES
|
|||
ui/widgets/WideBar.cpp
|
||||
ui/widgets/ThemeCustomizationWidget.h
|
||||
ui/widgets/ThemeCustomizationWidget.cpp
|
||||
ui/widgets/MinecraftSettingsWidget.h
|
||||
ui/widgets/MinecraftSettingsWidget.cpp
|
||||
ui/widgets/JavaSettingsWidget.h
|
||||
ui/widgets/JavaSettingsWidget.cpp
|
||||
|
||||
# GUI - instance group view
|
||||
ui/instanceview/InstanceProxyModel.cpp
|
||||
|
@ -1177,7 +1173,6 @@ qt_wrap_ui(LAUNCHER_UI
|
|||
ui/pages/global/LauncherPage.ui
|
||||
ui/pages/global/APIPage.ui
|
||||
ui/pages/global/ProxyPage.ui
|
||||
ui/pages/global/MinecraftPage.ui
|
||||
ui/pages/global/ExternalToolsPage.ui
|
||||
ui/pages/instance/ExternalResourcesPage.ui
|
||||
ui/pages/instance/NotesPage.ui
|
||||
|
@ -1185,7 +1180,6 @@ qt_wrap_ui(LAUNCHER_UI
|
|||
ui/pages/instance/ServersPage.ui
|
||||
ui/pages/instance/GameOptionsPage.ui
|
||||
ui/pages/instance/OtherLogsPage.ui
|
||||
ui/pages/instance/InstanceSettingsPage.ui
|
||||
ui/pages/instance/VersionPage.ui
|
||||
ui/pages/instance/ManagedPackPage.ui
|
||||
ui/pages/instance/WorldListPage.ui
|
||||
|
@ -1208,6 +1202,8 @@ qt_wrap_ui(LAUNCHER_UI
|
|||
ui/widgets/ModFilterWidget.ui
|
||||
ui/widgets/SubTaskProgressBar.ui
|
||||
ui/widgets/ThemeCustomizationWidget.ui
|
||||
ui/widgets/MinecraftSettingsWidget.ui
|
||||
ui/widgets/JavaSettingsWidget.ui
|
||||
ui/dialogs/CopyInstanceDialog.ui
|
||||
ui/dialogs/ProfileSetupDialog.ui
|
||||
ui/dialogs/ProgressDialog.ui
|
||||
|
@ -1223,12 +1219,10 @@ qt_wrap_ui(LAUNCHER_UI
|
|||
ui/dialogs/MSALoginDialog.ui
|
||||
ui/dialogs/OfflineLoginDialog.ui
|
||||
ui/dialogs/AboutDialog.ui
|
||||
ui/dialogs/EditAccountDialog.ui
|
||||
ui/dialogs/ReviewMessageBox.ui
|
||||
ui/dialogs/ScrollMessageBox.ui
|
||||
ui/dialogs/BlockedModsDialog.ui
|
||||
ui/dialogs/ChooseProviderDialog.ui
|
||||
|
||||
ui/dialogs/skins/SkinManageDialog.ui
|
||||
)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue