Change the fillPropertyTable method

[bertos.git] / wizard / BToolchainPage.py

diff --git a/wizard/BToolchainPage.py b/wizard/BToolchainPage.py
index f76c70c14ba94d8708873f3693a451c58e91928f..0922d5b5529bd1e33a5ae0ce28cd1441d12dc309 100644 (file)
--- a/wizard/BToolchainPage.py
+++ b/wizard/BToolchainPage.py
@@ -17,10 +17,12 @@ import BToolchainSearch
 import bertos_utils
 import qvariant_converter
 
+from const import *
+
 class BToolchainPage(BWizardPage):
     
     def __init__(self):
-        BWizardPage.__init__(self, "toolchain_select.ui")
+        BWizardPage.__init__(self, UI_LOCATION + "/toolchain_select.ui")
         self.setTitle(self.tr("Select toolchain"))
         self._validationProcess = None
         self._updateUi()
@@ -76,7 +78,7 @@ class BToolchainPage(BWizardPage):
         newData.update(infos)
         item.setData(Qt.UserRole, qvariant_converter.convertStringDict(newData))
         needed = self._projectInfoRetrieve("CPU_INFOS")
-        if infos["target"].find(qvariant_converter.getString(needed["TOOLCHAIN"])) != -1:
+        if infos["target"].find(needed["TOOLCHAIN"]) != -1:
             item.setIcon(QIcon(":/images/ok.png"))
         else:
             item.setIcon(QIcon(":/images/warning.png"))
@@ -99,7 +101,7 @@ class BToolchainPage(BWizardPage):
     def removeToolchain(self):
         if self.pageContent.toolchainList.currentRow() != -1:
             item = self.pageContent.toolchainList.takeItem(self.pageContent.toolchainList.currentRow())
-            toolchain = qvariant_converter.getString(qvariant_converter.getStringDict(item.data(Qt.UserRole))["path"])
+            toolchain = qvariant_converter.getStringDict(item.data(Qt.UserRole))["path"]
             toolchains = self.toolchains()
             del toolchains[toolchain]
             self.setToolchains(toolchains)