Remove font-Dialog and useGtk::FontSelector instead

(bzr r15017.1.13)

14 files changed, 209 insertions, 338 deletions

diff --git a/src/live_effects/CMakeLists.txt b/src/live_effects/CMakeLists.txt
index c3d740862..784317090 100644
--- a/src/live_effects/CMakeLists.txt
+++ b/src/live_effects/CMakeLists.txt
@@ -69,7 +69,7 @@ set(live_effects_SRC
 	parameter/powerstrokepointarray.cpp
 	parameter/random.cpp
 	parameter/text.cpp
-	parameter/font.cpp
+	parameter/fontbutton.cpp
 	parameter/togglebutton.cpp
 	parameter/transformedpoint.cpp
 	parameter/unit.cpp
@@ -151,7 +151,7 @@ set(live_effects_SRC
 	parameter/powerstrokepointarray.h
 	parameter/random.h
 	parameter/text.h
-	parameter/font.h
+	parameter/fontbutton.h
 	parameter/togglebutton.h
 	parameter/transformedpoint.h
 	parameter/unit.h
diff --git a/src/live_effects/lpe-measure-line.cpp b/src/live_effects/lpe-measure-line.cpp
index 6145f7592..5df3d499e 100644
--- a/src/live_effects/lpe-measure-line.cpp
+++ b/src/live_effects/lpe-measure-line.cpp
@@ -7,6 +7,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #include "live_effects/lpe-measure-line.h"
+#include <pangomm/fontdescription.h>
+#include <libnrtype/font-lister.h>
 #include "inkscape.h"
 #include "xml/node.h"
 #include "uri.h"
@@ -47,13 +49,13 @@ static const Util::EnumDataConverter<OrientationMethod> OMConverter(OrientationM
 
 LPEMeasureLine::LPEMeasureLine(LivePathEffectObject *lpeobject) :
     Effect(lpeobject),
-    fontselector(_("Font Selector*"), _("Font Selector"), "fontselector", &wr, this, " "),
+    fontbutton(_("Font*"), _("Font Selector"), "fontbutton", &wr, this),
     orientation(_("Orientation"), _("Orientation method"), "orientation", OMConverter, &wr, this, OM_PARALLEL, false),
     origin(_("Optional Origin"), _("Optional origin"), "origin", &wr, this),
     curve_linked(_("Curve on optional origin"), _("Curve on optional origin, set 0 to start/end"), "curve_linked", &wr, this, 1),
     origin_offset(_("Optional origin offset*"), _("Optional origin offset"), "origin_offset", &wr, this, 5),
     scale(_("Scale*"), _("Scaling factor"), "scale", &wr, this, 1.0),
-    precision(_("Number precision*"), _("Number precision"), "precision", &wr, this, 2),
+    precision(_("Precision*"), _("Precision"), "precision", &wr, this, 2),
     offset_right_left(_("Offset right left*"), _("Offset right left"), "offset_right_left", &wr, this, 0),
     offset_top_bottom(_("Offset top bottom*"), _("Offset top bottom"), "offset_top_bottom", &wr, this, 5),
     gap_start(_("Gap to line from origin"), _("Gap to line from origin, without affecting measure"), "gap_start", &wr, this, 0),
@@ -64,7 +66,7 @@ LPEMeasureLine::LPEMeasureLine(LivePathEffectObject *lpeobject) :
     scale_insensitive(_("Scale insensitive*"), _("Scale insensitive to transforms in element, parents..."), "scale_insensitive", &wr, this, true),
     local_locale(_("Local Number Format*"), _("Local number format"), "local_locale", &wr, this, true)
 {
-    registerParameter(&fontselector);
+    registerParameter(&fontbutton);
     registerParameter(&orientation);
     registerParameter(&origin);
     registerParameter(&curve_linked);
@@ -81,7 +83,7 @@ LPEMeasureLine::LPEMeasureLine(LivePathEffectObject *lpeobject) :
     registerParameter(&scale_insensitive);
     registerParameter(&local_locale);
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    fontselector.param_update_default(prefs->getString("/live_effects/measure-line/fontselector"));
+    fontbutton.param_update_default(prefs->getString("/live_effects/measure-line/fontbutton"));
     scale.param_update_default(prefs->getDouble("/live_effects/measure-line/scale", 1.0));
     precision.param_update_default(prefs->getInt("/live_effects/measure-line/precision", 2));
     offset_right_left.param_update_default(prefs->getDouble("/live_effects/measure-line/offset_right_left", 0.0));
@@ -116,7 +118,6 @@ LPEMeasureLine::LPEMeasureLine(LivePathEffectObject *lpeobject) :
     gap_end.param_set_range(-999999.0, 999999.0);
     gap_end.param_set_increments(1, 1);
     gap_end.param_set_digits(2);
-    fontlister = Inkscape::FontLister::get_instance();
 }
 
 bool LPEMeasureLine::alerts_off = false;
@@ -294,15 +295,14 @@ LPEMeasureLine::doBeforeEffect (SPLPEItem const* lpeitem)
                     rtspan->setAttribute("sodipodi:role", "line");
                 }
                 SPCSSAttr *css = sp_repr_css_attr_new();
-                Glib::ustring fontspec = fontselector.param_readFontSpec(fontselector.param_getSVGValue());
-                double fontsize = fontselector.param_readFontSize(fontselector.param_getSVGValue());
-                fontlister->fill_css( css, fontspec );
+                Pango::FontDescription fontdesc((Glib::ustring)fontbutton.param_getSVGValue());
+                double fontsize = fontdesc.get_size()/Pango::SCALE;
+                Inkscape::FontLister *fontlister = Inkscape::FontLister::get_instance();
+                fontlister->fill_css( css, (Glib::ustring)fontbutton.param_getSVGValue() );
                 std::stringstream font_size;
                 font_size.imbue(std::locale::classic());
                 font_size <<  fontsize << "pt";
                 sp_repr_css_set_property (css, "font-size", font_size.str().c_str());
-                sp_repr_css_set_property (css, "font-style", "normal");
-                sp_repr_css_set_property (css, "font-weight", "normal");
                 sp_repr_css_set_property (css, "line-height", "125%");
                 sp_repr_css_set_property (css, "letter-spacing", "0");
                 sp_repr_css_set_property (css, "word-spacing", "0");
@@ -352,14 +352,15 @@ LPEMeasureLine::doBeforeEffect (SPLPEItem const* lpeitem)
                 }
                 length = Inkscape::Util::Quantity::convert(length, doc_unit.c_str(), unit.get_abbreviation());
                 std::stringstream length_str;
-                length_str.setf(std::ios::fixed, std::ios::floatfield);
                 length_str.precision(precision);
+                length_str.setf(std::ios::fixed, std::ios::floatfield);
                 if (local_locale) {
                     length_str.imbue(std::locale(""));
                 } else {
                     length_str.imbue(std::locale::classic());
                 }
-                length_str << length << unit.get_abbreviation();
+                length_str << std::fixed << length;
+                length_str << unit.get_abbreviation();
                 Inkscape::XML::Node *rstring = NULL;
                 if (!elemref) {
                     rstring = xml_doc->createTextNode(length_str.str().c_str());
@@ -509,7 +510,7 @@ void
 LPEMeasureLine::saveDefault()
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    prefs->setString("/live_effects/measure-line/fontselector", (Glib::ustring)fontselector.param_getSVGValue());
+    prefs->setString("/live_effects/measure-line/fontbutton", (Glib::ustring)fontbutton.param_getSVGValue());
     prefs->setDouble("/live_effects/measure-line/scale", scale);
     prefs->setInt("/live_effects/measure-line/precision", precision);
     prefs->setDouble("/live_effects/measure-line/offset_right_left", offset_right_left);
diff --git a/src/live_effects/lpe-measure-line.h b/src/live_effects/lpe-measure-line.h
index 67d27408a..15831e231 100644
--- a/src/live_effects/lpe-measure-line.h
+++ b/src/live_effects/lpe-measure-line.h
@@ -12,7 +12,7 @@
 
 #include "live_effects/effect.h"
 #include "live_effects/parameter/enum.h"
-#include "live_effects/parameter/font.h"
+#include "live_effects/parameter/fontbutton.h"
 #include "live_effects/parameter/text.h"
 #include "live_effects/parameter/unit.h"
 #include "live_effects/parameter/bool.h"
@@ -47,8 +47,7 @@ public:
     void saveDefault();
     virtual Gtk::Widget *newWidget();
 private:
-    FontParam fontselector;
-    Inkscape::FontLister *fontlister;
+    FontButtonParam fontbutton;
     EnumParam<OrientationMethod> orientation;
     OriginalPathParam origin;
     ScalarParam curve_linked;
diff --git a/src/live_effects/parameter/Makefile_insert b/src/live_effects/parameter/Makefile_insert
index bd1c5b600..d9cd5b3c1 100644
--- a/src/live_effects/parameter/Makefile_insert
+++ b/src/live_effects/parameter/Makefile_insert
@@ -11,6 +11,8 @@ ink_common_sources += \
 	live_effects/parameter/random.h	\
 	live_effects/parameter/point.cpp	\
 	live_effects/parameter/point.h	\
+	live_effects/parameter/fontbutton.cpp	\
+	live_effects/parameter/fontbutton.h	\
 	live_effects/parameter/enum.h	\
 	live_effects/parameter/path-reference.cpp	\
 	live_effects/parameter/path-reference.h	\
diff --git a/src/live_effects/parameter/font.cpp b/src/live_effects/parameter/font.cpp
deleted file mode 100644
index 8f89ee5c4..000000000
--- a/src/live_effects/parameter/font.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Authors:
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-
-#include "ui/widget/registered-widget.h"
-#include "live_effects/parameter/font.h"
-#include "live_effects/effect.h"
-#include "ui/widget/font-selector.h"
-#include "svg/svg.h"
-#include "svg/stringstream.h"
-#include "verbs.h"
-
-#include <glibmm/i18n.h>
-
-namespace Inkscape {
-
-namespace LivePathEffect {
-
-FontParam::FontParam( const Glib::ustring& label, const Glib::ustring& tip,
-                      const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr,
-                      Effect* effect, const Glib::ustring default_value )
-    : Parameter(label, tip, key, wr, effect),
-      value(default_value),
-      defvalue(default_value)
-{
-}
-
-void
-FontParam::param_set_default()
-{
-    param_setValue(defvalue);
-}
-void 
-FontParam::param_update_default(const Glib::ustring default_value){
-    defvalue = default_value;
-}
-
-Glib::ustring
-FontParam::param_readFontSpec(const gchar * strvalue)
-{
-    Glib::ustring result;
-    gchar ** strarray = g_strsplit(strvalue, " @ ", 2);
-    double fontsize;
-    if (strarray[1]) {
-        unsigned int success = sp_svg_number_read_d(strarray[1], &fontsize);
-        if (success == 1) {
-            result = (Glib::ustring)strarray[0];
-            g_strfreev (strarray);
-            return result;
-        }
-    }
-    g_strfreev (strarray);
-    return result;
-}
-
-double
-FontParam::param_readFontSize(const gchar * strvalue)
-{
-    gchar ** strarray = g_strsplit(strvalue, " @ ", 2);
-    double fontsize = 0;
-    if (strarray[1]) {
-        unsigned int success = sp_svg_number_read_d(strarray[1], &fontsize);
-        if (success == 1) {
-                g_strfreev (strarray);
-                return fontsize;
-        }
-    }
-    g_strfreev (strarray);
-    return fontsize;
-}
-
-bool
-FontParam::param_readSVGValue(const gchar * strvalue)
-{
-    double fontsize = param_readFontSize(strvalue);
-    Glib::ustring fontspec = param_readFontSpec(strvalue);
-    Inkscape::SVGOStringStream os;
-    os << fontspec << " @ " << fontsize;
-    param_setValue((Glib::ustring)os.str());
-    return true;
-}
-
-gchar *
-FontParam::param_getSVGValue() const
-{
-    return g_strdup(value.c_str());
-}
-
-Gtk::Widget *
-FontParam::param_newWidget()
-{
-    Inkscape::UI::Widget::RegisteredFontSelector * fontselectorwdg = Gtk::manage(
-        new Inkscape::UI::Widget::RegisteredFontSelector( param_label,
-                                                          param_tooltip,
-                                                          param_key,
-                                                          *param_wr,
-                                                          param_effect->getRepr(),
-                                                          param_effect->getSPDoc() ) );
-    double fontsize = param_readFontSize(param_getSVGValue());
-    Glib::ustring fontspec = param_readFontSpec(param_getSVGValue());
-    fontselectorwdg->setValue( fontspec, fontsize );
-    fontselectorwdg->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change font selector parameter"));
-    param_effect->upd_params = false;
-    return dynamic_cast<Gtk::Widget *> (fontselectorwdg);
-}
-
-void
-FontParam::param_setValue(const Glib::ustring newvalue)
-{
-    value = newvalue;
-}
-
-} /* namespace LivePathEffect */
-
-} /* namespace Inkscape */
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
diff --git a/src/live_effects/parameter/fontbutton.cpp b/src/live_effects/parameter/fontbutton.cpp
new file mode 100644
index 000000000..ff8ab76a0
--- /dev/null
+++ b/src/live_effects/parameter/fontbutton.cpp
@@ -0,0 +1,92 @@
+/*
+ * Authors:
+ *
+ * Released under GNU GPL, read the file 'COPYING' for more information
+ */
+
+
+#include "ui/widget/registered-widget.h"
+#include "live_effects/parameter/fontbutton.h"
+#include "live_effects/effect.h"
+#include "ui/widget/font-button.h"
+#include "svg/svg.h"
+#include "svg/stringstream.h"
+#include "verbs.h"
+
+#include <glibmm/i18n.h>
+
+namespace Inkscape {
+
+namespace LivePathEffect {
+
+FontButtonParam::FontButtonParam( const Glib::ustring& label, const Glib::ustring& tip,
+                      const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr,
+                      Effect* effect, const Glib::ustring default_value )
+    : Parameter(label, tip, key, wr, effect),
+      value(default_value),
+      defvalue(default_value)
+{
+}
+
+void
+FontButtonParam::param_set_default()
+{
+    param_setValue(defvalue);
+}
+void 
+FontButtonParam::param_update_default(const Glib::ustring default_value){
+    defvalue = default_value;
+}
+
+bool
+FontButtonParam::param_readSVGValue(const gchar * strvalue)
+{
+    Inkscape::SVGOStringStream os;
+    os << strvalue;
+    param_setValue((Glib::ustring)os.str());
+    return true;
+}
+
+gchar *
+FontButtonParam::param_getSVGValue() const
+{
+    return g_strdup(value.c_str());
+}
+
+Gtk::Widget *
+FontButtonParam::param_newWidget()
+{
+    Inkscape::UI::Widget::RegisteredFontButton * fontbuttonwdg = Gtk::manage(
+        new Inkscape::UI::Widget::RegisteredFontButton( param_label,
+                                                        param_tooltip,
+                                                        param_key,
+                                                        *param_wr,
+                                                        param_effect->getRepr(),
+                                                        param_effect->getSPDoc() ) );
+    Glib::ustring fontspec = param_getSVGValue();
+    fontbuttonwdg->setValue( fontspec);
+    fontbuttonwdg->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change font button parameter"));
+    param_effect->upd_params = false;
+    return dynamic_cast<Gtk::Widget *> (fontbuttonwdg);
+}
+
+void
+FontButtonParam::param_setValue(const Glib::ustring newvalue)
+{
+    value = newvalue;
+}
+
+} /* namespace LivePathEffect */
+
+} /* namespace Inkscape */
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
diff --git a/src/live_effects/parameter/font.h b/src/live_effects/parameter/fontbutton.h
index 3909ea424..387ad130b 100644
--- a/src/live_effects/parameter/font.h
+++ b/src/live_effects/parameter/fontbutton.h
@@ -15,21 +15,19 @@ namespace Inkscape {
 
 namespace LivePathEffect {
 
-class FontParam : public Parameter {
+class FontButtonParam : public Parameter {
 public:
-    FontParam( const Glib::ustring& label,
+    FontButtonParam( const Glib::ustring& label,
                const Glib::ustring& tip,
                const Glib::ustring& key,
                Inkscape::UI::Widget::Registry* wr,
                Effect* effect,
                const Glib::ustring default_value = "");
-    virtual ~FontParam() {}
+    virtual ~FontButtonParam() {}
 
     virtual Gtk::Widget * param_newWidget();
     virtual bool param_readSVGValue(const gchar * strvalue);
-    double param_readFontSize(const gchar * strvalue);
     void param_update_default(const Glib::ustring defvalue);
-    Glib::ustring param_readFontSpec(const gchar * strvalue);
     virtual gchar * param_getSVGValue() const;
 
     void param_setValue(const Glib::ustring newvalue);
@@ -39,27 +37,13 @@ public:
     const Glib::ustring get_value() const { return defvalue; };
 
 private:
-    FontParam(const FontParam&);
-    FontParam& operator=(const FontParam&);
+    FontButtonParam(const FontButtonParam&);
+    FontButtonParam& operator=(const FontButtonParam&);
     Glib::ustring value;
     Glib::ustring defvalue;
 
 };
 
-/*
- * This parameter does not display a widget in the LPE dialog; LPEs can use it to display on-canvas
- * text that should not be settable by the user. Note that since no widget is provided, the
- * parameter must be initialized differently than usual (only with a pointer to the parent effect;
- * no label, no tooltip, etc.).
- */
-class FontParamInternal : public FontParam {
-public:
-    FontParamInternal(Effect* effect) :
-        FontParam("", "", "", NULL, effect) {}
-
-    virtual Gtk::Widget * param_newWidget() { return NULL; }
-};
-
 } //namespace LivePathEffect
 
 } //namespace Inkscape
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 62f341962..af375f1f9 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -128,7 +128,7 @@ set(ui_SRC
 	widget/entity-entry.cpp
 	widget/entry.cpp
 	widget/filter-effect-chooser.cpp
-	widget/font-selector.cpp
+	widget/font-button.cpp
 	widget/font-variants.cpp
 	widget/frame.cpp
 	widget/gimpcolorwheel.c
@@ -313,7 +313,7 @@ set(ui_SRC
 	widget/entity-entry.h
 	widget/entry.h
 	widget/filter-effect-chooser.h
-	widget/font-selector.h
+	widget/font-button.h
 	widget/font-variants.h
 	widget/frame.h
 	widget/gimpspinscale.h
diff --git a/src/ui/widget/Makefile_insert b/src/ui/widget/Makefile_insert
index bb833e5ec..b5d8a74f6 100644
--- a/src/ui/widget/Makefile_insert
+++ b/src/ui/widget/Makefile_insert
@@ -33,8 +33,8 @@ ink_common_sources +=	\
 	ui/widget/entry.h        \
 	ui/widget/filter-effect-chooser.h \
 	ui/widget/filter-effect-chooser.cpp \
-	ui/widget/font-selector.h      	\
-	ui/widget/font-selector.cpp      	\
+	ui/widget/font-button.h      	\
+	ui/widget/font-button.cpp      	\
 	ui/widget/font-variants.h      	\
 	ui/widget/font-variants.cpp     \
 	ui/widget/gimpspinscale.c	\
diff --git a/src/ui/widget/font-button.cpp b/src/ui/widget/font-button.cpp
new file mode 100644
index 000000000..2c79347b2
--- /dev/null
+++ b/src/ui/widget/font-button.cpp
@@ -0,0 +1,58 @@
+/*
+ *
+ * Released under GNU GPL.  Read the file 'COPYING' for more information.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "font-button.h"
+#include <glibmm/i18n.h>
+
+namespace Inkscape {
+namespace UI {
+namespace Widget {
+
+FontButton::FontButton(Glib::ustring const &label, Glib::ustring const &tooltip,
+              Glib::ustring const &suffix,
+              Glib::ustring const &icon,
+              bool mnemonic)
+           : Labelled(label, tooltip, new Gtk::FontButton("sans"), suffix, icon, mnemonic)
+{
+}
+
+Glib::ustring FontButton::getValue() const
+{
+    g_assert(_widget != NULL);
+    return static_cast<Gtk::FontButton*>(_widget)->get_font_name();
+}
+
+
+void FontButton::setValue (Glib::ustring fontspec)
+{
+    g_assert(_widget != NULL);
+    static_cast<Gtk::FontButton*>(_widget)->set_font_name(fontspec);
+}
+
+Glib::SignalProxy0<void> FontButton::signal_font_value_changed()
+{
+    g_assert(_widget != NULL);
+    return static_cast<Gtk::FontButton*>(_widget)->signal_font_set();
+}
+
+
+} // namespace Widget
+} // namespace UI
+} // namespace Inkscape
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/ui/widget/font-selector.h b/src/ui/widget/font-button.h
index 8146bc370..1f1ad2d01 100644
--- a/src/ui/widget/font-selector.h
+++ b/src/ui/widget/font-button.h
@@ -5,30 +5,24 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
-#ifndef INKSCAPE_UI_WIDGET_FONT_SELECTOR_H
-#define INKSCAPE_UI_WIDGET_FONT_SELECTOR_H
+#ifndef INKSCAPE_UI_WIDGET_FONT_BUTTON_H
+#define INKSCAPE_UI_WIDGET_FONT_BUTTON_H
 
 #include <gtkmm.h>
-#include "widgets/font-selector.h"
+#include "labelled.h"
 
-struct SPFontSelector;
 namespace Inkscape {
 namespace UI {
 namespace Widget {
 
 /**
- * A labelled text box, with spin buttons and optional
- * icon or suffix, for entering arbitrary number values. It adds an extra
- * number called "startseed", that is not UI edittable, but should be put in SVG.
- * This does NOT generate a random number, but provides merely the saving of 
- * the startseed value.
+ * A labelled font button for entering font values
  */
-class FontSelector : public Gtk::HBox
+class FontButton : public Labelled
 {
 public:
-
     /**
-     * Construct a FontSelector Widget.
+     * Construct a FontButton Widget.
      *
      * @param label     Label.
      * @param suffix    Suffix, placed after the widget (defaults to "").
@@ -37,31 +31,18 @@ public:
      *                  indicates the next character should be used for the
      *                  mnemonic accelerator key (defaults to false).
      */
-    FontSelector( Glib::ustring const &label,
+    FontButton( Glib::ustring const &label,
            Glib::ustring const &tooltip,
            Glib::ustring const &suffix = "",
            Glib::ustring const &icon = "",
            bool mnemonic = true);
 
-    Glib::ustring getFontSpec() const;
-    void onExpanderChanged();
-    void setFontSpec(Glib::ustring fontspec);
-    double getFontSize() const;
-    void setFontSize(double fontsize);
-    void setValue (Glib::ustring fontspec, double fontsize);
-    sigc::signal <void> signal_fontselupd;
-
-protected:
-    Gtk::Widget  *_widget;
-    bool expanded;
-    Glib::ustring _label;
-    Gtk::Expander * expander;
-    SPFontSelector *fsel;
-    Glib::ustring _fontspec;
-    double _fontsize;
-
-private:
-    void onFontSelectorSave();
+    Glib::ustring getValue() const;
+    void setValue (Glib::ustring fontspec);
+    /**
+    * Signal raised when the font button's value changes.
+    */
+    Glib::SignalProxy0<void> signal_font_value_changed();
 };
 
 } // namespace Widget
diff --git a/src/ui/widget/font-selector.cpp b/src/ui/widget/font-selector.cpp
deleted file mode 100644
index 0fcb307eb..000000000
--- a/src/ui/widget/font-selector.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- *
- * Released under GNU GPL.  Read the file 'COPYING' for more information.
- */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "font-selector.h"
-#include "widgets/icon.h"
-#include <glibmm/i18n.h>
-
-namespace Inkscape {
-namespace UI {
-namespace Widget {
-
-FontSelector::FontSelector(Glib::ustring const &label, Glib::ustring const &tooltip,
-              Glib::ustring const &suffix,
-              Glib::ustring const &icon,
-              bool mnemonic)
-             :_widget(new Gtk::HBox()), expanded(false), _label(label)
-{
-    Gtk::VBox * vbox_expander = Gtk::manage( new Gtk::VBox() );
-    GtkWidget *fontsel = sp_font_selector_new();
-    gtk_widget_set_size_request (fontsel, 290, 150);
-    fsel = SP_FONT_SELECTOR(fontsel);
-    Gtk::Widget*  pIcon = Gtk::manage( sp_icon_get_icon( "on", Inkscape::ICON_SIZE_BUTTON) );
-    Gtk::Button * pButton = Gtk::manage(new Gtk::Button());
-    pButton->set_relief(Gtk::RELIEF_NONE);
-    pIcon->show();
-    pButton->add(*pIcon);
-    pButton->show();
-    pButton->signal_clicked().connect(sigc::mem_fun(*this, &FontSelector::onFontSelectorSave));
-    pButton->set_tooltip_text(_("Save the changes to font selector"));
-    vbox_expander->pack_start(*Gtk::manage(Glib::wrap(fontsel)), true, true);
-    vbox_expander->pack_start(*pButton, true, true);
-    expander = Gtk::manage(new Gtk::Expander(label));
-    expander->add(*vbox_expander);
-    expander->set_expanded(expanded);
-    expander->set_spacing(5);
-    expander->set_use_markup(true);
-    onExpanderChanged();
-    _widget->set_tooltip_text(tooltip);
-    expander->property_expanded().signal_changed().connect(sigc::mem_fun(*this, &FontSelector::onExpanderChanged) );
-    pack_start(*expander, true, true);
-    pack_start(*Gtk::manage(_widget), true, true);
-}
-
-void
-FontSelector::onExpanderChanged()
-{
-    expanded = expander->get_expanded();
-    if(expanded) {
-        expander->set_label (Glib::ustring(_label));
-    } else {
-        expander->set_label (Glib::ustring(_label + _(" <b>hided</b>")));
-    }
-}
-
-Glib::ustring FontSelector::getFontSpec() const
-{
-    return _fontspec;
-}
-
-void FontSelector::setFontSpec(Glib::ustring fontspec)
-{
-    _fontspec = fontspec;
-}
-
-double FontSelector::getFontSize() const
-{
-    return _fontsize;
-}
-
-void FontSelector::setFontSize(double fontsize)
-{
-    _fontsize = fontsize;
-}
-
-void FontSelector::setValue (Glib::ustring fontspec, double fontsize)
-{
-    if (_fontsize != fontsize || _fontspec != fontspec) {
-        setFontSize(fontsize);
-        setFontSpec(fontspec);
-        sp_font_selector_set_fontspec(fsel, fontspec, fontsize);
-    }
-}
-
-void
-FontSelector::onFontSelectorSave()
-{
-    if (_fontspec != sp_font_selector_get_fontspec(fsel) || _fontsize != sp_font_selector_get_size(fsel)) {
-        setFontSpec(sp_font_selector_get_fontspec(fsel));
-        setFontSize(sp_font_selector_get_size(fsel));
-        signal_fontselupd.emit();
-        onExpanderChanged();
-    }
-}
-
-
-} // namespace Widget
-} // namespace UI
-} // namespace Inkscape
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp
index c58e599ee..38bb7f7cc 100644
--- a/src/ui/widget/registered-widget.cpp
+++ b/src/ui/widget/registered-widget.cpp
@@ -25,7 +25,7 @@
 #include "ui/widget/scalar-unit.h"
 #include "ui/widget/point.h"
 #include "ui/widget/random.h"
-#include "ui/widget/font-selector.h"
+#include "ui/widget/font-button.h"
 #include "widgets/spinbutton-events.h"
 
 #include "xml/repr.h"
@@ -805,33 +805,31 @@ RegisteredRandom::on_value_changed()
 }
 
 /*#########################################
- * Registered FONT-SELECTOR
+ * Registered FONT-BUTTON
  */
 
-RegisteredFontSelector::~RegisteredFontSelector()
+RegisteredFontButton::~RegisteredFontButton()
 {
-    _value_changed_connection.disconnect();
+    _signal_font_set.disconnect();
 }
 
-RegisteredFontSelector::RegisteredFontSelector ( const Glib::ustring& label, const Glib::ustring& tip,
+RegisteredFontButton::RegisteredFontButton ( const Glib::ustring& label, const Glib::ustring& tip,
                         const Glib::ustring& key, Registry& wr, Inkscape::XML::Node* repr_in,
                         SPDocument* doc_in )
-    : RegisteredWidget<FontSelector> (label, tip)
+    : RegisteredWidget<FontButton>(label, tip)
 {
     init_parent(key, wr, repr_in, doc_in);
-    _value_changed_connection = signal_fontselupd.connect (sigc::mem_fun (*this, &RegisteredFontSelector::on_value_changed));
+    _signal_font_set =  signal_font_value_changed().connect (sigc::mem_fun (*this, &RegisteredFontButton::on_value_changed));
 }
 
 void
-RegisteredFontSelector::setValue (Glib::ustring fontspec, double fontsize)
+RegisteredFontButton::setValue (Glib::ustring fontspec)
 {
-    if (fontsize != 0) { //have value in the effect
-        FontSelector::setValue (fontspec, fontsize);
-    }
+    FontButton::setValue(fontspec);
 }
 
 void
-RegisteredFontSelector::on_value_changed()
+RegisteredFontButton::on_value_changed()
 {
 
     if (_wr->isUpdating())
@@ -840,7 +838,7 @@ RegisteredFontSelector::on_value_changed()
     _wr->setUpdating (true);
 
     Inkscape::SVGOStringStream os;
-    os << getFontSpec() << " @ " << getFontSize();
+    os << getValue();
 
     write_to_xml(os.str().c_str());
 
diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h
index 2b4d98b88..d410dbfe6 100644
--- a/src/ui/widget/registered-widget.h
+++ b/src/ui/widget/registered-widget.h
@@ -22,7 +22,7 @@
 #include "ui/widget/text.h"
 #include "ui/widget/random.h"
 #include "ui/widget/unit-menu.h"
-#include "ui/widget/font-selector.h"
+#include "ui/widget/font-button.h"
 #include "ui/widget/color-picker.h"
 #include "inkscape.h"
 
@@ -421,20 +421,20 @@ protected:
     void on_value_changed();
 };
 
-class RegisteredFontSelector : public RegisteredWidget<FontSelector> {
+class RegisteredFontButton : public RegisteredWidget<FontButton> {
 public:
-    virtual ~RegisteredFontSelector();
-    RegisteredFontSelector ( const Glib::ustring& label,
+    virtual ~RegisteredFontButton();
+    RegisteredFontButton ( const Glib::ustring& label,
                              const Glib::ustring& tip,
                              const Glib::ustring& key,
                              Registry& wr,
                              Inkscape::XML::Node* repr_in = NULL,
                              SPDocument *doc_in = NULL);
 
-    void setValue (Glib::ustring fontspec, double fontsize);
+    void setValue (Glib::ustring fontspec);
 
 protected:
-    sigc::connection  _value_changed_connection;
+    sigc::connection  _signal_font_set;
     void on_value_changed();
 };