Fix toolchain reloadPage problem (_valid_items list wasn't cleared properly).

[bertos.git] / wizard / BToolchainPage.py

diff --git a/wizard/BToolchainPage.py b/wizard/BToolchainPage.py
index 43677e6ca7ed9e91de2fb55b55b656f062e56d4b..65505fb4310089f9be3ba307046a19bd50f41fd3 100644 (file)
--- 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
@@ -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,7 +97,7 @@ 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)
@@ -110,7 +110,7 @@ class BToolchainPage(BWizardPage):
         self._clearList()
         self.setupUi()
         self._populateToolchainList()
-        if len(self._valid_items) == 1:
+        if len(self._valid_items) >= 1:
             self.pageContent.toolchainList.setCurrentItem(self._valid_items[0])
 
     ####
@@ -180,6 +180,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: