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

Minor UI tweaks and bug fixes.

5 files changed, 13 insertions, 20 deletions

diff --git a/src/ui/dialog/glyphs.cpp b/src/ui/dialog/glyphs.cpp
index 0a62fd8c1..193ff232d 100644
--- a/src/ui/dialog/glyphs.cpp
+++ b/src/ui/dialog/glyphs.cpp
@@ -335,10 +335,8 @@ GlyphsPanel::GlyphsPanel() :
 // -------------------------------
 
     {
-        fontSelector = new Inkscape::UI::Widget::FontSelector (false);
-        fontSelector->set_name ("Glyphs");
-        fontSelector->set_fontsize_visible (false);
-        fontSelector->update_size (12.0);
+        fontSelector = new Inkscape::UI::Widget::FontSelector (false, false);
+        fontSelector->set_name ("UnicodeCharacters");
 
         sigc::connection conn =
             fontSelector->connectChanged(sigc::hide(sigc::mem_fun(*this, &GlyphsPanel::rebuild)));
diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp
index 71d251153..ff97bb68c 100644
--- a/src/ui/dialog/text-edit.cpp
+++ b/src/ui/dialog/text-edit.cpp
@@ -65,7 +65,7 @@ TextEdit::TextEdit()
     : UI::Widget::Panel("/dialogs/textandfont", SP_VERB_DIALOG_TEXT),
       font_label(_("_Font"), true),
       text_label(_("_Text"), true),
-      vari_label(_("_Variants"), true),
+      vari_label(_("_Features"), true),
       setasdefault_button(_("Set as _default")),
       close_button(_("_Close"), true),
       apply_button(_("_Apply"), true),
@@ -127,8 +127,8 @@ TextEdit::TextEdit()
     /* Notebook -----------------------------------*/
     notebook.set_name( "TextEdit Notebook" );
     notebook.append_page(font_vbox, font_label);
-    notebook.append_page(text_vbox, text_label);
     notebook.append_page(vari_vbox, vari_label);
+    notebook.append_page(text_vbox, text_label);
 
     /* Buttons (below notebook) ------------------ */
     setasdefault_button.set_use_underline(true);
@@ -376,7 +376,7 @@ SPCSSAttr *TextEdit::fillTextStyle ()
             sp_repr_css_set_property (css, "font-size", os.str().c_str());
         }
 
-        // Font variants
+        // Font variants (Font features)
         vari_vbox.fill_css( css );
 
         return css;
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.)
      */
diff --git a/src/verbs.cpp b/src/verbs.cpp
index 388992897..0c51c5314 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -3120,8 +3120,9 @@ Verb *Verb::_base_verbs[] = {
     new DialogVerb(SP_VERB_DIALOG_FILL_STROKE, "DialogFillStroke", N_("_Fill and Stroke..."),
                    N_("Edit objects' colors, gradients, arrowheads, and other fill and stroke properties..."), INKSCAPE_ICON("dialog-fill-and-stroke")),
     // FIXME: Probably better to either use something from the icon naming spec or ship our own "select-font" icon
-    new DialogVerb(SP_VERB_DIALOG_GLYPHS, "DialogGlyphs", N_("Gl_yphs..."),
-                   N_("Select characters from a glyphs palette"), INKSCAPE_ICON("gtk-select-font")),
+    // Technically what we show are unicode code points and not glyphs. The actual glyphs shown are determined by the shaping engines.
+    new DialogVerb(SP_VERB_DIALOG_GLYPHS, "DialogGlyphs", N_("_Unicode Characters..."),
+                   N_("Select Unicode characters from a palette"), INKSCAPE_ICON("gtk-select-font")),
     // FIXME: Probably better to either use something from the icon naming spec or ship our own "select-color" icon
     // TRANSLATORS: "Swatches" means: color samples
     new DialogVerb(SP_VERB_DIALOG_SWATCHES, "DialogSwatches", N_("S_watches..."),