X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos.py;h=594587be23dd923643246398c14199c15843f805;hb=ddfbc9df15a5a68f18913995533b9ca9153caaae;hp=387da00c2550342a6294e9c0bd47e24200099350;hpb=1dc20d252c2bf85262d1f4ac4c63982d337849f7;p=bertos.git

diff --git a/wizard/bertos.py b/wizard/bertos.py
old mode 100644
new mode 100755
index 387da00c..594587be
--- a/wizard/bertos.py
+++ b/wizard/bertos.py
@@ -9,7 +9,9 @@
 # Author: Lorenzo Berni <duplo@develer.com>
 #
 
+import os
 import sys
+from distutils.dep_util import newer
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
@@ -17,22 +19,31 @@ from PyQt4.QtGui import *
 import BProject
 
 import BStartPage
+import BWizard
 
-import BFolderPage
-import BVersionPage
-import BCpuPage
+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 = QWizard()
-    wizard.setWindowTitle("Create a BeRTOS project")
-    wizard.addPage(BFolderPage.BFolderPage())
-    wizard.addPage(BVersionPage.BVersionPage())
-    wizard.addPage(BCpuPage.BCpuPage())
+    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()
@@ -44,6 +55,8 @@ 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_())