From d61ebca9bca27d8722931c4bd22ba6642809c131 Mon Sep 17 00:00:00 2001 From: fn2006 Date: Tue, 30 May 2023 19:24:20 +0100 Subject: [PATCH] fix things broken by the merge --- launcher/Application.cpp | 2 + launcher/resources/OSX/scalable/launcher.svg | 32 ---- .../breeze_dark/scalable/launcher.svg | 147 +++++++++++------- .../breeze_light/scalable/launcher.svg | 96 ++++++++++++ launcher/resources/flat/scalable/launcher.svg | 32 ---- .../flat_white/scalable/launcher.svg | 98 +++++++++++- launcher/resources/iOS/scalable/launcher.svg | 32 ---- .../resources/multimc/scalable/launcher.svg | 32 ---- .../resources/pe_blue/scalable/launcher.svg | 32 ---- .../pe_colored/scalable/launcher.svg | 32 ---- .../resources/pe_dark/scalable/launcher.svg | 32 ---- .../resources/pe_light/scalable/launcher.svg | 32 ---- 12 files changed, 287 insertions(+), 312 deletions(-) create mode 100644 launcher/resources/breeze_light/scalable/launcher.svg diff --git a/launcher/Application.cpp b/launcher/Application.cpp index 36fb95a4..0ddb2d9f 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -104,6 +104,8 @@ #include "icons/IconList.h" #include "net/HttpMetaCache.h" +#include "ui/GuiUtil.h" + #include "java/JavaUtils.h" #include "updater/ExternalUpdater.h" diff --git a/launcher/resources/OSX/scalable/launcher.svg b/launcher/resources/OSX/scalable/launcher.svg index 08a45f44..64f8da74 100644 --- a/launcher/resources/OSX/scalable/launcher.svg +++ b/launcher/resources/OSX/scalable/launcher.svg @@ -93,36 +93,4 @@ inkscape:label="beak" /> - - - - - - - Prism Launcher Logo - 19/10/2022 - - - Prism Launcher - - - - - AutiOne, Boba, ely, Fulmine, gon sawa, Pankakes, tobimori, Zeke - - - https://github.com/PrismLauncher/PrismLauncher - - - CC BY-SA 4.0 - - - - - Prism Launcher - - - - - diff --git a/launcher/resources/breeze_dark/scalable/launcher.svg b/launcher/resources/breeze_dark/scalable/launcher.svg index aeee8433..64f8da74 100644 --- a/launcher/resources/breeze_dark/scalable/launcher.svg +++ b/launcher/resources/breeze_dark/scalable/launcher.svg @@ -1,57 +1,96 @@ - + - - Prism Launcher Logo - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - Prism Launcher Logo - 19/10/2022 - - - Prism Launcher - - - - - AutiOne, Boba, ely, Fulmine, gon sawa, Pankakes, tobimori, Zeke - - - https://github.com/PrismLauncher/PrismLauncher - - - Prism Launcher - - - - - - - - - - - - - - diff --git a/launcher/resources/breeze_light/scalable/launcher.svg b/launcher/resources/breeze_light/scalable/launcher.svg new file mode 100644 index 00000000..64f8da74 --- /dev/null +++ b/launcher/resources/breeze_light/scalable/launcher.svg @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + diff --git a/launcher/resources/flat/scalable/launcher.svg b/launcher/resources/flat/scalable/launcher.svg index 08a45f44..64f8da74 100644 --- a/launcher/resources/flat/scalable/launcher.svg +++ b/launcher/resources/flat/scalable/launcher.svg @@ -93,36 +93,4 @@ inkscape:label="beak" /> - - - - - - - Prism Launcher Logo - 19/10/2022 - - - Prism Launcher - - - - - AutiOne, Boba, ely, Fulmine, gon sawa, Pankakes, tobimori, Zeke - - - https://github.com/PrismLauncher/PrismLauncher - - - CC BY-SA 4.0 - - - - - Prism Launcher - - - - - diff --git a/launcher/resources/flat_white/scalable/launcher.svg b/launcher/resources/flat_white/scalable/launcher.svg index 54131b65..64f8da74 100644 --- a/launcher/resources/flat_white/scalable/launcher.svg +++ b/launcher/resources/flat_white/scalable/launcher.svg @@ -1,2 +1,96 @@ - - + + + + + + + + + + + + + + + + + + + diff --git a/launcher/resources/iOS/scalable/launcher.svg b/launcher/resources/iOS/scalable/launcher.svg index 08a45f44..64f8da74 100644 --- a/launcher/resources/iOS/scalable/launcher.svg +++ b/launcher/resources/iOS/scalable/launcher.svg @@ -93,36 +93,4 @@ inkscape:label="beak" /> - - - - - - - Prism Launcher Logo - 19/10/2022 - - - Prism Launcher - - - - - AutiOne, Boba, ely, Fulmine, gon sawa, Pankakes, tobimori, Zeke - - - https://github.com/PrismLauncher/PrismLauncher - - - CC BY-SA 4.0 - - - - - Prism Launcher - - - - - diff --git a/launcher/resources/multimc/scalable/launcher.svg b/launcher/resources/multimc/scalable/launcher.svg index 08a45f44..64f8da74 100644 --- a/launcher/resources/multimc/scalable/launcher.svg +++ b/launcher/resources/multimc/scalable/launcher.svg @@ -93,36 +93,4 @@ inkscape:label="beak" /> - - - - - - - Prism Launcher Logo - 19/10/2022 - - - Prism Launcher - - - - - AutiOne, Boba, ely, Fulmine, gon sawa, Pankakes, tobimori, Zeke - - - https://github.com/PrismLauncher/PrismLauncher - - - CC BY-SA 4.0 - - - - - Prism Launcher - - - - - diff --git a/launcher/resources/pe_blue/scalable/launcher.svg b/launcher/resources/pe_blue/scalable/launcher.svg index 08a45f44..64f8da74 100644 --- a/launcher/resources/pe_blue/scalable/launcher.svg +++ b/launcher/resources/pe_blue/scalable/launcher.svg @@ -93,36 +93,4 @@ inkscape:label="beak" /> - - - - - - - Prism Launcher Logo - 19/10/2022 - - - Prism Launcher - - - - - AutiOne, Boba, ely, Fulmine, gon sawa, Pankakes, tobimori, Zeke - - - https://github.com/PrismLauncher/PrismLauncher - - - CC BY-SA 4.0 - - - - - Prism Launcher - - - - - diff --git a/launcher/resources/pe_colored/scalable/launcher.svg b/launcher/resources/pe_colored/scalable/launcher.svg index 08a45f44..64f8da74 100644 --- a/launcher/resources/pe_colored/scalable/launcher.svg +++ b/launcher/resources/pe_colored/scalable/launcher.svg @@ -93,36 +93,4 @@ inkscape:label="beak" /> - - - - - - - Prism Launcher Logo - 19/10/2022 - - - Prism Launcher - - - - - AutiOne, Boba, ely, Fulmine, gon sawa, Pankakes, tobimori, Zeke - - - https://github.com/PrismLauncher/PrismLauncher - - - CC BY-SA 4.0 - - - - - Prism Launcher - - - - - diff --git a/launcher/resources/pe_dark/scalable/launcher.svg b/launcher/resources/pe_dark/scalable/launcher.svg index 08a45f44..64f8da74 100644 --- a/launcher/resources/pe_dark/scalable/launcher.svg +++ b/launcher/resources/pe_dark/scalable/launcher.svg @@ -93,36 +93,4 @@ inkscape:label="beak" /> - - - - - - - Prism Launcher Logo - 19/10/2022 - - - Prism Launcher - - - - - AutiOne, Boba, ely, Fulmine, gon sawa, Pankakes, tobimori, Zeke - - - https://github.com/PrismLauncher/PrismLauncher - - - CC BY-SA 4.0 - - - - - Prism Launcher - - - - - diff --git a/launcher/resources/pe_light/scalable/launcher.svg b/launcher/resources/pe_light/scalable/launcher.svg index 08a45f44..64f8da74 100644 --- a/launcher/resources/pe_light/scalable/launcher.svg +++ b/launcher/resources/pe_light/scalable/launcher.svg @@ -93,36 +93,4 @@ inkscape:label="beak" /> - - - - - - - Prism Launcher Logo - 19/10/2022 - - - Prism Launcher - - - - - AutiOne, Boba, ely, Fulmine, gon sawa, Pankakes, tobimori, Zeke - - - https://github.com/PrismLauncher/PrismLauncher - - - CC BY-SA 4.0 - - - - - Prism Launcher - - - - -