Make all icons themable (except the filter icons).

(bzr r7332)

6 files changed, 93 insertions, 110 deletions

diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 0014a3ce5..0a59c004f 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -18,38 +18,29 @@
 # include <config.h>
 #endif
 
-#include "verbs.h"
+#include <gtkmm/spinbutton.h>
 
+#include "desktop-handles.h"
 #include "dialogs/unclump.h"
-#include "removeoverlap/removeoverlap.h"
+#include "document.h"
+#include "enums.h"
 #include "graphlayout/graphlayout.h"
-
-#include <gtkmm/spinbutton.h>
-
-
-
-
-#include "util/glib-list-iterators.h"
-
-#include "widgets/icon.h"
-
 #include "inkscape.h"
-#include "document.h"
-#include "selection.h"
-#include "desktop-handles.h"
 #include "macros.h"
-#include "sp-item-transform.h"
+#include "node-context.h"  //For access to ShapeEditor
 #include "preferences.h"
-#include "enums.h"
-
-#include "sp-text.h"
+#include "removeoverlap/removeoverlap.h"
+#include "selection.h"
+#include "shape-editor.h" //For node align/distribute methods
 #include "sp-flowtext.h"
+#include "sp-item-transform.h"
+#include "sp-text.h"
 #include "text-editing.h"
-
-#include "node-context.h"  //For access to ShapeEditor
-#include "shape-editor.h" //For node align/distribute methods
-
 #include "tools-switch.h"
+#include "ui/icon-names.h"
+#include "util/glib-list-iterators.h"
+#include "verbs.h"
+#include "widgets/icon.h"
 
 #include "align-and-distribute.h"
 
@@ -807,110 +798,110 @@ AlignAndDistribute::AlignAndDistribute()
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
     //Instanciate the align buttons
-    addAlignButton("al_left_out",
-                   _("Align right sides of objects to left side of anchor"),
+    addAlignButton(INKSCAPE_ICON_ALIGN_HORIZONTAL_RIGHT_TO_ANCHOR,
+                   _("Align right edges of objects to the left edge of the anchor"),
                    0, 0);
-    addAlignButton("al_left_in",
-                   _("Align left sides"),
+    addAlignButton(INKSCAPE_ICON_ALIGN_HORIZONTAL_LEFT,
+                   _("Align left edges"),
                    0, 1);
-    addAlignButton("al_center_hor",
-                   _("Center on vertical axis"),
+    addAlignButton(INKSCAPE_ICON_ALIGN_HORIZONTAL_CENTER,
+                   _("Center objects horizontally"),
                    0, 2);
-    addAlignButton("al_right_in",
+    addAlignButton(INKSCAPE_ICON_ALIGN_HORIZONTAL_RIGHT,
                    _("Align right sides"),
                    0, 3);
-    addAlignButton("al_right_out",
-                   _("Align left sides of objects to right side of anchor"),
+    addAlignButton(INKSCAPE_ICON_ALIGN_HORIZONTAL_LEFT_TO_ANCHOR,
+                   _("Align left edges of objects to the right edge of the anchor"),
                    0, 4);
-    addAlignButton("al_top_out",
-                   _("Align bottoms of objects to top of anchor"),
+    addAlignButton(INKSCAPE_ICON_ALIGN_VERTICAL_BOTTOM_TO_ANCHOR,
+                   _("Align bottom edges of objects to the top edge of the anchor"),
                    1, 0);
-    addAlignButton("al_top_in",
-                   _("Align tops"),
+    addAlignButton(INKSCAPE_ICON_ALIGN_VERTICAL_TOP,
+                   _("Align top edges"),
                    1, 1);
-    addAlignButton("al_center_ver",
+    addAlignButton(INKSCAPE_ICON_ALIGN_VERTICAL_CENTER,
                    _("Center on horizontal axis"),
                    1, 2);
-    addAlignButton("al_bottom_in",
-                   _("Align bottoms"),
+    addAlignButton(INKSCAPE_ICON_ALIGN_VERTICAL_BOTTOM,
+                   _("Align bottom edges"),
                    1, 3);
-    addAlignButton("al_bottom_out",
-                   _("Align tops of objects to bottom of anchor"),
+    addAlignButton(INKSCAPE_ICON_ALIGN_VERTICAL_TOP_TO_ANCHOR,
+                   _("Align top edges of objects to the bottom edge of the anchor"),
                    1, 4);
 
     //Baseline aligns
-    addBaselineButton("al_baselines_vert",
-                   _("Align baseline anchors of texts vertically"),
-                      0, 5, this->align_table(), Geom::X, false);
-    addBaselineButton("al_baselines_hor",
+    addBaselineButton(INKSCAPE_ICON_ALIGN_HORIZONTAL_BASELINE,
                    _("Align baseline anchors of texts horizontally"),
+                      0, 5, this->align_table(), Geom::X, false);
+    addBaselineButton(INKSCAPE_ICON_ALIGN_VERTICAL_BASELINE,
+                   _("Align baselines of texts"),
                      1, 5, this->align_table(), Geom::Y, false);
 
     //The distribute buttons
-    addDistributeButton("distribute_hdist",
+    addDistributeButton(INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_GAPS,
                         _("Make horizontal gaps between objects equal"),
                         0, 4, true, Geom::X, .5, .5);
 
-    addDistributeButton("distribute_left",
-                        _("Distribute left sides equidistantly"),
+    addDistributeButton(INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_LEFT,
+                        _("Distribute left edges equidistantly"),
                         0, 1, false, Geom::X, 1., 0.);
-    addDistributeButton("distribute_hcentre",
+    addDistributeButton(INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_CENTER,
                         _("Distribute centers equidistantly horizontally"),
                         0, 2, false, Geom::X, .5, .5);
-    addDistributeButton("distribute_right",
-                        _("Distribute right sides equidistantly"),
+    addDistributeButton(INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_RIGHT,
+                        _("Distribute right edges equidistantly"),
                         0, 3, false, Geom::X, 0., 1.);
 
-    addDistributeButton("distribute_vdist",
+    addDistributeButton(INKSCAPE_ICON_DISTRIBUTE_VERTICAL_GAPS,
                         _("Make vertical gaps between objects equal"),
                         1, 4, true, Geom::Y, .5, .5);
 
-    addDistributeButton("distribute_top",
-                        _("Distribute tops equidistantly"),
+    addDistributeButton(INKSCAPE_ICON_DISTRIBUTE_VERTICAL_TOP,
+                        _("Distribute top edges equidistantly"),
                         1, 1, false, Geom::Y, 0, 1);
-    addDistributeButton("distribute_vcentre",
+    addDistributeButton(INKSCAPE_ICON_DISTRIBUTE_VERTICAL_CENTER,
                         _("Distribute centers equidistantly vertically"),
                         1, 2, false, Geom::Y, .5, .5);
-    addDistributeButton("distribute_bottom",
-                        _("Distribute bottoms equidistantly"),
+    addDistributeButton(INKSCAPE_ICON_DISTRIBUTE_VERTICAL_BOTTOM,
+                        _("Distribute bottom edges equidistantly"),
                         1, 3, false, Geom::Y, 1., 0.);
 
     //Baseline distribs
-    addBaselineButton("distribute_baselines_hor",
+    addBaselineButton(INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_BASELINE,
                    _("Distribute baseline anchors of texts horizontally"),
                       0, 5, this->distribute_table(), Geom::X, true);
-    addBaselineButton("distribute_baselines_vert",
-                   _("Distribute baseline anchors of texts vertically"),
+    addBaselineButton(INKSCAPE_ICON_DISTRIBUTE_VERTICAL_BASELINE,
+                   _("Distribute baselines of texts vertically"),
                      1, 5, this->distribute_table(), Geom::Y, true);
 
     //Randomize & Unclump
-    addRandomizeButton("distribute_randomize",
+    addRandomizeButton(INKSCAPE_ICON_DISTRIBUTE_RANDOMIZE,
                         _("Randomize centers in both dimensions"),
                         2, 2);
-    addUnclumpButton("unclump",
+    addUnclumpButton(INKSCAPE_ICON_DISTRIBUTE_UNCLUMP,
                         _("Unclump objects: try to equalize edge-to-edge distances"),
                         2, 4);
 
     //Remove overlaps
-    addRemoveOverlapsButton("remove_overlaps",
+    addRemoveOverlapsButton(INKSCAPE_ICON_DISTRIBUTE_REMOVE_OVERLAPS,
                             _("Move objects as little as possible so that their bounding boxes do not overlap"),
                             0, 0);
     //Graph Layout
-    addGraphLayoutButton("graph_layout",
+    addGraphLayoutButton(INKSCAPE_ICON_DISTRIBUTE_GRAPH,
                             _("Nicely arrange selected connector network"),
                             0, 0);
 
     //Node Mode buttons
-    addNodeButton("node_halign",
+    addNodeButton(INKSCAPE_ICON_ALIGN_HORIZONTAL_NODES,
                   _("Align selected nodes horizontally"),
                   0, Geom::X, false);
-    addNodeButton("node_valign",
+    addNodeButton(INKSCAPE_ICON_ALIGN_VERTICAL_NODES,
                   _("Align selected nodes vertically"),
                   1, Geom::Y, false);
-    addNodeButton("node_hdistribute",
+    addNodeButton(INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_NODE,
                   _("Distribute selected nodes horizontally"),
                   2, Geom::X, true);
-    addNodeButton("node_vdistribute",
+    addNodeButton(INKSCAPE_ICON_DISTRIBUTE_VERTICAL_NODE,
                   _("Distribute selected nodes vertically"),
                   3, Geom::Y, true);
 
diff --git a/src/ui/dialog/fill-and-stroke.cpp b/src/ui/dialog/fill-and-stroke.cpp
index a05c20b36..d28dc7955 100644
--- a/src/ui/dialog/fill-and-stroke.cpp
+++ b/src/ui/dialog/fill-and-stroke.cpp
@@ -18,13 +18,13 @@
 #include "fill-and-stroke.h"
 #include "filter-chemistry.h"
 #include "inkscape.h"
-#include "inkscape-stock.h"
 #include "selection.h"
 #include "style.h"
 #include "svg/css-ostringstream.h"
 #include "verbs.h"
 #include "xml/repr.h"
 #include "widgets/icon.h"
+#include "ui/icon-names.h"
 
 #include "dialogs/fill-style.h"
 #include "dialogs/stroke-style.h"
@@ -47,9 +47,9 @@ FillAndStroke::FillAndStroke()
 
     contents->pack_start(_notebook, true, true);
 
-    _notebook.append_page(_page_fill, _createPageTabLabel(_("Fill"), INKSCAPE_STOCK_PROPERTIES_FILL_PAGE));
-    _notebook.append_page(_page_stroke_paint, _createPageTabLabel(_("Stroke _paint"), INKSCAPE_STOCK_PROPERTIES_STROKE_PAINT_PAGE));
-    _notebook.append_page(_page_stroke_style, _createPageTabLabel(_("Stroke st_yle"), INKSCAPE_STOCK_PROPERTIES_STROKE_PAGE));
+    _notebook.append_page(_page_fill, _createPageTabLabel(_("Fill"), INKSCAPE_ICON_OBJECT_FILL));
+    _notebook.append_page(_page_stroke_paint, _createPageTabLabel(_("Stroke _paint"), INKSCAPE_ICON_OBJECT_STROKE));
+    _notebook.append_page(_page_stroke_style, _createPageTabLabel(_("Stroke st_yle"), INKSCAPE_ICON_OBJECT_STROKE_STYLE));
 
     _layoutPageFill();
     _layoutPageStrokePaint();
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index 1c66160dd..7746e1a60 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -15,30 +15,31 @@
 #endif
 
 #include <glibmm/i18n.h>
-#include "livepatheffect-editor.h"
-#include "ui/widget/imagetoggler.h"
-#include "verbs.h"
+#include <gtkmm/stock.h>
+#include <gtkmm/toolbar.h>
+#include <vector>
+
+#include "desktop.h"
+#include "desktop-handles.h"
+#include "document.h"
+#include "gtkmm/widget.h"
+#include "inkscape.h"
+#include "live_effects/effect.h"
+#include "live_effects/lpeobject.h"
+#include "live_effects/lpeobject-reference.h"
+#include "path-chemistry.h"
 #include "selection.h"
-#include "sp-shape.h"
 #include "sp-item-group.h"
+#include "sp-lpe-item.h"
 #include "sp-path.h"
 #include "sp-rect.h"
-#include "sp-lpe-item.h"
-#include "path-chemistry.h"
-#include "live_effects/effect.h"
-#include "live_effects/lpeobject.h"
-#include "live_effects/lpeobject-reference.h"
-#include "gtkmm/widget.h"
-#include <vector>
-#include "inkscape.h"
-#include "desktop-handles.h"
-#include "desktop.h"
-#include "document.h"
+#include "sp-shape.h"
+#include "ui/icon-names.h"
+#include "ui/widget/imagetoggler.h"
+#include "verbs.h"
 #include "xml/node.h"
-#include <gtkmm/stock.h>
-#include <gtkmm/toolbar.h>
 
-#include "live_effects/lpeobject-reference.h"
+#include "livepatheffect-editor.h"
 
 namespace Inkscape {
 class Application;
@@ -133,7 +134,8 @@ LivePathEffectEditor::LivePathEffectEditor()
     effectlist_selection->signal_changed().connect( sigc::mem_fun(*this, &LivePathEffectEditor::on_effect_selection_changed) );
 
     //Add the visibility icon column:
-    Inkscape::UI::Widget::ImageToggler *eyeRenderer = manage( new Inkscape::UI::Widget::ImageToggler("visible", "hidden") );
+    Inkscape::UI::Widget::ImageToggler *eyeRenderer = manage( new Inkscape::UI::Widget::ImageToggler(
+        INKSCAPE_ICON_OBJECT_VISIBLE, INKSCAPE_ICON_OBJECT_HIDDEN) );
     int visibleColNum = effectlist_view.append_column("is_visible", *eyeRenderer) - 1;
     eyeRenderer->signal_toggled().connect( sigc::mem_fun(*this, &LivePathEffectEditor::on_visibility_toggled) );
     eyeRenderer->property_activatable() = true;
diff --git a/src/ui/dialog/session-player.cpp b/src/ui/dialog/session-player.cpp
index b9a44fd98..0e484c3f2 100644
--- a/src/ui/dialog/session-player.cpp
+++ b/src/ui/dialog/session-player.cpp
@@ -24,8 +24,6 @@
 #include "desktop-handles.h"
 #include "document.h"
 
-#include "ui/stock.h"
-
 #include "jabber_whiteboard/node-tracker.h"
 #include "jabber_whiteboard/session-manager.h"
 #include "jabber_whiteboard/session-file-player.h"
@@ -120,14 +118,6 @@ SessionPlaybackDialogImpl::_construct()
 	// Playback controls
 	this->_playbackcontrols.set_show_arrow(false);
 
-	/* these are waiting for the Gtkmm conversion
-	this->_controls[0].set_stock_id(Stock::SESSION_PLAYBACK_REW);
-	this->_controls[1].set_stock_id(Stock::SESSION_PLAYBACK_STEPBACK);
-	this->_controls[2].set_stock_id(Stock::SESSION_PLAYBACK_PAUSE);
-	this->_controls[3].set_stock_id(Stock::SESSION_PLAYBACK_STEPFORWARD);
-	this->_controls[4].set_stock_id(Stock::SESSION_PLAYBACK_PLAY);
-	*/
-
 	this->_controls[0].set_label("Rewind");
 	this->_controls[1].set_label("Go back one");
 	this->_controls[2].set_label("Pause");
diff --git a/src/ui/dialog/tile.cpp b/src/ui/dialog/tile.cpp
index a383f7b1a..2921bf62e 100644
--- a/src/ui/dialog/tile.cpp
+++ b/src/ui/dialog/tile.cpp
@@ -803,7 +803,7 @@ TileDialog::TileDialog()
     {
         /*#### Y Padding ####*/
 
-        GtkWidget *i = sp_icon_new (Inkscape::ICON_SIZE_MENU, "clonetiler_per_row");
+        GtkWidget *i = sp_icon_new (Inkscape::ICON_SIZE_MENU, "object-rows");
         YPadBox.pack_start (*(Glib::wrap(i)), false, false, MARGIN);
 
         YPadSpinner.set_digits(1);
@@ -828,7 +828,7 @@ TileDialog::TileDialog()
     {
         /*#### X padding ####*/
 
-        GtkWidget *i = sp_icon_new (Inkscape::ICON_SIZE_MENU, "clonetiler_per_column");
+        GtkWidget *i = sp_icon_new (Inkscape::ICON_SIZE_MENU, "object-columns");
         XPadBox.pack_start (*(Glib::wrap(i)), false, false, MARGIN);
 
         XPadSpinner.set_digits(1);
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index a242aaa4c..1cab38d98 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -80,19 +80,19 @@ Transformation::Transformation()
       _page_skew              (4, 2),
       _page_transform         (3, 3),
       _scalar_move_horizontal (_("_Horizontal"), _("Horizontal displacement (relative) or position (absolute)"), UNIT_TYPE_LINEAR,
-                               "", "arrows_hor", &_units_move),
+                               "", "transform-move-horizontal", &_units_move),
       _scalar_move_vertical   (_("_Vertical"),  _("Vertical displacement (relative) or position (absolute)"), UNIT_TYPE_LINEAR,
-                               "", "arrows_ver", &_units_move),
+                               "", "transform-move-vertical", &_units_move),
       _scalar_scale_horizontal(_("_Width"), _("Horizontal size (absolute or percentage of current)"), UNIT_TYPE_DIMENSIONLESS,
-                               "", "transform_scale_hor", &_units_scale),
+                               "", "transform-scale-horizontal", &_units_scale),
       _scalar_scale_vertical  (_("_Height"),  _("Vertical size (absolute or percentage of current)"), UNIT_TYPE_DIMENSIONLESS,
-                               "", "transform_scale_ver", &_units_scale),
+                               "", "transform-scale-vertical", &_units_scale),
       _scalar_rotate          (_("A_ngle"), _("Rotation angle (positive = counterclockwise)"), UNIT_TYPE_RADIAL,
-                               "", "transform_rotate", &_units_rotate),
+                               "", "transform-rotate", &_units_rotate),
       _scalar_skew_horizontal (_("_Horizontal"), _("Horizontal skew angle (positive = counterclockwise), or absolute displacement, or percentage displacement"), UNIT_TYPE_LINEAR,
-                               "", "transform_scew_hor", &_units_skew),
+                               "", "transform-skew-horizontal", &_units_skew),
       _scalar_skew_vertical   (_("_Vertical"),  _("Vertical skew angle (positive = counterclockwise), or absolute displacement, or percentage displacement"),  UNIT_TYPE_LINEAR,
-                               "", "transform_scew_ver", &_units_skew),
+                               "", "transform-skew-vertical", &_units_skew),
 
       _scalar_transform_a     ("_A", _("Transformation matrix element A")),
       _scalar_transform_b     ("_B", _("Transformation matrix element B")),