From 297d4b4196c9bd1d9c4dd422dd88aaec620038d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 16 Oct 2021 00:42:01 +0200 Subject: [PATCH] NOISSUE continue the debranding --- launcher/MainWindow.cpp | 4 +- launcher/dialogs/CopyInstanceDialog.ui | 2 +- launcher/icons/IconList.cpp | 4 +- launcher/pages/global/LauncherPage.h | 8 +- launcher/pages/global/LauncherPage.ui | 10 +- launcher/resources/OSX/OSX.qrc | 3 +- .../scalable/{quickmods.svg => launcher.svg} | 0 launcher/resources/OSX/scalable/multimc.svg | 18 - launcher/resources/flat/flat.qrc | 2 +- launcher/resources/flat/scalable/launcher.svg | 2 + launcher/resources/iOS/iOS.qrc | 3 +- .../scalable/{quickmods.svg => launcher.svg} | 0 .../multimc/128x128/instances/infinity.png | Bin 15151 -> 8012 bytes launcher/resources/multimc/multimc.qrc | 8 - launcher/resources/multimc/scalable/logo.svg | 353 ------------------ .../resources/multimc/scalable/multimc.svg | 353 ------------------ launcher/resources/pe_blue/pe_blue.qrc | 3 +- .../scalable/{quickmods.svg => launcher.svg} | 0 .../resources/pe_blue/scalable/multimc.svg | 61 --- launcher/resources/pe_colored/pe_colored.qrc | 3 +- .../scalable/{quickmods.svg => launcher.svg} | 0 .../resources/pe_colored/scalable/multimc.svg | 32 -- launcher/resources/pe_dark/pe_dark.qrc | 3 +- .../scalable/{quickmods.svg => launcher.svg} | 0 .../resources/pe_dark/scalable/multimc.svg | 61 --- launcher/resources/pe_light/pe_light.qrc | 3 +- .../scalable/{quickmods.svg => launcher.svg} | 0 .../resources/pe_light/scalable/multimc.svg | 61 --- .../resources/sources/multimc-discord.svg | 265 ------------- notsecrets/logo.svg | 3 - 30 files changed, 23 insertions(+), 1242 deletions(-) rename launcher/resources/OSX/scalable/{quickmods.svg => launcher.svg} (100%) delete mode 100644 launcher/resources/OSX/scalable/multimc.svg create mode 100644 launcher/resources/flat/scalable/launcher.svg rename launcher/resources/iOS/scalable/{quickmods.svg => launcher.svg} (100%) delete mode 100644 launcher/resources/multimc/scalable/logo.svg delete mode 100644 launcher/resources/multimc/scalable/multimc.svg rename launcher/resources/pe_blue/scalable/{quickmods.svg => launcher.svg} (100%) delete mode 100644 launcher/resources/pe_blue/scalable/multimc.svg rename launcher/resources/pe_colored/scalable/{quickmods.svg => launcher.svg} (100%) delete mode 100644 launcher/resources/pe_colored/scalable/multimc.svg rename launcher/resources/pe_dark/scalable/{quickmods.svg => launcher.svg} (100%) delete mode 100644 launcher/resources/pe_dark/scalable/multimc.svg rename launcher/resources/pe_light/scalable/{quickmods.svg => launcher.svg} (100%) delete mode 100644 launcher/resources/pe_light/scalable/multimc.svg delete mode 100644 launcher/resources/sources/multimc-discord.svg diff --git a/launcher/MainWindow.cpp b/launcher/MainWindow.cpp index 84d72d5bc..91cf203a7 100644 --- a/launcher/MainWindow.cpp +++ b/launcher/MainWindow.cpp @@ -459,7 +459,7 @@ public: // NOTE: not added to toolbar, but used for instance context menu (right click) actionChangeInstIcon = TranslatedAction(MainWindow); actionChangeInstIcon->setObjectName(QStringLiteral("actionChangeInstIcon")); - actionChangeInstIcon->setIcon(QIcon(":/icons/instances/infinity")); + actionChangeInstIcon->setIcon(QIcon(":/icons/instances/grass")); actionChangeInstIcon->setIconVisibleInMenu(true); actionChangeInstIcon.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Change Icon")); actionChangeInstIcon.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Change the selected instance's icon.")); @@ -1866,7 +1866,7 @@ void MainWindow::selectionBad() statusBar()->clearMessage(); ui->instanceToolBar->setEnabled(false); ui->renameButton->setText(tr("Rename Instance")); - updateInstanceToolIcon("infinity"); + updateInstanceToolIcon("grass"); // ...and then see if we can enable the previously selected instance setSelectedInstanceById(LAUNCHER->settings()->get("SelectedInstance").toString()); diff --git a/launcher/dialogs/CopyInstanceDialog.ui b/launcher/dialogs/CopyInstanceDialog.ui index fa6754556..f4b191e27 100644 --- a/launcher/dialogs/CopyInstanceDialog.ui +++ b/launcher/dialogs/CopyInstanceDialog.ui @@ -43,7 +43,7 @@ - :/icons/instances/infinity:/icons/instances/infinity + :/icons/instances/grass:/icons/instances/grass diff --git a/launcher/icons/IconList.cpp b/launcher/icons/IconList.cpp index 70350534e..584edd69e 100644 --- a/launcher/icons/IconList.cpp +++ b/launcher/icons/IconList.cpp @@ -395,7 +395,7 @@ QIcon IconList::getIcon(const QString &key) const return icons[icon_index].icon(); // Fallback for icons that don't exist. - icon_index = getIconIndex("infinity"); + icon_index = getIconIndex("grass"); if (icon_index != -1) return icons[icon_index].icon(); @@ -404,7 +404,7 @@ QIcon IconList::getIcon(const QString &key) const int IconList::getIconIndex(const QString &key) const { - auto iter = name_index.find(key == "default" ? "infinity" : key); + auto iter = name_index.find(key == "default" ? "grass" : key); if (iter != name_index.end()) return *iter; diff --git a/launcher/pages/global/LauncherPage.h b/launcher/pages/global/LauncherPage.h index d851bfccf..e622ec482 100644 --- a/launcher/pages/global/LauncherPage.h +++ b/launcher/pages/global/LauncherPage.h @@ -42,19 +42,19 @@ public: QString displayName() const override { - return "MultiMC"; + return "Launcher"; } QIcon icon() const override { - return LAUNCHER->getThemedIcon("multimc"); + return LAUNCHER->getThemedIcon("launcher"); } QString id() const override { - return "multimc-settings"; + return "launcher-settings"; } QString helpPage() const override { - return "MultiMC-settings"; + return "Launcher-settings"; } bool apply() override; diff --git a/launcher/pages/global/LauncherPage.ui b/launcher/pages/global/LauncherPage.ui index 34fb9b57e..62a66d73b 100644 --- a/launcher/pages/global/LauncherPage.ui +++ b/launcher/pages/global/LauncherPage.ui @@ -54,7 +54,7 @@ - Check for updates when MultiMC starts? + Check for updates on start? @@ -160,7 +160,7 @@ - Move MultiMC data to new location (will restart MultiMC) + Move the data to new location (will restart the launcher) @@ -187,7 +187,7 @@ - MultiMC notifications + Launcher notifications @@ -515,9 +515,9 @@ <html><head/> <body> -<p>MultiMC sends anonymous usage statistics on every start of the application.</p><p>The following data is collected:</p> +<p>The launcher sends anonymous usage statistics on every start of the application.</p><p>The following data is collected:</p> <ul> -<li>MultiMC version.</li> +<li>Launcher version.</li> <li>Operating system name, version and architecture.</li> <li>CPU architecture (kernel architecture on linux).</li> <li>Size of system memory.</li> diff --git a/launcher/resources/OSX/OSX.qrc b/launcher/resources/OSX/OSX.qrc index 0ae7d4d06..b85313e13 100644 --- a/launcher/resources/OSX/OSX.qrc +++ b/launcher/resources/OSX/OSX.qrc @@ -16,16 +16,15 @@ scalable/jarmods.svg scalable/java.svg scalable/language.svg + scalable/launcher.svg scalable/loadermods.svg scalable/log.svg scalable/minecraft.svg - scalable/multimc.svg scalable/new.svg scalable/news.svg scalable/notes.svg scalable/patreon.svg scalable/proxy.svg - scalable/quickmods.svg scalable/refresh.svg scalable/resourcepacks.svg scalable/shaderpacks.svg diff --git a/launcher/resources/OSX/scalable/quickmods.svg b/launcher/resources/OSX/scalable/launcher.svg similarity index 100% rename from launcher/resources/OSX/scalable/quickmods.svg rename to launcher/resources/OSX/scalable/launcher.svg diff --git a/launcher/resources/OSX/scalable/multimc.svg b/launcher/resources/OSX/scalable/multimc.svg deleted file mode 100644 index caad21b51..000000000 --- a/launcher/resources/OSX/scalable/multimc.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - diff --git a/launcher/resources/flat/flat.qrc b/launcher/resources/flat/flat.qrc index a3cd51f8e..a888f6d45 100644 --- a/launcher/resources/flat/flat.qrc +++ b/launcher/resources/flat/flat.qrc @@ -18,10 +18,10 @@ scalable/jarmods.svg scalable/java.svg scalable/language.svg + scalable/launcher.svg scalable/loadermods.svg scalable/log.svg scalable/minecraft.svg - scalable/multimc.svg scalable/new.svg scalable/news.svg scalable/notes.svg diff --git a/launcher/resources/flat/scalable/launcher.svg b/launcher/resources/flat/scalable/launcher.svg new file mode 100644 index 000000000..2c4964db9 --- /dev/null +++ b/launcher/resources/flat/scalable/launcher.svg @@ -0,0 +1,2 @@ + + diff --git a/launcher/resources/iOS/iOS.qrc b/launcher/resources/iOS/iOS.qrc index 4aa3e8917..5eec744c0 100644 --- a/launcher/resources/iOS/iOS.qrc +++ b/launcher/resources/iOS/iOS.qrc @@ -16,16 +16,15 @@ scalable/jarmods.svg scalable/java.svg scalable/language.svg + scalable/launcher.svg scalable/loadermods.svg scalable/log.svg scalable/minecraft.svg - scalable/multimc.svg scalable/new.svg scalable/news.svg scalable/notes.svg scalable/patreon.svg scalable/proxy.svg - scalable/quickmods.svg scalable/refresh.svg scalable/resourcepacks.svg scalable/shaderpacks.svg diff --git a/launcher/resources/iOS/scalable/quickmods.svg b/launcher/resources/iOS/scalable/launcher.svg similarity index 100% rename from launcher/resources/iOS/scalable/quickmods.svg rename to launcher/resources/iOS/scalable/launcher.svg diff --git a/launcher/resources/multimc/128x128/instances/infinity.png b/launcher/resources/multimc/128x128/instances/infinity.png index cc7ca7bcbf820ba8760fc7b889b4613ee41b5b19..63e06e5b307dfe654d822837c1e01657e3f0c776 100644 GIT binary patch literal 8012 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 Pz`)??>gTe~DWM4fu7_Uz literal 15151 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 diff --git a/launcher/resources/multimc/multimc.qrc b/launcher/resources/multimc/multimc.qrc index eec10ea45..5fb9ccf0d 100644 --- a/launcher/resources/multimc/multimc.qrc +++ b/launcher/resources/multimc/multimc.qrc @@ -2,11 +2,6 @@ index.theme - - scalable/logo.svg - - - scalable/multimc.svg scalable/reddit-alien.svg @@ -284,9 +279,6 @@ 32x32/instances/herobrine.png 128x128/instances/herobrine.png - 32x32/instances/infinity.png - 128x128/instances/infinity.png - 32x32/instances/magitech.png 128x128/instances/magitech.png diff --git a/launcher/resources/multimc/scalable/logo.svg b/launcher/resources/multimc/scalable/logo.svg deleted file mode 100644 index 8bb0e2896..000000000 --- a/launcher/resources/multimc/scalable/logo.svg +++ /dev/null @@ -1,353 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - diff --git a/launcher/resources/multimc/scalable/multimc.svg b/launcher/resources/multimc/scalable/multimc.svg deleted file mode 100644 index 8bb0e2896..000000000 --- a/launcher/resources/multimc/scalable/multimc.svg +++ /dev/null @@ -1,353 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - diff --git a/launcher/resources/pe_blue/pe_blue.qrc b/launcher/resources/pe_blue/pe_blue.qrc index 2446e4c3e..c78d21ada 100644 --- a/launcher/resources/pe_blue/pe_blue.qrc +++ b/launcher/resources/pe_blue/pe_blue.qrc @@ -16,16 +16,15 @@ scalable/jarmods.svg scalable/java.svg scalable/language.svg + scalable/launcher.svg scalable/loadermods.svg scalable/log.svg scalable/minecraft.svg - scalable/multimc.svg scalable/new.svg scalable/news.svg scalable/notes.svg scalable/patreon.svg scalable/proxy.svg - scalable/quickmods.svg scalable/refresh.svg scalable/resourcepacks.svg scalable/shaderpacks.svg diff --git a/launcher/resources/pe_blue/scalable/quickmods.svg b/launcher/resources/pe_blue/scalable/launcher.svg similarity index 100% rename from launcher/resources/pe_blue/scalable/quickmods.svg rename to launcher/resources/pe_blue/scalable/launcher.svg diff --git a/launcher/resources/pe_blue/scalable/multimc.svg b/launcher/resources/pe_blue/scalable/multimc.svg deleted file mode 100644 index 820c0b531..000000000 --- a/launcher/resources/pe_blue/scalable/multimc.svg +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/launcher/resources/pe_colored/pe_colored.qrc b/launcher/resources/pe_colored/pe_colored.qrc index e95d65794..abe2cdb44 100644 --- a/launcher/resources/pe_colored/pe_colored.qrc +++ b/launcher/resources/pe_colored/pe_colored.qrc @@ -16,16 +16,15 @@ scalable/jarmods.svg scalable/java.svg scalable/language.svg + scalable/launcher.svg scalable/loadermods.svg scalable/log.svg scalable/minecraft.svg - scalable/multimc.svg scalable/new.svg scalable/news.svg scalable/notes.svg scalable/patreon.svg scalable/proxy.svg - scalable/quickmods.svg scalable/refresh.svg scalable/resourcepacks.svg scalable/screenshots.svg diff --git a/launcher/resources/pe_colored/scalable/quickmods.svg b/launcher/resources/pe_colored/scalable/launcher.svg similarity index 100% rename from launcher/resources/pe_colored/scalable/quickmods.svg rename to launcher/resources/pe_colored/scalable/launcher.svg diff --git a/launcher/resources/pe_colored/scalable/multimc.svg b/launcher/resources/pe_colored/scalable/multimc.svg deleted file mode 100644 index a146c52ee..000000000 --- a/launcher/resources/pe_colored/scalable/multimc.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/launcher/resources/pe_dark/pe_dark.qrc b/launcher/resources/pe_dark/pe_dark.qrc index c631c0a5a..03ae7ef90 100644 --- a/launcher/resources/pe_dark/pe_dark.qrc +++ b/launcher/resources/pe_dark/pe_dark.qrc @@ -16,16 +16,15 @@ scalable/jarmods.svg scalable/java.svg scalable/language.svg + scalable/launcher.svg scalable/loadermods.svg scalable/log.svg scalable/minecraft.svg - scalable/multimc.svg scalable/new.svg scalable/news.svg scalable/notes.svg scalable/patreon.svg scalable/proxy.svg - scalable/quickmods.svg scalable/refresh.svg scalable/resourcepacks.svg scalable/shaderpacks.svg diff --git a/launcher/resources/pe_dark/scalable/quickmods.svg b/launcher/resources/pe_dark/scalable/launcher.svg similarity index 100% rename from launcher/resources/pe_dark/scalable/quickmods.svg rename to launcher/resources/pe_dark/scalable/launcher.svg diff --git a/launcher/resources/pe_dark/scalable/multimc.svg b/launcher/resources/pe_dark/scalable/multimc.svg deleted file mode 100644 index e4cf7b7f1..000000000 --- a/launcher/resources/pe_dark/scalable/multimc.svg +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/launcher/resources/pe_light/pe_light.qrc b/launcher/resources/pe_light/pe_light.qrc index a687ed213..93d002055 100644 --- a/launcher/resources/pe_light/pe_light.qrc +++ b/launcher/resources/pe_light/pe_light.qrc @@ -16,16 +16,15 @@ scalable/jarmods.svg scalable/java.svg scalable/language.svg + scalable/launcher.svg scalable/loadermods.svg scalable/log.svg scalable/minecraft.svg - scalable/multimc.svg scalable/new.svg scalable/news.svg scalable/notes.svg scalable/patreon.svg scalable/proxy.svg - scalable/quickmods.svg scalable/refresh.svg scalable/resourcepacks.svg scalable/shaderpacks.svg diff --git a/launcher/resources/pe_light/scalable/quickmods.svg b/launcher/resources/pe_light/scalable/launcher.svg similarity index 100% rename from launcher/resources/pe_light/scalable/quickmods.svg rename to launcher/resources/pe_light/scalable/launcher.svg diff --git a/launcher/resources/pe_light/scalable/multimc.svg b/launcher/resources/pe_light/scalable/multimc.svg deleted file mode 100644 index 8b2cb6312..000000000 --- a/launcher/resources/pe_light/scalable/multimc.svg +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/launcher/resources/sources/multimc-discord.svg b/launcher/resources/sources/multimc-discord.svg deleted file mode 100644 index c3c730442..000000000 --- a/launcher/resources/sources/multimc-discord.svg +++ /dev/null @@ -1,265 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff --git a/notsecrets/logo.svg b/notsecrets/logo.svg index 6d32064a8..a1c8e4396 100644 --- a/notsecrets/logo.svg +++ b/notsecrets/logo.svg @@ -8,9 +8,6 @@ version="1.1" inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)" sodipodi:docname="logo.svg" - inkscape:export-filename="/home/peterix/playground/MultiMC-icons/multimc-smooth-biginfinity.png" - inkscape:export-xdpi="180" - inkscape:export-ydpi="180" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink"