X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=wizard%2FBCreationPage.py;h=8b2158f394de634396e5e54639d04df4fcb6974f;hb=cb1e0e932dd0bd84edb51dafe4377ff4d3545514;hp=3f9748445066c037a3f857b36ab450724e32889d;hpb=747ba554790ad832c0508b1f79242ba1d493d849;p=bertos.git

diff --git a/wizard/BCreationPage.py b/wizard/BCreationPage.py
index 3f974844..8b2158f3 100644
--- a/wizard/BCreationPage.py
+++ b/wizard/BCreationPage.py
@@ -24,21 +24,15 @@ class BCreationPage(BWizardPage):
         BWizardPage.__init__(self, UI_LOCATION + "/project_creation.ui")
         self.setTitle(self.tr("Create the BeRTOS project"))
         self._setupUi()
-        self._connectSignals()
         self._completed = False
+        self.setButtonText(QWizard.NextButton, self.tr("Create"))
     
     def _setupUi(self):
-        self._confirm_group = QWidgetGroup(self.pageContent.summaryTree,
-                                            self.pageContent.createButton)
-        self._final_group = QWidgetGroup(self.pageContent.iconLabel,
-                                            self.pageContent.textLabel)
-        self._final_group.setVisible(False)
         summary = self.pageContent.summaryTree
         summary.setHeaderHidden(True)
         summary.setColumnCount(1)
     
     def reloadData(self):
-        self._completed = False
         self._setupUi()
         self.pageContent.summaryTree.clear()
         top_level = []
@@ -71,54 +65,15 @@ class BCreationPage(BWizardPage):
                 moduleItem = QTreeWidgetItem(QStringList([module + " - " + information["description"]]))
                 module_categories[information["category"]].append(moduleItem)
                 if len(information["configuration"]) > 0:
-                    for property, data in configurations[information["configuration"]].items():
+                    for start, property in configurations[information["configuration"]]["paramlist"]:
                         # If the final char of the brief is a dot (".") removes it.
-                        brief = data["brief"]
+                        brief = configurations[information["configuration"]][property]["brief"]
                         if brief[-1] == ".":
                             brief = brief[:-1]
-                        configuration_item = QTreeWidgetItem(moduleItem, QStringList([brief + ": " + data["value"]]))
+                        configuration_item = QTreeWidgetItem(moduleItem, QStringList([brief + ": " + configurations[information["configuration"]][property]["value"]]))
         for key, value in module_categories.items():
             category_item = QTreeWidgetItem(module_title, QStringList([key]))
             category_item.addChildren(value)
         top_level.append(module_title)
         self.pageContent.summaryTree.insertTopLevelItems(0, top_level)
-    
-    def _connectSignals(self):
-        self.connect(self.pageContent.createButton, SIGNAL("clicked(bool)"), self._createProject)
-    
-    def _createProject(self):
-        QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
-        self._confirm_group.setVisible(False)
-        bertos_utils.createBertosProject(self.wizard().project())
-        self._final_group.setVisible(True)
-        self._completed = True
-        QApplication.restoreOverrideCursor()
-        self.emit(SIGNAL("completeChanged()"))
-    
-    def isComplete(self):
-        return self._completed
-
-class QWidgetGroup(QObject):
-    """
-    Container class, this class contains widgets and permit to set some
-    properties of the contained widgets at the same time.
-    """
-    def __init__(self, *elements):
-        self._widgets = []
-        for element in elements:
-            self._widgets.append(element)
-    
-    def addWidget(self, widget):
-        if widget not in self._widgets:
-            self._widgets.append(widget)
-    
-    def setVisible(self, visible):
-        for widget in self._widgets:
-            widget.setVisible(visible)
-    
-    def isVisible(self):
-        for widget in self._widgets:
-            if not widget.isVisible():
-                return False
-        return True