X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBModulePage.py;h=636b818886adaedad3249df52c5575f55ad3d1bd;hb=c9325bdb78d0b9741fab2dc2fb6e93e5e6b3c482;hp=f2ecdeba56381445730898f6c605bd699bfa6aef;hpb=084aaf0b06173468c6a9a70d47533ea142a9f4af;p=bertos.git

diff --git a/wizard/BModulePage.py b/wizard/BModulePage.py
index f2ecdeba..636b8188 100644
--- a/wizard/BModulePage.py
+++ b/wizard/BModulePage.py
@@ -56,6 +56,7 @@ class BModulePage(BWizardPage):
             checkBox.setChecked(modules[module]["enabled"])
     
     def _fillPropertyTable(self):
+        self.savePage()
         module = self._currentModule()
         configuration = self._projectInfoRetrieve("MODULES")[module]["configuration"]
         configurations = self._projectInfoRetrieve("CONFIGURATIONS")[configuration]
@@ -117,9 +118,11 @@ class BModulePage(BWizardPage):
     
     def _showPropertyDescription(self):
         self._resetPropertyDescription()
-        description = self._projectInfoRetrieve("CONFIGURATIONS")[self._currentModuleConfigurations()][self._currentProperty()]["description"]
-        name = self._currentProperty()
-        self._currentPropertyItem().setText(name + "\n" + description)
+        configurations = self._projectInfoRetrieve("CONFIGURATIONS")[self._currentModuleConfigurations()]
+        if self._currentProperty() in configurations.keys():
+            description = configurations[self._currentProperty()]["description"]
+            name = self._currentProperty()
+            self._currentPropertyItem().setText(name + "\n" + description)
     
     def _setupUi(self):
         self.pageContent.moduleTable.horizontalHeader().setResizeMode(QHeaderView.ResizeToContents)
@@ -154,9 +157,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,24 +174,38 @@ 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 = []
+        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)
-        return unsatisfied
\ No newline at end of file
+                unsatisfied |= set([module])
+                if dependency not in unsatisfied:
+                    unsatisfied |= self.unselectDependencyCheck(module)
+        return unsatisfied
+    
+    def savePage(self):
+        for index in range(self.pageContent.propertyTable.rowCount()):
+            print qvariant_converter.getString(self.pageContent.propertyTable.item(index, 0).data(Qt.UserRole))
\ No newline at end of file