X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBEditingDialog.py;h=10dcd24f0e9e766ec7b420149d85348a447898d2;hb=39c1c5711f7cd8b27348ba8f28fbc06491174df2;hp=c8f6e7069bfd3959e96c57f893b4dcbf2a8ab93d;hpb=0abb51206643b12557ea06191a95367638156905;p=bertos.git diff --git a/wizard/BEditingDialog.py b/wizard/BEditingDialog.py index c8f6e706..10dcd24f 100644 --- a/wizard/BEditingDialog.py +++ b/wizard/BEditingDialog.py @@ -132,10 +132,10 @@ class BEditingDialog(QDialog): qApp.setOverrideCursor(QCursor(Qt.WaitCursor)) dialog.version_page.setProjectInfo("SOURCES_PATH", version) dialog.version_page.setProjectInfo("OLD_SOURCES_PATH", current_version) - QApplication.instance().project.reloadCpuInfo() - enabled_modules = bertos_utils.enabledModules(dialog.version_page.project()) + enabled_modules = bertos_utils.enabledModules(dialog.version_page.project) old_configuration = dialog.version_page.projectInfo("CONFIGURATIONS") - dialog.version_page.project().loadSourceTree() + dialog.version_page.project.loadSourceTree() + QApplication.instance().project.reloadCpuInfo() QApplication.instance().project.loadModuleData() new_configuration = dialog.version_page.projectInfo("CONFIGURATIONS") merged_configuration = {} @@ -146,7 +146,7 @@ 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() @@ -157,7 +157,7 @@ class BEditingDialog(QDialog): def apply(self): try: qApp.setOverrideCursor(QCursor(Qt.WaitCursor)) - createBertosProject(self.module_page.project(), edit=True) + createBertosProject(self.module_page.project, edit=True) finally: qApp.restoreOverrideCursor() self.accept()