From 056aea92013907f6485a499b511cc0ef81c38a4d Mon Sep 17 00:00:00 2001 From: duplo Date: Mon, 29 Mar 2010 10:46:24 +0000 Subject: [PATCH] Use the local BeRTOS version instead of the original one git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3292 38d2e660-2303-0410-9eaa-f027e97ec537 --- wizard/BEditingDialog.py | 2 +- wizard/BVersionPage.py | 5 ++++- wizard/bertos_utils.py | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/wizard/BEditingDialog.py b/wizard/BEditingDialog.py index 4fae3423..1c3ed0d1 100644 --- a/wizard/BEditingDialog.py +++ b/wizard/BEditingDialog.py @@ -206,7 +206,7 @@ class BVersionDialog(QDialog): QDialog.__init__(self) self.setWindowIcon(QIcon(":/images/appicon.png")) layout = QVBoxLayout() - version_page = BVersionPage() + version_page = BVersionPage(edit=True) version_page.reloadData() self.version_page = version_page layout.addWidget(version_page) diff --git a/wizard/BVersionPage.py b/wizard/BVersionPage.py index d11d1ff8..8842289d 100644 --- a/wizard/BVersionPage.py +++ b/wizard/BVersionPage.py @@ -48,7 +48,8 @@ class BVersionPage(BWizardPage): to use. This page show some pieces of information about the version. """ - def __init__(self): + def __init__(self, edit=False): + self._edit = edit BWizardPage.__init__(self, UI_LOCATION + "/bertos_versions.ui") self.setTitle(self.tr("Select the BeRTOS directory")) self.setSubTitle(self.tr("The project created will be based on the BeRTOS version found")) @@ -183,6 +184,8 @@ class BVersionPage(BWizardPage): Fills the version list with all the BeRTOS versions founded in the QSettings. """ versions = set([]) + if self._edit: + versions.add(self.projectInfo("SOURCES_PATH")) if os.name == "nt": import winreg_importer versions |= set([os.path.normpath(dir) for dir in winreg_importer.getBertosDirs()]) diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py index 48cbbbf0..dc2172d7 100644 --- a/wizard/bertos_utils.py +++ b/wizard/bertos_utils.py @@ -135,7 +135,9 @@ def projectFileGenerator(project_info): if information["enabled"]: enabled_modules.append(module) project_data["ENABLED_MODULES"] = enabled_modules - project_data["SOURCES_PATH"] = project_info.info("SOURCES_PATH") + # Use the local BeRTOS version instead of the original one + # project_data["SOURCES_PATH"] = project_info.info("SOURCES_PATH") + project_data["SOURCES_PATH"] = directory project_data["TOOLCHAIN"] = project_info.info("TOOLCHAIN") project_data["CPU_NAME"] = project_info.info("CPU_NAME") project_data["SELECTED_FREQ"] = project_info.info("SELECTED_FREQ") -- 2.25.1