diff options
| author | Maximilian Albert <maximilian.albert@gmail.com> | 2008-08-19 13:37:37 +0000 |
|---|---|---|
| committer | cilix42 <cilix42@users.sourceforge.net> | 2008-08-19 13:37:37 +0000 |
| commit | b5d8350b996f3d43f8afaa9af2118474caf748f0 (patch) | |
| tree | f4af74a834669010f2f03818cd628cd56a63466f /src/widgets/toolbox.cpp | |
| parent | Apply instant-LPEs _before_ adding new items to selection (so that they can b... (diff) | |
| download | inkscape-b5d8350b996f3d43f8afaa9af2118474caf748f0.tar.gz inkscape-b5d8350b996f3d43f8afaa9af2118474caf748f0.zip | |
Deactivate unit selector when measuring info is off
(bzr r6702)
Diffstat (limited to 'src/widgets/toolbox.cpp')
| -rw-r--r-- | src/widgets/toolbox.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index ab2153fe0..185b80413 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -4895,16 +4895,18 @@ lpetool_toggle_show_bbox (GtkToggleAction *act, gpointer data) { } static void -lpetool_toggle_show_measuring_info (GtkToggleAction *act, gpointer data) { - SPDesktop *desktop = static_cast<SPDesktop *>(data); +lpetool_toggle_show_measuring_info (GtkToggleAction *act, GObject *tbl) { + SPDesktop *desktop = static_cast<SPDesktop *>(g_object_get_data(tbl, "desktop")); if (!tools_isactive(desktop, TOOLS_LPETOOL)) return; + GtkAction *unitact = static_cast<GtkAction*>(g_object_get_data(tbl, "lpetool_units_action")); SPLPEToolContext *lc = SP_LPETOOL_CONTEXT(desktop->event_context); if (tools_isactive(desktop, TOOLS_LPETOOL)) { bool show = gtk_toggle_action_get_active( act ); prefs_set_int_attribute ("tools.lpetool", "show_measuring_info", show ? 1 : 0); lpetool_show_measuring_info(lc, show); + gtk_action_set_sensitive(GTK_ACTION(unitact), show); } } @@ -5105,7 +5107,7 @@ static void sp_lpetool_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActi "lpetool_measuring_info", 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_measuring_info), desktop ); + g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(lpetool_toggle_show_measuring_info), holder ); gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs_get_int_attribute( "tools.lpetool", "show_measuring_info", 1 ) ); } @@ -5114,6 +5116,8 @@ static void sp_lpetool_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActi GtkAction* act = tracker->createAction( "LPEToolUnitsAction", _("Units"), ("") ); gtk_action_group_add_action( mainActions, act ); g_signal_connect_after( G_OBJECT(act), "changed", G_CALLBACK(lpetool_unit_changed), (GObject*)holder ); + g_object_set_data(holder, "lpetool_units_action", act); + gtk_action_set_sensitive(act, prefs_get_int_attribute ("tools.lpetool", "show_measuring_info", 1)); } /* Open LPE dialog (to adapt parameters numerically) */ |