X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fwidgets%2Flayer-selector.cpp;h=66f4aebf4e77fd822908a38f6e0e8e3dd37ec5dd;hb=81a9af22c466ddef2c71616702e565245ea37254;hp=bf23dcfcac1bbad8d03eccbf621bb6557f59f686;hpb=87c6636aa10a025441b313717f37fdbbc5b9af6e;p=inkscape.git diff --git a/src/widgets/layer-selector.cpp b/src/widgets/layer-selector.cpp index bf23dcfca..66f4aebf4 100644 --- a/src/widgets/layer-selector.cpp +++ b/src/widgets/layer-selector.cpp @@ -28,7 +28,9 @@ #include "desktop.h" #include "document.h" #include "dialogs/layer-properties.h" +#include "layer-manager.h" #include "xml/node-event-vector.h" +#include "verbs.h" namespace Inkscape { namespace Widgets { @@ -290,9 +292,11 @@ void LayerSelector::_setDesktopLayer() { SPObject *layer=_selector.get_active()->get_value(_model_columns.object); if ( _desktop && layer ) { _layer_changed_connection.block(); - _desktop->setCurrentLayer(layer); + + _desktop->layer_manager->setCurrentLayer(layer); + _layer_changed_connection.unblock(); - sp_desktop_selection(_desktop)->clear(); + _selectLayer(_desktop->currentLayer()); } } @@ -574,14 +578,16 @@ void LayerSelector::_prepareLabelRenderer( void LayerSelector::_lockLayer(bool lock) { if ( _layer && SP_IS_ITEM(_layer) ) { SP_ITEM(_layer)->setLocked(lock); - sp_document_maybe_done(sp_desktop_document(_desktop), "LayerSelector:lock"); + sp_document_done(sp_desktop_document(_desktop), SP_VERB_NONE, + lock? _("Lock layer") : _("Unlock layer")); } } void LayerSelector::_hideLayer(bool hide) { if ( _layer && SP_IS_ITEM(_layer) ) { SP_ITEM(_layer)->setHidden(hide); - sp_document_maybe_done(sp_desktop_document(_desktop), "LayerSelector:hide"); + sp_document_done(sp_desktop_document(_desktop), SP_VERB_NONE, + hide? _("Hide layer") : _("Unhide layer")); } }