X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=wizard%2FBModulePage.py;h=48ad0892db6ec34f19b21532fa764905de1a8033;hb=30c78a97f5d3e99d02d90d766956e36f8ff517f6;hp=974fc192c3ac2c20c09c5ab24f7a9c1df83676cb;hpb=f9c2a8d31399f00db0a00891f774d3c50cb489c6;p=bertos.git

diff --git a/wizard/BModulePage.py b/wizard/BModulePage.py
index 974fc192..48ad0892 100644
--- a/wizard/BModulePage.py
+++ b/wizard/BModulePage.py
@@ -154,18 +154,16 @@ class BModulePage(BWizardPage):
         depends = self._projectInfoRetrieve("MODULES")[selectedModule]["depends"]
         unsatisfied = self.selectDependencyCheck(selectedModule)
         if len(unsatisfied) > 0:
-            self._selectionDependencyFail(selectedModule, unsatisfied)
-    
-    def _selectionDependencyFail(self, selectedModule, unsatisfiedModules):
-        messageString = "The module " + selectedModule + " needs the following modules:\n" + \
-                        ", ".join(unsatisfiedModules) + ".\nDo you want to resolve autmatically the prolem?"
-        messageBox = QMessageBox()
-        messageBox.setIcon(QMessageBox.Warning)
-        messageBox.setText(self.tr("Dependency fail"))
-        messageBox.setInformativeText(self.tr(messageString))
-        messageBox.addButton(QMessageBox.Yes)
-        messageBox.addButton(QMessageBox.No)
-        messageBox.exec_()
+            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")
@@ -173,33 +171,34 @@ class BModulePage(BWizardPage):
         self._projectInfoStore("MODULES", modules)
         unsatisfied = self.unselectDependencyCheck(unselectedModule)
         if len(unsatisfied) > 0:
-            self._unselectionDependencyFail(unselectedModule, unsatisfied)
-    
-    def _unselectionDependencyFail(self, unselectedModule, unsatisfiedModules):
-        messageString = "The module " + unselectedModule + " is needed by the following modules:\n" + \
-                        ", ".join(unsatisfiedModules) + ".\nDo you want to resolve autmatically the prolem?"
-        messageBox = QMessageBox()
-        messageBox.setIcon(QMessageBox.Warning)
-        messageBox.setText(self.tr("Dependency fail"))
-        messageBox.setInformativeText(self.tr(messageString))
-        messageBox.addButton(QMessageBox.Yes)
-        messageBox.addButton(QMessageBox.No)
-        messageBox.exec_()
+            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 = []
+        unsatisfied = set()
         modules = self._projectInfoRetrieve("MODULES")
         for dependency in modules[module]["depends"]:
             if not modules[dependency]["enabled"]:
-                unsatisfied.append(dependency)
-                unsatisfied += self.selectDependencyCheck(dependency)
+                unsatisfied |= set([dependency])
+                if dependency not in unsatisfied:
+                    unsatisfied |= self.selectDependencyCheck(dependency)
         return unsatisfied
     
     def unselectDependencyCheck(self, dependency):
-        unsatisfied = []
+        unsatisfied = set()
         modules = self._projectInfoRetrieve("MODULES")
         for module, informations in modules.items():
             if dependency in informations["depends"] and informations["enabled"]:
-                unsatisfied.append(module)
-                unsatisfied += self.unselectDependencyCheck(module)
+                unsatisfied |= set([module])
+                if dependency not in unsatisfied:
+                    unsatisfied |= self.unselectDependencyCheck(module)
         return unsatisfied
\ No newline at end of file