X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBCpuPage.py;h=2d616d53fa900d767255c1ea71b4de36338de4a3;hb=f9c2a8d31399f00db0a00891f774d3c50cb489c6;hp=93919c9cf64d7effdd22f9dfb1a4324e83a927c7;hpb=f274955dde1ff30d451d55503ad2c9ef24ebec4f;p=bertos.git

diff --git a/wizard/BCpuPage.py b/wizard/BCpuPage.py
index 93919c9c..2d616d53 100644
--- a/wizard/BCpuPage.py
+++ b/wizard/BCpuPage.py
@@ -12,6 +12,7 @@
 
 from BWizardPage import *
 import bertos_utils
+import qvariant_converter
 
 class BCpuPage(BWizardPage):
     
@@ -27,9 +28,7 @@ class BCpuPage(BWizardPage):
         infos = bertos_utils.loadCpuInfos(self._projectInfoRetrieve("SOURCES_PATH"))
         for cpu in infos:
             item = QListWidgetItem(cpu["CPU_NAME"])
-            # The CPU_DESC field in the cpu definition is a list of string, so we need to 
-            # store it as a QStringList in a QVariant
-            item.setData(Qt.UserRole, QVariant(QStringList(cpu["CPU_DESC"])))
+            item.setData(Qt.UserRole, qvariant_converter.convertDict(cpu))
             self.pageContent.cpuList.addItem(item)
     
     def _connectSignals(self):
@@ -41,6 +40,7 @@ class BCpuPage(BWizardPage):
             self.pageContent.cpuList.setCurrentItem(elements[0])
     
     def _setupUi(self):
+        self.pageContent.cpuList.setSortingEnabled(True)
         self.pageContent.descriptionLabel.setVisible(False)
         self.pageContent.descriptionLabel.setText("")
     
@@ -54,15 +54,14 @@ class BCpuPage(BWizardPage):
     
     def isComplete(self):
         if self.pageContent.cpuList.currentRow() != -1:
-            self._projectInfoStore("CPU_NAME", self.pageContent.cpuList.currentItem().text())
+            self._projectInfoStore("CPU_INFOS", qvariant_converter.getDict(self.pageContent.cpuList.currentItem().data(Qt.UserRole)))
             return True
         else:
             return False
         
     def rowChanged(self):
-        description = self.pageContent.cpuList.currentItem().data(Qt.UserRole).toStringList()
-        # We need to convert the list of QString in a list of unicode
-        description =  [unicode(line) for line in description]
+        description = qvariant_converter.getDict(self.pageContent.cpuList.currentItem().data(Qt.UserRole))["CPU_DESC"]
+        description = qvariant_converter.getStringList(description)
         self.pageContent.descriptionLabel.setText("<br>".join(description))
         self.pageContent.descriptionLabel.setVisible(True)
         self.emit(SIGNAL("completeChanged()"))