X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBCpuPage.py;h=8323b1281946ef07ce7e8859e192dcbb31df5bcc;hb=1e209f4e383e78f1c06810d95b175c591e40e1e2;hp=6289efd839f4701885421139482eaf166efd8d60;hpb=3443db30df3da92f9842fbc198e0090d55aee676;p=bertos.git

diff --git a/wizard/BCpuPage.py b/wizard/BCpuPage.py
index 6289efd8..8323b128 100644
--- a/wizard/BCpuPage.py
+++ b/wizard/BCpuPage.py
@@ -12,10 +12,9 @@
 
 from BWizardPage import *
 import bertos_utils
-if PYQT_VERSION_STR > "4.4.3":
-    import qvariant_converter_new as qvariant_converter
-else:
-    import qvariant_converter_old as qvariant_converter
+import qvariant_converter
+
+from const import *
 
 class BCpuPage(BWizardPage):
     
@@ -43,6 +42,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("")
     
@@ -56,7 +56,13 @@ class BCpuPage(BWizardPage):
     
     def isComplete(self):
         if self.pageContent.cpuList.currentRow() != -1:
-            self._projectInfoStore("CPU_INFOS", qvariant_converter.getDict(self.pageContent.cpuList.currentItem().data(Qt.UserRole)))
+            infos = qvariant_converter.getDict(self.pageContent.cpuList.currentItem().data(Qt.UserRole))
+            for key, value in infos.items():
+                if type(CPU_DEF[key]) == list:
+                    infos[key] = qvariant_converter.getStringList(value)
+                if type(CPU_DEF[key]) == str or type(CPU_DEF) == unicode:
+                    infos[key] = qvariant_converter.getString(value)
+            self._projectInfoStore("CPU_INFOS", infos)
             return True
         else:
             return False