Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/synfigapp/actions/groupaddlayers.cpp b/synfig-studio/trunk/src/synfigapp/actions/groupaddlayers.cpp
index 872d2ca..42d3025 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/actions/groupaddlayers.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/groupaddlayers.cpp
@@ -1,20 +1,21 @@
 /* === S Y N F I G ========================================================= */
-/*!    \file action_layerremove.cpp
+/*!    \file groupaddlayers.cpp
 **     \brief Template File
 **
-**     $Id: groupaddlayers.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 "groupaddlayers.h"
 #include <synfigapp/canvasinterface.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -42,13 +45,13 @@ using namespace Action;
 /* === M A C R O S ========================================================= */
 
 ACTION_INIT(Action::GroupAddLayers);
-ACTION_SET_NAME(Action::GroupAddLayers,"group_add_layers");
-ACTION_SET_LOCAL_NAME(Action::GroupAddLayers,"Add Layers to Group");
+ACTION_SET_NAME(Action::GroupAddLayers,"GroupAddLayers");
+ACTION_SET_LOCAL_NAME(Action::GroupAddLayers,N_("Add Layers to Group"));
 ACTION_SET_TASK(Action::GroupAddLayers,"add");
 ACTION_SET_CATEGORY(Action::GroupAddLayers,Action::CATEGORY_LAYER|Action::CATEGORY_GROUP);
 ACTION_SET_PRIORITY(Action::GroupAddLayers,0);
 ACTION_SET_VERSION(Action::GroupAddLayers,"0.0");
-ACTION_SET_CVS_ID(Action::GroupAddLayers,"$Id: groupaddlayers.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::GroupAddLayers,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -64,7 +67,7 @@ Action::ParamVocab
 Action::GroupAddLayers::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 added to group"))
@@ -76,14 +79,14 @@ Action::GroupAddLayers::get_param_vocab()
                .set_desc(_("Name of the Group to add the Layers to"))
                .set_user_supplied()
        );
-       
+
        return ret;
 }
 
 bool
-Action::GroupAddLayers::is_canidate(const ParamList &x)
+Action::GroupAddLayers::is_candidate(const ParamList &x)
 {
-       return canidate_check(get_param_vocab(),x);
+       return candidate_check(get_param_vocab(),x);
 }
 
 bool
@@ -94,14 +97,14 @@ Action::GroupAddLayers::set_param(const synfig::String& name, const Action::Para
                std::pair<synfig::Layer::Handle,String> layer_pair;
                layer_pair.first=param.get_layer();
                layer_list.push_back(layer_pair);
-               
+
                return true;
        }
 
        if(name=="group" && param.get_type()==Param::TYPE_STRING)
        {
                group=param.get_string();
-               
+
                return true;
        }
 
@@ -124,7 +127,7 @@ Action::GroupAddLayers::perform()
        {
                Layer::Handle layer(iter->first);
                iter->second=layer->get_group();
-               
+
                layer->add_to_group(group);
        }
 }
@@ -136,9 +139,9 @@ Action::GroupAddLayers::undo()
        for(iter=layer_list.begin();iter!=layer_list.end();++iter)
        {
                Layer::Handle layer(iter->first);
-               
+
                layer->remove_from_group(group);
-               
+
                layer->add_to_group(iter->second);
        }
 }