Strip the gcc output

[bertos.git] / wizard / BCreationPage.py

diff --git a/wizard/BCreationPage.py b/wizard/BCreationPage.py
index e40db963a2aacb71ffa5cb841f0a8030263eb079..1e2f7fdc4723d488425329b5ad7cf572cde56ea0 100644 (file)
--- a/wizard/BCreationPage.py
+++ b/wizard/BCreationPage.py
@@ -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,14 +50,14 @@ 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 "target" in toolchain_info:
+            toolchain_target = QTreeWidgetItem(toolchain_title, QStringList([self.tr("target: " + toolchain_info["target"].strip())]))
         version = ""
-        if "version" in toolchain_info.keys():
-            version += "version: " + "GCC " + toolchain_info["version"] + " "
-        if "build" in toolchain_info.keys():
-            version += "(" + toolchain_info["build"] + ")"
-        if "version" in toolchain_info.keys():
+        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)
@@ -66,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)