From a3173b53717fcea686f267f4eb8fd9788e6677db Mon Sep 17 00:00:00 2001 From: Rachel Powers <508861+Ryex@users.noreply.github.com> Date: Fri, 7 Apr 2023 16:54:25 -0700 Subject: fix: ensure Application accepts URLs and local files form cmd args refactor: Move curseforge:// url scheme detection to Import Page feat: pass along extra CF pack info so pack metadata is established. Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> --- launcher/Application.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'launcher/Application.h') diff --git a/launcher/Application.h b/launcher/Application.h index ced0af17..83bfa9ef 100644 --- a/launcher/Application.h +++ b/launcher/Application.h @@ -211,6 +211,8 @@ public: int suitableMaxMem(); + void addImportUrl(QString const& url); + signals: void updateAllowedChanged(bool status); void globalSettingsAboutToOpen(); @@ -314,7 +316,7 @@ public: QString m_serverToJoin; QString m_profileToUse; bool m_liveCheck = false; - QList m_zipsToImport; + QList m_urlsToImport; QString m_instanceIdToShowWindowOf; std::unique_ptr logFile; }; -- cgit From b1ffc8ddab7d9aff10b6195a75e6e58c43b233ca Mon Sep 17 00:00:00 2001 From: Rachel Powers <508861+Ryex@users.noreply.github.com> Date: Fri, 12 May 2023 16:37:45 -0700 Subject: refactor: normalize url fn & cleanup Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> --- launcher/Application.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'launcher/Application.h') diff --git a/launcher/Application.h b/launcher/Application.h index 83bfa9ef..97d33830 100644 --- a/launcher/Application.h +++ b/launcher/Application.h @@ -211,7 +211,7 @@ public: int suitableMaxMem(); - void addImportUrl(QString const& url); + QUrl normalizeImportUrl(QString const& url); signals: void updateAllowedChanged(bool status); -- cgit From 22327bbe71b271a126521db737101ae07ba26f8d Mon Sep 17 00:00:00 2001 From: TheKodeToad Date: Thu, 6 Jul 2023 18:04:44 +0100 Subject: Combine launch buttons in Instance window, persist profiler Signed-off-by: TheKodeToad --- launcher/Application.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'launcher/Application.h') diff --git a/launcher/Application.h b/launcher/Application.h index ced0af17..b911edc1 100644 --- a/launcher/Application.h +++ b/launcher/Application.h @@ -222,14 +222,11 @@ signals: #endif public slots: - bool launch( - InstancePtr instance, - bool online = true, - bool demo = false, - BaseProfilerFactory *profiler = nullptr, - MinecraftServerTargetPtr serverToJoin = nullptr, - MinecraftAccountPtr accountToUse = nullptr - ); + bool launch(InstancePtr instance, + bool online = true, + bool demo = false, + MinecraftServerTargetPtr serverToJoin = nullptr, + MinecraftAccountPtr accountToUse = nullptr); bool kill(InstancePtr instance); void closeCurrentWindow(); -- cgit From 97662f5c8ecdf32403939e427c74310f9175fb9e Mon Sep 17 00:00:00 2001 From: TheKodeToad Date: Tue, 18 Jul 2023 22:50:43 +0100 Subject: Multiple icon themes! Signed-off-by: TheKodeToad --- launcher/Application.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'launcher/Application.h') diff --git a/launcher/Application.h b/launcher/Application.h index 527c536b..0b953f0a 100644 --- a/launcher/Application.h +++ b/launcher/Application.h @@ -70,6 +70,7 @@ class TranslationsModel; class ITheme; class MCEditTool; class ThemeManager; +class IconTheme; namespace Meta { class Index; @@ -124,6 +125,8 @@ public: QList getValidApplicationThemes(); + QList getValidIconThemes(); + void setApplicationTheme(const QString& name); shared_qobject_ptr updater() { -- cgit From 842f08dcfc29d24cae13c25264e67375dd069e27 Mon Sep 17 00:00:00 2001 From: TheKodeToad Date: Thu, 20 Jul 2023 11:51:44 +0100 Subject: (UX) Add open folder button next to combo boxes Signed-off-by: TheKodeToad --- launcher/Application.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'launcher/Application.h') diff --git a/launcher/Application.h b/launcher/Application.h index 0b953f0a..b8996022 100644 --- a/launcher/Application.h +++ b/launcher/Application.h @@ -119,15 +119,7 @@ public: QIcon getThemedIcon(const QString& name); - void setIconTheme(const QString& name); - - void applyCurrentlySelectedTheme(bool initial = false); - - QList getValidApplicationThemes(); - - QList getValidIconThemes(); - - void setApplicationTheme(const QString& name); + ThemeManager* themeManager() { return m_themeManager.get(); } shared_qobject_ptr updater() { return m_updater; -- cgit From 1a7c5693cc9d21cf974ad56e55a3ca07a22c8477 Mon Sep 17 00:00:00 2001 From: TheKodeToad Date: Fri, 21 Jul 2023 13:01:01 +0100 Subject: Remove redundant methods Signed-off-by: TheKodeToad --- launcher/Application.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'launcher/Application.h') diff --git a/launcher/Application.h b/launcher/Application.h index 203fd16e..1c221cec 100644 --- a/launcher/Application.h +++ b/launcher/Application.h @@ -122,10 +122,6 @@ public: ThemeManager* themeManager() { return m_themeManager.get(); } - QList getValidCatPacks(); - - QString getCatPack(QString catName = ""); - shared_qobject_ptr updater() { return m_updater; } void triggerUpdateCheck(); -- cgit From 83aa0062c7d831ca42ed4d82e5f6162ac8793be8 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 2 Aug 2023 13:45:08 +0200 Subject: feat: add custom native library path settings Signed-off-by: Sefa Eyeoglu --- launcher/Application.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'launcher/Application.h') diff --git a/launcher/Application.h b/launcher/Application.h index 6bc33274..5807107c 100644 --- a/launcher/Application.h +++ b/launcher/Application.h @@ -142,6 +142,8 @@ class Application : public QApplication { void updateCapabilities(); + void detectLibraries(); + /*! * Finds and returns the full path to a jar file. * Returns a null-string if it could not be found. @@ -275,6 +277,8 @@ class Application : public QApplication { SetupWizard* m_setupWizard = nullptr; public: + QString m_detectedGLFWPath; + QString m_detectedOpenALPath; QString m_instanceIdToLaunch; QString m_serverToJoin; QString m_profileToUse; -- cgit From ffd8ed550f05e1336afc6ddc424b6733256ecf02 Mon Sep 17 00:00:00 2001 From: TheKodeToad Date: Thu, 17 Aug 2023 10:16:52 +0100 Subject: Reformat Signed-off-by: TheKodeToad --- launcher/Application.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'launcher/Application.h') diff --git a/launcher/Application.h b/launcher/Application.h index a09f46b5..8a85fd95 100644 --- a/launcher/Application.h +++ b/launcher/Application.h @@ -187,7 +187,7 @@ class Application : public QApplication { void clickedOnDock(); #endif -public slots: + public slots: bool launch(InstancePtr instance, bool online = true, bool demo = false, -- cgit