Merge branch 'master' of github.com:daid/Cura

diff --git a/Cura/gui/app.py b/Cura/gui/app.py
index 50a7d1f4173a4a01106ecd301e6928e1637687ec..598d8c959162c62e83c54d52a45b5ecbd9d596b1 100644 (file)
--- a/Cura/gui/app.py
+++ b/Cura/gui/app.py
@@ -10,7 +10,6 @@ import warnings
 #Only import the _core to save import time
 import wx._core
 
-from Cura.gui import splashScreen
 from Cura.util import profile
 
 class CuraApp(wx.App):
@@ -27,6 +26,7 @@ class CuraApp(wx.App):
                        #Do not show a splashscreen on OSX, as by Apple guidelines
                        self.afterSplashCallback()
                else:
+                       from Cura.gui import splashScreen
                        self.splash = splashScreen.splashScreen(self.afterSplashCallback)
 
        def MacOpenFile(self, path):

diff --git a/package.sh b/package.sh
index 57726525be4bf287d8b40d4fafa33746ddc46c06..89745cc1e801d85aef63001ee593ee4a532d9610 100755 (executable)
--- a/package.sh
+++ b/package.sh
@@ -66,6 +66,25 @@ if [ "$BUILD_TARGET" = "all" ]; then
        exit
 fi
 
+# Change working directory to the directory the script is in
+# http://stackoverflow.com/a/246128
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $SCRIPT_DIR
+
+checkTool git "git: http://git-scm.com/"
+checkTool curl "curl: http://curl.haxx.se/"
+if [ $BUILD_TARGET = "win32" ]; then
+       #Check if we have 7zip, needed to extract and packup a bunch of packages for windows.
+       checkTool 7z "7zip: http://www.7-zip.org/"
+fi
+#For building under MacOS we need gnutar instead of tar
+if [ -z `which gnutar` ]; then
+       TAR=tar
+else
+       TAR=gnutar
+fi
+
+
 #############################
 # Darwin
 #############################
@@ -88,7 +107,9 @@ if [ "$BUILD_TARGET" = "darwin" ]; then
        cp -a STLQuickLook.qlgenerator dist/Cura.app/Contents/Library/QuickLook/
 
        # Archive app
-       $TAR cfp - dist/Cura.app | gzip --best -c > ../../${TARGET_DIR}.tar.gz
+       cd dist
+       $TAR cfp - Cura.app | gzip --best -c > ../../../${TARGET_DIR}.tar.gz
+       cd ..
 
        # Create sparse image for distribution
        hdiutil detach /Volumes/Cura\ -\ Ultimaker/
@@ -102,28 +123,11 @@ if [ "$BUILD_TARGET" = "darwin" ]; then
        exit
 fi
 
+
 #############################
 # Rest
 #############################
 
-# Change working directory to the directory the script is in
-# http://stackoverflow.com/a/246128
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd $SCRIPT_DIR
-
-checkTool git "git: http://git-scm.com/"
-checkTool curl "curl: http://curl.haxx.se/"
-if [ $BUILD_TARGET = "win32" ]; then
-       #Check if we have 7zip, needed to extract and packup a bunch of packages for windows.
-       checkTool 7z "7zip: http://www.7-zip.org/"
-fi
-#For building under MacOS we need gnutar instead of tar
-if [ -z `which gnutar` ]; then
-       TAR=tar
-else
-       TAR=gnutar
-fi
-
 #############################
 # Download all needed files.
 #############################

diff --git a/setup.py b/setup.py
index bde74778299443c20e5a3dd77778fe821e2d3609..1cf22659e9c5946d9ae60887a6a1441bbb53d94e 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -18,19 +18,19 @@ if sys.platform.startswith('darwin'):
             {
                 u'CFBundleTypeRole': u'Viewer',
                 u'LSItemContentTypes': [u'com.pleasantsoftware.uti.stl'],
-                u'LSHandlerRank': u'Alternate',
+                u'LSHandlerRank': u'Owner',
                 },
             {
                 u'CFBundleTypeRole': u'Viewer',
                 u'LSItemContentTypes': [u'org.khronos.collada.digital-asset-exchange'],
-                u'LSHandlerRank': u'Alternate'
+                u'LSHandlerRank': u'Owner'
             },
             {
                 u'CFBundleTypeName': u'Wavefront 3D Object',
                 u'CFBundleTypeExtensions': [u'obj'],
                 u'CFBundleTypeMIMETypes': [u'application/obj-3d'],
                 u'CFBundleTypeRole': u'Viewer',
-                u'LSHandlerRank': u'Alternate'
+                u'LSHandlerRank': u'Owner'
             }
         ],
         u'UTImportedTypeDeclarations': [