NOISSUE allow using icon themes for instances and instance badges

47 files changed, 69 insertions, 60 deletions

diff --git a/application/resources/instances/broken.png b/application/resources/instances/broken.png
deleted file mode 100644
index 7a80a76e..00000000
--- a/application/resources/instances/broken.png
+++ /dev/null
diff --git a/application/resources/instances/derp.png b/application/resources/instances/derp.png
deleted file mode 100644
index 4c361942..00000000
--- a/application/resources/instances/derp.png
+++ /dev/null
diff --git a/application/resources/instances/instances.qrc b/application/resources/instances/instances.qrc
deleted file mode 100644
index 1f90762a..00000000
--- a/application/resources/instances/instances.qrc
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-    <qresource prefix="/icons/instances">
-		<!-- Source: Mojang -->
-        <file alias="brick">brick.png</file>
-        <file alias="diamond">diamond.png</file>
-        <file alias="dirt">dirt.png</file>
-        <file alias="gold">gold.png</file>
-        <file alias="grass">grass.png</file>
-        <file alias="stone">stone.png</file>
-        <file alias="tnt">tnt.png</file>
-        <file alias="iron">iron.png</file>
-        <file alias="planks">planks.png</file>
-
-		<!-- Source: Unknown -->
-		<file alias="derp">derp.png</file>
-        <file alias="enderman">enderman.png</file>
-
-        <!-- Our own. -->
-        <file alias="chicken">chicken128.png</file>
-        <file alias="creeper">creeper128.png</file>
-        <file alias="enderpearl">enderpearl128.png</file>
-        <file alias="ftb-glow">ftb_glow128.png</file>
-        <file alias="ftb-logo">ftb_logo128.png</file>
-        <file alias="gear">gear128.png</file>
-        <file alias="herobrine">herobrine128.png</file>
-        <file alias="infinity">infinity128.png</file>
-        <file alias="magitech">magitech128.png</file>
-        <file alias="meat">meat128.png</file>
-        <file alias="netherstar">netherstar128.png</file>
-        <file alias="skeleton">skeleton128.png</file>
-        <file alias="squarecreeper">squarecreeper128.png</file>
-        <file alias="steve">steve128.png</file>
-    </qresource>
-    <qresource prefix="/icons/badges">
-        <!-- Source: see above -->
-        <file>enderman.png</file>
-        <file>herobrine.png</file>
-        <file>derp.png</file>
-		<file>status-running.png</file>
-		<file>status-bad.png</file>
-
-	<!-- Update. GPLv2, https://code.google.com/p/gnome-colors/ -->
-	<file>updateavailable.png</file>
-
-        <!-- Source: http://www.iconarchive.com/show/cat-icons-by-fasticon/Cat-Brown-icon.html -->
-        <file>kitten.png</file>
-        <!-- Source: http://www.iconarchive.com/show/crystal-clear-icons-by-everaldo/Filesystem-file-broken-icon.html -->
-        <file>broken.png</file>
-    </qresource>
-</RCC>
diff --git a/application/resources/instances/kitten.png b/application/resources/instances/kitten.png
deleted file mode 100644
index d17661ce..00000000
--- a/application/resources/instances/kitten.png
+++ /dev/null
diff --git a/application/resources/instances/status-bad.png b/application/resources/instances/status-bad.png
deleted file mode 100644
index d1547a47..00000000
--- a/application/resources/instances/status-bad.png
+++ /dev/null
diff --git a/application/resources/instances/status-running.png b/application/resources/instances/status-running.png
deleted file mode 100644
index ecd64451..00000000
--- a/application/resources/instances/status-running.png
+++ /dev/null
diff --git a/application/resources/instances/updateavailable.png b/application/resources/instances/updateavailable.png
deleted file mode 100644
index 754005f9..00000000
--- a/application/resources/instances/updateavailable.png
+++ /dev/null
diff --git a/application/resources/instances/chicken128.png b/application/resources/multimc/128x128/instances/chicken.png
index 71f6dedc..71f6dedc 100644
--- a/application/resources/instances/chicken128.png
+++ b/application/resources/multimc/128x128/instances/chicken.png
diff --git a/application/resources/instances/creeper128.png b/application/resources/multimc/128x128/instances/creeper.png
index 41b7d07d..41b7d07d 100644
--- a/application/resources/instances/creeper128.png
+++ b/application/resources/multimc/128x128/instances/creeper.png
diff --git a/application/resources/instances/enderpearl128.png b/application/resources/multimc/128x128/instances/enderpearl.png
index 0a5bf91a..0a5bf91a 100644
--- a/application/resources/instances/enderpearl128.png
+++ b/application/resources/multimc/128x128/instances/enderpearl.png
diff --git a/application/resources/instances/ftb_glow128.png b/application/resources/multimc/128x128/instances/ftb_glow.png
index 86632b21..86632b21 100644
--- a/application/resources/instances/ftb_glow128.png
+++ b/application/resources/multimc/128x128/instances/ftb_glow.png
diff --git a/application/resources/instances/ftb_logo128.png b/application/resources/multimc/128x128/instances/ftb_logo.png
index e725b7fe..e725b7fe 100644
--- a/application/resources/instances/ftb_logo128.png
+++ b/application/resources/multimc/128x128/instances/ftb_logo.png
diff --git a/application/resources/instances/gear128.png b/application/resources/multimc/128x128/instances/gear.png
index 75c68a66..75c68a66 100644
--- a/application/resources/instances/gear128.png
+++ b/application/resources/multimc/128x128/instances/gear.png
diff --git a/application/resources/instances/herobrine128.png b/application/resources/multimc/128x128/instances/herobrine.png
index 13f1494c..13f1494c 100644
--- a/application/resources/instances/herobrine128.png
+++ b/application/resources/multimc/128x128/instances/herobrine.png
diff --git a/application/resources/instances/infinity128.png b/application/resources/multimc/128x128/instances/infinity.png
index 226847fb..226847fb 100644
--- a/application/resources/instances/infinity128.png
+++ b/application/resources/multimc/128x128/instances/infinity.png
diff --git a/application/resources/instances/magitech128.png b/application/resources/multimc/128x128/instances/magitech.png
index 0f81a199..0f81a199 100644
--- a/application/resources/instances/magitech128.png
+++ b/application/resources/multimc/128x128/instances/magitech.png
diff --git a/application/resources/instances/meat128.png b/application/resources/multimc/128x128/instances/meat.png
index fefc9bf1..fefc9bf1 100644
--- a/application/resources/instances/meat128.png
+++ b/application/resources/multimc/128x128/instances/meat.png
diff --git a/application/resources/instances/netherstar128.png b/application/resources/multimc/128x128/instances/netherstar.png
index 132085f0..132085f0 100644
--- a/application/resources/instances/netherstar128.png
+++ b/application/resources/multimc/128x128/instances/netherstar.png
diff --git a/application/resources/instances/skeleton128.png b/application/resources/multimc/128x128/instances/skeleton.png
index 55fcf5a9..55fcf5a9 100644
--- a/application/resources/instances/skeleton128.png
+++ b/application/resources/multimc/128x128/instances/skeleton.png
diff --git a/application/resources/instances/squarecreeper128.png b/application/resources/multimc/128x128/instances/squarecreeper.png
index c82d8406..c82d8406 100644
--- a/application/resources/instances/squarecreeper128.png
+++ b/application/resources/multimc/128x128/instances/squarecreeper.png
diff --git a/application/resources/instances/steve128.png b/application/resources/multimc/128x128/instances/steve.png
index a07cbd2f..a07cbd2f 100644
--- a/application/resources/instances/steve128.png
+++ b/application/resources/multimc/128x128/instances/steve.png
diff --git a/application/resources/instances/brick.png b/application/resources/multimc/32x32/instances/brick.png
index 0b534366..0b534366 100644
--- a/application/resources/instances/brick.png
+++ b/application/resources/multimc/32x32/instances/brick.png
diff --git a/application/resources/instances/chicken.png b/application/resources/multimc/32x32/instances/chicken.png
index f870467a..f870467a 100644
--- a/application/resources/instances/chicken.png
+++ b/application/resources/multimc/32x32/instances/chicken.png
diff --git a/application/resources/instances/creeper.png b/application/resources/multimc/32x32/instances/creeper.png
index a67ecfc3..a67ecfc3 100644
--- a/application/resources/instances/creeper.png
+++ b/application/resources/multimc/32x32/instances/creeper.png
diff --git a/application/resources/instances/diamond.png b/application/resources/multimc/32x32/instances/diamond.png
index 376ab901..376ab901 100644
--- a/application/resources/instances/diamond.png
+++ b/application/resources/multimc/32x32/instances/diamond.png
diff --git a/application/resources/instances/dirt.png b/application/resources/multimc/32x32/instances/dirt.png
index 9e19eb8f..9e19eb8f 100644
--- a/application/resources/instances/dirt.png
+++ b/application/resources/multimc/32x32/instances/dirt.png
diff --git a/application/resources/instances/enderpearl.png b/application/resources/multimc/32x32/instances/enderpearl.png
index a818eb8e..a818eb8e 100644
--- a/application/resources/instances/enderpearl.png
+++ b/application/resources/multimc/32x32/instances/enderpearl.png
diff --git a/application/resources/instances/ftb_glow.png b/application/resources/multimc/32x32/instances/ftb_glow.png
index c4e6fd5d..c4e6fd5d 100644
--- a/application/resources/instances/ftb_glow.png
+++ b/application/resources/multimc/32x32/instances/ftb_glow.png
diff --git a/application/resources/instances/ftb_logo.png b/application/resources/multimc/32x32/instances/ftb_logo.png
index 20df7171..20df7171 100644
--- a/application/resources/instances/ftb_logo.png
+++ b/application/resources/multimc/32x32/instances/ftb_logo.png
diff --git a/application/resources/instances/gear.png b/application/resources/multimc/32x32/instances/gear.png
index da9ba2f9..da9ba2f9 100644
--- a/application/resources/instances/gear.png
+++ b/application/resources/multimc/32x32/instances/gear.png
diff --git a/application/resources/instances/gold.png b/application/resources/multimc/32x32/instances/gold.png
index 9bedda16..9bedda16 100644
--- a/application/resources/instances/gold.png
+++ b/application/resources/multimc/32x32/instances/gold.png
diff --git a/application/resources/instances/grass.png b/application/resources/multimc/32x32/instances/grass.png
index f1694547..f1694547 100644
--- a/application/resources/instances/grass.png
+++ b/application/resources/multimc/32x32/instances/grass.png
diff --git a/application/resources/instances/herobrine.png b/application/resources/multimc/32x32/instances/herobrine.png
index e5460da3..e5460da3 100644
--- a/application/resources/instances/herobrine.png
+++ b/application/resources/multimc/32x32/instances/herobrine.png
diff --git a/application/resources/instances/infinity.png b/application/resources/multimc/32x32/instances/infinity.png
index bd94a3dc..bd94a3dc 100644
--- a/application/resources/instances/infinity.png
+++ b/application/resources/multimc/32x32/instances/infinity.png
diff --git a/application/resources/instances/iron.png b/application/resources/multimc/32x32/instances/iron.png
index 28960782..28960782 100644
--- a/application/resources/instances/iron.png
+++ b/application/resources/multimc/32x32/instances/iron.png
diff --git a/application/resources/instances/magitech.png b/application/resources/multimc/32x32/instances/magitech.png
index 6fd8ff60..6fd8ff60 100644
--- a/application/resources/instances/magitech.png
+++ b/application/resources/multimc/32x32/instances/magitech.png
diff --git a/application/resources/instances/meat.png b/application/resources/multimc/32x32/instances/meat.png
index 6694859d..6694859d 100644
--- a/application/resources/instances/meat.png
+++ b/application/resources/multimc/32x32/instances/meat.png
diff --git a/application/resources/instances/netherstar.png b/application/resources/multimc/32x32/instances/netherstar.png
index 43cb5113..43cb5113 100644
--- a/application/resources/instances/netherstar.png
+++ b/application/resources/multimc/32x32/instances/netherstar.png
diff --git a/application/resources/instances/planks.png b/application/resources/multimc/32x32/instances/planks.png
index 7fcf8467..7fcf8467 100644
--- a/application/resources/instances/planks.png
+++ b/application/resources/multimc/32x32/instances/planks.png
diff --git a/application/resources/instances/skeleton.png b/application/resources/multimc/32x32/instances/skeleton.png
index 0c8d3505..0c8d3505 100644
--- a/application/resources/instances/skeleton.png
+++ b/application/resources/multimc/32x32/instances/skeleton.png
diff --git a/application/resources/instances/squarecreeper.png b/application/resources/multimc/32x32/instances/squarecreeper.png
index b78c4ae0..b78c4ae0 100644
--- a/application/resources/instances/squarecreeper.png
+++ b/application/resources/multimc/32x32/instances/squarecreeper.png
diff --git a/application/resources/instances/steve.png b/application/resources/multimc/32x32/instances/steve.png
index 07c6acde..07c6acde 100644
--- a/application/resources/instances/steve.png
+++ b/application/resources/multimc/32x32/instances/steve.png
diff --git a/application/resources/instances/stone.png b/application/resources/multimc/32x32/instances/stone.png
index 34f9a751..34f9a751 100644
--- a/application/resources/instances/stone.png
+++ b/application/resources/multimc/32x32/instances/stone.png
diff --git a/application/resources/instances/tnt.png b/application/resources/multimc/32x32/instances/tnt.png
index e40d404d..e40d404d 100644
--- a/application/resources/instances/tnt.png
+++ b/application/resources/multimc/32x32/instances/tnt.png
diff --git a/application/resources/instances/enderman.png b/application/resources/multimc/50x50/instances/enderman.png
index 9f3a72b3..9f3a72b3 100644
--- a/application/resources/instances/enderman.png
+++ b/application/resources/multimc/50x50/instances/enderman.png
diff --git a/application/resources/multimc/index.theme b/application/resources/multimc/index.theme
index 5f7d3f3f..0fe7e7d7 100644
--- a/application/resources/multimc/index.theme
+++ b/application/resources/multimc/index.theme
@@ -2,14 +2,7 @@
 Name=multimc
 Comment=MultiMC Default Icons
 Inherits=default
-Directories=scalable/apps,8x8,16x16,22x22,24x24,32x32,48x48,scalable
-
-[scalable/apps]
-Size=48
-Type=scalable
-MinSize=1
-MaxSize=512
-Context=Applications
+Directories=8x8,16x16,22x22,24x24,32x32,32x32/instances,48x48,50x50/instances,64x64,128x128/instances,256x256,scalable
 
 [8x8]
 Size=8
@@ -26,12 +19,25 @@ Size=24
 [32x32]
 Size=32
 
+[32x32/instances]
+Size=32
+MinSize=1
+MaxSize=32
+
 [48x48]
 Size=48
 
+[50x50/instances]
+Size=50
+
 [64x64]
 Size=64
 
+[128x128/instances]
+Size=128
+MinSize=33
+MaxSize=128
+
 [256x256]
 Size=256
 
diff --git a/application/resources/multimc/multimc.qrc b/application/resources/multimc/multimc.qrc
index 91e19065..ef3e9ab6 100644
--- a/application/resources/multimc/multimc.qrc
+++ b/application/resources/multimc/multimc.qrc
@@ -233,5 +233,59 @@
 		<!-- discord logo icon thing. from discord. traced from bitmap -->
 		<file>scalable/discord.svg</file>
 
-    </qresource>
+		<!-- instance icons -->
+		<file>32x32/instances/chicken.png</file>
+		<file>128x128/instances/chicken.png</file>
+
+		<file>32x32/instances/creeper.png</file>
+		<file>128x128/instances/creeper.png</file>
+
+		<file>32x32/instances/enderpearl.png</file>
+		<file>128x128/instances/enderpearl.png</file>
+
+		<file>32x32/instances/ftb_glow.png</file>
+		<file>128x128/instances/ftb_glow.png</file>
+
+		<file>32x32/instances/ftb_logo.png</file>
+		<file>128x128/instances/ftb_logo.png</file>
+
+		<file>32x32/instances/gear.png</file>
+		<file>128x128/instances/gear.png</file>
+
+		<file>32x32/instances/herobrine.png</file>
+		<file>128x128/instances/herobrine.png</file>
+
+		<file>32x32/instances/infinity.png</file>
+		<file>128x128/instances/infinity.png</file>
+
+		<file>32x32/instances/magitech.png</file>
+		<file>128x128/instances/magitech.png</file>
+
+		<file>32x32/instances/meat.png</file>
+		<file>128x128/instances/meat.png</file>
+
+		<file>32x32/instances/netherstar.png</file>
+		<file>128x128/instances/netherstar.png</file>
+
+		<file>32x32/instances/skeleton.png</file>
+		<file>128x128/instances/skeleton.png</file>
+
+		<file>32x32/instances/squarecreeper.png</file>
+		<file>128x128/instances/squarecreeper.png</file>
+
+		<file>32x32/instances/steve.png</file>
+		<file>128x128/instances/steve.png</file>
+
+		<file>32x32/instances/brick.png</file>
+		<file>32x32/instances/diamond.png</file>
+		<file>32x32/instances/dirt.png</file>
+		<file>32x32/instances/gold.png</file>
+		<file>32x32/instances/grass.png</file>
+		<file>32x32/instances/iron.png</file>
+		<file>32x32/instances/planks.png</file>
+		<file>32x32/instances/stone.png</file>
+		<file>32x32/instances/tnt.png</file>
+
+		<file>50x50/instances/enderman.png</file>
+	</qresource>
 </RCC>