X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBToolchainPage.py;h=b516943a49b4c71eab2d3ad515290ee0c24c19ff;hb=bc8b61afa24c8ccecb748ba1aebc5c45ff70cc17;hp=e3fd825a68eef42cf4c99bab26290b8f87bae169;hpb=67d2aeb4d61b3843ed2fbac9ced64ffb76059c50;p=bertos.git

diff --git a/wizard/BToolchainPage.py b/wizard/BToolchainPage.py
index e3fd825a..b516943a 100644
--- a/wizard/BToolchainPage.py
+++ b/wizard/BToolchainPage.py
@@ -37,7 +37,7 @@ import os
 import collections
 
 from BWizardPage import *
-from BOutputPage import BOutputPage
+from BCreationPage import BCreationPage
 
 import BToolchainSearch
 import bertos_utils
@@ -56,7 +56,7 @@ class BToolchainPage(BWizardPage):
     def __init__(self):
         BWizardPage.__init__(self, UI_LOCATION + "/toolchain_select.ui")
         self.setTitle(self.tr("Select toolchain"))
-        self._validation_process = None
+        self.setSubTitle(self.tr("You can look for more toolchains in your system by pressing the \"Search\" button, or manually add them with the \"+\" button"))
         self._valid_items = []
         self._toolchain_manager = ToolchainManager()
 
@@ -79,7 +79,7 @@ class BToolchainPage(BWizardPage):
         """
         # Route to Output page if it's a predefined easy project.
         if self.projectInfo("PROJECT_FROM_PRESET") and self.projectInfo("BASE_MODE"):
-            return self.wizard().pageIndex(BOutputPage)
+            return self.wizard().pageIndex(BCreationPage)
         else:
             return QWizardPage.nextId(self)
 
@@ -97,21 +97,22 @@ class BToolchainPage(BWizardPage):
         """
         Connects the signals with the related slots.
         """
-        self.connect(self.pageContent.toolchainList, SIGNAL("itemSelectionChanged()"), self.selectionChanged)
+        self.connect(self.pageContent.toolchainList, SIGNAL("currentItemChanged(QListWidgetItem *, QListWidgetItem*)"), 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.validateAllToolchains)
 
-    def reloadData(self):
+    def reloadData(self, previous_id=None):
         """
         Overload of the BWizard reloadData method.
         """
-        self._clearList()
-        self.setupUi()
-        self._populateToolchainList()
-        if len(self._valid_items) == 1:
-            self.pageContent.toolchainList.setCurrentItem(self._valid_items[0])
+        if previous_id is None or previous_id < self.wizard().currentId():
+            self._clearList()
+            self.setupUi()
+            self._populateToolchainList()
+            if len(self._valid_items) >= 1:
+                self.pageContent.toolchainList.setCurrentItem(self.pageContent.toolchainList.currentItem() or self._valid_items[0])
 
     ####
 
@@ -180,6 +181,7 @@ class BToolchainPage(BWizardPage):
         Fills the toolchain list with the toolchains stored in the QSettings.
         """
         self.pageContent.toolchainList.clear()
+        self._valid_items = []
         toolchains = self._toolchain_manager.predefined_toolchains + self._toolchain_manager.toolchains
         sel_toolchain = self.projectInfo("TOOLCHAIN")
         for key, value in toolchains:
@@ -218,7 +220,7 @@ class BToolchainPage(BWizardPage):
         for toolchain in toolchain_list:
             self._toolchain_manager.addToolchain(toolchain, _toolchain_dict.get(toolchain, False))
         self._populateToolchainList()
-        self.showMessage(self.tr("Toolchain search result."), self.tr("%1 toolchains founded").arg(len(self._toolchain_manager.toolchains)))
+        self.showMessage(self.tr("Toolchain search result."), self.tr("%1 toolchains found").arg(len(toolchain_list)))
 
     def _validItem(self, index, infos):
         """