When there is only one toolchain for the specified architecture the wizard selects...

[bertos.git] / wizard / BToolchainPage.py

diff --git a/wizard/BToolchainPage.py b/wizard/BToolchainPage.py
index 3c5ab357ecdb1c954535e2d319ca7a87fc10b131..6c7bebd2784c497ddbd3963637232a6d0eabe587 100644 (file)
--- a/wizard/BToolchainPage.py
+++ b/wizard/BToolchainPage.py
@@ -29,6 +29,7 @@ class BToolchainPage(BWizardPage):
         BWizardPage.__init__(self, UI_LOCATION + "/toolchain_select.ui")
         self.setTitle(self.tr("Select toolchain"))
         self._validation_process = None
+        self._valid_items = []
 
     ## Overloaded QWizardPage methods. ##
 
@@ -70,6 +71,8 @@ class BToolchainPage(BWizardPage):
         self._clearList()
         self.setupUi()
         self._populateToolchainList()
+        if len(self._valid_items) == 1:
+            self.pageContent.toolchainList.setCurrentItem(self._valid_items[0])
 
     ####
 
@@ -136,12 +139,17 @@ class BToolchainPage(BWizardPage):
         Fills the toolchain list with the toolchains stored in the QSettings.
         """
         toolchains = self.toolchains()
+        if os.name == "nt":
+            import winreg_importer
+            stored_toolchains = winreg_importer.getBertosToolchains()
+            for toolchain in stored_toolchains:
+                toolchains[toolchain] = True
         sel_toolchain = self.projectInfo("TOOLCHAIN")
         for key, value in toolchains.items():
             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))
@@ -163,12 +171,13 @@ 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):
         """
@@ -179,11 +188,12 @@ 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"))
+            self._valid_items.append(item)
         else:
             item.setIcon(QIcon(":/images/warning.png"))
-        if "version" in infos.keys() and "target" in infos.keys():
+        if "version" in infos and "target" in infos:
             item.setText("GCC " + infos["version"] + " - " + infos["target"].strip())
 
     def _invalidItem(self, index):
@@ -215,7 +225,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()