X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBToolchainSearch.py;h=0290c0eaecc53849b5e24db5f46226820e0c8550;hb=e80b8410edc8e74e94662722194d1cfddbb19ec5;hp=614eddff682fb725e05677acc13dd246f77b36be;hpb=73f1c621ec1c4054d533cdad5bb066b407b829e6;p=bertos.git

diff --git a/wizard/BToolchainSearch.py b/wizard/BToolchainSearch.py
index 614eddff..0290c0ea 100644
--- a/wizard/BToolchainSearch.py
+++ b/wizard/BToolchainSearch.py
@@ -13,6 +13,10 @@ from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 import PyQt4.uic as uic
 
+import qvariant_converter
+
+from const import *
+
 class BToolchainSearch(QDialog):
     
     def __init__(self):
@@ -22,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)
@@ -42,13 +46,13 @@ class BToolchainSearch(QDialog):
         self.content.searchButton.setEnabled(self.content.pathBox.isChecked() or self.content.customDirList.count() != 0)
     
     def _populateDirList(self):
-        search_dir_list = QApplication.instance().settings.value(QString("search_dir_list")).toList()
+        search_dir_list = qvariant_converter.getStringList(QApplication.instance().settings.value("search_dir_list"))
         for element in search_dir_list:
-            item = QListWidgetItem(unicode(element.toString()))
+            item = QListWidgetItem(element)
             self.content.customDirList.addItem(item)
     
     def _setPathSearch(self):
-        pathSearch = QApplication.instance().settings.value(QString("path_search")).toBool()
+        pathSearch = qvariant_converter.getBool(QApplication.instance().settings.value(QString("path_search")))
         self.content.pathBox.setChecked(pathSearch)
     
     def _stateChanged(self, state):
@@ -58,19 +62,20 @@ class BToolchainSearch(QDialog):
     def _addDir(self):
         directory = QFileDialog.getExistingDirectory(self, self.tr("Open Directory"), "", QFileDialog.ShowDirsOnly)
         if not directory.isEmpty():
+            directory = unicode(directory)
             item = QListWidgetItem(directory)
             self.content.customDirList.addItem(item)
-            search_dir_list = QApplication.instance().settings.value(QString("search_dir_list")).toList()
-            search_dir_list = set([d.toString() for d in search_dir_list] + [directory])
-            QApplication.instance().settings.setValue(QString("search_dir_list"), QVariant(list(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_converter.convertStringList(list(search_dir_list)))
             self._setSearchButton()
     
     def _removeDir(self):
         if self.content.customDirList.currentRow() != -1:
             item = self.content.customDirList.takeItem(self.content.customDirList.currentRow())
-            search_dir_list = QApplication.instance().settings.value(QString("search_dir_list")).toList()
-            search_dir_list = set([d.toString() for d in 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 = qvariant_converter.getStringList(QApplication.instance().settings.value(QString("search_dir_list")))
+            search_dir_list = set(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