X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos.py;h=df1d8c5dfd9db567dbb2858832b7c2b18f933f87;hb=160b7485c7930b724f8c724107cb4058ce985222;hp=96730e59d6ca65ea99abda65bab43a990a00dc1e;hpb=bc272fbd8f39f150b671bfb25725d4c8d9873e2e;p=bertos.git

diff --git a/wizard/bertos.py b/wizard/bertos.py
index 96730e59..df1d8c5d 100755
--- a/wizard/bertos.py
+++ b/wizard/bertos.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python
 # encoding: utf-8
 #
 # Copyright 2008 Develer S.r.l. (http://www.develer.com/)
@@ -21,15 +21,29 @@ import BProject
 import BStartPage
 import BWizard
 
+from BFolderPage import BFolderPage
+from BOpenPage import BOpenPage
+from BVersionPage import BVersionPage
+from BCpuPage import BCpuPage
+from BToolchainPage import BToolchainPage
+from BModulePage import BModulePage
+from BOutputPage import BOutputPage
+from BCreationPage import BCreationPage
+from BFinalPage import BFinalPage
+
 import bertos_utils
 
 def newProject():
-    wizard = BWizard.BWizard()
+    page_list = [BFolderPage, BVersionPage, BCpuPage, BToolchainPage, BModulePage, BOutputPage, BCreationPage, BFinalPage]
+    wizard = BWizard.BWizard(page_list)
     wizard.show()
     wizard.exec_()
     
 def editProject():
-    print "editProject"
+    page_list = [BOpenPage, BVersionPage, BCpuPage, BToolchainPage, BModulePage, BOutputPage, BCreationPage, BFinalPage]
+    wizard = BWizard.BWizard(page_list)
+    wizard.show()
+    wizard.exec_()
 
 def showStartPage():
     QApplication.instance().dialog = BStartPage.BStartPage()
@@ -38,15 +52,27 @@ def showStartPage():
     QApplication.instance().dialog.show()
 
 def main():
+    os.chdir(os.path.dirname(os.path.abspath(sys.argv[0])))
     app = QApplication(sys.argv)
     app.settings = QSettings("Develer", "Bertos Configurator")
     app.project = BProject.BProject()
+    # Development utility lines, to be removed for production
     if newer("bertos.qrc", "bertos.rcc"):
-        os.system("rcc -binary bertos.qrc > bertos.rcc")
+        os.system("rcc -binary bertos.qrc -o bertos.rcc")
     QResource.registerResource("bertos.rcc")
-    showStartPage()
-    sys.exit(app.exec_())
+    if "--create" in sys.argv and "--edit" not in sys.argv:
+        newProject()
+    elif "--edit" in sys.argv and "--create" not in sys.argv:
+        editProject()
+    elif "--create" in sys.argv and "--edit" in sys.argv:
+        # TODO need an explaining message
+        print " ".join(sys.argv)
+        print "Invalid usage!"
+        pass
+    else:
+        showStartPage()
+        sys.exit(app.exec_())
 
-if __name__ == '__main__':
+if __name__ == '__main__' or (hasattr(sys, 'frozen') and sys.frozen):
     main()