X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBCreationPage.py;h=42a419cb22fcc1d144311e4e303bda5244ee84da;hb=e80b8410edc8e74e94662722194d1cfddbb19ec5;hp=e83f45948c1ad70eb22e823767a464bbd4daeb4a;hpb=920eb05b3142d4315a694bbce9433cb95955c754;p=bertos.git

diff --git a/wizard/BCreationPage.py b/wizard/BCreationPage.py
index e83f4594..42a419cb 100644
--- a/wizard/BCreationPage.py
+++ b/wizard/BCreationPage.py
@@ -9,6 +9,8 @@
 # Author: Lorenzo Berni <duplo@develer.com>
 #
 
+import os
+
 from PyQt4.QtGui import *
 
 from BWizardPage import *
@@ -41,12 +43,12 @@ class BCreationPage(BWizardPage):
         self.pageContent.summaryTree.clear()
         topLevel = []
         folderTitle = QTreeWidgetItem(QStringList([self.tr("Project folder")]))
-        folderItem = QTreeWidgetItem(folderTitle, QStringList([self._projectInfoRetrieve("PROJECT_PATH")]))
+        folderItem = QTreeWidgetItem(folderTitle, QStringList([os.path.normpath(self._projectInfoRetrieve("PROJECT_PATH"))]))
         topLevel.append(folderTitle)
         versionTitle = QTreeWidgetItem(QStringList([self.tr("BeRTOS version")]))
         sources_path = self._projectInfoRetrieve("SOURCES_PATH")
         version = QTreeWidgetItem(versionTitle, QStringList([self.tr("version: ") + bertos_utils.bertosVersion(sources_path)]))
-        sourcePath = QTreeWidgetItem(versionTitle, QStringList([self.tr("path: ") + sources_path]))
+        sourcePath = QTreeWidgetItem(versionTitle, QStringList([self.tr("path: ") + os.path.normpath(sources_path)]))
         topLevel.append(versionTitle)
         cpuTitle = QTreeWidgetItem(QStringList([self.tr("CPU")]))
         cpuName = QTreeWidgetItem(cpuTitle, QStringList([self.tr("cpu name: ") + self._projectInfoRetrieve("CPU_NAME")]))
@@ -57,16 +59,27 @@ class BCreationPage(BWizardPage):
             toolchainTarget = QTreeWidgetItem(toolchainTitle, QStringList([self.tr("target: " + toolchainInfo["target"])]))
         if "version" in toolchainInfo.keys():
             toolchainTarget = QTreeWidgetItem(toolchainTitle, QStringList([self.tr("version: " + "GCC " + toolchainInfo["version"] + " (" + toolchainInfo["build"] + ")")]))
-        toolchainPath = QTreeWidgetItem(toolchainTitle, QStringList([self.tr("path: " + toolchainInfo["path"])]))
+        toolchainPath = QTreeWidgetItem(toolchainTitle, QStringList([self.tr("path: " + os.path.normpath(toolchainInfo["path"]))]))
         topLevel.append(toolchainTitle)
         moduleTitle = QTreeWidgetItem(QStringList([self.tr("Modules")]))
         configurations = self._projectInfoRetrieve("CONFIGURATIONS")
+        moduleCategories = {}
         for module, information in self._projectInfoRetrieve("MODULES").items():
             if information["enabled"]:
-                moduleItem = QTreeWidgetItem(moduleTitle, QStringList([module + " - " + information["description"]]))
+                if information["category"] not in moduleCategories.keys():
+                    moduleCategories[information["category"]] = []
+                moduleItem = QTreeWidgetItem(QStringList([module + " - " + information["description"]]))
+                moduleCategories[information["category"]].append(moduleItem)
                 if len(information["configuration"]) > 0:
                     for property, data in configurations[information["configuration"]].items():
-                        configurationItem = QTreeWidgetItem(moduleItem, QStringList([data["brief"] + " " + data["value"]]))
+                        # If the final char of the brief is a dot (".") removes it.
+                        brief = data["brief"]
+                        if brief[-1] == ".":
+                            brief = brief[:-1]
+                        configurationItem = QTreeWidgetItem(moduleItem, QStringList([brief + ": " + data["value"]]))
+        for key, value in moduleCategories.items():
+            categoryItem = QTreeWidgetItem(moduleTitle, QStringList([key]))
+            categoryItem.addChildren(value)
         topLevel.append(moduleTitle)
         self.pageContent.summaryTree.insertTopLevelItems(0, topLevel)