From d8413fa5ec594455b3cdec86899b61adba39eb33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 19 Jan 2014 04:52:34 +0100 Subject: [PATCH] Use icon theme so we can have more than one icon size per icon --- CMakeLists.txt | 10 +- graphics.qrc | 51 --- gui/MainWindow.cpp | 31 +- gui/MainWindow.ui | 41 +-- main.cpp | 5 +- resources/{icons => }/MultiMC.ico | Bin resources/XdgIcon.theme | 12 - resources/backgrounds/backgrounds.qrc | 6 + resources/{ => backgrounds}/catbgrnd2.png | Bin resources/{icons => }/instances/brick.png | Bin resources/{icons => }/instances/chicken.png | Bin .../{icons => }/instances/chicken128.png | Bin resources/{icons => }/instances/creeper.png | Bin .../{icons => }/instances/creeper128.png | Bin resources/{icons => }/instances/derp.png | Bin resources/{icons => }/instances/diamond.png | Bin resources/{icons => }/instances/dirt.png | Bin resources/{icons => }/instances/enderman.png | Bin .../{icons => }/instances/enderpearl.png | Bin .../{icons => }/instances/enderpearl128.png | Bin resources/{icons => }/instances/ftb_glow.png | Bin .../{icons => }/instances/ftb_glow128.png | Bin resources/{icons => }/instances/ftb_logo.png | Bin .../{icons => }/instances/ftb_logo128.png | Bin resources/{icons => }/instances/gear.png | Bin resources/{icons => }/instances/gear128.png | Bin resources/{icons => }/instances/gold.png | Bin resources/{icons => }/instances/grass.png | Bin resources/{icons => }/instances/herobrine.png | Bin .../{icons => }/instances/herobrine128.png | Bin resources/{icons => }/instances/infinity.png | Bin .../{icons => }/instances/infinity128.png | Bin resources/instances/instances.qrc | 30 ++ resources/{icons => }/instances/iron.png | Bin resources/{icons => }/instances/magitech.png | Bin .../{icons => }/instances/magitech128.png | Bin resources/{icons => }/instances/meat.png | Bin resources/{icons => }/instances/meat128.png | Bin .../{icons => }/instances/netherstar.png | Bin .../{icons => }/instances/netherstar128.png | Bin resources/{icons => }/instances/planks.png | Bin resources/{icons => }/instances/skeleton.png | Bin .../{icons => }/instances/skeleton128.png | Bin .../{icons => }/instances/squarecreeper.png | Bin .../instances/squarecreeper128.png | Bin resources/{icons => }/instances/steve.png | Bin resources/{icons => }/instances/steve128.png | Bin resources/{icons => }/instances/stone.png | Bin resources/{icons => }/instances/tnt.png | Bin resources/multimc/16x16/noaccount.png | Bin 0 -> 334 bytes resources/multimc/16x16/refresh.png | Bin 0 -> 1389 bytes .../toolbar => multimc/22x22}/about.png | Bin .../ReportBug.png => multimc/22x22/bug.png} | Bin .../toolbar => multimc/22x22}/centralmods.png | Bin .../toolbar => multimc/22x22}/checkupdate.png | Bin .../InstCopy.png => multimc/22x22/copy.png} | Bin .../{icons/toolbar => multimc/22x22}/help.png | Bin .../{icons/toolbar => multimc/22x22}/new.png | Bin .../NewsIcon.png => multimc/22x22/news.png} | Bin .../toolbar => multimc/22x22}/refresh.png | Bin .../toolbar => multimc/22x22}/settings.png | Bin .../toolbar => multimc/22x22}/viewfolder.png | Bin .../toolbar/Cat.png => multimc/24x24/cat.png} | Bin resources/multimc/24x24/noaccount.png | Bin 0 -> 344 bytes resources/multimc/24x24/refresh.png | Bin 0 -> 2116 bytes resources/multimc/32x32/noaccount.png | Bin 0 -> 363 bytes resources/multimc/32x32/refresh.png | Bin 0 -> 2822 bytes resources/multimc/48x48/noaccount.png | Bin 0 -> 387 bytes resources/multimc/48x48/refresh.png | Bin 0 -> 3922 bytes .../8x8/noaccount.png} | Bin resources/multimc/index.theme | 30 ++ resources/multimc/multimc.qrc | 32 ++ .../scalable/apps}/multimc.svg | 0 .../toolbar_svg => multimc/scalable}/bug.svg | 0 .../{icons => multimc/scalable}/console.svg | 0 .../scalable}/console_error.svg | 0 .../toolbar_svg => multimc/scalable}/news.svg | 0 .../instances_svg => sources}/clucker.svg | 0 .../instances_svg => sources}/creeper.svg | 0 .../instances_svg => sources}/enderpearl.svg | 0 .../instances_svg => sources}/ftb-glow.svg | 0 .../instances_svg => sources}/ftb-logo.svg | 0 .../{icons/instances_svg => sources}/gear.svg | 0 .../instances_svg => sources}/herobrine.svg | 0 .../instances_svg => sources}/magitech.svg | 0 .../{icons/instances_svg => sources}/meat.svg | 0 .../instances_svg => sources}/netherstar.svg | 0 .../instances_svg => sources}/pskeleton.svg | 0 .../instances_svg => sources}/skeleton.svg | 0 .../squarecreeper.svg | 0 resources/sources/status-bad.svg | 262 ++++++++++++++++ resources/sources/status-good.svg | 293 ++++++++++++++++++ resources/sources/status-terrible.svg | 262 ++++++++++++++++ .../instances_svg => sources}/steve.svg | 0 94 files changed, 953 insertions(+), 112 deletions(-) delete mode 100644 graphics.qrc rename resources/{icons => }/MultiMC.ico (100%) delete mode 100644 resources/XdgIcon.theme create mode 100644 resources/backgrounds/backgrounds.qrc rename resources/{ => backgrounds}/catbgrnd2.png (100%) rename resources/{icons => }/instances/brick.png (100%) rename resources/{icons => }/instances/chicken.png (100%) rename resources/{icons => }/instances/chicken128.png (100%) rename resources/{icons => }/instances/creeper.png (100%) rename resources/{icons => }/instances/creeper128.png (100%) rename resources/{icons => }/instances/derp.png (100%) rename resources/{icons => }/instances/diamond.png (100%) rename resources/{icons => }/instances/dirt.png (100%) rename resources/{icons => }/instances/enderman.png (100%) rename resources/{icons => }/instances/enderpearl.png (100%) rename resources/{icons => }/instances/enderpearl128.png (100%) rename resources/{icons => }/instances/ftb_glow.png (100%) rename resources/{icons => }/instances/ftb_glow128.png (100%) rename resources/{icons => }/instances/ftb_logo.png (100%) rename resources/{icons => }/instances/ftb_logo128.png (100%) rename resources/{icons => }/instances/gear.png (100%) rename resources/{icons => }/instances/gear128.png (100%) rename resources/{icons => }/instances/gold.png (100%) rename resources/{icons => }/instances/grass.png (100%) rename resources/{icons => }/instances/herobrine.png (100%) rename resources/{icons => }/instances/herobrine128.png (100%) rename resources/{icons => }/instances/infinity.png (100%) rename resources/{icons => }/instances/infinity128.png (100%) create mode 100644 resources/instances/instances.qrc rename resources/{icons => }/instances/iron.png (100%) rename resources/{icons => }/instances/magitech.png (100%) rename resources/{icons => }/instances/magitech128.png (100%) rename resources/{icons => }/instances/meat.png (100%) rename resources/{icons => }/instances/meat128.png (100%) rename resources/{icons => }/instances/netherstar.png (100%) rename resources/{icons => }/instances/netherstar128.png (100%) rename resources/{icons => }/instances/planks.png (100%) rename resources/{icons => }/instances/skeleton.png (100%) rename resources/{icons => }/instances/skeleton128.png (100%) rename resources/{icons => }/instances/squarecreeper.png (100%) rename resources/{icons => }/instances/squarecreeper128.png (100%) rename resources/{icons => }/instances/steve.png (100%) rename resources/{icons => }/instances/steve128.png (100%) rename resources/{icons => }/instances/stone.png (100%) rename resources/{icons => }/instances/tnt.png (100%) create mode 100644 resources/multimc/16x16/noaccount.png create mode 100644 resources/multimc/16x16/refresh.png rename resources/{icons/toolbar => multimc/22x22}/about.png (100%) rename resources/{icons/toolbar/ReportBug.png => multimc/22x22/bug.png} (100%) rename resources/{icons/toolbar => multimc/22x22}/centralmods.png (100%) rename resources/{icons/toolbar => multimc/22x22}/checkupdate.png (100%) rename resources/{icons/toolbar/InstCopy.png => multimc/22x22/copy.png} (100%) rename resources/{icons/toolbar => multimc/22x22}/help.png (100%) rename resources/{icons/toolbar => multimc/22x22}/new.png (100%) rename resources/{icons/toolbar/NewsIcon.png => multimc/22x22/news.png} (100%) rename resources/{icons/toolbar => multimc/22x22}/refresh.png (100%) rename resources/{icons/toolbar => multimc/22x22}/settings.png (100%) rename resources/{icons/toolbar => multimc/22x22}/viewfolder.png (100%) rename resources/{icons/toolbar/Cat.png => multimc/24x24/cat.png} (100%) create mode 100644 resources/multimc/24x24/noaccount.png create mode 100644 resources/multimc/24x24/refresh.png create mode 100644 resources/multimc/32x32/noaccount.png create mode 100644 resources/multimc/32x32/refresh.png create mode 100644 resources/multimc/48x48/noaccount.png create mode 100644 resources/multimc/48x48/refresh.png rename resources/{icons/toolbar/NoAccount.png => multimc/8x8/noaccount.png} (100%) create mode 100644 resources/multimc/index.theme create mode 100644 resources/multimc/multimc.qrc rename resources/{icons => multimc/scalable/apps}/multimc.svg (100%) rename resources/{icons/toolbar_svg => multimc/scalable}/bug.svg (100%) rename resources/{icons => multimc/scalable}/console.svg (100%) rename resources/{icons => multimc/scalable}/console_error.svg (100%) rename resources/{icons/toolbar_svg => multimc/scalable}/news.svg (100%) rename resources/{icons/instances_svg => sources}/clucker.svg (100%) rename resources/{icons/instances_svg => sources}/creeper.svg (100%) rename resources/{icons/instances_svg => sources}/enderpearl.svg (100%) rename resources/{icons/instances_svg => sources}/ftb-glow.svg (100%) rename resources/{icons/instances_svg => sources}/ftb-logo.svg (100%) rename resources/{icons/instances_svg => sources}/gear.svg (100%) rename resources/{icons/instances_svg => sources}/herobrine.svg (100%) rename resources/{icons/instances_svg => sources}/magitech.svg (100%) rename resources/{icons/instances_svg => sources}/meat.svg (100%) rename resources/{icons/instances_svg => sources}/netherstar.svg (100%) rename resources/{icons/instances_svg => sources}/pskeleton.svg (100%) rename resources/{icons/instances_svg => sources}/skeleton.svg (100%) rename resources/{icons/instances_svg => sources}/squarecreeper.svg (100%) create mode 100644 resources/sources/status-bad.svg create mode 100644 resources/sources/status-good.svg create mode 100644 resources/sources/status-terrible.svg rename resources/{icons/instances_svg => sources}/steve.svg (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c0a4439b2..f2ccdab0a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -519,6 +519,12 @@ gui/widgets/MCModInfoFrame.ui set (FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${MULTIMC_SOURCES} ${MULTIMC_UIS}) +SET(MULTIMC_QRCS +resources/backgrounds/backgrounds.qrc +resources/multimc/multimc.qrc +resources/instances/instances.qrc +) + ######## Windows resource files ######## IF(WIN32) @@ -562,10 +568,10 @@ ENDIF(MultiMC_CODE_COVERAGE) # Qt 5 stuff QT5_WRAP_UI(MULTIMC_UI ${MULTIMC_UIS}) -QT5_ADD_RESOURCES(GRAPHICS_QRC graphics.qrc) +QT5_ADD_RESOURCES(MULTIMC_RESOURCES ${MULTIMC_QRCS}) # Add common library -ADD_LIBRARY(MultiMC_common STATIC ${MULTIMC_SOURCES} ${MULTIMC_UI} ${GRAPHICS_QRC}) +ADD_LIBRARY(MultiMC_common STATIC ${MULTIMC_SOURCES} ${MULTIMC_UI} ${MULTIMC_RESOURCES}) # Add executable ADD_EXECUTABLE(MultiMC MACOSX_BUNDLE WIN32 main.cpp ${MULTIMC_RCS}) diff --git a/graphics.qrc b/graphics.qrc deleted file mode 100644 index 68d3beed2..000000000 --- a/graphics.qrc +++ /dev/null @@ -1,51 +0,0 @@ - - - resources/icons/toolbar/about.png - resources/icons/toolbar/ReportBug.png - resources/icons/toolbar/centralmods.png - resources/icons/toolbar/checkupdate.png - resources/icons/toolbar/help.png - resources/icons/toolbar/new.png - resources/icons/toolbar/InstCopy.png - resources/icons/toolbar/NewsIcon.png - resources/icons/toolbar/refresh.png - resources/icons/toolbar/settings.png - resources/icons/toolbar/viewfolder.png - resources/icons/toolbar/Cat.png - resources/icons/toolbar/NoAccount.png - - - resources/icons/instances/brick.png - resources/icons/instances/chicken128.png - resources/icons/instances/creeper128.png - resources/icons/instances/derp.png - resources/icons/instances/diamond.png - resources/icons/instances/dirt.png - resources/icons/instances/enderman.png - resources/icons/instances/enderpearl128.png - resources/icons/instances/ftb_glow128.png - resources/icons/instances/ftb_logo128.png - resources/icons/instances/gear128.png - resources/icons/instances/gold.png - resources/icons/instances/grass.png - resources/icons/instances/herobrine128.png - resources/icons/instances/infinity128.png - resources/icons/instances/iron.png - resources/icons/instances/magitech128.png - resources/icons/instances/meat128.png - resources/icons/instances/netherstar128.png - resources/icons/instances/planks.png - resources/icons/instances/skeleton128.png - resources/icons/instances/squarecreeper128.png - resources/icons/instances/steve128.png - resources/icons/instances/stone.png - resources/icons/instances/tnt.png - - - resources/icons/multimc.svg - resources/XdgIcon.theme - - - resources/catbgrnd2.png - - diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index cca1ecac0..7c8562cda 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -128,7 +128,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi // Add the news label to the news toolbar. { newsLabel = new QToolButton(); - newsLabel->setIcon(QIcon(":/icons/toolbar/news")); + newsLabel->setIcon(QIcon::fromTheme("news")); newsLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); newsLabel->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); ui->newsToolBar->insertWidget(ui->actionMoreNews, newsLabel); @@ -203,9 +203,9 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi m_statusLeft = new QLabel(tr("No instance selected"), this); m_statusRight = new QLabel(tr("No status available"), this); m_statusRefresh = new QToolButton(this); + m_statusRefresh->setCheckable(true); m_statusRefresh->setToolButtonStyle(Qt::ToolButtonIconOnly); - m_statusRefresh->setIcon( - QPixmap(":/icons/toolbar/refresh").scaled(16, 16, Qt::KeepAspectRatio)); + m_statusRefresh->setIcon(QIcon::fromTheme("refresh")); statusBar()->addPermanentWidget(m_statusLeft, 1); statusBar()->addPermanentWidget(m_statusRight, 0); @@ -241,8 +241,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi accountMenuButton->setMenu(accountMenu); accountMenuButton->setPopupMode(QToolButton::InstantPopup); accountMenuButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - accountMenuButton->setIcon( - QPixmap(":/icons/toolbar/noaccount").scaled(48, 48, Qt::KeepAspectRatio)); + accountMenuButton->setIcon(QIcon::fromTheme("noaccount")); QWidgetAction *accountMenuButtonAction = new QWidgetAction(this); accountMenuButtonAction->setDefaultWidget(accountMenuButton); @@ -408,7 +407,7 @@ void MainWindow::repopulateAccountsMenu() QAction *action = new QAction(tr("No Default Account"), this); action->setCheckable(true); - action->setIcon(QPixmap(":/icons/toolbar/noaccount").scaled(48, 48, Qt::KeepAspectRatio)); + action->setIcon(QIcon::fromTheme("noaccount")); action->setData(""); if (active_username.isEmpty()) { @@ -462,8 +461,7 @@ void MainWindow::activeAccountChanged() } // Set the icon to the "no account" icon. - accountMenuButton->setIcon( - QPixmap(":/icons/toolbar/noaccount").scaled(48, 48, Qt::KeepAspectRatio)); + accountMenuButton->setIcon(QIcon::fromTheme("noaccount")); } bool MainWindow::eventFilter(QObject *obj, QEvent *ev) @@ -533,8 +531,9 @@ static QString convertStatus(const QString &status) void MainWindow::reloadStatus() { + m_statusRefresh->setChecked(true); MMC->statusChecker()->reloadStatus(); - updateStatusUI(); + //updateStatusUI(); } static QString makeStatusString(const QMap statuses) @@ -555,16 +554,7 @@ void MainWindow::updateStatusUI() auto statuses = statusChecker->getStatusEntries(); QString status = makeStatusString(statuses); - if(statusChecker->isLoadingStatus()) - { - m_statusRefresh->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - m_statusRefresh->setText(tr("Loading...")); - } - else - { - m_statusRefresh->setToolButtonStyle(Qt::ToolButtonIconOnly); - m_statusRefresh->setText(tr("")); - } + m_statusRefresh->setChecked(false); m_statusRight->setText(status); @@ -574,8 +564,7 @@ void MainWindow::updateStatusUI() void MainWindow::updateStatusFailedUI() { m_statusRight->setText(makeStatusString(QMap())); - m_statusRefresh->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - m_statusRefresh->setText(tr("Failed.")); + m_statusRefresh->setChecked(false); statusTimer.start(60 * 1000); } diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui index 16e72c2f0..5653907e4 100644 --- a/gui/MainWindow.ui +++ b/gui/MainWindow.ui @@ -14,7 +14,7 @@ MultiMC 5 - + :/icons/multimc/scalable/apps/multimc.svg:/icons/multimc/scalable/apps/multimc.svg @@ -152,8 +152,7 @@ - - :/icons/toolbar/new:/icons/toolbar/new + Add Instance @@ -167,8 +166,7 @@ - - :/icons/toolbar/viewfolder:/icons/toolbar/viewfolder + View Instance Folder @@ -182,8 +180,7 @@ - - :/icons/toolbar/refresh:/icons/toolbar/refresh + Refresh @@ -197,8 +194,7 @@ - - :/icons/toolbar/centralmods:/icons/toolbar/centralmods + View Central Mods Folder @@ -212,8 +208,7 @@ - - :/icons/toolbar/checkupdate:/icons/toolbar/checkupdate + Check for Updates @@ -227,8 +222,7 @@ - - :/icons/toolbar/settings:/icons/toolbar/settings + Settings @@ -245,8 +239,7 @@ - - :/icons/toolbar/bug:/icons/toolbar/bug + Report a Bug @@ -260,8 +253,7 @@ - - :/icons/toolbar/news:/icons/toolbar/news + More News @@ -278,8 +270,7 @@ - - :/icons/toolbar/about:/icons/toolbar/about + About MultiMC @@ -332,7 +323,7 @@ true - + :/icons/instances/infinity:/icons/instances/infinity @@ -472,8 +463,7 @@ true - - :/icons/toolbar/cat:/icons/toolbar/cat + Meow @@ -484,8 +474,7 @@ - - :/icons/toolbar/copy:/icons/toolbar/copy + Copy Instance @@ -508,7 +497,9 @@ - + + + diff --git a/main.cpp b/main.cpp index c91af978a..181d72996 100644 --- a/main.cpp +++ b/main.cpp @@ -4,6 +4,7 @@ int main_gui(MultiMC &app) { // show main window + QIcon::setThemeName("multimc"); MainWindow mainWin; mainWin.restoreState(QByteArray::fromBase64(MMC->settings()->get("MainWindowState").toByteArray())); mainWin.restoreGeometry(QByteArray::fromBase64(MMC->settings()->get("MainWindowGeometry").toByteArray())); @@ -18,7 +19,9 @@ int main(int argc, char *argv[]) // initialize Qt MultiMC app(argc, argv); - Q_INIT_RESOURCE(graphics); + Q_INIT_RESOURCE(instances); + Q_INIT_RESOURCE(multimc); + Q_INIT_RESOURCE(backgrounds); switch (app.status()) { diff --git a/resources/icons/MultiMC.ico b/resources/MultiMC.ico similarity index 100% rename from resources/icons/MultiMC.ico rename to resources/MultiMC.ico diff --git a/resources/XdgIcon.theme b/resources/XdgIcon.theme deleted file mode 100644 index ad26482e8..000000000 --- a/resources/XdgIcon.theme +++ /dev/null @@ -1,12 +0,0 @@ -[Icon Theme] -Name=MultiMC -Comment=MultiMC Default Icons -Inherits=default -Directories=scalable/apps - -[scalable/apps] -Size=48 -Type=scalable -MinSize=1 -MaxSize=512 -Context=Applications diff --git a/resources/backgrounds/backgrounds.qrc b/resources/backgrounds/backgrounds.qrc new file mode 100644 index 000000000..55de139e7 --- /dev/null +++ b/resources/backgrounds/backgrounds.qrc @@ -0,0 +1,6 @@ + + + + catbgrnd2.png + + diff --git a/resources/catbgrnd2.png b/resources/backgrounds/catbgrnd2.png similarity index 100% rename from resources/catbgrnd2.png rename to resources/backgrounds/catbgrnd2.png diff --git a/resources/icons/instances/brick.png b/resources/instances/brick.png similarity index 100% rename from resources/icons/instances/brick.png rename to resources/instances/brick.png diff --git a/resources/icons/instances/chicken.png b/resources/instances/chicken.png similarity index 100% rename from resources/icons/instances/chicken.png rename to resources/instances/chicken.png diff --git a/resources/icons/instances/chicken128.png b/resources/instances/chicken128.png similarity index 100% rename from resources/icons/instances/chicken128.png rename to resources/instances/chicken128.png diff --git a/resources/icons/instances/creeper.png b/resources/instances/creeper.png similarity index 100% rename from resources/icons/instances/creeper.png rename to resources/instances/creeper.png diff --git a/resources/icons/instances/creeper128.png b/resources/instances/creeper128.png similarity index 100% rename from resources/icons/instances/creeper128.png rename to resources/instances/creeper128.png diff --git a/resources/icons/instances/derp.png b/resources/instances/derp.png similarity index 100% rename from resources/icons/instances/derp.png rename to resources/instances/derp.png diff --git a/resources/icons/instances/diamond.png b/resources/instances/diamond.png similarity index 100% rename from resources/icons/instances/diamond.png rename to resources/instances/diamond.png diff --git a/resources/icons/instances/dirt.png b/resources/instances/dirt.png similarity index 100% rename from resources/icons/instances/dirt.png rename to resources/instances/dirt.png diff --git a/resources/icons/instances/enderman.png b/resources/instances/enderman.png similarity index 100% rename from resources/icons/instances/enderman.png rename to resources/instances/enderman.png diff --git a/resources/icons/instances/enderpearl.png b/resources/instances/enderpearl.png similarity index 100% rename from resources/icons/instances/enderpearl.png rename to resources/instances/enderpearl.png diff --git a/resources/icons/instances/enderpearl128.png b/resources/instances/enderpearl128.png similarity index 100% rename from resources/icons/instances/enderpearl128.png rename to resources/instances/enderpearl128.png diff --git a/resources/icons/instances/ftb_glow.png b/resources/instances/ftb_glow.png similarity index 100% rename from resources/icons/instances/ftb_glow.png rename to resources/instances/ftb_glow.png diff --git a/resources/icons/instances/ftb_glow128.png b/resources/instances/ftb_glow128.png similarity index 100% rename from resources/icons/instances/ftb_glow128.png rename to resources/instances/ftb_glow128.png diff --git a/resources/icons/instances/ftb_logo.png b/resources/instances/ftb_logo.png similarity index 100% rename from resources/icons/instances/ftb_logo.png rename to resources/instances/ftb_logo.png diff --git a/resources/icons/instances/ftb_logo128.png b/resources/instances/ftb_logo128.png similarity index 100% rename from resources/icons/instances/ftb_logo128.png rename to resources/instances/ftb_logo128.png diff --git a/resources/icons/instances/gear.png b/resources/instances/gear.png similarity index 100% rename from resources/icons/instances/gear.png rename to resources/instances/gear.png diff --git a/resources/icons/instances/gear128.png b/resources/instances/gear128.png similarity index 100% rename from resources/icons/instances/gear128.png rename to resources/instances/gear128.png diff --git a/resources/icons/instances/gold.png b/resources/instances/gold.png similarity index 100% rename from resources/icons/instances/gold.png rename to resources/instances/gold.png diff --git a/resources/icons/instances/grass.png b/resources/instances/grass.png similarity index 100% rename from resources/icons/instances/grass.png rename to resources/instances/grass.png diff --git a/resources/icons/instances/herobrine.png b/resources/instances/herobrine.png similarity index 100% rename from resources/icons/instances/herobrine.png rename to resources/instances/herobrine.png diff --git a/resources/icons/instances/herobrine128.png b/resources/instances/herobrine128.png similarity index 100% rename from resources/icons/instances/herobrine128.png rename to resources/instances/herobrine128.png diff --git a/resources/icons/instances/infinity.png b/resources/instances/infinity.png similarity index 100% rename from resources/icons/instances/infinity.png rename to resources/instances/infinity.png diff --git a/resources/icons/instances/infinity128.png b/resources/instances/infinity128.png similarity index 100% rename from resources/icons/instances/infinity128.png rename to resources/instances/infinity128.png diff --git a/resources/instances/instances.qrc b/resources/instances/instances.qrc new file mode 100644 index 000000000..e9d22c784 --- /dev/null +++ b/resources/instances/instances.qrc @@ -0,0 +1,30 @@ + + + + brick.png + chicken128.png + creeper128.png + derp.png + diamond.png + dirt.png + enderman.png + enderpearl128.png + ftb_glow128.png + ftb_logo128.png + gear128.png + gold.png + grass.png + herobrine128.png + infinity128.png + iron.png + magitech128.png + meat128.png + netherstar128.png + planks.png + skeleton128.png + squarecreeper128.png + steve128.png + stone.png + tnt.png + + diff --git a/resources/icons/instances/iron.png b/resources/instances/iron.png similarity index 100% rename from resources/icons/instances/iron.png rename to resources/instances/iron.png diff --git a/resources/icons/instances/magitech.png b/resources/instances/magitech.png similarity index 100% rename from resources/icons/instances/magitech.png rename to resources/instances/magitech.png diff --git a/resources/icons/instances/magitech128.png b/resources/instances/magitech128.png similarity index 100% rename from resources/icons/instances/magitech128.png rename to resources/instances/magitech128.png diff --git a/resources/icons/instances/meat.png b/resources/instances/meat.png similarity index 100% rename from resources/icons/instances/meat.png rename to resources/instances/meat.png diff --git a/resources/icons/instances/meat128.png b/resources/instances/meat128.png similarity index 100% rename from resources/icons/instances/meat128.png rename to resources/instances/meat128.png diff --git a/resources/icons/instances/netherstar.png b/resources/instances/netherstar.png similarity index 100% rename from resources/icons/instances/netherstar.png rename to resources/instances/netherstar.png diff --git a/resources/icons/instances/netherstar128.png b/resources/instances/netherstar128.png similarity index 100% rename from resources/icons/instances/netherstar128.png rename to resources/instances/netherstar128.png diff --git a/resources/icons/instances/planks.png b/resources/instances/planks.png similarity index 100% rename from resources/icons/instances/planks.png rename to resources/instances/planks.png diff --git a/resources/icons/instances/skeleton.png b/resources/instances/skeleton.png similarity index 100% rename from resources/icons/instances/skeleton.png rename to resources/instances/skeleton.png diff --git a/resources/icons/instances/skeleton128.png b/resources/instances/skeleton128.png similarity index 100% rename from resources/icons/instances/skeleton128.png rename to resources/instances/skeleton128.png diff --git a/resources/icons/instances/squarecreeper.png b/resources/instances/squarecreeper.png similarity index 100% rename from resources/icons/instances/squarecreeper.png rename to resources/instances/squarecreeper.png diff --git a/resources/icons/instances/squarecreeper128.png b/resources/instances/squarecreeper128.png similarity index 100% rename from resources/icons/instances/squarecreeper128.png rename to resources/instances/squarecreeper128.png diff --git a/resources/icons/instances/steve.png b/resources/instances/steve.png similarity index 100% rename from resources/icons/instances/steve.png rename to resources/instances/steve.png diff --git a/resources/icons/instances/steve128.png b/resources/instances/steve128.png similarity index 100% rename from resources/icons/instances/steve128.png rename to resources/instances/steve128.png diff --git a/resources/icons/instances/stone.png b/resources/instances/stone.png similarity index 100% rename from resources/icons/instances/stone.png rename to resources/instances/stone.png diff --git a/resources/icons/instances/tnt.png b/resources/instances/tnt.png similarity index 100% rename from resources/icons/instances/tnt.png rename to resources/instances/tnt.png diff --git a/resources/multimc/16x16/noaccount.png b/resources/multimc/16x16/noaccount.png new file mode 100644 index 0000000000000000000000000000000000000000..b49bcf36ae68fbc9bc5225702f87c678edd51987 GIT binary patch literal 334 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLI14-?iy0WWg+Z8+Vb&Z8 z1_lQ95>H=O_Ir%N%m(tORhknS7#QAqx;TbtoS!?%_MEGONSl1U`MMhnt-KM<_nh+T z7jIy%T6)OLW#u+jbD@hGA|f6iL?@pK|14&F(sJf=+xJg2<~?V8Udc3T8RPGL%*P8E zR;^;%wT}6EDWjJ8QtoXN7VNv9f55~ya{lw5_djoI-towSEpEMd!fmq+I@}91xD5J~ z14NDrv#WXvS$^ELt|3w4fQfIz>s=1Fw|zSJm#69P-@3;0&zXPh)4%C^nW1tXbLK3& zQv$An4=nf+BE5MT#wV`edxFW>(x(h%zm`n7Z!ZC+6m5OLc{RTuCh! zot=B@=vk9!KNt0#)8uExC#~JuBYO5(kJ-XQT(bqsIwClD&Q1Ls_b*>QY3=jh@4r8- zlyg*H;Nb3V$rb;DA%R&g;gpawe~r&Qxnl7-+YfjsbsxOO$lLqhUDsJpN>51K@!a** zsgWl?+NxVincG-2ytVCI&%oHQK==bAJ9qoFtJ)szV z4m&pE@m&6Mmp{L}`8eZY-j)XS7fjP`?AoSMxNr5!#S6<0N9_q*6LewT>n;az5Q^UR)w-e>hJ z>U4xw-?)8EEq#mUI)1+o&)U`Pyq|AopKvg9ao*Qu&ni-RAHVdHnkJX<|K;<#nfr{t z@~Cb1Oq{456Fl?9{aq{T{yx=ap4lBAZ^iY>_KyRfuhOcxRWqwqJ{B0{tohKcUUy;N z-pZ$;KBZj=D|(oWmpCmw=H*o;yY^*}3igTApCzV>A8qE!tJ4FMVZ{O;r`)Oug~c=2NA#f|T+IYoInzqK6rYEty- zMq_R)d%5kt$y%!?2|urTJAc`+`mHGu980s;G1s5hzw^`BvhL>BJ9cLt=mfcM*!|+Z z{tcmLmv+C8{(fQNH`%wH#(($j|6lg{m|4#Urg?gSmz>)+J(*U+bh>AuF1N^oSrfDz z{EjY-{3WHd5D+3EF6GL4Cb1MS_m30pvz%+nVT0wL%7#SEE=o%R5 z8X1Hb8Cw~dSs7YDG^D?=bwtsSo1c=IRteQ$sB35#Vqj@yXkle+4$-h6$?FXR1A{5Z zNj{m$sd>ez3>hUQ1y=g{V7oHQQj_y@bMy0x_413-^>ZLfiuHZm1AO$2^bGZ_4{niw z*$A@KTkJ1GcR2)IX_pwpeR2pHMyi% YKM$;3zszlqjrI14-?iy0WWg+Z8+Vb&aw z3ic9DUsv{fjKa)@LTmcY&1GO<`0nZA7-Dhy>=oN{?hXQMAHGT+VbzE^Ao+!Fk$9{1 z1#QuFie6i_1v)cCxVTh)h@YRWyX>2q^;P|wC)4JiNmDuhSt7Y-=`+2;zgO`j2W}o*1YE0v5xyo?f-cFUwK(JfilM(L|hx*|5gdSUg{7z z&0*g2Lw>rRLMIAk4s6m{urB+OY@4D153|Af%^QLr-_MtEUyv!Kz`=AWR)p2^(d&={ t8JA5aK0UuWH~Ldu-1ADI4)M3_*$=|sf7|wX0|NsCgQu&X%Q~loCIE32hYkP$ literal 0 HcmV?d00001 diff --git a/resources/multimc/24x24/refresh.png b/resources/multimc/24x24/refresh.png new file mode 100644 index 0000000000000000000000000000000000000000..09a111867c999c6e48b5df0f7d649c2f3c4d1f6b GIT binary patch literal 2116 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 literal 0 HcmV?d00001 diff --git a/resources/multimc/48x48/refresh.png b/resources/multimc/48x48/refresh.png new file mode 100644 index 0000000000000000000000000000000000000000..f81b8d674cba6aca4aaa458fd3c93fcadec969c4 GIT binary patch literal 3922 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 literal 0 HcmV?d00001 diff --git a/resources/icons/toolbar/NoAccount.png b/resources/multimc/8x8/noaccount.png similarity index 100% rename from resources/icons/toolbar/NoAccount.png rename to resources/multimc/8x8/noaccount.png diff --git a/resources/multimc/index.theme b/resources/multimc/index.theme new file mode 100644 index 000000000..d7d460c76 --- /dev/null +++ b/resources/multimc/index.theme @@ -0,0 +1,30 @@ +[Icon Theme] +Name=multimc +Comment=MultiMC Default Icons +Inherits=default +Directories=scalable/apps,8x8,16x16,22x22,24x24,32x32,48x48 + +[scalable/apps] +Size=48 +Type=scalable +MinSize=1 +MaxSize=512 +Context=Applications + +[8x8] +Size=8 + +[16x16] +Size=16 + +[22x22] +Size=22 + +[24x24] +Size=24 + +[32x32] +Size=32 + +[48x48] +Size=48 diff --git a/resources/multimc/multimc.qrc b/resources/multimc/multimc.qrc new file mode 100644 index 000000000..bacd1f760 --- /dev/null +++ b/resources/multimc/multimc.qrc @@ -0,0 +1,32 @@ + + + + index.theme + scalable/apps/multimc.svg + scalable/console.svg + scalable/console_error.svg + scalable/bug.svg + scalable/news.svg + 22x22/about.png + 22x22/bug.png + 22x22/centralmods.png + 22x22/checkupdate.png + 22x22/help.png + 22x22/new.png + 22x22/copy.png + 22x22/news.png + 16x16/refresh.png + 22x22/refresh.png + 24x24/refresh.png + 32x32/refresh.png + 48x48/refresh.png + 22x22/settings.png + 22x22/viewfolder.png + 24x24/cat.png + 8x8/noaccount.png + 16x16/noaccount.png + 24x24/noaccount.png + 32x32/noaccount.png + 48x48/noaccount.png + + diff --git a/resources/icons/multimc.svg b/resources/multimc/scalable/apps/multimc.svg similarity index 100% rename from resources/icons/multimc.svg rename to resources/multimc/scalable/apps/multimc.svg diff --git a/resources/icons/toolbar_svg/bug.svg b/resources/multimc/scalable/bug.svg similarity index 100% rename from resources/icons/toolbar_svg/bug.svg rename to resources/multimc/scalable/bug.svg diff --git a/resources/icons/console.svg b/resources/multimc/scalable/console.svg similarity index 100% rename from resources/icons/console.svg rename to resources/multimc/scalable/console.svg diff --git a/resources/icons/console_error.svg b/resources/multimc/scalable/console_error.svg similarity index 100% rename from resources/icons/console_error.svg rename to resources/multimc/scalable/console_error.svg diff --git a/resources/icons/toolbar_svg/news.svg b/resources/multimc/scalable/news.svg similarity index 100% rename from resources/icons/toolbar_svg/news.svg rename to resources/multimc/scalable/news.svg diff --git a/resources/icons/instances_svg/clucker.svg b/resources/sources/clucker.svg similarity index 100% rename from resources/icons/instances_svg/clucker.svg rename to resources/sources/clucker.svg diff --git a/resources/icons/instances_svg/creeper.svg b/resources/sources/creeper.svg similarity index 100% rename from resources/icons/instances_svg/creeper.svg rename to resources/sources/creeper.svg diff --git a/resources/icons/instances_svg/enderpearl.svg b/resources/sources/enderpearl.svg similarity index 100% rename from resources/icons/instances_svg/enderpearl.svg rename to resources/sources/enderpearl.svg diff --git a/resources/icons/instances_svg/ftb-glow.svg b/resources/sources/ftb-glow.svg similarity index 100% rename from resources/icons/instances_svg/ftb-glow.svg rename to resources/sources/ftb-glow.svg diff --git a/resources/icons/instances_svg/ftb-logo.svg b/resources/sources/ftb-logo.svg similarity index 100% rename from resources/icons/instances_svg/ftb-logo.svg rename to resources/sources/ftb-logo.svg diff --git a/resources/icons/instances_svg/gear.svg b/resources/sources/gear.svg similarity index 100% rename from resources/icons/instances_svg/gear.svg rename to resources/sources/gear.svg diff --git a/resources/icons/instances_svg/herobrine.svg b/resources/sources/herobrine.svg similarity index 100% rename from resources/icons/instances_svg/herobrine.svg rename to resources/sources/herobrine.svg diff --git a/resources/icons/instances_svg/magitech.svg b/resources/sources/magitech.svg similarity index 100% rename from resources/icons/instances_svg/magitech.svg rename to resources/sources/magitech.svg diff --git a/resources/icons/instances_svg/meat.svg b/resources/sources/meat.svg similarity index 100% rename from resources/icons/instances_svg/meat.svg rename to resources/sources/meat.svg diff --git a/resources/icons/instances_svg/netherstar.svg b/resources/sources/netherstar.svg similarity index 100% rename from resources/icons/instances_svg/netherstar.svg rename to resources/sources/netherstar.svg diff --git a/resources/icons/instances_svg/pskeleton.svg b/resources/sources/pskeleton.svg similarity index 100% rename from resources/icons/instances_svg/pskeleton.svg rename to resources/sources/pskeleton.svg diff --git a/resources/icons/instances_svg/skeleton.svg b/resources/sources/skeleton.svg similarity index 100% rename from resources/icons/instances_svg/skeleton.svg rename to resources/sources/skeleton.svg diff --git a/resources/icons/instances_svg/squarecreeper.svg b/resources/sources/squarecreeper.svg similarity index 100% rename from resources/icons/instances_svg/squarecreeper.svg rename to resources/sources/squarecreeper.svg diff --git a/resources/sources/status-bad.svg b/resources/sources/status-bad.svg new file mode 100644 index 000000000..54334e066 --- /dev/null +++ b/resources/sources/status-bad.svg @@ -0,0 +1,262 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/resources/sources/status-good.svg b/resources/sources/status-good.svg new file mode 100644 index 000000000..3b3118064 --- /dev/null +++ b/resources/sources/status-good.svg @@ -0,0 +1,293 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/resources/sources/status-terrible.svg b/resources/sources/status-terrible.svg new file mode 100644 index 000000000..b0de7bfdb --- /dev/null +++ b/resources/sources/status-terrible.svg @@ -0,0 +1,262 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/resources/icons/instances_svg/steve.svg b/resources/sources/steve.svg similarity index 100% rename from resources/icons/instances_svg/steve.svg rename to resources/sources/steve.svg