X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=wizard%2FBToolchainPage.py;h=d9ea7687da2f0b27c9918ff00558b468c1db6824;hb=dd721d44c920f204cef12601141a609a87ab4398;hp=567fbcee11e0f3b2607b1a7ce1ef4651d66efc2e;hpb=595b7ac4403cebcc30244eebc14b31e487d1da16;p=bertos.git

diff --git a/wizard/BToolchainPage.py b/wizard/BToolchainPage.py
index 567fbcee..d9ea7687 100644
--- a/wizard/BToolchainPage.py
+++ b/wizard/BToolchainPage.py
@@ -14,6 +14,7 @@ import os
 from BWizardPage import *
 import BToolchainSearch
 import bertos_utils
+import qvariant_converter
 
 class BToolchainPage(BWizardPage):
     
@@ -35,10 +36,10 @@ class BToolchainPage(BWizardPage):
             self.pageContent.doSearchButton.setEnabled(False)
     
     def _populateToolchainList(self):
-        toolchains = self._settingsRetrieve("toolchains").toList()
+        toolchains = self.toolchains()
         for element in toolchains:
-            item = QListWidgetItem(element.toString())
-            item.setData(Qt.UserRole, element)
+            item = QListWidgetItem(element)
+            item.setData(Qt.UserRole, qvariant_converter.convertString(element))
             self.pageContent.toolchainList.addItem(item)
             
     def _clearList(self):
@@ -48,18 +49,17 @@ class BToolchainPage(BWizardPage):
         self.emit(SIGNAL("completeChanged()"))
     
     def _search(self):
-        dirList = [unicode(element.toString()) for element in self._settingsRetrieve("search_dir_list").toList()]
-        if(self._settingsRetrieve("path_search").toBool()):
+        dirList = self.searchDirList()
+        if(self.pathSearch()):
             dirList += [element for element in bertos_utils.getSystemPath()]
         toolchainList = bertos_utils.findToolchains(dirList)
-        storedToolchainList = self._settingsRetrieve("toolchains").toList()
-        storedToolchainList = set([unicode(toolchain.toString()) for toolchain in storedToolchainList])
-        toolchainList =set(toolchainList) - set(storedToolchainList)
+        storedToolchainList = self.toolchains()
+        toolchainList = set(toolchainList) - set(storedToolchainList)
         for element in toolchainList:
             item = QListWidgetItem(element)
-            item.setData(Qt.UserRole, QVariant(element))
+            item.setData(Qt.UserRole, qvariant_converter.convertString(element))
             self.pageContent.toolchainList.addItem(item)
-        self._settingsStore("toolchains", list(toolchainList.union(storedToolchainList)))
+        self.setToolchains(list(toolchainList.union(storedToolchainList)))
         
     def _connectSignals(self):
         self.connect(self.pageContent.toolchainList, SIGNAL("itemSelectionChanged()"), self._selectionChanged)
@@ -71,11 +71,11 @@ class BToolchainPage(BWizardPage):
     def _validItem(self, index, infos):
         item = self.pageContent.toolchainList.item(index)
         needed = self._projectInfoRetrieve("CPU_INFOS")
-        if infos["target"].find(unicode(needed[QString("TOOLCHAIN")].toString())) != -1:
+        if infos["target"].find(needed["TOOLCHAIN"]) != -1:
             item.setIcon(QIcon(":/images/ok.png"))
         else:
             item.setIcon(QIcon(":/images/warning.png"))
-        item.setText(infos["version"] + " " + infos["target"])
+        item.setText("GCC " + infos["version"] + " " + infos["target"])
     
     def _invalidItem(self, index):
         item = self.pageContent.toolchainList.item(index)
@@ -85,20 +85,19 @@ class BToolchainPage(BWizardPage):
         sel_toolchain = QFileDialog.getOpenFileName(self, self.tr("Choose the toolchain"), "")
         if not sel_toolchain.isEmpty():
             item = QListWidgetItem(sel_toolchain)
-            item.setData(Qt.UserRole, QVariant(sel_toolchain))
+            item.setData(Qt.UserRole, qvariant_converter.convertString(sel_toolchain))
             self.pageContent.toolchainList.addItem(item)
-            toolchains = self._settingsRetrieve("toolchains").toList()
-            toolchains = set([toolchain.toString() for toolchain in toolchains] + [sel_toolchain])
-            self._settingsStore("toolchains", list(toolchains))
+            toolchains = self.toolchains()
+            toolchains = set(toolchains + [sel_toolchain])
+            self.setToolchains(list(toolchains))
     
     def removeToolchain(self):
         if self.pageContent.toolchainList.currentRow() != -1:
             item = self.pageContent.toolchainList.takeItem(self.pageContent.toolchainList.currentRow())
-            item = item.data(Qt.UserRole).toString()
-            toolchains = self._settingsRetrieve("toolchains").toList()
-            toolchains = [unicode(toolchain.toString()) for toolchain in toolchains]
-            toolchains.remove(unicode(item))
-            self._settingsStore("toolchains", toolchains)
+            toolchain = qvariant_converter.getString(item.data(Qt.UserRole))
+            toolchains = self.toolchains()
+            toolchains.remove(toolchain)
+            self.setToolchains(toolchains)
     
     def searchToolchain(self):
         search = BToolchainSearch.BToolchainSearch()
@@ -107,14 +106,14 @@ class BToolchainPage(BWizardPage):
     
     def validateToolchains(self):
         for i in range(self.pageContent.toolchainList.count()):
-            filename = unicode(self.pageContent.toolchainList.item(i).data(Qt.UserRole).toString())
+            filename = qvariant_converter.getString(self.pageContent.toolchainList.item(i).data(Qt.UserRole))
             self._validationProcess = QProcess()
             self._validationProcess.start(filename, ["-v"])
             self._validationProcess.waitForStarted(1000)
             if self._validationProcess.waitForFinished(200):
                 description = str(self._validationProcess.readAllStandardError())
                 infos = bertos_utils.getToolchainInfo(description)
-                if len(infos.keys()) == 4:
+                if len(infos.keys()) >= 4:
                     self._validItem(i, infos)
                 else:
                     self._invalidItem(i)
@@ -124,7 +123,8 @@ class BToolchainPage(BWizardPage):
     
     def isComplete(self):
         if self.pageContent.toolchainList.currentRow() != -1:
-            self._projectInfoStore("TOOLCHAIN", self.pageContent.toolchainList.item(self.pageContent.toolchainList.currentRow()).data(Qt.UserRole).toString())
+            self._projectInfoStore("TOOLCHAIN", 
+                qvariant_converter.getString(self.pageContent.toolchainList.item(self.pageContent.toolchainList.currentRow()).data(Qt.UserRole)))
             return True
         else:
             return False
\ No newline at end of file