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

Rename 'cannocial_name_form' to 'canonical_name_form'

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1433 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
coppro
2009-12-04 06:04:57 +00:00
parent 46111fcbad
commit 47aa7ce923
10 changed files with 265 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/value/choice.cpp
+3 -3
View File
@@ -46,7 +46,7 @@ ChoiceThumbnailRequest::ChoiceThumbnailRequest(ValueViewer* viewer, int id, bool
Image ChoiceThumbnailRequest::generate() {
ChoiceStyle& s = style();
String name = cannocial_name_form(s.field().choices->choiceName(id));
String name = canonical_name_form(s.field().choices->choiceName(id));
ScriptableImage& img = s.choice_images[name];
return img.isReady()
? img.generate(GeneratedImage::Options(16,16, &viewer().getStylePackage(), &viewer().getLocalPackage(), ASPECT_BORDER, true))
@@ -181,7 +181,7 @@ void DropDownChoiceListBase::generateThumbnailImages() {
if (style().choice_images.empty() && style().image.isScripted()) {
for (int i = 0 ; i < end ; ++i) {
try {
String name = cannocial_name_form(field().choices->choiceName(i));
String name = canonical_name_form(field().choices->choiceName(i));
ctx.setVariable(_("input"), to_script(name));
GeneratedImageP img = image_from_script(style().image.getValidScriptP()->eval(ctx));
style().choice_images.insert(make_pair(name, ScriptableImage(img)));
@@ -197,7 +197,7 @@ void DropDownChoiceListBase::generateThumbnailImages() {
if (i >= image_count || status != THUMB_OK) {
// update image
ChoiceStyle& s = style();
String name = cannocial_name_form(s.field().choices->choiceName(i));
String name = canonical_name_form(s.field().choices->choiceName(i));
ScriptableImage& img = s.choice_images[name];
if (!img.update(ctx) && status == THUMB_CHANGED) {
status = THUMB_OK; // no need to rebuild