X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBToolchainPage.py;h=2587cf2019bc9fd768baf199c7b4aa870db12f90;hb=a8fcfb6e93a2bd82ece8953a282c7e28914a646d;hp=8988ed5741b3a87194ca5045bd075c59346aa5dd;hpb=d33cc3bc1a94318cdf7624edb613eb6771a2fcb9;p=bertos.git

diff --git a/wizard/BToolchainPage.py b/wizard/BToolchainPage.py
index 8988ed57..2587cf20 100644
--- a/wizard/BToolchainPage.py
+++ b/wizard/BToolchainPage.py
@@ -4,7 +4,7 @@
 # Copyright 2008 Develer S.r.l. (http://www.develer.com/)
 # All rights reserved.
 #
-# $Id:$
+# $Id$
 #
 # Author: Lorenzo Berni <duplo@develer.com>
 #
@@ -24,7 +24,7 @@ class BToolchainPage(BWizardPage):
     Page of the wizard that permits to choose the toolchain to use for the
     project.
     """
-    
+
     def __init__(self):
         BWizardPage.__init__(self, UI_LOCATION + "/toolchain_select.ui")
         self.setTitle(self.tr("Select toolchain"))
@@ -37,22 +37,22 @@ class BToolchainPage(BWizardPage):
         Overload of the QWizard isComplete method.
         """
         if self.pageContent.toolchainList.currentRow() != -1:
-            self.setProjectInfo("TOOLCHAIN", 
+            self.setProjectInfo("TOOLCHAIN",
                 qvariant_converter.getStringDict(self.pageContent.toolchainList.currentItem().data(Qt.UserRole)))
             return True
         else:
             return False
-    
+
     ####
-    
+
     ## Overloaded BWizardPage methods. ##
-    
+
     def setupUi(self):
         """
         Sets up the user interface.
         """
         self.pageContent.infoLabel.setVisible(False)
-    
+
     def connectSignals(self):
         """
         Connects the signals with the related slots.
@@ -90,10 +90,10 @@ class BToolchainPage(BWizardPage):
         """
         Slot called when the user adds manually a toolchain.
         """
-        sel_toolchain = QFileDialog.getOpenFileName(self, self.tr("Choose the toolchain"), "")
-        if not sel_toolchain.isEmpty():
+        sel_toolchain = unicode(QFileDialog.getOpenFileName(self, self.tr("Choose the toolchain"), ""))
+        if sel_toolchain != "":
             item = QListWidgetItem(sel_toolchain)
-            item.setData(Qt.UserRole, qvariant_converter.convertString({"path": sel_toolchain}))
+            item.setData(Qt.UserRole, qvariant_converter.convertStringDict({"path": sel_toolchain}))
             self.pageContent.toolchainList.addItem(item)
             toolchains = self.toolchains()
             toolchains[sel_toolchain] = False
@@ -112,7 +112,7 @@ class BToolchainPage(BWizardPage):
 
     def searchToolchain(self):
         """
-        Slot called when the user clicks on the 'search' button. It opens the 
+        Slot called when the user clicks on the 'search' button. It opens the
         toolchain search dialog.
         """
         search = BToolchainSearch.BToolchainSearch()
@@ -128,9 +128,9 @@ class BToolchainPage(BWizardPage):
         for i in range(self.pageContent.toolchainList.count()):
             self.validateToolchain(i)
         QApplication.instance().restoreOverrideCursor()
-    
+
     ####
-    
+
     def _populateToolchainList(self):
         """
         Fills the toolchain list with the toolchains stored in the QSettings.
@@ -141,7 +141,7 @@ class BToolchainPage(BWizardPage):
             item = QListWidgetItem(key)
             item.setData(Qt.UserRole, qvariant_converter.convertStringDict({"path": key}))
             self.pageContent.toolchainList.addItem(item)
-            if sel_toolchain is not None and sel_toolchain["path"] == key:
+            if sel_toolchain and sel_toolchain["path"] == key:
                 self.pageContent.toolchainList.setCurrentItem(item)
             if value:
                 self.validateToolchain(self.pageContent.toolchainList.row(item))
@@ -151,7 +151,7 @@ class BToolchainPage(BWizardPage):
         Removes all the toolchain from the list.
         """
         self.pageContent.toolchainList.clear()
-    
+
     def _search(self):
         """
         Searches for toolchains in the stored directories, and stores them in the
@@ -163,13 +163,14 @@ class BToolchainPage(BWizardPage):
         toolchain_list = bertos_utils.findToolchains(dir_list)
         stored_toolchains = self.toolchains()
         for element in toolchain_list:
-            if not element in stored_toolchains.keys():
+            if not element in stored_toolchains:
                 item = QListWidgetItem(element)
                 item.setData(Qt.UserRole, qvariant_converter.convertStringDict({"path": element}))
                 self.pageContent.toolchainList.addItem(item)
                 stored_toolchains[element] = False
         self.setToolchains(stored_toolchains)
-        
+        self.showMessage(self.tr("Toolchain search result."), self.tr("%1 toolchains founded").arg(len(stored_toolchains)))
+
     def _validItem(self, index, infos):
         """
         Sets the item at index as a valid item and associates the given info to it.
@@ -179,20 +180,20 @@ class BToolchainPage(BWizardPage):
         new_data.update(infos)
         item.setData(Qt.UserRole, qvariant_converter.convertStringDict(new_data))
         needed = self.projectInfo("CPU_INFOS")
-        if "target" in infos.keys() and infos["target"].find(needed["TOOLCHAIN"]) != -1:
+        if "target" in infos and infos["target"].find(needed["TOOLCHAIN"]) != -1:
             item.setIcon(QIcon(":/images/ok.png"))
         else:
             item.setIcon(QIcon(":/images/warning.png"))
-        if "version" in infos.keys() and "target" in infos.keys():
-            item.setText("GCC " + infos["version"] + " - " + infos["target"])
-    
+        if "version" in infos and "target" in infos:
+            item.setText("GCC " + infos["version"] + " - " + infos["target"].strip())
+
     def _invalidItem(self, index):
         """
         Sets the item at index as an invalid item.
         """
         item = self.pageContent.toolchainList.item(index)
         item.setIcon(QIcon(":/images/error.png"))
-        
+
     def validateToolchain(self, i):
         """
         Toolchain validation procedure.
@@ -215,7 +216,7 @@ class BToolchainPage(BWizardPage):
             if self._validation_process.waitForFinished(200):
                 description = str(self._validation_process.readAllStandardError())
                 info = bertos_utils.getToolchainInfo(description)
-                if len(info.keys()) >= 4:
+                if len(info) >= 4:
                     valid = True
             else:
                 self._validation_process.kill()