From c40c362302e11c41961d2af6e5545a1618e1f1ca Mon Sep 17 00:00:00 2001 From: duplo Date: Mon, 31 Aug 2009 16:07:49 +0000 Subject: [PATCH] Merge the settings, changing BeRTOS version git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2832 38d2e660-2303-0410-9eaa-f027e97ec537 --- wizard/BEditingDialog.py | 4 ++-- wizard/bertos_utils.py | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/wizard/BEditingDialog.py b/wizard/BEditingDialog.py index 1534146e..eacfbfe2 100644 --- a/wizard/BEditingDialog.py +++ b/wizard/BEditingDialog.py @@ -134,10 +134,10 @@ class BEditingDialog(QDialog): ) == QMessageBox.Ok: version_page.setProjectInfo("SOURCES_PATH", version) version_page.setProjectInfo("OLD_SOURCES_PATH", current_version) - project = version_page.project() - modules, lists, configurations, files = project.info("MODULES"), project.info("LISTS"), project.info("CONFIGURATIONS"), project.info("FILES") + enabled_modules = bertos_utils.enabledModules(version_page.project()) bertos_utils.loadSourceTree(version_page.project()) bertos_utils.loadModuleData(version_page.project(), True) + bertos_utils.setEnabledModules(version_page.project(), enabled_modules) self.module_page.fillModuleTree() def apply(self): diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py index 2b7d6767..2520b109 100644 --- a/wizard/bertos_utils.py +++ b/wizard/bertos_utils.py @@ -82,11 +82,21 @@ def loadBertosProject(project_file): tag_dict[tag] = False project_info.setInfo("ALL_CPU_TAGS", tag_dict) loadModuleData(project_info, True) + setEnabledModules(project_info, project_data["ENABLED_MODULES"]) + return project_info + +def setEnabledModules(project_info, enabled_modules): modules = project_info.info("MODULES") for module, information in modules.items(): - information["enabled"] = module in project_data["ENABLED_MODULES"] + information["enabled"] = module in enabled_modules project_info.setInfo("MODULES", modules) - return project_info + +def enabledModules(project_info): + enabled_modules = [] + for name, module in project_info.info("MODULES").items(): + if module["enabled"]: + enabled_modules.append(name) + return enabled_modules def mergeSources(srcdir, new_sources, old_sources): # The current mergeSources function provide only a raw copy of the sources in the -- 2.25.1