X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBCreationPage.py;h=2c4cb9a36d6dee85a0fe8a09ea388093aada13a6;hb=efb100c4cfb9fa25aa16bb3f336cd29e423abcf2;hp=e865a2cc2d89c757a7b41185f15c33a679a7dc5c;hpb=97903dc626136396587334b1d78f7623c91e9934;p=bertos.git

diff --git a/wizard/BCreationPage.py b/wizard/BCreationPage.py
index e865a2cc..2c4cb9a3 100644
--- a/wizard/BCreationPage.py
+++ b/wizard/BCreationPage.py
@@ -4,7 +4,7 @@
 # Copyright 2009 Develer S.r.l. (http://www.develer.com/)
 # All rights reserved.
 #
-# $Id:$
+# $Id$
 #
 # Author: Lorenzo Berni <duplo@develer.com>
 #
@@ -22,7 +22,7 @@ class BCreationPage(BWizardPage):
     
     def __init__(self):
         BWizardPage.__init__(self, UI_LOCATION + "/project_creation.ui")
-        self.setTitle(self.tr("Create the BeRTOS project"))
+        self.setTitle(self.tr("Settings summary"))
         self._completed = False
 
     ## Overloaded BWizardPage methods ##
@@ -50,10 +50,15 @@ class BCreationPage(BWizardPage):
         top_level.append(cpu_title)
         toolchain_title = QTreeWidgetItem(QStringList([self.tr("Toolchain")]))
         toolchain_info = self.projectInfo("TOOLCHAIN")
-        if "target" in toolchain_info.keys():
-            toolchain_target = QTreeWidgetItem(toolchain_title, QStringList([self.tr("target: " + toolchain_info["target"])]))
-        if "version" in toolchain_info.keys():
-            toolchain_target = QTreeWidgetItem(toolchain_title, QStringList([self.tr("version: " + "GCC " + toolchain_info["version"] + " (" + toolchain_info["build"] + ")")]))
+        if "target" in toolchain_info:
+            toolchain_target = QTreeWidgetItem(toolchain_title, QStringList([self.tr("target: " + toolchain_info["target"].strip())]))
+        version = ""
+        if "version" in toolchain_info:
+            version += "version: " + "GCC " + toolchain_info["version"].strip() + " "
+        if "build" in toolchain_info:
+            version += "(" + toolchain_info["build"].strip() + ")"
+        if "version" in toolchain_info:
+            toolchain_target = QTreeWidgetItem(toolchain_title, QStringList([version]))
         toolchain_path = QTreeWidgetItem(toolchain_title, QStringList([self.tr("path: " + os.path.normpath(toolchain_info["path"]))]))
         top_level.append(toolchain_title)
         module_title = QTreeWidgetItem(QStringList([self.tr("Modules")]))
@@ -61,7 +66,7 @@ class BCreationPage(BWizardPage):
         module_categories = {}
         for module, information in self.projectInfo("MODULES").items():
             if information["enabled"]:
-                if information["category"] not in module_categories.keys():
+                if information["category"] not in module_categories:
                     module_categories[information["category"]] = []
                 moduleItem = QTreeWidgetItem(QStringList([module + " - " + information["description"]]))
                 module_categories[information["category"]].append(moduleItem)
@@ -77,5 +82,7 @@ class BCreationPage(BWizardPage):
             category_item.addChildren(value)
         top_level.append(module_title)
         self.pageContent.summaryTree.insertTopLevelItems(0, top_level)
+        for item in top_level:
+            self.pageContent.summaryTree.expandItem(item)
     
     ####
\ No newline at end of file