merge from trunk (r12122)

(bzr r11668.1.51)

1 files changed, 18 insertions, 0 deletions

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index d963e0c7f..57f815730 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -601,6 +601,24 @@ void InkscapePreferences::initPageUI()
     _page_ui.add_line(false, "", _show_filters_info_box, "",
                         _("Show icons and descriptions for the filter primitives available at the filter effects dialog"));
 
+    {
+        Glib::ustring dockbarstyleLabels[] = {_("Icons only"), _("Text only"), _("Icons and text")};
+        int dockbarstyleValues[] = {0, 1, 2};
+
+        /* dockbar style */
+        _dockbar_style.init( "/options/dock/dockbarstyle", dockbarstyleLabels, dockbarstyleValues, G_N_ELEMENTS(dockbarstyleLabels), 0);
+        _page_ui.add_line(false, _("Dockbar style (requires restart):"),  _dockbar_style, "",
+                        _("Selects whether the vertical bars on the dockbar will show text labels, icons, or both"), false);
+	
+        Glib::ustring switcherstyleLabels[] = {_("Text only"), _("Icons only"), _("Icons and text")}; /* see bug #1098437   */
+        int switcherstyleValues[] = {0, 1, 2};
+	
+        /* switcher style */
+        _switcher_style.init( "/options/dock/switcherstyle", switcherstyleLabels, switcherstyleValues, G_N_ELEMENTS(switcherstyleLabels), 0);
+        _page_ui.add_line(false, _("Switcher style (requires restart):"),  _switcher_style, "",
+                        _("Selects whether the dockbar switcher will show text labels, icons, or both"), false);
+    }
+    
     // Windows
     _win_save_geom.init ( _("Save and restore window geometry for each document"), "/options/savewindowgeometry/value", 1, true, 0);
     _win_save_geom_prefs.init ( _("Remember and use last window's geometry"), "/options/savewindowgeometry/value", 2, false, &_win_save_geom);