X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Factivepointsimpleadd.cpp;h=e22a050d068a7f7af34d173dc74da8f9704d4c51;hb=976e5da32d8b20f054abf4cf2895ae466bcc7370;hp=62f8cf66d8a2f6e2fdc9254d7c5eac7f34435a08;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointsimpleadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointsimpleadd.cpp
index 62f8cf6..e22a050 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/activepointsimpleadd.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/activepointsimpleadd.cpp
@@ -2,19 +2,20 @@
 /*!	\file activepointsimpleadd.cpp
 **	\brief Simple add activepoint File
 **
-**	$Id: activepointsimpleadd.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2004 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
 */
 /* ========================================================================= */
@@ -48,7 +49,7 @@ ACTION_SET_TASK(Action::ActivepointSimpleAdd,"add");
 ACTION_SET_CATEGORY(Action::ActivepointSimpleAdd,Action::CATEGORY_WAYPOINT);
 ACTION_SET_PRIORITY(Action::ActivepointSimpleAdd,0);
 ACTION_SET_VERSION(Action::ActivepointSimpleAdd,"0.0");
-ACTION_SET_CVS_ID(Action::ActivepointSimpleAdd,"$Id: activepointsimpleadd.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::ActivepointSimpleAdd,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -66,7 +67,7 @@ Action::ParamVocab
 Action::ActivepointSimpleAdd::get_param_vocab()
 {
 	ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-	
+
 	ret.push_back(ParamDesc("value_desc",Param::TYPE_VALUEDESC)
 		.set_local_name(_("Destination ValueNode (Animated)"))
 	);
@@ -80,9 +81,9 @@ Action::ActivepointSimpleAdd::get_param_vocab()
 }
 
 bool
-Action::ActivepointSimpleAdd::is_canidate(const ParamList &x)
+Action::ActivepointSimpleAdd::is_candidate(const ParamList &x)
 {
-	if(canidate_check(get_param_vocab(),x))
+	if(candidate_check(get_param_vocab(),x))
 	{
 		ValueDesc value_desc(x.find("value_desc")->second.get_value_desc());
 		if(!value_desc.parent_is_value_node() || !ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node()))
@@ -90,7 +91,7 @@ Action::ActivepointSimpleAdd::is_canidate(const ParamList &x)
 
 		return true;
 	}
-	return canidate_check(get_param_vocab(),x);
+	return candidate_check(get_param_vocab(),x);
 }
 
 bool
@@ -99,23 +100,23 @@ Action::ActivepointSimpleAdd::set_param(const synfig::String& name, const Action
 	if(name=="value_desc" && param.get_type()==Param::TYPE_VALUEDESC)
 	{
 		ValueDesc value_desc(param.get_value_desc());
-		
+
 		if(!value_desc.parent_is_value_node())
 			return false;
-		
+
 		value_node=ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node());
-		
+
 		if(!value_node)
 			return false;
-		
+
 		index=value_desc.get_index();
-		
+
 		return true;
 	}
 	if(name=="activepoint" && param.get_type()==Param::TYPE_ACTIVEPOINT)
 	{
 		activepoint = param.get_activepoint();
-		
+
 		return true;
 	}
 
@@ -132,11 +133,11 @@ Action::ActivepointSimpleAdd::is_ready()const
 
 void
 Action::ActivepointSimpleAdd::perform()
-{	
+{
 	//remove any pretenders that lie at our destination
 	ValueNode_DynamicList::ListEntry::findresult iter = value_node->list[index]
 															.find_time(activepoint.get_time());
-	
+
 	time_overwrite = false;
 	if(iter.second)
 	{
@@ -144,13 +145,13 @@ Action::ActivepointSimpleAdd::perform()
 		time_overwrite = true;
 		value_node->list[index].erase(overwritten_ap);
 	}
-	
+
 	//add the value node in since it's safe
 	value_node->list[index].add(activepoint);
-	
+
 	//sort them...
 	value_node->list[index].timing_info.sort();
-	
+
 	// Signal that a valuenode has been changed
 	value_node->changed();
 }
@@ -160,23 +161,23 @@ Action::ActivepointSimpleAdd::undo()
 {
 	//remove our old version...
 	ValueNode_DynamicList::ListEntry::findresult iter = value_node->list[index].find_uid(activepoint);
-	
+
 	if(!iter.second)
 	{
 		throw Error(_("The activepoint to remove no longer exists"));
 	}
-	
+
 	//remove the offending value
 	value_node->list[index].erase(*iter.first); //could also just use waypoint
-	
+
 	if(time_overwrite)
 	{
-		value_node->list[index].add(overwritten_ap);				
+		value_node->list[index].add(overwritten_ap);
 	}
-	
+
 	//sort them...
 	value_node->list[index].timing_info.sort();
-	
+
 	// Signal that a valuenode has been changed
 	value_node->changed();
 }