summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--logic/SkinUtils.h2
-rw-r--r--resources/multimc/16x16/cat.pngbin0 -> 736 bytes
-rw-r--r--resources/multimc/16x16/refresh.pngbin1389 -> 931 bytes
-rw-r--r--resources/multimc/22x22/cat.pngbin0 -> 1034 bytes
-rw-r--r--resources/multimc/22x22/refresh.pngbin1843 -> 1283 bytes
-rw-r--r--resources/multimc/24x24/cat.pngbin811 -> 1252 bytes
-rw-r--r--resources/multimc/32x32/cat.pngbin0 -> 1678 bytes
-rw-r--r--resources/multimc/32x32/refresh.pngbin2822 -> 2182 bytes
-rw-r--r--resources/multimc/48x48/cat.pngbin0 -> 2733 bytes
-rw-r--r--resources/multimc/48x48/refresh.pngbin3922 -> 3743 bytes
-rw-r--r--resources/multimc/64x64/about.pngbin0 -> 5513 bytes
-rw-r--r--resources/multimc/64x64/bug.pngbin0 -> 4263 bytes
-rw-r--r--resources/multimc/64x64/cat.pngbin0 -> 4033 bytes
-rw-r--r--resources/multimc/64x64/centralmods.pngbin0 -> 4408 bytes
-rw-r--r--resources/multimc/64x64/checkupdate.pngbin0 -> 5858 bytes
-rw-r--r--resources/multimc/64x64/copy.pngbin0 -> 2884 bytes
-rw-r--r--resources/multimc/64x64/help.pngbin0 -> 5402 bytes
-rw-r--r--resources/multimc/64x64/new.pngbin0 -> 3949 bytes
-rw-r--r--resources/multimc/64x64/news.pngbin0 -> 4968 bytes
-rw-r--r--resources/multimc/64x64/refresh.pngbin0 -> 5745 bytes
-rw-r--r--resources/multimc/64x64/settings.pngbin0 -> 7125 bytes
-rw-r--r--resources/multimc/64x64/viewfolder.pngbin0 -> 2134 bytes
-rw-r--r--resources/multimc/index.theme3
-rw-r--r--resources/multimc/multimc.qrc64
-rw-r--r--resources/multimc/scalable/bug.svg28
25 files changed, 58 insertions, 39 deletions
diff --git a/logic/SkinUtils.h b/logic/SkinUtils.h
index 324f86b8..64353b72 100644
--- a/logic/SkinUtils.h
+++ b/logic/SkinUtils.h
@@ -19,5 +19,5 @@
namespace SkinUtils
{
-QPixmap getFaceFromCache(QString username, int height = 48, int width = 48);
+QPixmap getFaceFromCache(QString username, int height = 64, int width = 64);
}
diff --git a/resources/multimc/16x16/cat.png b/resources/multimc/16x16/cat.png
new file mode 100644
index 00000000..e6e31b44
--- /dev/null
+++ b/resources/multimc/16x16/cat.png
Binary files differ
diff --git a/resources/multimc/16x16/refresh.png b/resources/multimc/16x16/refresh.png
index dc66b824..86b6f82c 100644
--- a/resources/multimc/16x16/refresh.png
+++ b/resources/multimc/16x16/refresh.png
Binary files differ
diff --git a/resources/multimc/22x22/cat.png b/resources/multimc/22x22/cat.png
new file mode 100644
index 00000000..3ea7ba69
--- /dev/null
+++ b/resources/multimc/22x22/cat.png
Binary files differ
diff --git a/resources/multimc/22x22/refresh.png b/resources/multimc/22x22/refresh.png
index 734729bf..45b5535c 100644
--- a/resources/multimc/22x22/refresh.png
+++ b/resources/multimc/22x22/refresh.png
Binary files differ
diff --git a/resources/multimc/24x24/cat.png b/resources/multimc/24x24/cat.png
index 4fcda3ea..c93245f6 100644
--- a/resources/multimc/24x24/cat.png
+++ b/resources/multimc/24x24/cat.png
Binary files differ
diff --git a/resources/multimc/32x32/cat.png b/resources/multimc/32x32/cat.png
new file mode 100644
index 00000000..78ff98e9
--- /dev/null
+++ b/resources/multimc/32x32/cat.png
Binary files differ
diff --git a/resources/multimc/32x32/refresh.png b/resources/multimc/32x32/refresh.png
index 1f0c3913..afa2a9d7 100644
--- a/resources/multimc/32x32/refresh.png
+++ b/resources/multimc/32x32/refresh.png
Binary files differ
diff --git a/resources/multimc/48x48/cat.png b/resources/multimc/48x48/cat.png
new file mode 100644
index 00000000..25912a3c
--- /dev/null
+++ b/resources/multimc/48x48/cat.png
Binary files differ
diff --git a/resources/multimc/48x48/refresh.png b/resources/multimc/48x48/refresh.png
index f81b8d67..0b08b238 100644
--- a/resources/multimc/48x48/refresh.png
+++ b/resources/multimc/48x48/refresh.png
Binary files differ
diff --git a/resources/multimc/64x64/about.png b/resources/multimc/64x64/about.png
new file mode 100644
index 00000000..b83e9269
--- /dev/null
+++ b/resources/multimc/64x64/about.png
Binary files differ
diff --git a/resources/multimc/64x64/bug.png b/resources/multimc/64x64/bug.png
new file mode 100644
index 00000000..156b0315
--- /dev/null
+++ b/resources/multimc/64x64/bug.png
Binary files differ
diff --git a/resources/multimc/64x64/cat.png b/resources/multimc/64x64/cat.png
new file mode 100644
index 00000000..2cc21f80
--- /dev/null
+++ b/resources/multimc/64x64/cat.png
Binary files differ
diff --git a/resources/multimc/64x64/centralmods.png b/resources/multimc/64x64/centralmods.png
new file mode 100644
index 00000000..8831f437
--- /dev/null
+++ b/resources/multimc/64x64/centralmods.png
Binary files differ
diff --git a/resources/multimc/64x64/checkupdate.png b/resources/multimc/64x64/checkupdate.png
new file mode 100644
index 00000000..dd1e29ac
--- /dev/null
+++ b/resources/multimc/64x64/checkupdate.png
Binary files differ
diff --git a/resources/multimc/64x64/copy.png b/resources/multimc/64x64/copy.png
new file mode 100644
index 00000000..d12cf9c8
--- /dev/null
+++ b/resources/multimc/64x64/copy.png
Binary files differ
diff --git a/resources/multimc/64x64/help.png b/resources/multimc/64x64/help.png
new file mode 100644
index 00000000..0f3948c2
--- /dev/null
+++ b/resources/multimc/64x64/help.png
Binary files differ
diff --git a/resources/multimc/64x64/new.png b/resources/multimc/64x64/new.png
new file mode 100644
index 00000000..c3c6796c
--- /dev/null
+++ b/resources/multimc/64x64/new.png
Binary files differ
diff --git a/resources/multimc/64x64/news.png b/resources/multimc/64x64/news.png
new file mode 100644
index 00000000..e306eed3
--- /dev/null
+++ b/resources/multimc/64x64/news.png
Binary files differ
diff --git a/resources/multimc/64x64/refresh.png b/resources/multimc/64x64/refresh.png
new file mode 100644
index 00000000..8373d819
--- /dev/null
+++ b/resources/multimc/64x64/refresh.png
Binary files differ
diff --git a/resources/multimc/64x64/settings.png b/resources/multimc/64x64/settings.png
new file mode 100644
index 00000000..e3ff58fa
--- /dev/null
+++ b/resources/multimc/64x64/settings.png
Binary files differ
diff --git a/resources/multimc/64x64/viewfolder.png b/resources/multimc/64x64/viewfolder.png
new file mode 100644
index 00000000..7d531f9c
--- /dev/null
+++ b/resources/multimc/64x64/viewfolder.png
Binary files differ
diff --git a/resources/multimc/index.theme b/resources/multimc/index.theme
index d7d460c7..776792b7 100644
--- a/resources/multimc/index.theme
+++ b/resources/multimc/index.theme
@@ -28,3 +28,6 @@ Size=32
[48x48]
Size=48
+
+[64x64]
+Size=64 \ No newline at end of file
diff --git a/resources/multimc/multimc.qrc b/resources/multimc/multimc.qrc
index 592ea7a1..363347de 100644
--- a/resources/multimc/multimc.qrc
+++ b/resources/multimc/multimc.qrc
@@ -16,64 +16,82 @@
<file>22x22/about.png</file>
<file>32x32/about.png</file>
<file>48x48/about.png</file>
+ <file>64x64/about.png</file>
<!-- Report bug. Our own. -->
<file>scalable/bug.svg</file>
- <file>16x16/bug.png</file>
- <file>22x22/bug.png</file>
- <file>32x32/bug.png</file>
+ <file>16x16/bug.png</file>
+ <file>22x22/bug.png</file>
+ <file>32x32/bug.png</file>
<file>48x48/bug.png</file>
+ <file>64x64/bug.png</file>
- <!-- Show mods folder. CC-BY-SA 3.0 http://openiconlibrary.sourceforge.net/gallery2/?./Icons/places/oxygen-style/folder-favorites.png -->
- <file>scalable/centralmods.svg</file>
- <file>16x16/centralmods.png</file>
- <file>22x22/centralmods.png</file>
- <file>32x32/centralmods.png</file>
+ <!-- The cat button. Freeware, http://findicons.com/icon/73096/black_cat -->
+ <file>16x16/cat.png</file>
+ <file>22x22/cat.png</file>
+ <file>24x24/cat.png</file>
+ <file>32x32/cat.png</file>
+ <file>48x48/cat.png</file>
+ <file>64x64/cat.png</file>
+
+ <!-- Show mods folder. CC-BY-SA 3.0 http://openiconlibrary.sourceforge.net/gallery2/?./Icons/places/oxygen-style/folder-favorites.png -->
+ <file>scalable/centralmods.svg</file>
+ <file>16x16/centralmods.png</file>
+ <file>22x22/centralmods.png</file>
+ <file>32x32/centralmods.png</file>
<file>48x48/centralmods.png</file>
+ <file>64x64/centralmods.png</file>
<!-- Update. GPLv2, https://code.google.com/p/gnome-colors/ -->
<file>scalable/checkupdate.svg</file>
- <file>16x16/checkupdate.png</file>
- <file>22x22/checkupdate.png</file>
- <file>32x32/checkupdate.png</file>
+ <file>16x16/checkupdate.png</file>
+ <file>22x22/checkupdate.png</file>
+ <file>32x32/checkupdate.png</file>
<file>48x48/checkupdate.png</file>
+ <file>64x64/checkupdate.png</file>
+ <!-- copy instance. CC-BY-SA 3.0, http://openiconlibrary.sourceforge.net/gallery2/?./Icons/actions/edit-copy-6.png -->
+ <file>16x16/copy.png</file>
+ <file>22x22/copy.png</file>
+ <file>32x32/copy.png</file>
+ <file>48x48/copy.png</file>
+ <file>64x64/copy.png</file>
+
<!-- Help. CC-BY-SA 3.0, http://openiconlibrary.sourceforge.net/gallery2/?./Icons/actions/help.png -->
<file>16x16/help.png</file>
<file>22x22/help.png</file>
<file>32x32/help.png</file>
<file>48x48/help.png</file>
+ <file>64x64/help.png</file>
<!-- New instance. GPLv2, http://openiconlibrary.sourceforge.net/gallery2/?./Icons/actions/document-new-3.png -->
<file>16x16/new.png</file>
<file>22x22/new.png</file>
<file>32x32/new.png</file>
<file>48x48/new.png</file>
-
- <!-- copy instance. CC-BY-SA 3.0, http://openiconlibrary.sourceforge.net/gallery2/?./Icons/actions/edit-copy-6.png -->
- <file>16x16/copy.png</file>
- <file>22x22/copy.png</file>
- <file>32x32/copy.png</file>
- <file>48x48/copy.png</file>
+ <file>64x64/new.png</file>
<!-- Open news. Our own. -->
<file>scalable/news.svg</file>
- <file>16x16/news.png</file>
+ <file>16x16/news.png</file>
<file>22x22/news.png</file>
<file>32x32/news.png</file>
<file>48x48/news.png</file>
+ <file>64x64/news.png</file>
- <!-- Refresh, LGPL-2.1, http://openiconlibrary.sourceforge.net/gallery2/?./Icons/actions/view-refresh-6.png -->
- <file>16x16/refresh.png</file>
+ <!-- Refresh, CC-BY-SA 3.0, Oxygen icons. -->
+ <file>16x16/refresh.png</file>
<file>22x22/refresh.png</file>
<file>32x32/refresh.png</file>
<file>48x48/refresh.png</file>
+ <file>64x64/refresh.png</file>
<!-- Settings, LGPL-2.1, http://openiconlibrary.sourceforge.net/gallery2/?./Icons/apps/system-settings-3.png -->
<file>16x16/settings.png</file>
<file>22x22/settings.png</file>
<file>32x32/settings.png</file>
<file>48x48/settings.png</file>
+ <file>64x64/settings.png</file>
<!-- View folder. CC-BY-SA 3.0, http://openiconlibrary.sourceforge.net/gallery2/?./Icons/actions/document-open-folder.png -->
<file>scalable/viewfolder.svg</file>
@@ -81,12 +99,10 @@
<file>22x22/viewfolder.png</file>
<file>32x32/viewfolder.png</file>
<file>48x48/viewfolder.png</file>
-
- <!-- The cat button. Our own. -->
- <file>24x24/cat.png</file>
+ <file>64x64/viewfolder.png</file>
<!-- Default minecraft skin, desaturated, cutout of head, Mojang -->
- <file>8x8/noaccount.png</file>
+ <file>8x8/noaccount.png</file>
<file>16x16/noaccount.png</file>
<file>24x24/noaccount.png</file>
<file>32x32/noaccount.png</file>
diff --git a/resources/multimc/scalable/bug.svg b/resources/multimc/scalable/bug.svg
index 0534cbef..178e3c23 100644
--- a/resources/multimc/scalable/bug.svg
+++ b/resources/multimc/scalable/bug.svg
@@ -14,11 +14,11 @@
height="32"
id="svg2"
version="1.1"
- inkscape:version="0.48.3.1 r9886"
+ inkscape:version="0.48.4 r9939"
sodipodi:docname="bug.svg"
- inkscape:export-filename="/home/peterix/projects/MultiMC4/src/resources/tbaricons/ReportBug.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
+ inkscape:export-filename="/home/peterix/minecraft/src/MultiMC5/resources/multimc/64x64/bug.png"
+ inkscape:export-xdpi="180"
+ inkscape:export-ydpi="180">
<defs
id="defs4">
<linearGradient
@@ -189,10 +189,10 @@
inkscape:document-units="px"
inkscape:current-layer="g3986"
showgrid="false"
- inkscape:window-width="1607"
- inkscape:window-height="1030"
- inkscape:window-x="1676"
- inkscape:window-y="-3"
+ inkscape:window-width="1680"
+ inkscape:window-height="1026"
+ inkscape:window-x="-3"
+ inkscape:window-y="-4"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
@@ -324,7 +324,7 @@
</g>
<path
transform="matrix(1.5,0,0,1.5,-27.5,1011.8622)"
- d="m 54,16.5 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+ d="M 54,16.5 C 54,16.776142 53.776142,17 53.5,17 53.223858,17 53,16.776142 53,16.5 53,16.223858 53.223858,16 53.5,16 c 0.276142,0 0.5,0.223858 0.5,0.5 z"
sodipodi:ry="0.5"
sodipodi:rx="0.5"
sodipodi:cy="16.5"
@@ -334,7 +334,7 @@
sodipodi:type="arc" />
<path
transform="matrix(1.5,0,0,1.5,-28,1010.8622)"
- d="m 56,18.5 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+ d="M 56,18.5 C 56,18.776142 55.776142,19 55.5,19 55.223858,19 55,18.776142 55,18.5 55,18.223858 55.223858,18 55.5,18 c 0.276142,0 0.5,0.223858 0.5,0.5 z"
sodipodi:ry="0.5"
sodipodi:rx="0.5"
sodipodi:cy="18.5"
@@ -344,7 +344,7 @@
sodipodi:type="arc" />
<path
transform="matrix(1.5,0,0,1.5,-25,1009.3622)"
- d="m 50,20.5 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+ d="M 50,20.5 C 50,20.776142 49.776142,21 49.5,21 49.223858,21 49,20.776142 49,20.5 49,20.223858 49.223858,20 49.5,20 c 0.276142,0 0.5,0.223858 0.5,0.5 z"
sodipodi:ry="0.5"
sodipodi:rx="0.5"
sodipodi:cy="20.5"
@@ -354,7 +354,7 @@
sodipodi:type="arc" />
<path
transform="matrix(1.5,0,0,1.5,-26,1008.8622)"
- d="m 52,22.5 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+ d="M 52,22.5 C 52,22.776142 51.776142,23 51.5,23 51.223858,23 51,22.776142 51,22.5 51,22.223858 51.223858,22 51.5,22 c 0.276142,0 0.5,0.223858 0.5,0.5 z"
sodipodi:ry="0.5"
sodipodi:rx="0.5"
sodipodi:cy="22.5"
@@ -364,7 +364,7 @@
sodipodi:type="arc" />
<path
transform="matrix(1.5,0,0,1.5,-26.5,1009.3622)"
- d="m 54,23.5 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+ d="M 54,23.5 C 54,23.776142 53.776142,24 53.5,24 53.223858,24 53,23.776142 53,23.5 53,23.223858 53.223858,23 53.5,23 c 0.276142,0 0.5,0.223858 0.5,0.5 z"
sodipodi:ry="0.5"
sodipodi:rx="0.5"
sodipodi:cy="23.5"
@@ -374,7 +374,7 @@
sodipodi:type="arc" />
<path
transform="matrix(1.5,0,0,1.5,-27.5,1010.3622)"
- d="m 57,20.5 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+ d="M 57,20.5 C 57,20.776142 56.776142,21 56.5,21 56.223858,21 56,20.776142 56,20.5 56,20.223858 56.223858,20 56.5,20 c 0.276142,0 0.5,0.223858 0.5,0.5 z"
sodipodi:ry="0.5"
sodipodi:rx="0.5"
sodipodi:cy="20.5"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 03:41:16 +0000