#
# Copyright 2010 Develer S.r.l. (http://www.develer.com/)
#
-# $Id$
#
# Author: Lorenzo Berni <duplo@develer.com>
#
from BWizardPage import BWizardPage
-from BOutputPage import BOutputPage
+from BCreationPage import BCreationPage
from BToolchainPage import BToolchainPage
+from DefineException import ModuleDefineException
+
from bertos_utils import _cmp
from toolchain_manager import ToolchainManager
preset_path = self.selected_path
try:
QApplication.instance().setOverrideCursor(Qt.WaitCursor)
- self.project.loadProjectFromPreset(preset_path)
+ try:
+ self.project.loadProjectFromPreset(preset_path)
+ except ModuleDefineException, e:
+ self.exceptionOccurred(self.tr("Error parsing line '%2' in file %1").arg(e.path).arg(e.line))
self.setProjectInfo("PRESET_LOADED", True)
finally:
QApplication.instance().restoreOverrideCursor()
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:
## Overloaded BWizardPage methods ##
- def reloadData(self):
+ def reloadData(self, previous_id=None):
if not self.projectInfo("PRESET_LOADED"):
preset_path = self.projectInfo("PROJECT_BOARD")
preset_tree = self.projectInfo("PRESET_TREE")