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

diff --git a/wizard/BToolchainPage.py b/wizard/BToolchainPage.py
index 346eb648..d9ea7687 100644
--- a/wizard/BToolchainPage.py
+++ b/wizard/BToolchainPage.py
@@ -36,10 +36,10 @@ class BToolchainPage(BWizardPage):
             self.pageContent.doSearchButton.setEnabled(False)
     
     def _populateToolchainList(self):
-        toolchains = qvariant_converter.getStringList(self._settingsRetrieve("toolchains"))
+        toolchains = self.toolchains()
         for element in toolchains:
             item = QListWidgetItem(element)
-            item.setData(Qt.UserRole, QVariant(element))
+            item.setData(Qt.UserRole, qvariant_converter.convertString(element))
             self.pageContent.toolchainList.addItem(item)
             
     def _clearList(self):
@@ -49,17 +49,17 @@ class BToolchainPage(BWizardPage):
         self.emit(SIGNAL("completeChanged()"))
     
     def _search(self):
-        dirList = qvariant_converter.getStringList(self._settingsRetrieve("search_dir_list"))
-        if(qvariant_converter.getBool(self._settingsRetrieve("path_search"))):
+        dirList = self.searchDirList()
+        if(self.pathSearch()):
             dirList += [element for element in bertos_utils.getSystemPath()]
         toolchainList = bertos_utils.findToolchains(dirList)
-        storedToolchainList = qvariant_converter.getStringList(self._settingsRetrieve("toolchains"))
+        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)
@@ -75,7 +75,7 @@ class BToolchainPage(BWizardPage):
             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,19 +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 = qvariant_convert.getStringList(self._settingsRetrieve("toolchains"))
+            toolchains = self.toolchains()
             toolchains = set(toolchains + [sel_toolchain])
-            self._settingsStore("toolchains", list(toolchains))
+            self.setToolchains(list(toolchains))
     
     def removeToolchain(self):
         if self.pageContent.toolchainList.currentRow() != -1:
             item = self.pageContent.toolchainList.takeItem(self.pageContent.toolchainList.currentRow())
             toolchain = qvariant_converter.getString(item.data(Qt.UserRole))
-            toolchains = qvariant_converter.getStringList(self._settingsRetrieve("toolchains"))
+            toolchains = self.toolchains()
             toolchains.remove(toolchain)
-            self._settingsStore("toolchains", toolchains)
+            self.setToolchains(toolchains)
     
     def searchToolchain(self):
         search = BToolchainSearch.BToolchainSearch()
@@ -113,7 +113,7 @@ class BToolchainPage(BWizardPage):
             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)