X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fblinepointtangentmerge.cpp;h=39d4f36374f30a1601ee10bcc2dac66beb7ed5cf;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=39e6a17813425d2c077815bacf3cf7144d27f3a0;hpb=dee84efa006428fdfbf0e84b66ee94eb23113ad9;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.cpp b/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.cpp
index 39e6a17..39d4f36 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.cpp
@@ -2,10 +2,11 @@
 /*!	\file blinepointtangentmerge.cpp
 **	\brief Template File
 **
-**	$Id: blinepointtangentmerge.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	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
@@ -38,6 +39,8 @@
 #include "valuedescconnect.h"
 #include <synfigapp/canvasinterface.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -48,14 +51,14 @@ using namespace Action;
 
 /* === M A C R O S ========================================================= */
 
-ACTION_INIT(Action::BLinePointTangentMerge);
+ACTION_INIT_NO_GET_LOCAL_NAME(Action::BLinePointTangentMerge);
 ACTION_SET_NAME(Action::BLinePointTangentMerge,"bline_point_tangent_merge");
-ACTION_SET_LOCAL_NAME(Action::BLinePointTangentMerge,_("Merge Tangents"));
+ACTION_SET_LOCAL_NAME(Action::BLinePointTangentMerge,N_("Merge Tangents"));
 ACTION_SET_TASK(Action::BLinePointTangentMerge,"merge");
 ACTION_SET_CATEGORY(Action::BLinePointTangentMerge,Action::CATEGORY_VALUENODE);
 ACTION_SET_PRIORITY(Action::BLinePointTangentMerge,0);
 ACTION_SET_VERSION(Action::BLinePointTangentMerge,"0.0");
-ACTION_SET_CVS_ID(Action::BLinePointTangentMerge,"$Id: blinepointtangentmerge.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::BLinePointTangentMerge,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -69,11 +72,17 @@ Action::BLinePointTangentMerge::BLinePointTangentMerge()
 	set_dirty(true);
 }
 
+synfig::String
+Action::BLinePointTangentMerge::get_local_name()const
+{
+	return strprintf(_("Merge Tangents of '%s'"), ((ValueNode::Handle)(value_node))->get_description().c_str());
+}
+
 Action::ParamVocab
 Action::BLinePointTangentMerge::get_param_vocab()
 {
 	ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-	
+
 	ret.push_back(ParamDesc("value_node",Param::TYPE_VALUENODE)
 		.set_local_name(_("ValueNode of BLinePoint"))
 	);
@@ -81,7 +90,7 @@ Action::BLinePointTangentMerge::get_param_vocab()
 	ret.push_back(ParamDesc("time",Param::TYPE_TIME)
 		.set_local_name(_("Time"))
 	);
-	
+
 	return ret;
 }
 
@@ -108,13 +117,13 @@ Action::BLinePointTangentMerge::set_param(const synfig::String& name, const Acti
 	if(name=="value_node" && param.get_type()==Param::TYPE_VALUENODE)
 	{
 		value_node=value_node.cast_dynamic(param.get_value_node());
-		
+
 		return (bool)(value_node);
 	}
 	if(name=="time" && param.get_type()==Param::TYPE_TIME)
 	{
 		time=param.get_time();
-		
+
 		return true;
 	}
 
@@ -129,7 +138,7 @@ Action::BLinePointTangentMerge::is_ready()const
 
 	if(time==(Time::begin()-1))
 		synfig::error("Missing time");
-	
+
 	if(!value_node || time==(Time::begin()-1))
 		return false;
 	return Action::CanvasSpecific::is_ready();
@@ -141,40 +150,20 @@ Action::BLinePointTangentMerge::prepare()
 	clear();
 
 	Action::Handle action;
-	
-	{
-		action=Action::create("value_desc_set");
-		if(!action)
-			throw Error(_("Couldn't find action \"value_desc_set\""));
-		
-		action->set_param("canvas",get_canvas());
-		action->set_param("canvas_interface",get_canvas_interface());
-		action->set_param("value_desc",ValueDesc(value_node,3));
-		action->set_param("time",time);
-		action->set_param("new_value",synfig::ValueBase(false));
-	
-		assert(action->is_ready());
-		if(!action->is_ready())
-			throw Error(Error::TYPE_NOTREADY);
-	
-		add_action(action);
-	}
-	{
-		action=Action::create("value_desc_set");
-		if(!action)
-			throw Error(_("Couldn't find action \"value_desc_set\""));
-		
-		action->set_param("canvas",get_canvas());
-		action->set_param("canvas_interface",get_canvas_interface());
-		action->set_param("value_desc",ValueDesc(value_node,5));
-		action->set_param("time",time);
-		action->set_param("new_value",(*value_node->get_link("t1"))(time));
-	
-		assert(action->is_ready());
-		if(!action->is_ready())
-			throw Error(Error::TYPE_NOTREADY);
-	
-		add_action(action);
-	}
-	
+
+	action=Action::create("value_desc_set");
+	if(!action)
+		throw Error(_("Couldn't find action \"value_desc_set\""));
+
+	action->set_param("canvas",get_canvas());
+	action->set_param("canvas_interface",get_canvas_interface());
+	action->set_param("value_desc",ValueDesc(value_node,3));
+	action->set_param("time",time);
+	action->set_param("new_value",synfig::ValueBase(false));
+
+	assert(action->is_ready());
+	if(!action->is_ready())
+		throw Error(Error::TYPE_NOTREADY);
+
+	add_action(action);
 }