X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=wizard%2FBModulePage.py;h=3ec76e0db8d8a07d2a229372bd33cdd2335f1583;hb=805bb79067ea54a5c55f9f166d6fa64f3b8da16d;hp=17812cd991ce394445a80ec71892d55c25871b3f;hpb=ea62a2f8101c1fcc896892d2407f051ef3a9bc0b;p=bertos.git diff --git a/wizard/BModulePage.py b/wizard/BModulePage.py index 17812cd9..3ec76e0d 100644 --- a/wizard/BModulePage.py +++ b/wizard/BModulePage.py @@ -232,24 +232,24 @@ class BModulePage(BWizardPage): modules[selectedModule]["enabled"] = True self._projectInfoStore("MODULES", modules) depends = self._projectInfoRetrieve("MODULES")[selectedModule]["depends"] - unsatisfied = self.selectDependencyCheck(selectedModule) + unsatisfied = [] + if self.pageContent.automaticFix.isChecked(): + unsatisfied = self.selectDependencyCheck(selectedModule) if len(unsatisfied) > 0: - 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) + 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") modules[unselectedModule]["enabled"] = False self._projectInfoStore("MODULES", modules) - unsatisfied = self.unselectDependencyCheck(unselectedModule) + unsatisfied = [] + if self.pageContent.automaticFix.isChecked(): + unsatisfied = self.unselectDependencyCheck(unselectedModule) if len(unsatisfied) > 0: 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)) @@ -262,7 +262,6 @@ class BModulePage(BWizardPage): if unicode(self.pageContent.moduleTable.item(index, 1).text()) in unsatisfied: self._buttonGroup.button(index).setChecked(False) - def selectDependencyCheck(self, module): unsatisfied = set() modules = self._projectInfoRetrieve("MODULES")