Update to new kernel config; use cpu_relax().

[bertos.git] / wizard / BToolchainSearch.py

diff --git a/wizard/BToolchainSearch.py b/wizard/BToolchainSearch.py
index b568dea235766e8be89fab9d2a4e89ff0381bd29..0290c0eaecc53849b5e24db5f46226820e0c8550 100644 (file)
--- a/wizard/BToolchainSearch.py
+++ b/wizard/BToolchainSearch.py
@@ -15,6 +15,8 @@ import PyQt4.uic as uic
 
 import qvariant_converter
 
+from const import *
+
 class BToolchainSearch(QDialog):
     
     def __init__(self):
@@ -24,7 +26,7 @@ class BToolchainSearch(QDialog):
         self.setWindowTitle(self.tr("Toolchain search page"))
     
     def _setupUi(self):
-        self.content = uic.loadUi("toolchain_search.ui", None)
+        self.content = uic.loadUi(UI_LOCATION + "/toolchain_search.ui", None)
         layout = QVBoxLayout()
         layout.addWidget(self.content)
         self.setLayout(layout)
@@ -63,9 +65,9 @@ class BToolchainSearch(QDialog):
             directory = unicode(directory)
             item = QListWidgetItem(directory)
             self.content.customDirList.addItem(item)
-            search_dir_list = qvariant_conveter.getStringList(QApplication.instance().settings.value("search_dir_list"))
+            search_dir_list = qvariant_converter.getStringList(QApplication.instance().settings.value("search_dir_list"))
             search_dir_list = set(search_dir_list + [directory])
-            QApplication.instance().settings.setValue(QString("search_dir_list"), QVariant(list(search_dir_list)))
+            QApplication.instance().settings.setValue(QString("search_dir_list"), qvariant_converter.convertStringList(list(search_dir_list)))
             self._setSearchButton()
     
     def _removeDir(self):
@@ -73,7 +75,7 @@ class BToolchainSearch(QDialog):
             item = self.content.customDirList.takeItem(self.content.customDirList.currentRow())
             search_dir_list = qvariant_converter.getStringList(QApplication.instance().settings.value(QString("search_dir_list")))
             search_dir_list = set(search_dir_list)
-            search_dir_list.remove(item.text())
-            QApplication.instance().settings.setValue(QString("search_dir_list"), QVariant(list(search_dir_list)))
+            search_dir_list.remove(unicode(item.text()))
+            QApplication.instance().settings.setValue(QString("search_dir_list"), qvariant_converter.convertStringList(list(search_dir_list)))
             self._setSearchButton()
     
\ No newline at end of file