summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/Makefile_insert6
-rw-r--r--src/ui/cache/svg_preview_cache.cpp1
-rw-r--r--src/ui/dialog/align-and-distribute.cpp127
-rw-r--r--src/ui/dialog/fill-and-stroke.cpp8
-rw-r--r--src/ui/dialog/livepatheffect-editor.cpp40
-rw-r--r--src/ui/dialog/session-player.cpp10
-rw-r--r--src/ui/dialog/tile.cpp4
-rw-r--r--src/ui/dialog/transformation.cpp14
-rw-r--r--src/ui/icon-names.h567
-rw-r--r--src/ui/stock-items.cpp217
-rw-r--r--src/ui/stock-items.h37
-rw-r--r--src/ui/stock.cpp191
-rw-r--r--src/ui/stock.h196
-rw-r--r--src/ui/view/edit-widget.cpp55
-rw-r--r--src/ui/widget/imagetoggler.cpp15
-rw-r--r--src/ui/widget/object-composite-settings.cpp2
16 files changed, 690 insertions, 800 deletions
diff --git a/src/ui/Makefile_insert b/src/ui/Makefile_insert
index cb4812000..94c003584 100644
--- a/src/ui/Makefile_insert
+++ b/src/ui/Makefile_insert
@@ -11,8 +11,4 @@ ui_libui_a_SOURCES = \
ui/previewable.h \
ui/previewfillable.h \
ui/previewholder.cpp \
- ui/previewholder.h \
- ui/stock-items.cpp \
- ui/stock-items.h \
- ui/stock.cpp \
- ui/stock.h
+ ui/previewholder.h
diff --git a/src/ui/cache/svg_preview_cache.cpp b/src/ui/cache/svg_preview_cache.cpp
index ce10de477..6e05f6c03 100644
--- a/src/ui/cache/svg_preview_cache.cpp
+++ b/src/ui/cache/svg_preview_cache.cpp
@@ -24,7 +24,6 @@
#include "sp-namedview.h"
#include "selection.h"
#include "inkscape.h"
-#include "inkscape-stock.h"
#include "sp-rect.h"
#include "document-private.h"
#include "display/nr-arena.h"
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")),
diff --git a/src/ui/icon-names.h b/src/ui/icon-names.h
new file mode 100644
index 000000000..00341c4dd
--- /dev/null
+++ b/src/ui/icon-names.h
@@ -0,0 +1,567 @@
+/** @file
+ * @brief Macro for icon names used in Inkscape
+ *
+ * This file exists for several reasons: firstly, it contains all the icon names
+ * in Inkscape, so it can serve as a reference to themers. Secondly, using
+ * macros instead of strings avoids typos. Thirdly, we can change names
+ * to conform to external icon sets / specifications without changing any code.
+ */
+/* Authors:
+ * Krzysztof KosiƄski <tweenk.pl@gmail.com>
+ *
+ * Copyright (C) 2009 Authors
+ * Released under GNU GPL, read the file 'COPYING' for more information
+ */
+
+#ifndef SEEN_INKSCAPE_ICON_NAMES_H
+#define SEEN_INKSCAPE_ICON_NAMES_H
+
+#define INKSCAPE_ICON_ALIGN_HORIZONTAL_BASELINE \
+ "align-horizontal-baseline"
+#define INKSCAPE_ICON_ALIGN_HORIZONTAL_CENTER \
+ "align-horizontal-center"
+#define INKSCAPE_ICON_ALIGN_HORIZONTAL_LEFT \
+ "align-horizontal-left"
+#define INKSCAPE_ICON_ALIGN_HORIZONTAL_LEFT_TO_ANCHOR \
+ "align-horizontal-left-to-anchor"
+#define INKSCAPE_ICON_ALIGN_HORIZONTAL_NODES \
+ "align-horizontal-nodes"
+#define INKSCAPE_ICON_ALIGN_HORIZONTAL_RIGHT \
+ "align-horizontal-right"
+#define INKSCAPE_ICON_ALIGN_HORIZONTAL_RIGHT_TO_ANCHOR \
+ "align-horizontal-right-to-anchor"
+#define INKSCAPE_ICON_ALIGN_VERTICAL_BASELINE \
+ "align-vertical-baseline"
+#define INKSCAPE_ICON_ALIGN_VERTICAL_BOTTOM \
+ "align-vertical-bottom"
+#define INKSCAPE_ICON_ALIGN_VERTICAL_BOTTOM_TO_ANCHOR \
+ "align-vertical-bottom-to-anchor"
+#define INKSCAPE_ICON_ALIGN_VERTICAL_CENTER \
+ "align-vertical-center"
+#define INKSCAPE_ICON_ALIGN_VERTICAL_NODES \
+ "align-vertical-nodes"
+#define INKSCAPE_ICON_ALIGN_VERTICAL_TOP \
+ "align-vertical-top"
+#define INKSCAPE_ICON_ALIGN_VERTICAL_TOP_TO_ANCHOR \
+ "align-vertical-top-to-anchor"
+#define INKSCAPE_ICON_BITMAP_TRACE \
+ "bitmap-trace"
+#define INKSCAPE_ICON_COLOR_FILL \
+ "color-fill"
+#define INKSCAPE_ICON_COLOR_GRADIENT \
+ "color-gradient"
+#define INKSCAPE_ICON_COLOR_MANAGEMENT \
+ "color-management"
+#define INKSCAPE_ICON_COLOR_PICKER \
+ "color-picker"
+#define INKSCAPE_ICON_COLOR_REMOVE \
+ "color-remove"
+#define INKSCAPE_ICON_CONNECTOR_AVOID \
+ "connector-avoid"
+#define INKSCAPE_ICON_CONNECTOR_IGNORE \
+ "connector-ignore"
+#define INKSCAPE_ICON_DIALOG_ALIGN_AND_DISTRIBUTE \
+ "dialog-align-and-distribute"
+#define INKSCAPE_ICON_DIALOG_FILL_AND_STROKE \
+ "dialog-fill-and-stroke"
+#define INKSCAPE_ICON_DIALOG_ICON_PREVIEW \
+ "dialog-icon-preview"
+#define INKSCAPE_ICON_DIALOG_INPUT_DEVICES \
+ "dialog-input-devices"
+#define INKSCAPE_ICON_DIALOG_LAYERS \
+ "dialog-layers"
+#define INKSCAPE_ICON_DIALOG_MEMORY \
+ "dialog-memory"
+#define INKSCAPE_ICON_DIALOG_MESSAGES \
+ "dialog-messages"
+#define INKSCAPE_ICON_DIALOG_OBJECT_PROPERTIES \
+ "dialog-object-properties"
+#define INKSCAPE_ICON_DIALOG_ROWS_AND_COLUMNS \
+ "dialog-rows-and-columns"
+#define INKSCAPE_ICON_DIALOG_SCRIPTS \
+ "dialog-scripts"
+#define INKSCAPE_ICON_DIALOG_TEXT_AND_FONT \
+ "dialog-text-and-font"
+#define INKSCAPE_ICON_DIALOG_TILE_CLONES \
+ "dialog-tile-clones"
+#define INKSCAPE_ICON_DIALOG_TRANSFORM \
+ "dialog-transform"
+#define INKSCAPE_ICON_DIALOG_XML_EDITOR \
+ "dialog-xml-editor"
+#define INKSCAPE_ICON_DISTRIBUTE_GRAPH \
+ "distribute-graph"
+#define INKSCAPE_ICON_DISTRIBUTE_GRAPH_DIRECTED \
+ "distribute-graph-directed"
+#define INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_BASELINE \
+ "distribute-horizontal-baseline"
+#define INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_CENTER \
+ "distribute-horizontal-center"
+#define INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_GAPS \
+ "distribute-horizontal-gaps"
+#define INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_LEFT \
+ "distribute-horizontal-left"
+#define INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_NODE \
+ "distribute-horizontal-node"
+#define INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_RIGHT \
+ "distribute-horizontal-right"
+#define INKSCAPE_ICON_DISTRIBUTE_RANDOMIZE \
+ "distribute-randomize"
+#define INKSCAPE_ICON_DISTRIBUTE_REMOVE_OVERLAPS \
+ "distribute-remove-overlaps"
+#define INKSCAPE_ICON_DISTRIBUTE_UNCLUMP \
+ "distribute-unclump"
+#define INKSCAPE_ICON_DISTRIBUTE_VERTICAL_BASELINE \
+ "distribute-vertical-baseline"
+#define INKSCAPE_ICON_DISTRIBUTE_VERTICAL_BOTTOM \
+ "distribute-vertical-bottom"
+#define INKSCAPE_ICON_DISTRIBUTE_VERTICAL_CENTER \
+ "distribute-vertical-center"
+#define INKSCAPE_ICON_DISTRIBUTE_VERTICAL_GAPS \
+ "distribute-vertical-gaps"
+#define INKSCAPE_ICON_DISTRIBUTE_VERTICAL_NODE \
+ "distribute-vertical-node"
+#define INKSCAPE_ICON_DISTRIBUTE_VERTICAL_TOP \
+ "distribute-vertical-top"
+#define INKSCAPE_ICON_DOCUMENT_CLEANUP \
+ "document-cleanup"
+#define INKSCAPE_ICON_DOCUMENT_EXPORT \
+ "document-export"
+#define INKSCAPE_ICON_DOCUMENT_EXPORT_OCAL \
+ "document-export-ocal"
+#define INKSCAPE_ICON_DOCUMENT_IMPORT \
+ "document-import"
+#define INKSCAPE_ICON_DOCUMENT_IMPORT_OCAL \
+ "document-import-ocal"
+#define INKSCAPE_ICON_DOCUMENT_METADATA \
+ "document-metadata"
+#define INKSCAPE_ICON_DOCUMENT_OPEN_RECENT \
+ "document-open-recent"
+#define INKSCAPE_ICON_DRAW_CALLIGRAPHIC \
+ "draw-calligraphic"
+#define INKSCAPE_ICON_DRAW_CONNECTOR \
+ "draw-connector"
+#define INKSCAPE_ICON_DRAW_CUBOID \
+ "draw-cuboid"
+#define INKSCAPE_ICON_DRAW_ELLIPSE \
+ "draw-ellipse"
+#define INKSCAPE_ICON_DRAW_ELLIPSE_ARC \
+ "draw-ellipse-arc"
+#define INKSCAPE_ICON_DRAW_ELLIPSE_SEGMENT \
+ "draw-ellipse-segment"
+#define INKSCAPE_ICON_DRAW_ELLIPSE_WHOLE \
+ "draw-ellipse-whole"
+#define INKSCAPE_ICON_DRAW_ERASER \
+ "draw-eraser"
+#define INKSCAPE_ICON_DRAW_ERASER_DELETE_OBJECTS \
+ "draw-eraser-delete-objects"
+#define INKSCAPE_ICON_DRAW_FREEHAND \
+ "draw-freehand"
+#define INKSCAPE_ICON_DRAW_PATH \
+ "draw-path"
+#define INKSCAPE_ICON_DRAW_POLYGON \
+ "draw-polygon"
+#define INKSCAPE_ICON_DRAW_POLYGON_STAR \
+ "draw-polygon-star"
+#define INKSCAPE_ICON_DRAW_RECTANGLE \
+ "draw-rectangle"
+#define INKSCAPE_ICON_DRAW_SPIRAL \
+ "draw-spiral"
+#define INKSCAPE_ICON_DRAW_STAR \
+ "draw-star"
+#define INKSCAPE_ICON_DRAW_TEXT \
+ "draw-text"
+#define INKSCAPE_ICON_DRAW_TRACE_BACKGROUND \
+ "draw-trace-background"
+#define INKSCAPE_ICON_DRAW_USE_PRESSURE \
+ "draw-use-pressure"
+#define INKSCAPE_ICON_DRAW_USE_TILT \
+ "draw-use-tilt"
+#define INKSCAPE_ICON_EDIT_CLONE \
+ "edit-clone"
+#define INKSCAPE_ICON_EDIT_CLONE_UNLINK \
+ "edit-clone-unlink"
+#define INKSCAPE_ICON_EDIT_DUPLICATE \
+ "edit-duplicate"
+#define INKSCAPE_ICON_EDIT_PASTE_IN_PLACE \
+ "edit-paste-in-place"
+#define INKSCAPE_ICON_EDIT_PASTE_STYLE \
+ "edit-paste-style"
+#define INKSCAPE_ICON_EDIT_SELECT_ALL \
+ "edit-select-all"
+#define INKSCAPE_ICON_EDIT_SELECT_ALL_LAYERS \
+ "edit-select-all-layers"
+#define INKSCAPE_ICON_EDIT_SELECT_INVERT \
+ "edit-select-invert"
+#define INKSCAPE_ICON_EDIT_SELECT_NONE \
+ "edit-select-none"
+#define INKSCAPE_ICON_EDIT_SELECT_ORIGINAL \
+ "edit-select-original"
+#define INKSCAPE_ICON_EDIT_UNDO_HISTORY \
+ "edit-undo-history"
+#define INKSCAPE_ICON_FILL_RULE_EVEN_ODD \
+ "fill-rule-even-odd"
+#define INKSCAPE_ICON_FILL_RULE_NONZERO \
+ "fill-rule-nonzero"
+#define INKSCAPE_ICON_FORMAT_TEXT_DIRECTION_HORIZONTAL \
+ "format-text-direction-horizontal"
+#define INKSCAPE_ICON_FORMAT_TEXT_DIRECTION_VERTICAL \
+ "format-text-direction-vertical"
+#define INKSCAPE_ICON_GRID_AXONOMETRIC \
+ "grid-axonometric"
+#define INKSCAPE_ICON_GRID_RECTANGULAR \
+ "grid-rectangular"
+#define INKSCAPE_ICON_GUIDES \
+ "guides"
+#define INKSCAPE_ICON_HELP_CONTENTS \
+ "help-contents"
+#define INKSCAPE_ICON_HELP_KEYBOARD_SHORTCUTS \
+ "help-keyboard-shortcuts"
+#define INKSCAPE_ICON_IMAGE_FILTER_BLEND \
+ "image-filter-blend"
+#define INKSCAPE_ICON_IMAGE_FILTER_COLOR_MATRIX \
+ "image-filter-color-matrix"
+#define INKSCAPE_ICON_IMAGE_FILTER_DIFFUSE_LIGHTING \
+ "image-filter-diffuse-lighting"
+#define INKSCAPE_ICON_IMAGE_FILTER_DISPLACEMENT_MAP \
+ "image-filter-displacement-map"
+#define INKSCAPE_ICON_IMAGE_FILTER_FLOOD \
+ "image-filter-flood"
+#define INKSCAPE_ICON_IMAGE_FILTER_GAUSSIAN_BLUR \
+ "image-filter-gaussian-blur"
+#define INKSCAPE_ICON_IMAGE_FILTER_MORPHOLOGY \
+ "image-filter-morphology"
+#define INKSCAPE_ICON_IMAGE_FILTER_OFFSET \
+ "image-filter-offset"
+#define INKSCAPE_ICON_IMAGE_FILTER_TURBULENCE \
+ "image-filter-turbulence"
+#define INKSCAPE_ICON_INKSCAPE \
+ "inkscape"
+#define INKSCAPE_ICON_LAYER_BOTTOM \
+ "layer-bottom"
+#define INKSCAPE_ICON_LAYER_DELETE \
+ "layer-delete"
+#define INKSCAPE_ICON_LAYER_LOWER \
+ "layer-lower"
+#define INKSCAPE_ICON_LAYER_NEW \
+ "layer-new"
+#define INKSCAPE_ICON_LAYER_NEXT \
+ "layer-next"
+#define INKSCAPE_ICON_LAYER_PREVIOUS \
+ "layer-previous"
+#define INKSCAPE_ICON_LAYER_RAISE \
+ "layer-raise"
+#define INKSCAPE_ICON_LAYER_RENAME \
+ "layer-rename"
+#define INKSCAPE_ICON_LAYER_TOP \
+ "layer-top"
+#define INKSCAPE_ICON_NODE_ADD \
+ "node-add"
+#define INKSCAPE_ICON_NODE_BREAK \
+ "node-break"
+#define INKSCAPE_ICON_NODE_DELETE \
+ "node-delete"
+#define INKSCAPE_ICON_NODE_DELETE_SEGMENT \
+ "node-delete-segment"
+#define INKSCAPE_ICON_NODE_DISTRIBUTE_HORIZONTAL \
+ "node-distribute-horizontal"
+#define INKSCAPE_ICON_NODE_DISTRIBUTE_VERTICAL \
+ "node-distribute-vertical"
+#define INKSCAPE_ICON_NODE_JOIN \
+ "node-join"
+#define INKSCAPE_ICON_NODE_JOIN_SEGMENT \
+ "node-join-segment"
+#define INKSCAPE_ICON_NODE_SEGMENT_CURVE \
+ "node-segment-curve"
+#define INKSCAPE_ICON_NODE_SEGMENT_LINE \
+ "node-segment-line"
+#define INKSCAPE_ICON_NODE_TYPE_AUTO_SMOOTH \
+ "node-type-auto-smooth"
+#define INKSCAPE_ICON_NODE_TYPE_CUSP \
+ "node-type-cusp"
+#define INKSCAPE_ICON_NODE_TYPE_SMOOTH \
+ "node-type-smooth"
+#define INKSCAPE_ICON_NODE_TYPE_SYMMETRIC \
+ "node-type-symmetric"
+#define INKSCAPE_ICON_OBJECT_COLUMNS \
+ "object-columns"
+#define INKSCAPE_ICON_OBJECT_FILL \
+ "object-fill"
+#define INKSCAPE_ICON_OBJECT_FLIP_HORIZONTAL \
+ "object-flip-horizontal"
+#define INKSCAPE_ICON_OBJECT_FLIP_VERTICAL \
+ "object-flip-vertical"
+#define INKSCAPE_ICON_OBJECT_GROUP \
+ "object-group"
+#define INKSCAPE_ICON_OBJECT_HIDDEN \
+ "object-hidden"
+#define INKSCAPE_ICON_OBJECT_LOCKED \
+ "object-locked"
+#define INKSCAPE_ICON_OBJECT_ROTATE_LEFT \
+ "object-rotate-left"
+#define INKSCAPE_ICON_OBJECT_ROTATE_RIGHT \
+ "object-rotate-right"
+#define INKSCAPE_ICON_OBJECT_ROWS \
+ "object-rows"
+#define INKSCAPE_ICON_OBJECT_STROKE \
+ "object-stroke"
+#define INKSCAPE_ICON_OBJECT_STROKE_STYLE \
+ "object-stroke-style"
+#define INKSCAPE_ICON_OBJECT_TO_PATH \
+ "object-to-path"
+#define INKSCAPE_ICON_OBJECT_TWEAK_ATTRACT \
+ "object-tweak-attract"
+#define INKSCAPE_ICON_OBJECT_TWEAK_BLUR \
+ "object-tweak-blur"
+#define INKSCAPE_ICON_OBJECT_TWEAK_DUPLICATE \
+ "object-tweak-duplicate"
+#define INKSCAPE_ICON_OBJECT_TWEAK_JITTER_COLOR \
+ "object-tweak-jitter-color"
+#define INKSCAPE_ICON_OBJECT_TWEAK_PAINT \
+ "object-tweak-paint"
+#define INKSCAPE_ICON_OBJECT_TWEAK_PUSH \
+ "object-tweak-push"
+#define INKSCAPE_ICON_OBJECT_TWEAK_RANDOMIZE \
+ "object-tweak-randomize"
+#define INKSCAPE_ICON_OBJECT_TWEAK_ROTATE \
+ "object-tweak-rotate"
+#define INKSCAPE_ICON_OBJECT_TWEAK_SHRINK \
+ "object-tweak-shrink"
+#define INKSCAPE_ICON_OBJECT_UNGROUP \
+ "object-ungroup"
+#define INKSCAPE_ICON_OBJECT_UNLOCKED \
+ "object-unlocked"
+#define INKSCAPE_ICON_OBJECT_VISIBLE \
+ "object-visible"
+#define INKSCAPE_ICON_PAINT_GRADIENT_LINEAR \
+ "paint-gradient-linear"
+#define INKSCAPE_ICON_PAINT_GRADIENT_RADIAL \
+ "paint-gradient-radial"
+#define INKSCAPE_ICON_PAINT_NONE \
+ "paint-none"
+#define INKSCAPE_ICON_PAINT_PATTERN \
+ "paint-pattern"
+#define INKSCAPE_ICON_PAINT_SOLID \
+ "paint-solid"
+#define INKSCAPE_ICON_PAINT_UNKNOWN \
+ "paint-unknown"
+#define INKSCAPE_ICON_PATH_BREAK_APART \
+ "path-break-apart"
+#define INKSCAPE_ICON_PATH_CLIP_EDIT \
+ "path-clip-edit"
+#define INKSCAPE_ICON_PATH_COMBINE \
+ "path-combine"
+#define INKSCAPE_ICON_PATH_CUT \
+ "path-cut"
+#define INKSCAPE_ICON_PATH_DIFFERENCE \
+ "path-difference"
+#define INKSCAPE_ICON_PATH_DIVISION \
+ "path-division"
+#define INKSCAPE_ICON_PATH_EFFECT_PARAMETER_NEXT \
+ "path-effect-parameter-next"
+#define INKSCAPE_ICON_PATH_EXCLUSION \
+ "path-exclusion"
+#define INKSCAPE_ICON_PATH_INSET \
+ "path-inset"
+#define INKSCAPE_ICON_PATH_INTERSECTION \
+ "path-intersection"
+#define INKSCAPE_ICON_PATH_MASK_EDIT \
+ "path-mask-edit"
+#define INKSCAPE_ICON_PATH_MODE_BEZIER \
+ "path-mode-bezier"
+#define INKSCAPE_ICON_PATH_MODE_POLYLINE \
+ "path-mode-polyline"
+#define INKSCAPE_ICON_PATH_MODE_POLYLINE_PARAXIAL \
+ "path-mode-polyline-paraxial"
+#define INKSCAPE_ICON_PATH_MODE_SPIRO \
+ "path-mode-spiro"
+#define INKSCAPE_ICON_PATH_OFFSET_DYNAMIC \
+ "path-offset-dynamic"
+#define INKSCAPE_ICON_PATH_OFFSET_LINKED \
+ "path-offset-linked"
+#define INKSCAPE_ICON_PATH_OUTSET \
+ "path-outset"
+#define INKSCAPE_ICON_PATH_REVERSE \
+ "path-reverse"
+#define INKSCAPE_ICON_PATH_SIMPLIFY \
+ "path-simplify"
+#define INKSCAPE_ICON_PATH_TWEAK_ATTRACT \
+ "path-tweak-attract"
+#define INKSCAPE_ICON_PATH_TWEAK_GROW \
+ "path-tweak-grow"
+#define INKSCAPE_ICON_PATH_TWEAK_PUSH \
+ "path-tweak-push"
+#define INKSCAPE_ICON_PATH_TWEAK_ROUGHEN \
+ "path-tweak-roughen"
+#define INKSCAPE_ICON_PATH_TWEAK_SHRINK \
+ "path-tweak-shrink"
+#define INKSCAPE_ICON_PATH_UNION \
+ "path-union"
+#define INKSCAPE_ICON_PERSPECTIVE_PARALLEL \
+ "perspective-parallel"
+#define INKSCAPE_ICON_RECTANGLE_MAKE_CORNERS_SHARP \
+ "rectangle-make-corners-sharp"
+#define INKSCAPE_ICON_SELECTION_BOTTOM \
+ "selection-bottom"
+#define INKSCAPE_ICON_SELECTION_LOWER \
+ "selection-lower"
+#define INKSCAPE_ICON_SELECTION_MAKE_BITMAP_COPY \
+ "selection-make-bitmap-copy"
+#define INKSCAPE_ICON_SELECTION_MOVE_TO_LAYER_ABOVE \
+ "selection-move-to-layer-above"
+#define INKSCAPE_ICON_SELECTION_MOVE_TO_LAYER_BELOW \
+ "selection-move-to-layer-below"
+#define INKSCAPE_ICON_SELECTION_RAISE \
+ "selection-raise"
+#define INKSCAPE_ICON_SELECTION_TOP \
+ "selection-top"
+#define INKSCAPE_ICON_SHOW_DIALOGS \
+ "show-dialogs"
+#define INKSCAPE_ICON_SHOW_GRID \
+ "show-grid"
+#define INKSCAPE_ICON_SHOW_GUIDES \
+ "show-guides"
+#define INKSCAPE_ICON_SHOW_NODE_HANDLES \
+ "show-node-handles"
+#define INKSCAPE_ICON_SHOW_PATH_OUTLINE \
+ "show-path-outline"
+#define INKSCAPE_ICON_SNAP \
+ "snap"
+#define INKSCAPE_ICON_SNAP_BOUNDING_BOX \
+ "snap-bounding-box"
+#define INKSCAPE_ICON_SNAP_BOUNDING_BOX_CENTER \
+ "snap-bounding-box-center"
+#define INKSCAPE_ICON_SNAP_BOUNDING_BOX_CORNERS \
+ "snap-bounding-box-corners"
+#define INKSCAPE_ICON_SNAP_BOUNDING_BOX_EDGES \
+ "snap-bounding-box-edges"
+#define INKSCAPE_ICON_SNAP_BOUNDING_BOX_MIDPOINTS \
+ "snap-bounding-box-midpoints"
+#define INKSCAPE_ICON_SNAP_GRID_GUIDE_INTERSECTIONS \
+ "snap-grid-guide-intersections"
+#define INKSCAPE_ICON_SNAP_NODES \
+ "snap-nodes"
+#define INKSCAPE_ICON_SNAP_NODES_CENTER \
+ "snap-nodes-center"
+#define INKSCAPE_ICON_SNAP_NODES_CUSP \
+ "snap-nodes-cusp"
+#define INKSCAPE_ICON_SNAP_NODES_INTERSECTION \
+ "snap-nodes-intersection"
+#define INKSCAPE_ICON_SNAP_NODES_MIDPOINT \
+ "snap-nodes-midpoint"
+#define INKSCAPE_ICON_SNAP_NODES_PATH \
+ "snap-nodes-path"
+#define INKSCAPE_ICON_SNAP_NODES_ROTATION_CENTER \
+ "snap-nodes-rotation-center"
+#define INKSCAPE_ICON_SNAP_NODES_SMOOTH \
+ "snap-nodes-smooth"
+#define INKSCAPE_ICON_SNAP_PAGE \
+ "snap-page"
+#define INKSCAPE_ICON_STROKE_CAP_BUTT \
+ "stroke-cap-butt"
+#define INKSCAPE_ICON_STROKE_CAP_ROUND \
+ "stroke-cap-round"
+#define INKSCAPE_ICON_STROKE_CAP_SQUARE \
+ "stroke-cap-square"
+#define INKSCAPE_ICON_STROKE_JOIN_BEVEL \
+ "stroke-join-bevel"
+#define INKSCAPE_ICON_STROKE_JOIN_MITER \
+ "stroke-join-miter"
+#define INKSCAPE_ICON_STROKE_JOIN_ROUND \
+ "stroke-join-round"
+#define INKSCAPE_ICON_STROKE_TO_PATH \
+ "stroke-to-path"
+#define INKSCAPE_ICON_TEXT_CONVERT_TO_REGULAR \
+ "text-convert-to-regular"
+#define INKSCAPE_ICON_TEXT_FLOW_INTO_FRAME \
+ "text-flow-into-frame"
+#define INKSCAPE_ICON_TEXT_PUT_ON_PATH \
+ "text-put-on-path"
+#define INKSCAPE_ICON_TEXT_REMOVE_FROM_PATH \
+ "text-remove-from-path"
+#define INKSCAPE_ICON_TEXT_UNFLOW \
+ "text-unflow"
+#define INKSCAPE_ICON_TEXT_UNKERN \
+ "text-unkern"
+#define INKSCAPE_ICON_TOOL_NODE_EDITOR \
+ "tool-node-editor"
+#define INKSCAPE_ICON_TOOL_POINTER \
+ "tool-pointer"
+#define INKSCAPE_ICON_TOOL_TWEAK \
+ "tool-tweak"
+#define INKSCAPE_ICON_TRANSFORM_AFFECT_GRADIENT \
+ "transform-affect-gradient"
+#define INKSCAPE_ICON_TRANSFORM_AFFECT_PATTERN \
+ "transform-affect-pattern"
+#define INKSCAPE_ICON_TRANSFORM_AFFECT_ROUNDED_CORNERS \
+ "transform-affect-rounded-corners"
+#define INKSCAPE_ICON_TRANSFORM_AFFECT_STROKE \
+ "transform-affect-stroke"
+#define INKSCAPE_ICON_TRANSFORM_MOVE_HORIZONTAL \
+ "transform-move-horizontal"
+#define INKSCAPE_ICON_TRANSFORM_MOVE_VERTICAL \
+ "transform-move-vertical"
+#define INKSCAPE_ICON_TRANSFORM_ROTATE \
+ "transform-rotate"
+#define INKSCAPE_ICON_TRANSFORM_SCALE_HORIZONTAL \
+ "transform-scale-horizontal"
+#define INKSCAPE_ICON_TRANSFORM_SCALE_VERTICAL \
+ "transform-scale-vertical"
+#define INKSCAPE_ICON_TRANSFORM_SKEW_HORIZONTAL \
+ "transform-skew-horizontal"
+#define INKSCAPE_ICON_TRANSFORM_SKEW_VERTICAL \
+ "transform-skew-vertical"
+#define INKSCAPE_ICON_VIEW_FULLSCREEN \
+ "view-fullscreen"
+#define INKSCAPE_ICON_WINDOW_NEW \
+ "window-neW"
+#define INKSCAPE_ICON_WINDOW_NEXT \
+ "window-next"
+#define INKSCAPE_ICON_WINDOW_PREVIOUS \
+ "window-previous"
+#define INKSCAPE_ICON_XML_ATTRIBUTE_DELETE \
+ "xml-attribute-delete"
+#define INKSCAPE_ICON_XML_ELEMENT_NEW \
+ "xml-element-new"
+#define INKSCAPE_ICON_XML_NODE_DELETE \
+ "xml-node-delete"
+#define INKSCAPE_ICON_XML_NODE_DUPLICATE \
+ "xml-node-duplicate"
+#define INKSCAPE_ICON_XML_TEXT_NEW \
+ "xml-text-new"
+#define INKSCAPE_ICON_ZOOM \
+ "zoom"
+#define INKSCAPE_ICON_ZOOM_DOUBLE_SIZE \
+ "zoom-double-size"
+#define INKSCAPE_ICON_ZOOM_FIT_DRAWING \
+ "zoom-fit-drawing"
+#define INKSCAPE_ICON_ZOOM_FIT_PAGE \
+ "zoom-fit-page"
+#define INKSCAPE_ICON_ZOOM_FIT_SELECTION \
+ "zoom-fit-selection"
+#define INKSCAPE_ICON_ZOOM_FIT_WIDTH \
+ "zoom-fit-width"
+#define INKSCAPE_ICON_ZOOM_HALF_SIZE \
+ "zoom-half-size"
+#define INKSCAPE_ICON_ZOOM_IN \
+ "zoom-in"
+#define INKSCAPE_ICON_ZOOM_NEXT \
+ "zoom-next"
+#define INKSCAPE_ICON_ZOOM_ORIGINAL \
+ "zoom-original"
+#define INKSCAPE_ICON_ZOOM_OUT \
+ "zoom-out"
+#define INKSCAPE_ICON_ZOOM_PREVIOUS \
+ "zoom-previous"
+
+#endif /* ifdef SEEN_INKSCAPE_ICON_NAMES_H */
+
+/*
+ Local Variables:
+ mode:c++
+ c-file-style:"stroustrup"
+ c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+ indent-tabs-mode:nil
+ fill-column:99
+ End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
diff --git a/src/ui/stock-items.cpp b/src/ui/stock-items.cpp
deleted file mode 100644
index 6ac6042d4..000000000
--- a/src/ui/stock-items.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-/**
- * \brief StockItems for Inkscape-specific menu/button labels and key
- * accelerators.
- *
- * Author:
- * Derek P. Moore <derekm@hackunix.org>
- *
- * Copyright (C) 2004 Derek P. Moore
- *
- * Released under GNU GPL. Read the file 'COPYING' for more information.
- */
-
-#include <gtkmm/stock.h>
-#include <glibmm/i18n.h>
-
-#include "stock.h"
-
-namespace Inkscape {
-namespace UI {
-namespace Stock {
-
-void
-init()
-{
- using namespace Gtk::Stock;
-
-// FIXME: strings are replaced by placeholders, NOT to be translated until the code is enabled
-// See http://sourceforge.net/mailarchive/message.php?msg_id=11746016 for details
-
- // File menu
- add(Gtk::StockItem(OPEN, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(OPEN_RECENT, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(SAVE_AS, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(IMPORT, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(EXPORT, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(IMPORTFROMOCAL, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(EXPORTTOOCAL, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(PRINT, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(PRINT_PREVIEW, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(VACUUM_DEFS, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(PROPERTIES, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(PREFERENCES, _("PLACEHOLDER, do not translate")));
-
- // Edit menu
- add(Gtk::StockItem(PASTE_IN_PLACE, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(PASTE_STYLE, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(DUPLICATE, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(CLONE, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(CLONE_UNLINK, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(CLONE_SELECT_ORIG, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(MAKE_BITMAP, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(TILE, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(UNTILE, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(SELECT_ALL, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(SELECT_ALL_IN_ALL_LAYERS, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(SELECT_INVERT, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(SELECT_NONE, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(XML_EDITOR, _("PLACEHOLDER, do not translate")));
-
- // View menu
- add(Gtk::StockItem(ZOOM, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(ZOOM_IN, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(ZOOM_OUT, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(ZOOM_100, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(ZOOM_50, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(ZOOM_200, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(ZOOM_SELECTION, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(ZOOM_DRAWING, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(ZOOM_PAGE, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(ZOOM_WIDTH, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(ZOOM_PREV, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(ZOOM_NEXT, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(SHOW_HIDE, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(SHOW_HIDE_COMMANDS_BAR, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(SHOW_HIDE_TOOL_CONTROLS_BAR, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(SHOW_HIDE_TOOLS_BAR, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(SHOW_HIDE_RULERS, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(SHOW_HIDE_SCROLLBARS, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(SHOW_HIDE_STATUSBAR, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(SHOW_HIDE_DIALOGS, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(GRID, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(GUIDES, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(FULLSCREEN, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(MESSAGES, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(SCRIPTS, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(WINDOW_PREV, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(WINDOW_NEXT, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(WINDOW_DUPLICATE, _("PLACEHOLDER, do not translate")));
-
- // Layer menu
- add(Gtk::StockItem(LAYER_NEW, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(LAYER_RENAME, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(LAYER_DUPLICATE, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(LAYER_ANCHOR, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(LAYER_MERGE_DOWN, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(LAYER_DELETE, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(LAYER_SELECT_NEXT, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(LAYER_SELECT_PREV, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(LAYER_SELECT_TOP, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(LAYER_SELECT_BOTTOM, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(LAYER_RAISE, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(LAYER_LOWER, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(LAYER_TO_TOP, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(LAYER_TO_BOTTOM, _("PLACEHOLDER, do not translate")));
-
- // Object menu
- add(Gtk::StockItem(FILL_STROKE, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(OBJECT_PROPERTIES, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(GROUP, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(UNGROUP, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(RAISE, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(LOWER, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(RAISE_TO_TOP, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(LOWER_TO_BOTTOM, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(MOVE_TO_NEW_LAYER, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(MOVE_TO_NEXT_LAYER, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(MOVE_TO_PREV_LAYER, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(MOVE_TO_TOP_LAYER, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(MOVE_TO_BOTTOM_LAYER, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(ROTATE_90_CW, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(ROTATE_90_CCW, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(FLIP_HORIZ, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(FLIP_VERT, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(TRANSFORM, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(TRANSFORMATION, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(ALIGN_DISTRIBUTE, _("PLACEHOLDER, do not translate")));
-
- // Path menu
- add(Gtk::StockItem(OBJECT_TO_PATH, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(STROKE_TO_PATH, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(TRACE, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(UNION, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(DIFFERENCE, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(INTERSECTION, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(EXCLUSION, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(DIVISION, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(CUT_PATH, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(COMBINE, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(BREAK_APART, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(INSET, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(OUTSET, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(OFFSET_DYNAMIC, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(OFFSET_LINKED, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(SIMPLIFY, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(REVERSE, _("PLACEHOLDER, do not translate")));
- //add(Gtk::StockItem(CLEANUP, _("PLACEHOLDER, do not translate"))); (using Gtk::Stock::CLEAR)
-
- // Text menu
- add(Gtk::StockItem(SELECT_FONT, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(PUT_ON_PATH, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(REMOVE_FROM_PATH, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(REMOVE_MANUAL_KERNS, _("PLACEHOLDER, do not translate")));
-
- // About menu
- add(Gtk::StockItem(KEYS_MOUSE, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(TUTORIALS, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(ABOUT, _("PLACEHOLDER, do not translate")));
-
- // Tools toolbox
- add(Gtk::StockItem(TOOL_SELECT, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(TOOL_NODE, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(TOOL_ZOOM, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(TOOL_RECT, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(TOOL_ARC, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(TOOL_STAR, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(TOOL_SPIRAL, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(TOOL_FREEHAND, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(TOOL_PEN, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(TOOL_DYNADRAW, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(TOOL_TEXT, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(TOOL_DROPPER, _("PLACEHOLDER, do not translate")));
-
- // Select Tool controls
- add(Gtk::StockItem(TRANSFORM_STROKE, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(TRANSFORM_CORNERS, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(TRANSFORM_GRADIENT, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(TRANSFORM_PATTERN, _("PLACEHOLDER, do not translate")));
-
- // Node Tool controls
- add(Gtk::StockItem(NODE_INSERT, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(NODE_DELETE, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(NODE_JOIN, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(NODE_JOIN_SEGMENT, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(NODE_DELETE_SEGMENT, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(NODE_BREAK, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(NODE_CORNER, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(NODE_SMOOTH, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(NODE_SYMMETRIC, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(NODE_LINE, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(NODE_CURVE, _("PLACEHOLDER, do not translate")));
-
- // Calligraphy Tool controls
- add(Gtk::StockItem(USE_PRESSURE, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(USE_TILT, _("PLACEHOLDER, do not translate")));
-
- // Session playback controls
- add(Gtk::StockItem(SESSION_PLAYBACK_REW, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(SESSION_PLAYBACK_STEPBACK, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(SESSION_PLAYBACK_PAUSE, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(SESSION_PLAYBACK_STEPFORWARD, _("PLACEHOLDER, do not translate")));
- add(Gtk::StockItem(SESSION_PLAYBACK_PLAY, _("PLACEHOLDER, do not translate")));
-}
-
-} // namespace Stock
-} // namespace UI
-} // namespace Inkscape
-
-/*
- Local Variables:
- mode:c++
- c-file-style:"stroustrup"
- c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
- indent-tabs-mode:nil
- fill-column:99
- End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
diff --git a/src/ui/stock-items.h b/src/ui/stock-items.h
deleted file mode 100644
index a109c2960..000000000
--- a/src/ui/stock-items.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * \brief StockItems for Inkscape-specific menu and button labels and key
- * accelerators.
- *
- * Author:
- * Derek P. Moore <derekm@hackunix.org>
- *
- * Copyright (C) 2004 Derek P. Moore
- *
- * Released under GNU GPL. Read the file 'COPYING' for more information.
- */
-
-#ifndef INKSCAPE_UI_STOCK_ITEMS_H
-#define INKSCAPE_UI_STOCK_ITEMS_H
-
-namespace Inkscape {
-namespace UI {
-namespace Stock {
-
-void init();
-
-} // namespace Stock
-} // namespace UI
-} // namespace Inkscape
-
-#endif // INKSCAPE_UI_STOCK_ITEMS_H
-
-/*
- Local Variables:
- mode:c++
- c-file-style:"stroustrup"
- c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
- indent-tabs-mode:nil
- fill-column:99
- End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
diff --git a/src/ui/stock.cpp b/src/ui/stock.cpp
deleted file mode 100644
index f0ec456b1..000000000
--- a/src/ui/stock.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-/**
- * \brief StockIDs for Inkscape-specific stock menu/toolbar items and icons.
- *
- * Author:
- * Derek P. Moore <derekm@hackunix.org>
- *
- * Copyright (C) 2004 Derek P. Moore
- *
- * Released under GNU GPL. Read the file 'COPYING' for more information.
- */
-
-#include "stock.h"
-
-namespace Inkscape {
-namespace UI {
-namespace Stock {
-
-// File menu
-Gtk::StockID const OPEN_RECENT("open-recent");
-Gtk::StockID const IMPORT("import");
-Gtk::StockID const EXPORT("export");
-Gtk::StockID const IMPORTFROMOCAL("import_from_ocal");
-Gtk::StockID const EXPORTTOOCAL("export_to_ocal");
-Gtk::StockID const VACUUM_DEFS("vacuum-defs");
-// Edit menu
-Gtk::StockID const UNDO_HISTORY("undo-history");
-Gtk::StockID const PASTE_IN_PLACE("paste-in-place");
-Gtk::StockID const PASTE_STYLE("paste-style");
-Gtk::StockID const DUPLICATE("duplicate");
-Gtk::StockID const CLONE("clone");
-Gtk::StockID const CLONE_UNLINK("clone-unlink");
-Gtk::StockID const CLONE_SELECT_ORIG("clone-select-orig");
-Gtk::StockID const MAKE_BITMAP("make-bitmap");
-Gtk::StockID const TILE("tile");
-Gtk::StockID const UNTILE("untile");
-Gtk::StockID const SELECT_ALL("select-all");
-Gtk::StockID const SELECT_ALL_IN_ALL_LAYERS("select-all-in-all-layers");
-Gtk::StockID const SELECT_INVERT("select-invert");
-Gtk::StockID const SELECT_NONE("select-none");
-Gtk::StockID const XML_EDITOR("xml-editor");
-// View menu
-Gtk::StockID const ZOOM("zoom");
-Gtk::StockID const ZOOM_IN("zoom-in");
-Gtk::StockID const ZOOM_OUT("zoom-out");
-Gtk::StockID const ZOOM_100("zoom-100");
-Gtk::StockID const ZOOM_50("zoom-50");
-Gtk::StockID const ZOOM_200("zoom-200");
-Gtk::StockID const ZOOM_SELECTION("zoom-selection");
-Gtk::StockID const ZOOM_DRAWING("zoom-drawing");
-Gtk::StockID const ZOOM_PAGE("zoom-page");
-Gtk::StockID const ZOOM_WIDTH("zoom-width");
-Gtk::StockID const ZOOM_PREV("zoom-prev");
-Gtk::StockID const ZOOM_NEXT("zoom-next");
-Gtk::StockID const SHOW_HIDE("show-hide");
-Gtk::StockID const SHOW_HIDE_COMMANDS_BAR("show-hide-commands-bar");
-Gtk::StockID const SHOW_HIDE_TOOL_CONTROLS_BAR("show-hide-tool-controls-bar");
-Gtk::StockID const SHOW_HIDE_TOOLS_BAR("show-hide-tools-bar");
-Gtk::StockID const SHOW_HIDE_RULERS("show-hide-rulers");
-Gtk::StockID const SHOW_HIDE_SCROLLBARS("show-hide-scrollbars");
-Gtk::StockID const SHOW_HIDE_STATUSBAR("show-hide-statusbar");
-Gtk::StockID const SHOW_HIDE_DIALOGS("show-hide-dialogs");
-Gtk::StockID const GRID("grid");
-Gtk::StockID const GUIDES("guides");
-Gtk::StockID const FULLSCREEN("fullscreen");
-Gtk::StockID const MESSAGES("messages");
-Gtk::StockID const SCRIPTS("scripts");
-Gtk::StockID const WINDOW_PREV("window-prev");
-Gtk::StockID const WINDOW_NEXT("window-next");
-Gtk::StockID const WINDOW_DUPLICATE("window-duplicate");
-// Layer menu
-Gtk::StockID const LAYER_NEW("layer-new");
-Gtk::StockID const LAYER_RENAME("layer-rename");
-Gtk::StockID const LAYER_DUPLICATE("layer-duplicate");
-Gtk::StockID const LAYER_ANCHOR("layer-anchor");
-Gtk::StockID const LAYER_MERGE_DOWN("layer-merge-down");
-Gtk::StockID const LAYER_DELETE("layer-delete");
-Gtk::StockID const LAYER_SELECT_NEXT("layer-select-next");
-Gtk::StockID const LAYER_SELECT_PREV("layer-select-prev");
-Gtk::StockID const LAYER_SELECT_TOP("layer-select-top");
-Gtk::StockID const LAYER_SELECT_BOTTOM("layer-select-bottom");
-Gtk::StockID const LAYER_RAISE("layer-raise");
-Gtk::StockID const LAYER_LOWER("layer-lower");
-Gtk::StockID const LAYER_TO_TOP("layer-to-top");
-Gtk::StockID const LAYER_TO_BOTTOM("layer-to-bottom");
-// Object menu
-Gtk::StockID const FILL_STROKE("fill-stroke");
-Gtk::StockID const OBJECT_PROPERTIES("object-properties");
-Gtk::StockID const FILTER_EFFECTS("filter-effects");
-Gtk::StockID const GROUP("group");
-Gtk::StockID const UNGROUP("upgroup");
-Gtk::StockID const RAISE("raise");
-Gtk::StockID const LOWER("lower");
-Gtk::StockID const RAISE_TO_TOP("raise-to-top");
-Gtk::StockID const LOWER_TO_BOTTOM("lower-to-bottom");
-Gtk::StockID const MOVE_TO_NEW_LAYER("move-to-new-layer");
-Gtk::StockID const MOVE_TO_NEXT_LAYER("move-to-next-layer");
-Gtk::StockID const MOVE_TO_PREV_LAYER("move-to-prev-layer");
-Gtk::StockID const MOVE_TO_TOP_LAYER("move-to-top-layer");
-Gtk::StockID const MOVE_TO_BOTTOM_LAYER("move-to-bottom-layer");
-Gtk::StockID const ROTATE_90_CW("rotate-90-cw");
-Gtk::StockID const ROTATE_90_CCW("rotate-90-ccw");
-Gtk::StockID const FLIP_HORIZ("flip-horiz");
-Gtk::StockID const FLIP_VERT("flip-vert");
-Gtk::StockID const TRANSFORM("transform");
-Gtk::StockID const TRANSFORMATION("transformation");
-Gtk::StockID const ALIGN_DISTRIBUTE("align-distribute");
-// Path menu
-Gtk::StockID const OBJECT_TO_PATH("object-to-path");
-Gtk::StockID const STROKE_TO_PATH("stroke-to-path");
-Gtk::StockID const TRACE("trace");
-Gtk::StockID const UNION("union");
-Gtk::StockID const DIFFERENCE("difference");
-Gtk::StockID const INTERSECTION("intersection");
-Gtk::StockID const EXCLUSION("exclusion");
-Gtk::StockID const DIVISION("division");
-Gtk::StockID const CUT_PATH("cut-path");
-Gtk::StockID const COMBINE("combine");
-Gtk::StockID const BREAK_APART("break-apart");
-Gtk::StockID const INSET("inset");
-Gtk::StockID const OUTSET("outset");
-Gtk::StockID const OFFSET_DYNAMIC("offset-dynamic");
-Gtk::StockID const OFFSET_LINKED("offset-linked");
-Gtk::StockID const SIMPLIFY("simplify");
-Gtk::StockID const REVERSE("reverse");
-//Gtk::StockID const CLEANUP("cleanup"); (using Gtk::Stock::CLEAR)
-// Text menu
-Gtk::StockID const TEXT_PROPERTIES("text-properties");
-Gtk::StockID const PUT_ON_PATH("put-on-path");
-Gtk::StockID const REMOVE_FROM_PATH("remove-from-path");
-Gtk::StockID const REMOVE_MANUAL_KERNS("remove-manual-kerns");
-// About menu
-Gtk::StockID const KEYS_MOUSE("keys-mouse");
-Gtk::StockID const TUTORIALS("tutorials");
-Gtk::StockID const ABOUT("about");
-Gtk::StockID const ABOUT_SPLASH("about-splash");
-Gtk::StockID const ABOUT_42("about-42");
-Gtk::StockID const ABOUT_QUICK_HELP("about-quick-help");
-// Tools bar
-Gtk::StockID const TOOL_SELECT("tool-select");
-Gtk::StockID const TOOL_NODE("tool-node");
-Gtk::StockID const TOOL_ZOOM("tool-zoom");
-Gtk::StockID const TOOL_RECT("tool-rect");
-Gtk::StockID const TOOL_ARC("tool-arc");
-Gtk::StockID const TOOL_STAR("tool-star");
-Gtk::StockID const TOOL_SPIRAL("tool-spiral");
-Gtk::StockID const TOOL_FREEHAND("tool-freehand");
-Gtk::StockID const TOOL_PEN("tool-pen");
-Gtk::StockID const TOOL_DYNADRAW("tool-dynadraw");
-Gtk::StockID const TOOL_TEXT("tool-text");
-Gtk::StockID const TOOL_DROPPER("tool-dropper");
-// Select Tool controls
-Gtk::StockID const TRANSFORM_STROKE("transform-stroke");
-Gtk::StockID const TRANSFORM_CORNERS("transform-corners");
-Gtk::StockID const TRANSFORM_GRADIENT("transform-gradient");
-Gtk::StockID const TRANSFORM_PATTERN("transform-pattern");
-// Node Tool controls
-Gtk::StockID const NODE_INSERT("node-insert");
-Gtk::StockID const NODE_DELETE("node-delete");
-Gtk::StockID const NODE_JOIN("node-join");
-Gtk::StockID const NODE_JOIN_SEGMENT("node-join-segment");
-Gtk::StockID const NODE_DELETE_SEGMENT("node-delete-segment");
-Gtk::StockID const NODE_BREAK("node-break");
-Gtk::StockID const NODE_CORNER("node-corner");
-Gtk::StockID const NODE_SMOOTH("node-smooth");
-Gtk::StockID const NODE_SYMMETRIC("node-symmetric");
-Gtk::StockID const NODE_LINE("node-line");
-Gtk::StockID const NODE_CURVE("node-curve");
-// Calligraphy Tool controls
-Gtk::StockID const USE_PRESSURE("use-pressure");
-Gtk::StockID const USE_TILT("use-tilt");
-
-Gtk::StockID const SESSION_PLAYBACK_REW("session-rewind");
-Gtk::StockID const SESSION_PLAYBACK_STEPBACK("session-stepback");
-Gtk::StockID const SESSION_PLAYBACK_PAUSE("session-pause");
-Gtk::StockID const SESSION_PLAYBACK_STEPFORWARD("session-stepforward");
-Gtk::StockID const SESSION_PLAYBACK_PLAY("session-play");
-
-} // namespace Stock
-} // namespace UI
-} // namespace Inkscape
-
-/*
- Local Variables:
- mode:c++
- c-file-style:"stroustrup"
- c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
- indent-tabs-mode:nil
- fill-column:99
- End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
diff --git a/src/ui/stock.h b/src/ui/stock.h
deleted file mode 100644
index ad99a3c05..000000000
--- a/src/ui/stock.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/**
- * \brief StockIDs for Inkscape-specific stock items and icons.
- *
- * Author:
- * Derek P. Moore <derekm@hackunix.org>
- *
- * Copyright (C) 2004 Derek P. Moore
- *
- * Released under GNU GPL. Read the file 'COPYING' for more information.
- */
-
-#ifndef INKSCAPE_UI_STOCK_H
-#define INKSCAPE_UI_STOCK_H
-
-#include <gtkmm/stockid.h>
-
-namespace Inkscape {
-namespace UI {
-namespace Stock {
-
-// File menu
-extern Gtk::StockID const OPEN_RECENT;
-extern Gtk::StockID const IMPORT;
-extern Gtk::StockID const EXPORT;
-extern Gtk::StockID const IMPORTFROMOCAL;
-extern Gtk::StockID const EXPORTTOOCAL;
-extern Gtk::StockID const VACUUM_DEFS;
-// Edit menu
-extern Gtk::StockID const UNDO_HISTORY;
-extern Gtk::StockID const PASTE_IN_PLACE;
-extern Gtk::StockID const PASTE_STYLE;
-extern Gtk::StockID const DUPLICATE;
-extern Gtk::StockID const CLONE;
-extern Gtk::StockID const CLONE_UNLINK;
-extern Gtk::StockID const CLONE_SELECT_ORIG;
-extern Gtk::StockID const MAKE_BITMAP;
-extern Gtk::StockID const TILE;
-extern Gtk::StockID const UNTILE;
-extern Gtk::StockID const SELECT_ALL;
-extern Gtk::StockID const SELECT_ALL_IN_ALL_LAYERS;
-extern Gtk::StockID const SELECT_INVERT;
-extern Gtk::StockID const SELECT_NONE;
-extern Gtk::StockID const XML_EDITOR;
-// View menu
-extern Gtk::StockID const ZOOM;
-extern Gtk::StockID const ZOOM_IN;
-extern Gtk::StockID const ZOOM_OUT;
-extern Gtk::StockID const ZOOM_100;
-extern Gtk::StockID const ZOOM_50;
-extern Gtk::StockID const ZOOM_200;
-extern Gtk::StockID const ZOOM_SELECTION;
-extern Gtk::StockID const ZOOM_DRAWING;
-extern Gtk::StockID const ZOOM_PAGE;
-extern Gtk::StockID const ZOOM_WIDTH;
-extern Gtk::StockID const ZOOM_PREV;
-extern Gtk::StockID const ZOOM_NEXT;
-extern Gtk::StockID const SHOW_HIDE;
-extern Gtk::StockID const SHOW_HIDE_COMMANDS_BAR;
-extern Gtk::StockID const SHOW_HIDE_TOOL_CONTROLS_BAR;
-extern Gtk::StockID const SHOW_HIDE_TOOLS_BAR;
-extern Gtk::StockID const SHOW_HIDE_RULERS;
-extern Gtk::StockID const SHOW_HIDE_SCROLLBARS;
-extern Gtk::StockID const SHOW_HIDE_STATUSBAR;
-extern Gtk::StockID const SHOW_HIDE_DIALOGS;
-extern Gtk::StockID const GRID;
-extern Gtk::StockID const GUIDES;
-extern Gtk::StockID const FULLSCREEN;
-extern Gtk::StockID const MESSAGES;
-extern Gtk::StockID const SCRIPTS;
-extern Gtk::StockID const WINDOW_PREV;
-extern Gtk::StockID const WINDOW_NEXT;
-extern Gtk::StockID const WINDOW_DUPLICATE;
-// Layer menu
-extern Gtk::StockID const LAYER_NEW;
-extern Gtk::StockID const LAYER_RENAME;
-extern Gtk::StockID const LAYER_DUPLICATE;
-extern Gtk::StockID const LAYER_ANCHOR;
-extern Gtk::StockID const LAYER_MERGE_DOWN;
-extern Gtk::StockID const LAYER_DELETE;
-extern Gtk::StockID const LAYER_SELECT_NEXT;
-extern Gtk::StockID const LAYER_SELECT_PREV;
-extern Gtk::StockID const LAYER_SELECT_TOP;
-extern Gtk::StockID const LAYER_SELECT_BOTTOM;
-extern Gtk::StockID const LAYER_RAISE;
-extern Gtk::StockID const LAYER_LOWER;
-extern Gtk::StockID const LAYER_TO_TOP;
-extern Gtk::StockID const LAYER_TO_BOTTOM;
-// Object menu
-extern Gtk::StockID const FILL_STROKE;
-extern Gtk::StockID const OBJECT_PROPERTIES;
-extern Gtk::StockID const FILTER_EFFECTS;
-extern Gtk::StockID const GROUP;
-extern Gtk::StockID const UNGROUP;
-extern Gtk::StockID const RAISE;
-extern Gtk::StockID const LOWER;
-extern Gtk::StockID const RAISE_TO_TOP;
-extern Gtk::StockID const LOWER_TO_BOTTOM;
-extern Gtk::StockID const MOVE_TO_NEW_LAYER;
-extern Gtk::StockID const MOVE_TO_NEXT_LAYER;
-extern Gtk::StockID const MOVE_TO_PREV_LAYER;
-extern Gtk::StockID const MOVE_TO_TOP_LAYER;
-extern Gtk::StockID const MOVE_TO_BOTTOM_LAYER;
-extern Gtk::StockID const ROTATE_90_CW;
-extern Gtk::StockID const ROTATE_90_CCW;
-extern Gtk::StockID const FLIP_HORIZ;
-extern Gtk::StockID const FLIP_VERT;
-extern Gtk::StockID const TRANSFORM;
-extern Gtk::StockID const TRANSFORMATION;
-extern Gtk::StockID const ALIGN_DISTRIBUTE;
-// Path menu
-extern Gtk::StockID const OBJECT_TO_PATH;
-extern Gtk::StockID const STROKE_TO_PATH;
-extern Gtk::StockID const TRACE;
-extern Gtk::StockID const UNION;
-extern Gtk::StockID const DIFFERENCE;
-extern Gtk::StockID const INTERSECTION;
-extern Gtk::StockID const EXCLUSION;
-extern Gtk::StockID const DIVISION;
-extern Gtk::StockID const CUT_PATH;
-extern Gtk::StockID const COMBINE;
-extern Gtk::StockID const BREAK_APART;
-extern Gtk::StockID const INSET;
-extern Gtk::StockID const OUTSET;
-extern Gtk::StockID const OFFSET_DYNAMIC;
-extern Gtk::StockID const OFFSET_LINKED;
-extern Gtk::StockID const SIMPLIFY;
-extern Gtk::StockID const REVERSE;
-//extern Gtk::StockID const CLEANUP; (using Gtk::Stock::CLEAR)
-// Text menu
-extern Gtk::StockID const TEXT_PROPERTIES;
-extern Gtk::StockID const PUT_ON_PATH;
-extern Gtk::StockID const REMOVE_FROM_PATH;
-extern Gtk::StockID const REMOVE_MANUAL_KERNS;
-// About menu
-extern Gtk::StockID const KEYS_MOUSE;
-extern Gtk::StockID const TUTORIALS;
-extern Gtk::StockID const ABOUT;
-extern Gtk::StockID const ABOUT_SPLASH;
-extern Gtk::StockID const ABOUT_42;
-extern Gtk::StockID const ABOUT_QUICK_HELP;
-// Tools bar
-extern Gtk::StockID const TOOL_SELECT;
-extern Gtk::StockID const TOOL_NODE;
-extern Gtk::StockID const TOOL_ZOOM;
-extern Gtk::StockID const TOOL_RECT;
-extern Gtk::StockID const TOOL_ARC;
-extern Gtk::StockID const TOOL_STAR;
-extern Gtk::StockID const TOOL_SPIRAL;
-extern Gtk::StockID const TOOL_FREEHAND;
-extern Gtk::StockID const TOOL_PEN;
-extern Gtk::StockID const TOOL_DYNADRAW;
-extern Gtk::StockID const TOOL_TEXT;
-extern Gtk::StockID const TOOL_DROPPER;
-// Select Tool controls
-extern Gtk::StockID const TRANSFORM_STROKE;
-extern Gtk::StockID const TRANSFORM_CORNERS;
-extern Gtk::StockID const TRANSFORM_GRADIENT;
-extern Gtk::StockID const TRANSFORM_PATTERN;
-// Node Tool controls
-extern Gtk::StockID const NODE_INSERT;
-extern Gtk::StockID const NODE_DELETE;
-extern Gtk::StockID const NODE_JOIN;
-extern Gtk::StockID const NODE_JOIN_SEGMENT;
-extern Gtk::StockID const NODE_DELETE_SEGMENT;
-extern Gtk::StockID const NODE_BREAK;
-extern Gtk::StockID const NODE_CORNER;
-extern Gtk::StockID const NODE_SMOOTH;
-extern Gtk::StockID const NODE_SYMMETRIC;
-extern Gtk::StockID const NODE_LINE;
-extern Gtk::StockID const NODE_CURVE;
-// Calligraphy Tool controls
-extern Gtk::StockID const USE_PRESSURE;
-extern Gtk::StockID const USE_TILT;
-// Session playback dialog controls
-extern Gtk::StockID const SESSION_PLAYBACK_REW;
-extern Gtk::StockID const SESSION_PLAYBACK_STEPBACK;
-extern Gtk::StockID const SESSION_PLAYBACK_PAUSE;
-extern Gtk::StockID const SESSION_PLAYBACK_STEPFORWARD;
-extern Gtk::StockID const SESSION_PLAYBACK_PLAY;
-
-} // namespace Stock
-} // namespace UI
-} // namespace Inkscape
-
-#endif // INKSCAPE_UI_STOCK_H
-
-/*
- Local Variables:
- mode:c++
- c-file-style:"stroustrup"
- c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
- indent-tabs-mode:nil
- fill-column:99
- End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
diff --git a/src/ui/view/edit-widget.cpp b/src/ui/view/edit-widget.cpp
index 6f571a4ef..f11fac4cd 100644
--- a/src/ui/view/edit-widget.cpp
+++ b/src/ui/view/edit-widget.cpp
@@ -50,8 +50,6 @@
#include "file.h"
#include "application/editor.h"
#include "edit-widget.h"
-#include "ui/stock.h"
-#include "ui/stock-items.h"
#include "display/sodipodi-ctrlrect.h"
#include "helper/units.h"
@@ -85,7 +83,6 @@ EditWidget::EditWidget (SPDocument *doc)
g_warning("Creating new EditWidget");
_desktop = 0;
- Stock::init();
initActions();
initAccelMap();
initUIManager();
@@ -315,16 +312,8 @@ EditWidget::onUriChanged()
void
EditWidget::initMenuActions()
{
-// _act_grp->add(Gtk::Action::create("MenuFile", _("PLACEHOLDER, do not translate")));
-// _act_grp->add(Gtk::Action::create("MenuEdit", _("PLACEHOLDER, do not translate")));
-// _act_grp->add(Gtk::Action::create("MenuView", _("PLACEHOLDER, do not translate")));
-// _act_grp->add(Gtk::Action::create("MenuLayer", _("PLACEHOLDER, do not translate")));
-// _act_grp->add(Gtk::Action::create("MenuObject", _("PLACEHOLDER, do not translate")));
-// _act_grp->add(Gtk::Action::create("MenuPath", _("PLACEHOLDER, do not translate")));
-// _act_grp->add(Gtk::Action::create("MenuText", _("PLACEHOLDER, do not translate")));
-// _act_grp->add(Gtk::Action::create("MenuHelp", _("PLACEHOLDER, do not translate")));
-// temporarily replaced with non-gettext version to have a well-sized menu
-// for testing:
+// This has no chance of working right now.
+// Has to be converted to Gtk::Action::create_with_icon_name.
_act_grp->add(Gtk::Action::create("MenuFile", "File"));
_act_grp->add(Gtk::Action::create("MenuEdit", "Edit"));
@@ -345,9 +334,9 @@ EditWidget::initMenuActions()
Gtk::Stock::OPEN, Glib::ustring(),
_("PLACEHOLDER, do not translate")),
sigc::mem_fun(*this, &EditWidget::onActionFileOpen));
-
+/*
_act_grp->add(Gtk::Action::create("OpenRecent",
- Stock::OPEN_RECENT));
+ Stock::OPEN_RECENT));*/
_act_grp->add(Gtk::Action::create("Revert",
Gtk::Stock::REVERT_TO_SAVED, Glib::ustring(),
@@ -363,7 +352,7 @@ EditWidget::initMenuActions()
Gtk::Stock::SAVE_AS, Glib::ustring(),
_("PLACEHOLDER, do not translate")),
sigc::mem_fun(*this, &EditWidget::onActionFileOpen));
-
+/*
_act_grp->add(Gtk::Action::create("Import",
Stock::IMPORT, Glib::ustring(),
_("PLACEHOLDER, do not translate")),
@@ -372,7 +361,7 @@ EditWidget::initMenuActions()
_act_grp->add(Gtk::Action::create("Export",
Stock::EXPORT, Glib::ustring(),
_("PLACEHOLDER, do not translate")),
- sigc::mem_fun(*this, &EditWidget::onDialogExport));
+ sigc::mem_fun(*this, &EditWidget::onDialogExport));*/
_act_grp->add(Gtk::Action::create("Print",
Gtk::Stock::PRINT, Glib::ustring(),
@@ -382,10 +371,10 @@ EditWidget::initMenuActions()
_act_grp->add(Gtk::Action::create("PrintPreview",
Gtk::Stock::PRINT_PREVIEW),
sigc::mem_fun(*this, &EditWidget::onActionFileOpen));
-
+/*
_act_grp->add(Gtk::Action::create("VacuumDefs",
Stock::VACUUM_DEFS),
- sigc::mem_fun(*this, &EditWidget::onActionFileOpen));
+ sigc::mem_fun(*this, &EditWidget::onActionFileOpen));*/
_act_grp->add(Gtk::Action::create("DocumentProperties",
Gtk::Stock::PROPERTIES, Glib::ustring(),
@@ -413,10 +402,10 @@ EditWidget::initMenuActions()
_act_grp->add(Gtk::Action::create("Redo",
Gtk::Stock::REDO, Glib::ustring(),
_("PLACEHOLDER, do not translate")));
-
+/*
_act_grp->add(Gtk::Action::create("UndoHistory",
Stock::UNDO_HISTORY, Glib::ustring(),
- _("PLACEHOLDER, do not translate")));
+ _("PLACEHOLDER, do not translate")));*/
_act_grp->add(Gtk::Action::create("Cut",
Gtk::Stock::CUT, Glib::ustring(),
@@ -429,17 +418,17 @@ EditWidget::initMenuActions()
_act_grp->add(Gtk::Action::create("Paste",
Gtk::Stock::PASTE, Glib::ustring(),
_("PLACEHOLDER, do not translate")));
-
+/*
_act_grp->add(Gtk::Action::create("PasteInPlace",
Stock::PASTE_IN_PLACE));
_act_grp->add(Gtk::Action::create("PasteStyle",
- Stock::PASTE_STYLE));
+ Stock::PASTE_STYLE));*/
_act_grp->add(Gtk::Action::create("Find",
Gtk::Stock::FIND),
sigc::mem_fun(*this, &EditWidget::onDialogFind));
-
+/*
_act_grp->add(Gtk::Action::create("Duplicate",
Stock::DUPLICATE, Glib::ustring(),
_("PLACEHOLDER, do not translate")));
@@ -760,7 +749,7 @@ EditWidget::initMenuActions()
Stock::SIMPLIFY));
_act_grp->add(Gtk::Action::create("Reverse",
- Stock::REVERSE));
+ Stock::REVERSE));*/
_act_grp->add(Gtk::Action::create("Cleanup",
Gtk::Stock::CLEAR,
@@ -771,7 +760,7 @@ EditWidget::initMenuActions()
Gtk::Stock::SELECT_FONT, Glib::ustring(),
_("PLACEHOLDER, do not translate")),
sigc::mem_fun(*this, &EditWidget::onDialogTextProperties));
-
+/*
_act_grp->add(Gtk::Action::create("PutOnPath",
Stock::PUT_ON_PATH));
@@ -779,13 +768,14 @@ EditWidget::initMenuActions()
Stock::REMOVE_FROM_PATH));
_act_grp->add(Gtk::Action::create("RemoveManualKerns",
- Stock::REMOVE_MANUAL_KERNS));
+ Stock::REMOVE_MANUAL_KERNS));*/
// Whiteboard menu
#ifdef WITH_INKBOARD
#endif
// About menu
+/*
_act_grp->add(Gtk::Action::create("KeysAndMouse",
Stock::KEYS_MOUSE));
@@ -794,15 +784,16 @@ EditWidget::initMenuActions()
_act_grp->add(Gtk::Action::create("About",
Stock::ABOUT),
- sigc::mem_fun(*this, &EditWidget::onDialogAbout));
+ sigc::mem_fun(*this, &EditWidget::onDialogAbout));*/
}
void
EditWidget::initToolbarActions()
{
// Tools bar
+ // This has zero chance to work, and has to be converted to create_with_icon_name
Gtk::RadioAction::Group tools;
-
+/*
_act_grp->add(Gtk::RadioAction::create(tools, "ToolSelect",
Stock::TOOL_SELECT, Glib::ustring(),
_("PLACEHOLDER, do not translate")),
@@ -868,7 +859,7 @@ EditWidget::initToolbarActions()
_act_grp->add(Gtk::ToggleAction::create("TransformPattern",
Stock::TRANSFORM_PATTERN, Glib::ustring(),
- _("PLACEHOLDER, do not translate")));
+ _("PLACEHOLDER, do not translate")));*/
// Node Controls bar
_act_grp->add(Gtk::Action::create("NodeInsert",
@@ -878,7 +869,7 @@ EditWidget::initToolbarActions()
_act_grp->add(Gtk::Action::create("NodeDelete",
Gtk::Stock::REMOVE, Glib::ustring(),
_("PLACEHOLDER, do not translate")));
-
+/*
_act_grp->add(Gtk::Action::create("NodeJoin",
Stock::NODE_JOIN, Glib::ustring(),
_("PLACEHOLDER, do not translate")));
@@ -913,7 +904,7 @@ EditWidget::initToolbarActions()
_act_grp->add(Gtk::Action::create("NodeCurve",
Stock::NODE_CURVE, Glib::ustring(),
- _("PLACEHOLDER, do not translate")));
+ _("PLACEHOLDER, do not translate")));*/
}
void
diff --git a/src/ui/widget/imagetoggler.cpp b/src/ui/widget/imagetoggler.cpp
index e3670bd49..961cce5b5 100644
--- a/src/ui/widget/imagetoggler.cpp
+++ b/src/ui/widget/imagetoggler.cpp
@@ -31,19 +31,14 @@ ImageToggler::ImageToggler( char const* on, char const* off) :
{
property_mode() = Gtk::CELL_RENDERER_MODE_ACTIVATABLE;
int phys = sp_icon_get_phys_size((int)Inkscape::ICON_SIZE_DECORATION);
+ Glib::RefPtr<Gtk::IconTheme> icon_theme = Gtk::IconTheme::get_default();
- Glib::RefPtr<Gdk::Pixbuf> pbmm = Gtk::IconTheme::get_default()->load_icon(_pixOnName, phys, (Gtk::IconLookupFlags)0);
- if ( pbmm ) {
- GdkPixbuf* pb = gdk_pixbuf_copy(pbmm->gobj());
- _property_pixbuf_on = Glib::wrap( pb );
- pbmm->unreference();
+ if (icon_theme->has_icon(_pixOnName)) {
+ _property_pixbuf_on = icon_theme->load_icon(_pixOnName, phys, (Gtk::IconLookupFlags)0);
}
- pbmm = Gtk::IconTheme::get_default()->load_icon(_pixOffName, phys, (Gtk::IconLookupFlags)0);
- if ( pbmm ) {
- GdkPixbuf* pb = gdk_pixbuf_copy(pbmm->gobj());
- _property_pixbuf_off = Glib::wrap( pb );
- pbmm->unreference();
+ if (icon_theme->has_icon(_pixOffName)) {
+ _property_pixbuf_off = icon_theme->load_icon(_pixOffName, phys, (Gtk::IconLookupFlags)0);
}
property_pixbuf() = _property_pixbuf_off.get_value();
diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index 0ad7187f5..3e6683c64 100644
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -18,7 +18,6 @@
#include "document.h"
#include "filter-chemistry.h"
#include "inkscape.h"
-#include "inkscape-stock.h"
#include "selection.h"
#include "style.h"
#include "sp-item.h"
@@ -26,6 +25,7 @@
#include "verbs.h"
#include "xml/repr.h"
#include "widgets/icon.h"
+#include "ui/icon-names.h"
#include "ui/widget/object-composite-settings.h"
#include "display/sp-canvas.h"