From 2c971fd0dd67269a5ecd6c3323071e8b0b08bf1b Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Wed, 1 Nov 2017 11:23:50 +0100 Subject: Add widget to color and some refactoring --- src/verbs.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/verbs.cpp') diff --git a/src/verbs.cpp b/src/verbs.cpp index c1c108415..962196d06 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -1592,6 +1592,9 @@ void ObjectVerb::perform( SPAction *action, void *data) case SP_VERB_OBJECT_SET_MASK: sel->setMask(false, false); break; + case SP_VERB_OBJECT_SET_INVERSE_MASK: + sel->setMask(false, false, false, true); + break; case SP_VERB_OBJECT_EDIT_MASK: sel->editMask(false); break; @@ -1601,6 +1604,9 @@ void ObjectVerb::perform( SPAction *action, void *data) case SP_VERB_OBJECT_SET_CLIPPATH: sel->setMask(true, false); break; + case SP_VERB_OBJECT_SET_INVERSE_CLIPPATH: + sel->setMask(true, false, false, true); + break; case SP_VERB_OBJECT_CREATE_CLIP_GROUP: sel->setClipGroup(); break; @@ -2873,12 +2879,16 @@ Verb *Verb::_base_verbs[] = { INKSCAPE_ICON("object-flip-vertical")), new ObjectVerb(SP_VERB_OBJECT_SET_MASK, "ObjectSetMask", N_("_Set"), N_("Apply mask to selection (using the topmost object as mask)"), NULL), + new ObjectVerb(SP_VERB_OBJECT_SET_INVERSE_MASK, "ObjectSetInverseMask", N_("_Set Inverse (LPE)"), + N_("Apply inverse mask to selection (using the topmost object as mask)"), NULL), new ObjectVerb(SP_VERB_OBJECT_EDIT_MASK, "ObjectEditMask", N_("_Edit"), N_("Edit mask"), INKSCAPE_ICON("path-mask-edit")), new ObjectVerb(SP_VERB_OBJECT_UNSET_MASK, "ObjectUnSetMask", N_("_Release"), N_("Remove mask from selection"), NULL), new ObjectVerb(SP_VERB_OBJECT_SET_CLIPPATH, "ObjectSetClipPath", N_("_Set"), N_("Apply clipping path to selection (using the topmost object as clipping path)"), NULL), + new ObjectVerb(SP_VERB_OBJECT_SET_INVERSE_CLIPPATH, "ObjectSetInverseClipPath", N_("_Set Inverse (LPE)"), + N_("Apply inverse clipping path to selection (using the topmost object as clipping path)"), NULL), new ObjectVerb(SP_VERB_OBJECT_CREATE_CLIP_GROUP, "ObjectCreateClipGroup", N_("Create Cl_ip Group"), N_("Creates a clip group using the selected objects as a base"), NULL), new ObjectVerb(SP_VERB_OBJECT_EDIT_CLIPPATH, "ObjectEditClipPath", N_("_Edit"), -- cgit v1.2.3 From 08382df305f91a07349031e785500eb7be34872c Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Fri, 3 Nov 2017 00:14:28 +0100 Subject: Move finctions away object sets --- src/verbs.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/verbs.cpp') diff --git a/src/verbs.cpp b/src/verbs.cpp index 962196d06..27fc29dd4 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -85,6 +85,9 @@ #include "ui/icon-names.h" #include "ui/tools/node-tool.h" #include "ui/dialog/save-template-dialog.h" +#include "live_effects/effect.h" +#include "live_effects/lpe-powerclip.h" +#include "live_effects/lpe-powermask.h" using Inkscape::DocumentUndo; using Inkscape::UI::Dialog::ActionAlign; @@ -1593,7 +1596,9 @@ void ObjectVerb::perform( SPAction *action, void *data) sel->setMask(false, false); break; case SP_VERB_OBJECT_SET_INVERSE_MASK: - sel->setMask(false, false, false, true); + sel->setMask(false, false); + using Inkscape::LivePathEffect; + sp_inverse_powermask(sp_action_get_selection(action)); break; case SP_VERB_OBJECT_EDIT_MASK: sel->editMask(false); @@ -1605,7 +1610,9 @@ void ObjectVerb::perform( SPAction *action, void *data) sel->setMask(true, false); break; case SP_VERB_OBJECT_SET_INVERSE_CLIPPATH: - sel->setMask(true, false, false, true); + sel->setMask(true, false); + using Inkscape::LivePathEffect; + sp_inverse_powerclip(sp_action_get_selection(action)); break; case SP_VERB_OBJECT_CREATE_CLIP_GROUP: sel->setClipGroup(); -- cgit v1.2.3 From bc776cf2ee8744fb0b49cb3ef9f53e835515624b Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Fri, 3 Nov 2017 02:17:35 +0100 Subject: Rename wrong named function --- src/verbs.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/verbs.cpp') diff --git a/src/verbs.cpp b/src/verbs.cpp index 27fc29dd4..d0975af16 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -1597,8 +1597,7 @@ void ObjectVerb::perform( SPAction *action, void *data) break; case SP_VERB_OBJECT_SET_INVERSE_MASK: sel->setMask(false, false); - using Inkscape::LivePathEffect; - sp_inverse_powermask(sp_action_get_selection(action)); + Inkscape::LivePathEffect::sp_inverse_powermask(sp_action_get_selection(action)); break; case SP_VERB_OBJECT_EDIT_MASK: sel->editMask(false); @@ -1611,8 +1610,7 @@ void ObjectVerb::perform( SPAction *action, void *data) break; case SP_VERB_OBJECT_SET_INVERSE_CLIPPATH: sel->setMask(true, false); - using Inkscape::LivePathEffect; - sp_inverse_powerclip(sp_action_get_selection(action)); + Inkscape::LivePathEffect::sp_inverse_powerclip(sp_action_get_selection(action)); break; case SP_VERB_OBJECT_CREATE_CLIP_GROUP: sel->setClipGroup(); -- cgit v1.2.3