X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluenoderemove.cpp;h=5e5f98179ed6ba5b4e75a3c4fb1e25a603ae1cd7;hb=334e15ce6c4d9b1f30a168a55e7ef4d31320d568;hp=696732e70b28bd2358d4184dfebacfbe6e40b5bf;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenoderemove.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenoderemove.cpp
index 696732e..5e5f981 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/valuenoderemove.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuenoderemove.cpp
@@ -2,19 +2,20 @@
 /*!	\file valuenoderemove.cpp
 **	\brief Template File
 **
-**	$Id: valuenoderemove.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
+**	$Id$
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
 **	\endlegal
 */
 /* ========================================================================= */
@@ -31,6 +32,8 @@
 #include "valuenoderemove.h"
 #include <synfigapp/canvasinterface.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -41,14 +44,14 @@ using namespace Action;
 
 /* === M A C R O S ========================================================= */
 
-ACTION_INIT(Action::ValueNodeRemove);
+ACTION_INIT_NO_GET_LOCAL_NAME(Action::ValueNodeRemove);
 ACTION_SET_NAME(Action::ValueNodeRemove,"value_node_remove");
-ACTION_SET_LOCAL_NAME(Action::ValueNodeRemove,_("Unexport"));
+ACTION_SET_LOCAL_NAME(Action::ValueNodeRemove,N_("Unexport"));
 ACTION_SET_TASK(Action::ValueNodeRemove,"remove");
 ACTION_SET_CATEGORY(Action::ValueNodeRemove,Action::CATEGORY_VALUENODE);
 ACTION_SET_PRIORITY(Action::ValueNodeRemove,0);
 ACTION_SET_VERSION(Action::ValueNodeRemove,"0.0");
-ACTION_SET_CVS_ID(Action::ValueNodeRemove,"$Id: valuenoderemove.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::ValueNodeRemove,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -60,22 +63,29 @@ Action::ValueNodeRemove::ValueNodeRemove()
 {
 }
 
+synfig::String
+Action::ValueNodeRemove::get_local_name()const
+{
+	// TRANSLATORS: This is used in the 'history' dialog when a ValueNode is unexported.
+	return strprintf(_("Unexport '%s'"), old_name.c_str());
+}
+
 Action::ParamVocab
 Action::ValueNodeRemove::get_param_vocab()
 {
 	ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-	
+
 	ret.push_back(ParamDesc("value_node",Param::TYPE_VALUENODE)
 		.set_local_name(_("ValueNode"))
 	);
-	
+
 	return ret;
 }
 
 bool
-Action::ValueNodeRemove::is_canidate(const ParamList &x)
+Action::ValueNodeRemove::is_candidate(const ParamList &x)
 {
-	if(canidate_check(get_param_vocab(),x))
+	if(candidate_check(get_param_vocab(),x))
 	{
 		ValueNode::Handle value_node=x.find("value_node")->second.get_value_node();
 		if(!value_node->is_exported())
@@ -93,13 +103,13 @@ Action::ValueNodeRemove::set_param(const synfig::String& name, const Action::Par
 	if(name=="value_node" && param.get_type()==Param::TYPE_VALUENODE)
 	{
 		value_node=param.get_value_node();
-		
+
 		if(value_node && !value_node->is_exported())
 		{
 			synfig::error("Action::ValueNodeRemove::set_param(): ValueBase node not exported!");
 			value_node=0;
 		}
-		
+
 		return (bool)value_node;
 	}
 
@@ -119,7 +129,7 @@ Action::ValueNodeRemove::is_ready()const
 
 void
 Action::ValueNodeRemove::perform()
-{	
+{
 //	if(value_node->rcount()!=1)
 //		throw Error(_("ValueNode is still being used by something"));
 
@@ -131,18 +141,18 @@ Action::ValueNodeRemove::perform()
 	{
 		get_canvas_interface()->signal_value_node_deleted()(value_node);
 	}
-	
+
 	//throw Error(_("Not yet implemented"));
 /*
 	assert(value_node->is_exported());
 
 	if(get_canvas()->value_node_list().count(new_name))
 		throw Error(_("A ValueNode with this ID already exists in this canvas"));
-	
+
 	old_name=value_node->get_id();
 
-	value_node->set_id(new_name);	
-	
+	value_node->set_id(new_name);
+
 	if(get_canvas_interface())
 	{
 		get_canvas_interface()->signal_value_node_changed()(value_node);
@@ -158,16 +168,16 @@ Action::ValueNodeRemove::undo()
 	{
 		get_canvas_interface()->signal_value_node_added()(value_node);
 	}
-	
+
 	//throw Error(_("Not yet implemented"));
 /*
 	assert(value_node->is_exported());
 
 	if(get_canvas()->value_node_list().count(old_name))
 		throw Error(_("A ValueNode with the old ID already exists in this canvas (BUG)"));
-	
-	value_node->set_id(old_name);	
-	
+
+	value_node->set_id(old_name);
+
 	if(get_canvas_interface())
 	{
 		get_canvas_interface()->signal_value_node_changed()(value_node);