Add Text direction icons

2 files changed, 22 insertions, 9 deletions

diff --git a/src/ui/toolbar/text-toolbar.cpp b/src/ui/toolbar/text-toolbar.cpp
index 7326d82bb..042b66e6c 100644
--- a/src/ui/toolbar/text-toolbar.cpp
+++ b/src/ui/toolbar/text-toolbar.cpp
@@ -350,7 +350,7 @@ TextToolbar::TextToolbar(SPDesktop *desktop)
     }
     /* Line height units */
     {
-        _line_height_units_item = _tracker->create_tool_item( _("Units"), ("") );
+        _line_height_units_item = _tracker->create_tool_item( _("Units"), (""));
         _line_height_units_item->signal_changed_after().connect(sigc::mem_fun(*this, &TextToolbar::lineheight_unit_changed));
         add(*_line_height_units_item);
     }
@@ -522,19 +522,19 @@ TextToolbar::TextToolbar(SPDesktop *desktop)
         row = *(store->append());
         row[columns.col_label    ] = _("Horizontal");
         row[columns.col_tooltip  ] = _("Horizontal text");
-        row[columns.col_icon     ] = INKSCAPE_ICON("format-text-direction-horizontal");
+        row[columns.col_icon     ] = INKSCAPE_ICON("frmt-text-direction-horizontal");
         row[columns.col_sensitive] = true;
 
         row = *(store->append());
         row[columns.col_label    ] = _("Vertical — RL");
         row[columns.col_tooltip  ] = _("Vertical text — lines: right to left");
-        row[columns.col_icon     ] = INKSCAPE_ICON("format-text-direction-vertical");
+        row[columns.col_icon     ] = INKSCAPE_ICON("frmt-text-direction-vertical");
         row[columns.col_sensitive] = true;
 
         row = *(store->append());
         row[columns.col_label    ] = _("Vertical — LR");
         row[columns.col_tooltip  ] = _("Vertical text — lines: left to right");
-        row[columns.col_icon     ] = INKSCAPE_ICON("format-text-direction-vertical-lr");
+        row[columns.col_icon     ] = INKSCAPE_ICON("frmt-text-direction-vertical-lr");
         row[columns.col_sensitive] = true;
 
         _writing_mode_item =
@@ -584,7 +584,7 @@ TextToolbar::TextToolbar(SPDesktop *desktop)
                                               "Not Used",               // Icon
                                               store );                  // List store
         _orientation_item->use_icon(true);
-        _orientation_item->use_label( false );
+        _orientation_item->use_label(false);
         gint mode = prefs->getInt("/tools/text/text_orientation", 0);
         _orientation_item->set_active( mode );
         add(*_orientation_item);
@@ -603,13 +603,13 @@ TextToolbar::TextToolbar(SPDesktop *desktop)
         row = *(store->append());
         row[columns.col_label    ] = _("LTR");
         row[columns.col_tooltip  ] = _("Left to right text");
-        row[columns.col_icon     ] = INKSCAPE_ICON("format-text-direction-horizontal");
+        row[columns.col_icon     ] = INKSCAPE_ICON("frmt-text-direction-horizontal");
         row[columns.col_sensitive] = true;
 
         row = *(store->append());
         row[columns.col_label    ] = _("RTL");
         row[columns.col_tooltip  ] = _("Right to left text");
-        row[columns.col_icon     ] = INKSCAPE_ICON("format-text-direction-r2l");
+        row[columns.col_icon     ] = INKSCAPE_ICON("frmt-text-direction-r2l");
         row[columns.col_sensitive] = true;
 
         _direction_item =
@@ -622,6 +622,7 @@ TextToolbar::TextToolbar(SPDesktop *desktop)
         gint mode = prefs->getInt("/tools/text/text_direction", 0);
         _direction_item->set_active( mode );
         add(*_direction_item);
+
         _direction_item->signal_changed_after().connect(sigc::mem_fun(*this, &TextToolbar::direction_changed));
     }
 
diff --git a/src/ui/widget/combo-tool-item.cpp b/src/ui/widget/combo-tool-item.cpp
index 6adafe316..c3adf921f 100644
--- a/src/ui/widget/combo-tool-item.cpp
+++ b/src/ui/widget/combo-tool-item.cpp
@@ -14,7 +14,7 @@
 */
 
 #include "combo-tool-item.h"
-
+#include "preferences.h"
 #include <iostream>
 #include <utility>
 #include <gtkmm/toolitem.h>
@@ -106,10 +106,22 @@ ComboToolItem::populate_combobox()
 
     ComboToolItemColumns columns;
     if (_use_icon) {
+        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+        if (prefs->getBool("/theme/symbolicIcons", false)) {
+            auto children = _store->children();
+            for (auto row : children) {
+                Glib::ustring icon = row[columns.col_icon];
+                gint pos = icon.find("-symbolic");
+                if (pos == std::string::npos) {
+                    icon += "-symbolic";
+                }
+                row[columns.col_icon] = icon;
+            }
+        }
         Gtk::CellRendererPixbuf *renderer = new Gtk::CellRendererPixbuf;
         renderer->set_property ("stock_size", Gtk::ICON_SIZE_LARGE_TOOLBAR);
         _combobox->pack_start (*renderer, false);
-        _combobox->add_attribute (*renderer, "icon_name", columns.col_icon   );
+        _combobox->add_attribute (*renderer, "icon_name", columns.col_icon );
     } else if (_use_pixbuf) {
         Gtk::CellRendererPixbuf *renderer = new Gtk::CellRendererPixbuf;
         //renderer->set_property ("stock_size", Gtk::ICON_SIZE_LARGE_TOOLBAR);