From 2fe033c4a0bcdb0972046e1b55b0cf463075dc24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 19 Jan 2014 05:21:09 +0100 Subject: Move a bunch of resources into the resources folder. Also, cat is no longer mysterious. It's just FLUFFY! --- CMakeLists.txt | 4 ++-- MultiMC.icns | Bin 177400 -> 0 bytes MultiMC.manifest | 27 --------------------------- gui/MainWindow.ui | 2 +- multimc.rc | 29 ----------------------------- resources/MultiMC.icns | Bin 0 -> 177400 bytes resources/MultiMC.manifest | 27 +++++++++++++++++++++++++++ resources/multimc.rc | 29 +++++++++++++++++++++++++++++ 8 files changed, 59 insertions(+), 59 deletions(-) delete mode 100644 MultiMC.icns delete mode 100644 MultiMC.manifest delete mode 100644 multimc.rc create mode 100644 resources/MultiMC.icns create mode 100644 resources/MultiMC.manifest create mode 100644 resources/multimc.rc 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/MultiMC.icns b/MultiMC.icns deleted file mode 100644 index f96fd5a4..00000000 Binary files a/MultiMC.icns and /dev/null differ diff --git a/MultiMC.manifest b/MultiMC.manifest deleted file mode 100644 index 3acf8f7f..00000000 --- a/MultiMC.manifest +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - Custom Minecraft launcher for managing multiple installs. - - - - - - - - - - - \ No newline at end of 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 @@ Meow - <html><head/><body><p align="center"><span style=" font-weight:600; color:#ff0004;">Catnarok!</span></p><p align="center">Or just a cat with a ball of yarn?</p><p align="center"><span style=" font-style:italic;">WHO KNOWS?!</span></p><p align="center"><img src=":/icons/instances/tnt"/></p></body></html> + <html><head/><body><p align="center">It's a fluffy kitty :3</p></body></html> diff --git a/multimc.rc b/multimc.rc deleted file mode 100644 index 2140e3f4..00000000 --- a/multimc.rc +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include - -IDI_ICON1 ICON DISCARDABLE "resources/icons/MultiMC.ico" -1 RT_MANIFEST "MultiMC.manifest" - -VS_VERSION_INFO VERSIONINFO -FILEVERSION 1,0,0,0 -FILEOS VOS_NT_WINDOWS32 -FILETYPE VFT_APP -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "000004b0" - BEGIN - VALUE "CompanyName", "MultiMC Contributors" - VALUE "FileDescription", "Minecraft Launcher" - VALUE "FileVersion", "1.0.0.0" - VALUE "ProductName", "MultiMC" - VALUE "ProductVersion", "5" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0000, 0x04b0 // Unicode - END -END diff --git a/resources/MultiMC.icns b/resources/MultiMC.icns new file mode 100644 index 00000000..f96fd5a4 Binary files /dev/null and b/resources/MultiMC.icns differ diff --git a/resources/MultiMC.manifest b/resources/MultiMC.manifest new file mode 100644 index 00000000..3acf8f7f --- /dev/null +++ b/resources/MultiMC.manifest @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + Custom Minecraft launcher for managing multiple installs. + + + + + + + + + + + \ No newline at end of file diff --git a/resources/multimc.rc b/resources/multimc.rc new file mode 100644 index 00000000..ca92e2c3 --- /dev/null +++ b/resources/multimc.rc @@ -0,0 +1,29 @@ +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#endif +#include + +IDI_ICON1 ICON DISCARDABLE "MultiMC.ico" +1 RT_MANIFEST "MultiMC.manifest" + +VS_VERSION_INFO VERSIONINFO +FILEVERSION 1,0,0,0 +FILEOS VOS_NT_WINDOWS32 +FILETYPE VFT_APP +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "CompanyName", "MultiMC Contributors" + VALUE "FileDescription", "Minecraft Launcher" + VALUE "FileVersion", "1.0.0.0" + VALUE "ProductName", "MultiMC" + VALUE "ProductVersion", "5" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0000, 0x04b0 // Unicode + END +END -- cgit v1.2.3