aboutsummaryrefslogtreecommitdiff
path: root/launcher
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2021-10-13 01:59:25 +0200
committerPetr Mrázek <peterix@gmail.com>2021-10-21 00:47:53 +0200
commit441ab7eedcb8fe120a7f934684ed5545cdd7a4b6 (patch)
tree5a1a93e871f5172b3f087e9eb04bf6918bd34ec7 /launcher
parent6a4130c9149deb029b496c81e3b874ad834c54b7 (diff)
downloadPrismLauncher-441ab7eedcb8fe120a7f934684ed5545cdd7a4b6.tar.gz
PrismLauncher-441ab7eedcb8fe120a7f934684ed5545cdd7a4b6.tar.bz2
PrismLauncher-441ab7eedcb8fe120a7f934684ed5545cdd7a4b6.zip
NOISSUE debranding for real, initial work
This is probably very broken on macOS and Windows and will need a lot of work to complete fully.
Diffstat (limited to 'launcher')
-rw-r--r--launcher/BaseInstance.h2
-rw-r--r--launcher/CMakeLists.txt78
-rw-r--r--launcher/Env.h2
-rw-r--r--launcher/GuiUtil.cpp4
-rw-r--r--launcher/InstanceList.cpp2
-rw-r--r--launcher/InstanceProxyModel.cpp6
-rw-r--r--launcher/InstanceWindow.cpp18
-rw-r--r--launcher/LaunchController.cpp10
-rw-r--r--launcher/Launcher.cpp (renamed from launcher/MultiMC.cpp)108
-rw-r--r--launcher/Launcher.h (renamed from launcher/MultiMC.h)14
-rwxr-xr-xlauncher/Launcher.in (renamed from launcher/package/linux/MultiMC)37
-rw-r--r--launcher/MainWindow.cpp198
-rw-r--r--launcher/VersionProxyModel.cpp8
-rw-r--r--launcher/dialogs/AboutDialog.cpp4
-rw-r--r--launcher/dialogs/CopyInstanceDialog.cpp10
-rw-r--r--launcher/dialogs/ExportInstanceDialog.cpp4
-rw-r--r--launcher/dialogs/IconPickerDialog.cpp12
-rw-r--r--launcher/dialogs/NewComponentDialog.cpp4
-rw-r--r--launcher/dialogs/NewInstanceDialog.cpp24
-rw-r--r--launcher/dialogs/ProfileSelectDialog.cpp4
-rw-r--r--launcher/dialogs/UpdateDialog.cpp12
-rw-r--r--launcher/dialogs/VersionSelectDialog.cpp2
-rw-r--r--launcher/main.cpp12
-rw-r--r--launcher/minecraft/OneSixVersionFormat.cpp18
-rwxr-xr-xlauncher/package/linux/multimc.desktop11
-rw-r--r--launcher/pagedialog/PageDialog.cpp6
-rw-r--r--launcher/pages/global/AccountListPage.cpp4
-rw-r--r--launcher/pages/global/AccountListPage.h6
-rw-r--r--launcher/pages/global/CustomCommandsPage.cpp4
-rw-r--r--launcher/pages/global/CustomCommandsPage.h4
-rw-r--r--launcher/pages/global/ExternalToolsPage.cpp18
-rw-r--r--launcher/pages/global/ExternalToolsPage.h6
-rw-r--r--launcher/pages/global/JavaPage.cpp8
-rw-r--r--launcher/pages/global/JavaPage.h4
-rw-r--r--launcher/pages/global/LanguagePage.cpp2
-rw-r--r--launcher/pages/global/LanguagePage.h4
-rw-r--r--launcher/pages/global/LauncherPage.cpp (renamed from launcher/pages/global/MultiMCPage.cpp)58
-rw-r--r--launcher/pages/global/LauncherPage.h (renamed from launcher/pages/global/MultiMCPage.h)14
-rw-r--r--launcher/pages/global/LauncherPage.ui (renamed from launcher/pages/global/MultiMCPage.ui)4
-rw-r--r--launcher/pages/global/MinecraftPage.cpp6
-rw-r--r--launcher/pages/global/MinecraftPage.h4
-rw-r--r--launcher/pages/global/PasteEEPage.cpp6
-rw-r--r--launcher/pages/global/PasteEEPage.h4
-rw-r--r--launcher/pages/global/ProxyPage.cpp6
-rw-r--r--launcher/pages/global/ProxyPage.h4
-rw-r--r--launcher/pages/instance/GameOptionsPage.h4
-rw-r--r--launcher/pages/instance/InstanceSettingsPage.cpp14
-rw-r--r--launcher/pages/instance/InstanceSettingsPage.h4
-rw-r--r--launcher/pages/instance/LegacyUpgradePage.cpp6
-rw-r--r--launcher/pages/instance/LegacyUpgradePage.h4
-rw-r--r--launcher/pages/instance/LogPage.cpp6
-rw-r--r--launcher/pages/instance/LogPage.h4
-rw-r--r--launcher/pages/instance/ModFolderPage.cpp4
-rw-r--r--launcher/pages/instance/ModFolderPage.h4
-rw-r--r--launcher/pages/instance/NotesPage.h6
-rw-r--r--launcher/pages/instance/OtherLogsPage.cpp4
-rw-r--r--launcher/pages/instance/OtherLogsPage.h4
-rw-r--r--launcher/pages/instance/ScreenshotsPage.cpp4
-rw-r--r--launcher/pages/instance/ScreenshotsPage.h4
-rw-r--r--launcher/pages/instance/ServersPage.cpp4
-rw-r--r--launcher/pages/instance/ServersPage.h4
-rw-r--r--launcher/pages/instance/VersionPage.cpp18
-rw-r--r--launcher/pages/instance/WorldListPage.cpp8
-rw-r--r--launcher/pages/instance/WorldListPage.h4
-rw-r--r--launcher/pages/modplatform/ImportPage.cpp2
-rw-r--r--launcher/pages/modplatform/ImportPage.h4
-rw-r--r--launcher/pages/modplatform/VanillaPage.cpp2
-rw-r--r--launcher/pages/modplatform/VanillaPage.h4
-rw-r--r--launcher/pages/modplatform/atlauncher/AtlListModel.cpp4
-rw-r--r--launcher/pages/modplatform/atlauncher/AtlPage.cpp2
-rw-r--r--launcher/pages/modplatform/atlauncher/AtlPage.h4
-rw-r--r--launcher/pages/modplatform/flame/FlameModel.cpp4
-rw-r--r--launcher/pages/modplatform/flame/FlamePage.cpp2
-rw-r--r--launcher/pages/modplatform/flame/FlamePage.h4
-rw-r--r--launcher/pages/modplatform/ftb/FtbListModel.cpp4
-rw-r--r--launcher/pages/modplatform/ftb/FtbPage.h4
-rw-r--r--launcher/pages/modplatform/legacy_ftb/ListModel.cpp4
-rw-r--r--launcher/pages/modplatform/legacy_ftb/Page.cpp2
-rw-r--r--launcher/pages/modplatform/legacy_ftb/Page.h4
-rw-r--r--launcher/pages/modplatform/technic/TechnicModel.cpp4
-rw-r--r--launcher/pages/modplatform/technic/TechnicPage.cpp2
-rw-r--r--launcher/pages/modplatform/technic/TechnicPage.h4
-rw-r--r--launcher/resources/MultiMC.icnsbin782703 -> 0 bytes
-rw-r--r--launcher/resources/MultiMC.icobin55224 -> 0 bytes
-rw-r--r--launcher/resources/MultiMC.manifest31
-rw-r--r--launcher/resources/multimc.rc29
-rw-r--r--launcher/setupwizard/AnalyticsWizardPage.cpp6
-rw-r--r--launcher/setupwizard/JavaWizardPage.cpp6
-rw-r--r--launcher/setupwizard/LanguageWizardPage.cpp6
-rw-r--r--launcher/setupwizard/SetupWizard.cpp2
-rw-r--r--launcher/themes/ITheme.cpp6
-rw-r--r--launcher/translations/TranslationsModel.cpp2
-rw-r--r--launcher/widgets/JavaSettingsWidget.cpp12
-rw-r--r--launcher/widgets/LanguageSelectionWidget.cpp8
-rw-r--r--launcher/widgets/PageContainer.cpp10
95 files changed, 497 insertions, 567 deletions
diff --git a/launcher/BaseInstance.h b/launcher/BaseInstance.h
index 8c08dc05..51258933 100644
--- a/launcher/BaseInstance.h
+++ b/launcher/BaseInstance.h
@@ -78,7 +78,7 @@ public:
*/
void invalidate();
- /// The instance's ID. The ID SHALL be determined by MMC internally. The ID IS guaranteed to
+ /// The instance's ID. The ID SHALL be determined by LAUNCHER internally. The ID IS guaranteed to
/// be unique.
virtual QString id() const;
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index 4ec6a7d1..d1216f86 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -88,13 +88,13 @@ set(CORE_SOURCES
add_unit_test(FileSystem
SOURCES FileSystem_test.cpp
- LIBS MultiMC_logic
+ LIBS Launcher_logic
DATA testdata
)
add_unit_test(GZip
SOURCES GZip_test.cpp
- LIBS MultiMC_logic
+ LIBS Launcher_logic
)
set(PATHMATCHER_SOURCES
@@ -158,13 +158,13 @@ set(UPDATE_SOURCES
add_unit_test(UpdateChecker
SOURCES updater/UpdateChecker_test.cpp
- LIBS MultiMC_logic
+ LIBS Launcher_logic
DATA updater/testdata
)
add_unit_test(DownloadTask
SOURCES updater/DownloadTask_test.cpp
- LIBS MultiMC_logic
+ LIBS Launcher_logic
DATA updater/testdata
)
@@ -337,14 +337,14 @@ set(MINECRAFT_SOURCES
add_unit_test(GradleSpecifier
SOURCES minecraft/GradleSpecifier_test.cpp
- LIBS MultiMC_logic
+ LIBS Launcher_logic
)
add_executable(PackageManifest
mojang/PackageManifest_test.cpp
)
target_link_libraries(PackageManifest
- MultiMC_logic
+ Launcher_logic
Qt5::Test
)
target_include_directories(PackageManifest
@@ -358,25 +358,25 @@ add_test(
add_unit_test(MojangVersionFormat
SOURCES minecraft/MojangVersionFormat_test.cpp
- LIBS MultiMC_logic
+ LIBS Launcher_logic
DATA minecraft/testdata
)
add_unit_test(Library
SOURCES minecraft/Library_test.cpp
- LIBS MultiMC_logic
+ LIBS Launcher_logic
)
# FIXME: shares data with FileSystem test
add_unit_test(ModFolderModel
SOURCES minecraft/mod/ModFolderModel_test.cpp
DATA testdata
- LIBS MultiMC_logic
+ LIBS Launcher_logic
)
add_unit_test(ParseUtils
SOURCES minecraft/ParseUtils_test.cpp
- LIBS MultiMC_logic
+ LIBS Launcher_logic
)
# the screenshots feature
@@ -414,7 +414,7 @@ set(SETTINGS_SOURCES
add_unit_test(INIFile
SOURCES settings/INIFile_test.cpp
- LIBS MultiMC_logic
+ LIBS Launcher_logic
)
set(JAVA_SOURCES
@@ -437,7 +437,7 @@ set(JAVA_SOURCES
add_unit_test(JavaVersion
SOURCES java/JavaVersion_test.cpp
- LIBS MultiMC_logic
+ LIBS Launcher_logic
)
set(TRANSLATIONS_SOURCES
@@ -523,7 +523,7 @@ set(ATLAUNCHER_SOURCES
add_unit_test(Index
SOURCES meta/Index_test.cpp
- LIBS MultiMC_logic
+ LIBS Launcher_logic
)
################################ COMPILE ################################
@@ -557,8 +557,8 @@ set(LOGIC_SOURCES
SET(MULTIMC_SOURCES
# Application base
- MultiMC.h
- MultiMC.cpp
+ Launcher.h
+ Launcher.cpp
UpdateController.cpp
UpdateController.h
@@ -678,8 +678,8 @@ SET(MULTIMC_SOURCES
pages/global/LanguagePage.h
pages/global/MinecraftPage.cpp
pages/global/MinecraftPage.h
- pages/global/MultiMCPage.cpp
- pages/global/MultiMCPage.h
+ pages/global/LauncherPage.cpp
+ pages/global/LauncherPage.h
pages/global/ProxyPage.cpp
pages/global/ProxyPage.h
pages/global/PasteEEPage.cpp
@@ -831,7 +831,7 @@ SET(MULTIMC_UIS
pages/global/ExternalToolsPage.ui
pages/global/JavaPage.ui
pages/global/MinecraftPage.ui
- pages/global/MultiMCPage.ui
+ pages/global/LauncherPage.ui
pages/global/ProxyPage.ui
pages/global/PasteEEPage.ui
@@ -891,11 +891,11 @@ qt5_wrap_ui(MULTIMC_UI ${MULTIMC_UIS})
qt5_add_resources(MULTIMC_RESOURCES ${MULTIMC_QRCS})
# Add executable
-add_library(MultiMC_logic STATIC ${LOGIC_SOURCES} ${MULTIMC_SOURCES} ${MULTIMC_UI} ${MULTIMC_RESOURCES})
-target_link_libraries(MultiMC_logic
+add_library(Launcher_logic STATIC ${LOGIC_SOURCES} ${MULTIMC_SOURCES} ${MULTIMC_UI} ${MULTIMC_RESOURCES})
+target_link_libraries(Launcher_logic
systeminfo
- MultiMC_quazip
- MultiMC_classparser
+ Launcher_quazip
+ Launcher_classparser
${NBT_NAME}
${ZLIB_LIBRARIES}
optional-bare
@@ -903,46 +903,46 @@ target_link_libraries(MultiMC_logic
BuildConfig
Katabasis
)
-target_link_libraries(MultiMC_logic
+target_link_libraries(Launcher_logic
Qt5::Core
Qt5::Xml
Qt5::Network
Qt5::Concurrent
Qt5::Gui
)
-target_link_libraries(MultiMC_logic
- MultiMC_iconfix
+target_link_libraries(Launcher_logic
+ Launcher_iconfix
${QUAZIP_LIBRARIES}
hoedown
- MultiMC_rainbow
+ Launcher_rainbow
LocalPeer
ganalytics
)
-add_executable(MultiMC MACOSX_BUNDLE WIN32 main.cpp ${MULTIMC_RCS})
-target_link_libraries(MultiMC MultiMC_logic)
+target_link_libraries(Launcher_logic secrets)
-if(DEFINED MultiMC_APP_BINARY_NAME)
- set_target_properties(MultiMC PROPERTIES OUTPUT_NAME "${MultiMC_APP_BINARY_NAME}")
+add_executable(${Launcher_Name} MACOSX_BUNDLE WIN32 main.cpp ${MULTIMC_RCS})
+target_link_libraries(${Launcher_Name} Launcher_logic)
+
+if(DEFINED Launcher_APP_BINARY_NAME)
+ set_target_properties(${Launcher_Name} PROPERTIES OUTPUT_NAME "${Launcher_APP_BINARY_NAME}")
endif()
-if(DEFINED MultiMC_BINARY_RPATH)
- SET_TARGET_PROPERTIES(MultiMC PROPERTIES INSTALL_RPATH "${MultiMC_BINARY_RPATH}")
+if(DEFINED Launcher_BINARY_RPATH)
+ SET_TARGET_PROPERTIES(${Launcher_Name} PROPERTIES INSTALL_RPATH "${Launcher_BINARY_RPATH}")
endif()
-if(DEFINED MultiMC_APP_BINARY_DEFS)
- target_compile_definitions(MultiMC PRIVATE ${MultiMC_APP_BINARY_DEFS})
- target_compile_definitions(MultiMC_logic PRIVATE ${MultiMC_APP_BINARY_DEFS})
+if(DEFINED Launcher_APP_BINARY_DEFS)
+ target_compile_definitions(${Launcher_Name} PRIVATE ${Launcher_APP_BINARY_DEFS})
+ target_compile_definitions(Launcher_logic PRIVATE ${Launcher_APP_BINARY_DEFS})
endif()
-install(TARGETS MultiMC
+install(TARGETS ${Launcher_Name}
BUNDLE DESTINATION ${BUNDLE_DEST_DIR} COMPONENT Runtime
LIBRARY DESTINATION ${LIBRARY_DEST_DIR} COMPONENT Runtime
RUNTIME DESTINATION ${BINARY_DEST_DIR} COMPONENT Runtime
)
-target_link_libraries(MultiMC_logic secrets)
-
-#### The MultiMC bundle mess! ####
+#### The bundle mess! ####
# Bundle utilities are used to complete the portable packages - they add all the libraries that would otherwise be missing on the target system.
# NOTE: it seems that this absolutely has to be here, and nowhere else.
if(INSTALL_BUNDLE STREQUAL "full")
diff --git a/launcher/Env.h b/launcher/Env.h
index 7d1a8bc9..52427696 100644
--- a/launcher/Env.h
+++ b/launcher/Env.h
@@ -25,7 +25,7 @@ class Index;
class Env
{
- friend class MultiMC;
+ friend class Launcher;
private:
struct Private;
Env();
diff --git a/launcher/GuiUtil.cpp b/launcher/GuiUtil.cpp
index 302206f5..3dd31c7a 100644
--- a/launcher/GuiUtil.cpp
+++ b/launcher/GuiUtil.cpp
@@ -8,7 +8,7 @@
#include "net/PasteUpload.h"
#include "dialogs/CustomMessageBox.h"
-#include "MultiMC.h"
+#include "Launcher.h"
#include <settings/SettingsObject.h>
#include <DesktopServices.h>
#include <BuildConfig.h>
@@ -16,7 +16,7 @@
QString GuiUtil::uploadPaste(const QString &text, QWidget *parentWidget)
{
ProgressDialog dialog(parentWidget);
- auto APIKeySetting = MMC->settings()->get("PasteEEAPIKey").toString();
+ auto APIKeySetting = LAUNCHER->settings()->get("PasteEEAPIKey").toString();
if(APIKeySetting == "multimc")
{
APIKeySetting = BuildConfig.PASTE_EE_KEY;
diff --git a/launcher/InstanceList.cpp b/launcher/InstanceList.cpp
index cb38853b..42b2ae1a 100644
--- a/launcher/InstanceList.cpp
+++ b/launcher/InstanceList.cpp
@@ -822,7 +822,7 @@ Task * InstanceList::wrapInstanceTask(InstanceTask * task)
QString InstanceList::getStagedInstancePath()
{
QString key = QUuid::createUuid().toString();
- QString relPath = FS::PathCombine("_MMC_TEMP/" , key);
+ QString relPath = FS::PathCombine("_LAUNCHER_TEMP/" , key);
QDir rootPath(m_instDir);
auto path = FS::PathCombine(m_instDir, relPath);
if(!rootPath.mkpath(relPath))
diff --git a/launcher/InstanceProxyModel.cpp b/launcher/InstanceProxyModel.cpp
index 5317f60c..0311c239 100644
--- a/launcher/InstanceProxyModel.cpp
+++ b/launcher/InstanceProxyModel.cpp
@@ -1,5 +1,5 @@
#include "InstanceProxyModel.h"
-#include "MultiMC.h"
+#include "Launcher