X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBModulePage.py;h=3ec76e0db8d8a07d2a229372bd33cdd2335f1583;hb=805bb79067ea54a5c55f9f166d6fa64f3b8da16d;hp=a766b6a3dcf361bd126336352d27636e0702b226;hpb=0933e5f9aeb914fea0d70921504e56b3a0db69a6;p=bertos.git

diff --git a/wizard/BModulePage.py b/wizard/BModulePage.py
index a766b6a3..3ec76e0d 100644
--- a/wizard/BModulePage.py
+++ b/wizard/BModulePage.py
@@ -39,23 +39,13 @@ class BModulePage(BWizardPage):
     
     def _loadModuleData(self):
         try:
-            modules = bertos_utils.loadModuleInfosDict(self._project())
-            lists = bertos_utils.loadDefineListsDict(self._project())
-            configurations = {}
-            for module, informations in modules.items():
-                if len(informations["configuration"]) > 0:
-                    configurations[informations["configuration"]] = bertos_utils.loadConfigurationInfos(self._projectInfoRetrieve("SOURCES_PATH") +
-                                                                                                        "/" + informations["configuration"])
+            bertos_utils.loadModuleData(self._project())
         except ModuleDefineException, e:
-            self._exceptionOccurred(self.tr("Error parsing module information in file %1").arg(e.path))
+            self._exceptionOccurred(self.tr("Error parsing line '%2' in file %1").arg(e.path).arg(e.line))
         except EnumDefineException, e:
-            self._exceptionOccurred(self.tr("Error parsing enum informations in file %1").arg(e.path))
+            self._exceptionOccurred(self.tr("Error parsing line '%2' in file %1").arg(e.path).arg(e.line))
         except ConfigurationDefineException, e:
-            self._exceptionOccurred(self.tr("Error parsing configuration informations in file %1, reading parameter %2").arg(e.path).arg(e.name))
-        else:
-            self._projectInfoStore("MODULES", modules)
-            self._projectInfoStore("LISTS", lists)
-            self._projectInfoStore("CONFIGURATIONS", configurations)
+            self._exceptionOccurred(self.tr("Error parsing line '%2' in file %1").arg(e.path).arg(e.line))
     
     def _fillModuleTable(self):
         modules = self._projectInfoRetrieve("MODULES")
@@ -82,7 +72,7 @@ class BModulePage(BWizardPage):
                 configurations = self._projectInfoRetrieve("CONFIGURATIONS")[configuration]
                 self.pageContent.propertyTable.setRowCount(len(configurations))
                 for index, property in enumerate(configurations):
-                    item = QTableWidgetItem(property)
+                    item = QTableWidgetItem(configurations[property]["brief"])
                     item.setData(Qt.UserRole, qvariant_converter.convertString(property))
                     self.pageContent.propertyTable.setItem(index, 0, item)
                     if "type" in configurations[property]["informations"].keys() and configurations[property]["informations"]["type"] == "boolean":
@@ -181,15 +171,18 @@ class BModulePage(BWizardPage):
     def _resetPropertyDescription(self):
         for index in range(self.pageContent.propertyTable.rowCount()):
             propertyName = qvariant_converter.getString(self.pageContent.propertyTable.item(index, 0).data(Qt.UserRole))
-            self.pageContent.propertyTable.item(index, 0).setText(propertyName)
+            # Awful solution! Needed because if the user change the module, the selection changed...
+            if propertyName not in self._currentModuleConfigurations().keys():
+                break
+            self.pageContent.propertyTable.item(index, 0).setText(self._currentModuleConfigurations()[propertyName]['brief'])
     
     def _showPropertyDescription(self):
         self._resetPropertyDescription()
         configurations = self._currentModuleConfigurations()
         if self._currentProperty() in configurations.keys():
-            description = configurations[self._currentProperty()]["description"]
+            description = configurations[self._currentProperty()]["brief"]
             name = self._currentProperty()
-            self._currentPropertyItem().setText(name + "\n" + description)
+            self._currentPropertyItem().setText(description + "\n" + name)
     
     def _setupUi(self):
         self.pageContent.moduleTable.horizontalHeader().setResizeMode(QHeaderView.ResizeToContents)
@@ -239,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))
@@ -269,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")