X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBCpuPage.py;h=2af1df821f66429327b39ede313afc067798d182;hb=41e39823c216af723fabcce9b56c16b525adde1f;hp=e329dbc866d279557cee07037aa8d92fb0a0415d;hpb=ee276ea346d90090f039720664dbb18d50e6bf7b;p=bertos.git

diff --git a/wizard/BCpuPage.py b/wizard/BCpuPage.py
index e329dbc8..2af1df82 100644
--- a/wizard/BCpuPage.py
+++ b/wizard/BCpuPage.py
@@ -12,15 +12,14 @@
 
 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):
     
     def __init__(self):
-        BWizardPage.__init__(self, "cpu_select.ui")
+        BWizardPage.__init__(self, UI_LOCATION + "/cpu_select.ui")
         self.setTitle(self.tr("Select the CPU"))
         self._connectSignals()
         self._setupUi()
@@ -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.getStringDict(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