Mac OS X 0.9.0 ready to public

Allexin · Jan 18, 2016 · fa79161 · fa79161
1 parent 0234dc6
commit fa79161
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 2 deletions.
diff --git a/BUILD_README.txt b/BUILD_README.txt
@@ -3,9 +3,11 @@ Place TrackYourTime.exe in build folder, copy data folder, copy platforms plugin
 Pack int TrackYourTime_Windows.zip
 
 #Mac OS X
-copy data into TrackYourTime.app/Contents/
+copy data into TrackYourTime.app/Contents/MacOS
+copy platforms/libqcocoa.dylib into TrackYourTime.app/Contents/PlugIns/platforms
 add key LSUIElement with value 1 into TrackYourTime.app/Contents/Info.plist
 process macdeployqt with -dmg flag
+Rename package to TrackYourTime_MacOSX.dmg
 
 
 #Linux

diff --git a/TrackYourTime/ctrayicon.cpp b/TrackYourTime/ctrayicon.cpp
@@ -66,12 +66,20 @@ cTrayIcon::cTrayIcon(cDataManager *DataManager):QSystemTrayIcon()
 
 void cTrayIcon::setActive()
 {    
-     setIcon(QIcon("data/icons/main.ico"));
+#ifdef Q_OS_MAC
+    setIcon(QIcon("data/icons/main.png"));
+#else
+    setIcon(QIcon("data/icons/main.ico"));
+#endif
 }
 
 void cTrayIcon::setInactive()
 {
+#ifdef Q_OS_MAC
+    setIcon(QIcon("data/icons/main_gray.png"));
+#else
     setIcon(QIcon("data/icons/main_gray.ico"));
+#endif
 }
 
 void cTrayIcon::showHint(QString text)

diff --git a/TrackYourTime/main.cpp b/TrackYourTime/main.cpp
@@ -38,9 +38,24 @@ int main(int argc, char *argv[])
     QCoreApplication::setOrganizationDomain("sol-online.org"),
     QCoreApplication::setApplicationName("TrackYourTime");
 
+#ifdef Q_OS_MAC
+    QDir dir(argv[0]);
+    dir.cdUp();
+    QString currentDir = dir.absolutePath();
+    dir.cdUp();
+    dir.cd("PlugIns");
+    QCoreApplication::setLibraryPaths(QStringList(dir.absolutePath()));
+#endif
+
     QApplication a(argc, argv);
     QApplication::setQuitOnLastWindowClosed(false);
 
+#ifdef Q_OS_MAC
+    QDir::setCurrent(currentDir);
+#endif
+
+
+
     QSettings settings;
     QString Language = QLocale::system().name();
     Language.truncate(Language.lastIndexOf('_'));

diff --git a/data/icons/main.png b/data/icons/main.png
diff --git a/data/icons/main_gray.png b/data/icons/main_gray.png