summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Valavanis <valavanisalex@gmail.com>2019-01-21 23:49:19 +0000
committerAlexander Valavanis <valavanisalex@gmail.com>2019-01-21 23:49:19 +0000
commit8aae510a98bb214192ec50688e44267751d49b1c (patch)
treedbf2cf229a7c584958f532c3f8ee68a9d00a58a2
parentfix part of inbox:16 Spinbuttons look glitchy (diff)
downloadinkscape-8aae510a98bb214192ec50688e44267751d49b1c.tar.gz
inkscape-8aae510a98bb214192ec50688e44267751d49b1c.zip
Cleanup unused toolbar code
Diffstat
-rw-r--r--src/ui/toolbar/arc-toolbar.cpp12
-rw-r--r--src/ui/toolbar/box3d-toolbar.cpp12
-rw-r--r--src/ui/toolbar/calligraphy-toolbar.cpp16
-rw-r--r--src/ui/toolbar/connector-toolbar.cpp6
-rw-r--r--src/ui/toolbar/eraser-toolbar.cpp10
-rw-r--r--src/ui/toolbar/gradient-toolbar.cpp2
-rw-r--r--src/ui/toolbar/measure-toolbar.cpp8
-rw-r--r--src/ui/toolbar/mesh-toolbar.cpp4
-rw-r--r--src/ui/toolbar/node-toolbar.cpp4
-rw-r--r--src/ui/toolbar/paintbucket-toolbar.cpp4
-rw-r--r--src/ui/toolbar/pencil-toolbar.cpp6
-rw-r--r--src/ui/toolbar/rect-toolbar.cpp8
-rw-r--r--src/ui/toolbar/select-toolbar.cpp8
-rw-r--r--src/ui/toolbar/spiral-toolbar.cpp10
-rw-r--r--src/ui/toolbar/spray-toolbar.cpp14
-rw-r--r--src/ui/toolbar/star-toolbar.cpp12
-rw-r--r--src/ui/toolbar/text-toolbar.cpp12
-rw-r--r--src/ui/toolbar/tweak-toolbar.cpp6
-rw-r--r--src/widgets/toolbox.cpp13
-rw-r--r--src/widgets/toolbox.h2
20 files changed, 9 insertions, 160 deletions
diff --git a/src/ui/toolbar/arc-toolbar.cpp b/src/ui/toolbar/arc-toolbar.cpp
index 7c75b63bb..acfcac079 100644
--- a/src/ui/toolbar/arc-toolbar.cpp
+++ b/src/ui/toolbar/arc-toolbar.cpp
@@ -114,11 +114,9 @@ ArcToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Horizontal radius"), _("Rx:"), _("Horizontal radius of the circle, ellipse, or arc"),
"/tools/shapes/arc/rx", 0,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
TRUE, "altx-arc",
0, 1e6, SPIN_STEP, SPIN_PAGE_STEP,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
toolbar->_tracker);
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),
@@ -135,11 +133,9 @@ ArcToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Vertical radius"), _("Ry:"), _("Vertical radius of the circle, ellipse, or arc"),
"/tools/shapes/arc/ry", 0,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
0, 1e6, SPIN_STEP, SPIN_PAGE_STEP,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
toolbar->_tracker);
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),
@@ -161,11 +157,9 @@ ArcToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("The angle (in degrees) from the horizontal to the arc's start point"),
"/tools/shapes/arc/start", 0.0,
GTK_WIDGET(desktop->canvas),
- nullptr,
TRUE, "altx-arc",
-360.0, 360.0, 1.0, 10.0,
- nullptr, nullptr, 0,
- nullptr // callback
+ nullptr, nullptr, 0
);
toolbar->_start_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact));
gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
@@ -178,11 +172,9 @@ ArcToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("The angle (in degrees) from the horizontal to the arc's end point"),
"/tools/shapes/arc/end", 0.0,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
-360.0, 360.0, 1.0, 10.0,
- nullptr, nullptr, 0,
- nullptr // callback
+ nullptr, nullptr, 0
);
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 50838a393..bb2525153 100644
--- a/src/ui/toolbar/box3d-toolbar.cpp
+++ b/src/ui/toolbar/box3d-toolbar.cpp
@@ -91,11 +91,9 @@ Box3DToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Angle of PLs in X direction"),
"/tools/shapes/3dbox/box3d_angle_x", 30,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
TRUE, "altx-box3d",
-360.0, 360.0, 1.0, 10.0,
- labels, values, G_N_ELEMENTS(labels),
- nullptr // callback
+ labels, values, G_N_ELEMENTS(labels)
);
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),
@@ -134,11 +132,9 @@ Box3DToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Angle of PLs in Y direction"),
"/tools/shapes/3dbox/box3d_angle_y", 30,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
-360.0, 360.0, 1.0, 10.0,
- labels, values, G_N_ELEMENTS(labels),
- nullptr // callback
+ labels, values, G_N_ELEMENTS(labels)
);
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),
@@ -176,11 +172,9 @@ Box3DToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Angle of PLs in Z direction"),
"/tools/shapes/3dbox/box3d_angle_z", 30,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
-360.0, 360.0, 1.0, 10.0,
- labels, values, G_N_ELEMENTS(labels),
- nullptr // callback
+ labels, values, G_N_ELEMENTS(labels)
);
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),
diff --git a/src/ui/toolbar/calligraphy-toolbar.cpp b/src/ui/toolbar/calligraphy-toolbar.cpp
index a2908401e..7411d10ca 100644
--- a/src/ui/toolbar/calligraphy-toolbar.cpp
+++ b/src/ui/toolbar/calligraphy-toolbar.cpp
@@ -106,11 +106,9 @@ CalligraphyToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("The width of the calligraphic pen (relative to the visible canvas area)"),
"/tools/calligraphic/width", 15,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
TRUE, "altx-calligraphy",
1, 100, 1.0, 10.0,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr /*unit tracker*/, 1, 0 );
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));
@@ -129,11 +127,9 @@ CalligraphyToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("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),
- nullptr, // dataKludge
FALSE, nullptr,
-100, 100, 1, 10.0,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr /*unit tracker*/, 1, 0);
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));
@@ -151,11 +147,9 @@ CalligraphyToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("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),
- nullptr, // dataKludge
TRUE, "calligraphy-angle",
-90.0, 90.0, 1.0, 10.0,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr /*unit tracker*/, 1, 0 );
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));
@@ -173,11 +167,9 @@ CalligraphyToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Angle behavior (0 = nib always perpendicular to stroke direction, 100 = fixed angle)"),
"/tools/calligraphic/flatness", 90,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
0.0, 100, 1.0, 10.0,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr /*unit tracker*/, 1, 0);
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));
@@ -196,11 +188,9 @@ CalligraphyToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("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),
- nullptr, // dataKludge
FALSE, nullptr,
0.0, 5.0, 0.01, 0.1,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr /*unit tracker*/, 0.01, 2 );
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));
@@ -218,11 +208,9 @@ CalligraphyToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Increase to make strokes rugged and trembling"),
"/tools/calligraphic/tremor", 0.0,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
0.0, 100, 1, 10.0,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr /*unit tracker*/, 1, 0);
toolbar->_tremor_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact));
@@ -242,11 +230,9 @@ CalligraphyToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Increase to make the pen waver and wiggle"),
"/tools/calligraphic/wiggle", 0.0,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
0.0, 100, 1, 10.0,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr /*unit tracker*/, 1, 0);
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));
@@ -265,11 +251,9 @@ CalligraphyToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Increase to make the pen drag behind, as if slowed by inertia"),
"/tools/calligraphic/mass", 2.0,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
0.0, 100, 1, 10.0,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr /*unit tracker*/, 1, 0);
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));
diff --git a/src/ui/toolbar/connector-toolbar.cpp b/src/ui/toolbar/connector-toolbar.cpp
index 1cf80cec8..3feeed951 100644
--- a/src/ui/toolbar/connector-toolbar.cpp
+++ b/src/ui/toolbar/connector-toolbar.cpp
@@ -117,11 +117,9 @@ ConnectorToolbar::prep( SPDesktop *desktop, GtkActionGroup* mainActions)
_("The amount of connectors curvature"),
"/tools/connector/curvature", defaultConnCurvature,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
TRUE, "inkscape:connector-curvature",
0, 100, 1.0, 10.0,
nullptr, nullptr, 0,
- nullptr, // callback
nullptr /*unit tracker*/, 1, 0 );
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));
@@ -133,11 +131,9 @@ ConnectorToolbar::prep( SPDesktop *desktop, GtkActionGroup* mainActions)
_("The amount of space left around objects by auto-routing connectors"),
"/tools/connector/spacing", defaultConnSpacing,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
TRUE, "inkscape:connector-spacing",
0, 100, 1.0, 10.0,
nullptr, nullptr, 0,
- nullptr, // callback
nullptr /*unit tracker*/, 1, 0 );
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));
@@ -160,11 +156,9 @@ ConnectorToolbar::prep( SPDesktop *desktop, GtkActionGroup* mainActions)
_("Ideal length for connectors when layout is applied"),
"/tools/connector/length", 100,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
TRUE, "inkscape:connector-length",
10, 1000, 10.0, 100.0,
nullptr, nullptr, 0,
- nullptr, // callback
nullptr /*unit tracker*/, 1, 0 );
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));
diff --git a/src/ui/toolbar/eraser-toolbar.cpp b/src/ui/toolbar/eraser-toolbar.cpp
index 8950b6a58..e27f2e917 100644
--- a/src/ui/toolbar/eraser-toolbar.cpp
+++ b/src/ui/toolbar/eraser-toolbar.cpp
@@ -116,11 +116,9 @@ EraserToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("The width of the eraser pen (relative to the visible canvas area)"),
"/tools/eraser/width", 15,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
TRUE, "altx-eraser",
0, 100, 1.0, 10.0,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr /*unit tracker*/, 1, 0);
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));
@@ -151,11 +149,9 @@ EraserToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("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),
- nullptr, // dataKludge
FALSE, nullptr,
-100, 100, 1, 10.0,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr /*unit tracker*/, 1, 0);
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));
@@ -174,11 +170,9 @@ EraserToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("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),
- nullptr, // dataKludge
FALSE, nullptr,
0.0, 5.0, 0.01, 0.1,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr /*unit tracker*/, 0.01, 2 );
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));
@@ -196,11 +190,9 @@ EraserToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Increase to make strokes rugged and trembling"),
"/tools/eraser/tremor", 0.0,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
0.0, 100, 1, 10.0,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr /*unit tracker*/, 1, 0);
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));
@@ -219,11 +211,9 @@ EraserToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Increase to make the eraser drag behind, as if slowed by inertia"),
"/tools/eraser/mass", 10.0,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
0.0, 100, 1, 10.0,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr /*unit tracker*/, 1, 0);
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));
diff --git a/src/ui/toolbar/gradient-toolbar.cpp b/src/ui/toolbar/gradient-toolbar.cpp
index 4d1b16c6e..9845f3378 100644
--- a/src/ui/toolbar/gradient-toolbar.cpp
+++ b/src/ui/toolbar/gradient-toolbar.cpp
@@ -545,11 +545,9 @@ GradientToolbar::prep(SPDesktop * desktop, GtkActionGroup* mainActions)
_("Offset"), C_("Gradient", "Offset:"), _("Offset of selected stop"),
"/tools/gradient/stopoffset", 0,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
0.0, 1.0, 0.01, 0.1,
nullptr, nullptr, 0,
- nullptr, // callback
nullptr /*unit tracker*/,
0.01, 2, 1.0);
diff --git a/src/ui/toolbar/measure-toolbar.cpp b/src/ui/toolbar/measure-toolbar.cpp
index f16b1fdb6..f478146da 100644
--- a/src/ui/toolbar/measure-toolbar.cpp
+++ b/src/ui/toolbar/measure-toolbar.cpp
@@ -228,11 +228,9 @@ MeasureToolbar::prep(SPDesktop * desktop, GtkActionGroup* mainActions)
_("The font size to be used in the measurement labels"),
"/tools/measure/fontsize", 10.0,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
1.0, 36.0, 1.0, 4.0,
nullptr, nullptr, 0,
- nullptr, // callback
nullptr, 0 , 2);
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));
@@ -261,11 +259,9 @@ MeasureToolbar::prep(SPDesktop * desktop, GtkActionGroup* mainActions)
_("Decimal precision of measure"),
"/tools/measure/precision", 2,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
0, 10, 1, 0,
nullptr, nullptr, 0,
- nullptr, // callback
nullptr, 0 ,0);
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));
@@ -279,11 +275,9 @@ MeasureToolbar::prep(SPDesktop * desktop, GtkActionGroup* mainActions)
_("Scale the results"),
"/tools/measure/scale", 100.0,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
0.0, 90000.0, 1.0, 4.0,
nullptr, nullptr, 0,
- nullptr, // callback
nullptr, 0 , 3);
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));
@@ -297,11 +291,9 @@ MeasureToolbar::prep(SPDesktop * desktop, GtkActionGroup* mainActions)
_("Mark dimension offset"),
"/tools/measure/offset", 5.0,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
0.0, 90000.0, 1.0, 4.0,
nullptr, nullptr, 0,
- nullptr, // callback
nullptr, 0 , 2);
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));
diff --git a/src/ui/toolbar/mesh-toolbar.cpp b/src/ui/toolbar/mesh-toolbar.cpp
index 2345a16ba..87fe807e5 100644
--- a/src/ui/toolbar/mesh-toolbar.cpp
+++ b/src/ui/toolbar/mesh-toolbar.cpp
@@ -297,11 +297,9 @@ MeshToolbar::prep(SPDesktop * desktop, GtkActionGroup* mainActions)
_("Rows"), _("Rows:"), _("Number of rows in new mesh"),
"/tools/mesh/mesh_rows", 1,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
1, 20, 1, 1,
labels, values, 0,
- nullptr, // callback
nullptr /*unit tracker*/,
1.0, 0 );
toolbar->_row_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact));
@@ -318,11 +316,9 @@ MeshToolbar::prep(SPDesktop * desktop, GtkActionGroup* mainActions)
_("Columns"), _("Columns:"), _("Number of columns in new mesh"),
"/tools/mesh/mesh_cols", 1,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
1, 20, 1, 1,
labels, values, 0,
- nullptr, // callback
nullptr /*unit tracker*/,
1.0, 0 );
toolbar->_col_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact));
diff --git a/src/ui/toolbar/node-toolbar.cpp b/src/ui/toolbar/node-toolbar.cpp
index 32fbaaefd..6b11092c5 100644
--- a/src/ui/toolbar/node-toolbar.cpp
+++ b/src/ui/toolbar/node-toolbar.cpp
@@ -480,11 +480,9 @@ NodeToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("X coordinate:"), _("X:"), _("X coordinate of selected node(s)"),
"/tools/nodes/Xcoord", 0,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
TRUE, "altx-nodes",
-1e6, 1e6, SPIN_STEP, SPIN_PAGE_STEP,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
holder->_tracker );
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));
@@ -500,11 +498,9 @@ NodeToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Y coordinate:"), _("Y:"), _("Y coordinate of selected node(s)"),
"/tools/nodes/Ycoord", 0,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
-1e6, 1e6, SPIN_STEP, SPIN_PAGE_STEP,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
holder->_tracker );
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));
diff --git a/src/ui/toolbar/paintbucket-toolbar.cpp b/src/ui/toolbar/paintbucket-toolbar.cpp
index fd463289d..97bbf1882 100644
--- a/src/ui/toolbar/paintbucket-toolbar.cpp
+++ b/src/ui/toolbar/paintbucket-toolbar.cpp
@@ -106,11 +106,9 @@ PaintbucketToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("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),
- nullptr, // dataKludge
TRUE,
"inkscape:paintbucket-threshold", 0, 100.0, 1.0, 10.0,
nullptr, nullptr, 0,
- nullptr, // callback
nullptr /*unit tracker*/, 1, 0 );
toolbar->_threshold_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact));
@@ -138,11 +136,9 @@ PaintbucketToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("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),
- nullptr, // dataKludge
TRUE,
"inkscape:paintbucket-offset", -1e4, 1e4, 0.1, 0.5,
nullptr, nullptr, 0,
- nullptr, // callback
toolbar->_tracker,
1, 2);
toolbar->_offset_adj = Glib::wrap(ege_adjustment_action_get_adjustment(eact));
diff --git a/src/ui/toolbar/pencil-toolbar.cpp b/src/ui/toolbar/pencil-toolbar.cpp
index 74c40c44f..890e3e8b2 100644
--- a/src/ui/toolbar/pencil-toolbar.cpp
+++ b/src/ui/toolbar/pencil-toolbar.cpp
@@ -110,11 +110,9 @@ PencilToolbar::prep_pencil(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Min pressure"), _("Min:"), _("Min percent of pressure"),
"/tools/freehand/pencil/minpressure", 0,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
0, 100, 1, 0,
nullptr, nullptr, 0,
- nullptr, // callback
nullptr, 0 ,0);
toolbar->_minpressure_adj = Glib::wrap(ege_adjustment_action_get_adjustment(toolbar->_minpressure));
@@ -132,11 +130,9 @@ PencilToolbar::prep_pencil(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Max pressure"), _("Max:"), _("Max percent of pressure"),
"/tools/freehand/pencil/maxpressure", 100,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
0, 100, 1, 0,
nullptr, nullptr, 0,
- nullptr, // callback
nullptr, 0 ,0);
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));
@@ -176,11 +172,9 @@ PencilToolbar::prep_pencil(SPDesktop *desktop, GtkActionGroup* mainActions)
"/tools/freehand/pencil/tolerance",
3.0,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
TRUE, "altx-pencil",
1, 100.0, 0.5, 1.0,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr /*unit tracker*/,
1, 2);
diff --git a/src/ui/toolbar/rect-toolbar.cpp b/src/ui/toolbar/rect-toolbar.cpp
index d4fa9d74f..38bd8159c 100644
--- a/src/ui/toolbar/rect-toolbar.cpp
+++ b/src/ui/toolbar/rect-toolbar.cpp
@@ -116,11 +116,9 @@ RectToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Width"), _("W:"), _("Width of rectangle"),
"/tools/shapes/rect/width", 0,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
TRUE, "altx-rect",
0, 1e6, SPIN_STEP, SPIN_PAGE_STEP,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
holder->_tracker);
holder->_width_adj = Glib::wrap(ege_adjustment_action_get_adjustment(holder->_width_action));
@@ -140,11 +138,9 @@ RectToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Height"), _("H:"), _("Height of rectangle"),
"/tools/shapes/rect/height", 0,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
0, 1e6, SPIN_STEP, SPIN_PAGE_STEP,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
holder->_tracker);
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),
@@ -163,11 +159,9 @@ RectToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Horizontal radius"), _("Rx:"), _("Horizontal radius of rounded corners"),
"/tools/shapes/rect/rx", 0,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
0, 1e6, SPIN_STEP, SPIN_PAGE_STEP,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
holder->_tracker);
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),
@@ -185,11 +179,9 @@ RectToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Vertical radius"), _("Ry:"), _("Vertical radius of rounded corners"),
"/tools/shapes/rect/ry", 0,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
0, 1e6, SPIN_STEP, SPIN_PAGE_STEP,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
holder->_tracker);
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),
diff --git a/src/ui/toolbar/select-toolbar.cpp b/src/ui/toolbar/select-toolbar.cpp
index 604b185b7..6b5d87c8c 100644
--- a/src/ui/toolbar/select-toolbar.cpp
+++ b/src/ui/toolbar/select-toolbar.cpp
@@ -223,11 +223,9 @@ SelectToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
"/tools/select/X", /* path */
0.0, /* def(default) */
GTK_WIDGET(desktop->canvas), /* focusTarget */
- nullptr, /* dataKludge */
TRUE, "altx", /* altx, altx_mark */
-1e6, 1e6, SPIN_STEP, SPIN_PAGE_STEP, /* lower, upper, step, page */
nullptr, nullptr, 0, /* descrLabels, descrValues, descrCount */
- nullptr, /* callback */
holder->_tracker, /* unit_tracker */
SPIN_STEP, 3, 1); /* climb, digits, factor */
@@ -244,11 +242,9 @@ SelectToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
"/tools/select/Y", /* path */
0.0, /* def(default) */
GTK_WIDGET(desktop->canvas), /* focusTarget */
- nullptr, /* dataKludge */
TRUE, "altx", /* altx, altx_mark */
-1e6, 1e6, SPIN_STEP, SPIN_PAGE_STEP, /* lower, upper, step, page */
nullptr, nullptr, 0, /* descrLabels, descrValues, descrCount */
- nullptr, /* callback */
holder->_tracker, /* unit_tracker */
SPIN_STEP, 3, 1); /* climb, digits, factor */
@@ -265,11 +261,9 @@ SelectToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
"/tools/select/width", /* path */
0.0, /* def(default) */
GTK_WIDGET(desktop->canvas), /* focusTarget */
- nullptr, /* dataKludge */
TRUE, "altx", /* altx, altx_mark */
0.0, 1e6, SPIN_STEP, SPIN_PAGE_STEP, /* lower, upper, step, page */
nullptr, nullptr, 0, /* descrLabels, descrValues, descrCount */
- nullptr, /* callback */
holder->_tracker, /* unit_tracker */
SPIN_STEP, 3, 1); /* climb, digits, factor */
@@ -298,11 +292,9 @@ SelectToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
"/tools/select/height", /* path */
0.0, /* def(default) */
GTK_WIDGET(desktop->canvas), /* focusTarget */
- nullptr, /* dataKludge */
TRUE, "altx", /* altx, altx_mark */
0.0, 1e6, SPIN_STEP, SPIN_PAGE_STEP, /* lower, upper, step, page */
nullptr, nullptr, 0, /* descrLabels, descrValues, descrCount */
- nullptr, /* callback */
holder->_tracker, /* unit_tracker */
SPIN_STEP, 3, 1); /* climb, digits, factor */
diff --git a/src/ui/toolbar/spiral-toolbar.cpp b/src/ui/toolbar/spiral-toolbar.cpp
index acdf82b3b..89ede4d0c 100644
--- a/src/ui/toolbar/spiral-toolbar.cpp
+++ b/src/ui/toolbar/spiral-toolbar.cpp
@@ -100,11 +100,9 @@ SpiralToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Number of turns"), _("Turns:"), _("Number of revolutions"),
"/tools/shapes/spiral/revolution", 3.0,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
TRUE, "altx-spiral",
0.01, 1024.0, 0.1, 1.0,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr /*unit tracker*/, 1, 2);
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),
@@ -120,11 +118,9 @@ SpiralToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Divergence"), _("Divergence:"), _("How much denser/sparser are outer revolutions; 1 = uniform"),
"/tools/shapes/spiral/expansion", 1.0,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
0.0, 1000.0, 0.01, 1.0,
- labels, values, G_N_ELEMENTS(labels),
- nullptr // dataKludge
+ labels, values, G_N_ELEMENTS(labels)
);
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),
@@ -140,11 +136,9 @@ SpiralToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Inner radius"), _("Inner radius:"), _("Radius of the innermost revolution (relative to the spiral size)"),
"/tools/shapes/spiral/t0", 0.0,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
0.0, 0.999, 0.01, 1.0,
- labels, values, G_N_ELEMENTS(labels),
- nullptr // callback
+ labels, values, G_N_ELEMENTS(labels)
);
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),
diff --git a/src/ui/toolbar/spray-toolbar.cpp b/src/ui/toolbar/spray-toolbar.cpp
index c0c945ffe..d409c34ed 100644
--- a/src/ui/toolbar/spray-toolbar.cpp
+++ b/src/ui/toolbar/spray-toolbar.cpp
@@ -93,11 +93,9 @@ SprayToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Width"), _("Width:"), _("The width of the spray area (relative to the visible canvas area)"),
"/tools/spray/width", 15,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
true, "altx-spray",
1, 100, 1.0, 10.0,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr /*unit tracker*/, 1, 0 );
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));
@@ -125,11 +123,9 @@ SprayToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Focus"), _("Focus:"), _("0 to spray a spot; increase to enlarge the ring radius"),
"/tools/spray/mean", 0,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
true, "spray-mean",
0, 100, 1.0, 10.0,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr /*unit tracker*/, 1, 0 );
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));
@@ -146,11 +142,9 @@ SprayToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
C_("Spray tool", "Scatter"), C_("Spray tool", "Scatter:"), _("Increase to scatter sprayed objects"),
"/tools/spray/standard_deviation", 70,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
true, "spray-standard_deviation",
1, 100, 1.0, 10.0,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr /*unit tracker*/, 1, 0 );
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));
@@ -216,11 +210,9 @@ SprayToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Adjusts the number of items sprayed per click"),
"/tools/spray/population", 70,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
true, "spray-population",
1, 100, 1.0, 10.0,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr /*unit tracker*/, 1, 0 );
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));
@@ -249,11 +241,9 @@ SprayToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("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),
- nullptr, // dataKludge
true, "spray-rotation",
0, 100, 1.0, 10.0,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr /*unit tracker*/, 1, 0 );
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));
@@ -271,11 +261,9 @@ SprayToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("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),
- nullptr, // dataKludge
true, "spray-scale",
0, 100, 1.0, 10.0,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr /*unit tracker*/, 1, 0 );
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));
@@ -413,11 +401,9 @@ SprayToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Increase to segregate objects more (value in percent)"),
"/tools/spray/offset", 100,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
0, 1000, 1, 4,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr, 0 , 0);
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));
diff --git a/src/ui/toolbar/star-toolbar.cpp b/src/ui/toolbar/star-toolbar.cpp
index 5aa88f1e0..017c24ed5 100644
--- a/src/ui/toolbar/star-toolbar.cpp
+++ b/src/ui/toolbar/star-toolbar.cpp
@@ -140,11 +140,9 @@ StarToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Corners"), _("Corners:"), _("Number of corners of a polygon or star"),
"/tools/shapes/star/magnitude", 3,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
3, 1024, 1, 5,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr /*unit tracker*/,
1.0, 0 );
@@ -165,11 +163,9 @@ StarToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Base radius to tip radius ratio"),
"/tools/shapes/star/proportion", 0.5,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
0.01, 1.0, 0.01, 0.1,
- labels, values, G_N_ELEMENTS(labels),
- nullptr // callback
+ labels, values, G_N_ELEMENTS(labels)
);
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));
@@ -191,11 +187,9 @@ StarToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Rounded"), _("Rounded:"), _("How much rounded are the corners (0 for sharp)"),
"/tools/shapes/star/rounded", 0.0,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
-10.0, 10.0, 0.01, 0.1,
- labels, values, G_N_ELEMENTS(labels),
- nullptr // callback
+ labels, values, G_N_ELEMENTS(labels)
);
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));
@@ -211,11 +205,9 @@ StarToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Randomized"), _("Randomized:"), _("Scatter randomly the corners and angles"),
"/tools/shapes/star/randomized", 0.0,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
FALSE, nullptr,
-10.0, 10.0, 0.001, 0.01,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr /*unit tracker*/, 0.1, 3 );
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));
diff --git a/src/ui/toolbar/text-toolbar.cpp b/src/ui/toolbar/text-toolbar.cpp
index 72bd5cdb0..bbe938450 100644
--- a/src/ui/toolbar/text-toolbar.cpp
+++ b/src/ui/toolbar/text-toolbar.cpp
@@ -583,12 +583,10 @@ TextToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
"/tools/text/lineheight", /* preferences path */
0.0, /* default */
GTK_WIDGET(desktop->canvas), /* focusTarget */
- nullptr, /* dataKludge */
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 */
labels, values, G_N_ELEMENTS(labels), /* drop down menu */
- nullptr, /* callback */
nullptr, // tracker, /* unit tracker */
0.1, /* step (used?) */
2, /* digits to show */
@@ -674,12 +672,10 @@ TextToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
"/tools/text/wordspacing", /* preferences path */
0.0, /* default */
GTK_WIDGET(desktop->canvas), /* focusTarget */
- nullptr, /* dataKludge */
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 */
labels, values, G_N_ELEMENTS(labels), /* drop down menu */
- nullptr, /* callback */
nullptr, /* unit tracker */
0.1, /* step (used?) */
2, /* digits to show */
@@ -707,12 +703,10 @@ TextToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
"/tools/text/letterspacing", /* preferences path */
0.0, /* default */
GTK_WIDGET(desktop->canvas), /* focusTarget */
- nullptr, /* dataKludge */
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 */
labels, values, G_N_ELEMENTS(labels), /* drop down menu */
- nullptr, /* callback */
nullptr, /* unit tracker */
0.1, /* step (used?) */
2, /* digits to show */
@@ -739,12 +733,10 @@ TextToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
"/tools/text/dx", /* preferences path */
0.0, /* default */
GTK_WIDGET(desktop->canvas), /* focusTarget */
- nullptr, /* dataKludge */
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 */
labels, values, G_N_ELEMENTS(labels), /* drop down menu */
- nullptr, /* callback */
nullptr, /* unit tracker */
0.1, /* step (used?) */
2, /* digits to show */
@@ -771,12 +763,10 @@ TextToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
"/tools/text/dy", /* preferences path */
0.0, /* default */
GTK_WIDGET(desktop->canvas), /* focusTarget */
- nullptr, /* dataKludge */
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 */
labels, values, G_N_ELEMENTS(labels), /* drop down menu */
- nullptr, /* callback */
nullptr, /* unit tracker */
0.1, /* step (used?) */
2, /* digits to show */
@@ -803,12 +793,10 @@ TextToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
"/tools/text/rotation", /* preferences path */
0.0, /* default */
GTK_WIDGET(desktop->canvas), /* focusTarget */
- nullptr, /* dataKludge */
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 */
labels, values, G_N_ELEMENTS(labels), /* drop down menu */
- nullptr, /* callback */
nullptr, /* unit tracker */
0.1, /* step (used?) */
2, /* digits to show */
diff --git a/src/ui/toolbar/tweak-toolbar.cpp b/src/ui/toolbar/tweak-toolbar.cpp
index e85e1d7a5..1b17e3495 100644
--- a/src/ui/toolbar/tweak-toolbar.cpp
+++ b/src/ui/toolbar/tweak-toolbar.cpp
@@ -95,11 +95,9 @@ TweakToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Width"), _("Width:"), _("The width of the tweak area (relative to the visible canvas area)"),
"/tools/tweak/width", 15,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
TRUE, "altx-tweak",
1, 100, 1.0, 10.0,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr /*unit tracker*/, 0.01, 0, 100 );
holder->_adj_tweak_width = Glib::wrap(ege_adjustment_action_get_adjustment(eact));
@@ -118,11 +116,9 @@ TweakToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("Force"), _("Force:"), _("The force of the tweak action"),
"/tools/tweak/force", 20,
GTK_WIDGET(desktop->canvas),
- nullptr, // dataKludge
TRUE, "tweak-force",
1, 100, 1.0, 10.0,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr /*unit tracker*/, 0.01, 0, 100 );
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));
@@ -316,11 +312,9 @@ TweakToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
_("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),
- nullptr, // dataKludge
TRUE, "tweak-fidelity",
1, 100, 1.0, 10.0,
labels, values, G_N_ELEMENTS(labels),
- nullptr, // callback
nullptr /*unit tracker*/, 0.01, 0, 100 );
holder->_adj_tweak_fidelity = Glib::wrap(ege_adjustment_action_get_adjustment(holder->_tweak_fidelity));
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 2dd1c57ef..7cfa4de03 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -714,11 +714,9 @@ EgeAdjustmentAction * create_adjustment_action( gchar const *name,
gchar const *label, gchar const *shortLabel, gchar const *tooltip,
Glib::ustring const &path, gdouble def,
GtkWidget *focusTarget,
- GObject * /* dataKludge */,
gboolean altx, gchar const *altx_mark,
gdouble lower, gdouble upper, gdouble step, gdouble page,
gchar const** descrLabels, gdouble const* descrValues, guint descrCount,
- void (*callback)(GtkAdjustment *, GObject *),
Inkscape::UI::Widget::UnitTracker *unit_tracker,
gdouble climb/* = 0.1*/, guint digits/* = 3*/, double factor/* = 1.0*/ )
{
@@ -732,8 +730,6 @@ EgeAdjustmentAction * create_adjustment_action( gchar const *name,
GtkAdjustment* adj = GTK_ADJUSTMENT( gtk_adjustment_new( prefs->getDouble(path, def) * factor,
lower, upper, step, page, 0 ) );
-// g_signal_connect( G_OBJECT(adj), "value-changed", G_CALLBACK(callback), dataKludge );
-
EgeAdjustmentAction* act = ege_adjustment_action_new( adj, name, label, tooltip, nullptr, climb, digits, unit_tracker );
if ( shortLabel ) {
g_object_set( act, "short_label", shortLabel, NULL );
@@ -751,15 +747,6 @@ EgeAdjustmentAction * create_adjustment_action( gchar const *name,
g_object_set( G_OBJECT(act), "self-id", altx_mark, NULL );
}
- /*
- * TODO: Is this ever used?
- if ( dataKludge ) {
- // Rather lame, but it's the only place where we need to get the entry name
- // but we don't have an Entry
- g_object_set_data( dataKludge, prefs->getEntry(path).getEntryName().data(), adj );
- }
- */
-
if (unit_tracker) {
unit_tracker->addAdjustment(adj);
}
diff --git a/src/widgets/toolbox.h b/src/widgets/toolbox.h
index 2236a7ab1..b605b4fbb 100644
--- a/src/widgets/toolbox.h
+++ b/src/widgets/toolbox.h
@@ -135,11 +135,9 @@ void delete_connection(GObject * /*obj*/, sigc::connection *connection);
gchar const *label, gchar const *shortLabel, gchar const *tooltip,
Glib::ustring const &path, gdouble def,
GtkWidget *focusTarget,
- GObject *dataKludge,
gboolean altx, gchar const *altx_mark,
gdouble lower, gdouble upper, gdouble step, gdouble page,
gchar const** descrLabels, gdouble const* descrValues, guint descrCount,
- void (*callback)(GtkAdjustment *, GObject *),
Inkscape::UI::Widget::UnitTracker *unit_tracker = nullptr,
gdouble climb = 0.1, guint digits = 3, double factor = 1.0 );
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-19 02:02:40 +0000