![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 17fc0e73693d77277df99b178973ed3a8668ffeb..287a45f1a2c196bb41bf9a04d49a97764bb39f4f 100644 (file)
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
static EgeAdjustmentAction * create_adjustment_action( gchar const *name,
gchar const *label, gchar const *tooltip,
gchar const *path, gchar const *data, gdouble def,
+ GtkWidget *focusTarget,
GtkWidget *us,
GtkWidget *dataKludge,
gboolean altx, gchar const *altx_mark,
gtk_signal_connect( GTK_OBJECT(adj), "value-changed", GTK_SIGNAL_FUNC(callback), dataKludge );
- EgeAdjustmentAction* act = ege_adjustment_action_new( adj, name, label, tooltip, 0 );
+ EgeAdjustmentAction* act = ege_adjustment_action_new( adj, name, label, tooltip, 0, climb, digits );
- gtk_object_set_data( GTK_OBJECT(dataKludge), data, adj );
+ if ( focusTarget ) {
+ ege_adjustment_action_set_focuswidget( act, focusTarget );
+ }
+
+ if ( dataKludge ) {
+ gtk_object_set_data( GTK_OBJECT(dataKludge), data, adj );
+ }
return act;
}
@@ -2022,7 +2029,7 @@ static void sp_ddc_tilt_state_changed2( GtkToggleAction *act, GtkAction *calligr
{
prefs_set_int_attribute( "tools.calligraphic", "usetilt", gtk_toggle_action_get_active( act ) ? 1 : 0 );
- gtk_action_set_sensitive( calligraphy_angle, gtk_toggle_action_get_active( act ) );
+ gtk_action_set_sensitive( calligraphy_angle, !gtk_toggle_action_get_active( act ) );
}
static void sp_ddc_defaults2(GtkWidget *, GtkWidget *dataKludge)
static GtkWidget *
sp_calligraphy_toolbox_new(SPDesktop *desktop)
{
- if ( prefs_get_int_attribute_limited( "options.stocktoolbars", "value", 0, 0, 1 ) ) {
+ if ( prefs_get_int_attribute_limited( "options.stocktoolbars", "value", 1, 0, 1 ) ) {
GtkWidget *toolBar = 0;
GtkWidget* holder = gtk_table_new( 1, 2, FALSE );
eact = create_adjustment_action( "WidthAction",
_("Width:"), _("The width of the calligraphic pen (relative to the visible canvas area)"),
"tools.calligraphic", "width", 15,
- NULL, holder, TRUE, "altx-calligraphy",
+ GTK_WIDGET(desktop->canvas), NULL, holder, TRUE, "altx-calligraphy",
1, 100, 1.0, 10.0,
sp_ddc_width_value_changed2, 0.01, 0, 100 );
gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
eact = create_adjustment_action( "ThinningAction",
_("Thinning:"), _("How much velocity thins the stroke (> 0 makes fast strokes thinner, < 0 makes them broader, 0 makes width independent of velocity)"),
"tools.calligraphic", "thinning", 0.1,
- NULL, holder, FALSE, NULL,
+ GTK_WIDGET(desktop->canvas), NULL, holder, FALSE, NULL,
-1.0, 1.0, 0.01, 0.1,
sp_ddc_velthin_value_changed2, 0.01, 2);
gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
eact = create_adjustment_action( "AngleAction",
_("Angle:"), _("The angle of the pen's nib (in degrees; 0 = horizontal; has no effect if fixation = 0)"),
"tools.calligraphic", "angle", 30,
- NULL, holder, TRUE, "calligraphy-angle",
+ GTK_WIDGET(desktop->canvas), NULL, holder, TRUE, "calligraphy-angle",
-90.0, 90.0, 1.0, 10.0,
sp_ddc_angle_value_changed2, 1, 0 );
gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
eact = create_adjustment_action( "FixationAction",
_("Fixation:"), _("Angle behavior (0 = nib always perpendicular to stroke direction, 1 = fixed angle)"),
"tools.calligraphic", "flatness", 0.9,
- NULL, holder, FALSE, NULL,
+ GTK_WIDGET(desktop->canvas), NULL, holder, FALSE, NULL,
0.0, 1.0, 0.01, 0.1,
sp_ddc_flatness_value_changed2, 0.01, 2 );
gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
eact = create_adjustment_action( "CapRoundingAction",
_("Round:"), _("Increase to round the ends of strokes"),
"tools.calligraphic", "cap_rounding", 0.0,
- NULL, holder, FALSE, NULL,
+ GTK_WIDGET(desktop->canvas), NULL, holder, FALSE, NULL,
0.0, 1.0, 0.01, 0.1,
sp_ddc_cap_rounding_value_changed2, 0.01, 2 );
gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
eact = create_adjustment_action( "TremorAction",
_("Tremor:"), _("Increase to make strokes rugged and trembling"),
"tools.calligraphic", "tremor", 0.0,
- NULL, holder, FALSE, NULL,
+ GTK_WIDGET(desktop->canvas), NULL, holder, FALSE, NULL,
0.0, 1.0, 0.01, 0.1,
sp_ddc_tremor_value_changed2, 0.01, 2 );
eact = create_adjustment_action( "WiggleAction",
_("Wiggle:"), _("Increase to make the pen waver and wiggle"),
"tools.calligraphic", "wiggle", 0.0,
- NULL, holder, FALSE, NULL,
+ GTK_WIDGET(desktop->canvas), NULL, holder, FALSE, NULL,
0.0, 1.0, 0.01, 0.1,
sp_ddc_wiggle_value_changed2, 0.01, 2 );
gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
eact = create_adjustment_action( "MassAction",
_("Mass:"), _("Increase to make the pen drag behind, as if slowed by inertia"),
"tools.calligraphic", "mass", 0.02,
- NULL, holder, FALSE, NULL,
+ GTK_WIDGET(desktop->canvas), NULL, holder, FALSE, NULL,
0.0, 1.0, 0.01, 0.1,
sp_ddc_mass_value_changed2, 0.01, 2 );
gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
Inkscape::ICON_SIZE_DECORATION );
gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(sp_ddc_tilt_state_changed2), calligraphy_angle );
- gtk_action_set_sensitive( GTK_ACTION(calligraphy_angle), prefs_get_int_attribute( "tools.calligraphic", "usetilt", 1 ) );
+ gtk_action_set_sensitive( GTK_ACTION(calligraphy_angle), !prefs_get_int_attribute( "tools.calligraphic", "usetilt", 1 ) );
gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs_get_int_attribute( "tools.calligraphic", "usetilt", 1 ) );
}