X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBToolchainPage.py;h=567fbcee11e0f3b2607b1a7ce1ef4651d66efc2e;hb=d5403b5adfbe4ef86d77498932bbf514143bb842;hp=c3756261e8708d71534b7194b98b01fb3b331fd5;hpb=f84a93605a71e983cc4f84cae1241a6306cb58a3;p=bertos.git diff --git a/wizard/BToolchainPage.py b/wizard/BToolchainPage.py index c3756261..567fbcee 100644 --- a/wizard/BToolchainPage.py +++ b/wizard/BToolchainPage.py @@ -9,7 +9,10 @@ # Author: Lorenzo Berni # +import os + from BWizardPage import * +import BToolchainSearch import bertos_utils class BToolchainPage(BWizardPage): @@ -17,24 +20,10 @@ class BToolchainPage(BWizardPage): def __init__(self): BWizardPage.__init__(self, "toolchain_select.ui") self.setTitle(self.tr("Select toolchain")) - self._setupUi() + self._validationProcess = None 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,67 +40,46 @@ 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): + dirList = [unicode(element.toString()) for element in self._settingsRetrieve("search_dir_list").toList()] + if(self._settingsRetrieve("path_search").toBool()): + dirList += [element for element in bertos_utils.getSystemPath()] + toolchainList = bertos_utils.findToolchains(dirList) + storedToolchainList = self._settingsRetrieve("toolchains").toList() + storedToolchainList = set([unicode(toolchain.toString()) for toolchain in storedToolchainList]) + toolchainList =set(toolchainList) - set(storedToolchainList) + for element in toolchainList: + item = QListWidgetItem(element) + item.setData(Qt.UserRole, QVariant(element)) + self.pageContent.toolchainList.addItem(item) + self._settingsStore("toolchains", list(toolchainList.union(storedToolchainList))) + 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) + self.connect(self.pageContent.searchButton, SIGNAL("clicked()"), self.searchToolchain) + self.connect(self.pageContent.checkButton, SIGNAL("clicked()"), self.validateToolchains) - 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() + def _validItem(self, index, infos): + item = self.pageContent.toolchainList.item(index) + needed = self._projectInfoRetrieve("CPU_INFOS") + if infos["target"].find(unicode(needed[QString("TOOLCHAIN")].toString())) != -1: + item.setIcon(QIcon(":/images/ok.png")) + else: + item.setIcon(QIcon(":/images/warning.png")) + item.setText(infos["version"] + " " + infos["target"]) + + def _invalidItem(self, index): + item = self.pageContent.toolchainList.item(index) + item.setIcon(QIcon(":/images/error.png")) def addToolchain(self): sel_toolchain = QFileDialog.getOpenFileName(self, self.tr("Choose the toolchain"), "") @@ -128,27 +96,31 @@ class BToolchainPage(BWizardPage): item = self.pageContent.toolchainList.takeItem(self.pageContent.toolchainList.currentRow()) item = item.data(Qt.UserRole).toString() toolchains = self._settingsRetrieve("toolchains").toList() - toolchains = [toolchain.toString() for toolchain in toolchains] + toolchains = [unicode(toolchain.toString()) for toolchain in toolchains] 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 searchToolchain(self): + search = BToolchainSearch.BToolchainSearch() + self.connect(search, SIGNAL("accepted()"), self._search) + search.exec_() - 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 validateToolchains(self): + for i in range(self.pageContent.toolchainList.count()): + filename = unicode(self.pageContent.toolchainList.item(i).data(Qt.UserRole).toString()) + self._validationProcess = QProcess() + self._validationProcess.start(filename, ["-v"]) + self._validationProcess.waitForStarted(1000) + if self._validationProcess.waitForFinished(200): + description = str(self._validationProcess.readAllStandardError()) + infos = bertos_utils.getToolchainInfo(description) + if len(infos.keys()) == 4: + self._validItem(i, infos) + else: + self._invalidItem(i) + else: + self._validationProcess.kill() + self._invalidItem(i) def isComplete(self): if self.pageContent.toolchainList.currentRow() != -1: