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 delta 8010 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 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"