X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=wizard%2Fbertos.py;h=594587be23dd923643246398c14199c15843f805;hb=7db7c78dbf87d4b165374b4cae71eb17316576e9;hp=80001466c8bd9548c0a80e3e5966caa9967ff4f5;hpb=f2e6ff05112a4f58fbc6d7a9acf7c414a7e8488d;p=bertos.git

diff --git a/wizard/bertos.py b/wizard/bertos.py
old mode 100644
new mode 100755
index 80001466..594587be
--- a/wizard/bertos.py
+++ b/wizard/bertos.py
@@ -9,26 +9,41 @@
 # Author: Lorenzo Berni <duplo@develer.com>
 #
 
+import os
 import sys
+from distutils.dep_util import newer
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
+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 BFolderPage
-import BVersionPage
+import bertos_utils
 
 def newProject():
-    wizard = QWizard()
-    wizard.setWindowTitle("Create a BeRTOS project")
-    wizard.addPage(BFolderPage.BFolderPage())
-    wizard.addPage(BVersionPage.BVersionPage())
+    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()
@@ -39,6 +54,9 @@ def showStartPage():
 def main():
     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")
     QResource.registerResource("bertos.rcc")
     showStartPage()
     sys.exit(app.exec_())