X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftags%2Fstable%2Fsrc%2Fsynfig%2Fvalue.cpp;h=d80fbf9df502133d9f442c7aa0b2085960264119;hb=47fce282611fbba1044921d22ca887f9b53ad91a;hp=7be5b49dca8d3ae6eafee38a8db5535e72a05f02;hpb=684cf1db661a9a5cbc142238cf05d6d2f7aa3f89;p=synfig.git diff --git a/synfig-core/tags/stable/src/synfig/value.cpp b/synfig-core/tags/stable/src/synfig/value.cpp index 7be5b49..d80fbf9 100644 --- a/synfig-core/tags/stable/src/synfig/value.cpp +++ b/synfig-core/tags/stable/src/synfig/value.cpp @@ -6,7 +6,7 @@ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley -** Copyright (c) 2007 Chris Moore +** Copyright (c) 2007, 2008 Chris Moore ** ** This package is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License as @@ -145,6 +145,12 @@ ValueBase::set(const char* x) _set(String(x)); } +void +ValueBase::set(char* x) +{ + _set(String(x)); +} + bool ValueBase::is_valid()const { @@ -189,15 +195,13 @@ ValueBase::clear() case TYPE_BOOL: delete static_cast(data); break; case TYPE_INTEGER: delete static_cast(data); break; case TYPE_ANGLE: delete static_cast(data); break; - case TYPE_VECTOR: delete static_cast(data); break; case TYPE_TIME: delete static_cast(data); break; case TYPE_REAL: delete static_cast(data); break; + case TYPE_VECTOR: delete static_cast(data); break; case TYPE_COLOR: delete static_cast(data); break; case TYPE_SEGMENT: delete static_cast(data); break; case TYPE_BLINEPOINT: delete static_cast(data); break; case TYPE_LIST: delete static_cast(data); break; - case TYPE_STRING: delete static_cast(data); break; - case TYPE_GRADIENT: delete static_cast(data); break; case TYPE_CANVAS: { etl::handle canvas(get(etl::loose_handle())); @@ -207,6 +211,8 @@ ValueBase::clear() delete static_cast*>(data); break; } + case TYPE_STRING: delete static_cast(data); break; + case TYPE_GRADIENT: delete static_cast(data); break; default: break; } @@ -224,20 +230,34 @@ ValueBase::type_name(Type id) // don't internationalize these type names - they're using in .sif files switch(id) { - case TYPE_REAL: return "real"; - case TYPE_TIME: return "time"; - case TYPE_INTEGER: return "integer"; - case TYPE_BOOL: return "bool"; - case TYPE_ANGLE: return "angle"; - case TYPE_VECTOR: return "vector"; - case TYPE_COLOR: return "color"; - case TYPE_STRING: return "string"; - case TYPE_CANVAS: return "canvas"; - case TYPE_LIST: return "list"; - case TYPE_SEGMENT: return "segment"; - case TYPE_GRADIENT: return "gradient"; - case TYPE_BLINEPOINT: return "bline_point"; - case TYPE_NIL: return "nil"; + /* TRANSLATORS: this is the name of a type -- see http://synfig.org/Types */ + case TYPE_BOOL: return N_("bool"); + /* TRANSLATORS: this is the name of a type -- see http://synfig.org/Types */ + case TYPE_INTEGER: return N_("integer"); + /* TRANSLATORS: this is the name of a type -- see http://synfig.org/Types */ + case TYPE_ANGLE: return N_("angle"); + /* TRANSLATORS: this is the name of a type -- see http://synfig.org/Types */ + case TYPE_TIME: return N_("time"); + /* TRANSLATORS: this is the name of a type -- see http://synfig.org/Types */ + case TYPE_REAL: return N_("real"); + /* TRANSLATORS: this is the name of a type -- see http://synfig.org/Types */ + case TYPE_VECTOR: return N_("vector"); + /* TRANSLATORS: this is the name of a type -- see http://synfig.org/Types */ + case TYPE_COLOR: return N_("color"); + /* TRANSLATORS: this is the name of a type -- see http://synfig.org/Types */ + case TYPE_SEGMENT: return N_("segment"); + /* TRANSLATORS: this is the name of a type -- see http://synfig.org/Types */ + case TYPE_BLINEPOINT: return N_("bline_point"); + /* TRANSLATORS: this is the name of a type -- see http://synfig.org/Types */ + case TYPE_LIST: return N_("list"); + /* TRANSLATORS: this is the name of a type -- see http://synfig.org/Types */ + case TYPE_CANVAS: return N_("canvas"); + /* TRANSLATORS: this is the name of a type -- see http://synfig.org/Types */ + case TYPE_STRING: return N_("string"); + /* TRANSLATORS: this is the name of a type -- see http://synfig.org/Types */ + case TYPE_GRADIENT: return N_("gradient"); + /* TRANSLATORS: this is the name of a type -- see http://synfig.org/Types */ + case TYPE_NIL: return N_("nil"); default: break; } @@ -246,6 +266,12 @@ ValueBase::type_name(Type id) return "UNKNOWN"; } +String +ValueBase::type_local_name(Type id) +{ + return dgettext("synfig",type_name(id).c_str()); +} + ValueBase::Type ValueBase::ident_type(const String &str) {