X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos.py;h=34b59839094c7b10a36d62c2362928fdd046ee4a;hb=5945a0313c8774a741a8bf77b82b96467ad8da3c;hp=7097ebce2a777d1039bfbe8968acc27224457f68;hpb=f33f24e5577871635c7298ecfba0e5b543549102;p=bertos.git diff --git a/wizard/bertos.py b/wizard/bertos.py index 7097ebce..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, BBoardPage, BVersionPage, 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(