Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.cpp b/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.cpp
index f2e5e1d..dc2140c 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
-/*!    \file action_layerremove.cpp
+/*!    \file groupremovelayers.cpp
 **     \brief Template File
 **
-**     $Id: groupremovelayers.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) 2007 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 "groupremovelayers.h"
 #include <synfigapp/canvasinterface.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -43,13 +46,13 @@ using namespace Action;
 /* === M A C R O S ========================================================= */
 
 ACTION_INIT(Action::GroupRemoveLayers);
-ACTION_SET_NAME(Action::GroupRemoveLayers,"group_remove_layers");
-ACTION_SET_LOCAL_NAME(Action::GroupRemoveLayers,"Remove Layers from a Group");
+ACTION_SET_NAME(Action::GroupRemoveLayers,"GroupRemoveLayers");
+ACTION_SET_LOCAL_NAME(Action::GroupRemoveLayers,N_("Remove Layers from a Group"));
 ACTION_SET_TASK(Action::GroupRemoveLayers,"remove");
 ACTION_SET_CATEGORY(Action::GroupRemoveLayers,Action::CATEGORY_LAYER|Action::CATEGORY_GROUP);
 ACTION_SET_PRIORITY(Action::GroupRemoveLayers,0);
 ACTION_SET_VERSION(Action::GroupRemoveLayers,"0.0");
-ACTION_SET_CVS_ID(Action::GroupRemoveLayers,"$Id: groupremovelayers.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::GroupRemoveLayers,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -65,26 +68,20 @@ Action::ParamVocab
 Action::GroupRemoveLayers::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"))
+               .set_desc(_("Layer to be removed from group"))
                .set_supports_multiple()
        );
 
-       ret.push_back(ParamDesc("group",Param::TYPE_STRING)
-               .set_local_name(_("Group"))
-               .set_desc(_("Name of the Group to add the Layers to"))
-               .set_user_supplied()
-       );
-       
        return ret;
 }
 
 bool
-Action::GroupRemoveLayers::is_canidate(const ParamList &x)
+Action::GroupRemoveLayers::is_candidate(const ParamList &x)
 {
-       return canidate_check(get_param_vocab(),x);
+       return candidate_check(get_param_vocab(),x);
 }
 
 bool
@@ -95,14 +92,7 @@ Action::GroupRemoveLayers::set_param(const synfig::String& name, const Action::P
                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;
        }
 
@@ -112,7 +102,7 @@ Action::GroupRemoveLayers::set_param(const synfig::String& name, const Action::P
 bool
 Action::GroupRemoveLayers::is_ready()const
 {
-       if(layer_list.empty() || group.empty())
+       if(layer_list.empty())
                return false;
        return Action::CanvasSpecific::is_ready();
 }
@@ -124,9 +114,7 @@ Action::GroupRemoveLayers::perform()
        for(iter=layer_list.begin();iter!=layer_list.end();++iter)
        {
                Layer::Handle layer(iter->first);
-               iter->second=layer->get_group();
-               
-               layer->remove_from_group(group);
+               layer->remove_from_group(iter->second=layer->get_group());
        }
 }
 
@@ -137,7 +125,7 @@ Action::GroupRemoveLayers::undo()
        for(iter=layer_list.begin();iter!=layer_list.end();++iter)
        {
                Layer::Handle layer(iter->first);
-               
+
                layer->add_to_group(iter->second);
        }
 }