X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBEditingDialog.py;h=f4cb468fbf2e68790dca050284a1690350577f9c;hb=a256e501c16b63a423267f8621d6bdcda20d3f3a;hp=db2fcf11d84eb56ae2fa312124afcf34ae1b9378;hpb=e5652672a648b1a8b77e497f1dfc7239c382811f;p=bertos.git

diff --git a/wizard/BEditingDialog.py b/wizard/BEditingDialog.py
index db2fcf11..f4cb468f 100644
--- a/wizard/BEditingDialog.py
+++ b/wizard/BEditingDialog.py
@@ -39,7 +39,7 @@ import os
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from bertos_utils import bertosVersion, getToolchainName, createBertosProject
+from bertos_utils import bertosVersion, getToolchainName
 from BToolchainPage import BToolchainPage
 from BVersionPage import BVersionPage
 
@@ -118,7 +118,7 @@ class BEditingDialog(QDialog):
             dialog.toolchain_page.setProjectInfo("TOOLCHAIN", toolchain)
     
     def changeBertosVersion(self):
-	current_version = self.module_page.projectInfo("SOURCES_PATH")
+	current_version = self.module_page.projectInfo("BERTOS_PATH")
         dialog = BVersionDialog()
         if dialog.exec_():
             version = qvariant_converter.getString(dialog.version_page.currentItem().data(Qt.UserRole))
@@ -130,12 +130,13 @@ class BEditingDialog(QDialog):
             ) == QMessageBox.Ok:
                 try:
                     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())
+                    dialog.version_page.setProjectInfo("BERTOS_PATH", version)
+                    dialog.version_page.setProjectInfo("OLD_BERTOS_PATH", current_version)
+                    enabled_modules = bertos_utils.enabledModules(dialog.version_page.project)
                     old_configuration = dialog.version_page.projectInfo("CONFIGURATIONS")
-                    dialog.version_page.project().loadSourceTree()
-                    qApp.project.loadModuleData(dialog.version_page.project())
+                    dialog.version_page.project.loadSourceTree()
+                    QApplication.instance().project.reloadCpuInfo()
+                    QApplication.instance().project.loadModuleData()
                     new_configuration = dialog.version_page.projectInfo("CONFIGURATIONS")
                     merged_configuration = {}
                     for conf in new_configuration:
@@ -145,18 +146,18 @@ class BEditingDialog(QDialog):
                             configuration = new_configuration[conf]
                         merged_configuration[conf] = configuration
                     dialog.version_page.setProjectInfo("CONFIGURATIONS", merged_configuration)
-                    bertos_utils.setEnabledModules(dialog.version_page.project(), enabled_modules)
+                    bertos_utils.setEnabledModules(dialog.version_page.project, enabled_modules)
                     self.module_page.fillModuleTree()
                 finally:
                     qApp.restoreOverrideCursor()
             else:
                 # Rollback version to the previous selected one.
-                dialog.version_page.setProjectInfo("SOURCES_PATH", current_version)
+                dialog.version_page.setProjectInfo("BERTOS_PATH", current_version)
 
     def apply(self):
         try:
             qApp.setOverrideCursor(QCursor(Qt.WaitCursor))
-            createBertosProject(self.module_page.project(), edit=True)
+            QApplication.instance().project.createBertosProject()
         finally:
             qApp.restoreOverrideCursor()
         self.accept()
@@ -174,10 +175,10 @@ class BEditingDialog(QDialog):
         return self.module_page.versions()
 
     def currentVersion(self):
-        return self.module_page.projectInfo("SOURCES_PATH")
+        return self.module_page.projectInfo("BERTOS_PATH")
     
     def setCurrentVersion(self, version):
-        self.module_page.setProjectInfo("SOURCES_PATH", version)
+        self.module_page.setProjectInfo("BERTOS_PATH", version)
 
 class BToolchainDialog(QDialog):
     def __init__(self):
@@ -227,7 +228,7 @@ class BVersionDialog(QDialog):
         layout.addLayout(button_layout)
         self.setLayout(layout)
         self.connect(ok_button, SIGNAL("clicked()"), self.accept)
-        current_version = version_page.projectInfo("SOURCES_PATH")
+        current_version = version_page.projectInfo("BERTOS_PATH")
         self.setWindowTitle(self.tr("Change BeRTOS version"))