Add new parameter to reloadData method (an integer containing the id of the previous...

[bertos.git] / wizard / BProjectPresets.py

diff --git a/wizard/BProjectPresets.py b/wizard/BProjectPresets.py
index ba4d6d7d0314c119054d477f485a2f6b772011af..9afed4f4328ea37ccefb71f2c6a967ba45623f45 100644 (file)
--- a/wizard/BProjectPresets.py
+++ b/wizard/BProjectPresets.py
@@ -42,7 +42,7 @@ from PyQt4.QtGui import *
 
 from BWizardPage import BWizardPage
 
-from BOutputPage import BOutputPage
+from BCreationPage import BCreationPage
 from BToolchainPage import BToolchainPage
 
 from bertos_utils import _cmp
@@ -122,6 +122,7 @@ class BProjectPresets(BWizardPage):
         try:
             QApplication.instance().setOverrideCursor(Qt.WaitCursor)
             self.project.loadProjectFromPreset(preset_path)
+            self.setProjectInfo("PRESET_LOADED", True)
         finally:
             QApplication.instance().restoreOverrideCursor()
         # Return always True, this is a fake validation.
@@ -147,7 +148,7 @@ class BProjectPresets(BWizardPage):
                     toolchain_info = tm._validateToolchain(toolchain)
                     toolchain_info["path"] = toolchain
                     self.setProjectInfo("TOOLCHAIN", toolchain_info)
-                    return self.wizard().pageIndex(BOutputPage)
+                    return self.wizard().pageIndex(BCreationPage)
                 else:
                     return self.wizard().pageIndex(BToolchainPage)
             else:
@@ -162,13 +163,14 @@ class BProjectPresets(BWizardPage):
     
     ## Overloaded BWizardPage methods ##
     
-    def reloadData(self):
-        preset_path = self.projectInfo("PROJECT_BOARD")
-        preset_tree = self.projectInfo("PRESET_TREE")
-        preset_list = preset_tree["children"][preset_path]["children"]
-        preset_list = sorted(preset_list.values(), _cmp)
-        self.setTitle(self.tr("Select the project template for %1").arg(preset_tree["children"][preset_path]["info"].get("name", preset_tree["children"][preset_path]["info"]["filename"])))
-        self.setupTabs(preset_list)
+    def reloadData(self, previous_id=None):
+        if not self.projectInfo("PRESET_LOADED"):
+            preset_path = self.projectInfo("PROJECT_BOARD")
+            preset_tree = self.projectInfo("PRESET_TREE")
+            preset_list = preset_tree["children"][preset_path]["children"]
+            preset_list = sorted(preset_list.values(), _cmp)
+            self.setTitle(self.tr("Select the project template for %1").arg(preset_tree["children"][preset_path]["info"].get("name", preset_tree["children"][preset_path]["info"]["filename"])))
+            self.setupTabs(preset_list)
 
     def connectSignals(self):
         self.connect(self.pageContent.boardTabWidget, SIGNAL("currentChanged(int)"), self, SIGNAL("completeChanged()"))