summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-01-19 05:21:09 +0100
committerPetr Mrázek <peterix@gmail.com>2014-01-19 05:21:09 +0100
commit2fe033c4a0bcdb0972046e1b55b0cf463075dc24 (patch)
tree453a480f0669b393f906def63d6325ce36e3319e
parentd8413fa5ec594455b3cdec86899b61adba39eb33 (diff)
downloadMultiMC-2fe033c4a0bcdb0972046e1b55b0cf463075dc24.tar
MultiMC-2fe033c4a0bcdb0972046e1b55b0cf463075dc24.tar.gz
MultiMC-2fe033c4a0bcdb0972046e1b55b0cf463075dc24.tar.lz
MultiMC-2fe033c4a0bcdb0972046e1b55b0cf463075dc24.tar.xz
MultiMC-2fe033c4a0bcdb0972046e1b55b0cf463075dc24.zip
Move a bunch of resources into the resources folder.
Also, cat is no longer mysterious. It's just FLUFFY!
-rw-r--r--CMakeLists.txt4
-rw-r--r--gui/MainWindow.ui2
-rw-r--r--resources/MultiMC.icns (renamed from MultiMC.icns)bin177400 -> 177400 bytes
-rw-r--r--resources/MultiMC.manifest (renamed from MultiMC.manifest)0
-rw-r--r--resources/multimc.rc (renamed from multimc.rc)2
5 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2ccdab0..9efb4cd2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -528,7 +528,7 @@ resources/instances/instances.qrc
######## Windows resource files ########
IF(WIN32)
-SET(MULTIMC_RCS multimc.rc)
+SET(MULTIMC_RCS resources/multimc.rc)
ENDIF()
####### X11 Stuff #######
@@ -670,7 +670,7 @@ FILE(WRITE \"\${CMAKE_INSTALL_PREFIX}/${QTCONF_DEST_DIR}/qt.conf\" \"\")
# ICNS file for OS X
IF(APPLE)
- INSTALL(FILES MultiMC.icns DESTINATION MultiMC.app/Contents/Resources)
+ INSTALL(FILES resources/MultiMC.icns DESTINATION MultiMC.app/Contents/Resources)
ENDIF()
CONFIGURE_FILE(
diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui
index 5653907e..25af6f60 100644
--- a/gui/MainWindow.ui
+++ b/gui/MainWindow.ui
@@ -469,7 +469,7 @@
<string>Meow</string>
</property>
<property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600; color:#ff0004;&quot;&gt;Catnarok!&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;Or just a cat with a ball of yarn?&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;WHO KNOWS?!&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;img src=&quot;:/icons/instances/tnt&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;It's a fluffy kitty :3&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</action>
<action name="actionCopyInstance">
diff --git a/MultiMC.icns b/resources/MultiMC.icns
index f96fd5a4..f96fd5a4 100644
--- a/MultiMC.icns
+++ b/resources/MultiMC.icns
Binary files differ
diff --git a/MultiMC.manifest b/resources/MultiMC.manifest
index 3acf8f7f..3acf8f7f 100644
--- a/MultiMC.manifest
+++ b/resources/MultiMC.manifest
diff --git a/multimc.rc b/resources/multimc.rc
index 2140e3f4..ca92e2c3 100644
--- a/multimc.rc
+++ b/resources/multimc.rc
@@ -3,7 +3,7 @@
#endif
#include <windows.h>
-IDI_ICON1 ICON DISCARDABLE "resources/icons/MultiMC.ico"
+IDI_ICON1 ICON DISCARDABLE "MultiMC.ico"
1 RT_MANIFEST "MultiMC.manifest"
VS_VERSION_INFO VERSIONINFO