summaryrefslogtreecommitdiffstats
path: root/src/widgets/toolbox.cpp
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2009-04-18 01:24:27 +0000
committertweenk <tweenk@users.sourceforge.net>2009-04-18 01:24:27 +0000
commiteba76fd4133117e607221b27d0bee61ec5b17197 (patch)
treeb2cff54dd213c6e79120de6ce62eb9cc34829112 /src/widgets/toolbox.cpp
parentFix broken randomize icon (diff)
downloadinkscape-eba76fd4133117e607221b27d0bee61ec5b17197.tar.gz
inkscape-eba76fd4133117e607221b27d0bee61ec5b17197.zip
Fix most icons in the geometry tool
(bzr r7727)
Diffstat (limited to 'src/widgets/toolbox.cpp')
-rw-r--r--src/widgets/toolbox.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 0f880e1be..ce2260451 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -5347,7 +5347,7 @@ static void sp_lpetool_mode_changed(EgeSelectOneAction *act, GObject *tbl)
g_object_set_data(tbl, "freeze", GINT_TO_POINTER(TRUE));
gint mode = ege_select_one_action_get_active(act);
- EffectType type = lpesubtools[mode];
+ EffectType type = lpesubtools[mode].type;
SPLPEToolContext *lc = SP_LPETOOL_CONTEXT(desktop->event_context);
bool success = lpetool_try_construction(lc, type);
@@ -5566,17 +5566,17 @@ static void sp_lpetool_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActi
gtk_list_store_set( model, &iter,
0, _("All inactive"),
1, _("No geometric tool is active"),
- 2, _("all_inactive"),
+ 2, _("draw-geometry-inactive"),
-1 );
Inkscape::LivePathEffect::EffectType type;
for (int i = 1; i < num_subtools; ++i) { // we start with i = 1 because INVALID_LPE was already added
- type = lpesubtools[i];
+ type = lpesubtools[i].type;
gtk_list_store_append( model, &iter );
gtk_list_store_set( model, &iter,
0, Inkscape::LivePathEffect::LPETypeConverter.get_label(type).c_str(),
1, Inkscape::LivePathEffect::LPETypeConverter.get_label(type).c_str(),
- 2, Inkscape::LivePathEffect::LPETypeConverter.get_key(type).c_str(),
+ 2, lpesubtools[i].icon_name,
-1 );
}
@@ -5600,7 +5600,7 @@ static void sp_lpetool_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActi
InkToggleAction* act = ink_toggle_action_new( "LPEShowBBoxAction",
_("Show limiting bounding box"),
_("Show bounding box (used to cut infinite lines)"),
- "lpetool_show_bbox",
+ "show-bounding-box",
Inkscape::ICON_SIZE_DECORATION );
gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(lpetool_toggle_show_bbox), desktop );