From 8f7aec032b11a2e2b3034c9d9719a74726dad130 Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Sun, 26 Oct 2014 23:44:20 +0100 Subject: Add dark, light, blue and colored theme from pe. Replaces the old dark and light themes --- CMakeLists.txt | 2 + gui/MainWindow.ui | 2 + gui/pages/LegacyJarModPage.h | 2 +- gui/pages/global/ExternalToolsPage.h | 2 +- gui/pages/global/MultiMCPage.cpp | 14 + gui/pages/global/MultiMCPage.ui | 12 +- gui/widgets/IconLabel.cpp | 15 +- logic/LegacyInstance.cpp | 4 +- logic/OneSixInstance.cpp | 4 +- main.cpp | 2 + resources/multimc/16x16/coremods.png | Bin 0 -> 702 bytes resources/multimc/16x16/jarmods.png | Bin 0 -> 693 bytes resources/multimc/16x16/loadermods.png | Bin 0 -> 731 bytes resources/multimc/16x16/plugin-blue.png | Bin 731 -> 0 bytes resources/multimc/16x16/plugin-green.png | Bin 702 -> 0 bytes resources/multimc/16x16/plugin-red.png | Bin 693 -> 0 bytes resources/multimc/24x24/coremods.png | Bin 0 -> 1281 bytes resources/multimc/24x24/jarmods.png | Bin 0 -> 1170 bytes resources/multimc/24x24/loadermods.png | Bin 0 -> 1240 bytes resources/multimc/24x24/plugin-blue.png | Bin 1240 -> 0 bytes resources/multimc/24x24/plugin-green.png | Bin 1281 -> 0 bytes resources/multimc/24x24/plugin-red.png | Bin 1170 -> 0 bytes resources/multimc/32x32/coremods.png | Bin 0 -> 1758 bytes resources/multimc/32x32/jarmods.png | Bin 0 -> 1566 bytes resources/multimc/32x32/loadermods.png | Bin 0 -> 1708 bytes resources/multimc/32x32/plugin-blue.png | Bin 1708 -> 0 bytes resources/multimc/32x32/plugin-green.png | Bin 1758 -> 0 bytes resources/multimc/32x32/plugin-red.png | Bin 1566 -> 0 bytes resources/multimc/64x64/coremods.png | Bin 0 -> 5036 bytes resources/multimc/64x64/jarmods.png | Bin 0 -> 4003 bytes resources/multimc/64x64/loadermods.png | Bin 0 -> 4406 bytes resources/multimc/64x64/plugin-blue.png | Bin 4406 -> 0 bytes resources/multimc/64x64/plugin-green.png | Bin 5036 -> 0 bytes resources/multimc/64x64/plugin-red.png | Bin 4003 -> 0 bytes resources/multimc/multimc.qrc | 26 +- resources/multimc/scalable/apps/multimc.svg | 1993 ----------------------- resources/multimc/scalable/multimc.svg | 1993 +++++++++++++++++++++++ resources/pe_blue/index.theme | 11 + resources/pe_blue/pe_blue.qrc | 33 + resources/pe_blue/scalable/about.svg | 16 + resources/pe_blue/scalable/accounts.svg | 46 + resources/pe_blue/scalable/bug.svg | 47 + resources/pe_blue/scalable/centralmods.svg | 43 + resources/pe_blue/scalable/checkupdate.svg | 43 + resources/pe_blue/scalable/copy.svg | 41 + resources/pe_blue/scalable/coremods.svg | 41 + resources/pe_blue/scalable/externaltools.svg | 41 + resources/pe_blue/scalable/jarmods.svg | 22 + resources/pe_blue/scalable/java.svg | 47 + resources/pe_blue/scalable/loadermods.svg | 42 + resources/pe_blue/scalable/log.svg | 41 + resources/pe_blue/scalable/minecraft.svg | 44 + resources/pe_blue/scalable/multimc.svg | 61 + resources/pe_blue/scalable/new.svg | 44 + resources/pe_blue/scalable/news.svg | 13 + resources/pe_blue/scalable/notes.svg | 46 + resources/pe_blue/scalable/patreon.svg | 41 + resources/pe_blue/scalable/proxy.svg | 45 + resources/pe_blue/scalable/quickmods.svg | 43 + resources/pe_blue/scalable/refresh.svg | 41 + resources/pe_blue/scalable/resourcepacks.svg | 13 + resources/pe_blue/scalable/screenshots.svg | 44 + resources/pe_blue/scalable/settings.svg | 46 + resources/pe_blue/scalable/status-bad.svg | 103 ++ resources/pe_blue/scalable/status-good.svg | 114 ++ resources/pe_blue/scalable/viewfolder.svg | 42 + resources/pe_colored/index.theme | 11 + resources/pe_colored/pe_colored.qrc | 33 + resources/pe_colored/scalable/about.svg | 19 + resources/pe_colored/scalable/accounts.svg | 20 + resources/pe_colored/scalable/bug.svg | 17 + resources/pe_colored/scalable/centralmods.svg | 18 + resources/pe_colored/scalable/checkupdate.svg | 13 + resources/pe_colored/scalable/copy.svg | 16 + resources/pe_colored/scalable/coremods.svg | 16 + resources/pe_colored/scalable/externaltools.svg | 13 + resources/pe_colored/scalable/jarmods.svg | 22 + resources/pe_colored/scalable/java.svg | 49 + resources/pe_colored/scalable/loadermods.svg | 15 + resources/pe_colored/scalable/log.svg | 16 + resources/pe_colored/scalable/minecraft.svg | 14 + resources/pe_colored/scalable/multimc.svg | 32 + resources/pe_colored/scalable/new.svg | 16 + resources/pe_colored/scalable/news.svg | 13 + resources/pe_colored/scalable/notes.svg | 21 + resources/pe_colored/scalable/patreon.svg | 12 + resources/pe_colored/scalable/proxy.svg | 15 + resources/pe_colored/scalable/quickmods.svg | 14 + resources/pe_colored/scalable/refresh.svg | 11 + resources/pe_colored/scalable/resourcepacks.svg | 15 + resources/pe_colored/scalable/screenshots.svg | 16 + resources/pe_colored/scalable/settings.svg | 18 + resources/pe_colored/scalable/status-bad.svg | 103 ++ resources/pe_colored/scalable/status-good.svg | 114 ++ resources/pe_colored/scalable/viewfolder.svg | 17 + resources/pe_dark/16x16/status-bad.png | Bin 468 -> 0 bytes resources/pe_dark/16x16/status-good.png | Bin 527 -> 0 bytes resources/pe_dark/22x22/status-bad.png | Bin 592 -> 0 bytes resources/pe_dark/22x22/status-good.png | Bin 665 -> 0 bytes resources/pe_dark/24x24/status-bad.png | Bin 605 -> 0 bytes resources/pe_dark/24x24/status-good.png | Bin 676 -> 0 bytes resources/pe_dark/32x32/status-bad.png | Bin 839 -> 0 bytes resources/pe_dark/32x32/status-good.png | Bin 802 -> 0 bytes resources/pe_dark/48x48/status-bad.png | Bin 1162 -> 0 bytes resources/pe_dark/48x48/status-good.png | Bin 1159 -> 0 bytes resources/pe_dark/64x64/status-bad.png | Bin 1413 -> 0 bytes resources/pe_dark/64x64/status-good.png | Bin 1478 -> 0 bytes resources/pe_dark/index.theme | 30 +- resources/pe_dark/pe_dark.qrc | 64 +- resources/pe_dark/scalable/about.svg | 29 +- resources/pe_dark/scalable/accounts.svg | 46 + resources/pe_dark/scalable/bug.svg | 66 +- resources/pe_dark/scalable/centralmods.svg | 52 +- resources/pe_dark/scalable/checkupdate.svg | 60 +- resources/pe_dark/scalable/console.svg | 228 --- resources/pe_dark/scalable/console_error.svg | 247 --- resources/pe_dark/scalable/copy.svg | 51 +- resources/pe_dark/scalable/coremods.svg | 41 + resources/pe_dark/scalable/externaltools.svg | 41 + resources/pe_dark/scalable/jarmods.svg | 41 + resources/pe_dark/scalable/java.svg | 48 + resources/pe_dark/scalable/loadermods.svg | 42 + resources/pe_dark/scalable/log.svg | 41 + resources/pe_dark/scalable/minecraft.svg | 44 + resources/pe_dark/scalable/multimc.svg | 61 + resources/pe_dark/scalable/new.svg | 53 +- resources/pe_dark/scalable/news.svg | 13 + resources/pe_dark/scalable/notes.svg | 46 + resources/pe_dark/scalable/patreon.svg | 53 +- resources/pe_dark/scalable/proxy.svg | 43 + resources/pe_dark/scalable/quickmods.svg | 43 + resources/pe_dark/scalable/refresh.svg | 52 +- resources/pe_dark/scalable/resourcepacks.svg | 13 + resources/pe_dark/scalable/screenshots.svg | 44 + resources/pe_dark/scalable/settings.svg | 69 +- resources/pe_dark/scalable/status-bad.svg | 103 ++ resources/pe_dark/scalable/status-good.svg | 114 ++ resources/pe_dark/scalable/viewfolder.svg | 51 +- resources/pe_light/16x16/status-bad.png | Bin 468 -> 0 bytes resources/pe_light/16x16/status-good.png | Bin 527 -> 0 bytes resources/pe_light/22x22/status-bad.png | Bin 592 -> 0 bytes resources/pe_light/22x22/status-good.png | Bin 665 -> 0 bytes resources/pe_light/24x24/status-bad.png | Bin 605 -> 0 bytes resources/pe_light/24x24/status-good.png | Bin 676 -> 0 bytes resources/pe_light/32x32/status-bad.png | Bin 839 -> 0 bytes resources/pe_light/32x32/status-good.png | Bin 802 -> 0 bytes resources/pe_light/48x48/status-bad.png | Bin 1162 -> 0 bytes resources/pe_light/48x48/status-good.png | Bin 1159 -> 0 bytes resources/pe_light/64x64/status-bad.png | Bin 1413 -> 0 bytes resources/pe_light/64x64/status-good.png | Bin 1478 -> 0 bytes resources/pe_light/index.theme | 30 +- resources/pe_light/pe_light.qrc | 67 +- resources/pe_light/scalable/about.svg | 28 +- resources/pe_light/scalable/accounts.svg | 46 + resources/pe_light/scalable/bug.svg | 87 +- resources/pe_light/scalable/centralmods.svg | 51 +- resources/pe_light/scalable/checkupdate.svg | 57 +- resources/pe_light/scalable/console.svg | 228 --- resources/pe_light/scalable/console_error.svg | 247 --- resources/pe_light/scalable/copy.svg | 50 +- resources/pe_light/scalable/coremods.svg | 41 + resources/pe_light/scalable/externaltools.svg | 41 + resources/pe_light/scalable/jarmods.svg | 41 + resources/pe_light/scalable/java.svg | 49 + resources/pe_light/scalable/loadermods.svg | 42 + resources/pe_light/scalable/log.svg | 41 + resources/pe_light/scalable/minecraft.svg | 44 + resources/pe_light/scalable/multimc.svg | 61 + resources/pe_light/scalable/new.svg | 52 +- resources/pe_light/scalable/news.svg | 307 +--- resources/pe_light/scalable/notes.svg | 46 + resources/pe_light/scalable/patreon.svg | 123 +- resources/pe_light/scalable/proxy.svg | 45 + resources/pe_light/scalable/quickmods.svg | 43 + resources/pe_light/scalable/refresh.svg | 51 +- resources/pe_light/scalable/resourcepacks.svg | 13 + resources/pe_light/scalable/screenshots.svg | 44 + resources/pe_light/scalable/settings.svg | 95 +- resources/pe_light/scalable/status-bad.svg | 103 ++ resources/pe_light/scalable/status-good.svg | 114 ++ resources/pe_light/scalable/viewfolder.svg | 49 +- 181 files changed, 6401 insertions(+), 3898 deletions(-) create mode 100644 resources/multimc/16x16/coremods.png create mode 100644 resources/multimc/16x16/jarmods.png create mode 100644 resources/multimc/16x16/loadermods.png delete mode 100644 resources/multimc/16x16/plugin-blue.png delete mode 100644 resources/multimc/16x16/plugin-green.png delete mode 100644 resources/multimc/16x16/plugin-red.png create mode 100644 resources/multimc/24x24/coremods.png create mode 100644 resources/multimc/24x24/jarmods.png create mode 100644 resources/multimc/24x24/loadermods.png delete mode 100644 resources/multimc/24x24/plugin-blue.png delete mode 100644 resources/multimc/24x24/plugin-green.png delete mode 100644 resources/multimc/24x24/plugin-red.png create mode 100644 resources/multimc/32x32/coremods.png create mode 100644 resources/multimc/32x32/jarmods.png create mode 100644 resources/multimc/32x32/loadermods.png delete mode 100644 resources/multimc/32x32/plugin-blue.png delete mode 100644 resources/multimc/32x32/plugin-green.png delete mode 100644 resources/multimc/32x32/plugin-red.png create mode 100644 resources/multimc/64x64/coremods.png create mode 100644 resources/multimc/64x64/jarmods.png create mode 100644 resources/multimc/64x64/loadermods.png delete mode 100644 resources/multimc/64x64/plugin-blue.png delete mode 100644 resources/multimc/64x64/plugin-green.png delete mode 100644 resources/multimc/64x64/plugin-red.png delete mode 100644 resources/multimc/scalable/apps/multimc.svg create mode 100644 resources/multimc/scalable/multimc.svg create mode 100644 resources/pe_blue/index.theme create mode 100644 resources/pe_blue/pe_blue.qrc create mode 100644 resources/pe_blue/scalable/about.svg create mode 100644 resources/pe_blue/scalable/accounts.svg create mode 100644 resources/pe_blue/scalable/bug.svg create mode 100644 resources/pe_blue/scalable/centralmods.svg create mode 100644 resources/pe_blue/scalable/checkupdate.svg create mode 100644 resources/pe_blue/scalable/copy.svg create mode 100644 resources/pe_blue/scalable/coremods.svg create mode 100644 resources/pe_blue/scalable/externaltools.svg create mode 100644 resources/pe_blue/scalable/jarmods.svg create mode 100644 resources/pe_blue/scalable/java.svg create mode 100644 resources/pe_blue/scalable/loadermods.svg create mode 100644 resources/pe_blue/scalable/log.svg create mode 100644 resources/pe_blue/scalable/minecraft.svg create mode 100644 resources/pe_blue/scalable/multimc.svg create mode 100644 resources/pe_blue/scalable/new.svg create mode 100644 resources/pe_blue/scalable/news.svg create mode 100644 resources/pe_blue/scalable/notes.svg create mode 100644 resources/pe_blue/scalable/patreon.svg create mode 100644 resources/pe_blue/scalable/proxy.svg create mode 100644 resources/pe_blue/scalable/quickmods.svg create mode 100644 resources/pe_blue/scalable/refresh.svg create mode 100644 resources/pe_blue/scalable/resourcepacks.svg create mode 100644 resources/pe_blue/scalable/screenshots.svg create mode 100644 resources/pe_blue/scalable/settings.svg create mode 100644 resources/pe_blue/scalable/status-bad.svg create mode 100644 resources/pe_blue/scalable/status-good.svg create mode 100644 resources/pe_blue/scalable/viewfolder.svg create mode 100644 resources/pe_colored/index.theme create mode 100644 resources/pe_colored/pe_colored.qrc create mode 100644 resources/pe_colored/scalable/about.svg create mode 100644 resources/pe_colored/scalable/accounts.svg create mode 100644 resources/pe_colored/scalable/bug.svg create mode 100644 resources/pe_colored/scalable/centralmods.svg create mode 100644 resources/pe_colored/scalable/checkupdate.svg create mode 100644 resources/pe_colored/scalable/copy.svg create mode 100644 resources/pe_colored/scalable/coremods.svg create mode 100644 resources/pe_colored/scalable/externaltools.svg create mode 100644 resources/pe_colored/scalable/jarmods.svg create mode 100644 resources/pe_colored/scalable/java.svg create mode 100644 resources/pe_colored/scalable/loadermods.svg create mode 100644 resources/pe_colored/scalable/log.svg create mode 100644 resources/pe_colored/scalable/minecraft.svg create mode 100644 resources/pe_colored/scalable/multimc.svg create mode 100644 resources/pe_colored/scalable/new.svg create mode 100644 resources/pe_colored/scalable/news.svg create mode 100644 resources/pe_colored/scalable/notes.svg create mode 100644 resources/pe_colored/scalable/patreon.svg create mode 100644 resources/pe_colored/scalable/proxy.svg create mode 100644 resources/pe_colored/scalable/quickmods.svg create mode 100644 resources/pe_colored/scalable/refresh.svg create mode 100644 resources/pe_colored/scalable/resourcepacks.svg create mode 100644 resources/pe_colored/scalable/screenshots.svg create mode 100644 resources/pe_colored/scalable/settings.svg create mode 100644 resources/pe_colored/scalable/status-bad.svg create mode 100644 resources/pe_colored/scalable/status-good.svg create mode 100644 resources/pe_colored/scalable/viewfolder.svg delete mode 100644 resources/pe_dark/16x16/status-bad.png delete mode 100644 resources/pe_dark/16x16/status-good.png delete mode 100644 resources/pe_dark/22x22/status-bad.png delete mode 100644 resources/pe_dark/22x22/status-good.png delete mode 100644 resources/pe_dark/24x24/status-bad.png delete mode 100644 resources/pe_dark/24x24/status-good.png delete mode 100644 resources/pe_dark/32x32/status-bad.png delete mode 100644 resources/pe_dark/32x32/status-good.png delete mode 100644 resources/pe_dark/48x48/status-bad.png delete mode 100644 resources/pe_dark/48x48/status-good.png delete mode 100644 resources/pe_dark/64x64/status-bad.png delete mode 100644 resources/pe_dark/64x64/status-good.png create mode 100644 resources/pe_dark/scalable/accounts.svg delete mode 100644 resources/pe_dark/scalable/console.svg delete mode 100644 resources/pe_dark/scalable/console_error.svg create mode 100644 resources/pe_dark/scalable/coremods.svg create mode 100644 resources/pe_dark/scalable/externaltools.svg create mode 100644 resources/pe_dark/scalable/jarmods.svg create mode 100644 resources/pe_dark/scalable/java.svg create mode 100644 resources/pe_dark/scalable/loadermods.svg create mode 100644 resources/pe_dark/scalable/log.svg create mode 100644 resources/pe_dark/scalable/minecraft.svg create mode 100644 resources/pe_dark/scalable/multimc.svg create mode 100644 resources/pe_dark/scalable/news.svg create mode 100644 resources/pe_dark/scalable/notes.svg create mode 100644 resources/pe_dark/scalable/proxy.svg create mode 100644 resources/pe_dark/scalable/quickmods.svg create mode 100644 resources/pe_dark/scalable/resourcepacks.svg create mode 100644 resources/pe_dark/scalable/screenshots.svg create mode 100644 resources/pe_dark/scalable/status-bad.svg create mode 100644 resources/pe_dark/scalable/status-good.svg delete mode 100644 resources/pe_light/16x16/status-bad.png delete mode 100644 resources/pe_light/16x16/status-good.png delete mode 100644 resources/pe_light/22x22/status-bad.png delete mode 100644 resources/pe_light/22x22/status-good.png delete mode 100644 resources/pe_light/24x24/status-bad.png delete mode 100644 resources/pe_light/24x24/status-good.png delete mode 100644 resources/pe_light/32x32/status-bad.png delete mode 100644 resources/pe_light/32x32/status-good.png delete mode 100644 resources/pe_light/48x48/status-bad.png delete mode 100644 resources/pe_light/48x48/status-good.png delete mode 100644 resources/pe_light/64x64/status-bad.png delete mode 100644 resources/pe_light/64x64/status-good.png create mode 100644 resources/pe_light/scalable/accounts.svg delete mode 100644 resources/pe_light/scalable/console.svg delete mode 100644 resources/pe_light/scalable/console_error.svg create mode 100644 resources/pe_light/scalable/coremods.svg create mode 100644 resources/pe_light/scalable/externaltools.svg create mode 100644 resources/pe_light/scalable/jarmods.svg create mode 100644 resources/pe_light/scalable/java.svg create mode 100644 resources/pe_light/scalable/loadermods.svg create mode 100644 resources/pe_light/scalable/log.svg create mode 100644 resources/pe_light/scalable/minecraft.svg create mode 100644 resources/pe_light/scalable/multimc.svg create mode 100644 resources/pe_light/scalable/notes.svg create mode 100644 resources/pe_light/scalable/proxy.svg create mode 100644 resources/pe_light/scalable/quickmods.svg create mode 100644 resources/pe_light/scalable/resourcepacks.svg create mode 100644 resources/pe_light/scalable/screenshots.svg create mode 100644 resources/pe_light/scalable/status-bad.svg create mode 100644 resources/pe_light/scalable/status-good.svg diff --git a/CMakeLists.txt b/CMakeLists.txt index fc7c521b..88e72353 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -716,6 +716,8 @@ set(MULTIMC_QRCS resources/multimc/multimc.qrc resources/pe_dark/pe_dark.qrc resources/pe_light/pe_light.qrc + resources/pe_colored/pe_colored.qrc + resources/pe_blue/pe_blue.qrc resources/instances/instances.qrc resources/versions/versions.qrc ) diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui index a3edf6bd..9fce38c4 100644 --- a/gui/MainWindow.ui +++ b/gui/MainWindow.ui @@ -501,6 +501,8 @@ + + diff --git a/gui/pages/LegacyJarModPage.h b/gui/pages/LegacyJarModPage.h index 1a72abf3..90c7f228 100644 --- a/gui/pages/LegacyJarModPage.h +++ b/gui/pages/LegacyJarModPage.h @@ -41,7 +41,7 @@ public: } virtual QIcon icon() const { - return QIcon::fromTheme("plugin-red"); + return QIcon::fromTheme("jarmods"); } virtual QString id() const { diff --git a/gui/pages/global/ExternalToolsPage.h b/gui/pages/global/ExternalToolsPage.h index 027e164e..1188f22b 100644 --- a/gui/pages/global/ExternalToolsPage.h +++ b/gui/pages/global/ExternalToolsPage.h @@ -37,7 +37,7 @@ public: } QIcon icon() const override { - return QIcon::fromTheme("plugin-blue"); + return QIcon::fromTheme("externaltools"); } QString id() const override { diff --git a/gui/pages/global/MultiMCPage.cpp b/gui/pages/global/MultiMCPage.cpp index 73a5ff20..9694a138 100644 --- a/gui/pages/global/MultiMCPage.cpp +++ b/gui/pages/global/MultiMCPage.cpp @@ -276,6 +276,12 @@ void MultiMCPage::applySettings() case 2: s->set("IconTheme", "pe_light"); break; + case 3: + s->set("IconTheme", "pe_blue"); + break; + case 4: + s->set("IconTheme", "pe_colored"); + break; case 0: default: s->set("IconTheme", "multimc"); @@ -333,6 +339,14 @@ void MultiMCPage::loadSettings() { ui->themeComboBox->setCurrentIndex(2); } + else if (theme == "pe_blue") + { + ui->themeComboBox->setCurrentIndex(3); + } + else if (theme == "pe_colored") + { + ui->themeComboBox->setCurrentIndex(4); + } else { ui->themeComboBox->setCurrentIndex(0); diff --git a/gui/pages/global/MultiMCPage.ui b/gui/pages/global/MultiMCPage.ui index f456ebc1..94592476 100644 --- a/gui/pages/global/MultiMCPage.ui +++ b/gui/pages/global/MultiMCPage.ui @@ -336,7 +336,7 @@ - Simple + Simple (Dark Icons) @@ -344,6 +344,16 @@ Simple (Light Icons) + + + Simple (Blue Icons) + + + + + Simple (Colored Icons) + + diff --git a/gui/widgets/IconLabel.cpp b/gui/widgets/IconLabel.cpp index 773f0b99..86c8a431 100644 --- a/gui/widgets/IconLabel.cpp +++ b/gui/widgets/IconLabel.cpp @@ -26,5 +26,18 @@ void IconLabel::setIcon(QIcon icon) void IconLabel::paintEvent(QPaintEvent *) { QPainter p(this); - m_icon.paint(&p, contentsRect()); + QRect rect = contentsRect(); + int width = rect.width(); + int height = rect.height(); + if(width < height) + { + rect.setHeight(width); + rect.translate(0, (height - width) / 2); + } + else if (width > height) + { + rect.setWidth(height); + rect.translate((width - height) / 2, 0); + } + m_icon.paint(&p, rect); } diff --git a/logic/LegacyInstance.cpp b/logic/LegacyInstance.cpp index eede7070..47fc3eb9 100644 --- a/logic/LegacyInstance.cpp +++ b/logic/LegacyInstance.cpp @@ -53,9 +53,9 @@ QList LegacyInstance::getPages() // FIXME: actually implement the legacy instance upgrade, then enable this. //values.append(new LegacyUpgradePage(this)); values.append(new LegacyJarModPage(this)); - values.append(new ModFolderPage(this, loaderModList(), "mods", "plugin-blue", tr("Loader mods"), + values.append(new ModFolderPage(this, loaderModList(), "mods", "loadermods", tr("Loader mods"), "Loader-mods")); - values.append(new ModFolderPage(this, coreModList(), "coremods", "plugin-green", tr("Core mods"), + values.append(new ModFolderPage(this, coreModList(), "coremods", "coremods", tr("Core mods"), "Core-mods")); values.append(new TexturePackPage(this)); values.append(new NotesPage(this)); diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp index 00d8a9db..fcfe4ac3 100644 --- a/logic/OneSixInstance.cpp +++ b/logic/OneSixInstance.cpp @@ -64,9 +64,9 @@ QList OneSixInstance::getPages() { QList values; values.append(new VersionPage(this)); - values.append(new ModFolderPage(this, loaderModList(), "mods", "plugin-blue", + values.append(new ModFolderPage(this, loaderModList(), "mods", "loadermods", tr("Loader mods"), "Loader-mods")); - values.append(new CoreModFolderPage(this, coreModList(), "coremods", "plugin-green", + values.append(new CoreModFolderPage(this, coreModList(), "coremods", "coremods", tr("Core mods"), "Core-mods")); values.append(new ResourcePackPage(this)); values.append(new TexturePackPage(this)); diff --git a/main.cpp b/main.cpp index 988649e5..87a33f91 100644 --- a/main.cpp +++ b/main.cpp @@ -37,6 +37,8 @@ int main(int argc, char *argv[]) #endif Q_INIT_RESOURCE(pe_dark); Q_INIT_RESOURCE(pe_light); + Q_INIT_RESOURCE(pe_blue); + Q_INIT_RESOURCE(pe_colored); switch (app.status()) { diff --git a/resources/multimc/16x16/coremods.png b/resources/multimc/16x16/coremods.png new file mode 100644 index 00000000..af0f1166 Binary files /dev/null and b/resources/multimc/16x16/coremods.png differ diff --git a/resources/multimc/16x16/jarmods.png b/resources/multimc/16x16/jarmods.png new file mode 100644 index 00000000..1a97c9c0 Binary files /dev/null and b/resources/multimc/16x16/jarmods.png differ diff --git a/resources/multimc/16x16/loadermods.png b/resources/multimc/16x16/loadermods.png new file mode 100644 index 00000000..b5ab3fce Binary files /dev/null and b/resources/multimc/16x16/loadermods.png differ diff --git a/resources/multimc/16x16/plugin-blue.png b/resources/multimc/16x16/plugin-blue.png deleted file mode 100644 index b5ab3fce..00000000 Binary files a/resources/multimc/16x16/plugin-blue.png and /dev/null differ diff --git a/resources/multimc/16x16/plugin-green.png b/resources/multimc/16x16/plugin-green.png deleted file mode 100644 index af0f1166..00000000 Binary files a/resources/multimc/16x16/plugin-green.png and /dev/null differ diff --git a/resources/multimc/16x16/plugin-red.png b/resources/multimc/16x16/plugin-red.png deleted file mode 100644 index 1a97c9c0..00000000 Binary files a/resources/multimc/16x16/plugin-red.png and /dev/null differ diff --git a/resources/multimc/24x24/coremods.png b/resources/multimc/24x24/coremods.png new file mode 100644 index 00000000..90603d24 Binary files /dev/null and b/resources/multimc/24x24/coremods.png differ diff --git a/resources/multimc/24x24/jarmods.png b/resources/multimc/24x24/jarmods.png new file mode 100644 index 00000000..68cb8e9d Binary files /dev/null and b/resources/multimc/24x24/jarmods.png differ diff --git a/resources/multimc/24x24/loadermods.png b/resources/multimc/24x24/loadermods.png new file mode 100644 index 00000000..250a6260 Binary files /dev/null and b/resources/multimc/24x24/loadermods.png differ diff --git a/resources/multimc/24x24/plugin-blue.png b/resources/multimc/24x24/plugin-blue.png deleted file mode 100644 index 250a6260..00000000 Binary files a/resources/multimc/24x24/plugin-blue.png and /dev/null differ diff --git a/resources/multimc/24x24/plugin-green.png b/resources/multimc/24x24/plugin-green.png deleted file mode 100644 index 90603d24..00000000 Binary files a/resources/multimc/24x24/plugin-green.png and /dev/null differ diff --git a/resources/multimc/24x24/plugin-red.png b/resources/multimc/24x24/plugin-red.png deleted file mode 100644 index 68cb8e9d..00000000 Binary files a/resources/multimc/24x24/plugin-red.png and /dev/null differ diff --git a/resources/multimc/32x32/coremods.png b/resources/multimc/32x32/coremods.png new file mode 100644 index 00000000..770d695e Binary files /dev/null and b/resources/multimc/32x32/coremods.png differ diff --git a/resources/multimc/32x32/jarmods.png b/resources/multimc/32x32/jarmods.png new file mode 100644 index 00000000..5cda173a Binary files /dev/null and b/resources/multimc/32x32/jarmods.png differ diff --git a/resources/multimc/32x32/loadermods.png b/resources/multimc/32x32/loadermods.png new file mode 100644 index 00000000..c4ca12e2 Binary files /dev/null and b/resources/multimc/32x32/loadermods.png differ diff --git a/resources/multimc/32x32/plugin-blue.png b/resources/multimc/32x32/plugin-blue.png deleted file mode 100644 index c4ca12e2..00000000 Binary files a/resources/multimc/32x32/plugin-blue.png and /dev/null differ diff --git a/resources/multimc/32x32/plugin-green.png b/resources/multimc/32x32/plugin-green.png deleted file mode 100644 index 770d695e..00000000 Binary files a/resources/multimc/32x32/plugin-green.png and /dev/null differ diff --git a/resources/multimc/32x32/plugin-red.png b/resources/multimc/32x32/plugin-red.png deleted file mode 100644 index 5cda173a..00000000 Binary files a/resources/multimc/32x32/plugin-red.png and /dev/null differ diff --git a/resources/multimc/64x64/coremods.png b/resources/multimc/64x64/coremods.png new file mode 100644 index 00000000..668be334 Binary files /dev/null and b/resources/multimc/64x64/coremods.png differ diff --git a/resources/multimc/64x64/jarmods.png b/resources/multimc/64x64/jarmods.png new file mode 100644 index 00000000..55d1a42a Binary files /dev/null and b/resources/multimc/64x64/jarmods.png differ diff --git a/resources/multimc/64x64/loadermods.png b/resources/multimc/64x64/loadermods.png new file mode 100644 index 00000000..24618fd0 Binary files /dev/null and b/resources/multimc/64x64/loadermods.png differ diff --git a/resources/multimc/64x64/plugin-blue.png b/resources/multimc/64x64/plugin-blue.png deleted file mode 100644 index 24618fd0..00000000 Binary files a/resources/multimc/64x64/plugin-blue.png and /dev/null differ diff --git a/resources/multimc/64x64/plugin-green.png b/resources/multimc/64x64/plugin-green.png deleted file mode 100644 index 668be334..00000000 Binary files a/resources/multimc/64x64/plugin-green.png and /dev/null differ diff --git a/resources/multimc/64x64/plugin-red.png b/resources/multimc/64x64/plugin-red.png deleted file mode 100644 index 55d1a42a..00000000 Binary files a/resources/multimc/64x64/plugin-red.png and /dev/null differ diff --git a/resources/multimc/multimc.qrc b/resources/multimc/multimc.qrc index b0a1b3ab..9be22c7b 100644 --- a/resources/multimc/multimc.qrc +++ b/resources/multimc/multimc.qrc @@ -3,7 +3,7 @@ index.theme - scalable/apps/multimc.svg + scalable/multimc.svg scalable/console.svg @@ -126,22 +126,22 @@ 64x64/status-good.png - 16x16/plugin-blue.png - 24x24/plugin-blue.png - 32x32/plugin-blue.png - 64x64/plugin-blue.png + 16x16/loadermods.png + 24x24/loadermods.png + 32x32/loadermods.png + 64x64/loadermods.png - 16x16/plugin-red.png - 24x24/plugin-red.png - 32x32/plugin-red.png - 64x64/plugin-red.png + 16x16/jarmods.png + 24x24/jarmods.png + 32x32/jarmods.png + 64x64/jarmods.png - 16x16/plugin-green.png - 24x24/plugin-green.png - 32x32/plugin-green.png - 64x64/plugin-green.png + 16x16/coremods.png + 24x24/coremods.png + 32x32/coremods.png + 64x64/coremods.png 16x16/resourcepacks.png diff --git a/resources/multimc/scalable/apps/multimc.svg b/resources/multimc/scalable/apps/multimc.svg deleted file mode 100644 index 178509ac..00000000 --- a/resources/multimc/scalable/apps/multimc.svg +++ /dev/null @@ -1,1993 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -