X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluedescset.cpp;h=01f38aee1f58b74c6f445f7a161d78368d5e8973;hb=62999c94c88e5c867f88eb39fd8653680df0ad50;hp=ccbd1ae22ce665a8347cf8059ce6d932b167d0b3;hpb=4742c682ea173332f2d28428cfd7d40e3693b652;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp
index ccbd1ae..01f38ae 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp
@@ -53,11 +53,8 @@ using namespace synfigapp;
 using namespace Action;
 
 /* === M A C R O S ========================================================= */
-#define ACTION_INIT2(class) \
-	Action::Base* class::create() { return new class(); }	\
-	synfig::String class::get_name()const { return name__; }
 
-ACTION_INIT2(Action::ValueDescSet);
+ACTION_INIT_NO_GET_LOCAL_NAME(Action::ValueDescSet);
 ACTION_SET_NAME(Action::ValueDescSet,"value_desc_set");
 ACTION_SET_LOCAL_NAME(Action::ValueDescSet,N_("Set ValueDesc"));
 ACTION_SET_TASK(Action::ValueDescSet,"set");
@@ -86,31 +83,28 @@ Action::ValueDescSet::get_local_name()const
 	{
 	}
 	else if(value_desc.parent_is_layer_param())
-	{
-		if(value_desc.get_layer()->get_description().empty())
-			name=value_desc.get_layer()->get_local_name();
-		else
-			name=value_desc.get_layer()->get_description();
-		name+="->"+value_desc.get_param_name();
-	}
+		name = strprintf(_("'%s' -> %s"),
+						 (value_desc.get_layer()->get_description().empty()
+						  ? value_desc.get_layer()->get_local_name()
+						  : value_desc.get_layer()->get_description()).c_str(),
+						 value_desc.get_param_name().c_str());
 	else if(value_desc.parent_is_value_node())
 	{
 		synfig::LinkableValueNode::Handle value_node(synfig::LinkableValueNode::Handle::cast_reinterpret(value_desc.get_parent_value_node()));
-		name=value_node->link_local_name(value_desc.get_index());
-
 		synfig::Node* node;
 		for(node=value_node.get();!node->parent_set.empty() && !dynamic_cast<Layer*>(node);node=*node->parent_set.begin());
 		Layer::Handle parent_layer(dynamic_cast<Layer*>(node));
 		if(parent_layer)
-		{
-			if(parent_layer->get_description().empty())
-				name=parent_layer->get_local_name()+"=>"+name;
-			else
-				name=parent_layer->get_description()+"=>"+name;
-		}
+			name = strprintf(_("'%s' => %s"),
+							 (parent_layer->get_description().empty()
+							  ? parent_layer->get_local_name()
+							  : parent_layer->get_description()).c_str(),
+							 value_node->link_local_name(value_desc.get_index()).c_str()); 
+		else
+			name = value_node->link_local_name(value_desc.get_index());
 	}
 
-	return strprintf(_("Set %s"),name.c_str());
+	return strprintf(_("Set %s"), name.c_str());
 }
 
 Action::ParamVocab
@@ -294,7 +288,7 @@ Action::ValueDescSet::prepare()
 			break;
 		}
 		default:
-			throw Error("Bad type for composite (%s)",ValueBase::type_name(value.get_type()).c_str());
+			throw Error(_("Bad type for composite (%s)"),ValueBase::type_local_name(value.get_type()).c_str());
 			break;
 		}
 
@@ -353,7 +347,7 @@ Action::ValueDescSet::prepare()
 			n_components=4;
 			break;
 		default:
-			throw Error(_("Bad type for radial composite (%s)"),ValueBase::type_name(value.get_type()).c_str());
+			throw Error(_("Bad type for radial composite (%s)"),ValueBase::type_local_name(value.get_type()).c_str());
 			break;
 		}
 		for(int i=0;i<n_components;i++)