amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

* Added console panel for evaluating scripts and showing error messages.

Browse Source 
* Rewrite of error queue code: errors are now pulled, instead of being turned into messageboxes automatically.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1629 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2011-01-21 13:26:03 +00:00
parent 4079bc26b8
commit bd55326c7d
37 changed files with 1288 additions and 797 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/font.cpp
+1 -1
View File
@@ -60,7 +60,7 @@ FontP Font::make(int add_flags, AColor* other_color, double* other_size) const {
f->color = Color(128,0,0);
}
if (add_flags & FONT_CODE_KW) {
f->color = Color(158,0,0);
f->color = Color(158,100,0);
f->flags |= FONT_BOLD;
}
if (add_flags & FONT_SOFT) {
src/data/keyword.cpp
+2 -2
View File
@@ -215,7 +215,7 @@ void Keyword::prepare(const vector<KeywordParamP>& param_types, bool force) {
// throwing an error can mean a set will not be loaded!
// instead, simply disable the keyword
//throw InternalError(_("Unknown keyword parameter type: ") + type);
handle_error(_("Unknown keyword parameter type: ") + type, true, false);
handle_error(_("Unknown keyword parameter type: ") + type);
valid = false;
return;
}
@@ -700,7 +700,7 @@ bool KeywordDatabase::tryExpand(const Keyword& kw,
try {
reminder = kw.reminder.invoke(ctx)->toString();
} catch (const Error& e) {
handle_error(_ERROR_2_("in keyword reminder", e.what(), kw.keyword), true, false);
handle_error(_ERROR_2_("in keyword reminder", e.what(), kw.keyword));
}
ctx.setVariable(_("keyword"), to_script(total));
ctx.setVariable(_("reminder"), to_script(reminder));
src/data/locale.cpp
+2 -2
View File
@@ -86,7 +86,7 @@ SubLocaleP find_wildcard_and_set(map<String,SubLocaleP>& items, const String& na
// ----------------------------------------------------------------------------- : Translation
String warn_and_identity(const String& key) {
handle_warning(_("Missing key in locale: ") + key, false);
queue_message(MESSAGE_WARNING, _("Missing key in locale: ") + key);
return key;
}
@@ -253,7 +253,7 @@ void Locale::validate(Version ver) {
+ _("\n found: ") + ver.toString();
}
if (!errors.empty()) {
handle_warning(errors);
queue_message(MESSAGE_WARNING, errors);
}
}
src/data/statistics.cpp
+1 -1
View File
@@ -121,7 +121,7 @@ void StatsCategory::find_dimensions(const vector<StatsDimensionP>& available) {
}
}
if (!dim) {
handle_error(_ERROR_1_("dimension not found",n),false);
handle_error(_ERROR_1_("dimension not found",n));
} else {
dimensions.push_back(dim);
}