From 07a86951a15301ccb7eb1446cc1e6d3ca7a68f9b Mon Sep 17 00:00:00 2001
From: Alexander Brock <zaibu@lunar-orbit.de>
Date: Wed, 9 Nov 2016 01:23:41 +0100
Subject: Move boolop functions from sp_selected_path_<op> to
 ObjectSet::path<op>

(bzr r15223.1.1)
---
 src/verbs.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/verbs.cpp')

diff --git a/src/verbs.cpp b/src/verbs.cpp
index a5426f324..32aee4161 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -1115,22 +1115,22 @@ void SelectionVerb::perform(SPAction *action, void *data)
     bool handled = true;
     switch (reinterpret_cast<std::size_t>(data)) {
         case SP_VERB_SELECTION_UNION:
-            sp_selected_path_union(selection, dt);
+            selection->pathUnion();
             break;
         case SP_VERB_SELECTION_INTERSECT:
-            sp_selected_path_intersect(selection, dt);
+            selection->pathIntersect();
             break;
         case SP_VERB_SELECTION_DIFF:
-            sp_selected_path_diff(selection, dt);
+            selection->pathDiff();
             break;
         case SP_VERB_SELECTION_SYMDIFF:
-            sp_selected_path_symdiff(selection, dt);
+            selection->pathSymDiff();
             break;
         case SP_VERB_SELECTION_CUT:
-            sp_selected_path_cut(selection, dt);
+            selection->pathCut();
             break;
         case SP_VERB_SELECTION_SLICE:
-            sp_selected_path_slice(selection, dt);
+            selection->pathSlice();
             break;
         case SP_VERB_SELECTION_GROW:
         {
-- 
cgit v1.2.3


From 2e8438d76a5f26719d381843cd3ce3fa694809fb Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Tue, 27 Dec 2016 15:49:22 +0000
Subject: Rm remaining Gtk::Stock usage

(bzr r15368)
---
 src/verbs.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/verbs.cpp')

diff --git a/src/verbs.cpp b/src/verbs.cpp
index 32aee4161..975a3679e 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -37,7 +37,6 @@
 // If this is not done, then errors will be generate relating to Glib::Threads being undefined
 #include <gtkmm/filechooserdialog.h>
 #include <gtkmm/messagedialog.h>
-#include <gtkmm/stock.h>
 
 #include "desktop.h"
 
-- 
cgit v1.2.3


From e8dcb5062f6114a9fb06d496ab5d906aec405c78 Mon Sep 17 00:00:00 2001
From: "alexandru.roman" <alexroman5g@gmail.com>
Date: Sat, 21 Jan 2017 23:28:05 +0100
Subject: Fix "swap fill and stroke" for multiple objects in selection Add verb
 and shortcut possibility

Fixed bugs:
  - https://launchpad.net/bugs/367360
  - https://launchpad.net/bugs/675690

(bzr r15428)
---
 src/verbs.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/verbs.cpp')

diff --git a/src/verbs.cpp b/src/verbs.cpp
index 975a3679e..aeb742105 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -1086,6 +1086,9 @@ void EditVerb::perform(SPAction *action, void *data)
         case SP_VERB_EDIT_NEXT_PATHEFFECT_PARAMETER:
             sp_selection_next_patheffect_param(dt);
             break;
+        case SP_VERB_EDIT_SWAP_FILL_STROKE:
+            dt->selection->swapFillStroke();
+            break;
         case SP_VERB_EDIT_LINK_COLOR_PROFILE:
             break;
         case SP_VERB_EDIT_REMOVE_COLOR_PROFILE:
@@ -2585,6 +2588,8 @@ Verb *Verb::_base_verbs[] = {
                  N_("Create four guides aligned with the page borders"), NULL),
     new EditVerb(SP_VERB_EDIT_NEXT_PATHEFFECT_PARAMETER, "EditNextPathEffectParameter", N_("Next path effect parameter"),
                  N_("Show next editable path effect parameter"), INKSCAPE_ICON("path-effect-parameter-next")),
+    new EditVerb(SP_VERB_EDIT_SWAP_FILL_STROKE, "EditSwapFillStroke", N_("Swap fill and stroke"),
+                 N_("Swap fill and stroke of an object"), NULL),
 
     // Selection
     new SelectionVerb(SP_VERB_SELECTION_TO_FRONT, "SelectionToFront", N_("Raise to _Top"),
-- 
cgit v1.2.3