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 000000000..b49bcf36a Binary files /dev/null and b/resources/multimc/16x16/noaccount.png differ diff --git a/resources/multimc/16x16/refresh.png b/resources/multimc/16x16/refresh.png new file mode 100644 index 000000000..dc66b824f Binary files /dev/null and b/resources/multimc/16x16/refresh.png differ diff --git a/resources/icons/toolbar/about.png b/resources/multimc/22x22/about.png similarity index 100% rename from resources/icons/toolbar/about.png rename to resources/multimc/22x22/about.png diff --git a/resources/icons/toolbar/ReportBug.png b/resources/multimc/22x22/bug.png similarity index 100% rename from resources/icons/toolbar/ReportBug.png rename to resources/multimc/22x22/bug.png diff --git a/resources/icons/toolbar/centralmods.png b/resources/multimc/22x22/centralmods.png similarity index 100% rename from resources/icons/toolbar/centralmods.png rename to resources/multimc/22x22/centralmods.png diff --git a/resources/icons/toolbar/checkupdate.png b/resources/multimc/22x22/checkupdate.png similarity index 100% rename from resources/icons/toolbar/checkupdate.png rename to resources/multimc/22x22/checkupdate.png diff --git a/resources/icons/toolbar/InstCopy.png b/resources/multimc/22x22/copy.png similarity index 100% rename from resources/icons/toolbar/InstCopy.png rename to resources/multimc/22x22/copy.png diff --git a/resources/icons/toolbar/help.png b/resources/multimc/22x22/help.png similarity index 100% rename from resources/icons/toolbar/help.png rename to resources/multimc/22x22/help.png diff --git a/resources/icons/toolbar/new.png b/resources/multimc/22x22/new.png similarity index 100% rename from resources/icons/toolbar/new.png rename to resources/multimc/22x22/new.png diff --git a/resources/icons/toolbar/NewsIcon.png b/resources/multimc/22x22/news.png similarity index 100% rename from resources/icons/toolbar/NewsIcon.png rename to resources/multimc/22x22/news.png diff --git a/resources/icons/toolbar/refresh.png b/resources/multimc/22x22/refresh.png similarity index 100% rename from resources/icons/toolbar/refresh.png rename to resources/multimc/22x22/refresh.png diff --git a/resources/icons/toolbar/settings.png b/resources/multimc/22x22/settings.png similarity index 100% rename from resources/icons/toolbar/settings.png rename to resources/multimc/22x22/settings.png diff --git a/resources/icons/toolbar/viewfolder.png b/resources/multimc/22x22/viewfolder.png similarity index 100% rename from resources/icons/toolbar/viewfolder.png rename to resources/multimc/22x22/viewfolder.png diff --git a/resources/icons/toolbar/Cat.png b/resources/multimc/24x24/cat.png similarity index 100% rename from resources/icons/toolbar/Cat.png rename to resources/multimc/24x24/cat.png diff --git a/resources/multimc/24x24/noaccount.png b/resources/multimc/24x24/noaccount.png new file mode 100644 index 000000000..ac12437cf Binary files /dev/null and b/resources/multimc/24x24/noaccount.png differ diff --git a/resources/multimc/24x24/refresh.png b/resources/multimc/24x24/refresh.png new file mode 100644 index 000000000..09a111867 Binary files /dev/null and b/resources/multimc/24x24/refresh.png differ diff --git a/resources/multimc/32x32/noaccount.png b/resources/multimc/32x32/noaccount.png new file mode 100644 index 000000000..a73afc946 Binary files /dev/null and b/resources/multimc/32x32/noaccount.png differ diff --git a/resources/multimc/32x32/refresh.png b/resources/multimc/32x32/refresh.png new file mode 100644 index 000000000..1f0c39132 Binary files /dev/null and b/resources/multimc/32x32/refresh.png differ diff --git a/resources/multimc/48x48/noaccount.png b/resources/multimc/48x48/noaccount.png new file mode 100644 index 000000000..4703796c7 Binary files /dev/null and b/resources/multimc/48x48/noaccount.png differ diff --git a/resources/multimc/48x48/refresh.png b/resources/multimc/48x48/refresh.png new file mode 100644 index 000000000..f81b8d674 Binary files /dev/null and b/resources/multimc/48x48/refresh.png differ 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