From 875610e1b352beb2a15eed0c67563905eb97108b Mon Sep 17 00:00:00 2001
From: Max-Wilhelm Bruker <brukie@localhost.(none)>
Date: Fri, 27 Apr 2012 00:39:34 +0200
Subject: [PATCH] mac fixes

---
 cockatrice/CMakeLists.txt | 9 ++++++---
 cockatrice/src/main.cpp   | 7 ++++---
 cockatrice/src/main.h     | 2 +-
 prepareMacRelease.sh      | 6 ++++--
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index c32b7359..cc8ae9a9 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -156,6 +156,9 @@ endif (UNIX)
 if (WIN32)
 	set_source_files_properties(src/main.cpp PROPERTIES COMPILE_FLAGS -DTRANSLATION_PATH=\\"translations\\")
 endif (WIN32)
+if (APPLE)
+	set_source_files_properties(src/main.cpp PROPERTIES COMPILE_FLAGS -DTRANSLATION_PATH=\\"../../../translations\\")
+endif (APPLE)
 
 set(cockatrice_RESOURCES cockatrice.qrc)
 set(cockatrice_TS
@@ -179,9 +182,9 @@ if(WIN32)
 endif(WIN32)
 
 if(APPLE)
-  set(OSX_ICON_FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns)
-  set_source_files_properties(${OSX_ICON_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-  set( cockatrice_SOURCES ${cockatrice_SOURCES} ${OSX_ICON_FILES} )
+  set(MACOSX_BUNDLE_ICON_FILE appicon.icns)
+  set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+  set(cockatrice_SOURCES ${cockatrice_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns)
 ENDIF(APPLE)
 SET(QT_USE_QTNETWORK TRUE)
 SET(QT_USE_QTSCRIPT TRUE)
diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp
index 88a37512..69bc521e 100644
--- a/cockatrice/src/main.cpp
+++ b/cockatrice/src/main.cpp
@@ -49,9 +49,9 @@ SoundEngine *soundEngine;
 
 const QString translationPrefix = "cockatrice";
 #ifdef TRANSLATION_PATH
-const QString translationPath = TRANSLATION_PATH;
+QString translationPath = TRANSLATION_PATH;
 #else
-const QString translationPath = QString();
+QString translationPath = QString();
 #endif
 
 void myMessageOutput(QtMsgType /*type*/, const char *msg)
@@ -69,7 +69,8 @@ void installNewTranslator()
 
 	qtTranslator->load("qt_" + lang, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
 	qApp->installTranslator(qtTranslator);
-	
+	if (!translationPath.startsWith("/"))
+		translationPath.prepend(qApp->applicationDirPath() + "/");
 	if (!settingsCache->getCustomTranslationFile().isEmpty())
 		translator->load(settingsCache->getCustomTranslationFile());
 	else
diff --git a/cockatrice/src/main.h b/cockatrice/src/main.h
index a8f8c678..4a1d234f 100644
--- a/cockatrice/src/main.h
+++ b/cockatrice/src/main.h
@@ -9,7 +9,7 @@ extern CardDatabase *db;
 
 extern QTranslator *translator;
 extern const QString translationPrefix;
-extern const QString translationPath;
+extern QString translationPath;
 
 void installNewTranslator();
 
diff --git a/prepareMacRelease.sh b/prepareMacRelease.sh
index c5ff441a..fb05c71b 100644
--- a/prepareMacRelease.sh
+++ b/prepareMacRelease.sh
@@ -3,8 +3,8 @@
 FRAMEWORKS="Core Gui Multimedia Network Svg Xml Script"
 DATE=`date '+%Y%m%d'`
 #QTDIR="/Users/brukie/QtSDK/Desktop/Qt/474/gcc"
-QTLIB="/Users/brukie/qt/lib"
-QTPLUGINS="/Users/brukie/qt/plugins"
+QTLIB="/Users/brukie/qt_leopard/lib"
+QTPLUGINS="/Users/brukie/qt_leopard/plugins"
 PROTOBUF="/Users/brukie/protobuf"
 DIR=cockatrice_mac_$DATE
 if [ -d $DIR ]; then echo "delete old dir first"; exit 1; fi
@@ -15,6 +15,8 @@ cp -R build/cockatrice/cockatrice.app $DIR
 cp -R build/oracle/oracle.app $DIR
 mkdir $DIR/Frameworks
 cp -R sounds zonebg $DIR
+mkdir $DIR/translations
+cp build/cockatrice/*.qm $DIR/translations
 cp -R $QTPLUGINS $DIR/PlugIns
 for f in $FRAMEWORKS; do
 	cp -R $QTLIB/Qt"$f".framework $DIR/Frameworks