Merge commit '870c4952fdb3268f5d4b6359d2e8046a6bb8df4f'

.gitignore

@@ -3,7 +3,7 @@
 *.pyc
 *.zip
 *.exe
-osx64-SkeinPyPy-NewUI*
+osx64-Cura-NewUI*
-win32-SkeinPyPy-NewUI*
+win32-Cura-NewUI*
-linux-SkeinPyPy-NewUI*
+linux-Cura-NewUI*
 Printrun

Cura/cura.py

@@ -3,7 +3,7 @@
 This page is in the table of contents.
 ==Overview==
 ===Introduction===
-SkeinPyPy is a GPL tool chain to forge a gcode skein for a model. Based on Skeinforge.
+Cura is a GPL tool chain to forge a gcode skein for a model. Based on Skeinforge.
 
 The slicing code is the same as Skeinforge. But the UI has been revamped to be... sane.
 
@@ -14,9 +14,10 @@ import __init__
 
 import sys
 import platform
-
 from optparse import OptionParser
-from newui import sliceRun
+
+from util import profile
+from util import sliceRun
 
 __author__ = 'Daid'
 __credits__ = """
@@ -43,13 +44,15 @@ Art of Illusion <http://www.artofillusion.org/>"""
 __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html'
 
 def main():
-	parser = OptionParser()
+	parser = OptionParser(usage="usage: %prog [options] <filename>.stl")
+	parser.add_option("-p", "--profile", action="store", type="string", dest="profile", help="Use these profile settings instead of loading current_profile.ini")
 	(options, args) = parser.parse_args()
-	sys.argv = [sys.argv[0]] + args
+	if options.profile != None:
+		profile.loadGlobalProfileFromString(options.profile)
 	if len( args ) > 0:
 		sliceRun.runSlice(args)
 	else:
-		from newui import mainWindow
+		from gui import mainWindow
 		mainWindow.main()
 
 if __name__ == '__main__':