diff options
| -rw-r--r-- | src/ui/toolbar/arc-toolbar.cpp | 8 | ||||
| -rw-r--r-- | src/ui/toolbar/box3d-toolbar.cpp | 6 | ||||
| -rw-r--r-- | src/ui/toolbar/calligraphy-toolbar.cpp | 17 | ||||
| -rw-r--r-- | src/ui/toolbar/connector-toolbar.cpp | 6 | ||||
| -rw-r--r-- | src/ui/toolbar/eraser-toolbar.cpp | 10 | ||||
| -rw-r--r-- | src/ui/toolbar/gradient-toolbar.cpp | 3 | ||||
| -rw-r--r-- | src/ui/toolbar/measure-toolbar.cpp | 8 | ||||
| -rw-r--r-- | src/ui/toolbar/mesh-toolbar.cpp | 4 | ||||
| -rw-r--r-- | src/ui/toolbar/node-toolbar.cpp | 4 | ||||
| -rw-r--r-- | src/ui/toolbar/paintbucket-toolbar.cpp | 6 | ||||
| -rw-r--r-- | src/ui/toolbar/pencil-toolbar.cpp | 6 | ||||
| -rw-r--r-- | src/ui/toolbar/rect-toolbar.cpp | 8 | ||||
| -rw-r--r-- | src/ui/toolbar/select-toolbar.cpp | 10 | ||||
| -rw-r--r-- | src/ui/toolbar/spiral-toolbar.cpp | 6 | ||||
| -rw-r--r-- | src/ui/toolbar/spray-toolbar.cpp | 14 | ||||
| -rw-r--r-- | src/ui/toolbar/star-toolbar.cpp | 8 | ||||
| -rw-r--r-- | src/ui/toolbar/text-toolbar.cpp | 12 | ||||
| -rw-r--r-- | src/ui/toolbar/tweak-toolbar.cpp | 8 | ||||
| -rw-r--r-- | src/widgets/toolbox.cpp | 7 | ||||
| -rw-r--r-- | src/widgets/toolbox.h | 1 |
20 files changed, 70 insertions, 82 deletions
diff --git a/src/ui/toolbar/arc-toolbar.cpp b/src/ui/toolbar/arc-toolbar.cpp index acfcac079..d964846cf 100644 --- a/src/ui/toolbar/arc-toolbar.cpp +++ b/src/ui/toolbar/arc-toolbar.cpp @@ -113,11 +113,11 @@ ArcToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) toolbar->_rx_action = create_adjustment_action( "ArcRadiusXAction", _("Horizontal radius"), _("Rx:"), _("Horizontal radius of the circle, ellipse, or arc"), "/tools/shapes/arc/rx", 0, - GTK_WIDGET(desktop->canvas), TRUE, "altx-arc", 0, 1e6, SPIN_STEP, SPIN_PAGE_STEP, labels, values, G_N_ELEMENTS(labels), toolbar->_tracker); + ege_adjustment_action_set_focuswidget(toolbar->_rx_action, GTK_WIDGET(desktop->canvas)); toolbar->_rx_adj = Glib::wrap(ege_adjustment_action_get_adjustment(toolbar->_rx_action)); toolbar->_rx_adj->signal_value_changed().connect(sigc::bind(sigc::mem_fun(*toolbar, &ArcToolbar::value_changed), toolbar->_rx_adj, "rx")); @@ -132,11 +132,11 @@ ArcToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) toolbar->_ry_action = create_adjustment_action( "ArcRadiusYAction", _("Vertical radius"), _("Ry:"), _("Vertical radius of the circle, ellipse, or arc"), "/tools/shapes/arc/ry", 0, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, 0, 1e6, SPIN_STEP, SPIN_PAGE_STEP, labels, values, G_N_ELEMENTS(labels), toolbar->_tracker); + ege_adjustment_action_set_focuswidget(toolbar->_ry_action, GTK_WIDGET(desktop->canvas)); toolbar->_ry_adj = Glib::wrap(ege_adjustment_action_get_adjustment(toolbar->_ry_action)); toolbar->_ry_adj->signal_value_changed().connect(sigc::bind(sigc::mem_fun(*toolbar, &ArcToolbar::value_changed), toolbar->_ry_adj, "ry")); @@ -156,11 +156,11 @@ ArcToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) _("Start"), _("Start:"), _("The angle (in degrees) from the horizontal to the arc's start point"), "/tools/shapes/arc/start", 0.0, - GTK_WIDGET(desktop->canvas), TRUE, "altx-arc", -360.0, 360.0, 1.0, 10.0, nullptr, nullptr, 0 ); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); toolbar->_start_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); } @@ -171,11 +171,11 @@ ArcToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) _("End"), _("End:"), _("The angle (in degrees) from the horizontal to the arc's end point"), "/tools/shapes/arc/end", 0.0, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, -360.0, 360.0, 1.0, 10.0, nullptr, nullptr, 0 ); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); toolbar->_end_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); } diff --git a/src/ui/toolbar/box3d-toolbar.cpp b/src/ui/toolbar/box3d-toolbar.cpp index bb2525153..e42700c93 100644 --- a/src/ui/toolbar/box3d-toolbar.cpp +++ b/src/ui/toolbar/box3d-toolbar.cpp @@ -90,11 +90,11 @@ Box3DToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) // Translators: PL is short for 'perspective line' _("Angle of PLs in X direction"), "/tools/shapes/3dbox/box3d_angle_x", 30, - GTK_WIDGET(desktop->canvas), TRUE, "altx-box3d", -360.0, 360.0, 1.0, 10.0, labels, values, G_N_ELEMENTS(labels) ); + ege_adjustment_action_set_focuswidget(holder->_angle_x_action, GTK_WIDGET(desktop->canvas)); holder->_angle_x_adj = Glib::wrap(ege_adjustment_action_get_adjustment(holder->_angle_x_action)); holder->_angle_x_adj->signal_value_changed().connect(sigc::bind(sigc::mem_fun(*holder, &Box3DToolbar::angle_value_changed), holder->_angle_x_adj, Proj::X)); @@ -131,11 +131,11 @@ Box3DToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) // Translators: PL is short for 'perspective line' _("Angle of PLs in Y direction"), "/tools/shapes/3dbox/box3d_angle_y", 30, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, -360.0, 360.0, 1.0, 10.0, labels, values, G_N_ELEMENTS(labels) ); + ege_adjustment_action_set_focuswidget(holder->_angle_y_action, GTK_WIDGET(desktop->canvas)); holder->_angle_y_adj = Glib::wrap(ege_adjustment_action_get_adjustment(holder->_angle_y_action)); holder->_angle_y_adj->signal_value_changed().connect(sigc::bind(sigc::mem_fun(*holder, &Box3DToolbar::angle_value_changed), holder->_angle_y_adj, Proj::Y)); @@ -171,11 +171,11 @@ Box3DToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) // Translators: PL is short for 'perspective line' _("Angle of PLs in Z direction"), "/tools/shapes/3dbox/box3d_angle_z", 30, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, -360.0, 360.0, 1.0, 10.0, labels, values, G_N_ELEMENTS(labels) ); + ege_adjustment_action_set_focuswidget(holder->_angle_z_action, GTK_WIDGET(desktop->canvas)); holder->_angle_z_adj = Glib::wrap(ege_adjustment_action_get_adjustment(holder->_angle_z_action)); holder->_angle_z_adj->signal_value_changed().connect(sigc::bind(sigc::mem_fun(*holder, &Box3DToolbar::angle_value_changed), holder->_angle_z_adj, Proj::Z)); diff --git a/src/ui/toolbar/calligraphy-toolbar.cpp b/src/ui/toolbar/calligraphy-toolbar.cpp index 7411d10ca..f6900e361 100644 --- a/src/ui/toolbar/calligraphy-toolbar.cpp +++ b/src/ui/toolbar/calligraphy-toolbar.cpp @@ -105,11 +105,11 @@ CalligraphyToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) _("Pen Width"), _("Width:"), _("The width of the calligraphic pen (relative to the visible canvas area)"), "/tools/calligraphic/width", 15, - GTK_WIDGET(desktop->canvas), TRUE, "altx-calligraphy", 1, 100, 1.0, 10.0, labels, values, G_N_ELEMENTS(labels), nullptr /*unit tracker*/, 1, 0 ); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); toolbar->_width_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); toolbar->_width_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &CalligraphyToolbar::width_value_changed)); toolbar->_widget_map["width"] = G_OBJECT(toolbar->_width_adj->gobj()); @@ -126,11 +126,11 @@ CalligraphyToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) _("Stroke Thinning"), _("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", 10, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, -100, 100, 1, 10.0, labels, values, G_N_ELEMENTS(labels), nullptr /*unit tracker*/, 1, 0); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); toolbar->_thinning_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); toolbar->_thinning_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &CalligraphyToolbar::velthin_value_changed)); toolbar->_widget_map["thinning"] = G_OBJECT(toolbar->_thinning_adj->gobj()); @@ -146,11 +146,11 @@ CalligraphyToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) _("Pen Angle"), _("Angle:"), _("The angle of the pen's nib (in degrees; 0 = horizontal; has no effect if fixation = 0)"), "/tools/calligraphic/angle", 30, - GTK_WIDGET(desktop->canvas), TRUE, "calligraphy-angle", -90.0, 90.0, 1.0, 10.0, labels, values, G_N_ELEMENTS(labels), nullptr /*unit tracker*/, 1, 0 ); + ege_adjustment_action_set_focuswidget(toolbar->_angle_action, GTK_WIDGET(desktop->canvas)); toolbar->_angle_adj = Glib::wrap(ege_adjustment_action_get_adjustment(toolbar->_angle_action)); toolbar->_angle_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &CalligraphyToolbar::angle_value_changed)); toolbar->_widget_map["angle"] = G_OBJECT(toolbar->_angle_adj->gobj()); @@ -166,11 +166,11 @@ CalligraphyToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) _("Fixation"), _("Fixation:"), _("Angle behavior (0 = nib always perpendicular to stroke direction, 100 = fixed angle)"), "/tools/calligraphic/flatness", 90, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, 0.0, 100, 1.0, 10.0, labels, values, G_N_ELEMENTS(labels), nullptr /*unit tracker*/, 1, 0); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); toolbar->_fixation_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); toolbar->_fixation_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &CalligraphyToolbar::flatness_value_changed)); toolbar->_widget_map["flatness"] = G_OBJECT(toolbar->_fixation_adj->gobj()); @@ -187,11 +187,11 @@ CalligraphyToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) _("Cap rounding"), _("Caps:"), _("Increase to make caps at the ends of strokes protrude more (0 = no caps, 1 = round caps)"), "/tools/calligraphic/cap_rounding", 0.0, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, 0.0, 5.0, 0.01, 0.1, labels, values, G_N_ELEMENTS(labels), nullptr /*unit tracker*/, 0.01, 2 ); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); toolbar->_cap_rounding_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); toolbar->_cap_rounding_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &CalligraphyToolbar::cap_rounding_value_changed)); toolbar->_widget_map["cap_rounding"] = G_OBJECT(toolbar->_cap_rounding_adj->gobj()); @@ -207,12 +207,11 @@ CalligraphyToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) _("Stroke Tremor"), _("Tremor:"), _("Increase to make strokes rugged and trembling"), "/tools/calligraphic/tremor", 0.0, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, 0.0, 100, 1, 10.0, labels, values, G_N_ELEMENTS(labels), nullptr /*unit tracker*/, 1, 0); - + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); toolbar->_tremor_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); toolbar->_tremor_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &CalligraphyToolbar::tremor_value_changed)); toolbar->_widget_map["tremor"] = G_OBJECT(toolbar->_tremor_adj->gobj()); @@ -229,11 +228,11 @@ CalligraphyToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) _("Pen Wiggle"), _("Wiggle:"), _("Increase to make the pen waver and wiggle"), "/tools/calligraphic/wiggle", 0.0, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, 0.0, 100, 1, 10.0, labels, values, G_N_ELEMENTS(labels), nullptr /*unit tracker*/, 1, 0); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); toolbar->_wiggle_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); toolbar->_wiggle_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &CalligraphyToolbar::wiggle_value_changed)); toolbar->_widget_map["wiggle"] = G_OBJECT(toolbar->_wiggle_adj->gobj()); @@ -250,11 +249,11 @@ CalligraphyToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) _("Pen Mass"), _("Mass:"), _("Increase to make the pen drag behind, as if slowed by inertia"), "/tools/calligraphic/mass", 2.0, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, 0.0, 100, 1, 10.0, labels, values, G_N_ELEMENTS(labels), nullptr /*unit tracker*/, 1, 0); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); toolbar->_mass_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); toolbar->_mass_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &CalligraphyToolbar::mass_value_changed)); toolbar->_widget_map["mass"] = G_OBJECT(toolbar->_mass_adj->gobj()); diff --git a/src/ui/toolbar/connector-toolbar.cpp b/src/ui/toolbar/connector-toolbar.cpp index 3feeed951..1855fe734 100644 --- a/src/ui/toolbar/connector-toolbar.cpp +++ b/src/ui/toolbar/connector-toolbar.cpp @@ -116,11 +116,11 @@ ConnectorToolbar::prep( SPDesktop *desktop, GtkActionGroup* mainActions) _("Connector Curvature"), _("Curvature:"), _("The amount of connectors curvature"), "/tools/connector/curvature", defaultConnCurvature, - GTK_WIDGET(desktop->canvas), TRUE, "inkscape:connector-curvature", 0, 100, 1.0, 10.0, nullptr, nullptr, 0, nullptr /*unit tracker*/, 1, 0 ); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); toolbar->_curvature_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); toolbar->_curvature_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &ConnectorToolbar::curvature_changed)); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); @@ -130,11 +130,11 @@ ConnectorToolbar::prep( SPDesktop *desktop, GtkActionGroup* mainActions) _("Connector Spacing"), _("Spacing:"), _("The amount of space left around objects by auto-routing connectors"), "/tools/connector/spacing", defaultConnSpacing, - GTK_WIDGET(desktop->canvas), TRUE, "inkscape:connector-spacing", 0, 100, 1.0, 10.0, nullptr, nullptr, 0, nullptr /*unit tracker*/, 1, 0 ); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); toolbar->_spacing_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); toolbar->_spacing_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &ConnectorToolbar::spacing_changed)); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); @@ -155,11 +155,11 @@ ConnectorToolbar::prep( SPDesktop *desktop, GtkActionGroup* mainActions) _("Connector Length"), _("Length:"), _("Ideal length for connectors when layout is applied"), "/tools/connector/length", 100, - GTK_WIDGET(desktop->canvas), TRUE, "inkscape:connector-length", 10, 1000, 10.0, 100.0, nullptr, nullptr, 0, nullptr /*unit tracker*/, 1, 0 ); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); toolbar->_length_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); toolbar->_length_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &ConnectorToolbar::length_changed)); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); diff --git a/src/ui/toolbar/eraser-toolbar.cpp b/src/ui/toolbar/eraser-toolbar.cpp index e27f2e917..496623d1e 100644 --- a/src/ui/toolbar/eraser-toolbar.cpp +++ b/src/ui/toolbar/eraser-toolbar.cpp @@ -115,11 +115,11 @@ EraserToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) _("Pen Width"), _("Width:"), _("The width of the eraser pen (relative to the visible canvas area)"), "/tools/eraser/width", 15, - GTK_WIDGET(desktop->canvas), TRUE, "altx-eraser", 0, 100, 1.0, 10.0, labels, values, G_N_ELEMENTS(labels), nullptr /*unit tracker*/, 1, 0); + ege_adjustment_action_set_focuswidget(toolbar->_width, GTK_WIDGET(desktop->canvas)); toolbar->_width_adj = Glib::wrap(ege_adjustment_action_get_adjustment(toolbar->_width)); toolbar->_width_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &EraserToolbar::width_value_changed)); ege_adjustment_action_set_appearance( toolbar->_width, TOOLBAR_SLIDER_HINT ); @@ -148,11 +148,11 @@ EraserToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) _("Eraser Stroke Thinning"), _("Thinning:"), _("How much velocity thins the stroke (> 0 makes fast strokes thinner, < 0 makes them broader, 0 makes width independent of velocity)"), "/tools/eraser/thinning", 10, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, -100, 100, 1, 10.0, labels, values, G_N_ELEMENTS(labels), nullptr /*unit tracker*/, 1, 0); + ege_adjustment_action_set_focuswidget(toolbar->_thinning, GTK_WIDGET(desktop->canvas)); toolbar->_thinning_adj = Glib::wrap(ege_adjustment_action_get_adjustment(toolbar->_thinning)); toolbar->_thinning_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &EraserToolbar::velthin_value_changed)); gtk_action_group_add_action( mainActions, GTK_ACTION(toolbar->_thinning) ); @@ -169,11 +169,11 @@ EraserToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) _("Eraser Cap rounding"), _("Caps:"), _("Increase to make caps at the ends of strokes protrude more (0 = no caps, 1 = round caps)"), "/tools/eraser/cap_rounding", 0.0, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, 0.0, 5.0, 0.01, 0.1, labels, values, G_N_ELEMENTS(labels), nullptr /*unit tracker*/, 0.01, 2 ); + ege_adjustment_action_set_focuswidget(toolbar->_cap_rounding, GTK_WIDGET(desktop->canvas)); toolbar->_cap_rounding_adj = Glib::wrap(ege_adjustment_action_get_adjustment(toolbar->_cap_rounding)); toolbar->_cap_rounding_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &EraserToolbar::cap_rounding_value_changed)); gtk_action_group_add_action( mainActions, GTK_ACTION(toolbar->_cap_rounding) ); @@ -189,11 +189,11 @@ EraserToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) _("EraserStroke Tremor"), _("Tremor:"), _("Increase to make strokes rugged and trembling"), "/tools/eraser/tremor", 0.0, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, 0.0, 100, 1, 10.0, labels, values, G_N_ELEMENTS(labels), nullptr /*unit tracker*/, 1, 0); + ege_adjustment_action_set_focuswidget(toolbar->_tremor, GTK_WIDGET(desktop->canvas)); toolbar->_tremor_adj = Glib::wrap(ege_adjustment_action_get_adjustment(toolbar->_tremor)); toolbar->_tremor_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &EraserToolbar::tremor_value_changed)); @@ -210,11 +210,11 @@ EraserToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) _("Eraser Mass"), _("Mass:"), _("Increase to make the eraser drag behind, as if slowed by inertia"), "/tools/eraser/mass", 10.0, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, 0.0, 100, 1, 10.0, labels, values, G_N_ELEMENTS(labels), nullptr /*unit tracker*/, 1, 0); + ege_adjustment_action_set_focuswidget(toolbar->_mass, GTK_WIDGET(desktop->canvas)); toolbar->_mass_adj = Glib::wrap(ege_adjustment_action_get_adjustment(toolbar->_mass)); toolbar->_mass_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &EraserToolbar::mass_value_changed)); ege_adjustment_action_set_appearance( toolbar->_mass, TOOLBAR_SLIDER_HINT ); diff --git a/src/ui/toolbar/gradient-toolbar.cpp b/src/ui/toolbar/gradient-toolbar.cpp index 9845f3378..bf0759018 100644 --- a/src/ui/toolbar/gradient-toolbar.cpp +++ b/src/ui/toolbar/gradient-toolbar.cpp @@ -544,13 +544,12 @@ GradientToolbar::prep(SPDesktop * desktop, GtkActionGroup* mainActions) toolbar->_offset_action = create_adjustment_action( "GradientEditOffsetAction", _("Offset"), C_("Gradient", "Offset:"), _("Offset of selected stop"), "/tools/gradient/stopoffset", 0, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, 0.0, 1.0, 0.01, 0.1, nullptr, nullptr, 0, nullptr /*unit tracker*/, 0.01, 2, 1.0); - + ege_adjustment_action_set_focuswidget(toolbar->_offset_action, GTK_WIDGET(desktop->canvas)); toolbar->_offset_adj = Glib::wrap(ege_adjustment_action_get_adjustment(toolbar->_offset_action)); toolbar->_offset_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &GradientToolbar::stop_offset_adjustment_changed)); gtk_action_group_add_action( mainActions, GTK_ACTION(toolbar->_offset_action) ); diff --git a/src/ui/toolbar/measure-toolbar.cpp b/src/ui/toolbar/measure-toolbar.cpp index f478146da..9f58391c0 100644 --- a/src/ui/toolbar/measure-toolbar.cpp +++ b/src/ui/toolbar/measure-toolbar.cpp @@ -227,11 +227,11 @@ MeasureToolbar::prep(SPDesktop * desktop, GtkActionGroup* mainActions) _("Font Size"), _("Font Size:"), _("The font size to be used in the measurement labels"), "/tools/measure/fontsize", 10.0, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, 1.0, 36.0, 1.0, 4.0, nullptr, nullptr, 0, nullptr, 0 , 2); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); holder->_font_size_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); holder->_font_size_adj->signal_value_changed().connect(sigc::mem_fun(*holder, &MeasureToolbar::fontsize_value_changed)); gtk_action_group_add_action( mainActions, GTK_ACTION(eact)); @@ -258,11 +258,11 @@ MeasureToolbar::prep(SPDesktop * desktop, GtkActionGroup* mainActions) _("Precision"), _("Precision:"), _("Decimal precision of measure"), "/tools/measure/precision", 2, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, 0, 10, 1, 0, nullptr, nullptr, 0, nullptr, 0 ,0); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); holder->_precision_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); holder->_precision_adj->signal_value_changed().connect(sigc::mem_fun(*holder, &MeasureToolbar::precision_value_changed)); gtk_action_group_add_action( mainActions, GTK_ACTION(eact)); @@ -274,11 +274,11 @@ MeasureToolbar::prep(SPDesktop * desktop, GtkActionGroup* mainActions) _("Scale %"), _("Scale %:"), _("Scale the results"), "/tools/measure/scale", 100.0, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, 0.0, 90000.0, 1.0, 4.0, nullptr, nullptr, 0, nullptr, 0 , 3); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); holder->_scale_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); holder->_scale_adj->signal_value_changed().connect(sigc::mem_fun(*holder, &MeasureToolbar::scale_value_changed)); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); @@ -290,11 +290,11 @@ MeasureToolbar::prep(SPDesktop * desktop, GtkActionGroup* mainActions) _("Offset"), _("Offset:"), _("Mark dimension offset"), "/tools/measure/offset", 5.0, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, 0.0, 90000.0, 1.0, 4.0, nullptr, nullptr, 0, nullptr, 0 , 2); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); holder->_offset_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); holder->_offset_adj->signal_value_changed().connect(sigc::mem_fun(*holder, &MeasureToolbar::offset_value_changed)); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); diff --git a/src/ui/toolbar/mesh-toolbar.cpp b/src/ui/toolbar/mesh-toolbar.cpp index 87fe807e5..846582907 100644 --- a/src/ui/toolbar/mesh-toolbar.cpp +++ b/src/ui/toolbar/mesh-toolbar.cpp @@ -296,12 +296,12 @@ MeshToolbar::prep(SPDesktop * desktop, GtkActionGroup* mainActions) eact = create_adjustment_action( "MeshRowAction", _("Rows"), _("Rows:"), _("Number of rows in new mesh"), "/tools/mesh/mesh_rows", 1, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, 1, 20, 1, 1, labels, values, 0, nullptr /*unit tracker*/, 1.0, 0 ); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); toolbar->_row_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); toolbar->_row_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &MeshToolbar::row_changed)); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); @@ -315,12 +315,12 @@ MeshToolbar::prep(SPDesktop * desktop, GtkActionGroup* mainActions) eact = create_adjustment_action( "MeshColumnAction", _("Columns"), _("Columns:"), _("Number of columns in new mesh"), "/tools/mesh/mesh_cols", 1, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, 1, 20, 1, 1, labels, values, 0, nullptr /*unit tracker*/, 1.0, 0 ); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); toolbar->_col_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); toolbar->_col_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &MeshToolbar::col_changed)); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); diff --git a/src/ui/toolbar/node-toolbar.cpp b/src/ui/toolbar/node-toolbar.cpp index 6b11092c5..472d99c43 100644 --- a/src/ui/toolbar/node-toolbar.cpp +++ b/src/ui/toolbar/node-toolbar.cpp @@ -479,11 +479,11 @@ NodeToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) holder->_nodes_x_action = create_adjustment_action( "NodeXAction", _("X coordinate:"), _("X:"), _("X coordinate of selected node(s)"), "/tools/nodes/Xcoord", 0, - GTK_WIDGET(desktop->canvas), TRUE, "altx-nodes", -1e6, 1e6, SPIN_STEP, SPIN_PAGE_STEP, labels, values, G_N_ELEMENTS(labels), holder->_tracker ); + ege_adjustment_action_set_focuswidget(holder->_nodes_x_action, GTK_WIDGET(desktop->canvas)); holder->_nodes_x_adj = Glib::wrap(ege_adjustment_action_get_adjustment(holder->_nodes_x_action)); holder->_nodes_x_adj->signal_value_changed().connect(sigc::bind(sigc::mem_fun(*holder, &NodeToolbar::value_changed), Geom::X)); gtk_action_set_sensitive( GTK_ACTION(holder->_nodes_x_action), FALSE ); @@ -497,11 +497,11 @@ NodeToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) holder->_nodes_y_action = create_adjustment_action( "NodeYAction", _("Y coordinate:"), _("Y:"), _("Y coordinate of selected node(s)"), "/tools/nodes/Ycoord", 0, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, -1e6, 1e6, SPIN_STEP, SPIN_PAGE_STEP, labels, values, G_N_ELEMENTS(labels), holder->_tracker ); + ege_adjustment_action_set_focuswidget(holder->_nodes_y_action, GTK_WIDGET(desktop->canvas)); holder->_nodes_y_adj = Glib::wrap(ege_adjustment_action_get_adjustment(holder->_nodes_y_action)); holder->_nodes_y_adj->signal_value_changed().connect(sigc::bind(sigc::mem_fun(*holder, &NodeToolbar::value_changed), Geom::Y)); gtk_action_set_sensitive( GTK_ACTION(holder->_nodes_y_action), FALSE ); diff --git a/src/ui/toolbar/paintbucket-toolbar.cpp b/src/ui/toolbar/paintbucket-toolbar.cpp index 97bbf1882..1ad411c1c 100644 --- a/src/ui/toolbar/paintbucket-toolbar.cpp +++ b/src/ui/toolbar/paintbucket-toolbar.cpp @@ -105,11 +105,12 @@ PaintbucketToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) "ThresholdAction", _("Fill Threshold"), _("Threshold:"), _("The maximum allowed difference between the clicked pixel and the neighboring pixels to be counted in the fill"), - "/tools/paintbucket/threshold", 5, GTK_WIDGET(desktop->canvas), + "/tools/paintbucket/threshold", 5, TRUE, "inkscape:paintbucket-threshold", 0, 100.0, 1.0, 10.0, nullptr, nullptr, 0, nullptr /*unit tracker*/, 1, 0 ); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); toolbar->_threshold_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); toolbar->_threshold_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &PaintbucketToolbar::threshold_changed)); @@ -135,12 +136,13 @@ PaintbucketToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) "OffsetAction", _("Grow/shrink by"), _("Grow/shrink by:"), _("The amount to grow (positive) or shrink (negative) the created fill path"), - "/tools/paintbucket/offset", 0, GTK_WIDGET(desktop->canvas), + "/tools/paintbucket/offset", 0, TRUE, "inkscape:paintbucket-offset", -1e4, 1e4, 0.1, 0.5, nullptr, nullptr, 0, toolbar->_tracker, 1, 2); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); toolbar->_offset_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); toolbar->_offset_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &PaintbucketToolbar::offset_changed)); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); diff --git a/src/ui/toolbar/pencil-toolbar.cpp b/src/ui/toolbar/pencil-toolbar.cpp index 890e3e8b2..b20393ba1 100644 --- a/src/ui/toolbar/pencil-toolbar.cpp +++ b/src/ui/toolbar/pencil-toolbar.cpp @@ -109,12 +109,12 @@ PencilToolbar::prep_pencil(SPDesktop *desktop, GtkActionGroup* mainActions) toolbar->_minpressure = create_adjustment_action( "MinPressureAction", _("Min pressure"), _("Min:"), _("Min percent of pressure"), "/tools/freehand/pencil/minpressure", 0, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, 0, 100, 1, 0, nullptr, nullptr, 0, nullptr, 0 ,0); + ege_adjustment_action_set_focuswidget(toolbar->_minpressure, GTK_WIDGET(desktop->canvas)); toolbar->_minpressure_adj = Glib::wrap(ege_adjustment_action_get_adjustment(toolbar->_minpressure)); toolbar->_minpressure_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &PencilToolbar::minpressure_value_changed)); gtk_action_group_add_action( mainActions, GTK_ACTION(toolbar->_minpressure) ); @@ -129,11 +129,11 @@ PencilToolbar::prep_pencil(SPDesktop *desktop, GtkActionGroup* mainActions) toolbar->_maxpressure = create_adjustment_action( "MaxPressureAction", _("Max pressure"), _("Max:"), _("Max percent of pressure"), "/tools/freehand/pencil/maxpressure", 100, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, 0, 100, 1, 0, nullptr, nullptr, 0, nullptr, 0 ,0); + ege_adjustment_action_set_focuswidget(toolbar->_maxpressure, GTK_WIDGET(desktop->canvas)); toolbar->_maxpressure_adj = Glib::wrap(ege_adjustment_action_get_adjustment(toolbar->_maxpressure)); toolbar->_maxpressure_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &PencilToolbar::maxpressure_value_changed)); gtk_action_group_add_action( mainActions, GTK_ACTION(toolbar->_maxpressure) ); @@ -171,12 +171,12 @@ PencilToolbar::prep_pencil(SPDesktop *desktop, GtkActionGroup* mainActions) _("How much smoothing (simplifying) is applied to the line"), "/tools/freehand/pencil/tolerance", 3.0, - GTK_WIDGET(desktop->canvas), TRUE, "altx-pencil", 1, 100.0, 0.5, 1.0, labels, values, G_N_ELEMENTS(labels), nullptr /*unit tracker*/, 1, 2); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); toolbar->_tolerance_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); toolbar->_tolerance_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &PencilToolbar::tolerance_value_changed)); diff --git a/src/ui/toolbar/rect-toolbar.cpp b/src/ui/toolbar/rect-toolbar.cpp index 38bd8159c..44d0cc7ce 100644 --- a/src/ui/toolbar/rect-toolbar.cpp +++ b/src/ui/toolbar/rect-toolbar.cpp @@ -115,11 +115,11 @@ RectToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) holder->_width_action = create_adjustment_action( "RectWidthAction", _("Width"), _("W:"), _("Width of rectangle"), "/tools/shapes/rect/width", 0, - GTK_WIDGET(desktop->canvas), TRUE, "altx-rect", 0, 1e6, SPIN_STEP, SPIN_PAGE_STEP, labels, values, G_N_ELEMENTS(labels), holder->_tracker); + ege_adjustment_action_set_focuswidget(holder->_width_action, GTK_WIDGET(desktop->canvas)); holder->_width_adj = Glib::wrap(ege_adjustment_action_get_adjustment(holder->_width_action)); holder->_width_adj->signal_value_changed().connect(sigc::bind(sigc::mem_fun(*holder, &RectToolbar::value_changed), @@ -137,11 +137,11 @@ RectToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) holder->_height_action = create_adjustment_action( "RectHeightAction", _("Height"), _("H:"), _("Height of rectangle"), "/tools/shapes/rect/height", 0, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, 0, 1e6, SPIN_STEP, SPIN_PAGE_STEP, labels, values, G_N_ELEMENTS(labels), holder->_tracker); + ege_adjustment_action_set_focuswidget(holder->_height_action, GTK_WIDGET(desktop->canvas)); holder->_height_adj = Glib::wrap(ege_adjustment_action_get_adjustment(holder->_height_action)); holder->_height_adj->signal_value_changed().connect(sigc::bind(sigc::mem_fun(*holder, &RectToolbar::value_changed), holder->_height_adj, @@ -158,11 +158,11 @@ RectToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) eact = create_adjustment_action( "RadiusXAction", _("Horizontal radius"), _("Rx:"), _("Horizontal radius of rounded corners"), "/tools/shapes/rect/rx", 0, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, 0, 1e6, SPIN_STEP, SPIN_PAGE_STEP, labels, values, G_N_ELEMENTS(labels), holder->_tracker); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); holder->_rx_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); holder->_rx_adj->signal_value_changed().connect(sigc::bind(sigc::mem_fun(*holder, &RectToolbar::value_changed), holder->_rx_adj, @@ -178,11 +178,11 @@ RectToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) eact = create_adjustment_action( "RadiusYAction", _("Vertical radius"), _("Ry:"), _("Vertical radius of rounded corners"), "/tools/shapes/rect/ry", 0, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, 0, 1e6, SPIN_STEP, SPIN_PAGE_STEP, labels, values, G_N_ELEMENTS(labels), holder->_tracker); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); holder->_ry_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); holder->_ry_adj->signal_value_changed().connect(sigc::bind(sigc::mem_fun(*holder, &RectToolbar::value_changed), holder->_ry_adj, diff --git a/src/ui/toolbar/select-toolbar.cpp b/src/ui/toolbar/select-toolbar.cpp index 6b5d87c8c..32ff56625 100644 --- a/src/ui/toolbar/select-toolbar.cpp +++ b/src/ui/toolbar/select-toolbar.cpp @@ -222,12 +222,12 @@ SelectToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) C_("Select toolbar", "Horizontal coordinate of selection"), /* tooltip */ "/tools/select/X", /* path */ 0.0, /* def(default) */ - GTK_WIDGET(desktop->canvas), /* focusTarget */ TRUE, "altx", /* altx, altx_mark */ -1e6, 1e6, SPIN_STEP, SPIN_PAGE_STEP, /* lower, upper, step, page */ nullptr, nullptr, 0, /* descrLabels, descrValues, descrCount */ holder->_tracker, /* unit_tracker */ SPIN_STEP, 3, 1); /* climb, digits, factor */ + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); holder->_adj_x = Glib::wrap(GTK_ADJUSTMENT(ege_adjustment_action_get_adjustment(eact))); holder->_adj_x->signal_value_changed().connect(sigc::bind(sigc::mem_fun(*holder, &SelectToolbar::any_value_changed), holder->_adj_x)); @@ -241,12 +241,12 @@ SelectToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) C_("Select toolbar", "Vertical coordinate of selection"), /* tooltip */ "/tools/select/Y", /* path */ 0.0, /* def(default) */ - GTK_WIDGET(desktop->canvas), /* focusTarget */ TRUE, "altx", /* altx, altx_mark */ -1e6, 1e6, SPIN_STEP, SPIN_PAGE_STEP, /* lower, upper, step, page */ nullptr, nullptr, 0, /* descrLabels, descrValues, descrCount */ holder->_tracker, /* unit_tracker */ SPIN_STEP, 3, 1); /* climb, digits, factor */ + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); holder->_adj_y = Glib::wrap(GTK_ADJUSTMENT(ege_adjustment_action_get_adjustment(eact))); holder->_adj_y->signal_value_changed().connect(sigc::bind(sigc::mem_fun(*holder, &SelectToolbar::any_value_changed), holder->_adj_y)); @@ -260,12 +260,12 @@ SelectToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) C_("Select toolbar", "Width of selection"), /* tooltip */ "/tools/select/width", /* path */ 0.0, /* def(default) */ - GTK_WIDGET(desktop->canvas), /* focusTarget */ TRUE, "altx", /* altx, altx_mark */ 0.0, 1e6, SPIN_STEP, SPIN_PAGE_STEP, /* lower, upper, step, page */ nullptr, nullptr, 0, /* descrLabels, descrValues, descrCount */ holder->_tracker, /* unit_tracker */ SPIN_STEP, 3, 1); /* climb, digits, factor */ + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); holder->_adj_w = Glib::wrap(GTK_ADJUSTMENT(ege_adjustment_action_get_adjustment(eact))); holder->_adj_w->signal_value_changed().connect(sigc::bind(sigc::mem_fun(*holder, &SelectToolbar::any_value_changed), holder->_adj_w)); @@ -291,14 +291,12 @@ SelectToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) C_("Select toolbar", "Height of selection"), /* tooltip */ "/tools/select/height", /* path */ 0.0, /* def(default) */ - GTK_WIDGET(desktop->canvas), /* focusTarget */ TRUE, "altx", /* altx, altx_mark */ 0.0, 1e6, SPIN_STEP, SPIN_PAGE_STEP, /* lower, upper, step, page */ nullptr, nullptr, 0, /* descrLabels, descrValues, descrCount */ holder->_tracker, /* unit_tracker */ SPIN_STEP, 3, 1); /* climb, digits, factor */ - - + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); holder->_adj_h = Glib::wrap(GTK_ADJUSTMENT(ege_adjustment_action_get_adjustment(eact))); holder->_adj_h->signal_value_changed().connect(sigc::bind(sigc::mem_fun(*holder, &SelectToolbar::any_value_changed), holder->_adj_h)); gtk_action_group_add_action( holder->_selection_actions, GTK_ACTION(eact) ); diff --git a/src/ui/toolbar/spiral-toolbar.cpp b/src/ui/toolbar/spiral-toolbar.cpp index 89ede4d0c..a13b4b2c1 100644 --- a/src/ui/toolbar/spiral-toolbar.cpp +++ b/src/ui/toolbar/spiral-toolbar.cpp @@ -99,11 +99,11 @@ SpiralToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) eact = create_adjustment_action( "SpiralRevolutionAction", _("Number of turns"), _("Turns:"), _("Number of revolutions"), "/tools/shapes/spiral/revolution", 3.0, - GTK_WIDGET(desktop->canvas), TRUE, "altx-spiral", 0.01, 1024.0, 0.1, 1.0, labels, values, G_N_ELEMENTS(labels), nullptr /*unit tracker*/, 1, 2); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); toolbar->_revolution_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); toolbar->_revolution_adj->signal_value_changed().connect(sigc::bind(sigc::mem_fun(*toolbar, &SpiralToolbar::value_changed), toolbar->_revolution_adj, "revolution")); @@ -117,11 +117,11 @@ SpiralToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) eact = create_adjustment_action( "SpiralExpansionAction", _("Divergence"), _("Divergence:"), _("How much denser/sparser are outer revolutions; 1 = uniform"), "/tools/shapes/spiral/expansion", 1.0, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, 0.0, 1000.0, 0.01, 1.0, labels, values, G_N_ELEMENTS(labels) ); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); toolbar->_expansion_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); toolbar->_expansion_adj->signal_value_changed().connect(sigc::bind(sigc::mem_fun(*toolbar, &SpiralToolbar::value_changed), toolbar->_expansion_adj, "expansion")); @@ -135,11 +135,11 @@ SpiralToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) eact = create_adjustment_action( "SpiralT0Action", _("Inner radius"), _("Inner radius:"), _("Radius of the innermost revolution (relative to the spiral size)"), "/tools/shapes/spiral/t0", 0.0, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, 0.0, 0.999, 0.01, 1.0, labels, values, G_N_ELEMENTS(labels) ); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); toolbar->_t0_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); toolbar->_t0_adj->signal_value_changed().connect(sigc::bind(sigc::mem_fun(*toolbar, &SpiralToolbar::value_changed), toolbar->_t0_adj, "t0")); diff --git a/src/ui/toolbar/spray-toolbar.cpp b/src/ui/toolbar/spray-toolbar.cpp index d409c34ed..3656aae26 100644 --- a/src/ui/toolbar/spray-toolbar.cpp +++ b/src/ui/toolbar/spray-toolbar.cpp @@ -92,11 +92,11 @@ SprayToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) EgeAdjustmentAction *eact = create_adjustment_action( "SprayWidthAction", _("Width"), _("Width:"), _("The width of the spray area (relative to the visible canvas area)"), "/tools/spray/width", 15, - GTK_WIDGET(desktop->canvas), true, "altx-spray", 1, 100, 1.0, 10.0, labels, values, G_N_ELEMENTS(labels), nullptr /*unit tracker*/, 1, 0 ); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); holder->_width_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); holder->_width_adj->signal_value_changed().connect(sigc::mem_fun(*holder, &SprayToolbar::width_value_changed)); ege_adjustment_action_set_appearance( eact, TOOLBAR_SLIDER_HINT ); @@ -122,11 +122,11 @@ SprayToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) EgeAdjustmentAction *eact = create_adjustment_action( "SprayMeanAction", _("Focus"), _("Focus:"), _("0 to spray a spot; increase to enlarge the ring radius"), "/tools/spray/mean", 0, - GTK_WIDGET(desktop->canvas), true, "spray-mean", 0, 100, 1.0, 10.0, labels, values, G_N_ELEMENTS(labels), nullptr /*unit tracker*/, 1, 0 ); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); holder->_mean_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); holder->_mean_adj->signal_value_changed().connect(sigc::mem_fun(*holder, &SprayToolbar::mean_value_changed)); ege_adjustment_action_set_appearance( eact, TOOLBAR_SLIDER_HINT ); @@ -141,11 +141,11 @@ SprayToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) EgeAdjustmentAction *eact = create_adjustment_action( "SprayStandard_deviationAction", C_("Spray tool", "Scatter"), C_("Spray tool", "Scatter:"), _("Increase to scatter sprayed objects"), "/tools/spray/standard_deviation", 70, - GTK_WIDGET(desktop->canvas), true, "spray-standard_deviation", 1, 100, 1.0, 10.0, labels, values, G_N_ELEMENTS(labels), nullptr /*unit tracker*/, 1, 0 ); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); holder->_sd_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); holder->_sd_adj->signal_value_changed().connect(sigc::mem_fun(*holder, &SprayToolbar::standard_deviation_value_changed)); ege_adjustment_action_set_appearance( eact, TOOLBAR_SLIDER_HINT ); @@ -209,11 +209,11 @@ SprayToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) _("Amount"), _("Amount:"), _("Adjusts the number of items sprayed per click"), "/tools/spray/population", 70, - GTK_WIDGET(desktop->canvas), true, "spray-population", 1, 100, 1.0, 10.0, labels, values, G_N_ELEMENTS(labels), nullptr /*unit tracker*/, 1, 0 ); + ege_adjustment_action_set_focuswidget(holder->_spray_population, GTK_WIDGET(desktop->canvas)); holder->_population_adj = Glib::wrap(ege_adjustment_action_get_adjustment(holder->_spray_population)); holder->_population_adj->signal_value_changed().connect(sigc::mem_fun(*holder, &SprayToolbar::population_value_changed)); ege_adjustment_action_set_appearance( holder->_spray_population, TOOLBAR_SLIDER_HINT ); @@ -240,11 +240,11 @@ SprayToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) // xgettext:no-c-format _("Variation of the rotation of the sprayed objects; 0% for the same rotation than the original object"), "/tools/spray/rotation_variation", 0, - GTK_WIDGET(desktop->canvas), true, "spray-rotation", 0, 100, 1.0, 10.0, labels, values, G_N_ELEMENTS(labels), nullptr /*unit tracker*/, 1, 0 ); + ege_adjustment_action_set_focuswidget(holder->_spray_rotation, GTK_WIDGET(desktop->canvas)); holder->_rotation_adj = Glib::wrap(ege_adjustment_action_get_adjustment(holder->_spray_rotation)); holder->_rotation_adj->signal_value_changed().connect(sigc::mem_fun(*holder, &SprayToolbar::rotation_value_changed)); ege_adjustment_action_set_appearance(holder->_spray_rotation, TOOLBAR_SLIDER_HINT ); @@ -260,11 +260,11 @@ SprayToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) // xgettext:no-c-format _("Variation in the scale of the sprayed objects; 0% for the same scale than the original object"), "/tools/spray/scale_variation", 0, - GTK_WIDGET(desktop->canvas), true, "spray-scale", 0, 100, 1.0, 10.0, labels, values, G_N_ELEMENTS(labels), nullptr /*unit tracker*/, 1, 0 ); + ege_adjustment_action_set_focuswidget(holder->_spray_scale, GTK_WIDGET(desktop->canvas)); holder->_scale_adj = Glib::wrap(ege_adjustment_action_get_adjustment(holder->_spray_scale)); holder->_scale_adj->signal_value_changed().connect(sigc::mem_fun(*holder, &SprayToolbar::scale_value_changed)); ege_adjustment_action_set_appearance( holder->_spray_scale, TOOLBAR_SLIDER_HINT ); @@ -400,11 +400,11 @@ SprayToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) _("Offset %"), _("Offset %:"), _("Increase to segregate objects more (value in percent)"), "/tools/spray/offset", 100, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, 0, 1000, 1, 4, labels, values, G_N_ELEMENTS(labels), nullptr, 0 , 0); + ege_adjustment_action_set_focuswidget(holder->_offset, GTK_WIDGET(desktop->canvas)); holder->_offset_adj = Glib::wrap(ege_adjustment_action_get_adjustment(holder->_offset)); holder->_offset_adj->signal_value_changed().connect(sigc::mem_fun(*holder, &SprayToolbar::offset_value_changed)); gtk_action_group_add_action( mainActions, GTK_ACTION(holder->_offset) ); diff --git a/src/ui/toolbar/star-toolbar.cpp b/src/ui/toolbar/star-toolbar.cpp index 017c24ed5..18bc1c2ec 100644 --- a/src/ui/toolbar/star-toolbar.cpp +++ b/src/ui/toolbar/star-toolbar.cpp @@ -139,12 +139,12 @@ StarToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) eact = create_adjustment_action( "MagnitudeAction", _("Corners"), _("Corners:"), _("Number of corners of a polygon or star"), "/tools/shapes/star/magnitude", 3, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, 3, 1024, 1, 5, labels, values, G_N_ELEMENTS(labels), nullptr /*unit tracker*/, 1.0, 0 ); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); holder->_magnitude_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); holder->_magnitude_adj->signal_value_changed().connect(sigc::mem_fun(*holder, &StarToolbar::magnitude_value_changed)); @@ -162,11 +162,11 @@ StarToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) // Base radius is the same for the closest handle. _("Base radius to tip radius ratio"), "/tools/shapes/star/proportion", 0.5, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, 0.01, 1.0, 0.01, 0.1, labels, values, G_N_ELEMENTS(labels) ); + ege_adjustment_action_set_focuswidget(holder->_prop_action, GTK_WIDGET(desktop->canvas)); holder->_spoke_adj = Glib::wrap(ege_adjustment_action_get_adjustment(holder->_prop_action)); holder->_spoke_adj->signal_value_changed().connect(sigc::mem_fun(*holder, &StarToolbar::proportion_value_changed)); gtk_action_group_add_action( mainActions, GTK_ACTION(holder->_prop_action) ); @@ -186,11 +186,11 @@ StarToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) eact = create_adjustment_action( "RoundednessAction", _("Rounded"), _("Rounded:"), _("How much rounded are the corners (0 for sharp)"), "/tools/shapes/star/rounded", 0.0, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, -10.0, 10.0, 0.01, 0.1, labels, values, G_N_ELEMENTS(labels) ); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); holder->_roundedness_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); holder->_roundedness_adj->signal_value_changed().connect(sigc::mem_fun(*holder, &StarToolbar::rounded_value_changed)); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); @@ -204,11 +204,11 @@ StarToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) eact = create_adjustment_action( "RandomizationAction", _("Randomized"), _("Randomized:"), _("Scatter randomly the corners and angles"), "/tools/shapes/star/randomized", 0.0, - GTK_WIDGET(desktop->canvas), FALSE, nullptr, -10.0, 10.0, 0.001, 0.01, labels, values, G_N_ELEMENTS(labels), nullptr /*unit tracker*/, 0.1, 3 ); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); holder->_randomization_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); holder->_randomization_adj->signal_value_changed().connect(sigc::mem_fun(*holder, &StarToolbar::randomized_value_changed)); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); diff --git a/src/ui/toolbar/text-toolbar.cpp b/src/ui/toolbar/text-toolbar.cpp index bbe938450..b55ed02ed 100644 --- a/src/ui/toolbar/text-toolbar.cpp +++ b/src/ui/toolbar/text-toolbar.cpp @@ -582,7 +582,6 @@ TextToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) _("Spacing between baselines"), /* tooltip */ "/tools/text/lineheight", /* preferences path */ 0.0, /* default */ - GTK_WIDGET(desktop->canvas), /* focusTarget */ FALSE, /* set alt-x keyboard shortcut? */ nullptr, /* altx_mark */ 0.0, 1000.0, 0.1, 1.0, /* lower, upper, step (arrow up/down), page up/down */ @@ -592,6 +591,7 @@ TextToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) 2, /* digits to show */ 1.0 /* factor (multiplies default) */ ); + ege_adjustment_action_set_focuswidget(toolbar->_line_height_action, GTK_WIDGET(desktop->canvas)); toolbar->_line_height_adj = Glib::wrap(ege_adjustment_action_get_adjustment(toolbar->_line_height_action)); toolbar->_line_height_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &TextToolbar::lineheight_value_changed)); @@ -671,7 +671,6 @@ TextToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) _("Spacing between words (px)"), /* tooltip */ "/tools/text/wordspacing", /* preferences path */ 0.0, /* default */ - GTK_WIDGET(desktop->canvas), /* focusTarget */ FALSE, /* set alt-x keyboard shortcut? */ nullptr, /* altx_mark */ -100.0, 100.0, 0.01, 0.10, /* lower, upper, step (arrow up/down), page up/down */ @@ -681,6 +680,7 @@ TextToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) 2, /* digits to show */ 1.0 /* factor (multiplies default) */ ); + ege_adjustment_action_set_focuswidget(toolbar->_word_spacing_action, GTK_WIDGET(desktop->canvas)); toolbar->_word_spacing_adj = Glib::wrap(ege_adjustment_action_get_adjustment(toolbar->_word_spacing_action)); toolbar->_word_spacing_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &TextToolbar::wordspacing_value_changed)); @@ -702,7 +702,6 @@ TextToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) _("Spacing between letters (px)"), /* tooltip */ "/tools/text/letterspacing", /* preferences path */ 0.0, /* default */ - GTK_WIDGET(desktop->canvas), /* focusTarget */ FALSE, /* set alt-x keyboard shortcut? */ nullptr, /* altx_mark */ -100.0, 100.0, 0.01, 0.10, /* lower, upper, step (arrow up/down), page up/down */ @@ -712,6 +711,7 @@ TextToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) 2, /* digits to show */ 1.0 /* factor (multiplies default) */ ); + ege_adjustment_action_set_focuswidget(toolbar->_letter_spacing_action, GTK_WIDGET(desktop->canvas)); toolbar->_letter_spacing_adj = Glib::wrap(ege_adjustment_action_get_adjustment(toolbar->_letter_spacing_action)); toolbar->_letter_spacing_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &TextToolbar::letterspacing_value_changed)); gtk_action_group_add_action( mainActions, GTK_ACTION(toolbar->_letter_spacing_action) ); @@ -732,7 +732,6 @@ TextToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) _("Horizontal kerning (px)"), /* tooltip */ "/tools/text/dx", /* preferences path */ 0.0, /* default */ - GTK_WIDGET(desktop->canvas), /* focusTarget */ FALSE, /* set alt-x keyboard shortcut? */ nullptr, /* altx_mark */ -100.0, 100.0, 0.01, 0.1, /* lower, upper, step (arrow up/down), page up/down */ @@ -742,6 +741,7 @@ TextToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) 2, /* digits to show */ 1.0 /* factor (multiplies default) */ ); + ege_adjustment_action_set_focuswidget(toolbar->_dx_action, GTK_WIDGET(desktop->canvas)); toolbar->_dx_adj = Glib::wrap(ege_adjustment_action_get_adjustment(toolbar->_dx_action)); toolbar->_dx_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &TextToolbar::dx_value_changed)); gtk_action_group_add_action( mainActions, GTK_ACTION(toolbar->_dx_action) ); @@ -762,7 +762,6 @@ TextToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) _("Vertical shift (px)"), /* tooltip */ "/tools/text/dy", /* preferences path */ 0.0, /* default */ - GTK_WIDGET(desktop->canvas), /* focusTarget */ FALSE, /* set alt-x keyboard shortcut? */ nullptr, /* altx_mark */ -100.0, 100.0, 0.01, 0.1, /* lower, upper, step (arrow up/down), page up/down */ @@ -772,6 +771,7 @@ TextToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) 2, /* digits to show */ 1.0 /* factor (multiplies default) */ ); + ege_adjustment_action_set_focuswidget(toolbar->_dy_action, GTK_WIDGET(desktop->canvas)); toolbar->_dy_adj = Glib::wrap(ege_adjustment_action_get_adjustment(toolbar->_dy_action)); toolbar->_dy_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &TextToolbar::dy_value_changed)); gtk_action_group_add_action( mainActions, GTK_ACTION(toolbar->_dy_action) ); @@ -792,7 +792,6 @@ TextToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) _("Character rotation (degrees)"), /* tooltip */ "/tools/text/rotation", /* preferences path */ 0.0, /* default */ - GTK_WIDGET(desktop->canvas), /* focusTarget */ FALSE, /* set alt-x keyboard shortcut? */ nullptr, /* altx_mark */ -180.0, 180.0, 0.1, 1.0, /* lower, upper, step (arrow up/down), page up/down */ @@ -802,6 +801,7 @@ TextToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) 2, /* digits to show */ 1.0 /* factor (multiplies default) */ ); + ege_adjustment_action_set_focuswidget(toolbar->_rotation_action, GTK_WIDGET(desktop->canvas)); toolbar->_rotation_adj = Glib::wrap(ege_adjustment_action_get_adjustment(toolbar->_rotation_action)); toolbar->_rotation_adj->signal_value_changed().connect(sigc::mem_fun(*toolbar, &TextToolbar::rotation_value_changed)); gtk_action_group_add_action( mainActions, GTK_ACTION(toolbar->_rotation_action) ); diff --git a/src/ui/toolbar/tweak-toolbar.cpp b/src/ui/toolbar/tweak-toolbar.cpp index 1b17e3495..e3a58ff24 100644 --- a/src/ui/toolbar/tweak-toolbar.cpp +++ b/src/ui/toolbar/tweak-toolbar.cpp @@ -94,12 +94,11 @@ TweakToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) EgeAdjustmentAction *eact = create_adjustment_action( "TweakWidthAction", _("Width"), _("Width:"), _("The width of the tweak area (relative to the visible canvas area)"), "/tools/tweak/width", 15, - GTK_WIDGET(desktop->canvas), TRUE, "altx-tweak", 1, 100, 1.0, 10.0, labels, values, G_N_ELEMENTS(labels), nullptr /*unit tracker*/, 0.01, 0, 100 ); - + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); holder->_adj_tweak_width = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); holder->_adj_tweak_width->signal_value_changed().connect(sigc::mem_fun(*holder, &TweakToolbar::tweak_width_value_changed)); ege_adjustment_action_set_appearance( eact, TOOLBAR_SLIDER_HINT ); @@ -115,11 +114,11 @@ TweakToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) EgeAdjustmentAction *eact = create_adjustment_action( "TweakForceAction", _("Force"), _("Force:"), _("The force of the tweak action"), "/tools/tweak/force", 20, - GTK_WIDGET(desktop->canvas), TRUE, "tweak-force", 1, 100, 1.0, 10.0, labels, values, G_N_ELEMENTS(labels), nullptr /*unit tracker*/, 0.01, 0, 100 ); + ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); holder->_adj_tweak_force = Glib::wrap(ege_adjustment_action_get_adjustment(eact)); holder->_adj_tweak_force->signal_value_changed().connect(sigc::mem_fun(*holder, &TweakToolbar::tweak_force_value_changed)); ege_adjustment_action_set_appearance( eact, TOOLBAR_SLIDER_HINT ); @@ -311,12 +310,11 @@ TweakToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) _("Fidelity"), _("Fidelity:"), _("Low fidelity simplifies paths; high fidelity preserves path features but may generate a lot of new nodes"), "/tools/tweak/fidelity", 50, - GTK_WIDGET(desktop->canvas), TRUE, "tweak-fidelity", 1, 100, 1.0, 10.0, labels, values, G_N_ELEMENTS(labels), nullptr /*unit tracker*/, 0.01, 0, 100 ); - + ege_adjustment_action_set_focuswidget(holder->_tweak_fidelity, GTK_WIDGET(desktop->canvas)); holder->_adj_tweak_fidelity = Glib::wrap(ege_adjustment_action_get_adjustment(holder->_tweak_fidelity)); holder->_adj_tweak_fidelity->signal_value_changed().connect(sigc::mem_fun(*holder, &TweakToolbar::tweak_fidelity_value_changed)); gtk_action_group_add_action( mainActions, GTK_ACTION(holder->_tweak_fidelity) ); diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 7cfa4de03..bd9b3bf0b 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -713,7 +713,6 @@ static GtkWidget* createCustomSlider( GtkAdjustment *adjustment, gdouble climbRa EgeAdjustmentAction * create_adjustment_action( gchar const *name, gchar const *label, gchar const *shortLabel, gchar const *tooltip, Glib::ustring const &path, gdouble def, - GtkWidget *focusTarget, gboolean altx, gchar const *altx_mark, gdouble lower, gdouble upper, gdouble step, gdouble page, gchar const** descrLabels, gdouble const* descrValues, guint descrCount, @@ -739,10 +738,6 @@ EgeAdjustmentAction * create_adjustment_action( gchar const *name, ege_adjustment_action_set_descriptions( act, descrLabels, descrValues, descrCount ); } - if ( focusTarget ) { - ege_adjustment_action_set_focuswidget( act, focusTarget ); - } - if ( altx && altx_mark ) { g_object_set( G_OBJECT(act), "self-id", altx_mark, NULL ); } @@ -1019,8 +1014,6 @@ void setup_aux_toolbox(GtkWidget *toolbox, SPDesktop *desktop) // just defines behaviour. GtkWidget* kludge = aux_toolboxes[i].prep_func(desktop, mainActions->gobj()); gtk_widget_set_name( kludge, "Kludge" ); - // g_object_set_data( G_OBJECT(kludge), "dtw", desktop->canvas); - // g_object_set_data( G_OBJECT(kludge), "desktop", desktop); dataHolders[aux_toolboxes[i].type_name] = kludge; } else { diff --git a/src/widgets/toolbox.h b/src/widgets/toolbox.h index b605b4fbb..6c973ba4a 100644 --- a/src/widgets/toolbox.h +++ b/src/widgets/toolbox.h @@ -134,7 +134,6 @@ void delete_connection(GObject * /*obj*/, sigc::connection *connection); EgeAdjustmentAction * create_adjustment_action( gchar const *name, gchar const *label, gchar const *shortLabel, gchar const *tooltip, Glib::ustring const &path, gdouble def, - GtkWidget *focusTarget, gboolean altx, gchar const *altx_mark, gdouble lower, gdouble upper, gdouble step, gdouble page, gchar const** descrLabels, gdouble const* descrValues, guint descrCount, |