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

diff --git a/wizard/BCpuPage.py b/wizard/BCpuPage.py
index 03ef2cc0..e329dbc8 100644
--- a/wizard/BCpuPage.py
+++ b/wizard/BCpuPage.py
@@ -12,18 +12,58 @@
 
 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
 
 class BCpuPage(BWizardPage):
     
     def __init__(self):
         BWizardPage.__init__(self, "cpu_select.ui")
         self.setTitle(self.tr("Select the CPU"))
+        self._connectSignals()
+        self._setupUi()
     
     def _populateCpuList(self):
-        cpus = bertos_utils.findDefinitions("cdef", self._projectInfoRetrieve("SOURCES_PATH"))
-        for cpu in cpus.keys():
-            self.pageContent.cpuList.addItem(QListWidgetItem(cpu))
+        self.pageContent.cpuList.clear()
+        self.pageContent.cpuList.setCurrentItem(None)
+        infos = bertos_utils.loadCpuInfos(self._projectInfoRetrieve("SOURCES_PATH"))
+        for cpu in infos:
+            item = QListWidgetItem(cpu["CPU_NAME"])
+            item.setData(Qt.UserRole, qvariant_converter.convertDict(cpu))
+            self.pageContent.cpuList.addItem(item)
+    
+    def _connectSignals(self):
+        self.connect(self.pageContent.cpuList, SIGNAL("itemSelectionChanged()"), self.rowChanged)
+    
+    def _selectItem(self, cpu):
+        elements = self.pageContent.cpuList.findItems(cpu, Qt.MatchCaseSensitive)
+        if len(elements) == 1:
+            self.pageContent.cpuList.setCurrentItem(elements[0])
+    
+    def _setupUi(self):
+        self.pageContent.descriptionLabel.setVisible(False)
+        self.pageContent.descriptionLabel.setText("")
     
     def reloadData(self):
         self._populateCpuList()
-        
\ No newline at end of file
+        cpuName = self._projectInfoRetrieve("CPU_NAME")
+        self._setupUi()
+        if not cpuName is None:
+            self._selectItem(cpuName)
+        self.emit(SIGNAL("completeChanged()"))
+    
+    def isComplete(self):
+        if self.pageContent.cpuList.currentRow() != -1:
+            self._projectInfoStore("CPU_INFOS", qvariant_converter.getStringDict(self.pageContent.cpuList.currentItem().data(Qt.UserRole)))
+            return True
+        else:
+            return False
+        
+    def rowChanged(self):
+        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()"))