Added copyright lines for files I've edited this year.

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

diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp
index 4fd7b0f..0cf2a17 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
-/*!    \file action_layerremove.cpp
+/*!    \file layerremove.cpp
 **     \brief Template File
 **
-**     $Id: layerremove.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
+**     $Id$
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2008 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -32,6 +33,8 @@
 #include "layerremove.h"
 #include <synfigapp/canvasinterface.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -42,14 +45,14 @@ using namespace Action;
 
 /* === M A C R O S ========================================================= */
 
-ACTION_INIT(Action::LayerRemove);
+ACTION_INIT_NO_GET_LOCAL_NAME(Action::LayerRemove);
 ACTION_SET_NAME(Action::LayerRemove,"layer_remove");
-ACTION_SET_LOCAL_NAME(Action::LayerRemove,"Remove Layer");
+ACTION_SET_LOCAL_NAME(Action::LayerRemove,N_("Remove Layer"));
 ACTION_SET_TASK(Action::LayerRemove,"remove");
 ACTION_SET_CATEGORY(Action::LayerRemove,Action::CATEGORY_LAYER);
 ACTION_SET_PRIORITY(Action::LayerRemove,0);
 ACTION_SET_VERSION(Action::LayerRemove,"0.0");
-ACTION_SET_CVS_ID(Action::LayerRemove,"$Id: layerremove.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::LayerRemove,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -61,17 +64,23 @@ Action::LayerRemove::LayerRemove()
 {
 }
 
+synfig::String
+Action::LayerRemove::get_local_name()const
+{
+       return get_layer_descriptions(layer_list, _("Remove Layer"), _("Remove Layers"));
+}
+
 Action::ParamVocab
 Action::LayerRemove::get_param_vocab()
 {
        ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-       
+
        ret.push_back(ParamDesc("layer",Param::TYPE_LAYER)
                .set_local_name(_("Layer"))
                .set_desc(_("Layer to be deleted"))
                .set_supports_multiple()
        );
-       
+
        return ret;
 }
 
@@ -89,7 +98,7 @@ Action::LayerRemove::set_param(const synfig::String& name, const Action::Param &
                std::pair<synfig::Layer::Handle,int> layer_pair;
                layer_pair.first=param.get_layer();
                layer_list.push_back(layer_pair);
-               
+
                return true;
        }
 
@@ -116,36 +125,36 @@ Action::LayerRemove::perform()
 
                // Find the iterator for the layer
                Canvas::iterator iter2=find(subcanvas->begin(),subcanvas->end(),layer);
-               
+
                // If we couldn't find the layer in the canvas, then bail
                if(*iter2!=layer)
                {
-                       /*!     \fixme We should really undo all prior removals
+                       /*!     \todo We should really undo all prior removals
                        **      before we go throwing shit around */
                        throw Error(_("This layer doesn't exist anymore."));
                }
-               
+
                // If the subcanvas isn't the same as the canvas,
                // then it had better be an inline canvas. If not,
                // bail
                if(get_canvas()!=subcanvas && !subcanvas->is_inline())
                {
-                       /*!     \fixme We should really undo all prior removals
+                       /*!     \todo We should really undo all prior removals
                        **      before we go throwing shit around */
                        throw Error(_("This layer doesn't belong to this canvas anymore"));
                }
-               
+
                set_canvas(subcanvas);
-               
+
                // Calculate the depth that the layer was at (For the undo)
                iter->second=layer->get_depth();
-       
+
                // Mark ourselves as dirty if necessary
                set_dirty(layer->active());
-                       
+
                // Remove the layer from the canvas
                subcanvas->erase(iter2);
-               
+
                // Signal that a layer has been removed
                if(get_canvas_interface())
                        get_canvas_interface()->signal_layer_removed()(layer);
@@ -157,23 +166,23 @@ Action::LayerRemove::undo()
 {
        std::list<std::pair<synfig::Layer::Handle,int> >::reverse_iterator iter;
        for(iter=layer_list.rbegin();iter!=layer_list.rend();++iter)
-       {       
+       {
                Layer::Handle layer(iter->first);
                int& depth(iter->second);
-               
+
                // Set the layer's canvas
                layer->set_canvas(get_canvas());
-       
+
                // Make sure that the depth is valid
                if(get_canvas()->size()<depth)
                        depth=get_canvas()->size();
-               
+
                // Mark ourselves as dirty if necessary
                set_dirty(layer->active());
-       
+
                // Insert the layer into the canvas at the desired depth
-               get_canvas()->insert(get_canvas()->begin()+depth,layer);        
-               
+               get_canvas()->insert(get_canvas()->begin()+depth,layer);
+
                // Signal that a layer has been inserted
                if(get_canvas_interface())
                        get_canvas_interface()->signal_layer_inserted()(layer,depth);