From ee3f4de6a58fef625cf82cb7989c062ce941afcf Mon Sep 17 00:00:00 2001 From: Jeena Date: Tue, 8 Oct 2013 05:54:24 +0200 Subject: [PATCH] fixed problems with images on os x --- .gitignore | 1 + Mac/deploy.sh | 5 +++-- Mac/setup.py | 2 -- Qt/Bungloo.py | 2 ++ Qt/SingleApplication.py | 1 + 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f6c2133..7c99f0a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +Mac/Bungloo.app Mac/bungloo dsa_priv.pem *.pyc diff --git a/Mac/deploy.sh b/Mac/deploy.sh index d438210..7fd3563 100755 --- a/Mac/deploy.sh +++ b/Mac/deploy.sh @@ -1,5 +1,6 @@ #!/bin/bash +rm -rf Bungloo.app rm -rf bungloo mkdir bungloo cp -r ../Qt/* bungloo @@ -10,6 +11,6 @@ cp setup.py bungloo cp Info.plist bungloo cd bungloo python setup.py py2app -#mv dist/Bungloo.app .. +mv dist/Bungloo.app .. cd .. -#rm -rf bungloo \ No newline at end of file +rm -rf bungloo \ No newline at end of file diff --git a/Mac/setup.py b/Mac/setup.py index 0c4ee4c..f684a7c 100644 --- a/Mac/setup.py +++ b/Mac/setup.py @@ -47,5 +47,3 @@ setup( options={'py2app': OPTIONS}, setup_requires=['py2app'], ) - -print os.path.dirname(PyQt4.__file__) \ No newline at end of file diff --git a/Qt/Bungloo.py b/Qt/Bungloo.py index 5fa8c58..8f599c8 100755 --- a/Qt/Bungloo.py +++ b/Qt/Bungloo.py @@ -8,6 +8,8 @@ RUNNING_LOCAL = os.path.basename(sys.argv[0]) == "Bungloo.py" RUNNING_ON_WINDOWS = os.name == "nt" RUNNING_ON_OSX = _platform == "darwin" +print sys.argv[0] + if RUNNING_LOCAL or RUNNING_ON_WINDOWS: import Windows, Helper, SingleApplication else: diff --git a/Qt/SingleApplication.py b/Qt/SingleApplication.py index 3de572c..91c8e97 100755 --- a/Qt/SingleApplication.py +++ b/Qt/SingleApplication.py @@ -8,6 +8,7 @@ import json class SingleApplication(QtGui.QApplication): def __init__(self, argv, key): self.bungloo = None + QtGui.QApplication.setGraphicsSystem("raster") QtGui.QApplication.__init__(self, argv) self._memory = QtCore.QSharedMemory(self) self._memory.setKey(key)