Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-studio / trunk / src / synfigapp / actions / layeradd.cpp

diff --git a/synfig-studio/trunk/src/synfigapp/actions/layeradd.cpp b/synfig-studio/trunk/src/synfigapp/actions/layeradd.cpp
index d70aa6a..51d12db 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/actions/layeradd.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/layeradd.cpp
@@ -2,19 +2,21 @@
 /*!    \file layeradd.cpp
 **     \brief Template File
 **
-**     $Id: layeradd.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
+**     Copyright (c) 2008 Chris Moore
 **
-**     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 +33,8 @@
 #include "layeradd.h"
 #include <synfigapp/canvasinterface.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -41,14 +45,14 @@ using namespace Action;
 
 /* === M A C R O S ========================================================= */
 
-ACTION_INIT(Action::LayerAdd);
-ACTION_SET_NAME(Action::LayerAdd,"layer_add");
-ACTION_SET_LOCAL_NAME(Action::LayerAdd,"Add Layer");
+ACTION_INIT_NO_GET_LOCAL_NAME(Action::LayerAdd);
+ACTION_SET_NAME(Action::LayerAdd,"LayerAdd");
+ACTION_SET_LOCAL_NAME(Action::LayerAdd,N_("Add Layer"));
 ACTION_SET_TASK(Action::LayerAdd,"add");
 ACTION_SET_CATEGORY(Action::LayerAdd,Action::CATEGORY_LAYER);
 ACTION_SET_PRIORITY(Action::LayerAdd,0);
 ACTION_SET_VERSION(Action::LayerAdd,"0.0");
-ACTION_SET_CVS_ID(Action::LayerAdd,"$Id: layeradd.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::LayerAdd,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -60,23 +64,32 @@ Action::LayerAdd::LayerAdd()
 {
 }
 
+synfig::String
+Action::LayerAdd::get_local_name()const
+{
+       if (layer)
+               return strprintf("%s '%s'", _("Add Layer"), layer->get_local_name().c_str());
+       else
+               return _("Add Layer");
+}
+
 Action::ParamVocab
 Action::LayerAdd::get_param_vocab()
 {
        ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-       
+
        ret.push_back(ParamDesc("new",Param::TYPE_LAYER)
                .set_local_name(_("New Layer"))
                .set_desc(_("Layer to be added"))
        );
-       
+
        return ret;
 }
 
 bool
-Action::LayerAdd::is_canidate(const ParamList &x)
+Action::LayerAdd::is_candidate(const ParamList &x)
 {
-       return canidate_check(get_param_vocab(),x);
+       return candidate_check(get_param_vocab(),x);
 }
 
 bool
@@ -85,7 +98,7 @@ Action::LayerAdd::set_param(const synfig::String& name, const Action::Param &par
        if(name=="new" && param.get_type()==Param::TYPE_LAYER)
        {
                layer=param.get_layer();
-               
+
                return true;
        }
 
@@ -105,13 +118,13 @@ Action::LayerAdd::perform()
 {
        // Set the layer's canvas
        layer->set_canvas(get_canvas());
-               
+
        // Push the layer onto the front of the canvas
-       get_canvas()->push_front(layer);        
+       get_canvas()->push_front(layer);
 
        // Mark ourselves as dirty if necessary
        //set_dirty(layer->active());
-       
+
        // Signal that a layer has been inserted
        if(get_canvas_interface())
        {
@@ -125,17 +138,17 @@ Action::LayerAdd::undo()
 {
        // Find the iterator for the layer
        Canvas::iterator iter=find(get_canvas()->begin(),get_canvas()->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."));
-       
+
        // Remove the layer from the canvas
        get_canvas()->erase(iter);
 
        // Mark ourselves as dirty if necessary
        //set_dirty(layer->active());
-       
+
        // Signal that a layer has been inserted
        if(get_canvas_interface())
        {