diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2007-03-25 07:50:33 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2007-03-25 07:50:33 +0000 |
| commit | e4bfc937bc7be59dfa26aa9db97fa037b4021443 (patch) | |
| tree | a3c5d0c9cd0930eb375a5ca16d38f22eb68acc67 | |
| parent | move extension adding to the right place so it's added on export, not on browse (diff) | |
| download | inkscape-e4bfc937bc7be59dfa26aa9db97fa037b4021443.tar.gz inkscape-e4bfc937bc7be59dfa26aa9db97fa037b4021443.zip | |
Cleaning up toggle/redo interaction
(bzr r2755)
| -rw-r--r-- | src/widgets/toolbox.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 8ea27df93..d8903b404 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -1088,13 +1088,14 @@ static void star_tb_event_attr_changed(Inkscape::XML::Node *repr, gchar const *n adj = GTK_ADJUSTMENT( gtk_object_get_data(GTK_OBJECT(tbl), "rounded") ); gtk_adjustment_set_value(adj, sp_repr_get_double_attribute(repr, "inkscape:rounded", 0.0)); } else if (!strcmp(name, "inkscape:flatsided")) { - GtkToggleAction* flat_action = GTK_TOGGLE_ACTION( g_object_get_data( G_OBJECT(tbl), "flat_action" ) ); GtkAction* prop_action = GTK_ACTION( g_object_get_data(G_OBJECT(tbl), "prop_action") ); char const *flatsides = repr->attribute("inkscape:flatsided"); if (flatsides && !strcmp(flatsides,"false" )) { - gtk_toggle_action_set_active( flat_action, FALSE ); + GtkToggleAction* flat2_action = GTK_TOGGLE_ACTION( g_object_get_data( G_OBJECT(tbl), "flat2_action" ) ); + gtk_toggle_action_set_active( flat2_action, TRUE ); gtk_action_set_sensitive( prop_action, TRUE ); } else { + GtkToggleAction* flat_action = GTK_TOGGLE_ACTION( g_object_get_data( G_OBJECT(tbl), "flat_action" ) ); gtk_toggle_action_set_active( flat_action, TRUE ); gtk_action_set_sensitive( prop_action, FALSE ); } @@ -1190,7 +1191,8 @@ static void sp_stb_defaults( GtkWidget *widget, GtkWidget *dataKludge ) gdouble rounded = 0; GtkToggleAction* flat_action = GTK_TOGGLE_ACTION( g_object_get_data( G_OBJECT(dataKludge), "flat_action" ) ); - gtk_toggle_action_set_active( flat_action, flat ); + GtkToggleAction* flat2_action = GTK_TOGGLE_ACTION( g_object_get_data( G_OBJECT(dataKludge), "flat2_action" ) ); + gtk_toggle_action_set_active( flat ? flat_action : flat2_action, TRUE ); GtkAction* sb2 = GTK_ACTION( g_object_get_data(G_OBJECT(dataKludge), "prop_action") ); gtk_action_set_sensitive( sb2, !flat ); @@ -1287,6 +1289,7 @@ sp_star_toolbox_new(SPDesktop *desktop) g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(sp_stb_sides_flat_state_changed), holder); gtk_object_set_data( GTK_OBJECT(holder), "flat_action", act ); + gtk_object_set_data( GTK_OBJECT(holder), "flat2_action", act2 ); } /* Magnitude */ |