From a714c688d60a3a62114591984f57f26cd41dbed9 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Fri, 18 Mar 2016 11:23:29 +0100
Subject: Reverting 14701.

(bzr r14716.1.2)
---
 src/widgets/toolbox.cpp | 6 ------
 1 file changed, 6 deletions(-)

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

diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index f4d7ebf25..72537f727 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -55,7 +55,6 @@
 #include "ui/tools-switch.h"
 #include "../ui/icon-names.h"
 #include "../ui/widget/style-swatch.h"
-#include "../ui/widget/unit-tracker.h"
 #include "../verbs.h"
 #include "../widgets/button.h"
 #include "../widgets/spinbutton-events.h"
@@ -516,7 +515,6 @@ static gchar const * ui_descr =
         "    <toolitem action='TextSubscriptAction' />"
         "    <separator />"
         "    <toolitem action='TextLineHeightAction' />"
-        "    <toolitem action='TextLineHeightUnitAction' />"
         "    <toolitem action='TextLetterSpacingAction' />"
         "    <toolitem action='TextWordSpacingAction' />"
         "    <toolitem action='TextDxAction' />"
@@ -1124,10 +1122,6 @@ EgeAdjustmentAction * create_adjustment_action( gchar const *name,
         g_object_set_data( dataKludge, prefs->getEntry(path).getEntryName().data(), adj );
     }
 
-    if (unit_tracker) {
-        unit_tracker->addAdjustment(adj);
-    }   
-
     // Using a cast just to make sure we pass in the right kind of function pointer
     g_object_set( G_OBJECT(act), "tool-post", static_cast<EgeWidgetFixup>(sp_set_font_size_smaller), NULL );
 
-- 
cgit v1.2.3


From 4cce40a79ab973a3609cd5ee7666673bc2337fef Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Tue, 22 Mar 2016 14:56:36 +0100
Subject: Add line-height unit selector to text toolbar. Remove 'm' and 'ft'
 non-CSS lengths.

(bzr r14716.1.3)
---
 src/widgets/toolbox.cpp | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 72537f727..705c16d1f 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -515,6 +515,7 @@ static gchar const * ui_descr =
         "    <toolitem action='TextSubscriptAction' />"
         "    <separator />"
         "    <toolitem action='TextLineHeightAction' />"
+        "    <toolitem action='TextLineHeightUnitsAction' />"
         "    <toolitem action='TextLetterSpacingAction' />"
         "    <toolitem action='TextWordSpacingAction' />"
         "    <toolitem action='TextDxAction' />"
-- 
cgit v1.2.3