From: dooglus <dooglus@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Tue, 15 Jan 2008 14:48:31 +0000 (+0000)
Subject: When merging a tangent, show which tangent was merged in the History dialog.
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=93751ae666038ba39ea9444c95e608396d4540aa;p=synfig.git

When merging a tangent, show which tangent was merged in the History dialog.


git-svn-id: http://svn.voria.com/code@1374 1f10aa63-cdf2-0310-b900-c93c546f37ac
---

diff --git a/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.cpp b/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.cpp
index 8556af9..4f3d476 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.cpp
@@ -51,7 +51,7 @@ 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,N_("Merge Tangents"));
 ACTION_SET_TASK(Action::BLinePointTangentMerge,"merge");
@@ -72,6 +72,12 @@ 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()
 {