X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBEditingDialog.py;h=46c184d25e10c345abb7194c6d0e1c4d42e475e1;hb=68089deab4cdbd7e359f23c95ac9fbab3dd08297;hp=d9b4d1bd33c86413e0a64638168b86dfc5d96f85;hpb=a861d8e4e8a484679865bf5cd4e26954f76452da;p=bertos.git

diff --git a/wizard/BEditingDialog.py b/wizard/BEditingDialog.py
index d9b4d1bd..46c184d2 100644
--- a/wizard/BEditingDialog.py
+++ b/wizard/BEditingDialog.py
@@ -44,6 +44,7 @@ from BToolchainPage import BToolchainPage
 from BVersionPage import BVersionPage
 import qvariant_converter
 import BModulePage
+import bertos_utils
 
 class BEditingDialog(QDialog):
 
@@ -133,6 +134,21 @@ class BEditingDialog(QDialog):
                 ) == QMessageBox.Ok:
                     version_page.setProjectInfo("SOURCES_PATH", version)
                     version_page.setProjectInfo("OLD_SOURCES_PATH", current_version)
+                    enabled_modules = bertos_utils.enabledModules(version_page.project())
+                    old_configuration = version_page.projectInfo("CONFIGURATIONS")
+                    bertos_utils.loadSourceTree(version_page.project())
+                    bertos_utils.loadModuleData(version_page.project())
+                    new_configuration = version_page.projectInfo("CONFIGURATIONS")
+                    merged_configuration = {}
+                    for conf in new_configuration:
+                        if conf in old_configuration:
+                            configuration = bertos_utils.updateConfigurationValues(new_configuration[conf], old_configuration[conf])
+                        else:
+                            configuration = new_configuration[conf]
+                        merged_configuration[conf] = configuration
+                    version_page.setProjectInfo("CONFIGURATIONS", merged_configuration)
+                    bertos_utils.setEnabledModules(version_page.project(), enabled_modules)
+                    self.module_page.fillModuleTree()
 
     def apply(self):
         createBertosProject(self.module_page.project(), edit=True)