X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBEditingDialog.py;h=4fae34231e1bc1557158bcde35dcb875a91a86a9;hb=b284d6d7f4a218edab54dc0f8eb4f734a3f22b8a;hp=2f07643085a855fd30dfc42f2da1d85a14e087e5;hpb=0d655b5d706dd22c401628c386369477883ce743;p=bertos.git

diff --git a/wizard/BEditingDialog.py b/wizard/BEditingDialog.py
index 2f076430..4fae3423 100644
--- a/wizard/BEditingDialog.py
+++ b/wizard/BEditingDialog.py
@@ -112,41 +112,41 @@ class BEditingDialog(QDialog):
         dialog = BToolchainDialog()
         if dialog.exec_():
             toolchain = qvariant_converter.getStringDict(dialog.toolchain_page.currentItem().data(Qt.UserRole))
-            toolchain_page.setProjectInfo("TOOLCHAIN", toolchain)
+            dialog.toolchain_page.setProjectInfo("TOOLCHAIN", toolchain)
     
     def changeBertosVersion(self):
+	current_version = self.module_page.projectInfo("SOURCES_PATH")
         dialog = BVersionDialog()
         if dialog.exec_():
-            version = qvariant_converter.getString(version_page.currentItem().data(Qt.UserRole))
-            if version != current_version:
-                if QMessageBox.question(
-                    version_page,
-                    self.tr("BeRTOS version update"),
-                    self.tr("Changing the BeRTOS version will destroy all the modification done on the BeRTOS sources"),
-                    QMessageBox.Ok | QMessageBox.Cancel
-                ) == QMessageBox.Ok:
-		    qApp.setOverrideCursor(QCursor(Qt.WaitCursor))
-                    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()
-                    qApp.restoreOverrideCursor()
-		else:
-		    # Rollback version to the previous selected one.
-		    version_page.setProjectInfo("SOURCES_PATH", current_version)
+            version = qvariant_converter.getString(dialog.version_page.currentItem().data(Qt.UserRole))
+            if QMessageBox.question(
+                dialog.version_page,
+                self.tr("BeRTOS version update"),
+                self.tr("Changing the BeRTOS version will destroy all the modification done on the BeRTOS sources"),
+                QMessageBox.Ok | QMessageBox.Cancel
+            ) == QMessageBox.Ok:
+                qApp.setOverrideCursor(QCursor(Qt.WaitCursor))
+                dialog.version_page.setProjectInfo("SOURCES_PATH", version)
+                dialog.version_page.setProjectInfo("OLD_SOURCES_PATH", current_version)
+                enabled_modules = bertos_utils.enabledModules(dialog.version_page.project())
+                old_configuration = dialog.version_page.projectInfo("CONFIGURATIONS")
+                bertos_utils.loadSourceTree(dialog.version_page.project())
+                bertos_utils.loadModuleData(dialog.version_page.project())
+                new_configuration = dialog.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
+                dialog.version_page.setProjectInfo("CONFIGURATIONS", merged_configuration)
+                bertos_utils.setEnabledModules(dialog.version_page.project(), enabled_modules)
+                self.module_page.fillModuleTree()
+                qApp.restoreOverrideCursor()
+            else:
+                # Rollback version to the previous selected one.
+                dialog.version_page.setProjectInfo("SOURCES_PATH", current_version)
 
     def apply(self):
         qApp.setOverrideCursor(QCursor(Qt.WaitCursor))
@@ -183,10 +183,11 @@ class BToolchainDialog(QDialog):
 	# TODO: to be moved in BToolchainPage
 	for toolchain_row in range(toolchain_page.pageContent.toolchainList.count()):
             toolchain = qvariant_converter.getStringDict(toolchain_page.pageContent.toolchainList.item(toolchain_row).data(Qt.UserRole))
-	    if toolchain["path"] == current_toolchain["path"]:
+	    if current_toolchain and toolchain["path"] == current_toolchain["path"]:
                 toolchain_page.pageContent.toolchainList.setCurrentRow(toolchain_row)
 		toolchain_page.selectionChanged()
 		break
+	self.toolchain_page = toolchain_page
         layout.addWidget(toolchain_page)
         button_layout = QHBoxLayout()
         button_layout.addStretch()
@@ -207,6 +208,7 @@ class BVersionDialog(QDialog):
         layout = QVBoxLayout()
         version_page = BVersionPage()
         version_page.reloadData()
+	self.version_page = version_page
         layout.addWidget(version_page)
         button_layout = QHBoxLayout()
         button_layout.addStretch()