self.pageContent.doSearchButton.setEnabled(False)
def _populateToolchainList(self):
- toolchains = qvariant_converter.getStringList(self._settingsRetrieve("toolchains"))
+ toolchains = self.toolchains()
for element in toolchains:
item = QListWidgetItem(element)
- item.setData(Qt.UserRole, QVariant(element))
+ item.setData(Qt.UserRole, qvariant_converter.convertString(element))
self.pageContent.toolchainList.addItem(item)
def _clearList(self):
self.emit(SIGNAL("completeChanged()"))
def _search(self):
- dirList = qvariant_converter.getStringList(self._settingsRetrieve("search_dir_list"))
- if(qvariant_converter.getBool(self._settingsRetrieve("path_search"))):
+ dirList = self.searchDirList()
+ if(self.pathSearch()):
dirList += [element for element in bertos_utils.getSystemPath()]
toolchainList = bertos_utils.findToolchains(dirList)
- storedToolchainList = qvariant_converter.getStringList(self._settingsRetrieve("toolchains"))
+ storedToolchainList = self.toolchains()
toolchainList = set(toolchainList) - set(storedToolchainList)
for element in toolchainList:
item = QListWidgetItem(element)
- item.setData(Qt.UserRole, QVariant(element))
+ item.setData(Qt.UserRole, qvariant_converter.convertString(element))
self.pageContent.toolchainList.addItem(item)
- self._settingsStore("toolchains", list(toolchainList.union(storedToolchainList)))
+ self.setToolchains(list(toolchainList.union(storedToolchainList)))
def _connectSignals(self):
self.connect(self.pageContent.toolchainList, SIGNAL("itemSelectionChanged()"), self._selectionChanged)
item.setIcon(QIcon(":/images/ok.png"))
else:
item.setIcon(QIcon(":/images/warning.png"))
- item.setText(infos["version"] + " " + infos["target"])
+ item.setText("GCC " + infos["version"] + " " + infos["target"])
def _invalidItem(self, index):
item = self.pageContent.toolchainList.item(index)
sel_toolchain = QFileDialog.getOpenFileName(self, self.tr("Choose the toolchain"), "")
if not sel_toolchain.isEmpty():
item = QListWidgetItem(sel_toolchain)
- item.setData(Qt.UserRole, QVariant(sel_toolchain))
+ item.setData(Qt.UserRole, qvariant_converter.convertString(sel_toolchain))
self.pageContent.toolchainList.addItem(item)
- toolchains = qvariant_convert.getStringList(self._settingsRetrieve("toolchains"))
+ toolchains = self.toolchains()
toolchains = set(toolchains + [sel_toolchain])
- self._settingsStore("toolchains", list(toolchains))
+ self.setToolchains(list(toolchains))
def removeToolchain(self):
if self.pageContent.toolchainList.currentRow() != -1:
item = self.pageContent.toolchainList.takeItem(self.pageContent.toolchainList.currentRow())
toolchain = qvariant_converter.getString(item.data(Qt.UserRole))
- toolchains = qvariant_converter.getStringList(self._settingsRetrieve("toolchains"))
+ toolchains = self.toolchains()
toolchains.remove(toolchain)
- self._settingsStore("toolchains", toolchains)
+ self.setToolchains(toolchains)
def searchToolchain(self):
search = BToolchainSearch.BToolchainSearch()
if self._validationProcess.waitForFinished(200):
description = str(self._validationProcess.readAllStandardError())
infos = bertos_utils.getToolchainInfo(description)
- if len(infos.keys()) == 4:
+ if len(infos.keys()) >= 4:
self._validItem(i, infos)
else:
self._invalidItem(i)