X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBToolchainPage.py;h=b344ce2536baf38cfede2ba922c63535174d7190;hb=03fc128d13180a389d42c9720882187c21e8f6ed;hp=b3acb4d97622aaf567173497eeedf5d3cf1701c4;hpb=147451dc3bd84ba979b3c55b8dfe0261cccbfb48;p=bertos.git

diff --git a/wizard/BToolchainPage.py b/wizard/BToolchainPage.py
index b3acb4d9..b344ce25 100644
--- a/wizard/BToolchainPage.py
+++ b/wizard/BToolchainPage.py
@@ -10,6 +10,7 @@
 #
 
 from BWizardPage import *
+import BToolchainSearch
 import bertos_utils
 
 class BToolchainPage(BWizardPage):
@@ -17,24 +18,9 @@ class BToolchainPage(BWizardPage):
     def __init__(self):
         BWizardPage.__init__(self, "toolchain_select.ui")
         self.setTitle(self.tr("Select toolchain"))
-        self._setupUi()
         self._populateToolchainList()
-        self._populateDirList()
         self._connectSignals()
     
-    def _setupUi(self):
-        path = self._settingsRetrieve("path_search").toBool()
-        if not path is None:
-            self.pageContent.pathBox.setChecked(path)
-        else:
-            self.pageContent.pathBox.setChecked(False)
-        customPath = self._settingsRetrieve("custom_dir").toBool()
-        if not customPath is None:
-            self.pageContent.customDirBox.setChecked(customPath)
-        else:
-            self.pageContent.customDirBox.setChecked(False)
-        self._updateUi()
-    
     def _updateUi(self):
         if self.pageContent.customDirBox.isChecked():
             self._enableCustomDir()
@@ -51,76 +37,31 @@ class BToolchainPage(BWizardPage):
             item = QListWidgetItem(element.toString())
             item.setData(Qt.UserRole, element)
             self.pageContent.toolchainList.addItem(item)
-    
-    def _populateDirList(self):
-        search_dir_list = self._settingsRetrieve("search_dir_list").toList()
-        for element in search_dir_list:
-            item = QListWidgetItem(element.toString())
-            item.setData(Qt.UserRole, element)
-            self.pageContent.customDirList.addItem(item)
-        
-    def _disableCustomDir(self):
-        self.pageContent.customDirList.setEnabled(False)
-        self.pageContent.addDirButton.setEnabled(False)
-        self.pageContent.removeDirButton.setEnabled(False)
-    
-    def _enableCustomDir(self):
-        self.pageContent.customDirList.setEnabled(True)
-        self.pageContent.addDirButton.setEnabled(True)
-        self.pageContent.removeDirButton.setEnabled(True)
-    
+            
     def _clearList(self):
         self.pageContent.toolchainList.clear()
     
     def _selectionChanged(self):
         self.emit(SIGNAL("completeChanged()"))
     
+    def _search(self):
+        pass
+        
     def _connectSignals(self):
-        self.connect(self.pageContent.pathBox, SIGNAL("clicked()"), self._updateUi)
-        self.connect(self.pageContent.customDirBox, SIGNAL("clicked()"), self._updateUi)
-        self.connect(self.pageContent.searchButton, SIGNAL("clicked()"), self.toSearchSubpage)
-        self.connect(self.pageContent.cancelButton, SIGNAL("clicked()"), self.toSelectionSubpage)
-        self.connect(self.pageContent.doSearchButton, SIGNAL("clicked()"), self.doSearch)
-        self.connect(self.pageContent.addDirButton, SIGNAL("clicked()"), self.addDir)
-        self.connect(self.pageContent.removeDirButton, SIGNAL("clicked()"), self.removeDir)
         self.connect(self.pageContent.toolchainList, SIGNAL("itemSelectionChanged()"), self._selectionChanged)
         self.connect(self.pageContent.addButton, SIGNAL("clicked()"), self.addToolchain)
         self.connect(self.pageContent.removeButton, SIGNAL("clicked()"), self.removeToolchain)
-    
-    def toSearchSubpage(self):
-        self.pageContent.pageSelector.setCurrentIndex(1)
-
-    def toSelectionSubpage(self):
-        self.pageContent.pageSelector.setCurrentIndex(0)    
-
-    def doSearch(self):
-        path = []
-        if self.pageContent.pathBox.isChecked():
-            path += bertos_utils.getSystemPath()
-        if self.pageContent.customDirBox.isChecked():
-            for element in range(self.pageContent.customDirList.count()):
-                path += [unicode(self.pageContent.customDirList.item(element).data(Qt.UserRole).toString())]
-        toolchains = bertos_utils.findToolchains(path)
-        toolchains_stored = self._settingsRetrieve("toolchains").toList()
-        toolchains += [unicode(toolchain.toString()) for toolchain in toolchains_stored]
-        toolchains = set(toolchains)
-        toolchains = list(toolchains)
-        self._clearList()
-        for toolchain in toolchains:
-            item = QListWidgetItem(toolchain)
-            item.setData(Qt.UserRole, QVariant(toolchain))
-            self.pageContent.toolchainList.addItem(item)
-        self._settingsStore("toolchains", toolchains)
-        self.toSelectionSubpage()
+        self.connect(self.pageContent.searchButton, SIGNAL("clicked()"), self.searchToolchain)
     
     def addToolchain(self):
         sel_toolchain = QFileDialog.getOpenFileName(self, self.tr("Choose the toolchain"), "")
-        item = QListWidgetItem(sel_toolchain)
-        item.setData(Qt.UserRole, QVariant(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))
+        if not sel_toolchain.isEmpty():
+            item = QListWidgetItem(sel_toolchain)
+            item.setData(Qt.UserRole, QVariant(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))
     
     def removeToolchain(self):
         if self.pageContent.toolchainList.currentRow() != -1:
@@ -131,23 +72,10 @@ class BToolchainPage(BWizardPage):
             toolchains.remove(unicode(item))
             self._settingsStore("toolchains", toolchains)
     
-    def addDir(self):
-        directory = QFileDialog.getExistingDirectory(self, self.tr("Open Directory"), "", QFileDialog.ShowDirsOnly)
-        if not directory.isEmpty():
-            item = QListWidgetItem(directory)
-            item.setData(Qt.UserRole, QVariant(directory))
-            self.pageContent.customDirList.addItem(item)
-            search_dir_list = self._settingsRetrieve("search_dir_list").toList()
-            search_dir_list = set([d.toString() for d in search_dir_list] + [directory])
-            self._settingsStore("search_dir_list", list(search_dir_list))
-    
-    def removeDir(self):
-        if self.pageContent.customDirList.currentRow() != -1:
-            item = self.pageContent.customDirList.takeItem(self.pageContent.customDirList.currentRow())
-            search_dir_list = self._settingsRetrieve("search_dir_list").toList()
-            search_dir_list = set([d.toString() for d in search_dir_list])
-            search_dir_list.remove(item.data(Qt.UserRole).toString())
-            self._settingsStore("search_dir_list", list(search_dir_list))
+    def searchToolchain(self):
+        search = BToolchainSearch.BToolchainSearch()
+        self.connect(search, SIGNAL("accepted()"), self._search)
+        search.exec_()
     
     def isComplete(self):
         if self.pageContent.toolchainList.currentRow() != -1: