X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos.py;h=34b59839094c7b10a36d62c2362928fdd046ee4a;hb=264df59535958b2180719f01ef29cf655839b5c6;hp=0e3206c2144c6a2a603b35168e9dd60d4410d577;hpb=ec8c7a72981bd819fba072cf53404bae3d9cee46;p=bertos.git diff --git a/wizard/bertos.py b/wizard/bertos.py index 0e3206c2..34b59839 100755 --- a/wizard/bertos.py +++ b/wizard/bertos.py @@ -49,6 +49,7 @@ from BWizard import BWizard from BIntroPage import BIntroPage from BFolderPage import BFolderPage from BBoardPage import BBoardPage +from BRoutePage import BRoutePage from BOpenPage import BOpenPage from BVersionPage import BVersionPage from BCpuPage import BCpuPage @@ -66,7 +67,7 @@ from LoadException import VersionException, ToolchainException def newProject(): QApplication.instance().project = BProject() - page_list = [BIntroPage, BFolderPage, BVersionPage, BBoardPage, BCpuPage, BToolchainPage, BModulePage, BOutputPage, BCreationPage, BFinalPage] + page_list = [BIntroPage, BFolderPage, BVersionPage, BBoardPage, BRoutePage, BCpuPage, BToolchainPage, BModulePage, BOutputPage, BCreationPage, BFinalPage] wizard = BWizard(page_list) wizard.show() wizard.exec_() @@ -84,6 +85,8 @@ def newProject(): def editProject(project_file): info_dict = {} while(True): + # Empty project is the default fallback. + QApplication.instance().project = BProject() try: QApplication.instance().project = BProject(project_file, info_dict) except VersionException: @@ -95,7 +98,7 @@ def editProject(project_file): dialog = BVersionDialog() if dialog.exec_(): version = dialog.version_page.currentVersion() - info_dict["SOURCES_PATH"] = version + info_dict["BERTOS_PATH"] = version continue except ToolchainException, exc: QMessageBox.critical(