X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=inline;f=wizard%2FBModulePage.py;h=48ad0892db6ec34f19b21532fa764905de1a8033;hb=30c78a97f5d3e99d02d90d766956e36f8ff517f6;hp=39cf91d99854e2aa388bf6f60388f95b955f1214;hpb=de4e90c7ff6428672deb13cc9a2533f10d997067;p=bertos.git diff --git a/wizard/BModulePage.py b/wizard/BModulePage.py index 39cf91d9..48ad0892 100644 --- a/wizard/BModulePage.py +++ b/wizard/BModulePage.py @@ -154,9 +154,16 @@ class BModulePage(BWizardPage): depends = self._projectInfoRetrieve("MODULES")[selectedModule]["depends"] unsatisfied = self.selectDependencyCheck(selectedModule) if len(unsatisfied) > 0: - QMessageBox.warning(self, self.tr("Dependency error"), - self.tr("The module %1 needs the following modules:\n%2.\n\nDo you want to resolve automatically the problem?").arg(selectedModule).arg(", ".join(unsatisfied)), - QMessageBox.Yes | QMessageBox.No, QMessageBox.Yes) + message = self.tr("The module %1 needs the following modules:\n%2.\n\nDo you want to resolve automatically the problem?") + message = message.arg(selectedModule).arg(", ".join(unsatisfied)) + choice = QMessageBox.warning(self, self.tr("Dependency error"), message, QMessageBox.Yes | QMessageBox.No, QMessageBox.Yes) + if choice == QMessageBox.Yes: + for module in unsatisfied: + modules = self._projectInfoRetrieve("MODULES") + modules[module]["enabled"] = True + for index in range(self.pageContent.moduleTable.rowCount()): + if unicode(self.pageContent.moduleTable.item(index, 1).text()) in unsatisfied: + self._buttonGroup.button(index).setChecked(True) def _moduleUnselected(self, unselectedModule): modules = self._projectInfoRetrieve("MODULES") @@ -164,9 +171,17 @@ class BModulePage(BWizardPage): self._projectInfoStore("MODULES", modules) unsatisfied = self.unselectDependencyCheck(unselectedModule) if len(unsatisfied) > 0: - QMessageBox.warning(self, self.tr("Dependency error"), - self.tr("The module %1 is needed by the following modules:\n%2.\n\nDo you want to resolve automatically the problem?").arg(unselectedModule).arg(", ".join(unsatisfied)), - QMessageBox.Yes | QMessageBox.No, QMessageBox.Yes) + message = self.tr("The module %1 is needed by the following modules:\n%2.\n\nDo you want to resolve automatically the problem?") + message = message.arg(unselectedModule).arg(", ".join(unsatisfied)) + choice = QMessageBox.warning(self, self.tr("Dependency error"), message, QMessageBox.Yes | QMessageBox.No, QMessageBox.Yes) + if choice == QMessageBox.Yes: + for module in unsatisfied: + modules = self._projectInfoRetrieve("MODULES") + modules[module]["enabled"] = False + for index in range(self.pageContent.moduleTable.rowCount()): + if unicode(self.pageContent.moduleTable.item(index, 1).text()) in unsatisfied: + self._buttonGroup.button(index).setChecked(False) + def selectDependencyCheck(self, module): unsatisfied = set()