From 59e1ed3d8750b499b6d515a82bc08f6f72cc456a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 1 Jun 2019 00:59:02 +0200 Subject: NOISSUE add the pocket fox icon --- api/gui/icons/IconList.cpp | 3 +- application/MultiMC.cpp | 3 +- application/resources/multimc/index.theme | 7 +- application/resources/multimc/multimc.qrc | 2 + .../resources/multimc/scalable/instances/fox.svg | 290 +++++++++++++++++++++ 5 files changed, 301 insertions(+), 4 deletions(-) create mode 100644 application/resources/multimc/scalable/instances/fox.svg diff --git a/api/gui/icons/IconList.cpp b/api/gui/icons/IconList.cpp index 89380a91..72edb46f 100644 --- a/api/gui/icons/IconList.cpp +++ b/api/gui/icons/IconList.cpp @@ -187,8 +187,7 @@ Qt::DropActions IconList::supportedDropActions() const return Qt::CopyAction; } -bool IconList::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, - const QModelIndex &parent) +bool IconList::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) { if (action == Qt::IgnoreAction) return true; diff --git a/application/MultiMC.cpp b/application/MultiMC.cpp index 762121b2..f31c4ba5 100644 --- a/application/MultiMC.cpp +++ b/application/MultiMC.cpp @@ -552,7 +552,8 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv) { ":/icons/multimc/32x32/instances/", ":/icons/multimc/50x50/instances/", - ":/icons/multimc/128x128/instances/" + ":/icons/multimc/128x128/instances/", + ":/icons/multimc/scalable/instances/" }; m_icons.reset(new IconList(instFolders, setting->get().toString())); connect(setting.get(), &Setting::SettingChanged,[&](const Setting &, QVariant value) diff --git a/application/resources/multimc/index.theme b/application/resources/multimc/index.theme index 290f42fb..6061b7f8 100644 --- a/application/resources/multimc/index.theme +++ b/application/resources/multimc/index.theme @@ -2,7 +2,7 @@ Name=multimc Comment=MultiMC Default Icons Inherits=default -Directories=8x8,16x16,22x22,24x24,32x32,32x32/instances,48x48,50x50/instances,64x64,128x128/instances,256x256,scalable +Directories=8x8,16x16,22x22,24x24,32x32,32x32/instances,48x48,50x50/instances,64x64,128x128/instances,256x256,scalable,scalable/instances [8x8] Size=8 @@ -51,3 +51,8 @@ Size=48 Type=Scalable MinSize=16 MaxSize=256 + +[scalable/instances] +Size=128 +MinSize=16 +MaxSize=256 diff --git a/application/resources/multimc/multimc.qrc b/application/resources/multimc/multimc.qrc index 7feaaaef..22e7af86 100644 --- a/application/resources/multimc/multimc.qrc +++ b/application/resources/multimc/multimc.qrc @@ -308,5 +308,7 @@ 32x32/instances/tnt.png 50x50/instances/enderman.png + + scalable/instances/fox.svg diff --git a/application/resources/multimc/scalable/instances/fox.svg b/application/resources/multimc/scalable/instances/fox.svg new file mode 100644 index 00000000..fcf16b2f --- /dev/null +++ b/application/resources/multimc/scalable/instances/fox.svg @@ -0,0 +1,290 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3