From d8413fa5ec594455b3cdec86899b61adba39eb33 Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Sun, 19 Jan 2014 04:52:34 +0100 Subject: 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/MultiMC.ico | Bin 0 -> 76126 bytes resources/XdgIcon.theme | 12 - resources/backgrounds/backgrounds.qrc | 6 + resources/backgrounds/catbgrnd2.png | Bin 0 -> 78285 bytes resources/catbgrnd2.png | Bin 78285 -> 0 bytes resources/icons/MultiMC.ico | Bin 76126 -> 0 bytes resources/icons/console.svg | 228 --- resources/icons/console_error.svg | 247 --- resources/icons/instances/brick.png | Bin 713 -> 0 bytes resources/icons/instances/chicken.png | Bin 1181 -> 0 bytes resources/icons/instances/chicken128.png | Bin 6369 -> 0 bytes resources/icons/instances/creeper.png | Bin 1524 -> 0 bytes resources/icons/instances/creeper128.png | Bin 9046 -> 0 bytes resources/icons/instances/derp.png | Bin 5225 -> 0 bytes resources/icons/instances/diamond.png | Bin 708 -> 0 bytes resources/icons/instances/dirt.png | Bin 482 -> 0 bytes resources/icons/instances/enderman.png | Bin 2429 -> 0 bytes resources/icons/instances/enderpearl.png | Bin 2120 -> 0 bytes resources/icons/instances/enderpearl128.png | Bin 21425 -> 0 bytes resources/icons/instances/ftb_glow.png | Bin 1747 -> 0 bytes resources/icons/instances/ftb_glow128.png | Bin 12708 -> 0 bytes resources/icons/instances/ftb_logo.png | Bin 1607 -> 0 bytes resources/icons/instances/ftb_logo128.png | Bin 7883 -> 0 bytes resources/icons/instances/gear.png | Bin 2414 -> 0 bytes resources/icons/instances/gear128.png | Bin 18321 -> 0 bytes resources/icons/instances/gold.png | Bin 978 -> 0 bytes resources/icons/instances/grass.png | Bin 618 -> 0 bytes resources/icons/instances/herobrine.png | Bin 1034 -> 0 bytes resources/icons/instances/herobrine128.png | Bin 4937 -> 0 bytes resources/icons/instances/infinity.png | Bin 1714 -> 0 bytes resources/icons/instances/infinity128.png | Bin 9237 -> 0 bytes resources/icons/instances/iron.png | Bin 532 -> 0 bytes resources/icons/instances/magitech.png | Bin 2646 -> 0 bytes resources/icons/instances/magitech128.png | Bin 23097 -> 0 bytes resources/icons/instances/meat.png | Bin 1514 -> 0 bytes resources/icons/instances/meat128.png | Bin 10583 -> 0 bytes resources/icons/instances/netherstar.png | Bin 1942 -> 0 bytes resources/icons/instances/netherstar128.png | Bin 14062 -> 0 bytes resources/icons/instances/planks.png | Bin 461 -> 0 bytes resources/icons/instances/skeleton.png | Bin 696 -> 0 bytes resources/icons/instances/skeleton128.png | Bin 3673 -> 0 bytes resources/icons/instances/squarecreeper.png | Bin 1623 -> 0 bytes resources/icons/instances/squarecreeper128.png | Bin 9136 -> 0 bytes resources/icons/instances/steve.png | Bin 969 -> 0 bytes resources/icons/instances/steve128.png | Bin 4312 -> 0 bytes resources/icons/instances/stone.png | Bin 438 -> 0 bytes resources/icons/instances/tnt.png | Bin 378 -> 0 bytes resources/icons/instances_svg/clucker.svg | 404 ----- resources/icons/instances_svg/creeper.svg | 775 --------- resources/icons/instances_svg/enderpearl.svg | 271 --- resources/icons/instances_svg/ftb-glow.svg | 606 ------- resources/icons/instances_svg/ftb-logo.svg | 257 --- resources/icons/instances_svg/gear.svg | 434 ----- resources/icons/instances_svg/herobrine.svg | 583 ------- resources/icons/instances_svg/magitech.svg | 886 ---------- resources/icons/instances_svg/meat.svg | 371 ----- resources/icons/instances_svg/netherstar.svg | 342 ---- resources/icons/instances_svg/pskeleton.svg | 581 ------- resources/icons/instances_svg/skeleton.svg | 610 ------- resources/icons/instances_svg/squarecreeper.svg | 828 ---------- resources/icons/instances_svg/steve.svg | 534 ------ resources/icons/multimc.svg | 1993 ----------------------- resources/icons/toolbar/Cat.png | Bin 811 -> 0 bytes resources/icons/toolbar/InstCopy.png | Bin 297 -> 0 bytes resources/icons/toolbar/NewsIcon.png | Bin 1173 -> 0 bytes resources/icons/toolbar/NoAccount.png | Bin 284 -> 0 bytes resources/icons/toolbar/ReportBug.png | Bin 1180 -> 0 bytes resources/icons/toolbar/about.png | Bin 1693 -> 0 bytes resources/icons/toolbar/centralmods.png | Bin 1561 -> 0 bytes resources/icons/toolbar/checkupdate.png | Bin 1635 -> 0 bytes resources/icons/toolbar/help.png | Bin 1735 -> 0 bytes resources/icons/toolbar/new.png | Bin 1440 -> 0 bytes resources/icons/toolbar/refresh.png | Bin 1843 -> 0 bytes resources/icons/toolbar/settings.png | Bin 1964 -> 0 bytes resources/icons/toolbar/viewfolder.png | Bin 1006 -> 0 bytes resources/icons/toolbar_svg/bug.svg | 387 ----- resources/icons/toolbar_svg/news.svg | 296 ---- resources/instances/brick.png | Bin 0 -> 713 bytes resources/instances/chicken.png | Bin 0 -> 1181 bytes resources/instances/chicken128.png | Bin 0 -> 6369 bytes resources/instances/creeper.png | Bin 0 -> 1524 bytes resources/instances/creeper128.png | Bin 0 -> 9046 bytes resources/instances/derp.png | Bin 0 -> 5225 bytes resources/instances/diamond.png | Bin 0 -> 708 bytes resources/instances/dirt.png | Bin 0 -> 482 bytes resources/instances/enderman.png | Bin 0 -> 2429 bytes resources/instances/enderpearl.png | Bin 0 -> 2120 bytes resources/instances/enderpearl128.png | Bin 0 -> 21425 bytes resources/instances/ftb_glow.png | Bin 0 -> 1747 bytes resources/instances/ftb_glow128.png | Bin 0 -> 12708 bytes resources/instances/ftb_logo.png | Bin 0 -> 1607 bytes resources/instances/ftb_logo128.png | Bin 0 -> 7883 bytes resources/instances/gear.png | Bin 0 -> 2414 bytes resources/instances/gear128.png | Bin 0 -> 18321 bytes resources/instances/gold.png | Bin 0 -> 978 bytes resources/instances/grass.png | Bin 0 -> 618 bytes resources/instances/herobrine.png | Bin 0 -> 1034 bytes resources/instances/herobrine128.png | Bin 0 -> 4937 bytes resources/instances/infinity.png | Bin 0 -> 1714 bytes resources/instances/infinity128.png | Bin 0 -> 9237 bytes resources/instances/instances.qrc | 30 + resources/instances/iron.png | Bin 0 -> 532 bytes resources/instances/magitech.png | Bin 0 -> 2646 bytes resources/instances/magitech128.png | Bin 0 -> 23097 bytes resources/instances/meat.png | Bin 0 -> 1514 bytes resources/instances/meat128.png | Bin 0 -> 10583 bytes resources/instances/netherstar.png | Bin 0 -> 1942 bytes resources/instances/netherstar128.png | Bin 0 -> 14062 bytes resources/instances/planks.png | Bin 0 -> 461 bytes resources/instances/skeleton.png | Bin 0 -> 696 bytes resources/instances/skeleton128.png | Bin 0 -> 3673 bytes resources/instances/squarecreeper.png | Bin 0 -> 1623 bytes resources/instances/squarecreeper128.png | Bin 0 -> 9136 bytes resources/instances/steve.png | Bin 0 -> 969 bytes resources/instances/steve128.png | Bin 0 -> 4312 bytes resources/instances/stone.png | Bin 0 -> 438 bytes resources/instances/tnt.png | Bin 0 -> 378 bytes resources/multimc/16x16/noaccount.png | Bin 0 -> 334 bytes resources/multimc/16x16/refresh.png | Bin 0 -> 1389 bytes resources/multimc/22x22/about.png | Bin 0 -> 1693 bytes resources/multimc/22x22/bug.png | Bin 0 -> 1180 bytes resources/multimc/22x22/centralmods.png | Bin 0 -> 1561 bytes resources/multimc/22x22/checkupdate.png | Bin 0 -> 1635 bytes resources/multimc/22x22/copy.png | Bin 0 -> 297 bytes resources/multimc/22x22/help.png | Bin 0 -> 1735 bytes resources/multimc/22x22/new.png | Bin 0 -> 1440 bytes resources/multimc/22x22/news.png | Bin 0 -> 1173 bytes resources/multimc/22x22/refresh.png | Bin 0 -> 1843 bytes resources/multimc/22x22/settings.png | Bin 0 -> 1964 bytes resources/multimc/22x22/viewfolder.png | Bin 0 -> 1006 bytes resources/multimc/24x24/cat.png | Bin 0 -> 811 bytes 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 resources/multimc/8x8/noaccount.png | Bin 0 -> 284 bytes resources/multimc/index.theme | 30 + resources/multimc/multimc.qrc | 32 + resources/multimc/scalable/apps/multimc.svg | 1993 +++++++++++++++++++++++ resources/multimc/scalable/bug.svg | 387 +++++ resources/multimc/scalable/console.svg | 228 +++ resources/multimc/scalable/console_error.svg | 247 +++ resources/multimc/scalable/news.svg | 296 ++++ resources/sources/clucker.svg | 404 +++++ resources/sources/creeper.svg | 775 +++++++++ resources/sources/enderpearl.svg | 271 +++ resources/sources/ftb-glow.svg | 606 +++++++ resources/sources/ftb-logo.svg | 257 +++ resources/sources/gear.svg | 434 +++++ resources/sources/herobrine.svg | 583 +++++++ resources/sources/magitech.svg | 886 ++++++++++ resources/sources/meat.svg | 371 +++++ resources/sources/netherstar.svg | 342 ++++ resources/sources/pskeleton.svg | 581 +++++++ resources/sources/skeleton.svg | 610 +++++++ resources/sources/squarecreeper.svg | 828 ++++++++++ resources/sources/status-bad.svg | 262 +++ resources/sources/status-good.svg | 293 ++++ resources/sources/status-terrible.svg | 262 +++ resources/sources/steve.svg | 534 ++++++ 167 files changed, 11586 insertions(+), 10745 deletions(-) delete mode 100644 graphics.qrc create mode 100644 resources/MultiMC.ico delete mode 100644 resources/XdgIcon.theme create mode 100644 resources/backgrounds/backgrounds.qrc create mode 100644 resources/backgrounds/catbgrnd2.png delete mode 100644 resources/catbgrnd2.png delete mode 100644 resources/icons/MultiMC.ico delete mode 100644 resources/icons/console.svg delete mode 100644 resources/icons/console_error.svg delete mode 100644 resources/icons/instances/brick.png delete mode 100644 resources/icons/instances/chicken.png delete mode 100644 resources/icons/instances/chicken128.png delete mode 100644 resources/icons/instances/creeper.png delete mode 100644 resources/icons/instances/creeper128.png delete mode 100644 resources/icons/instances/derp.png delete mode 100644 resources/icons/instances/diamond.png delete mode 100644 resources/icons/instances/dirt.png delete mode 100644 resources/icons/instances/enderman.png delete mode 100644 resources/icons/instances/enderpearl.png delete mode 100644 resources/icons/instances/enderpearl128.png delete mode 100644 resources/icons/instances/ftb_glow.png delete mode 100644 resources/icons/instances/ftb_glow128.png delete mode 100644 resources/icons/instances/ftb_logo.png delete mode 100644 resources/icons/instances/ftb_logo128.png delete mode 100644 resources/icons/instances/gear.png delete mode 100644 resources/icons/instances/gear128.png delete mode 100644 resources/icons/instances/gold.png delete mode 100644 resources/icons/instances/grass.png delete mode 100644 resources/icons/instances/herobrine.png delete mode 100644 resources/icons/instances/herobrine128.png delete mode 100644 resources/icons/instances/infinity.png delete mode 100644 resources/icons/instances/infinity128.png delete mode 100644 resources/icons/instances/iron.png delete mode 100644 resources/icons/instances/magitech.png delete mode 100644 resources/icons/instances/magitech128.png delete mode 100644 resources/icons/instances/meat.png delete mode 100644 resources/icons/instances/meat128.png delete mode 100644 resources/icons/instances/netherstar.png delete mode 100644 resources/icons/instances/netherstar128.png delete mode 100644 resources/icons/instances/planks.png delete mode 100644 resources/icons/instances/skeleton.png delete mode 100644 resources/icons/instances/skeleton128.png delete mode 100644 resources/icons/instances/squarecreeper.png delete mode 100644 resources/icons/instances/squarecreeper128.png delete mode 100644 resources/icons/instances/steve.png delete mode 100644 resources/icons/instances/steve128.png delete mode 100644 resources/icons/instances/stone.png delete mode 100644 resources/icons/instances/tnt.png delete mode 100644 resources/icons/instances_svg/clucker.svg delete mode 100644 resources/icons/instances_svg/creeper.svg delete mode 100644 resources/icons/instances_svg/enderpearl.svg delete mode 100644 resources/icons/instances_svg/ftb-glow.svg delete mode 100644 resources/icons/instances_svg/ftb-logo.svg delete mode 100644 resources/icons/instances_svg/gear.svg delete mode 100644 resources/icons/instances_svg/herobrine.svg delete mode 100644 resources/icons/instances_svg/magitech.svg delete mode 100644 resources/icons/instances_svg/meat.svg delete mode 100644 resources/icons/instances_svg/netherstar.svg delete mode 100644 resources/icons/instances_svg/pskeleton.svg delete mode 100644 resources/icons/instances_svg/skeleton.svg delete mode 100644 resources/icons/instances_svg/squarecreeper.svg delete mode 100644 resources/icons/instances_svg/steve.svg delete mode 100644 resources/icons/multimc.svg delete mode 100644 resources/icons/toolbar/Cat.png delete mode 100644 resources/icons/toolbar/InstCopy.png delete mode 100644 resources/icons/toolbar/NewsIcon.png delete mode 100644 resources/icons/toolbar/NoAccount.png delete mode 100644 resources/icons/toolbar/ReportBug.png delete mode 100644 resources/icons/toolbar/about.png delete mode 100644 resources/icons/toolbar/centralmods.png delete mode 100644 resources/icons/toolbar/checkupdate.png delete mode 100644 resources/icons/toolbar/help.png delete mode 100644 resources/icons/toolbar/new.png delete mode 100644 resources/icons/toolbar/refresh.png delete mode 100644 resources/icons/toolbar/settings.png delete mode 100644 resources/icons/toolbar/viewfolder.png delete mode 100644 resources/icons/toolbar_svg/bug.svg delete mode 100644 resources/icons/toolbar_svg/news.svg create mode 100644 resources/instances/brick.png create mode 100644 resources/instances/chicken.png create mode 100644 resources/instances/chicken128.png create mode 100644 resources/instances/creeper.png create mode 100644 resources/instances/creeper128.png create mode 100644 resources/instances/derp.png create mode 100644 resources/instances/diamond.png create mode 100644 resources/instances/dirt.png create mode 100644 resources/instances/enderman.png create mode 100644 resources/instances/enderpearl.png create mode 100644 resources/instances/enderpearl128.png create mode 100644 resources/instances/ftb_glow.png create mode 100644 resources/instances/ftb_glow128.png create mode 100644 resources/instances/ftb_logo.png create mode 100644 resources/instances/ftb_logo128.png create mode 100644 resources/instances/gear.png create mode 100644 resources/instances/gear128.png create mode 100644 resources/instances/gold.png create mode 100644 resources/instances/grass.png create mode 100644 resources/instances/herobrine.png create mode 100644 resources/instances/herobrine128.png create mode 100644 resources/instances/infinity.png create mode 100644 resources/instances/infinity128.png create mode 100644 resources/instances/instances.qrc create mode 100644 resources/instances/iron.png create mode 100644 resources/instances/magitech.png create mode 100644 resources/instances/magitech128.png create mode 100644 resources/instances/meat.png create mode 100644 resources/instances/meat128.png create mode 100644 resources/instances/netherstar.png create mode 100644 resources/instances/netherstar128.png create mode 100644 resources/instances/planks.png create mode 100644 resources/instances/skeleton.png create mode 100644 resources/instances/skeleton128.png create mode 100644 resources/instances/squarecreeper.png create mode 100644 resources/instances/squarecreeper128.png create mode 100644 resources/instances/steve.png create mode 100644 resources/instances/steve128.png create mode 100644 resources/instances/stone.png create mode 100644 resources/instances/tnt.png create mode 100644 resources/multimc/16x16/noaccount.png create mode 100644 resources/multimc/16x16/refresh.png create mode 100644 resources/multimc/22x22/about.png create mode 100644 resources/multimc/22x22/bug.png create mode 100644 resources/multimc/22x22/centralmods.png create mode 100644 resources/multimc/22x22/checkupdate.png create mode 100644 resources/multimc/22x22/copy.png create mode 100644 resources/multimc/22x22/help.png create mode 100644 resources/multimc/22x22/new.png create mode 100644 resources/multimc/22x22/news.png create mode 100644 resources/multimc/22x22/refresh.png create mode 100644 resources/multimc/22x22/settings.png create mode 100644 resources/multimc/22x22/viewfolder.png create mode 100644 resources/multimc/24x24/cat.png 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 create mode 100644 resources/multimc/8x8/noaccount.png create mode 100644 resources/multimc/index.theme create mode 100644 resources/multimc/multimc.qrc create mode 100644 resources/multimc/scalable/apps/multimc.svg create mode 100644 resources/multimc/scalable/bug.svg create mode 100644 resources/multimc/scalable/console.svg create mode 100644 resources/multimc/scalable/console_error.svg create mode 100644 resources/multimc/scalable/news.svg create mode 100644 resources/sources/clucker.svg create mode 100644 resources/sources/creeper.svg create mode 100644 resources/sources/enderpearl.svg create mode 100644 resources/sources/ftb-glow.svg create mode 100644 resources/sources/ftb-logo.svg create mode 100644 resources/sources/gear.svg create mode 100644 resources/sources/herobrine.svg create mode 100644 resources/sources/magitech.svg create mode 100644 resources/sources/meat.svg create mode 100644 resources/sources/netherstar.svg create mode 100644 resources/sources/pskeleton.svg create mode 100644 resources/sources/skeleton.svg create mode 100644 resources/sources/squarecreeper.svg create mode 100644 resources/sources/status-bad.svg create mode 100644 resources/sources/status-good.svg create mode 100644 resources/sources/status-terrible.svg create mode 100644 resources/sources/steve.svg diff --git a/CMakeLists.txt b/CMakeLists.txt index c0a4439b..f2ccdab0 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 68d3beed..00000000 --- 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 cca1ecac..7c8562cd 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 16e72c2f..5653907e 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 c91af978..181d7299 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/MultiMC.ico b/resources/MultiMC.ico new file mode 100644 index 00000000..734af0fb Binary files /dev/null and b/resources/MultiMC.ico differ diff --git a/resources/XdgIcon.theme b/resources/XdgIcon.theme deleted file mode 100644 index ad26482e..00000000 --- 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 00000000..55de139e --- /dev/null +++ b/resources/backgrounds/backgrounds.qrc @@ -0,0 +1,6 @@ + + + + catbgrnd2.png + + diff --git a/resources/backgrounds/catbgrnd2.png b/resources/backgrounds/catbgrnd2.png new file mode 100644 index 00000000..2b949e0b Binary files /dev/null and b/resources/backgrounds/catbgrnd2.png differ diff --git a/resources/catbgrnd2.png b/resources/catbgrnd2.png deleted file mode 100644 index 2b949e0b..00000000 Binary files a/resources/catbgrnd2.png and /dev/null differ diff --git a/resources/icons/MultiMC.ico b/resources/icons/MultiMC.ico deleted file mode 100644 index 734af0fb..00000000 Binary files a/resources/icons/MultiMC.ico and /dev/null differ diff --git a/resources/icons/console.svg b/resources/icons/console.svg deleted file mode 100644 index ec14ab68..00000000 --- a/resources/icons/console.svg +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - MC - - - diff --git a/resources/icons/console_error.svg b/resources/icons/console_error.svg deleted file mode 100644 index a71c6b35..00000000 --- a/resources/icons/console_error.svg +++ /dev/null @@ -1,247 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff --git a/resources/icons/instances/brick.png b/resources/icons/instances/brick.png deleted file mode 100644 index 0b534366..00000000 Binary files a/resources/icons/instances/brick.png and /dev/null differ diff --git a/resources/icons/instances/chicken.png b/resources/icons/instances/chicken.png deleted file mode 100644 index f870467a..00000000 Binary files a/resources/icons/instances/chicken.png and /dev/null differ diff --git a/resources/icons/instances/chicken128.png b/resources/icons/instances/chicken128.png deleted file mode 100644 index 71f6dedc..00000000 Binary files a/resources/icons/instances/chicken128.png and /dev/null differ diff --git a/resources/icons/instances/creeper.png b/resources/icons/instances/creeper.png deleted file mode 100644 index a67ecfc3..00000000 Binary files a/resources/icons/instances/creeper.png and /dev/null differ diff --git a/resources/icons/instances/creeper128.png b/resources/icons/instances/creeper128.png deleted file mode 100644 index 41b7d07d..00000000 Binary files a/resources/icons/instances/creeper128.png and /dev/null differ diff --git a/resources/icons/instances/derp.png b/resources/icons/instances/derp.png deleted file mode 100644 index 4c361942..00000000 Binary files a/resources/icons/instances/derp.png and /dev/null differ diff --git a/resources/icons/instances/diamond.png b/resources/icons/instances/diamond.png deleted file mode 100644 index 376ab901..00000000 Binary files a/resources/icons/instances/diamond.png and /dev/null differ diff --git a/resources/icons/instances/dirt.png b/resources/icons/instances/dirt.png deleted file mode 100644 index 9e19eb8f..00000000 Binary files a/resources/icons/instances/dirt.png and /dev/null differ diff --git a/resources/icons/instances/enderman.png b/resources/icons/instances/enderman.png deleted file mode 100644 index 9f3a72b3..00000000 Binary files a/resources/icons/instances/enderman.png and /dev/null differ diff --git a/resources/icons/instances/enderpearl.png b/resources/icons/instances/enderpearl.png deleted file mode 100644 index a818eb8e..00000000 Binary files a/resources/icons/instances/enderpearl.png and /dev/null differ diff --git a/resources/icons/instances/enderpearl128.png b/resources/icons/instances/enderpearl128.png deleted file mode 100644 index 0a5bf91a..00000000 Binary files a/resources/icons/instances/enderpearl128.png and /dev/null differ diff --git a/resources/icons/instances/ftb_glow.png b/resources/icons/instances/ftb_glow.png deleted file mode 100644 index c4e6fd5d..00000000 Binary files a/resources/icons/instances/ftb_glow.png and /dev/null differ diff --git a/resources/icons/instances/ftb_glow128.png b/resources/icons/instances/ftb_glow128.png deleted file mode 100644 index 86632b21..00000000 Binary files a/resources/icons/instances/ftb_glow128.png and /dev/null differ diff --git a/resources/icons/instances/ftb_logo.png b/resources/icons/instances/ftb_logo.png deleted file mode 100644 index 20df7171..00000000 Binary files a/resources/icons/instances/ftb_logo.png and /dev/null differ diff --git a/resources/icons/instances/ftb_logo128.png b/resources/icons/instances/ftb_logo128.png deleted file mode 100644 index e725b7fe..00000000 Binary files a/resources/icons/instances/ftb_logo128.png and /dev/null differ diff --git a/resources/icons/instances/gear.png b/resources/icons/instances/gear.png deleted file mode 100644 index da9ba2f9..00000000 Binary files a/resources/icons/instances/gear.png and /dev/null differ diff --git a/resources/icons/instances/gear128.png b/resources/icons/instances/gear128.png deleted file mode 100644 index 75c68a66..00000000 Binary files a/resources/icons/instances/gear128.png and /dev/null differ diff --git a/resources/icons/instances/gold.png b/resources/icons/instances/gold.png deleted file mode 100644 index 9bedda16..00000000 Binary files a/resources/icons/instances/gold.png and /dev/null differ diff --git a/resources/icons/instances/grass.png b/resources/icons/instances/grass.png deleted file mode 100644 index f1694547..00000000 Binary files a/resources/icons/instances/grass.png and /dev/null differ diff --git a/resources/icons/instances/herobrine.png b/resources/icons/instances/herobrine.png deleted file mode 100644 index e5460da3..00000000 Binary files a/resources/icons/instances/herobrine.png and /dev/null differ diff --git a/resources/icons/instances/herobrine128.png b/resources/icons/instances/herobrine128.png deleted file mode 100644 index 13f1494c..00000000 Binary files a/resources/icons/instances/herobrine128.png and /dev/null differ diff --git a/resources/icons/instances/infinity.png b/resources/icons/instances/infinity.png deleted file mode 100644 index bd94a3dc..00000000 Binary files a/resources/icons/instances/infinity.png and /dev/null differ diff --git a/resources/icons/instances/infinity128.png b/resources/icons/instances/infinity128.png deleted file mode 100644 index 226847fb..00000000 Binary files a/resources/icons/instances/infinity128.png and /dev/null differ diff --git a/resources/icons/instances/iron.png b/resources/icons/instances/iron.png deleted file mode 100644 index 28960782..00000000 Binary files a/resources/icons/instances/iron.png and /dev/null differ diff --git a/resources/icons/instances/magitech.png b/resources/icons/instances/magitech.png deleted file mode 100644 index 6fd8ff60..00000000 Binary files a/resources/icons/instances/magitech.png and /dev/null differ diff --git a/resources/icons/instances/magitech128.png b/resources/icons/instances/magitech128.png deleted file mode 100644 index 0f81a199..00000000 Binary files a/resources/icons/instances/magitech128.png and /dev/null differ diff --git a/resources/icons/instances/meat.png b/resources/icons/instances/meat.png deleted file mode 100644 index 6694859d..00000000 Binary files a/resources/icons/instances/meat.png and /dev/null differ diff --git a/resources/icons/instances/meat128.png b/resources/icons/instances/meat128.png deleted file mode 100644 index fefc9bf1..00000000 Binary files a/resources/icons/instances/meat128.png and /dev/null differ diff --git a/resources/icons/instances/netherstar.png b/resources/icons/instances/netherstar.png deleted file mode 100644 index 43cb5113..00000000 Binary files a/resources/icons/instances/netherstar.png and /dev/null differ diff --git a/resources/icons/instances/netherstar128.png b/resources/icons/instances/netherstar128.png deleted file mode 100644 index 132085f0..00000000 Binary files a/resources/icons/instances/netherstar128.png and /dev/null differ diff --git a/resources/icons/instances/planks.png b/resources/icons/instances/planks.png deleted file mode 100644 index 7fcf8467..00000000 Binary files a/resources/icons/instances/planks.png and /dev/null differ diff --git a/resources/icons/instances/skeleton.png b/resources/icons/instances/skeleton.png deleted file mode 100644 index 0c8d3505..00000000 Binary files a/resources/icons/instances/skeleton.png and /dev/null differ diff --git a/resources/icons/instances/skeleton128.png b/resources/icons/instances/skeleton128.png deleted file mode 100644 index 55fcf5a9..00000000 Binary files a/resources/icons/instances/skeleton128.png and /dev/null differ diff --git a/resources/icons/instances/squarecreeper.png b/resources/icons/instances/squarecreeper.png deleted file mode 100644 index b78c4ae0..00000000 Binary files a/resources/icons/instances/squarecreeper.png and /dev/null differ diff --git a/resources/icons/instances/squarecreeper128.png b/resources/icons/instances/squarecreeper128.png deleted file mode 100644 index c82d8406..00000000 Binary files a/resources/icons/instances/squarecreeper128.png and /dev/null differ diff --git a/resources/icons/instances/steve.png b/resources/icons/instances/steve.png deleted file mode 100644 index 07c6acde..00000000 Binary files a/resources/icons/instances/steve.png and /dev/null differ diff --git a/resources/icons/instances/steve128.png b/resources/icons/instances/steve128.png deleted file mode 100644 index a07cbd2f..00000000 Binary files a/resources/icons/instances/steve128.png and /dev/null differ diff --git a/resources/icons/instances/stone.png b/resources/icons/instances/stone.png deleted file mode 100644 index 34f9a751..00000000 Binary files a/resources/icons/instances/stone.png and /dev/null differ diff --git a/resources/icons/instances/tnt.png b/resources/icons/instances/tnt.png deleted file mode 100644 index e40d404d..00000000 Binary files a/resources/icons/instances/tnt.png and /dev/null differ diff --git a/resources/icons/instances_svg/clucker.svg b/resources/icons/instances_svg/clucker.svg deleted file mode 100644 index 0c1727eb..00000000 --- a/resources/icons/instances_svg/clucker.svg +++ /dev/null @@ -1,404 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -