X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos.py;h=f178a0a04174db2adf2ee7515afdcc55dd212952;hb=74787ad8b91866fea9188acfc63b4aa47140ac32;hp=78c34946b3ad093a1954764093b79c5c485ef703;hpb=081a88733d3d278a1001ddb718121bbefe577c37;p=bertos.git

diff --git a/wizard/bertos.py b/wizard/bertos.py
index 78c34946..f178a0a0 100755
--- a/wizard/bertos.py
+++ b/wizard/bertos.py
@@ -4,7 +4,7 @@
 # Copyright 2008 Develer S.r.l. (http://www.develer.com/)
 # All rights reserved.
 #
-# $Id:$
+# $Id$
 #
 # Author: Lorenzo Berni <duplo@develer.com>
 #
@@ -21,20 +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()
-    if wizard.exec_():
-        prj = wizard.project()
-        output = prj.info("OUTPUT")
-        if output == "makefile":
-            ## Now only supports the BeRTOS build system
-            bertos_utils.createBertosProject(prj)
+    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()
@@ -43,14 +52,26 @@ 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()
-    if newer("bertos.qrc", "bertos.rcc"):
-        os.system("rcc -binary bertos.qrc > bertos.rcc")
+    # Development utility lines, to be removed for production
+    if not (hasattr(sys, "frozen") and sys.frozen) and newer("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__':
     main()