projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sam3 spi: use data transfer register interrupt instead of tx finished interrupt:...
[bertos.git]
/
wizard
/
BProjectPresets.py
diff --git
a/wizard/BProjectPresets.py
b/wizard/BProjectPresets.py
index b92eaa3dfb571267f70d5742e947919abd89a123..13e4aebd75dc7b14266aa78f8fe94e9c99242def 100644
(file)
--- a/
wizard/BProjectPresets.py
+++ b/
wizard/BProjectPresets.py
@@
-28,7
+28,6
@@
#
# Copyright 2010 Develer S.r.l. (http://www.develer.com/)
#
#
# Copyright 2010 Develer S.r.l. (http://www.develer.com/)
#
-# $Id$
#
# Author: Lorenzo Berni <duplo@develer.com>
#
#
# Author: Lorenzo Berni <duplo@develer.com>
#
@@
-42,9
+41,11
@@
from PyQt4.QtGui import *
from BWizardPage import BWizardPage
from BWizardPage import BWizardPage
-from B
OutputPage import BOutput
Page
+from B
CreationPage import BCreation
Page
from BToolchainPage import BToolchainPage
from BToolchainPage import BToolchainPage
+from DefineException import ModuleDefineException
+
from bertos_utils import _cmp
from toolchain_manager import ToolchainManager
from bertos_utils import _cmp
from toolchain_manager import ToolchainManager
@@
-121,7
+122,10
@@
class BProjectPresets(BWizardPage):
preset_path = self.selected_path
try:
QApplication.instance().setOverrideCursor(Qt.WaitCursor)
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()
self.setProjectInfo("PRESET_LOADED", True)
finally:
QApplication.instance().restoreOverrideCursor()
@@
-148,7
+152,7
@@
class BProjectPresets(BWizardPage):
toolchain_info = tm._validateToolchain(toolchain)
toolchain_info["path"] = toolchain
self.setProjectInfo("TOOLCHAIN", toolchain_info)
toolchain_info = tm._validateToolchain(toolchain)
toolchain_info["path"] = toolchain
self.setProjectInfo("TOOLCHAIN", toolchain_info)
- return self.wizard().pageIndex(B
Output
Page)
+ return self.wizard().pageIndex(B
Creation
Page)
else:
return self.wizard().pageIndex(BToolchainPage)
else:
else:
return self.wizard().pageIndex(BToolchainPage)
else:
@@
-163,7
+167,7
@@
class BProjectPresets(BWizardPage):
## Overloaded BWizardPage methods ##
## 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")
if not self.projectInfo("PRESET_LOADED"):
preset_path = self.projectInfo("PROJECT_BOARD")
preset_tree = self.projectInfo("PRESET_TREE")