From 31aa6219ac721c59cb1a98788dbca7b7a58c5000 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 10 Nov 2015 18:23:11 +0100
Subject: Spray Tool: Change hide invisibe by over visible and over invisible,
 sugested by Ivan Louette

(bzr r14453)
---
 src/widgets/toolbox.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/widgets/toolbox.cpp')

diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index cdb9e0d20..b9051dd50 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -321,7 +321,8 @@ static gchar const * ui_descr =
         "    <toolitem action='SprayStandard_deviationAction' />"
         "    <toolitem action='SprayMeanAction' />"
         "    <separator />"
-        "    <toolitem action='SprayOverVisibleAction' />"
+        "    <toolitem action='SprayOverNoTransparentAction' />"
+        "    <toolitem action='SprayOverTransparentAction' />"
         "    <toolitem action='SprayNoOverlapAction' />"
         "    <toolitem action='SprayToolOffsetAction' />"
         "    <separator />"
-- 
cgit v1.2.3


From de44c6059f00e773cef5c22534e12a1adc50b3a4 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 11 Nov 2015 01:02:03 +0100
Subject: Improvements to the over visible/invisible to minimize the colisions,
 sprayed items fit on background whith overlap visible or invisible areas Add
 option in picker mode to compute the center/or average area of sprayed item
 Now reverse work without adbanced trace dialog inverting the color. By this
 all buttons have a utility in advanced and in normal mode

(bzr r14454)
---
 src/widgets/toolbox.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/widgets/toolbox.cpp')

diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index b9051dd50..0aaba39f9 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -327,10 +327,11 @@ static gchar const * ui_descr =
         "    <toolitem action='SprayToolOffsetAction' />"
         "    <separator />"
         "    <toolitem action='SprayPickColorAction' />"
-        "    <toolitem action='SprayOverPickInverseValueAction' />"
         "    <toolitem action='SprayOverPickFillAction' />"
         "    <toolitem action='SprayOverPickStrokeAction' />"
-        
+        "    <toolitem action='SprayOverPickInverseValueAction' />"
+        "    <toolitem action='SprayPickCenterAction' />"
+
         "  </toolbar>"
 
         "  <toolbar name='ZoomToolbar'>"
@@ -369,7 +370,7 @@ static gchar const * ui_descr =
         "    <toolitem action='MeasureToGuides' />"
         "    <toolitem action='MeasureMarkDimension' />"
         "    <toolitem action='MeasureToItem' />"
-        "  </toolbar>"
+        "  </toolbar>" 
 
         "  <toolbar name='StarToolbar'>"
         "    <separator />"
-- 
cgit v1.2.3


From 75f6b25acdf6f51f5772e55d2150076b539b6e67 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 11 Nov 2015 09:34:01 +0100
Subject: Add option to spray tool to no overlap between colors

(bzr r14455)
---
 src/widgets/toolbox.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/widgets/toolbox.cpp')

diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 0aaba39f9..3e79e038a 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -323,15 +323,15 @@ static gchar const * ui_descr =
         "    <separator />"
         "    <toolitem action='SprayOverNoTransparentAction' />"
         "    <toolitem action='SprayOverTransparentAction' />"
+        "    <toolitem action='SprayPickNoOverlapAction' />"
         "    <toolitem action='SprayNoOverlapAction' />"
         "    <toolitem action='SprayToolOffsetAction' />"
         "    <separator />"
         "    <toolitem action='SprayPickColorAction' />"
-        "    <toolitem action='SprayOverPickFillAction' />"
-        "    <toolitem action='SprayOverPickStrokeAction' />"
-        "    <toolitem action='SprayOverPickInverseValueAction' />"
+        "    <toolitem action='SprayPickFillAction' />"
+        "    <toolitem action='SprayPickStrokeAction' />"
+        "    <toolitem action='SprayPickInverseValueAction' />"
         "    <toolitem action='SprayPickCenterAction' />"
-
         "  </toolbar>"
 
         "  <toolbar name='ZoomToolbar'>"
-- 
cgit v1.2.3