From 13412fe4b1e8ed5cf540394f799ac8df21b1cbc8 Mon Sep 17 00:00:00 2001
From: Jabiertxof <jtx@jtx>
Date: Fri, 6 Jan 2017 02:09:33 +0100
Subject: Improve UI to partialy fix bug 1654121 now offset in measure is neas
 the only button tat have this option. also improved tooltip

(bzr r15393)
---
 src/widgets/measure-toolbar.cpp | 2 +-
 src/widgets/toolbox.cpp         | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/widgets')

diff --git a/src/widgets/measure-toolbar.cpp b/src/widgets/measure-toolbar.cpp
index a8c974bbc..066c3fbfa 100644
--- a/src/widgets/measure-toolbar.cpp
+++ b/src/widgets/measure-toolbar.cpp
@@ -326,7 +326,7 @@ void sp_measure_toolbox_prep(SPDesktop * desktop, GtkActionGroup* mainActions, G
     {
         eact = create_adjustment_action( "MeasureOffsetAction",
                                          _("Offset"), _("Offset:"),
-                                         _("The offset size"),
+                                         _("Mark dimension offset"),
                                          "/tools/measure/offset", 5.0,
                                          GTK_WIDGET(desktop->canvas), holder, FALSE, NULL,
                                          0.0, 90000.0, 1.0, 4.0,
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 758a3125b..126eac9cd 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -362,8 +362,6 @@ static gchar const * ui_descr =
         "    <separator />"
         "    <toolitem action='MeasureScaleAction' />"
         "    <separator />"
-        "    <toolitem action='MeasureOffsetAction' />"
-        "    <separator />"
         "    <toolitem action='measure_units_label' />"
         "    <toolitem action='MeasureUnitsAction' />"
         "    <toolitem action='MeasureIgnore1stAndLast' />"
@@ -373,8 +371,9 @@ static gchar const * ui_descr =
         "    <toolitem action='MeasureReverse' />"
         "    <toolitem action='MeasureToPhantom' />"
         "    <toolitem action='MeasureToGuides' />"
-        "    <toolitem action='MeasureMarkDimension' />"
         "    <toolitem action='MeasureToItem' />"
+        "    <toolitem action='MeasureMarkDimension' />"
+        "    <toolitem action='MeasureOffsetAction' />"
         "  </toolbar>" 
 
         "  <toolbar name='StarToolbar'>"
-- 
cgit v1.2.3


From bfcc3c57a2387e25bb2bc05a8a77f0ce51ca6b21 Mon Sep 17 00:00:00 2001
From: Tim Sheridan <tghs@tghs.net>
Date: Sat, 7 Jan 2017 00:46:07 +0000
Subject: Add missing include for array template

(bzr r15394.1.1)
---
 src/widgets/eraser-toolbar.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/widgets')

diff --git a/src/widgets/eraser-toolbar.cpp b/src/widgets/eraser-toolbar.cpp
index 64aace4e7..7377cdc00 100644
--- a/src/widgets/eraser-toolbar.cpp
+++ b/src/widgets/eraser-toolbar.cpp
@@ -33,6 +33,8 @@
 #include "eraser-toolbar.h"
 #include "calligraphy-toolbar.h" // TODO: needed for update_presets_list
 
+#include <array>
+
 #include "desktop.h"
 #include "document-undo.h"
 #include "widgets/ege-adjustment-action.h"
-- 
cgit v1.2.3