X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos.py;h=05ecf7af3c927fab08717f255d356d0681fda27c;hb=393f95e5ad4729311c47d3f708faa76357e6fead;hp=54f2885b59ec544666b7891fbdd8d54809909750;hpb=680617324b88f51858e9de9652679d268cf90be4;p=bertos.git

diff --git a/wizard/bertos.py b/wizard/bertos.py
index 54f2885b..05ecf7af 100755
--- a/wizard/bertos.py
+++ b/wizard/bertos.py
@@ -47,6 +47,7 @@ import BProject
 import BStartPage
 import BWizard
 
+from BIntroPage import BIntroPage
 from BFolderPage import BFolderPage
 from BOpenPage import BOpenPage
 from BVersionPage import BVersionPage
@@ -57,12 +58,14 @@ from BOutputPage import BOutputPage
 from BCreationPage import BCreationPage
 from BFinalPage import BFinalPage
 
-from BEditingDialog import BEditingDialog
+from BEditingDialog import BEditingDialog, BVersionDialog, BToolchainDialog
 
 import bertos_utils
 
+from LoadException import VersionException, ToolchainException
+
 def newProject():
-    page_list = [BFolderPage, BVersionPage, BCpuPage, BToolchainPage, BModulePage, BOutputPage, BCreationPage, BFinalPage]
+    page_list = [BIntroPage, BFolderPage, BVersionPage, BCpuPage, BToolchainPage, BModulePage, BOutputPage, BCreationPage, BFinalPage]
     wizard = BWizard.BWizard(page_list)
     wizard.show()
     wizard.exec_()
@@ -78,7 +81,34 @@ def newProject():
     sys.exit()
     
 def editProject(project_file):
-    QApplication.instance().project = bertos_utils.loadBertosProject(project_file)
+    info_dict = {}
+    while(True):
+        try:
+            QApplication.instance().project = bertos_utils.loadBertosProject(project_file, info_dict)
+        except VersionException:
+            QMessageBox.critical(
+                None,
+                QObject().tr("BeRTOS version not found!"),
+                QObject().tr("The selected BeRTOS version is not found, please select an existing one...")
+            )
+            dialog = BVersionDialog()
+            if dialog.exec_():
+                version = dialog.version_page.currentVersion()
+                info_dict["SOURCES_PATH"] = version
+            continue
+        except ToolchainException, exc:
+            QMessageBox.critical(
+                None,
+                QObject().tr("Toolchain not found!"),
+                QObject().tr("The selected toolchain is not found, please select an existing one...")
+            )
+            QApplication.instance().project = exc.partial_project
+            dialog = BToolchainDialog()
+            if dialog.exec_():
+                toolchain = dialog.toolchain_page.currentToolchain()
+                info_dict["TOOLCHAIN"] = toolchain
+            continue
+        break
     dialog = BEditingDialog()
     dialog.exec_()