X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Flayerremove.cpp;h=4f08c3f7abc1be2bebfd5f7352158e3f08a748bb;hb=63e709f66d50c124cc0ece2325f4773ac4ae7b20;hp=abfe5f8664b879e52ff8f4de1cd26187aa31e3c7;hpb=c6af6e1c3816eb3b15c573089b32e6ae65cd2f49;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp index abfe5f8..4f08c3f 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp @@ -2,7 +2,7 @@ /*! \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 @@ -32,6 +32,8 @@ #include "layerremove.h" #include +#include + #endif using namespace std; @@ -42,14 +44,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,6 +63,25 @@ Action::LayerRemove::LayerRemove() { } +synfig::String +Action::LayerRemove::get_local_name()const +{ + String ret; + + if (layer_list.empty()) + return _("Remove Layer"); + + ret = strprintf("%s '%s'", + (layer_list.size() == 1 + ? _("Remove Layer") + : _("Remove Layers")), + layer_list.begin()->first->get_non_empty_description().c_str()); + + for(std::list >::const_iterator iter=++layer_list.begin(); iter!=layer_list.end(); ++iter) + ret += strprintf(", '%s'", (iter->first->get_non_empty_description().c_str())); + return ret; +} + Action::ParamVocab Action::LayerRemove::get_param_vocab() { @@ -120,7 +141,7 @@ Action::LayerRemove::perform() // 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.")); } @@ -130,7 +151,7 @@ Action::LayerRemove::perform() // 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")); }