X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBModulePage.py;h=9c13a2cc01402688b69ba71b70faef78d1d1f27e;hb=e28fc9dfd2361aecf99ecb8f3f256a8776e266d3;hp=a6307d7a0abbefeb5cc61e36c4f52a486d0a5336;hpb=505f1c5092e0efa3b63009a7544923751d43f0b3;p=bertos.git diff --git a/wizard/BModulePage.py b/wizard/BModulePage.py index a6307d7a..9c13a2cc 100644 --- a/wizard/BModulePage.py +++ b/wizard/BModulePage.py @@ -35,6 +35,7 @@ import os +from PyQt4.QtCore import * from PyQt4.QtGui import * from BWizardPage import * import bertos_utils @@ -85,11 +86,13 @@ class BModulePage(BWizardPage): """ Overload of the BWizardPage reloadData method. """ - QApplication.instance().setOverrideCursor(Qt.WaitCursor) - self.setupUi() - self.loadModuleData() - self.fillModuleTree() - QApplication.instance().restoreOverrideCursor() + try: + QApplication.instance().setOverrideCursor(Qt.WaitCursor) + self.setupUi() + self.loadModuleData() + self.fillModuleTree() + finally: + QApplication.instance().restoreOverrideCursor() #### @@ -107,7 +110,7 @@ class BModulePage(BWizardPage): module = self.currentModule() if module: try: - supported = bertos_utils.isSupported(self.project(), module=module) + supported = bertos_utils.isSupported(self.project, module=module) except SupportedException, e: self.exceptionOccurred(self.tr("Error evaluating \"%1\" for module %2").arg(e.support_string).arg(module)) supported = True @@ -134,7 +137,7 @@ class BModulePage(BWizardPage): # Doesn't show the hidden fields continue try: - param_supported = bertos_utils.isSupported(self.project(), property_id=(configuration, property)) + param_supported = bertos_utils.isSupported(self.project, property_id=(configuration, property)) except SupportedException, e: self.exceptionOccurred(self.tr("Error evaluating \"%1\" for parameter %2").arg(e.support_string).arg(property)) param_supported = True @@ -221,7 +224,7 @@ class BModulePage(BWizardPage): and not self.projectInfo("LISTS") \ and not self.projectInfo("CONFIGURATIONS"): try: - bertos_utils.loadModuleData(self.project()) + self.project.loadModuleData() except ModuleDefineException, e: self.exceptionOccurred(self.tr("Error parsing line '%2' in file %1").arg(e.path).arg(e.line)) except EnumDefineException, e: @@ -248,7 +251,7 @@ class BModulePage(BWizardPage): enabled = modules[module]["enabled"] module_item = QTreeWidgetItem(item, QStringList([module])) try: - supported = bertos_utils.isSupported(self.project(), module=module) + supported = bertos_utils.isSupported(self.project, module=module) except SupportedException, e: self.exceptionOccurred(self.tr("Error evaluating \"%1\" for module %2").arg(e.support_string).arg(module)) supported = True @@ -401,65 +404,75 @@ class BModulePage(BWizardPage): """ Resolves the selection dependencies. """ - modules = self.projectInfo("MODULES") - modules[selectedModule]["enabled"] = True - self.setProjectInfo("MODULES", modules) - depends = self.projectInfo("MODULES")[selectedModule]["depends"] - unsatisfied = [] - if self.pageContent.automaticFix.isChecked(): - unsatisfied = self.selectDependencyCheck(selectedModule) - if len(unsatisfied) > 0: - for module in unsatisfied: - modules = self.projectInfo("MODULES") - modules[module]["enabled"] = True - for category in range(self.pageContent.moduleTree.topLevelItemCount()): - item = self.pageContent.moduleTree.topLevelItem(category) - for child in range(item.childCount()): - if unicode(item.child(child).text(0)) in unsatisfied: - self.setBold(item.child(child), True) - self.setBold(item, True) - item.child(child).setCheckState(0, Qt.Checked) - - def moduleUnselected(self, unselectedModule): - """ - Resolves the unselection dependencies. - """ - modules = self.projectInfo("MODULES") - modules[unselectedModule]["enabled"] = False - self.setProjectInfo("MODULES", modules) - unsatisfied = [] - unsatisfied_params = [] - if self.pageContent.automaticFix.isChecked(): - unsatisfied, unsatisfied_params = self.unselectDependencyCheck(unselectedModule) - if len(unsatisfied) > 0 or len(unsatisfied_params) > 0: - message = [] - heading = self.tr("The module %1 is needed by").arg(unselectedModule) - message.append(heading) - module_list = ", ".join(unsatisfied) - param_list = ", ".join(["%s (%s)" %(param_name, module) for module, param_name in unsatisfied_params]) - if module_list: - message.append(QString(module_list)) - if module_list and param_list: - message.append(self.tr("and by")) - if param_list: - message.append(QString(param_list)) - message_str = QStringList(message).join(" ") - message_str.append(self.tr("\n\nDo you want to automatically fix these conflicts?")) - choice = QMessageBox.warning(self, self.tr("Dependency error"), message_str, QMessageBox.Yes | QMessageBox.No, QMessageBox.Yes) - if choice == QMessageBox.Yes: + try: + qApp.setOverrideCursor(Qt.WaitCursor) + modules = self.projectInfo("MODULES") + modules[selectedModule]["enabled"] = True + self.setProjectInfo("MODULES", modules) + depends = self.projectInfo("MODULES")[selectedModule]["depends"] + unsatisfied = [] + if self.pageContent.automaticFix.isChecked(): + unsatisfied = self.selectDependencyCheck(selectedModule) + if len(unsatisfied) > 0: for module in unsatisfied: modules = self.projectInfo("MODULES") - modules[module]["enabled"] = False + modules[module]["enabled"] = True for category in range(self.pageContent.moduleTree.topLevelItemCount()): item = self.pageContent.moduleTree.topLevelItem(category) for child in range(item.childCount()): if unicode(item.child(child).text(0)) in unsatisfied: - item.child(child).setCheckState(0, Qt.Unchecked) - for module, param in unsatisfied_params: - configuration_file = self.projectInfo("MODULES")[module]["configuration"] - configurations = self.projectInfo("CONFIGURATIONS") - configurations[configuration_file][param]["value"] = "0" - self.setProjectInfo("CONFIGURATIONS", configurations) + self.setBold(item.child(child), True) + self.setBold(item, True) + item.child(child).setCheckState(0, Qt.Checked) + finally: + qApp.restoreOverrideCursor() + + def moduleUnselected(self, unselectedModule): + """ + Resolves the unselection dependencies. + """ + try: + qApp.setOverrideCursor(Qt.WaitCursor) + modules = self.projectInfo("MODULES") + modules[unselectedModule]["enabled"] = False + self.setProjectInfo("MODULES", modules) + unsatisfied = [] + unsatisfied_params = [] + if self.pageContent.automaticFix.isChecked(): + unsatisfied, unsatisfied_params = self.unselectDependencyCheck(unselectedModule) + if len(unsatisfied) > 0 or len(unsatisfied_params) > 0: + message = [] + heading = self.tr("The module %1 is needed by").arg(unselectedModule) + message.append(heading) + module_list = ", ".join(unsatisfied) + param_list = ", ".join(["%s (%s)" %(param_name, module) for module, param_name in unsatisfied_params]) + if module_list: + message.append(QString(module_list)) + if module_list and param_list: + message.append(self.tr("and by")) + if param_list: + message.append(QString(param_list)) + message_str = QStringList(message).join(" ") + message_str.append(self.tr("\n\nDo you want to automatically fix these conflicts?")) + qApp.restoreOverrideCursor() + choice = QMessageBox.warning(self, self.tr("Dependency error"), message_str, QMessageBox.Yes | QMessageBox.No, QMessageBox.Yes) + qApp.setOverrideCursor(Qt.WaitCursor) + if choice == QMessageBox.Yes: + for module in unsatisfied: + modules = self.projectInfo("MODULES") + modules[module]["enabled"] = False + for category in range(self.pageContent.moduleTree.topLevelItemCount()): + item = self.pageContent.moduleTree.topLevelItem(category) + for child in range(item.childCount()): + if unicode(item.child(child).text(0)) in unsatisfied: + item.child(child).setCheckState(0, Qt.Unchecked) + for module, param in unsatisfied_params: + configuration_file = self.projectInfo("MODULES")[module]["configuration"] + configurations = self.projectInfo("CONFIGURATIONS") + configurations[configuration_file][param]["value"] = "0" + self.setProjectInfo("CONFIGURATIONS", configurations) + finally: + qApp.restoreOverrideCursor() def selectDependencyCheck(self, module): """ @@ -468,12 +481,16 @@ class BModulePage(BWizardPage): unsatisfied = set() modules = self.projectInfo("MODULES") files = self.projectInfo("FILES") - configurations = self.projectInfo("CONFIGURATIONS")[modules[module]["configuration"]] + configurations = self.projectInfo("CONFIGURATIONS").get(modules[module]["configuration"], {"paramlist": ()}) conditional_deps = () for i, param_name in configurations["paramlist"]: information = configurations[param_name] - if information["informations"]["type"] == "boolean" and information["value"] != "0" and "conditional_deps" in information["informations"]: + if information["informations"]["type"] == "boolean" and \ + information["value"] != "0" and \ + "conditional_deps" in information["informations"]: + conditional_deps += information["informations"]["conditional_deps"] + for dependency in modules[module]["depends"] + conditional_deps: if dependency in modules and not modules[dependency]["enabled"]: unsatisfied |= set([dependency])