X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fgroupremovelayers.cpp;h=acec54e5e6fb5b6cb5f40b9ba968608d7371ab5e;hb=d57e1c20fdab21aab99fe0561b942b9972f9fbba;hp=036a9d69dfdeff79e4779bf2f7e7077fe350e6d4;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.cpp b/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.cpp index 036a9d6..acec54e 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.cpp @@ -1,20 +1,21 @@ /* === 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 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 "groupremovelayers.h" #include +#include + #endif using namespace std; @@ -43,12 +46,12 @@ using namespace Action; 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_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 ======================================================= */ @@ -64,26 +67,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 @@ -94,14 +91,7 @@ Action::GroupRemoveLayers::set_param(const synfig::String& name, const Action::P std::pair 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; } @@ -111,7 +101,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(); } @@ -123,9 +113,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()); } } @@ -136,7 +124,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); } }