X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBModulePage.py;h=72b0f9da950bde5cdf74b5fc10c5030468b223a7;hb=1ddc1613b03c97b8ef84c4657c5fbc82e86fa32b;hp=ccaf621c4f53e12ecddce7b162165875c1f719a4;hpb=7f0679e3d2edfba574b4732c458480ed0799acd0;p=bertos.git diff --git a/wizard/BModulePage.py b/wizard/BModulePage.py index ccaf621c..72b0f9da 100644 --- a/wizard/BModulePage.py +++ b/wizard/BModulePage.py @@ -80,19 +80,21 @@ class BModulePage(BWizardPage): self.connect(self.pageContent.moduleTree, SIGNAL("itemPressed(QTreeWidgetItem*, int)"), self.fillPropertyTable) self.connect(self.pageContent.moduleTree, SIGNAL("itemPressed(QTreeWidgetItem*, int)"), self.moduleClicked) self.connect(self.pageContent.moduleTree, SIGNAL("itemChanged(QTreeWidgetItem*, int)"), self.dependencyCheck) - self.connect(self.pageContent.propertyTable, SIGNAL("itemSelectionChanged()"), self.showPropertyDescription) - def reloadData(self): + def reloadData(self, previous_id=None): """ Overload of the BWizardPage reloadData method. """ - try: - QApplication.instance().setOverrideCursor(Qt.WaitCursor) - self.setupUi() - self.loadModuleData() - self.fillModuleTree() - finally: - QApplication.instance().restoreOverrideCursor() + # Check if the user are approaching this page from the previous or the + # next one. + if previous_id is None or previous_id < self.wizard().currentId(): + try: + QApplication.instance().setOverrideCursor(Qt.WaitCursor) + self.setupUi() + self.loadModuleData() + self.fillModuleTree() + finally: + QApplication.instance().restoreOverrideCursor() #### @@ -110,7 +112,7 @@ class BModulePage(BWizardPage): module = self.currentModule() if module: try: - supported = bertos_utils.isSupported(self.project(), module=module) + supported = bertos_utils.isSupported(self.project, module=module) except SupportedException, e: self.exceptionOccurred(self.tr("Error evaluating \"%1\" for module %2").arg(e.support_string).arg(module)) supported = True @@ -137,7 +139,7 @@ class BModulePage(BWizardPage): # Doesn't show the hidden fields continue try: - param_supported = bertos_utils.isSupported(self.project(), property_id=(configuration, property)) + param_supported = bertos_utils.isSupported(self.project, property_id=(configuration, property)) except SupportedException, e: self.exceptionOccurred(self.tr("Error evaluating \"%1\" for parameter %2").arg(e.support_string).arg(property)) param_supported = True @@ -147,6 +149,8 @@ class BModulePage(BWizardPage): # Set the row count to the current index + 1 self.pageContent.propertyTable.setRowCount(index + 1) item = QTableWidgetItem(configurations[property]["brief"]) + item.setFlags(item.flags() & ~Qt.ItemIsSelectable) + item.setToolTip(property) item.setData(Qt.UserRole, qvariant_converter.convertString(property)) self.pageContent.propertyTable.setItem(index, 0, item) if "type" in configurations[property]["informations"] and configurations[property]["informations"]["type"] == "boolean": @@ -219,12 +223,13 @@ class BModulePage(BWizardPage): """ Loads the module data. """ - # Load the module data only if it isn't already loaded - if not self.projectInfo("MODULES") \ - and not self.projectInfo("LISTS") \ - and not self.projectInfo("CONFIGURATIONS"): + # Do not load the module data again when the Wizard is in editing mode + # or when it's working on a preset. + if not self.project.edit and not self.project.from_preset: + # Load the module data every time so that if the user changed the cpu + # the right configurations are picked up. try: - self.project().loadModuleData() + self.project.loadModuleData() except ModuleDefineException, e: self.exceptionOccurred(self.tr("Error parsing line '%2' in file %1").arg(e.path).arg(e.line)) except EnumDefineException, e: @@ -251,7 +256,7 @@ class BModulePage(BWizardPage): enabled = modules[module]["enabled"] module_item = QTreeWidgetItem(item, QStringList([module])) try: - supported = bertos_utils.isSupported(self.project(), module=module) + supported = bertos_utils.isSupported(self.project, module=module) except SupportedException, e: self.exceptionOccurred(self.tr("Error evaluating \"%1\" for module %2").arg(e.support_string).arg(module)) supported = True @@ -376,7 +381,12 @@ class BModulePage(BWizardPage): """ Returns the configuration for the selected module. """ - configuration = self.projectInfo("MODULES")[module]["configuration"] + configuration = [] + if module: + # On linux platform it seems that the behaviour of the focus + # changing is a bit different from the mac one. So if module is + # None then no configurations should be returned. + configuration = self.projectInfo("MODULES")[module]["configuration"] if len(configuration) > 0: return self.projectInfo("CONFIGURATIONS")[configuration] else: @@ -400,6 +410,9 @@ class BModulePage(BWizardPage): item.setFont(0, font) self.pageContent.moduleTree.blockSignals(False) + def isBold(self, item): + return item.font(0).bold() + def moduleSelected(self, selectedModule): """ Resolves the selection dependencies. @@ -463,9 +476,14 @@ class BModulePage(BWizardPage): modules[module]["enabled"] = False for category in range(self.pageContent.moduleTree.topLevelItemCount()): item = self.pageContent.moduleTree.topLevelItem(category) + self.setBold(item, False) for child in range(item.childCount()): if unicode(item.child(child).text(0)) in unsatisfied: + self.setBold(item.child(child), False) item.child(child).setCheckState(0, Qt.Unchecked) + else: + if self.isBold(item.child(child)): + self.setBold(item, True) for module, param in unsatisfied_params: configuration_file = self.projectInfo("MODULES")[module]["configuration"] configurations = self.projectInfo("CONFIGURATIONS")