X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Flayeractivate.cpp;h=a051e01001b5a839919289e477cfc6df1b46d3e0;hb=8ef042c40521681cea99944097c4f90a5ac6cf74;hp=e4c034c5eedd44031a4ead811729e977d020fb01;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp b/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp
index e4c034c..a051e01 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp
@@ -2,19 +2,20 @@
 /*!	\file layeractivate.cpp
 **	\brief Template File
 **
-**	$Id: layeractivate.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 "layeractivate.h"
 #include <synfigapp/canvasinterface.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -42,16 +45,16 @@ 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__; }	
+	synfig::String class::get_name()const { return name__; }
 
 ACTION_INIT2(Action::LayerActivate);
 ACTION_SET_NAME(Action::LayerActivate,"layer_activate");
-ACTION_SET_LOCAL_NAME(Action::LayerActivate,_("Activate Layer"));
+ACTION_SET_LOCAL_NAME(Action::LayerActivate,N_("Activate Layer"));
 ACTION_SET_TASK(Action::LayerActivate,"activate");
 ACTION_SET_CATEGORY(Action::LayerActivate,Action::CATEGORY_LAYER);
 ACTION_SET_PRIORITY(Action::LayerActivate,0);
 ACTION_SET_VERSION(Action::LayerActivate,"0.0");
-ACTION_SET_CVS_ID(Action::LayerActivate,"$Id: layeractivate.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::LayerActivate,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -81,7 +84,7 @@ Action::ParamVocab
 Action::LayerActivate::get_param_vocab()
 {
 	ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-	
+
 	ret.push_back(ParamDesc("layer",Param::TYPE_LAYER)
 		.set_local_name(_("Layer"))
 	);
@@ -90,14 +93,14 @@ Action::LayerActivate::get_param_vocab()
 		.set_local_name(_("New Status"))
 		.set_desc(_("The new status of the layer"))
 	);
-	
+
 	return ret;
 }
 
 bool
-Action::LayerActivate::is_canidate(const ParamList &x)
+Action::LayerActivate::is_candidate(const ParamList &x)
 {
-	return canidate_check(get_param_vocab(),x);
+	return candidate_check(get_param_vocab(),x);
 }
 
 bool
@@ -106,14 +109,14 @@ Action::LayerActivate::set_param(const synfig::String& name, const Action::Param
 	if(name=="layer" && param.get_type()==Param::TYPE_LAYER)
 	{
 		layer=param.get_layer();
-		
+
 		return true;
 	}
 
 	if(name=="new_status" && param.get_type()==Param::TYPE_BOOL)
 	{
 		new_status=param.get_bool();
-		
+
 		return true;
 	}
 
@@ -132,10 +135,10 @@ void
 Action::LayerActivate::perform()
 {
 	Canvas::Handle subcanvas(layer->get_canvas());
-	
+
 	// Find the iterator for the layer
 	Canvas::iterator iter=find(subcanvas->begin(),subcanvas->end(),layer);
-	
+
 	// If we couldn't find the layer in the canvas, then bail
 	if(*iter!=layer)
 		throw Error(_("This layer doesn't exist anymore."));
@@ -146,9 +149,9 @@ Action::LayerActivate::perform()
 	//if(get_canvas()!=subcanvas && !subcanvas->is_inline())
 	//if(get_canvas()->get_root()!=subcanvas->get_root())
 	//	throw Error(_("This layer doesn't belong to this composition"));
-	
+
 	old_status=layer->active();
-	
+
 	// If we are changing the status to what it already is,
 	// the go ahead and return
 	if(new_status==old_status)
@@ -158,7 +161,7 @@ Action::LayerActivate::perform()
 	}
 	else
 		set_dirty();
-	
+
 	if(new_status)
 		layer->enable();
 	else
@@ -189,7 +192,7 @@ Action::LayerActivate::undo()
 		layer->enable();
 	else
 		layer->disable();
-	
+
 	if(get_canvas_interface())
 	{
 		get_canvas_interface()->signal_layer_status_changed()(layer,old_status);