X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBToolchainPage.py;h=6c7bebd2784c497ddbd3963637232a6d0eabe587;hb=83e8cfaaf519136e906463151f91ea6bac409973;hp=be7fc6f12da215120fc094cfab13585710850be1;hpb=16497dd0bf8e2166a45622c5a8787f4adfdd4746;p=bertos.git

diff --git a/wizard/BToolchainPage.py b/wizard/BToolchainPage.py
index be7fc6f1..6c7bebd2 100644
--- 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))
@@ -182,6 +190,7 @@ class BToolchainPage(BWizardPage):
         needed = self.projectInfo("CPU_INFOS")
         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 and "target" in infos: