projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for more i2c devices.
[bertos.git]
/
wizard
/
BProjectPresets.py
diff --git
a/wizard/BProjectPresets.py
b/wizard/BProjectPresets.py
index 9afed4f4328ea37ccefb71f2c6a967ba45623f45..2b5dd6735acb89921aaf0a730b8afecc70eaa02e 100644
(file)
--- a/
wizard/BProjectPresets.py
+++ b/
wizard/BProjectPresets.py
@@
-45,6
+45,8
@@
from BWizardPage import BWizardPage
from BCreationPage import BCreationPage
from BToolchainPage import BToolchainPage
from BCreationPage import BCreationPage
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
+123,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()