X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos.py;h=edb131d67663c3f27282f592222dbefe158febf5;hb=b284d6d7f4a218edab54dc0f8eb4f734a3f22b8a;hp=a5610a75b6e74f919ea9618a89780bf5e2a52112;hpb=4dacc56bc3ec46d0517a67fe6c6608efc5b77962;p=bertos.git

diff --git a/wizard/bertos.py b/wizard/bertos.py
index a5610a75..edb131d6 100755
--- a/wizard/bertos.py
+++ b/wizard/bertos.py
@@ -40,6 +40,8 @@ from distutils.dep_util import newer
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
+import exception_handler
+
 import BProject
 
 import BStartPage
@@ -55,10 +57,12 @@ 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]
     wizard = BWizard.BWizard(page_list)
@@ -72,12 +76,38 @@ def newProject():
         for ide in to_be_opened:
             command_line = command_lines[ide]
             relevant_file = relevant_files[ide]
-            import subprocess
-            subprocess.call(command_line + " \"" + relevant_file + "\"")
+            QProcess.startDetached(command_line, [relevant_file,])
     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_()