From 05f60fa645caeda752fe6bffb33993f6485cadb6 Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebronyat-signgmaildotcom>
Date: Sun, 2 Mar 2014 12:48:51 -0500
Subject: Experimental merge of Ponyscape to Inkscape trunk (does not compile)

(bzr r13090.1.3)
---
 src/ui/widget/filter-effect-chooser.cpp | 2 ++
 src/ui/widget/filter-effect-chooser.h   | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/ui/widget/filter-effect-chooser.cpp b/src/ui/widget/filter-effect-chooser.cpp
index 65706a9dc..3932bdfd4 100644
--- a/src/ui/widget/filter-effect-chooser.cpp
+++ b/src/ui/widget/filter-effect-chooser.cpp
@@ -23,6 +23,8 @@ namespace Widget {
 
 SimpleFilterModifier::SimpleFilterModifier(int flags)
     : _lb_blend(_("Blend mode:")),
+      _lb_blur(_("_Blur:")),
+      _lb_blur_unit(_("%")),
       _blend(BlendModeConverter, SP_ATTR_INVALID, false),
       _blur(_("Blur (%)"), 0, 0, 100, 1, 0.01, 1)
 {
diff --git a/src/ui/widget/filter-effect-chooser.h b/src/ui/widget/filter-effect-chooser.h
index 6f0c2f26e..a467adcb1 100644
--- a/src/ui/widget/filter-effect-chooser.h
+++ b/src/ui/widget/filter-effect-chooser.h
@@ -54,11 +54,13 @@ public:
     double get_blur_value() const;
     void set_blur_value(const double);
     void set_blur_sensitive(const bool);
+    Gtk::Label *get_blur_label() { return &_lb_blur; };
 
 private:
     int _flags;
     Gtk::HBox _hb_blend;
-    Gtk::Label _lb_blend;
+    Gtk::HBox _hb_blur;
+    Gtk::Label _lb_blend, _lb_blur, _lb_blur_unit;
 
     ComboBoxEnum<Inkscape::Filters::FilterBlendMode> _blend;
     SpinScale _blur;
-- 
cgit v1.2.3