diff --git a/launcher/MainWindow.cpp b/launcher/MainWindow.cpp index 84d72d5b..91cf203a 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 fa675455..f4b191e2 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 70350534..584edd69 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 d851bfcc..e622ec48 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 34fb9b57..62a66d73 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 0ae7d4d0..b85313e1 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 caad21b5..00000000 --- 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 a3cd51f8..a888f6d4 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 00000000..2c4964db --- /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 4aa3e891..5eec744c 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 cc7ca7bc..63e06e5b 100644 Binary files a/launcher/resources/multimc/128x128/instances/infinity.png and b/launcher/resources/multimc/128x128/instances/infinity.png differ diff --git a/launcher/resources/multimc/multimc.qrc b/launcher/resources/multimc/multimc.qrc index eec10ea4..5fb9ccf0 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 8bb0e289..00000000 --- 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 8bb0e289..00000000 --- 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 2446e4c3..c78d21ad 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 820c0b53..00000000 --- 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 e95d6579..abe2cdb4 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 a146c52e..00000000 --- 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 c631c0a5..03ae7ef9 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 e4cf7b7f..00000000 --- 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 a687ed21..93d00205 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 8b2cb631..00000000 --- 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 c3c73044..00000000 --- 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 6d32064a..a1c8e439 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"