X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluedescset.cpp;h=d4d89dba798c2b59ffa296c59313fc8c151c1d55;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=0c5a1b4663998bc95cb43bf96be2f71fbed4fe69;hpb=6c27d1b6cf4694a873542cb264c650893f2c6e0e;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp
index 0c5a1b4..d4d89db 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescset.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
@@ -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");
@@ -80,37 +77,10 @@ Action::ValueDescSet::ValueDescSet():
 synfig::String
 Action::ValueDescSet::get_local_name()const
 {
-	String name("ValueDesc");
-
-	if(!value_desc)
-	{
-	}
-	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();
-	}
-	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;
-		}
-	}
-
-	return strprintf(_("Set %s"),name.c_str());
+	return strprintf(_("Set %s"),
+					 value_desc
+					 ? value_desc.get_description().c_str()
+					 : _("ValueDesc"));
 }
 
 Action::ParamVocab
@@ -203,7 +173,6 @@ Action::ValueDescSet::prepare()
 
 		if (value_desc.get_index()==4) {
 			printf("copying change to tangent 2\n");
-			DEBUGPOINT();
 			ValueNode_Composite::Handle parent_value_node;
 			parent_value_node=parent_value_node.cast_dynamic(value_desc.get_parent_value_node());
 
@@ -521,7 +490,6 @@ Action::ValueDescSet::prepare()
 			if(!action->is_ready())
 				throw Error(Error::TYPE_NOTREADY);
 
-				DEBUGPOINT();
 			add_action_front(action);
 		}
 		else
@@ -529,7 +497,6 @@ Action::ValueDescSet::prepare()
 			value_node=value_node.cast_dynamic(value_desc.get_value_node());
 		}
 
-				DEBUGPOINT();
 		if(!value_node)
 			throw Error(_("Direct manipulation of this ValueNode type is not yet supported"));
 
@@ -551,7 +518,6 @@ Action::ValueDescSet::prepare()
 		if(!action->is_ready())
 			throw Error(Error::TYPE_NOTREADY);
 
-				DEBUGPOINT();
 		add_action(action);
 
 		return;