X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBModulePage.py;h=06de96380e37e41d477d6728db447a64bf80af36;hb=1f92b928d3390119fc6f94bd52358f812e1a8c5f;hp=ee713ab4e459e05c0cd5ced60062c4a834961ded;hpb=f08b2428843745bd9d15aecb4e2006f8350ece36;p=bertos.git diff --git a/wizard/BModulePage.py b/wizard/BModulePage.py index ee713ab4..06de9638 100644 --- a/wizard/BModulePage.py +++ b/wizard/BModulePage.py @@ -28,9 +28,8 @@ class BModulePage(BWizardPage): def reloadData(self): self._setupUi() - self._setupButtonGroup() self._loadModuleData() - self._fillModuleTable() + self._fillModuleTree() def _setupButtonGroup(self): self._buttonGroup = QButtonGroup() @@ -39,35 +38,31 @@ class BModulePage(BWizardPage): def _loadModuleData(self): try: - modules = bertos_utils.loadModuleInfosDict(self._projectInfoRetrieve("SOURCES_PATH")) - lists = bertos_utils.loadDefineListsDict(self._projectInfoRetrieve("SOURCES_PATH")) - 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.parameter)) + 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.parameter)) + 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").arg(e.parameter)) - 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): + def _fillModuleTree(self): modules = self._projectInfoRetrieve("MODULES") if modules is None: return - self.pageContent.moduleTable.setRowCount(len(modules)) - for index, module in enumerate(modules): - self.pageContent.moduleTable.setItem(index, 1, QTableWidgetItem(module)) - checkBox = QCheckBox() - self._buttonGroup.addButton(checkBox, index) - self.pageContent.moduleTable.setCellWidget(index, 0, checkBox) - checkBox.setChecked(modules[module]["enabled"]) + categories = {} + for module, information in modules.items(): + if information["category"] not in categories.keys(): + categories[information["category"]] = [] + categories[information["category"]].append(module) + for category, modules in categories.items(): + item = QTreeWidgetItem(QStringList([category])) + for module in modules: + moduleItem = QTreeWidgetItem(item, QStringList([module])) + moduleItem.setCheckState(0, Qt.Unchecked) + self.pageContent.moduleTree.addTopLevelItem(item) + self.pageContent.moduleTree.sortItems(0, Qt.AscendingOrder) + def _fillPropertyTable(self): module = self._currentModule() @@ -81,19 +76,25 @@ class BModulePage(BWizardPage): if len(configuration) > 0: configurations = self._projectInfoRetrieve("CONFIGURATIONS")[configuration] self.pageContent.propertyTable.setRowCount(len(configurations)) - for index, property in enumerate(configurations): - item = QTableWidgetItem(property) - 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": - self._insertCheckBox(index, configurations[property]["value"]) - elif "type" in configurations[property]["informations"].keys() and configurations[property]["informations"]["type"] == "enum": - self._insertComboBox(index, configurations[property]["value"], configurations[property]["informations"]["value_list"]) - elif "type" in configurations[property]["informations"] and configurations[property]["informations"]["type"] == "int": - self._insertSpinBox(index, configurations[property]["value"], configurations[property]["informations"]) + index = 0 + for property in configurations: + if "type" in configurations[property]["informations"] and configurations[property]["informations"]["type"] == "autoenabled": + ## Doesn't show the hidden fields + pass else: - # Not defined type, rendered as a text field - self.pageContent.propertyTable.setItem(index, 1, 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": + self._insertCheckBox(index, configurations[property]["value"]) + elif "type" in configurations[property]["informations"].keys() and configurations[property]["informations"]["type"] == "enum": + self._insertComboBox(index, configurations[property]["value"], configurations[property]["informations"]["value_list"]) + elif "type" in configurations[property]["informations"] and configurations[property]["informations"]["type"] == "int": + self._insertSpinBox(index, configurations[property]["value"], configurations[property]["informations"]) + else: + # Not defined type, rendered as a text field + self.pageContent.propertyTable.setItem(index, 1, QTableWidgetItem(configurations[property]["value"])) + index += 1 else: self.pageContent.propertyTable.setRowCount(0) @@ -153,9 +154,10 @@ class BModulePage(BWizardPage): def _currentModule(self): - currentModule = self.pageContent.moduleTable.item(self.pageContent.moduleTable.currentRow(), 1) - if currentModule is not None: - return unicode(currentModule.text()) + currentModule = self.pageContent.moduleTree.currentItem() + # return only the child items + if currentModule is not None and currentModule.parent() is not None: + return unicode(currentModule.text(0)) else: return None @@ -168,9 +170,6 @@ class BModulePage(BWizardPage): def _currentPropertyItem(self): return self.pageContent.propertyTable.item(self.pageContent.propertyTable.currentRow(), 0) - def _module(self, row): - return unicode(self.pageContent.moduleTable.item(row, 1).text()) - def _configurations(self, module): configuration = self._projectInfoRetrieve("MODULES")[module]["configuration"] if len(configuration) > 0: @@ -181,24 +180,22 @@ 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) - self.pageContent.moduleTable.horizontalHeader().setStretchLastSection(True) - self.pageContent.moduleTable.horizontalHeader().setVisible(False) - self.pageContent.moduleTable.verticalHeader().setResizeMode(QHeaderView.ResizeToContents) - self.pageContent.moduleTable.verticalHeader().setVisible(False) - self.pageContent.moduleTable.setColumnCount(2) - self.pageContent.moduleTable.setRowCount(0) + self.pageContent.moduleTree.clear() + self.pageContent.moduleTree.setHeaderHidden(True) self.pageContent.propertyTable.horizontalHeader().setResizeMode(QHeaderView.Stretch) self.pageContent.propertyTable.horizontalHeader().setVisible(False) self.pageContent.propertyTable.verticalHeader().setResizeMode(QHeaderView.ResizeToContents) @@ -208,7 +205,8 @@ class BModulePage(BWizardPage): self.pageContent.moduleLabel.setVisible(False) def _connectSignals(self): - self.connect(self.pageContent.moduleTable, SIGNAL("itemSelectionChanged()"), self._fillPropertyTable) + self.connect(self.pageContent.moduleTree, SIGNAL("itemPressed(QTreeWidgetItem*, int)"), self._fillPropertyTable) + self.connect(self.pageContent.moduleTree, SIGNAL("itemChanged(QTreeWidgetItem*, int)"), self._dependencyCheck) self.connect(self.pageContent.propertyTable, SIGNAL("itemSelectionChanged()"), self._showPropertyDescription) self.connect(self._controlGroup, SIGNAL("stateChanged"), self._saveValue) @@ -234,50 +232,69 @@ class BModulePage(BWizardPage): else: self._moduleUnselected(module) + def _dependencyCheck(self, item): + checked = False + module = unicode(item.text(0)) + if item.checkState(0) == Qt.Checked: + self._moduleSelected(module) + else: + self._moduleUnselected(module) + self.removeFileDependencies(module) + def _moduleSelected(self, selectedModule): modules = self._projectInfoRetrieve("MODULES") 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 category in range(self.pageContent.moduleTree.topLevelItemCount()): + item = self.pageContent.moduleTree.topLevelItem(category) + for child in range(item.childCount()): + if unicode(item.child(child).text(0)) in unsatisfied: + item.child(child).setCheckState(0, Qt.Checked) 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 = self.tr("The module %1 is needed by the following modules:\n%2.\n\nDo you want to remove these modules too?") 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) - + for category in range(self.pageContent.moduleTree.topLevelItemCount()): + item = self.pageContent.moduleTree.topLevelItem(category) + for child in range(item.childCount()): + if unicode(item.child(child).text(0)) in unsatisfied: + item.child(child).setCheckState(0, Qt.Unchecked) def selectDependencyCheck(self, module): unsatisfied = set() modules = self._projectInfoRetrieve("MODULES") + files = self._projectInfoRetrieve("FILES") for dependency in modules[module]["depends"]: - if not modules[dependency]["enabled"]: + if dependency in modules and not modules[dependency]["enabled"]: unsatisfied |= set([dependency]) if dependency not in unsatisfied: unsatisfied |= self.selectDependencyCheck(dependency) + if dependency not in modules: + if dependency in files: + files[dependency] += 1 + else: + files[dependency] = 1 + self._projectInfoStore("FILES", files) return unsatisfied def unselectDependencyCheck(self, dependency): @@ -289,6 +306,17 @@ class BModulePage(BWizardPage): if dependency not in unsatisfied: unsatisfied |= self.unselectDependencyCheck(module) return unsatisfied + + def removeFileDependencies(self, module): + modules = self._projectInfoRetrieve("MODULES") + files = self._projectInfoRetrieve("FILES") + dependencies = modules[module]["depends"] + for dependency in dependencies: + if dependency in files: + files[dependency] -= 1 + if files[dependency] == 0: + del files[dependency] + self._projectInfoStore("FILES", files) class QControlGroup(QObject): def __init__(self):