summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-05-18 22:50:00 +0200
committerPetr Mrázek <peterix@gmail.com>2014-05-25 03:38:45 +0200
commiteb9661370b3697993efd180b9959b2aa448ecc6e (patch)
treef77221057609b10c3b319a7539038a219f7c37bc
parent911ac19a56fa1a5f8dd4798385022813cd0b9d07 (diff)
downloadMultiMC-eb9661370b3697993efd180b9959b2aa448ecc6e.tar
MultiMC-eb9661370b3697993efd180b9959b2aa448ecc6e.tar.gz
MultiMC-eb9661370b3697993efd180b9959b2aa448ecc6e.tar.lz
MultiMC-eb9661370b3697993efd180b9959b2aa448ecc6e.tar.xz
MultiMC-eb9661370b3697993efd180b9959b2aa448ecc6e.zip
Enable SVG icons
-rw-r--r--CMakeLists.txt4
-rw-r--r--gui/MainWindow.ui4
-rw-r--r--resources/multimc/index.theme10
3 files changed, 12 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 17589f9a..ad3a32c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -667,7 +667,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInf
DIRECTORY "${QT_PLUGINS_DIR}/imageformats"
DESTINATION ${PLUGIN_DEST_DIR}
COMPONENT Runtime
- REGEX "tga|svg|tiff|mng" EXCLUDE
+ REGEX "tga|tiff|mng" EXCLUDE
)
# Platform plugins
@@ -683,7 +683,7 @@ else()
DIRECTORY "${QT_PLUGINS_DIR}/imageformats"
DESTINATION ${PLUGIN_DEST_DIR}
COMPONENT Runtime
- REGEX "tga|svg|tiff|mng" EXCLUDE
+ REGEX "tga|tiff|mng" EXCLUDE
REGEX "d\\." EXCLUDE
REGEX "_debug\\." EXCLUDE
)
diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui
index 1d7fbec9..b4ae3441 100644
--- a/gui/MainWindow.ui
+++ b/gui/MainWindow.ui
@@ -74,7 +74,7 @@
<addaction name="actionReportBug"/>
<addaction name="actionAbout"/>
<addaction name="separator"/>
- <addaction name="actionPatreon"/>
+ <addaction name="actionPatreon"/>
<addaction name="actionCAT"/>
</widget>
<widget class="QStatusBar" name="statusBar"/>
@@ -284,7 +284,7 @@
<property name="statusTip">
<string>Open the MultiMC Patreon page.</string>
</property>
- </action>
+ </action>
<action name="actionMoreNews">
<property name="icon">
<iconset theme="news">
diff --git a/resources/multimc/index.theme b/resources/multimc/index.theme
index 776792b7..8e1241e9 100644
--- a/resources/multimc/index.theme
+++ b/resources/multimc/index.theme
@@ -2,7 +2,7 @@
Name=multimc
Comment=MultiMC Default Icons
Inherits=default
-Directories=scalable/apps,8x8,16x16,22x22,24x24,32x32,48x48
+Directories=scalable/apps,8x8,16x16,22x22,24x24,32x32,48x48,scalable
[scalable/apps]
Size=48
@@ -30,4 +30,10 @@ Size=32
Size=48
[64x64]
-Size=64 \ No newline at end of file
+Size=64
+
+[scalable]
+Size=48
+Type=Scalable
+MinSize=16
+MaxSize=256