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

.gitignore

@@ -19,3 +19,6 @@ cura.bat
 object-mirror.png
 object.png
 *darwin.dmg
+scripts/darwin/dist/*
+scripts/darwin/build/*
+scripts/darwin/Cura.dmg.sparseimage

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "Cura/util/Power"]
-	path = Cura/util/Power
-	url = git://github.com/GreatFruitOmsk/Power.git

Cura/gui/printWindow.py

@@ -7,6 +7,7 @@ import subprocess
 import sys
 import time
 import platform
+import power
 
 import wx
 from wx.lib import buttons
@@ -15,7 +16,6 @@ from Cura.gui.util import webcam
 from Cura.gui.util import taskbar
 from Cura.util import machineCom
 from Cura.util import gcodeInterpreter
-from Cura.util import power
 from Cura.util.resources import getPathForImage
 
 printWindowMonitorHandle = None

Cura/gui/util/__init__.py

@@ -0,0 +1 @@
+# coding=utf-8

Cura/util/Power

@@ -1 +0,0 @@
-Subproject commit 9630adf08ee2de90cb3a49af53d85693060ccbff

Cura/util/__init__.py

@@ -1,7 +1 @@
-import sys
-import os
-
-
-sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'Power'))
-
-import power
+# coding=utf-8

README.md

@@ -32,7 +32,7 @@ You'll need non-system, framework-based, universal with min deployment target se
 
 **deployment target set to 10.6**: Output of ``otool -l `which python` `` should contain *"cmd LC_VERSION_MIN_MACOSX ... version 10.6"*
 
-The easiest way to install it is via [Homebrew](http://mxcl.github.com/homebrew/): `brew install --fresh osx_python_cura.rb --universal` (TODO: upload the formula). Note you'll need to uninstall Python if you already have it installed via Homebrew.
+The easiest way to install it is via [Homebrew](http://mxcl.github.com/homebrew/): `brew install --fresh https://github.com/downloads/GreatFruitOmsk/Cura/python.rb --universal`. Note you'll need to uninstall Python if you already have it installed via Homebrew.
 
 ###Virtualenv
 You may skip this step if you don't bother to use [virtualenv](http://pypi.python.org/pypi/virtualenv). It's not a requirement.
@@ -72,7 +72,7 @@ Following packages are required for packaging Cura into app:
 
     py2app>=0.7.2
 
-The easiest way to install all this packages is to use virtualenv's pip: `pip install requirements_darwin.txt`
+The easiest way to install all this packages is to use virtualenv's pip: `pip install -r requirements_darwin.txt`
 
 ####PyObjC
 At time of writing, pyobjc 2.5 is not available at pypi. You have to clone repo and install it manually:

package.sh

@@ -85,7 +85,7 @@ if [ "$BUILD_TARGET" = "darwin" ]; then
 
 	# Install QuickLook plugin
 	mkdir -p dist/Cura.app/Contents/Library/QuickLook
-	cp STLQuickLook.qlgenerator dist/Cura.app/Contents/Library/QuickLook/
+	cp -a STLQuickLook.qlgenerator dist/Cura.app/Contents/Library/QuickLook/
 
 	# Archive app
 	$TAR cfp - dist/Cura.app | gzip --best -c > ../../${TARGET_DIR}.tar.gz

requirements.txt

@@ -0,0 +1,4 @@
+PyOpenGL>=3.0.2
+numpy>=1.6.2
+pyserial>=2.6
+-e git+git://github.com/GreatFruitOmsk/Power.git#egg=Power

requirements_darwin.txt

@@ -1,4 +1,2 @@
-PyOpenGL>=3.0.2
-numpy>=1.6.2
-pyserial>=2.6
+-r requirements.txt
 py2app>=0.7.2

setup.py

@@ -6,7 +6,7 @@ if sys.platform.startswith('darwin'):
     from setuptools import setup
 
     APP = ['Cura/cura.py']
-    DATA_FILES = ['Cura/images', 'Cura/LICENSE', 'Cura/stl.ico']
+    DATA_FILES = ['Cura/LICENSE', 'Cura/resources/images', 'Cura/resources/meshes', 'Cura/resources/example/', 'Cura/resources/firmware/']
     PLIST = {
         u'CFBundleName': u'Cura',
         u'CFBundleShortVersionString': u'12.11',
@@ -51,7 +51,7 @@ if sys.platform.startswith('darwin'):
     }
     OPTIONS = {
         'argv_emulation': True,
-        'iconfile': 'Cura/Cura.icns',
+        'iconfile': 'Cura/resources/Cura.icns',
         'includes': ['objc', 'Foundation'],
         'resources': DATA_FILES,
         'optimize': '2',