Rename "Glyphs" dialog to "Unicode Characters" dialog to better reflect what it does.

Minor UI tweaks and bug fixes.

2 files changed, 5 insertions, 11 deletions

diff --git a/src/ui/widget/font-selector.cpp b/src/ui/widget/font-selector.cpp
index a0d651010..c83e80350 100644
--- a/src/ui/widget/font-selector.cpp
+++ b/src/ui/widget/font-selector.cpp
@@ -27,7 +27,7 @@ namespace Inkscape {
 namespace UI {
 namespace Widget {
 
-FontSelector::FontSelector (bool with_size)
+FontSelector::FontSelector (bool with_size, bool with_variations)
     : Gtk::Grid ()
     , family_frame (_("Font family"))
     , style_frame (C_("Font selector", "Style"))
@@ -91,7 +91,9 @@ FontSelector::FontSelector (bool with_size)
         attach (size_label,    1, 1, 1, 1);
         attach (size_combobox, 2, 1, 1, 1);
     }
-    attach (font_variations, 0, 2, 3, 1);
+    if (with_variations) { // Glyphs panel does not use variations.
+        attach (font_variations, 0, 2, 3, 1);
+    }
 
     // Add signals
     family_treeview.get_selection()->signal_changed().connect(sigc::mem_fun(*this, &FontSelector::on_family_changed));
diff --git a/src/ui/widget/font-selector.h b/src/ui/widget/font-selector.h
index 956d2e83b..c308c0528 100644
--- a/src/ui/widget/font-selector.h
+++ b/src/ui/widget/font-selector.h
@@ -64,7 +64,7 @@ public:
     /**
      * Constructor
      */
-    FontSelector (bool with_size = true);
+    FontSelector (bool with_size = true, bool with_variations = true);
 
 protected:
 
@@ -131,14 +131,6 @@ public:
     double get_fontsize() { return font_size; };
 
     /**
-     * Shoe/hide size widgets
-     */
-    void set_fontsize_visible( bool visible = true ) {
-        size_label.set_visible (visible);
-        size_combobox.set_visible (visible);
-    }
-
-    /**
      * Let others know that user has changed GUI settings.
      * (Used to enable 'Apply' and 'Default' buttons.)
      */