fix error on building the binary resource file of the wizard

[bertos.git] / wizard / bertos.py

diff --git a/wizard/bertos.py b/wizard/bertos.py
index 7017e0d2073fbef8720a242a29c0a8c3a93c51f9..a92a054bc289a42b7653f66a2a453c1f0d844585 100755 (executable)
--- 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,13 +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()
@@ -40,7 +56,7 @@ def main():
     app.settings = QSettings("Develer", "Bertos Configurator")
     app.project = BProject.BProject()
     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_())