X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fwidgets%2Ftoolbox.cpp;h=47cb78cb22d21ad91f6f158c5688f584bda645a2;hb=7ec2a593a4a4046d6313fc868bd32ca1a5b2a119;hp=6cac1fe0fff6446001fde5be2a1db4e31530af6e;hpb=663313163d115d458eee462faff726be5bb08af6;p=inkscape.git diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 6cac1fe0f..47cb78cb2 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -1,5 +1,3 @@ -#define __SP_MAINTOOLBOX_C__ - /** \file * Controls bars for some of Inkscape's tools * (for some tools, they are in their own files) @@ -47,7 +45,6 @@ #include "sp-namedview.h" #include "desktop.h" #include "desktop-handles.h" -#include "nodepath.h" #include "xml/repr.h" #include "xml/node-event-vector.h" #include @@ -62,7 +59,12 @@ #include "gradient-toolbar.h" #include "connector-context.h" +#include "node-context.h" +#include "shape-editor.h" +#include "tweak-context.h" #include "sp-rect.h" +#include "box3d.h" +#include "box3d-context.h" #include "sp-star.h" #include "sp-spiral.h" #include "sp-ellipse.h" @@ -70,6 +72,7 @@ #include "sp-flowtext.h" #include "style.h" #include "selection.h" +#include "selection-chemistry.h" #include "document-private.h" #include "desktop-style.h" #include "../libnrtype/font-lister.h" @@ -96,19 +99,21 @@ using Inkscape::UnitTracker; typedef void (*SetupFunction)(GtkWidget *toolbox, SPDesktop *desktop); typedef void (*UpdateFunction)(SPDesktop *desktop, SPEventContext *eventcontext, GtkWidget *toolbox); -static GtkWidget *sp_node_toolbox_new(SPDesktop *desktop); -static GtkWidget *sp_zoom_toolbox_new(SPDesktop *desktop); -static GtkWidget *sp_star_toolbox_new(SPDesktop *desktop); -static GtkWidget *sp_arc_toolbox_new(SPDesktop *desktop); -static GtkWidget *sp_rect_toolbox_new(SPDesktop *desktop); -static GtkWidget *sp_spiral_toolbox_new(SPDesktop *desktop); -static GtkWidget *sp_pencil_toolbox_new(SPDesktop *desktop); -static GtkWidget *sp_pen_toolbox_new(SPDesktop *desktop); -static GtkWidget *sp_calligraphy_toolbox_new(SPDesktop *desktop); -static GtkWidget *sp_dropper_toolbox_new(SPDesktop *desktop); +static void sp_node_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder); +static void sp_tweak_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder); +static void sp_zoom_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder); +static void sp_star_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder); +static void sp_arc_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder); +static void sp_rect_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder); +static void sp_3dbox_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder); +static void sp_spiral_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder); +static void sp_pencil_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder); +static void sp_pen_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder); +static void sp_calligraphy_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder); +static void sp_dropper_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder); static GtkWidget *sp_empty_toolbox_new(SPDesktop *desktop); -static GtkWidget *sp_connector_toolbox_new(SPDesktop *desktop); -static GtkWidget *sp_paintbucket_toolbox_new(SPDesktop *desktop); +static void sp_connector_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder); +static void sp_paintbucket_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder); namespace { GtkWidget *sp_text_toolbox_new (SPDesktop *desktop); } @@ -121,8 +126,10 @@ static struct { } const tools[] = { { "SPSelectContext", "select_tool", SP_VERB_CONTEXT_SELECT, SP_VERB_CONTEXT_SELECT_PREFS}, { "SPNodeContext", "node_tool", SP_VERB_CONTEXT_NODE, SP_VERB_CONTEXT_NODE_PREFS }, + { "SPTweakContext", "tweak_tool", SP_VERB_CONTEXT_TWEAK, SP_VERB_CONTEXT_TWEAK_PREFS }, { "SPZoomContext", "zoom_tool", SP_VERB_CONTEXT_ZOOM, SP_VERB_CONTEXT_ZOOM_PREFS }, { "SPRectContext", "rect_tool", SP_VERB_CONTEXT_RECT, SP_VERB_CONTEXT_RECT_PREFS }, +// { "SP3DBoxContext", "3dbox_tool", SP_VERB_CONTEXT_3DBOX, SP_VERB_CONTEXT_3DBOX_PREFS }, { "SPArcContext", "arc_tool", SP_VERB_CONTEXT_ARC, SP_VERB_CONTEXT_ARC_PREFS }, { "SPStarContext", "star_tool", SP_VERB_CONTEXT_STAR, SP_VERB_CONTEXT_STAR_PREFS }, { "SPSpiralContext", "spiral_tool", SP_VERB_CONTEXT_SPIRAL, SP_VERB_CONTEXT_SPIRAL_PREFS }, @@ -141,25 +148,258 @@ static struct { gchar const *type_name; gchar const *data_name; GtkWidget *(*create_func)(SPDesktop *desktop); + void (*prep_func)(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder); + gchar const *ui_name; + gint swatch_verb_id; + gchar const *swatch_tool; + gchar const *swatch_tip; } const aux_toolboxes[] = { - { "SPSelectContext", "select_toolbox", sp_select_toolbox_new }, - { "SPNodeContext", "node_toolbox", sp_node_toolbox_new }, - { "SPZoomContext", "zoom_toolbox", sp_zoom_toolbox_new }, - { "SPStarContext", "star_toolbox", sp_star_toolbox_new }, - { "SPRectContext", "rect_toolbox", sp_rect_toolbox_new }, - { "SPArcContext", "arc_toolbox", sp_arc_toolbox_new }, - { "SPSpiralContext", "spiral_toolbox", sp_spiral_toolbox_new }, - { "SPPencilContext", "pencil_toolbox", sp_pencil_toolbox_new }, - { "SPPenContext", "pen_toolbox", sp_pen_toolbox_new }, - { "SPDynaDrawContext", "calligraphy_toolbox", sp_calligraphy_toolbox_new }, - { "SPTextContext", "text_toolbox", sp_text_toolbox_new }, - { "SPDropperContext", "dropper_toolbox", sp_dropper_toolbox_new }, - { "SPGradientContext", "gradient_toolbox", sp_gradient_toolbox_new }, - { "SPConnectorContext", "connector_toolbox", sp_connector_toolbox_new }, - { "SPFloodContext", "paintbucket_toolbox", sp_paintbucket_toolbox_new }, - { NULL, NULL, NULL } + { "SPSelectContext", "select_toolbox", 0, sp_select_toolbox_prep, "SelectToolbar", + SP_VERB_INVALID, 0, 0}, + { "SPNodeContext", "node_toolbox", 0, sp_node_toolbox_prep, "NodeToolbar", + SP_VERB_INVALID, 0, 0}, + { "SPTweakContext", "tweak_toolbox", 0, sp_tweak_toolbox_prep, "TweakToolbar", + SP_VERB_CONTEXT_TWEAK_PREFS, "tools.tweak", _("Color/opacity used for color tweaking")}, + { "SPZoomContext", "zoom_toolbox", 0, sp_zoom_toolbox_prep, "ZoomToolbar", + SP_VERB_INVALID, 0, 0}, + { "SPStarContext", "star_toolbox", 0, sp_star_toolbox_prep, "StarToolbar", + SP_VERB_CONTEXT_STAR_PREFS, "tools.shapes.star", _("Style of new stars")}, + { "SPRectContext", "rect_toolbox", 0, sp_rect_toolbox_prep, "RectToolbar", + SP_VERB_CONTEXT_RECT_PREFS, "tools.shapes.rect", _("Style of new rectangles")}, + { "SP3DBoxContext", "3dbox_toolbox", 0, sp_3dbox_toolbox_prep, "3DBoxToolbar", + SP_VERB_CONTEXT_3DBOX_PREFS, "tools.shapes.3dbox", _("Style of new 3D boxes")}, + { "SPArcContext", "arc_toolbox", 0, sp_arc_toolbox_prep, "ArcToolbar", + SP_VERB_CONTEXT_ARC_PREFS, "tools.shapes.arc", _("Style of new ellipses")}, + { "SPSpiralContext", "spiral_toolbox", 0, sp_spiral_toolbox_prep, "SpiralToolbar", + SP_VERB_CONTEXT_SPIRAL_PREFS, "tools.shapes.spiral", _("Style of new spirals")}, + { "SPPencilContext", "pencil_toolbox", 0, sp_pencil_toolbox_prep, "PencilToolbar", + SP_VERB_CONTEXT_PENCIL_PREFS, "tools.freehand.pencil", _("Style of new paths created by Pencil")}, + { "SPPenContext", "pen_toolbox", 0, sp_pen_toolbox_prep, "PenToolbar", + SP_VERB_CONTEXT_PEN_PREFS, "tools.freehand.pen", _("Style of new paths created by Pen")}, + { "SPDynaDrawContext", "calligraphy_toolbox", 0, sp_calligraphy_toolbox_prep,"CalligraphyToolbar", + SP_VERB_CONTEXT_CALLIGRAPHIC_PREFS, "tools.calligraphic", _("Style of new calligraphic strokes")}, + { "SPTextContext", "text_toolbox", sp_text_toolbox_new, 0, 0, + SP_VERB_INVALID, 0, 0}, + { "SPDropperContext", "dropper_toolbox", 0, sp_dropper_toolbox_prep, "DropperToolbar", + SP_VERB_INVALID, 0, 0}, + { "SPGradientContext", "gradient_toolbox", sp_gradient_toolbox_new, 0, 0, + SP_VERB_INVALID, 0, 0}, + { "SPConnectorContext", "connector_toolbox", 0, sp_connector_toolbox_prep, "ConnectorToolbar", + SP_VERB_INVALID, 0, 0}, + { "SPFloodContext", "paintbucket_toolbox", 0, sp_paintbucket_toolbox_prep, "PaintbucketToolbar", + SP_VERB_CONTEXT_PAINTBUCKET_PREFS, "tools.paintbucket", _("Style of Paint Bucket fill objects")}, + { NULL, NULL, NULL, NULL, NULL, SP_VERB_INVALID, NULL, NULL } }; + +static gchar const * ui_descr = + "" + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + + " " + " " + " " + " " + " " + " " + " " + " " + + " " + " " + + " " + " " + + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + + " " + " " + " " + " " + + " " + " " + " " + " " + " " + " " + " " + " " + " " + + "" +; + static GtkActionGroup* create_or_fetch_actions( SPDesktop* desktop ); static void toolbox_set_desktop (GtkWidget *toolbox, SPDesktop *desktop, SetupFunction setup_func, UpdateFunction update_func, sigc::connection*); @@ -178,21 +418,21 @@ static void update_commands_toolbox (SPDesktop *desktop, SPEventContext *eventco *dropper_opacity_entry ; */ // should be made a private member once this is converted to class -static void delete_connection(GObject *obj, sigc::connection *connection) { +static void delete_connection(GObject */*obj*/, sigc::connection *connection) { connection->disconnect(); delete connection; } -static GtkWidget * -sp_toolbox_button_new(GtkWidget *t, Inkscape::IconSize size, gchar const *pxname, GtkSignalFunc handler, - GtkTooltips *tt, gchar const *tip) +static void purge_repr_listener( GObject* obj, GObject* tbl ) { - GtkWidget *b = sp_button_new_from_data(size, SP_BUTTON_TYPE_NORMAL, NULL, pxname, tip, tt); - gtk_widget_show(b); - if (handler) gtk_signal_connect(GTK_OBJECT(b), "clicked", handler, NULL); - gtk_box_pack_start(GTK_BOX(t), b, FALSE, FALSE, 0); - - return b; + (void)obj; + Inkscape::XML::Node* oldrepr = reinterpret_cast( g_object_get_data( tbl, "repr" ) ); + if (oldrepr) { // remove old listener + sp_repr_remove_listener_by_data(oldrepr, tbl); + Inkscape::GC::release(oldrepr); + oldrepr = 0; + g_object_set_data( tbl, "repr", NULL ); + } } GtkWidget * @@ -231,7 +471,7 @@ GtkWidget * sp_toolbox_button_normal_new_from_verb(GtkWidget *t, Inkscape::IconS } -static void trigger_sp_action( GtkAction* act, gpointer user_data ) +static void trigger_sp_action( GtkAction* /*act*/, gpointer user_data ) { SPAction* targetAction = SP_ACTION(user_data); if ( targetAction ) { @@ -239,7 +479,7 @@ static void trigger_sp_action( GtkAction* act, gpointer user_data ) } } -static void sp_action_action_set_sensitive (SPAction *action, unsigned int sensitive, void *data) +static void sp_action_action_set_sensitive (SPAction */*action*/, unsigned int sensitive, void *data) { if ( data ) { GtkAction* act = GTK_ACTION(data); @@ -372,14 +612,14 @@ sp_tool_toolbox_new() } static void -aux_toolbox_attached(GtkHandleBox *toolbox, GtkWidget *child) +aux_toolbox_attached(GtkHandleBox */*toolbox*/, GtkWidget *child) { g_object_set_data(G_OBJECT(child), "is_detached", GINT_TO_POINTER(FALSE)); gtk_widget_queue_resize(child); } static void -aux_toolbox_detached(GtkHandleBox *toolbox, GtkWidget *child) +aux_toolbox_detached(GtkHandleBox */*toolbox*/, GtkWidget *child) { g_object_set_data(G_OBJECT(child), "is_detached", GINT_TO_POINTER(TRUE)); gtk_widget_queue_resize(child); @@ -453,143 +693,316 @@ sp_commands_toolbox_new() return hb; } +static EgeAdjustmentAction * create_adjustment_action( gchar const *name, + gchar const *label, gchar const *shortLabel, gchar const *tooltip, + gchar const *path, gchar const *data, gdouble def, + GtkWidget *focusTarget, + GtkWidget *us, + 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 *), + gdouble climb = 0.1, guint digits = 3, double factor = 1.0 ) +{ + GtkAdjustment* adj = GTK_ADJUSTMENT( gtk_adjustment_new( prefs_get_double_attribute(path, data, def) * factor, + lower, upper, step, page, page ) ); + if (us) { + sp_unit_selector_add_adjustment( SP_UNIT_SELECTOR(us), adj ); + } + + gtk_signal_connect( GTK_OBJECT(adj), "value-changed", GTK_SIGNAL_FUNC(callback), dataKludge ); + + EgeAdjustmentAction* act = ege_adjustment_action_new( adj, name, label, tooltip, 0, climb, digits ); + if ( shortLabel ) { + g_object_set( act, "short_label", shortLabel, NULL ); + } + + if ( (descrCount > 0) && descrLabels && descrValues ) { + 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 ); + } + + if ( dataKludge ) { + g_object_set_data( dataKludge, data, adj ); + } + + // Using a cast just to make sure we pass in the right kind of function pointer + g_object_set( G_OBJECT(act), "tool-post", static_cast(sp_set_font_size_smaller), NULL ); + + return act; +} + //#################################### //# node editing callbacks //#################################### +/** + * FIXME: Returns current shape_editor in context. // later eliminate this function at all! + */ +static ShapeEditor *get_current_shape_editor() +{ + if (!SP_ACTIVE_DESKTOP) { + return NULL; + } + + SPEventContext *event_context = (SP_ACTIVE_DESKTOP)->event_context; + + if (!SP_IS_NODE_CONTEXT(event_context)) { + return NULL; + } + + return SP_NODE_CONTEXT(event_context)->shape_editor; +} + + void sp_node_path_edit_add(void) { - sp_node_selected_add_node(); + ShapeEditor *shape_editor = get_current_shape_editor(); + if (shape_editor) shape_editor->add_node(); } void sp_node_path_edit_delete(void) { - sp_node_selected_delete(); + ShapeEditor *shape_editor = get_current_shape_editor(); + if (shape_editor) shape_editor->delete_nodes(); } void sp_node_path_edit_delete_segment(void) { - sp_node_selected_delete_segment(); + ShapeEditor *shape_editor = get_current_shape_editor(); + if (shape_editor) shape_editor->delete_segment(); } void sp_node_path_edit_break(void) { - sp_node_selected_break(); + ShapeEditor *shape_editor = get_current_shape_editor(); + if (shape_editor) shape_editor->break_at_nodes(); } void sp_node_path_edit_join(void) { - sp_node_selected_join(); + ShapeEditor *shape_editor = get_current_shape_editor(); + if (shape_editor) shape_editor->join_nodes(); } void sp_node_path_edit_join_segment(void) { - sp_node_selected_join_segment(); + ShapeEditor *shape_editor = get_current_shape_editor(); + if (shape_editor) shape_editor->join_segments(); } void sp_node_path_edit_toline(void) { - sp_node_selected_set_line_type(NR_LINETO); + ShapeEditor *shape_editor = get_current_shape_editor(); + if (shape_editor) shape_editor->set_type_of_segments(NR_LINETO); } void sp_node_path_edit_tocurve(void) { - sp_node_selected_set_line_type(NR_CURVETO); + ShapeEditor *shape_editor = get_current_shape_editor(); + if (shape_editor) shape_editor->set_type_of_segments(NR_CURVETO); } void sp_node_path_edit_cusp(void) { - sp_node_selected_set_type(Inkscape::NodePath::NODE_CUSP); + ShapeEditor *shape_editor = get_current_shape_editor(); + if (shape_editor) shape_editor->set_node_type(Inkscape::NodePath::NODE_CUSP); } void sp_node_path_edit_smooth(void) { - sp_node_selected_set_type(Inkscape::NodePath::NODE_SMOOTH); + ShapeEditor *shape_editor = get_current_shape_editor(); + if (shape_editor) shape_editor->set_node_type(Inkscape::NodePath::NODE_SMOOTH); } void sp_node_path_edit_symmetrical(void) { - sp_node_selected_set_type(Inkscape::NodePath::NODE_SYMM); + ShapeEditor *shape_editor = get_current_shape_editor(); + if (shape_editor) shape_editor->set_node_type(Inkscape::NodePath::NODE_SYMM); } -static void toggle_show_handles (GtkToggleAction *act, gpointer data) { +static void toggle_show_handles (GtkToggleAction *act, gpointer /*data*/) { bool show = gtk_toggle_action_get_active( act ); prefs_set_int_attribute ("tools.nodes", "show_handles", show ? 1 : 0); - sp_nodepath_show_handles(show); + ShapeEditor *shape_editor = get_current_shape_editor(); + if (shape_editor) shape_editor->show_handles(show); +} + +void sp_node_path_edit_nextLPEparam (GtkAction */*act*/, gpointer data) { + sp_selection_next_patheffect_param( reinterpret_cast(data) ); +} + +/* is called when the node selection is modified */ +static void +sp_node_toolbox_coord_changed(gpointer /*shape_editor*/, GObject *tbl) +{ + GtkAction* xact = GTK_ACTION( g_object_get_data( tbl, "nodes_x_action" ) ); + GtkAction* yact = GTK_ACTION( g_object_get_data( tbl, "nodes_y_action" ) ); + GtkAdjustment *xadj = ege_adjustment_action_get_adjustment(EGE_ADJUSTMENT_ACTION(xact)); + GtkAdjustment *yadj = ege_adjustment_action_get_adjustment(EGE_ADJUSTMENT_ACTION(yact)); + + // quit if run by the attr_changed listener + if (g_object_get_data( tbl, "freeze" )) { + return; + } + + // in turn, prevent listener from responding + g_object_set_data( tbl, "freeze", GINT_TO_POINTER(TRUE)); + + UnitTracker* tracker = reinterpret_cast( g_object_get_data( tbl, "tracker" ) ); + SPUnit const *unit = tracker->getActiveUnit(); + + ShapeEditor *shape_editor = get_current_shape_editor(); + if (shape_editor && shape_editor->has_nodepath()) { + Inkscape::NodePath::Path *nodepath = shape_editor->get_nodepath(); + int n_selected = 0; + if (nodepath) { + n_selected = nodepath->numSelected(); + } + + if (n_selected == 0) { + gtk_action_set_sensitive(xact, FALSE); + gtk_action_set_sensitive(yact, FALSE); + } else { + gtk_action_set_sensitive(xact, TRUE); + gtk_action_set_sensitive(yact, TRUE); + NR::Coord oldx = sp_units_get_pixels(gtk_adjustment_get_value(xadj), *unit); + NR::Coord oldy = sp_units_get_pixels(gtk_adjustment_get_value(xadj), *unit); + + if (n_selected == 1) { + NR::Point sel_node = nodepath->singleSelectedCoords(); + if (oldx != sel_node[NR::X] || oldy != sel_node[NR::Y]) { + gtk_adjustment_set_value(xadj, sp_pixels_get_units(sel_node[NR::X], *unit)); + gtk_adjustment_set_value(yadj, sp_pixels_get_units(sel_node[NR::Y], *unit)); + } + } else { + NR::Maybe x = sp_node_selected_common_coord(nodepath, NR::X); + NR::Maybe y = sp_node_selected_common_coord(nodepath, NR::Y); + if ((x && ((*x) != oldx)) || (y && ((*y) != oldy))) { + /* Note: Currently x and y will always have a value, even if the coordinates of the + selected nodes don't coincide (in this case we use the coordinates of the center + of the bounding box). So the entries are never set to zero. */ + // FIXME: Maybe we should clear the entry if several nodes are selected + // instead of providing a kind of average value + gtk_adjustment_set_value(xadj, sp_pixels_get_units(x ? (*x) : 0.0, *unit)); + gtk_adjustment_set_value(yadj, sp_pixels_get_units(y ? (*y) : 0.0, *unit)); + } + } + } + } else { + // no shape-editor or nodepath yet (when we just switched to the tool); coord entries must be inactive + gtk_action_set_sensitive(xact, FALSE); + gtk_action_set_sensitive(yact, FALSE); + } + + g_object_set_data( tbl, "freeze", GINT_TO_POINTER(FALSE) ); +} + +static void +sp_node_path_value_changed(GtkAdjustment *adj, GObject *tbl, gchar const *value_name) +{ + SPDesktop *desktop = (SPDesktop *) g_object_get_data( tbl, "desktop" ); + + UnitTracker* tracker = reinterpret_cast(g_object_get_data( tbl, "tracker" )); + SPUnit const *unit = tracker->getActiveUnit(); + + if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) { + prefs_set_double_attribute("tools.nodes", value_name, sp_units_get_pixels(adj->value, *unit)); + } + + // quit if run by the attr_changed listener + if (g_object_get_data( tbl, "freeze" )) { + return; + } + + // in turn, prevent listener from responding + g_object_set_data( tbl, "freeze", GINT_TO_POINTER(TRUE)); + + ShapeEditor *shape_editor = get_current_shape_editor(); + if (shape_editor && shape_editor->has_nodepath()) { + double val = sp_units_get_pixels(gtk_adjustment_get_value(adj), *unit); + if (!strcmp(value_name, "x")) { + sp_node_selected_move_absolute(shape_editor->get_nodepath(), val, NR::X); + } + if (!strcmp(value_name, "y")) { + sp_node_selected_move_absolute(shape_editor->get_nodepath(), val, NR::Y); + } + } + + g_object_set_data( tbl, "freeze", GINT_TO_POINTER(FALSE) ); +} + +static void +sp_node_path_x_value_changed(GtkAdjustment *adj, GObject *tbl) +{ + sp_node_path_value_changed(adj, tbl, "x"); +} + +static void +sp_node_path_y_value_changed(GtkAdjustment *adj, GObject *tbl) +{ + sp_node_path_value_changed(adj, tbl, "y"); } //################################ //## Node Editing Toolbox ## //################################ -static GtkWidget * -sp_node_toolbox_new(SPDesktop *desktop) +static void sp_node_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder) { - gchar const * descr = - "" - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - ""; - GtkActionGroup* mainActions = create_or_fetch_actions( desktop ); - + UnitTracker* tracker = new UnitTracker( SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE ); + tracker->setActiveUnit( sp_desktop_namedview(desktop)->doc_units ); + g_object_set_data( holder, "tracker", tracker ); { InkAction* inky = ink_action_new( "NodeInsertAction", - _("Insert"), + _("Insert node"), _("Insert new nodes into selected segments"), "node_insert", Inkscape::ICON_SIZE_SMALL_TOOLBAR ); + g_object_set( inky, "short_label", _("Insert"), NULL ); g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_node_path_edit_add), 0 ); gtk_action_group_add_action( mainActions, GTK_ACTION(inky) ); } { InkAction* inky = ink_action_new( "NodeDeleteAction", - _("Delete"), + _("Delete node"), _("Delete selected nodes"), "node_delete", Inkscape::ICON_SIZE_SMALL_TOOLBAR ); + g_object_set( inky, "short_label", _("Delete"), NULL ); g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_node_path_edit_delete), 0 ); gtk_action_group_add_action( mainActions, GTK_ACTION(inky) ); } { InkAction* inky = ink_action_new( "NodeJoinAction", - _("Join"), + _("Join endnodes"), _("Join selected endnodes"), "node_join", Inkscape::ICON_SIZE_SMALL_TOOLBAR ); + g_object_set( inky, "short_label", _("Join"), NULL ); g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_node_path_edit_join), 0 ); gtk_action_group_add_action( mainActions, GTK_ACTION(inky) ); } @@ -685,65 +1098,75 @@ sp_node_toolbox_new(SPDesktop *desktop) gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs_get_int_attribute( "tools.nodes", "show_handles", 1 ) ); } - GtkUIManager* mgr = gtk_ui_manager_new(); - GError* errVal = 0; + { + InkAction* inky = ink_action_new( "EditNextLPEParameterAction", + _("Next Path Effect Parameter"), + _("Show next Path Effect parameter for editing"), + "edit_next_parameter", + Inkscape::ICON_SIZE_DECORATION ); + g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_node_path_edit_nextLPEparam), desktop ); + gtk_action_group_add_action( mainActions, GTK_ACTION(inky) ); + } - gtk_ui_manager_insert_action_group( mgr, mainActions, 0 ); - gtk_ui_manager_add_ui_from_string( mgr, descr, -1, &errVal ); + /* X coord of selected node(s) */ + { + EgeAdjustmentAction* eact = 0; + gchar const* labels[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; + gdouble values[] = {1, 2, 3, 5, 10, 20, 50, 100, 200, 500}; + eact = create_adjustment_action( "NodeXAction", + _("X coordinate:"), _("X:"), _("X coordinate of selected node(s)"), + "tools.nodes", "Xcoord", 0, + GTK_WIDGET(desktop->canvas), NULL/*us*/, holder, TRUE, "altx-nodes", + -1e6, 1e6, SPIN_STEP, SPIN_PAGE_STEP, + labels, values, G_N_ELEMENTS(labels), + sp_node_path_x_value_changed ); + tracker->addAdjustment( ege_adjustment_action_get_adjustment(eact) ); + g_object_set_data( holder, "nodes_x_action", eact ); + gtk_action_set_sensitive( GTK_ACTION(eact), FALSE ); + gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); + } - GtkWidget* toolBar = gtk_ui_manager_get_widget( mgr, "/ui/NodeToolbar" ); - gtk_toolbar_set_style( GTK_TOOLBAR(toolBar), GTK_TOOLBAR_ICONS ); - gint shrinkTop = prefs_get_int_attribute_limited( "toolbox", "small", 1, 0, 1 ); - Inkscape::IconSize toolboxSize = shrinkTop ? Inkscape::ICON_SIZE_SMALL_TOOLBAR : Inkscape::ICON_SIZE_LARGE_TOOLBAR; - gtk_toolbar_set_icon_size( GTK_TOOLBAR(toolBar), (GtkIconSize)toolboxSize ); + /* Y coord of selected node(s) */ + { + EgeAdjustmentAction* eact = 0; + gchar const* labels[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; + gdouble values[] = {1, 2, 3, 5, 10, 20, 50, 100, 200, 500}; + eact = create_adjustment_action( "NodeYAction", + _("Y coordinate:"), _("Y:"), _("Y coordinate of selected node(s)"), + "tools.nodes", "Ycoord", 0, + GTK_WIDGET(desktop->canvas), NULL/*us*/, holder, FALSE, NULL, + -1e6, 1e6, SPIN_STEP, SPIN_PAGE_STEP, + labels, values, G_N_ELEMENTS(labels), + sp_node_path_y_value_changed ); + tracker->addAdjustment( ege_adjustment_action_get_adjustment(eact) ); + g_object_set_data( holder, "nodes_y_action", eact ); + gtk_action_set_sensitive( GTK_ACTION(eact), FALSE ); + gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); + } - return toolBar; -} // end of sp_node_toolbox_new() + // add the units menu + { + GtkAction* act = tracker->createAction( "NodeUnitsAction", _("Units"), ("") ); + gtk_action_group_add_action( mainActions, act ); + } + + sigc::connection *connection = new sigc::connection ( + desktop->connectToolSubselectionChanged(sigc::bind (sigc::ptr_fun(sp_node_toolbox_coord_changed), (GObject *)holder)) + ); + + g_signal_connect( holder, "destroy", G_CALLBACK(delete_connection), connection ); + g_signal_connect( holder, "destroy", G_CALLBACK(purge_repr_listener), holder ); +} // end of sp_node_toolbox_prep() //######################## //## Zoom Toolbox ## //######################## -static GtkWidget * -sp_zoom_toolbox_new(SPDesktop *desktop) +static void sp_zoom_toolbox_prep(SPDesktop */*desktop*/, GtkActionGroup* /*mainActions*/, GObject* /*holder*/) { - gchar const * descr = - "" - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - ""; - GtkActionGroup* mainActions = create_or_fetch_actions( desktop ); - - - GtkUIManager* mgr = gtk_ui_manager_new(); - GError* errVal = 0; - - gtk_ui_manager_insert_action_group( mgr, mainActions, 0 ); - gtk_ui_manager_add_ui_from_string( mgr, descr, -1, &errVal ); - - GtkWidget* toolBar = gtk_ui_manager_get_widget( mgr, "/ui/ZoomToolbar" ); - gtk_toolbar_set_style( GTK_TOOLBAR(toolBar), GTK_TOOLBAR_ICONS ); - gint shrinkTop = prefs_get_int_attribute_limited( "toolbox", "small", 1, 0, 1 ); - Inkscape::IconSize toolboxSize = shrinkTop ? Inkscape::ICON_SIZE_SMALL_TOOLBAR : Inkscape::ICON_SIZE_LARGE_TOOLBAR; - gtk_toolbar_set_icon_size( GTK_TOOLBAR(toolBar), (GtkIconSize)toolboxSize ); - - return toolBar; -} // end of sp_zoom_toolbox_new() + // no custom GtkAction setup needed +} // end of sp_zoom_toolbox_prep() void sp_tool_toolbox_set_desktop(GtkWidget *toolbox, SPDesktop *desktop) @@ -799,7 +1222,14 @@ static void setup_tool_toolbox(GtkWidget *toolbox, SPDesktop *desktop) { GtkTooltips *tooltips=GTK_TOOLTIPS(g_object_get_data(G_OBJECT(toolbox), "tooltips")); - gint shrinkLeft = prefs_get_int_attribute_limited( "toolbox.left", "small", 0, 0, 1 ); + gint shrinkLeft = prefs_get_int_attribute_limited( "toolbox.tools", "small", 0, 0, 1 ); + if ( (shrinkLeft == 0) && (prefs_get_int_attribute_limited( "toolbox.tools", "small", 1, 0, 1 ) == 1) ) { + // "toolbox.tools" was not set. Fallback to older value + shrinkLeft = prefs_get_int_attribute_limited( "toolbox.left", "small", 0, 0, 1 ); + + // Copy the setting forwards + prefs_set_int_attribute( "toolbox.tools", "small", shrinkLeft ); + } Inkscape::IconSize toolboxSize = shrinkLeft ? Inkscape::ICON_SIZE_SMALL_TOOLBAR : Inkscape::ICON_SIZE_LARGE_TOOLBAR; for (int i = 0 ; tools[i].type_name ; i++ ) { @@ -818,7 +1248,7 @@ setup_tool_toolbox(GtkWidget *toolbox, SPDesktop *desktop) static void -update_tool_toolbox( SPDesktop *desktop, SPEventContext *eventcontext, GtkWidget *toolbox ) +update_tool_toolbox( SPDesktop */*desktop*/, SPEventContext *eventcontext, GtkWidget *toolbox ) { gchar const *const tname = ( eventcontext ? gtk_type_name(GTK_OBJECT_TYPE(eventcontext)) @@ -829,28 +1259,93 @@ update_tool_toolbox( SPDesktop *desktop, SPEventContext *eventcontext, GtkWidget } } -static void -setup_aux_toolbox(GtkWidget *toolbox, SPDesktop *desktop) -{ - GtkSizeGroup* grouper = gtk_size_group_new( GTK_SIZE_GROUP_BOTH ); +static void +setup_aux_toolbox(GtkWidget *toolbox, SPDesktop *desktop) +{ + GtkSizeGroup* grouper = gtk_size_group_new( GTK_SIZE_GROUP_BOTH ); + GtkActionGroup* mainActions = create_or_fetch_actions( desktop ); + GtkUIManager* mgr = gtk_ui_manager_new(); + GError* errVal = 0; + gtk_ui_manager_insert_action_group( mgr, mainActions, 0 ); + gtk_ui_manager_add_ui_from_string( mgr, ui_descr, -1, &errVal ); + + std::map dataHolders; + + for (int i = 0 ; aux_toolboxes[i].type_name ; i++ ) { + if ( aux_toolboxes[i].prep_func ) { + // converted to GtkActions and UIManager + + GtkWidget* kludge = gtk_hbox_new( FALSE, 0 ); + 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; + aux_toolboxes[i].prep_func( desktop, mainActions, G_OBJECT(kludge) ); + } else { + + GtkWidget *sub_toolbox = 0; + if (aux_toolboxes[i].create_func == NULL) + sub_toolbox = sp_empty_toolbox_new(desktop); + else { + sub_toolbox = aux_toolboxes[i].create_func(desktop); + } + + gtk_size_group_add_widget( grouper, sub_toolbox ); + + gtk_container_add(GTK_CONTAINER(toolbox), sub_toolbox); + g_object_set_data(G_OBJECT(toolbox), aux_toolboxes[i].data_name, sub_toolbox); + + } + } + + // Second pass to create toolbars *after* all GtkActions are created + for (int i = 0 ; aux_toolboxes[i].type_name ; i++ ) { + if ( aux_toolboxes[i].prep_func ) { + // converted to GtkActions and UIManager + + GtkWidget* kludge = dataHolders[aux_toolboxes[i].type_name]; + + GtkWidget* holder = gtk_table_new( 1, 3, FALSE ); + gtk_table_attach( GTK_TABLE(holder), kludge, 2, 3, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0 ); + + gchar* tmp = g_strdup_printf( "/ui/%s", aux_toolboxes[i].ui_name ); + GtkWidget* toolBar = gtk_ui_manager_get_widget( mgr, tmp ); + g_free( tmp ); + tmp = 0; + + gint shrinkTop = prefs_get_int_attribute_limited( "toolbox", "small", 1, 0, 1 ); + Inkscape::IconSize toolboxSize = shrinkTop ? Inkscape::ICON_SIZE_SMALL_TOOLBAR : Inkscape::ICON_SIZE_LARGE_TOOLBAR; + if ( prefs_get_int_attribute_limited( "toolbox", "icononly", 1, 0, 1 ) ) { + gtk_toolbar_set_style( GTK_TOOLBAR(toolBar), GTK_TOOLBAR_ICONS ); + } + gtk_toolbar_set_icon_size( GTK_TOOLBAR(toolBar), static_cast(toolboxSize) ); + + + gtk_table_attach( GTK_TABLE(holder), toolBar, 0, 1, 0, 1, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), 0, 0 ); - for (int i = 0 ; aux_toolboxes[i].type_name ; i++ ) { - GtkWidget *sub_toolbox; - if (aux_toolboxes[i].create_func == NULL) - sub_toolbox = sp_empty_toolbox_new(desktop); - else - sub_toolbox = aux_toolboxes[i].create_func(desktop); + if ( aux_toolboxes[i].swatch_verb_id != SP_VERB_INVALID ) { + Inkscape::UI::Widget::StyleSwatch *swatch = new Inkscape::UI::Widget::StyleSwatch( NULL, aux_toolboxes[i].swatch_tip ); + swatch->setDesktop( desktop ); + swatch->setClickVerb( aux_toolboxes[i].swatch_verb_id ); + swatch->setWatchedTool( aux_toolboxes[i].swatch_tool, true ); + GtkWidget *swatch_ = GTK_WIDGET( swatch->gobj() ); + gtk_table_attach( GTK_TABLE(holder), swatch_, 1, 2, 0, 1, (GtkAttachOptions)(GTK_SHRINK | GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), AUX_BETWEEN_BUTTON_GROUPS, 0 ); + } + + gtk_widget_show_all( holder ); + sp_set_font_size_smaller( holder ); - gtk_size_group_add_widget( grouper, sub_toolbox ); + gtk_size_group_add_widget( grouper, holder ); - gtk_container_add(GTK_CONTAINER(toolbox), sub_toolbox); - g_object_set_data(G_OBJECT(toolbox), aux_toolboxes[i].data_name, sub_toolbox); + gtk_container_add( GTK_CONTAINER(toolbox), holder ); + g_object_set_data( G_OBJECT(toolbox), aux_toolboxes[i].data_name, holder ); + } } + g_object_unref( G_OBJECT(grouper) ); } static void -update_aux_toolbox(SPDesktop *desktop, SPEventContext *eventcontext, GtkWidget *toolbox) +update_aux_toolbox(SPDesktop */*desktop*/, SPEventContext *eventcontext, GtkWidget *toolbox) { gchar const *tname = ( eventcontext ? gtk_type_name(GTK_OBJECT_TYPE(eventcontext)) @@ -917,7 +1412,9 @@ setup_commands_toolbox(GtkWidget *toolbox, SPDesktop *desktop) gtk_ui_manager_add_ui_from_string( mgr, descr, -1, &errVal ); GtkWidget* toolBar = gtk_ui_manager_get_widget( mgr, "/ui/CommandsToolbar" ); - gtk_toolbar_set_style( GTK_TOOLBAR(toolBar), GTK_TOOLBAR_ICONS ); + if ( prefs_get_int_attribute_limited( "toolbox", "icononly", 1, 0, 1 ) ) { + gtk_toolbar_set_style( GTK_TOOLBAR(toolBar), GTK_TOOLBAR_ICONS ); + } gint shrinkTop = prefs_get_int_attribute_limited( "toolbox", "small", 1, 0, 1 ); Inkscape::IconSize toolboxSize = shrinkTop ? Inkscape::ICON_SIZE_SMALL_TOOLBAR : Inkscape::ICON_SIZE_LARGE_TOOLBAR; gtk_toolbar_set_icon_size( GTK_TOOLBAR(toolBar), (GtkIconSize)toolboxSize ); @@ -927,7 +1424,7 @@ setup_commands_toolbox(GtkWidget *toolbox, SPDesktop *desktop) } static void -update_commands_toolbox(SPDesktop *desktop, SPEventContext *eventcontext, GtkWidget *toolbox) +update_commands_toolbox(SPDesktop */*desktop*/, SPEventContext */*eventcontext*/, GtkWidget */*toolbox*/) { } @@ -1012,60 +1509,15 @@ sp_tb_spinbutton( return hb; } -static EgeAdjustmentAction * create_adjustment_action( gchar const *name, - gchar const *label, gchar const *tooltip, - gchar const *path, gchar const *data, gdouble def, - GtkWidget *focusTarget, - GtkWidget *us, - GtkWidget *dataKludge, - gboolean altx, gchar const *altx_mark, - gdouble lower, gdouble upper, gdouble step, gdouble page, - gchar const** descrLabels, gdouble const* descrValues, guint descrCount, - void (*callback)(GtkAdjustment *, GtkWidget *), - gdouble climb = 0.1, guint digits = 3, double factor = 1.0 ) -{ - GtkAdjustment* adj = GTK_ADJUSTMENT( gtk_adjustment_new( prefs_get_double_attribute(path, data, def) * factor, - lower, upper, step, page, page ) ); - if (us) { - sp_unit_selector_add_adjustment( SP_UNIT_SELECTOR(us), adj ); - } - - gtk_signal_connect( GTK_OBJECT(adj), "value-changed", GTK_SIGNAL_FUNC(callback), dataKludge ); - - EgeAdjustmentAction* act = ege_adjustment_action_new( adj, name, label, tooltip, 0, climb, digits ); - - if ( (descrCount > 0) && descrLabels && descrValues ) { - 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 ); - } - - if ( dataKludge ) { - gtk_object_set_data( GTK_OBJECT(dataKludge), data, adj ); - } - - // Using a cast just to make sure we pass in the right kind of function pointer - g_object_set( G_OBJECT(act), "tool-post", static_cast(sp_set_font_size_smaller), NULL ); - - return act; -} - - #define MODE_LABEL_WIDTH 70 //######################## //## Star ## //######################## -static void sp_stb_magnitude_value_changed( GtkAdjustment *adj, GtkWidget *dataKludge ) +static void sp_stb_magnitude_value_changed( GtkAdjustment *adj, GObject *dataKludge ) { - SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(dataKludge), "desktop"); + SPDesktop *desktop = (SPDesktop *) g_object_get_data( dataKludge, "desktop" ); if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) { // do not remember prefs if this call is initiated by an undo change, because undoing object @@ -1074,12 +1526,12 @@ static void sp_stb_magnitude_value_changed( GtkAdjustment *adj, GtkWidget *dataK } // quit if run by the attr_changed listener - if (g_object_get_data(G_OBJECT(dataKludge), "freeze")) { + if (g_object_get_data( dataKludge, "freeze" )) { return; } // in turn, prevent listener from responding - g_object_set_data(G_OBJECT(dataKludge), "freeze", GINT_TO_POINTER(TRUE)); + g_object_set_data( dataKludge, "freeze", GINT_TO_POINTER(TRUE) ); bool modmade = false; @@ -1099,24 +1551,24 @@ static void sp_stb_magnitude_value_changed( GtkAdjustment *adj, GtkWidget *dataK if (modmade) sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_STAR, _("Star: Change number of corners")); - g_object_set_data(G_OBJECT(dataKludge), "freeze", GINT_TO_POINTER(FALSE)); + g_object_set_data( dataKludge, "freeze", GINT_TO_POINTER(FALSE) ); } -static void sp_stb_proportion_value_changed( GtkAdjustment *adj, GtkWidget *dataKludge ) +static void sp_stb_proportion_value_changed( GtkAdjustment *adj, GObject *dataKludge ) { - SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(dataKludge), "desktop"); + SPDesktop *desktop = (SPDesktop *) g_object_get_data( dataKludge, "desktop" ); if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) { prefs_set_double_attribute("tools.shapes.star", "proportion", adj->value); } // quit if run by the attr_changed listener - if (g_object_get_data(G_OBJECT(dataKludge), "freeze")) { + if (g_object_get_data( dataKludge, "freeze" )) { return; } // in turn, prevent listener from responding - g_object_set_data(G_OBJECT(dataKludge), "freeze", GINT_TO_POINTER(TRUE)); + g_object_set_data( dataKludge, "freeze", GINT_TO_POINTER(TRUE) ); bool modmade = false; Inkscape::Selection *selection = sp_desktop_selection(desktop); @@ -1141,12 +1593,12 @@ static void sp_stb_proportion_value_changed( GtkAdjustment *adj, GtkWidget *data if (modmade) sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_STAR, _("Star: Change spoke ratio")); - g_object_set_data(G_OBJECT(dataKludge), "freeze", GINT_TO_POINTER(FALSE)); + g_object_set_data( dataKludge, "freeze", GINT_TO_POINTER(FALSE) ); } -static void sp_stb_sides_flat_state_changed( EgeSelectOneAction *act, GtkObject *dataKludge ) +static void sp_stb_sides_flat_state_changed( EgeSelectOneAction *act, GObject *dataKludge ) { - SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(dataKludge), "desktop"); + SPDesktop *desktop = (SPDesktop *) g_object_get_data( dataKludge, "desktop" ); bool flat = ege_select_one_action_get_active( act ) == 0; if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) { @@ -1155,16 +1607,16 @@ static void sp_stb_sides_flat_state_changed( EgeSelectOneAction *act, GtkObject } // quit if run by the attr_changed listener - if (g_object_get_data(G_OBJECT(dataKludge), "freeze")) { + if (g_object_get_data( dataKludge, "freeze" )) { return; } // in turn, prevent listener from responding - g_object_set_data(G_OBJECT(dataKludge), "freeze", GINT_TO_POINTER(TRUE)); + g_object_set_data( dataKludge, "freeze", GINT_TO_POINTER(TRUE) ); Inkscape::Selection *selection = sp_desktop_selection(desktop); GSList const *items = selection->itemList(); - GtkAction* prop_action = GTK_ACTION( g_object_get_data(G_OBJECT(dataKludge), "prop_action") ); + GtkAction* prop_action = GTK_ACTION( g_object_get_data( dataKludge, "prop_action" ) ); bool modmade = false; if ( prop_action ) { @@ -1185,24 +1637,24 @@ static void sp_stb_sides_flat_state_changed( EgeSelectOneAction *act, GtkObject flat ? _("Make polygon") : _("Make star")); } - g_object_set_data(G_OBJECT(dataKludge), "freeze", GINT_TO_POINTER(FALSE)); + g_object_set_data( dataKludge, "freeze", GINT_TO_POINTER(FALSE) ); } -static void sp_stb_rounded_value_changed( GtkAdjustment *adj, GtkWidget *dataKludge ) +static void sp_stb_rounded_value_changed( GtkAdjustment *adj, GObject *dataKludge ) { - SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(dataKludge), "desktop"); + SPDesktop *desktop = (SPDesktop *) g_object_get_data( dataKludge, "desktop" ); if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) { prefs_set_double_attribute("tools.shapes.star", "rounded", (gdouble) adj->value); } // quit if run by the attr_changed listener - if (g_object_get_data(G_OBJECT(dataKludge), "freeze")) { + if (g_object_get_data( dataKludge, "freeze" )) { return; } // in turn, prevent listener from responding - g_object_set_data(G_OBJECT(dataKludge), "freeze", GINT_TO_POINTER(TRUE)); + g_object_set_data( dataKludge, "freeze", GINT_TO_POINTER(TRUE) ); bool modmade = false; @@ -1219,24 +1671,24 @@ static void sp_stb_rounded_value_changed( GtkAdjustment *adj, GtkWidget *dataKlu if (modmade) sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_STAR, _("Star: Change rounding")); - g_object_set_data(G_OBJECT(dataKludge), "freeze", GINT_TO_POINTER(FALSE)); + g_object_set_data( dataKludge, "freeze", GINT_TO_POINTER(FALSE) ); } -static void sp_stb_randomized_value_changed( GtkAdjustment *adj, GtkWidget *dataKludge ) +static void sp_stb_randomized_value_changed( GtkAdjustment *adj, GObject *dataKludge ) { - SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(dataKludge), "desktop"); + SPDesktop *desktop = (SPDesktop *) g_object_get_data( dataKludge, "desktop" ); if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) { prefs_set_double_attribute("tools.shapes.star", "randomized", (gdouble) adj->value); } // quit if run by the attr_changed listener - if (g_object_get_data(G_OBJECT(dataKludge), "freeze")) { + if (g_object_get_data( dataKludge, "freeze" )) { return; } // in turn, prevent listener from responding - g_object_set_data(G_OBJECT(dataKludge), "freeze", GINT_TO_POINTER(TRUE)); + g_object_set_data( dataKludge, "freeze", GINT_TO_POINTER(TRUE) ); bool modmade = false; @@ -1253,13 +1705,13 @@ static void sp_stb_randomized_value_changed( GtkAdjustment *adj, GtkWidget *data if (modmade) sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_STAR, _("Star: Change randomization")); - g_object_set_data(G_OBJECT(dataKludge), "freeze", GINT_TO_POINTER(FALSE)); + g_object_set_data( dataKludge, "freeze", GINT_TO_POINTER(FALSE) ); } static void star_tb_event_attr_changed(Inkscape::XML::Node *repr, gchar const *name, - gchar const *old_value, gchar const *new_value, - bool is_interactive, gpointer data) + gchar const */*old_value*/, gchar const */*new_value*/, + bool /*is_interactive*/, gpointer data) { GtkWidget *tbl = GTK_WIDGET(data); @@ -1322,11 +1774,12 @@ static Inkscape::XML::NodeEventVector star_tb_repr_events = * \param selection Should not be NULL. */ static void -sp_star_toolbox_selection_changed(Inkscape::Selection *selection, GtkObject *tbl) +sp_star_toolbox_selection_changed(Inkscape::Selection *selection, GObject *tbl) { int n_selected = 0; Inkscape::XML::Node *repr = NULL; - Inkscape::XML::Node *oldrepr = NULL; + + purge_repr_listener( tbl, tbl ); for (GSList const *items = selection->itemList(); items != NULL; @@ -1338,23 +1791,15 @@ sp_star_toolbox_selection_changed(Inkscape::Selection *selection, GtkObject *tbl } } - EgeOutputAction* act = EGE_OUTPUT_ACTION( gtk_object_get_data(GTK_OBJECT(tbl), "mode_action") ); + EgeOutputAction* act = EGE_OUTPUT_ACTION( g_object_get_data( tbl, "mode_action" ) ); if (n_selected == 0) { g_object_set( G_OBJECT(act), "label", _("New:"), NULL ); } else if (n_selected == 1) { g_object_set( G_OBJECT(act), "label", _("Change:"), NULL ); - oldrepr = (Inkscape::XML::Node *) gtk_object_get_data(GTK_OBJECT(tbl), "repr"); - if (oldrepr) { // remove old listener - sp_repr_remove_listener_by_data(oldrepr, tbl); - Inkscape::GC::release(oldrepr); - oldrepr = 0; - g_object_set_data(G_OBJECT(tbl), "repr", NULL); - } - if (repr) { - g_object_set_data(G_OBJECT(tbl), "repr", repr); + g_object_set_data( tbl, "repr", repr ); Inkscape::GC::anchor(repr); sp_repr_add_listener(repr, &star_tb_repr_events, tbl); sp_repr_synthesize_events(repr, &star_tb_repr_events, tbl); @@ -1367,7 +1812,7 @@ sp_star_toolbox_selection_changed(Inkscape::Selection *selection, GtkObject *tbl } -static void sp_stb_defaults( GtkWidget *widget, GtkWidget *dataKludge ) +static void sp_stb_defaults( GtkWidget */*widget*/, GObject *dataKludge ) { // FIXME: in this and all other _default functions, set some flag telling the value_changed // callbacks to lump all the changes for all selected objects in one undo step @@ -1381,25 +1826,25 @@ static void sp_stb_defaults( GtkWidget *widget, GtkWidget *dataKludge ) gdouble randomized = 0; gdouble rounded = 0; - EgeSelectOneAction* flat_action = EGE_SELECT_ONE_ACTION( g_object_get_data( G_OBJECT(dataKludge), "flat_action" ) ); + EgeSelectOneAction* flat_action = EGE_SELECT_ONE_ACTION( g_object_get_data( dataKludge, "flat_action" ) ); ege_select_one_action_set_active( flat_action, flat ? 0 : 1 ); - GtkAction* sb2 = GTK_ACTION( g_object_get_data(G_OBJECT(dataKludge), "prop_action") ); + GtkAction* sb2 = GTK_ACTION( g_object_get_data( dataKludge, "prop_action" ) ); gtk_action_set_sensitive( sb2, !flat ); - adj = GTK_ADJUSTMENT( gtk_object_get_data(GTK_OBJECT(dataKludge), "magnitude") ); + adj = GTK_ADJUSTMENT( g_object_get_data( dataKludge, "magnitude" ) ); gtk_adjustment_set_value(adj, mag); gtk_adjustment_value_changed(adj); - adj = GTK_ADJUSTMENT( gtk_object_get_data(GTK_OBJECT(dataKludge), "proportion") ); + adj = GTK_ADJUSTMENT( g_object_get_data( dataKludge, "proportion" ) ); gtk_adjustment_set_value(adj, prop); gtk_adjustment_value_changed(adj); - adj = GTK_ADJUSTMENT( gtk_object_get_data(GTK_OBJECT(dataKludge), "rounded") ); + adj = GTK_ADJUSTMENT( g_object_get_data( dataKludge, "rounded" ) ); gtk_adjustment_set_value(adj, rounded); gtk_adjustment_value_changed(adj); - adj = GTK_ADJUSTMENT( gtk_object_get_data(GTK_OBJECT(dataKludge), "randomized") ); + adj = GTK_ADJUSTMENT( g_object_get_data( dataKludge, "randomized" ) ); gtk_adjustment_set_value(adj, randomized); gtk_adjustment_value_changed(adj); } @@ -1418,40 +1863,16 @@ sp_toolbox_add_label(GtkWidget *tbl, gchar const *title, bool wide) } -static GtkWidget * -sp_star_toolbox_new(SPDesktop *desktop) +static void sp_star_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder) { - GtkWidget* holder = gtk_table_new( 1, 2, FALSE ); - - gchar const * descr = - "" - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - ""; - GtkActionGroup* mainActions = gtk_action_group_new("main"); - { EgeOutputAction* act = ege_output_action_new( "StarStateAction", _("New:"), "", 0 ); ege_output_action_set_use_markup( act, TRUE ); gtk_action_group_add_action( mainActions, GTK_ACTION( act ) ); - gtk_object_set_data( GTK_OBJECT(holder), "mode_action", act ); + g_object_set_data( holder, "mode_action", act ); } { - gtk_object_set_data(GTK_OBJECT(holder), "dtw", desktop->canvas); - gtk_object_set_data(GTK_OBJECT(holder), "desktop", desktop); - //EgeAdjustmentAction* calligraphy_angle = 0; EgeAdjustmentAction* eact = 0; gchar const *flatsidedstr = prefs_get_string_attribute( "tools.shapes.star", "isflatsided" ); @@ -1476,9 +1897,9 @@ sp_star_toolbox_new(SPDesktop *desktop) 2, "star_angled", -1 ); - EgeSelectOneAction* act = ege_select_one_action_new( "FlatAction", _(""), _(""), NULL, GTK_TREE_MODEL(model) ); + EgeSelectOneAction* act = ege_select_one_action_new( "FlatAction", (""), (""), NULL, GTK_TREE_MODEL(model) ); gtk_action_group_add_action( mainActions, GTK_ACTION(act) ); - gtk_object_set_data( GTK_OBJECT(holder), "flat_action", act ); + g_object_set_data( holder, "flat_action", act ); ege_select_one_action_set_appearance( act, "full" ); ege_select_one_action_set_radio_action_type( act, INK_RADIO_ACTION_TYPE ); @@ -1491,34 +1912,38 @@ sp_star_toolbox_new(SPDesktop *desktop) } /* Magnitude */ - //gchar const* labels[] = {_("tri (default)"), _("quad"), _("pent")}; - //gdouble values[] = {3, 4, 5}; + { + gchar const* labels[] = {_("triangle/tri-star"), _("square/quad-star"), _("pentagon/five-pointed star"), _("hexagon/six-pointed star"), 0, 0, 0, 0, 0}; + gdouble values[] = {3, 4, 5, 6, 7, 8, 10, 12, 20}; eact = create_adjustment_action( "MagnitudeAction", - _("Corners:"), _("Number of corners of a polygon or star"), + _("Corners"), _("Corners:"), _("Number of corners of a polygon or star"), "tools.shapes.star", "magnitude", 3, GTK_WIDGET(desktop->canvas), NULL, holder, FALSE, NULL, 3, 1024, 1, 5, - 0, 0, 0, // labels, values, G_N_ELEMENTS(labels), + labels, values, G_N_ELEMENTS(labels), sp_stb_magnitude_value_changed, 1.0, 0 ); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); gtk_action_set_sensitive( GTK_ACTION(eact), TRUE ); + } /* Spoke ratio */ - //gchar const* labels2[] = {_("(left edge up)"), _("(horizontal)"), _("(default)"), _("(right edge up)")}; - //gdouble values2[] = {-90, 0, 30, 90}; + { + gchar const* labels[] = {_("thin-ray star"), 0, _("pentagram"), _("hexagram"), _("heptagram"), _("octagram"), _("regular polygon")}; + gdouble values[] = {0.01, 0.2, 0.382, 0.577, 0.692, 0.765, 1}; eact = create_adjustment_action( "SpokeAction", - _("Spoke ratio:"), + _("Spoke ratio"), _("Spoke ratio:"), // TRANSLATORS: Tip radius of a star is the distance from the center to the farthest handle. // 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), NULL, holder, FALSE, NULL, 0.01, 1.0, 0.01, 0.1, - 0, 0, 0, // labels2, values2, G_N_ELEMENTS(labels2), + labels, values, G_N_ELEMENTS(labels), sp_stb_proportion_value_changed ); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); - g_object_set_data(G_OBJECT(holder), "prop_action", eact); + g_object_set_data( holder, "prop_action", eact ); + } if ( !isFlatSided ) { gtk_action_set_sensitive( GTK_ACTION(eact), TRUE ); @@ -1527,36 +1952,40 @@ sp_star_toolbox_new(SPDesktop *desktop) } /* Roundedness */ - //gchar const* labels3[] = {_("(left edge up)"), _("(horizontal)"), _("(default)"), _("(right edge up)")}; - //gdouble values3[] = {-90, 0, 30, 90}; + { + gchar const* labels[] = {_("stretched"), _("twisted"), _("slightly pinched"), _("NOT rounded"), _("slightly rounded"), _("visibly rounded"), _("well rounded"), _("amply rounded"), 0, _("stretched"), _("blown up")}; + gdouble values[] = {-1, -0.2, -0.03, 0, 0.05, 0.1, 0.2, 0.3, 0.5, 1, 10}; eact = create_adjustment_action( "RoundednessAction", - _("Rounded:"), _("How much rounded are the corners (0 for sharp)"), + _("Rounded"), _("Rounded:"), _("How much rounded are the corners (0 for sharp)"), "tools.shapes.star", "rounded", 0.0, GTK_WIDGET(desktop->canvas), NULL, holder, FALSE, NULL, - -100.0, 100.0, 0.01, 0.1, - 0, 0, 0, // labels3, values3, G_N_ELEMENTS(labels3), + -10.0, 10.0, 0.01, 0.1, + labels, values, G_N_ELEMENTS(labels), sp_stb_rounded_value_changed ); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); gtk_action_set_sensitive( GTK_ACTION(eact), TRUE ); + } /* Randomization */ - //gchar const* labels4[] = {_("(left edge up)"), _("(horizontal)"), _("(default)"), _("(right edge up)")}; - //gdouble values4[] = {-90, 0, 30, 90}; + { + gchar const* labels[] = {_("NOT randomized"), _("slightly irregular"), _("visibly randomized"), _("strongly randomized"), _("blown up")}; + gdouble values[] = {0, 0.01, 0.1, 0.5, 10}; eact = create_adjustment_action( "RandomizationAction", - _("Randomized:"), _("Scatter randomly the corners and angles"), + _("Randomized"), _("Randomized:"), _("Scatter randomly the corners and angles"), "tools.shapes.star", "randomized", 0.0, GTK_WIDGET(desktop->canvas), NULL, holder, FALSE, NULL, -10.0, 10.0, 0.001, 0.01, - 0, 0, 0, // labels4, values4, G_N_ELEMENTS(labels4), + labels, values, G_N_ELEMENTS(labels), sp_stb_randomized_value_changed, 0.1, 3 ); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); gtk_action_set_sensitive( GTK_ACTION(eact), TRUE ); + } } { /* Reset */ { - GtkAction* act = gtk_action_new( "ResetAction", + GtkAction* act = gtk_action_new( "StarResetAction", _("Defaults"), _("Reset shape parameters to defaults (use Inkscape Preferences > Tools to change defaults)"), GTK_STOCK_CLEAR ); @@ -1566,36 +1995,11 @@ sp_star_toolbox_new(SPDesktop *desktop) } } - - GtkUIManager* mgr = gtk_ui_manager_new(); - GError* errVal = 0; - - gtk_ui_manager_insert_action_group( mgr, mainActions, 0 ); - gtk_ui_manager_add_ui_from_string( mgr, descr, -1, &errVal ); - - GtkWidget* toolBar = gtk_ui_manager_get_widget( mgr, "/ui/StarToolbar" ); - gtk_toolbar_set_style( GTK_TOOLBAR(toolBar), GTK_TOOLBAR_ICONS ); - gtk_toolbar_set_icon_size( GTK_TOOLBAR(toolBar), GTK_ICON_SIZE_SMALL_TOOLBAR ); - - - gtk_table_attach( GTK_TABLE(holder), toolBar, 0, 1, 0, 1, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), 0, 0 ); - - Inkscape::UI::Widget::StyleSwatch *swatch = new Inkscape::UI::Widget::StyleSwatch(NULL, _("Style of new stars")); - swatch->setDesktop( desktop ); - swatch->setClickVerb( SP_VERB_CONTEXT_STAR_PREFS ); - swatch->setWatchedTool( "tools.shapes.star", true ); - GtkWidget *swatch_ = GTK_WIDGET(swatch->gobj()); - gtk_table_attach( GTK_TABLE(holder), swatch_, 1, 2, 0, 1, (GtkAttachOptions)(GTK_SHRINK | GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), AUX_BETWEEN_BUTTON_GROUPS, 0 ); - - gtk_widget_show_all(holder); - //sp_set_font_size_smaller (tbl); - sigc::connection *connection = new sigc::connection( - sp_desktop_selection(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_star_toolbox_selection_changed), (GtkObject *)holder)) + sp_desktop_selection(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_star_toolbox_selection_changed), (GObject *)holder)) ); - g_signal_connect(G_OBJECT(holder), "destroy", G_CALLBACK(delete_connection), connection); - - return holder; + g_signal_connect( holder, "destroy", G_CALLBACK(delete_connection), connection ); + g_signal_connect( holder, "destroy", G_CALLBACK(purge_repr_listener), holder ); } @@ -1603,14 +2007,13 @@ sp_star_toolbox_new(SPDesktop *desktop) //## Rect ## //######################## -static void -sp_rtb_sensitivize (GtkWidget *tbl) +static void sp_rtb_sensitivize( GObject *tbl ) { - GtkAdjustment *adj1 = GTK_ADJUSTMENT(gtk_object_get_data(GTK_OBJECT(tbl), "rx")); - GtkAdjustment *adj2 = GTK_ADJUSTMENT(gtk_object_get_data(GTK_OBJECT(tbl), "ry")); - GtkAction* not_rounded = GTK_ACTION( g_object_get_data(G_OBJECT(tbl), "not_rounded") ); + GtkAdjustment *adj1 = GTK_ADJUSTMENT( g_object_get_data(tbl, "rx") ); + GtkAdjustment *adj2 = GTK_ADJUSTMENT( g_object_get_data(tbl, "ry") ); + GtkAction* not_rounded = GTK_ACTION( g_object_get_data(tbl, "not_rounded") ); - if (adj1->value == 0 && adj2->value == 0 && gtk_object_get_data(GTK_OBJECT(tbl), "single")) { // only for a single selected rect (for now) + if (adj1->value == 0 && adj2->value == 0 && g_object_get_data(tbl, "single")) { // only for a single selected rect (for now) gtk_action_set_sensitive( not_rounded, FALSE ); } else { gtk_action_set_sensitive( not_rounded, TRUE ); @@ -1619,12 +2022,12 @@ sp_rtb_sensitivize (GtkWidget *tbl) static void -sp_rtb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_name, +sp_rtb_value_changed(GtkAdjustment *adj, GObject *tbl, gchar const *value_name, void (*setter)(SPRect *, gdouble)) { - SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop"); + SPDesktop *desktop = (SPDesktop *) g_object_get_data( tbl, "desktop" ); - UnitTracker* tracker = reinterpret_cast(gtk_object_get_data(GTK_OBJECT(tbl), "tracker")); + UnitTracker* tracker = reinterpret_cast(g_object_get_data( tbl, "tracker" )); SPUnit const *unit = tracker->getActiveUnit(); if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) { @@ -1632,12 +2035,12 @@ sp_rtb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_name } // quit if run by the attr_changed listener - if (g_object_get_data(G_OBJECT(tbl), "freeze")) { + if (g_object_get_data( tbl, "freeze" )) { return; } // in turn, prevent listener from responding - g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(TRUE)); + g_object_set_data( tbl, "freeze", GINT_TO_POINTER(TRUE)); bool modmade = false; Inkscape::Selection *selection = sp_desktop_selection(desktop); @@ -1652,39 +2055,36 @@ sp_rtb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_name } } - sp_rtb_sensitivize (tbl); + sp_rtb_sensitivize( tbl ); if (modmade) { sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_RECT, _("Change rectangle")); } - g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE)); - - // defocus spinbuttons by moving focus to the canvas, unless "stay" is on - spinbutton_defocus(GTK_OBJECT(tbl)); + g_object_set_data( tbl, "freeze", GINT_TO_POINTER(FALSE) ); } static void -sp_rtb_rx_value_changed(GtkAdjustment *adj, GtkWidget *tbl) +sp_rtb_rx_value_changed(GtkAdjustment *adj, GObject *tbl) { sp_rtb_value_changed(adj, tbl, "rx", sp_rect_set_visible_rx); } static void -sp_rtb_ry_value_changed(GtkAdjustment *adj, GtkWidget *tbl) +sp_rtb_ry_value_changed(GtkAdjustment *adj, GObject *tbl) { sp_rtb_value_changed(adj, tbl, "ry", sp_rect_set_visible_ry); } static void -sp_rtb_width_value_changed(GtkAdjustment *adj, GtkWidget *tbl) +sp_rtb_width_value_changed(GtkAdjustment *adj, GObject *tbl) { sp_rtb_value_changed(adj, tbl, "width", sp_rect_set_visible_width); } static void -sp_rtb_height_value_changed(GtkAdjustment *adj, GtkWidget *tbl) +sp_rtb_height_value_changed(GtkAdjustment *adj, GObject *tbl) { sp_rtb_value_changed(adj, tbl, "height", sp_rect_set_visible_height); } @@ -1692,71 +2092,69 @@ sp_rtb_height_value_changed(GtkAdjustment *adj, GtkWidget *tbl) static void -sp_rtb_defaults( GtkWidget *widget, GtkObject *obj) +sp_rtb_defaults( GtkWidget */*widget*/, GObject *obj) { - GtkWidget *tbl = GTK_WIDGET(obj); - GtkAdjustment *adj = 0; - adj = GTK_ADJUSTMENT( gtk_object_get_data(obj, "rx") ); + adj = GTK_ADJUSTMENT( g_object_get_data(obj, "rx") ); gtk_adjustment_set_value(adj, 0.0); // this is necessary if the previous value was 0, but we still need to run the callback to change all selected objects gtk_adjustment_value_changed(adj); - adj = GTK_ADJUSTMENT( gtk_object_get_data(obj, "ry") ); + adj = GTK_ADJUSTMENT( g_object_get_data(obj, "ry") ); gtk_adjustment_set_value(adj, 0.0); gtk_adjustment_value_changed(adj); - sp_rtb_sensitivize (tbl); + sp_rtb_sensitivize( obj ); } -static void rect_tb_event_attr_changed(Inkscape::XML::Node *repr, gchar const *name, - gchar const *old_value, gchar const *new_value, - bool is_interactive, gpointer data) +static void rect_tb_event_attr_changed(Inkscape::XML::Node */*repr*/, gchar const */*name*/, + gchar const */*old_value*/, gchar const */*new_value*/, + bool /*is_interactive*/, gpointer data) { - GtkWidget *tbl = GTK_WIDGET(data); + GObject *tbl = G_OBJECT(data); // quit if run by the _changed callbacks - if (g_object_get_data(G_OBJECT(tbl), "freeze")) { + if (g_object_get_data( tbl, "freeze" )) { return; } // in turn, prevent callbacks from responding - g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(TRUE)); + g_object_set_data( tbl, "freeze", GINT_TO_POINTER(TRUE) ); - UnitTracker* tracker = reinterpret_cast( gtk_object_get_data(GTK_OBJECT(tbl), "tracker") ); + UnitTracker* tracker = reinterpret_cast( g_object_get_data( tbl, "tracker" ) ); SPUnit const *unit = tracker->getActiveUnit(); - gpointer item = g_object_get_data(G_OBJECT(tbl), "item"); + gpointer item = g_object_get_data( tbl, "item" ); if (item && SP_IS_RECT(item)) { { - GtkAdjustment *adj = (GtkAdjustment*)gtk_object_get_data(GTK_OBJECT(tbl), "rx"); + GtkAdjustment *adj = GTK_ADJUSTMENT( g_object_get_data( tbl, "rx" ) ); gdouble rx = sp_rect_get_visible_rx(SP_RECT(item)); gtk_adjustment_set_value(adj, sp_pixels_get_units(rx, *unit)); } { - GtkAdjustment *adj = (GtkAdjustment*)gtk_object_get_data(GTK_OBJECT(tbl), "ry"); + GtkAdjustment *adj = GTK_ADJUSTMENT( g_object_get_data( tbl, "ry" ) ); gdouble ry = sp_rect_get_visible_ry(SP_RECT(item)); gtk_adjustment_set_value(adj, sp_pixels_get_units(ry, *unit)); } { - GtkAdjustment *adj = (GtkAdjustment*)gtk_object_get_data(GTK_OBJECT(tbl), "width"); + GtkAdjustment *adj = GTK_ADJUSTMENT( g_object_get_data( tbl, "width" ) ); gdouble width = sp_rect_get_visible_width (SP_RECT(item)); gtk_adjustment_set_value(adj, sp_pixels_get_units(width, *unit)); } { - GtkAdjustment *adj = (GtkAdjustment*)gtk_object_get_data(GTK_OBJECT(tbl), "height"); + GtkAdjustment *adj = GTK_ADJUSTMENT( g_object_get_data( tbl, "height" ) ); gdouble height = sp_rect_get_visible_height (SP_RECT(item)); gtk_adjustment_set_value(adj, sp_pixels_get_units(height, *unit)); } } - sp_rtb_sensitivize (tbl); + sp_rtb_sensitivize( tbl ); - g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE)); + g_object_set_data( tbl, "freeze", GINT_TO_POINTER(FALSE) ); } @@ -1772,12 +2170,16 @@ static Inkscape::XML::NodeEventVector rect_tb_repr_events = { * \param selection should not be NULL. */ static void -sp_rect_toolbox_selection_changed(Inkscape::Selection *selection, GtkObject *tbl) +sp_rect_toolbox_selection_changed(Inkscape::Selection *selection, GObject *tbl) { int n_selected = 0; Inkscape::XML::Node *repr = NULL; SPItem *item = NULL; - Inkscape::XML::Node *oldrepr = NULL; + + if ( g_object_get_data( tbl, "repr" ) ) { + g_object_set_data( tbl, "item", NULL ); + } + purge_repr_listener( tbl, tbl ); for (GSList const *items = selection->itemList(); items != NULL; @@ -1789,38 +2191,30 @@ sp_rect_toolbox_selection_changed(Inkscape::Selection *selection, GtkObject *tbl } } - EgeOutputAction* act = EGE_OUTPUT_ACTION( gtk_object_get_data(GTK_OBJECT(tbl), "mode_action") ); + EgeOutputAction* act = EGE_OUTPUT_ACTION( g_object_get_data( tbl, "mode_action" ) ); - g_object_set_data(G_OBJECT(tbl), "single", GINT_TO_POINTER(FALSE)); + g_object_set_data( tbl, "single", GINT_TO_POINTER(FALSE) ); if (n_selected == 0) { g_object_set( G_OBJECT(act), "label", _("New:"), NULL ); - GtkAction* w = GTK_ACTION( gtk_object_get_data(GTK_OBJECT(tbl), "width_action") ); + GtkAction* w = GTK_ACTION( g_object_get_data( tbl, "width_action" ) ); gtk_action_set_sensitive(w, FALSE); - GtkAction* h = GTK_ACTION( gtk_object_get_data(GTK_OBJECT(tbl), "height_action") ); + GtkAction* h = GTK_ACTION( g_object_get_data( tbl, "height_action" ) ); gtk_action_set_sensitive(h, FALSE); } else if (n_selected == 1) { g_object_set( G_OBJECT(act), "label", _("Change:"), NULL ); - g_object_set_data(G_OBJECT(tbl), "single", GINT_TO_POINTER(TRUE)); + g_object_set_data( tbl, "single", GINT_TO_POINTER(TRUE) ); - GtkAction* w = GTK_ACTION( gtk_object_get_data(GTK_OBJECT(tbl), "width_action") ); + GtkAction* w = GTK_ACTION( g_object_get_data( tbl, "width_action" ) ); gtk_action_set_sensitive(w, TRUE); - GtkAction* h = GTK_ACTION( gtk_object_get_data(GTK_OBJECT(tbl), "height_action") ); + GtkAction* h = GTK_ACTION( g_object_get_data( tbl, "height_action" ) ); gtk_action_set_sensitive(h, TRUE); - oldrepr = (Inkscape::XML::Node *) gtk_object_get_data(GTK_OBJECT(tbl), "repr"); - if (oldrepr) { // remove old listener - sp_repr_remove_listener_by_data(oldrepr, tbl); - Inkscape::GC::release(oldrepr); - oldrepr = 0; - g_object_set_data(G_OBJECT(tbl), "repr", NULL); - g_object_set_data(G_OBJECT(tbl), "item", NULL); - } if (repr) { - g_object_set_data(G_OBJECT(tbl), "repr", repr); - g_object_set_data(G_OBJECT(tbl), "item", item); + g_object_set_data( tbl, "repr", repr ); + g_object_set_data( tbl, "item", item ); Inkscape::GC::anchor(repr); sp_repr_add_listener(repr, &rect_tb_repr_events, tbl); sp_repr_synthesize_events(repr, &rect_tb_repr_events, tbl); @@ -1829,40 +2223,20 @@ sp_rect_toolbox_selection_changed(Inkscape::Selection *selection, GtkObject *tbl // FIXME: implement averaging of all parameters for multiple selected //gtk_label_set_markup(GTK_LABEL(l), _("Average:")); g_object_set( G_OBJECT(act), "label", _("Change:"), NULL ); - sp_rtb_sensitivize (GTK_WIDGET(tbl)); + sp_rtb_sensitivize( tbl ); } } -static GtkWidget * -sp_rect_toolbox_new(SPDesktop *desktop) +static void sp_rect_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder) { - GtkWidget *holder = gtk_hbox_new(FALSE, 0); - gtk_object_set_data(GTK_OBJECT(holder), "dtw", desktop->canvas); - gtk_object_set_data(GTK_OBJECT(holder), "desktop", desktop); - - gchar const * descr = - "" - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - ""; - GtkActionGroup* mainActions = gtk_action_group_new("main"); - EgeAdjustmentAction* eact = 0; { EgeOutputAction* act = ege_output_action_new( "RectStateAction", _("New:"), "", 0 ); ege_output_action_set_use_markup( act, TRUE ); gtk_action_group_add_action( mainActions, GTK_ACTION( act ) ); - gtk_object_set_data( GTK_OBJECT(holder), "mode_action", act ); + g_object_set_data( holder, "mode_action", act ); } // rx/ry units menu: create @@ -1870,46 +2244,52 @@ sp_rect_toolbox_new(SPDesktop *desktop) //tracker->addUnit( SP_UNIT_PERCENT, 0 ); // fixme: add % meaning per cent of the width/height tracker->setActiveUnit( sp_desktop_namedview(desktop)->doc_units ); - gtk_object_set_data( GTK_OBJECT(holder), "tracker", tracker ); + g_object_set_data( holder, "tracker", tracker ); /* W */ { - eact = create_adjustment_action( "WidthAction", - _("W:"), _("Width of rectangle"), + gchar const* labels[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; + gdouble values[] = {1, 2, 3, 5, 10, 20, 50, 100, 200, 500}; + eact = create_adjustment_action( "RectWidthAction", + _("Width"), _("W:"), _("Width of rectangle"), "tools.shapes.rect", "width", 0, GTK_WIDGET(desktop->canvas), NULL/*us*/, holder, TRUE, "altx-rect", 0, 1e6, SPIN_STEP, SPIN_PAGE_STEP, - 0, 0, 0, + labels, values, G_N_ELEMENTS(labels), sp_rtb_width_value_changed ); tracker->addAdjustment( ege_adjustment_action_get_adjustment(eact) ); - gtk_object_set_data( GTK_OBJECT(holder), "width_action", eact ); + g_object_set_data( holder, "width_action", eact ); gtk_action_set_sensitive( GTK_ACTION(eact), FALSE ); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); } /* H */ { - eact = create_adjustment_action( "HeightAction", - _("H:"), _("Height of rectangle"), + gchar const* labels[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; + gdouble values[] = {1, 2, 3, 5, 10, 20, 50, 100, 200, 500}; + eact = create_adjustment_action( "RectHeightAction", + _("Height"), _("H:"), _("Height of rectangle"), "tools.shapes.rect", "height", 0, GTK_WIDGET(desktop->canvas), NULL/*us*/, holder, FALSE, NULL, 0, 1e6, SPIN_STEP, SPIN_PAGE_STEP, - 0, 0, 0, + labels, values, G_N_ELEMENTS(labels), sp_rtb_height_value_changed ); tracker->addAdjustment( ege_adjustment_action_get_adjustment(eact) ); - gtk_object_set_data( GTK_OBJECT(holder), "height_action", eact ); + g_object_set_data( holder, "height_action", eact ); gtk_action_set_sensitive( GTK_ACTION(eact), FALSE ); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); } /* rx */ { + gchar const* labels[] = {_("not rounded"), 0, 0, 0, 0, 0, 0, 0, 0}; + gdouble values[] = {0.5, 1, 2, 3, 5, 10, 20, 50, 100}; eact = create_adjustment_action( "RadiusXAction", - _("Rx:"), _("Horizontal radius of rounded corners"), + _("Horizontal radius"), _("Rx:"), _("Horizontal radius of rounded corners"), "tools.shapes.rect", "rx", 0, GTK_WIDGET(desktop->canvas), NULL/*us*/, holder, FALSE, NULL, 0, 1e6, SPIN_STEP, SPIN_PAGE_STEP, - 0, 0, 0, + labels, values, G_N_ELEMENTS(labels), sp_rtb_rx_value_changed); tracker->addAdjustment( ege_adjustment_action_get_adjustment(eact) ); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); @@ -1917,12 +2297,14 @@ sp_rect_toolbox_new(SPDesktop *desktop) /* ry */ { + gchar const* labels[] = {_("not rounded"), 0, 0, 0, 0, 0, 0, 0, 0}; + gdouble values[] = {0.5, 1, 2, 3, 5, 10, 20, 50, 100}; eact = create_adjustment_action( "RadiusYAction", - _("Ry:"), _("Vertical radius of rounded corners"), + _("Vertical radius"), _("Ry:"), _("Vertical radius of rounded corners"), "tools.shapes.rect", "ry", 0, GTK_WIDGET(desktop->canvas), NULL/*us*/, holder, FALSE, NULL, 0, 1e6, SPIN_STEP, SPIN_PAGE_STEP, - 0, 0, 0, + labels, values, G_N_ELEMENTS(labels), sp_rtb_ry_value_changed); tracker->addAdjustment( ege_adjustment_action_get_adjustment(eact) ); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); @@ -1930,7 +2312,7 @@ sp_rect_toolbox_new(SPDesktop *desktop) // add the units menu { - GtkAction* act = tracker->createAction( "RectUnitsAction", _("Units"), _("") ); + GtkAction* act = tracker->createAction( "RectUnitsAction", _("Units"), ("") ); gtk_action_group_add_action( mainActions, act ); } @@ -1944,43 +2326,297 @@ sp_rect_toolbox_new(SPDesktop *desktop) g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_rtb_defaults), holder ); gtk_action_group_add_action( mainActions, GTK_ACTION(inky) ); gtk_action_set_sensitive( GTK_ACTION(inky), TRUE ); - gtk_object_set_data( GTK_OBJECT(holder), "not_rounded", inky ); + g_object_set_data( holder, "not_rounded", inky ); } - Inkscape::UI::Widget::StyleSwatch *swatch = new Inkscape::UI::Widget::StyleSwatch(NULL, _("Style of new rectangles")); - swatch->setDesktop (desktop); - swatch->setClickVerb (SP_VERB_CONTEXT_RECT_PREFS); - swatch->setWatchedTool ("tools.shapes.rect", true); - GtkWidget *swatch_ = GTK_WIDGET(swatch->gobj()); - gtk_box_pack_end(GTK_BOX(holder), swatch_, FALSE, FALSE, 0); + g_object_set_data( holder, "single", GINT_TO_POINTER(TRUE) ); + sp_rtb_sensitivize( holder ); - g_object_set_data(G_OBJECT(holder), "single", GINT_TO_POINTER(TRUE)); - sp_rtb_sensitivize (holder); + sigc::connection *connection = new sigc::connection( + sp_desktop_selection(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_rect_toolbox_selection_changed), (GObject *)holder)) + ); + g_signal_connect( holder, "destroy", G_CALLBACK(delete_connection), connection ); + g_signal_connect( holder, "destroy", G_CALLBACK(purge_repr_listener), holder ); +} +//######################## +//## 3D Box ## +//######################## - GtkUIManager* mgr = gtk_ui_manager_new(); - GError* errVal = 0; +static void sp_3dbox_toggle_vp_changed (GtkToggleAction */*act*/, GObject *dataKludge, Box3D::Axis axis) +{ + SPDesktop *desktop = (SPDesktop *) g_object_get_data (dataKludge, "desktop"); + SPDocument *document = sp_desktop_document (desktop); + Box3D::Perspective3D *persp = document->current_perspective; - gtk_ui_manager_insert_action_group( mgr, mainActions, 0 ); - gtk_ui_manager_add_ui_from_string( mgr, descr, -1, &errVal ); + g_return_if_fail (is_single_axis_direction (axis)); + g_return_if_fail (persp); + + persp->toggle_boxes (axis); + + gchar *str; + switch (axis) { + case Box3D::X: + str = g_strdup ("box3d_angle_x_action"); + break; + case Box3D::Y: + str = g_strdup ("box3d_angle_y_action"); + break; + case Box3D::Z: + str = g_strdup ("box3d_angle_z_action"); + break; + default: + return; + } + GtkAction* angle_action = GTK_ACTION (g_object_get_data (dataKludge, str)); + if (angle_action) { + gtk_action_set_sensitive (angle_action, !persp->get_vanishing_point (axis)->is_finite() ); + } + + // FIXME: Given how it is realized in the other tools, this is probably not the right way to do it, + // but without the if construct, we get continuous segfaults. Needs further investigation. + if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) { + sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_3DBOX, + _("3D Box: Change perspective")); + } +} - GtkWidget* toolBar = gtk_ui_manager_get_widget( mgr, "/ui/RectToolbar" ); - gtk_toolbar_set_style( GTK_TOOLBAR(toolBar), GTK_TOOLBAR_ICONS ); - gtk_toolbar_set_icon_size( GTK_TOOLBAR(toolBar), GTK_ICON_SIZE_SMALL_TOOLBAR ); +static void sp_3dbox_toggle_vp_x_changed(GtkToggleAction *act, GObject *dataKludge) +{ + sp_3dbox_toggle_vp_changed (act, dataKludge, Box3D::X); +} +static void sp_3dbox_toggle_vp_y_changed(GtkToggleAction *act, GObject *dataKludge) +{ + sp_3dbox_toggle_vp_changed (act, dataKludge, Box3D::Y); +} - gtk_box_pack_start( GTK_BOX(holder), toolBar, TRUE, TRUE, 0 ); +static void sp_3dbox_toggle_vp_z_changed(GtkToggleAction *act, GObject *dataKludge) +{ + sp_3dbox_toggle_vp_changed (act, dataKludge, Box3D::Z); +} +static void sp_3dbox_vp_angle_changed(GtkAdjustment *adj, GObject *dataKludge, Box3D::Axis axis ) +{ + SPDesktop *desktop = (SPDesktop *) g_object_get_data(dataKludge, "desktop"); + Box3D::Perspective3D *persp = sp_desktop_document (desktop)->current_perspective; - gtk_widget_show_all(holder); - sp_set_font_size_smaller(holder); + if (persp) { + double angle = adj->value * M_PI/180; + persp->set_infinite_direction (axis, NR::Point (cos (angle), sin (angle))); - sigc::connection *connection = new sigc::connection( - sp_desktop_selection(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_rect_toolbox_selection_changed), (GtkObject *)holder)) - ); - g_signal_connect(G_OBJECT(holder), "destroy", G_CALLBACK(delete_connection), connection); + // FIXME: See comment above; without the if construct we get segfaults during undo. + if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) { + sp_document_maybe_done(sp_desktop_document(desktop), "perspectiveangle", SP_VERB_CONTEXT_3DBOX, + _("3D Box: Change perspective")); + } + } + //g_object_set_data(G_OBJECT(dataKludge), "freeze", GINT_TO_POINTER(FALSE)); +} + +static void sp_3dbox_vpx_angle_changed(GtkAdjustment *adj, GObject *dataKludge ) +{ + sp_3dbox_vp_angle_changed (adj, dataKludge, Box3D::X); +} + +static void sp_3dbox_vpy_angle_changed(GtkAdjustment *adj, GObject *dataKludge ) +{ + sp_3dbox_vp_angle_changed (adj, dataKludge, Box3D::Y); +} + +static void sp_3dbox_vpz_angle_changed(GtkAdjustment *adj, GObject *dataKludge ) +{ + sp_3dbox_vp_angle_changed (adj, dataKludge, Box3D::Z); +} + +// normalize angle so that it lies in the interval [0,360] +static double sp_3dbox_normalize_angle (double a) { + double angle = a + ((int) (a/360.0))*360; + if (angle < 0) { + angle += 360.0; + } + return angle; +} + +static void sp_3dbox_tb_event_attr_changed(Inkscape::XML::Node */*repr*/, gchar const *name, + gchar const */*old_value*/, gchar const */*new_value*/, + bool /*is_interactive*/, gpointer data) +{ + GtkWidget *tbl = GTK_WIDGET(data); + + // FIXME: if we check for "freeze" as in other tools, no action is performed at all ... + /*** + // quit if run by the _changed callbacks + if (g_object_get_data(G_OBJECT(tbl), "freeze")) { + return; + } - return holder; + // in turn, prevent callbacks from responding + g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(TRUE)); + ***/ + + if (!strcmp(name, "inkscape:perspective")) { + GtkAdjustment *adj = 0; + double angle; + SPDesktop *desktop = (SPDesktop *) g_object_get_data(G_OBJECT(tbl), "desktop"); + Box3D::Perspective3D *persp = sp_desktop_document (desktop)->current_perspective; + + adj = GTK_ADJUSTMENT(gtk_object_get_data(GTK_OBJECT(tbl), "dir_vp_x")); + angle = sp_3dbox_normalize_angle (persp->get_vanishing_point (Box3D::X)->get_angle()); + gtk_adjustment_set_value(adj, angle); + + adj = GTK_ADJUSTMENT(gtk_object_get_data(GTK_OBJECT(tbl), "dir_vp_y")); + angle = sp_3dbox_normalize_angle (persp->get_vanishing_point (Box3D::Y)->get_angle()); + gtk_adjustment_set_value(adj, angle); + + adj = GTK_ADJUSTMENT(gtk_object_get_data(GTK_OBJECT(tbl), "dir_vp_z")); + angle = sp_3dbox_normalize_angle (persp->get_vanishing_point (Box3D::Z)->get_angle()); + gtk_adjustment_set_value(adj, angle); + } +} + +static Inkscape::XML::NodeEventVector sp_3dbox_tb_repr_events = +{ + NULL, /* child_added */ + NULL, /* child_removed */ + sp_3dbox_tb_event_attr_changed, + NULL, /* content_changed */ + NULL /* order_changed */ +}; + +/** + * \param selection Should not be NULL. + */ +static void +sp_3dbox_toolbox_selection_changed(Inkscape::Selection *selection, GObject *tbl) +{ + Inkscape::XML::Node *repr = NULL; + purge_repr_listener(tbl, tbl); + + SPItem *item = selection->singleItem(); + if (item) { + repr = SP_OBJECT_REPR(item); + if (repr) { + g_object_set_data(tbl, "repr", repr); + Inkscape::GC::anchor(repr); + sp_repr_add_listener(repr, &sp_3dbox_tb_repr_events, tbl); + sp_repr_synthesize_events(repr, &sp_3dbox_tb_repr_events, tbl); + } + } +} + +static void sp_3dbox_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder) +{ + EgeAdjustmentAction* eact = 0; + SPDocument *document = sp_desktop_document (desktop); + Box3D::Perspective3D *persp = document->current_perspective; + bool toggled = false; + + /* angle of VP in X direction */ + eact = create_adjustment_action("3DBoxPosAngleXAction", + _("Angle X"), _("Angle X:"), _("Angle of infinite vanishing point in X direction"), + "tools.shapes.3dbox", "dir_vp_x", persp->get_vanishing_point (Box3D::X)->get_angle(), + GTK_WIDGET(desktop->canvas), NULL, holder, FALSE, NULL, + 0.0, 360.0, 1.0, 10.0, + 0, 0, 0, // labels, values, G_N_ELEMENTS(labels), + sp_3dbox_vpx_angle_changed, + 0.1, 1); + gtk_action_group_add_action(mainActions, GTK_ACTION(eact)); + g_object_set_data(holder, "box3d_angle_x_action", eact); + if (!persp->get_vanishing_point (Box3D::X)->is_finite()) { + gtk_action_set_sensitive(GTK_ACTION(eact), TRUE); + } else { + gtk_action_set_sensitive(GTK_ACTION(eact), FALSE); + } + + /* toggle VP in X direction */ + { + InkToggleAction* act = ink_toggle_action_new("3DBoxVPXAction", + _("Toggle VP in X direction"), + _("Toggle VP in X direction between 'finite' and 'infinite' (=parallel)"), + "toggle_vp_x", + Inkscape::ICON_SIZE_DECORATION); + gtk_action_group_add_action(mainActions, GTK_ACTION(act)); + if (persp) { + toggled = !persp->get_vanishing_point(Box3D::X)->is_finite(); + } + gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(act), toggled); + /* we connect the signal after setting the state to avoid switching the state again */ + g_signal_connect_after(G_OBJECT(act), "toggled", G_CALLBACK(sp_3dbox_toggle_vp_x_changed), holder); + } + + /* angle of VP in Y direction */ + eact = create_adjustment_action("3DBoxPosAngleYAction", + _("Angle Y"), _("Angle Y:"), _("Angle of infinite vanishing point in Y direction"), + "tools.shapes.3dbox", "dir_vp_y", persp->get_vanishing_point (Box3D::Y)->get_angle(), + GTK_WIDGET(desktop->canvas), NULL, holder, FALSE, NULL, + 0.0, 360.0, 1.0, 10.0, + 0, 0, 0, // labels, values, G_N_ELEMENTS(labels), + sp_3dbox_vpy_angle_changed, + 0.1, 1); + gtk_action_group_add_action(mainActions, GTK_ACTION(eact)); + g_object_set_data(holder, "box3d_angle_y_action", eact); + if (!persp->get_vanishing_point (Box3D::Y)->is_finite()) { + gtk_action_set_sensitive(GTK_ACTION(eact), TRUE); + } else { + gtk_action_set_sensitive(GTK_ACTION(eact), FALSE); + } + + /* toggle VP in Y direction */ + { + InkToggleAction* act = ink_toggle_action_new("3DBoxVPYAction", + _("Toggle VP in Y direction"), + _("Toggle VP in Y direction between 'finite' and 'infinite' (=parallel)"), + "toggle_vp_y", + Inkscape::ICON_SIZE_DECORATION); + gtk_action_group_add_action(mainActions, GTK_ACTION(act)); + if (persp) { + toggled = !persp->get_vanishing_point(Box3D::Y)->is_finite(); + } + gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(act), toggled); + /* we connect the signal after setting the state to avoid switching the state again */ + g_signal_connect_after(G_OBJECT(act), "toggled", G_CALLBACK(sp_3dbox_toggle_vp_y_changed), holder); + } + + /* angle of VP in Z direction */ + eact = create_adjustment_action("3DBoxPosAngleZAction", + _("Angle Z"), _("Angle Z:"), _("Angle of infinite vanishing point in Z direction"), + "tools.shapes.3dbox", "dir_vp_z", persp->get_vanishing_point (Box3D::Z)->get_angle(), + GTK_WIDGET(desktop->canvas), NULL, holder, FALSE, NULL, + 0.0, 360.0, 1.0, 10.0, + 0, 0, 0, // labels, values, G_N_ELEMENTS(labels), + sp_3dbox_vpz_angle_changed, + 0.1, 1); + + gtk_action_group_add_action(mainActions, GTK_ACTION(eact)); + g_object_set_data(holder, "box3d_angle_z_action", eact); + if (!persp->get_vanishing_point (Box3D::Z)->is_finite()) { + gtk_action_set_sensitive(GTK_ACTION(eact), TRUE); + } else { + gtk_action_set_sensitive(GTK_ACTION(eact), FALSE); + } + + /* toggle VP in Z direction */ + { + InkToggleAction* act = ink_toggle_action_new("3DBoxVPZAction", + _("Toggle VP in Z direction"), + _("Toggle VP in Z direction between 'finite' and 'infinite' (=parallel)"), + "toggle_vp_z", + Inkscape::ICON_SIZE_DECORATION); + gtk_action_group_add_action(mainActions, GTK_ACTION(act)); + if (persp) { + toggled = !persp->get_vanishing_point(Box3D::Z)->is_finite(); + } + /* we connect the signal after setting the state to avoid switching the state again */ + gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(act), toggled); + g_signal_connect_after(G_OBJECT(act), "toggled", G_CALLBACK(sp_3dbox_toggle_vp_z_changed), holder); + } + + sigc::connection *connection = new sigc::connection( + sp_desktop_selection(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_3dbox_toolbox_selection_changed), (GObject *)holder)) + ); + g_signal_connect(holder, "destroy", G_CALLBACK(delete_connection), connection); + g_signal_connect(holder, "destroy", G_CALLBACK(purge_repr_listener), holder); } //######################## @@ -1988,21 +2624,21 @@ sp_rect_toolbox_new(SPDesktop *desktop) //######################## static void -sp_spl_tb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_name) +sp_spl_tb_value_changed(GtkAdjustment *adj, GObject *tbl, gchar const *value_name) { - SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop"); + SPDesktop *desktop = (SPDesktop *) g_object_get_data( tbl, "desktop" ); if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) { prefs_set_double_attribute("tools.shapes.spiral", value_name, adj->value); } // quit if run by the attr_changed listener - if (g_object_get_data(G_OBJECT(tbl), "freeze")) { + if (g_object_get_data( tbl, "freeze" )) { return; } // in turn, prevent listener from responding - g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(TRUE)); + g_object_set_data( tbl, "freeze", GINT_TO_POINTER(TRUE) ); gchar* namespaced_name = g_strconcat("sodipodi:", value_name, NULL); @@ -2026,31 +2662,29 @@ sp_spl_tb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_n _("Change spiral")); } - g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE)); - - spinbutton_defocus(GTK_OBJECT(tbl)); + g_object_set_data( tbl, "freeze", GINT_TO_POINTER(FALSE) ); } static void -sp_spl_tb_revolution_value_changed(GtkAdjustment *adj, GtkWidget *tbl) +sp_spl_tb_revolution_value_changed(GtkAdjustment *adj, GObject *tbl) { sp_spl_tb_value_changed(adj, tbl, "revolution"); } static void -sp_spl_tb_expansion_value_changed(GtkAdjustment *adj, GtkWidget *tbl) +sp_spl_tb_expansion_value_changed(GtkAdjustment *adj, GObject *tbl) { sp_spl_tb_value_changed(adj, tbl, "expansion"); } static void -sp_spl_tb_t0_value_changed(GtkAdjustment *adj, GtkWidget *tbl) +sp_spl_tb_t0_value_changed(GtkAdjustment *adj, GObject *tbl) { sp_spl_tb_value_changed(adj, tbl, "t0"); } static void -sp_spl_tb_defaults(GtkWidget *widget, GtkObject *obj) +sp_spl_tb_defaults(GtkWidget */*widget*/, GtkObject *obj) { GtkWidget *tbl = GTK_WIDGET(obj); @@ -2077,9 +2711,9 @@ sp_spl_tb_defaults(GtkWidget *widget, GtkObject *obj) } -static void spiral_tb_event_attr_changed(Inkscape::XML::Node *repr, gchar const *name, - gchar const *old_value, gchar const *new_value, - bool is_interactive, gpointer data) +static void spiral_tb_event_attr_changed(Inkscape::XML::Node *repr, gchar const */*name*/, + gchar const */*old_value*/, gchar const */*new_value*/, + bool /*is_interactive*/, gpointer data) { GtkWidget *tbl = GTK_WIDGET(data); @@ -2114,11 +2748,12 @@ static Inkscape::XML::NodeEventVector spiral_tb_repr_events = { }; static void -sp_spiral_toolbox_selection_changed(Inkscape::Selection *selection, GtkObject *tbl) +sp_spiral_toolbox_selection_changed(Inkscape::Selection *selection, GObject *tbl) { int n_selected = 0; Inkscape::XML::Node *repr = NULL; - Inkscape::XML::Node *oldrepr = NULL; + + purge_repr_listener( tbl, tbl ); for (GSList const *items = selection->itemList(); items != NULL; @@ -2130,23 +2765,15 @@ sp_spiral_toolbox_selection_changed(Inkscape::Selection *selection, GtkObject *t } } - GtkWidget *l = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(tbl), "mode_label")); + EgeOutputAction* act = EGE_OUTPUT_ACTION( g_object_get_data( tbl, "mode_action" ) ); if (n_selected == 0) { - gtk_label_set_markup(GTK_LABEL(l), _("New:")); + g_object_set( G_OBJECT(act), "label", _("New:"), NULL ); } else if (n_selected == 1) { - gtk_label_set_markup(GTK_LABEL(l), _("Change:")); - - oldrepr = (Inkscape::XML::Node *) gtk_object_get_data(GTK_OBJECT(tbl), "repr"); - if (oldrepr) { // remove old listener - sp_repr_remove_listener_by_data(oldrepr, tbl); - Inkscape::GC::release(oldrepr); - oldrepr = 0; - g_object_set_data(G_OBJECT(tbl), "repr", NULL); - } + g_object_set( G_OBJECT(act), "label", _("Change:"), NULL ); if (repr) { - g_object_set_data(G_OBJECT(tbl), "repr", repr); + g_object_set_data( tbl, "repr", repr ); Inkscape::GC::anchor(repr); sp_repr_add_listener(repr, &spiral_tb_repr_events, tbl); sp_repr_synthesize_events(repr, &spiral_tb_repr_events, tbl); @@ -2154,81 +2781,81 @@ sp_spiral_toolbox_selection_changed(Inkscape::Selection *selection, GtkObject *t } else { // FIXME: implement averaging of all parameters for multiple selected //gtk_label_set_markup(GTK_LABEL(l), _("Average:")); - gtk_label_set_markup(GTK_LABEL(l), _("Change:")); + g_object_set( G_OBJECT(act), "label", _("Change:"), NULL ); } } -static GtkWidget * -sp_spiral_toolbox_new(SPDesktop *desktop) +static void sp_spiral_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder) { - GtkWidget *tbl = gtk_hbox_new(FALSE, 0); - gtk_object_set_data(GTK_OBJECT(tbl), "dtw", desktop->canvas); - gtk_object_set_data(GTK_OBJECT(tbl), "desktop", desktop); - - GtkTooltips *tt = gtk_tooltips_new(); + EgeAdjustmentAction* eact = 0; - sp_toolbox_add_label(tbl, _("New:")); + { + EgeOutputAction* act = ege_output_action_new( "SpiralStateAction", _("New:"), "", 0 ); + ege_output_action_set_use_markup( act, TRUE ); + gtk_action_group_add_action( mainActions, GTK_ACTION( act ) ); + g_object_set_data( holder, "mode_action", act ); + } /* Revolution */ { - GtkWidget *hb = sp_tb_spinbutton(_("Turns:"), _("Number of revolutions"), + gchar const* labels[] = {_("just a curve"), 0, _("one full revolution"), 0, 0, 0, 0, 0, 0}; + gdouble values[] = {0.01, 0.5, 1, 2, 3, 5, 10, 20, 50, 100}; + eact = create_adjustment_action( "SpiralRevolutionAction", + _("Number of turns"), _("Turns:"), _("Number of revolutions"), "tools.shapes.spiral", "revolution", 3.0, - NULL, tbl, TRUE, "altx-spiral", + GTK_WIDGET(desktop->canvas), NULL, holder, TRUE, "altx-spiral", 0.01, 1024.0, 0.1, 1.0, + labels, values, G_N_ELEMENTS(labels), sp_spl_tb_revolution_value_changed, 1, 2); - gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, AUX_SPACING); + gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); } /* Expansion */ { - GtkWidget *hb = sp_tb_spinbutton(_("Divergence:"), _("How much denser/sparser are outer revolutions; 1 = uniform"), + gchar const* labels[] = {_("circle"), _("edge is much denser"), _("edge is denser"), _("even"), _("center is denser"), _("center is much denser"), 0}; + gdouble values[] = {0, 0.1, 0.5, 1, 1.5, 5, 20}; + eact = create_adjustment_action( "SpiralExpansionAction", + _("Divergence"), _("Divergence:"), _("How much denser/sparser are outer revolutions; 1 = uniform"), "tools.shapes.spiral", "expansion", 1.0, - NULL, tbl, FALSE, NULL, + GTK_WIDGET(desktop->canvas), NULL, holder, FALSE, NULL, 0.0, 1000.0, 0.01, 1.0, + labels, values, G_N_ELEMENTS(labels), sp_spl_tb_expansion_value_changed); - gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, AUX_SPACING); + gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); } /* T0 */ { - GtkWidget *hb = sp_tb_spinbutton(_("Inner radius:"), _("Radius of the innermost revolution (relative to the spiral size)"), + gchar const* labels[] = {_("starts from center"), _("starts mid-way"), _("starts near edge")}; + gdouble values[] = {0, 0.5, 0.9}; + 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, - NULL, tbl, FALSE, NULL, + GTK_WIDGET(desktop->canvas), NULL, holder, FALSE, NULL, 0.0, 0.999, 0.01, 1.0, + labels, values, G_N_ELEMENTS(labels), sp_spl_tb_t0_value_changed); - gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, AUX_SPACING); + gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); } - aux_toolbox_space(tbl, AUX_SPACING); - /* Reset */ { - GtkWidget *hb = gtk_hbox_new(FALSE, 1); - GtkWidget *b = gtk_button_new_with_label(_("Defaults")); - gtk_tooltips_set_tip(tt, b, _("Reset shape parameters to defaults (use Inkscape Preferences > Tools to change defaults)"), NULL); - gtk_widget_show(b); - gtk_container_add(GTK_CONTAINER(hb), b); - gtk_signal_connect(GTK_OBJECT(b), "clicked", GTK_SIGNAL_FUNC(sp_spl_tb_defaults), tbl); - gtk_box_pack_start(GTK_BOX(tbl),hb, FALSE, FALSE, AUX_BETWEEN_BUTTON_GROUPS); - } - - Inkscape::UI::Widget::StyleSwatch *swatch = new Inkscape::UI::Widget::StyleSwatch(NULL, _("Style of new spirals")); - swatch->setDesktop (desktop); - swatch->setClickVerb (SP_VERB_CONTEXT_SPIRAL_PREFS); - swatch->setWatchedTool ("tools.shapes.spiral", true); - GtkWidget *swatch_ = GTK_WIDGET(swatch->gobj()); - gtk_box_pack_end(GTK_BOX(tbl), swatch_, FALSE, FALSE, 0); + InkAction* inky = ink_action_new( "SpiralResetAction", + _("Defaults"), + _("Reset shape parameters to defaults (use Inkscape Preferences > Tools to change defaults)"), + GTK_STOCK_CLEAR, + Inkscape::ICON_SIZE_SMALL_TOOLBAR ); + g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_spl_tb_defaults), holder ); + gtk_action_group_add_action( mainActions, GTK_ACTION(inky) ); + } - gtk_widget_show_all(tbl); - sp_set_font_size_smaller (tbl); sigc::connection *connection = new sigc::connection( - sp_desktop_selection(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_spiral_toolbox_selection_changed), (GtkObject *)tbl)) + sp_desktop_selection(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_spiral_toolbox_selection_changed), (GObject *)holder)) ); - g_signal_connect(G_OBJECT(tbl), "destroy", G_CALLBACK(delete_connection), connection); - - return tbl; + g_signal_connect( holder, "destroy", G_CALLBACK(delete_connection), connection ); + g_signal_connect( holder, "destroy", G_CALLBACK(purge_repr_listener), holder ); } //######################## @@ -2236,44 +2863,296 @@ sp_spiral_toolbox_new(SPDesktop *desktop) //######################## -static GtkWidget * -sp_pen_toolbox_new(SPDesktop *desktop) +static void sp_pen_toolbox_prep(SPDesktop */*desktop*/, GtkActionGroup* /*mainActions*/, GObject* /*holder*/) { - GtkWidget *tbl = gtk_hbox_new(FALSE, 0); - gtk_object_set_data(GTK_OBJECT(tbl), "dtw", desktop->canvas); - gtk_object_set_data(GTK_OBJECT(tbl), "desktop", desktop); + // Put stuff here +} - Inkscape::UI::Widget::StyleSwatch *swatch = new Inkscape::UI::Widget::StyleSwatch(NULL, _("Style of new paths created by Pen")); - swatch->setDesktop (desktop); - swatch->setClickVerb (SP_VERB_CONTEXT_PEN_PREFS); - swatch->setWatchedTool ("tools.freehand.pen", true); - GtkWidget *swatch_ = GTK_WIDGET(swatch->gobj()); - gtk_box_pack_end(GTK_BOX(tbl), swatch_, FALSE, FALSE, 0); +static void sp_pencil_toolbox_prep(SPDesktop */*desktop*/, GtkActionGroup* /*mainActions*/, GObject* /*holder*/) +{ + // Put stuff here +} - gtk_widget_show_all(tbl); - sp_set_font_size_smaller (tbl); +//######################## +//## Tweak ## +//######################## - return tbl; +static void sp_tweak_width_value_changed( GtkAdjustment *adj, GObject */*tbl*/ ) +{ + prefs_set_double_attribute( "tools.tweak", "width", adj->value * 0.01 ); } -static GtkWidget * -sp_pencil_toolbox_new(SPDesktop *desktop) +static void sp_tweak_force_value_changed( GtkAdjustment *adj, GObject */*tbl*/ ) { - GtkWidget *tbl = gtk_hbox_new(FALSE, 0); - gtk_object_set_data(GTK_OBJECT(tbl), "dtw", desktop->canvas); - gtk_object_set_data(GTK_OBJECT(tbl), "desktop", desktop); + prefs_set_double_attribute( "tools.tweak", "force", adj->value * 0.01 ); +} + +static void sp_tweak_pressure_state_changed( GtkToggleAction *act, gpointer /*data*/ ) +{ + prefs_set_int_attribute( "tools.tweak", "usepressure", gtk_toggle_action_get_active( act ) ? 1 : 0); +} - Inkscape::UI::Widget::StyleSwatch *swatch = new Inkscape::UI::Widget::StyleSwatch(NULL, _("Style of new paths created by Pencil")); - swatch->setDesktop (desktop); - swatch->setClickVerb (SP_VERB_CONTEXT_PENCIL_PREFS); - swatch->setWatchedTool ("tools.freehand.pencil", true); - GtkWidget *swatch_ = GTK_WIDGET(swatch->gobj()); - gtk_box_pack_end(GTK_BOX(tbl), swatch_, FALSE, FALSE, 0); +static void sp_tweak_mode_changed( EgeSelectOneAction *act, GObject *tbl ) +{ + int mode = ege_select_one_action_get_active( act ); + prefs_set_int_attribute("tools.tweak", "mode", mode); - gtk_widget_show_all(tbl); - sp_set_font_size_smaller (tbl); + GtkAction *doh = GTK_ACTION(g_object_get_data( tbl, "tweak_doh")); + GtkAction *dos = GTK_ACTION(g_object_get_data( tbl, "tweak_dos")); + GtkAction *dol = GTK_ACTION(g_object_get_data( tbl, "tweak_dol")); + GtkAction *doo = GTK_ACTION(g_object_get_data( tbl, "tweak_doo")); + GtkAction *fid = GTK_ACTION(g_object_get_data( tbl, "tweak_fidelity")); + GtkAction *dolabel = GTK_ACTION(g_object_get_data( tbl, "tweak_channels_label")); + if (mode == TWEAK_MODE_COLORPAINT || mode == TWEAK_MODE_COLORJITTER) { + if (doh) gtk_action_set_sensitive (doh, TRUE); + if (dos) gtk_action_set_sensitive (dos, TRUE); + if (dol) gtk_action_set_sensitive (dol, TRUE); + if (doo) gtk_action_set_sensitive (doo, TRUE); + if (dolabel) gtk_action_set_sensitive (dolabel, TRUE); + if (fid) gtk_action_set_sensitive (fid, FALSE); + } else { + if (doh) gtk_action_set_sensitive (doh, FALSE); + if (dos) gtk_action_set_sensitive (dos, FALSE); + if (dol) gtk_action_set_sensitive (dol, FALSE); + if (doo) gtk_action_set_sensitive (doo, FALSE); + if (dolabel) gtk_action_set_sensitive (dolabel, FALSE); + if (fid) gtk_action_set_sensitive (fid, TRUE); + } +} + +static void sp_tweak_fidelity_value_changed( GtkAdjustment *adj, GObject */*tbl*/ ) +{ + prefs_set_double_attribute( "tools.tweak", "fidelity", adj->value * 0.01 ); +} + +static void tweak_toggle_doh (GtkToggleAction *act, gpointer /*data*/) { + bool show = gtk_toggle_action_get_active( act ); + prefs_set_int_attribute ("tools.tweak", "doh", show ? 1 : 0); +} +static void tweak_toggle_dos (GtkToggleAction *act, gpointer /*data*/) { + bool show = gtk_toggle_action_get_active( act ); + prefs_set_int_attribute ("tools.tweak", "dos", show ? 1 : 0); +} +static void tweak_toggle_dol (GtkToggleAction *act, gpointer /*data*/) { + bool show = gtk_toggle_action_get_active( act ); + prefs_set_int_attribute ("tools.tweak", "dol", show ? 1 : 0); +} +static void tweak_toggle_doo (GtkToggleAction *act, gpointer /*data*/) { + bool show = gtk_toggle_action_get_active( act ); + prefs_set_int_attribute ("tools.tweak", "doo", show ? 1 : 0); +} + +static void sp_tweak_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder) +{ + { + /* Width */ + gchar const* labels[] = {_("(pinch tweak)"), 0, 0, 0, _("(default)"), 0, 0, 0, 0, _("(broad tweak)")}; + gdouble values[] = {1, 3, 5, 10, 15, 20, 30, 50, 75, 100}; + 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), NULL, holder, TRUE, "altx-tweak", + 1, 100, 1.0, 10.0, + labels, values, G_N_ELEMENTS(labels), + sp_tweak_width_value_changed, 0.01, 0, 100 ); + gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); + gtk_action_set_sensitive( GTK_ACTION(eact), TRUE ); + } + + + { + /* Force */ + gchar const* labels[] = {_("(minimum force)"), 0, 0, _("(default)"), 0, 0, 0, _("(maximum force)")}; + gdouble values[] = {1, 5, 10, 20, 30, 50, 70, 100}; + EgeAdjustmentAction *eact = create_adjustment_action( "TweakForceAction", + _("Force"), _("Force:"), _("The force of the tweak action"), + "tools.tweak", "force", 20, + GTK_WIDGET(desktop->canvas), NULL, holder, TRUE, "tweak-force", + 1, 100, 1.0, 10.0, + labels, values, G_N_ELEMENTS(labels), + sp_tweak_force_value_changed, 0.01, 0, 100 ); + gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); + gtk_action_set_sensitive( GTK_ACTION(eact), TRUE ); + } + + /* Mode */ + { + GtkListStore* model = gtk_list_store_new( 3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING ); + + GtkTreeIter iter; + gtk_list_store_append( model, &iter ); + gtk_list_store_set( model, &iter, + 0, _("Push mode"), + 1, _("Push parts of paths in any direction"), + 2, "tweak_push_mode", + -1 ); + + gtk_list_store_append( model, &iter ); + gtk_list_store_set( model, &iter, + 0, _("Shrink mode"), + 1, _("Shrink (inset) parts of paths"), + 2, "tweak_shrink_mode", + -1 ); + + gtk_list_store_append( model, &iter ); + gtk_list_store_set( model, &iter, + 0, _("Grow mode"), + 1, _("Grow (outset) parts of paths"), + 2, "tweak_grow_mode", + -1 ); + + gtk_list_store_append( model, &iter ); + gtk_list_store_set( model, &iter, + 0, _("Attract mode"), + 1, _("Attract parts of paths towards cursor"), + 2, "tweak_attract_mode", + -1 ); + + gtk_list_store_append( model, &iter ); + gtk_list_store_set( model, &iter, + 0, _("Repel mode"), + 1, _("Repel parts of paths from cursor"), + 2, "tweak_repel_mode", + -1 ); + + gtk_list_store_append( model, &iter ); + gtk_list_store_set( model, &iter, + 0, _("Roughen mode"), + 1, _("Roughen parts of paths"), + 2, "tweak_roughen_mode", + -1 ); + + gtk_list_store_append( model, &iter ); + gtk_list_store_set( model, &iter, + 0, _("Color paint mode"), + 1, _("Paint the tool's color upon selected objects"), + 2, "tweak_colorpaint_mode", + -1 ); + + gtk_list_store_append( model, &iter ); + gtk_list_store_set( model, &iter, + 0, _("Color jitter mode"), + 1, _("Jitter the colors of selected objects"), + 2, "tweak_colorjitter_mode", + -1 ); + + EgeSelectOneAction* act = ege_select_one_action_new( "TweakModeAction", _("Mode"), (""), NULL, GTK_TREE_MODEL(model) ); + g_object_set( act, "short_label", _("Mode:"), NULL ); + gtk_action_group_add_action( mainActions, GTK_ACTION(act) ); + g_object_set_data( holder, "mode_action", act ); + + ege_select_one_action_set_appearance( act, "full" ); + ege_select_one_action_set_radio_action_type( act, INK_RADIO_ACTION_TYPE ); + g_object_set( G_OBJECT(act), "icon-property", "iconId", NULL ); + ege_select_one_action_set_icon_column( act, 2 ); + ege_select_one_action_set_tooltip_column( act, 1 ); + + gint mode = prefs_get_int_attribute("tools.tweak", "mode", 0); + ege_select_one_action_set_active( act, mode ); + g_signal_connect_after( G_OBJECT(act), "changed", G_CALLBACK(sp_tweak_mode_changed), holder ); + + g_object_set_data( G_OBJECT(holder), "tweak_tool_mode", act); + } + + guint mode = prefs_get_int_attribute("tools.tweak", "mode", 0); + + { + EgeOutputAction* act = ege_output_action_new( "TweakChannelsLabel", _("Channels:"), "", 0 ); + ege_output_action_set_use_markup( act, TRUE ); + gtk_action_group_add_action( mainActions, GTK_ACTION( act ) ); + if (mode != TWEAK_MODE_COLORPAINT && mode != TWEAK_MODE_COLORJITTER) + gtk_action_set_sensitive (GTK_ACTION(act), FALSE); + g_object_set_data( holder, "tweak_channels_label", act); + } + + { + InkToggleAction* act = ink_toggle_action_new( "TweakDoH", + _("Hue"), + _("In color mode, act on objects' hue"), + NULL, + Inkscape::ICON_SIZE_DECORATION ); + g_object_set( act, "short_label", _("H"), NULL ); + gtk_action_group_add_action( mainActions, GTK_ACTION( act ) ); + g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(tweak_toggle_doh), desktop ); + gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs_get_int_attribute( "tools.tweak", "doh", 1 ) ); + if (mode != TWEAK_MODE_COLORPAINT && mode != TWEAK_MODE_COLORJITTER) + gtk_action_set_sensitive (GTK_ACTION(act), FALSE); + g_object_set_data( holder, "tweak_doh", act); + } + { + InkToggleAction* act = ink_toggle_action_new( "TweakDoS", + _("Saturation"), + _("In color mode, act on objects' saturation"), + NULL, + Inkscape::ICON_SIZE_DECORATION ); + g_object_set( act, "short_label", _("S"), NULL ); + gtk_action_group_add_action( mainActions, GTK_ACTION( act ) ); + g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(tweak_toggle_dos), desktop ); + gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs_get_int_attribute( "tools.tweak", "dos", 1 ) ); + if (mode != TWEAK_MODE_COLORPAINT && mode != TWEAK_MODE_COLORJITTER) + gtk_action_set_sensitive (GTK_ACTION(act), FALSE); + g_object_set_data( holder, "tweak_dos", act ); + } + { + InkToggleAction* act = ink_toggle_action_new( "TweakDoL", + _("Lightness"), + _("In color mode, act on objects' lightness"), + NULL, + Inkscape::ICON_SIZE_DECORATION ); + g_object_set( act, "short_label", _("L"), NULL ); + gtk_action_group_add_action( mainActions, GTK_ACTION( act ) ); + g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(tweak_toggle_dol), desktop ); + gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs_get_int_attribute( "tools.tweak", "dol", 1 ) ); + if (mode != TWEAK_MODE_COLORPAINT && mode != TWEAK_MODE_COLORJITTER) + gtk_action_set_sensitive (GTK_ACTION(act), FALSE); + g_object_set_data( holder, "tweak_dol", act ); + } + { + InkToggleAction* act = ink_toggle_action_new( "TweakDoO", + _("Opacity"), + _("In color mode, act on objects' opacity"), + NULL, + Inkscape::ICON_SIZE_DECORATION ); + g_object_set( act, "short_label", _("O"), NULL ); + gtk_action_group_add_action( mainActions, GTK_ACTION( act ) ); + g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(tweak_toggle_doo), desktop ); + gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs_get_int_attribute( "tools.tweak", "doo", 1 ) ); + if (mode != TWEAK_MODE_COLORPAINT && mode != TWEAK_MODE_COLORJITTER) + gtk_action_set_sensitive (GTK_ACTION(act), FALSE); + g_object_set_data( holder, "tweak_doo", act ); + } + + { /* Fidelity */ + gchar const* labels[] = {_("(rough, simplified)"), 0, 0, _("(default)"), 0, 0, _("(fine, but many nodes)")}; + gdouble values[] = {10, 25, 35, 50, 60, 80, 100}; + EgeAdjustmentAction *eact = create_adjustment_action( "TweakFidelityAction", + _("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), NULL, holder, TRUE, "tweak-fidelity", + 1, 100, 1.0, 10.0, + labels, values, G_N_ELEMENTS(labels), + sp_tweak_fidelity_value_changed, 0.01, 0, 100 ); + gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); + gtk_action_set_sensitive( GTK_ACTION(eact), TRUE ); + if (mode == TWEAK_MODE_COLORPAINT || mode == TWEAK_MODE_COLORJITTER) + gtk_action_set_sensitive (GTK_ACTION(eact), FALSE); + g_object_set_data( holder, "tweak_fidelity", eact ); + } + + + /* Use Pressure button */ + { + InkToggleAction* act = ink_toggle_action_new( "TweakPressureAction", + _("Pressure"), + _("Use the pressure of the input device to alter the force of tweak action"), + "use_pressure", + Inkscape::ICON_SIZE_DECORATION ); + gtk_action_group_add_action( mainActions, GTK_ACTION( act ) ); + g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(sp_tweak_pressure_state_changed), NULL); + gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs_get_int_attribute( "tools.tweak", "usepressure", 1 ) ); + } - return tbl; } @@ -2281,52 +3160,52 @@ sp_pencil_toolbox_new(SPDesktop *desktop) //## Calligraphy ## //######################## -static void sp_ddc_mass_value_changed( GtkAdjustment *adj, GtkWidget *tbl ) +static void sp_ddc_mass_value_changed( GtkAdjustment *adj, GObject* /*tbl*/ ) { prefs_set_double_attribute( "tools.calligraphic", "mass", adj->value ); } -static void sp_ddc_wiggle_value_changed( GtkAdjustment *adj, GtkWidget *tbl ) +static void sp_ddc_wiggle_value_changed( GtkAdjustment *adj, GObject* /*tbl*/ ) { prefs_set_double_attribute( "tools.calligraphic", "wiggle", adj->value ); } -static void sp_ddc_angle_value_changed( GtkAdjustment *adj, GtkWidget *tbl ) +static void sp_ddc_angle_value_changed( GtkAdjustment *adj, GObject* /*tbl*/ ) { prefs_set_double_attribute( "tools.calligraphic", "angle", adj->value ); } -static void sp_ddc_width_value_changed( GtkAdjustment *adj, GtkWidget *tbl ) +static void sp_ddc_width_value_changed( GtkAdjustment *adj, GObject */*tbl*/ ) { prefs_set_double_attribute( "tools.calligraphic", "width", adj->value * 0.01 ); } -static void sp_ddc_velthin_value_changed( GtkAdjustment *adj, GtkWidget *tbl ) +static void sp_ddc_velthin_value_changed( GtkAdjustment *adj, GObject* /*tbl*/ ) { prefs_set_double_attribute("tools.calligraphic", "thinning", adj->value); } -static void sp_ddc_flatness_value_changed( GtkAdjustment *adj, GtkWidget *tbl ) +static void sp_ddc_flatness_value_changed( GtkAdjustment *adj, GObject* /*tbl*/ ) { prefs_set_double_attribute( "tools.calligraphic", "flatness", adj->value ); } -static void sp_ddc_tremor_value_changed( GtkAdjustment *adj, GtkWidget *tbl ) +static void sp_ddc_tremor_value_changed( GtkAdjustment *adj, GObject* /*tbl*/ ) { prefs_set_double_attribute( "tools.calligraphic", "tremor", adj->value ); } -static void sp_ddc_cap_rounding_value_changed( GtkAdjustment *adj, GtkWidget *tbl ) +static void sp_ddc_cap_rounding_value_changed( GtkAdjustment *adj, GObject* /*tbl*/ ) { prefs_set_double_attribute( "tools.calligraphic", "cap_rounding", adj->value ); } -static void sp_ddc_pressure_state_changed( GtkToggleAction *act, gpointer data ) +static void sp_ddc_pressure_state_changed( GtkToggleAction *act, gpointer /*data*/ ) { prefs_set_int_attribute( "tools.calligraphic", "usepressure", gtk_toggle_action_get_active( act ) ? 1 : 0); } -static void sp_ddc_trace_background_changed( GtkToggleAction *act, gpointer data ) +static void sp_ddc_trace_background_changed( GtkToggleAction *act, gpointer /*data*/ ) { prefs_set_int_attribute( "tools.calligraphic", "tracebackground", gtk_toggle_action_get_active( act ) ? 1 : 0); } @@ -2338,7 +3217,7 @@ static void sp_ddc_tilt_state_changed( GtkToggleAction *act, GtkAction *calligra gtk_action_set_sensitive( calligraphy_angle, !gtk_toggle_action_get_active( act ) ); } -static void sp_ddc_defaults(GtkWidget *, GtkWidget *dataKludge) +static void sp_ddc_defaults(GtkWidget *, GObject *dataKludge) { // FIXME: make defaults settable via Inkscape Options struct KeyValue { @@ -2357,7 +3236,7 @@ static void sp_ddc_defaults(GtkWidget *, GtkWidget *dataKludge) for (unsigned i = 0; i < G_N_ELEMENTS(key_values); ++i) { KeyValue const &kv = key_values[i]; - GtkAdjustment* adj = static_cast(gtk_object_get_data(GTK_OBJECT(dataKludge), kv.key)); + GtkAdjustment* adj = static_cast(g_object_get_data(dataKludge, kv.key)); if ( adj ) { gtk_adjustment_set_value(adj, kv.value); } @@ -2365,34 +3244,8 @@ static void sp_ddc_defaults(GtkWidget *, GtkWidget *dataKludge) } -static GtkWidget * -sp_calligraphy_toolbox_new(SPDesktop *desktop) +static void sp_calligraphy_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder) { - GtkWidget* holder = gtk_table_new( 1, 2, FALSE ); - - gchar const * descr = - "" - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - ""; - GtkActionGroup* mainActions = gtk_action_group_new("main"); - { EgeAdjustmentAction* calligraphy_angle = 0; @@ -2400,13 +3253,14 @@ sp_calligraphy_toolbox_new(SPDesktop *desktop) /* Width */ gchar const* labels[] = {_("(hairline)"), 0, 0, 0, _("(default)"), 0, 0, 0, 0, _("(broad stroke)")}; gdouble values[] = {1, 3, 5, 10, 15, 20, 30, 50, 75, 100}; - EgeAdjustmentAction *eact = create_adjustment_action( "WidthAction", - _("Width:"), _("The width of the calligraphic pen (relative to the visible canvas area)"), - "tools.calligraphic", "width", 15, - GTK_WIDGET(desktop->canvas), NULL, holder, TRUE, "altx-calligraphy", - 1, 100, 1.0, 10.0, - labels, values, G_N_ELEMENTS(labels), - sp_ddc_width_value_changed, 0.01, 0, 100 ); + EgeAdjustmentAction *eact = create_adjustment_action( "CalligraphyWidthAction", + _("Pen Width"), _("Width:"), + _("The width of the calligraphic pen (relative to the visible canvas area)"), + "tools.calligraphic", "width", 15, + GTK_WIDGET(desktop->canvas), NULL, holder, TRUE, "altx-calligraphy", + 1, 100, 1.0, 10.0, + labels, values, G_N_ELEMENTS(labels), + sp_ddc_width_value_changed, 0.01, 0, 100 ); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); gtk_action_set_sensitive( GTK_ACTION(eact), TRUE ); } @@ -2416,12 +3270,13 @@ sp_calligraphy_toolbox_new(SPDesktop *desktop) gchar const* labels[] = {_("(speed blows up stroke)"), 0, 0, _("(slight widening)"), _("(constant width)"), _("(slight thinning, default)"), 0, 0, _("(speed deflates stroke)")}; gdouble values[] = {-1, -0.4, -0.2, -0.1, 0, 0.1, 0.2, 0.4, 1}; EgeAdjustmentAction* eact = create_adjustment_action( "ThinningAction", - _("Thinning:"), _("How much velocity thins the stroke (> 0 makes fast strokes thinner, < 0 makes them broader, 0 makes width independent of velocity)"), - "tools.calligraphic", "thinning", 0.1, - GTK_WIDGET(desktop->canvas), NULL, holder, FALSE, NULL, - -1.0, 1.0, 0.01, 0.1, - labels, values, G_N_ELEMENTS(labels), - sp_ddc_velthin_value_changed, 0.01, 2); + _("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", 0.1, + GTK_WIDGET(desktop->canvas), NULL, holder, FALSE, NULL, + -1.0, 1.0, 0.01, 0.1, + labels, values, G_N_ELEMENTS(labels), + sp_ddc_velthin_value_changed, 0.01, 2); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); gtk_action_set_sensitive( GTK_ACTION(eact), TRUE ); } @@ -2431,12 +3286,13 @@ sp_calligraphy_toolbox_new(SPDesktop *desktop) gchar const* labels[] = {_("(left edge up)"), 0, 0, _("(horizontal)"), _("(default)"), 0, _("(right edge up)")}; gdouble values[] = {-90, -60, -30, 0, 30, 60, 90}; EgeAdjustmentAction* eact = create_adjustment_action( "AngleAction", - _("Angle:"), _("The angle of the pen's nib (in degrees; 0 = horizontal; has no effect if fixation = 0)"), - "tools.calligraphic", "angle", 30, - GTK_WIDGET(desktop->canvas), NULL, holder, TRUE, "calligraphy-angle", - -90.0, 90.0, 1.0, 10.0, - labels, values, G_N_ELEMENTS(labels), - sp_ddc_angle_value_changed, 1, 0 ); + _("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), NULL, holder, TRUE, "calligraphy-angle", + -90.0, 90.0, 1.0, 10.0, + labels, values, G_N_ELEMENTS(labels), + sp_ddc_angle_value_changed, 1, 0 ); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); gtk_action_set_sensitive( GTK_ACTION(eact), TRUE ); calligraphy_angle = eact; @@ -2447,12 +3303,13 @@ sp_calligraphy_toolbox_new(SPDesktop *desktop) gchar const* labels[] = {_("(perpendicular to stroke, \"brush\")"), 0, 0, 0, _("(almost fixed, default)"), _("(fixed by Angle, \"pen\")")}; gdouble values[] = {0, 0.2, 0.4, 0.6, 0.9, 1.0}; EgeAdjustmentAction* eact = create_adjustment_action( "FixationAction", - _("Fixation:"), _("Angle behavior (0 = nib always perpendicular to stroke direction, 1 = fixed angle)"), - "tools.calligraphic", "flatness", 0.9, - GTK_WIDGET(desktop->canvas), NULL, holder, FALSE, NULL, - 0.0, 1.0, 0.01, 0.1, - labels, values, G_N_ELEMENTS(labels), - sp_ddc_flatness_value_changed, 0.01, 2 ); + _("Fixation"), _("Fixation:"), + _("Angle behavior (0 = nib always perpendicular to stroke direction, 1 = fixed angle)"), + "tools.calligraphic", "flatness", 0.9, + GTK_WIDGET(desktop->canvas), NULL, holder, FALSE, NULL, + 0.0, 1.0, 0.01, 0.1, + labels, values, G_N_ELEMENTS(labels), + sp_ddc_flatness_value_changed, 0.01, 2 ); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); gtk_action_set_sensitive( GTK_ACTION(eact), TRUE ); } @@ -2463,12 +3320,13 @@ sp_calligraphy_toolbox_new(SPDesktop *desktop) gdouble values[] = {0, 0.3, 0.5, 1.0, 1.4, 5.0}; // TRANSLATORS: "cap" means "end" (both start and finish) here EgeAdjustmentAction* eact = create_adjustment_action( "CapRoundingAction", - _("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), NULL, holder, FALSE, NULL, - 0.0, 5.0, 0.01, 0.1, - labels, values, G_N_ELEMENTS(labels), - sp_ddc_cap_rounding_value_changed, 0.01, 2 ); + _("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), NULL, holder, FALSE, NULL, + 0.0, 5.0, 0.01, 0.1, + labels, values, G_N_ELEMENTS(labels), + sp_ddc_cap_rounding_value_changed, 0.01, 2 ); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); gtk_action_set_sensitive( GTK_ACTION(eact), TRUE ); } @@ -2478,12 +3336,13 @@ sp_calligraphy_toolbox_new(SPDesktop *desktop) gchar const* labels[] = {_("(smooth line)"), _("(slight tremor)"), _("(noticeable tremor)"), 0, 0, _("(maximum tremor)")}; gdouble values[] = {0, 0.1, 0.2, 0.4, 0.6, 1.0}; EgeAdjustmentAction* eact = create_adjustment_action( "TremorAction", - _("Tremor:"), _("Increase to make strokes rugged and trembling"), - "tools.calligraphic", "tremor", 0.0, - GTK_WIDGET(desktop->canvas), NULL, holder, FALSE, NULL, - 0.0, 1.0, 0.01, 0.1, - labels, values, G_N_ELEMENTS(labels), - sp_ddc_tremor_value_changed, 0.01, 2 ); + _("Stroke Tremor"), _("Tremor:"), + _("Increase to make strokes rugged and trembling"), + "tools.calligraphic", "tremor", 0.0, + GTK_WIDGET(desktop->canvas), NULL, holder, FALSE, NULL, + 0.0, 1.0, 0.01, 0.1, + labels, values, G_N_ELEMENTS(labels), + sp_ddc_tremor_value_changed, 0.01, 2 ); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); gtk_action_set_sensitive( GTK_ACTION(eact), TRUE ); @@ -2494,12 +3353,13 @@ sp_calligraphy_toolbox_new(SPDesktop *desktop) gchar const* labels[] = {_("(no wiggle)"), _("(slight deviation)"), 0, 0, _("(wild waves and curls)")}; gdouble values[] = {0, 0.2, 0.4, 0.6, 1.0}; EgeAdjustmentAction* eact = create_adjustment_action( "WiggleAction", - _("Wiggle:"), _("Increase to make the pen waver and wiggle"), - "tools.calligraphic", "wiggle", 0.0, - GTK_WIDGET(desktop->canvas), NULL, holder, FALSE, NULL, - 0.0, 1.0, 0.01, 0.1, - labels, values, G_N_ELEMENTS(labels), - sp_ddc_wiggle_value_changed, 0.01, 2 ); + _("Pen Wiggle"), _("Wiggle:"), + _("Increase to make the pen waver and wiggle"), + "tools.calligraphic", "wiggle", 0.0, + GTK_WIDGET(desktop->canvas), NULL, holder, FALSE, NULL, + 0.0, 1.0, 0.01, 0.1, + labels, values, G_N_ELEMENTS(labels), + sp_ddc_wiggle_value_changed, 0.01, 2 ); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); gtk_action_set_sensitive( GTK_ACTION(eact), TRUE ); } @@ -2509,12 +3369,13 @@ sp_calligraphy_toolbox_new(SPDesktop *desktop) gchar const* labels[] = {_("(no inertia)"), _("(slight smoothing, default)"), _("(noticeable lagging)"), 0, 0, _("(maximum inertia)")}; gdouble values[] = {0.0, 0.02, 0.1, 0.2, 0.5, 1.0}; EgeAdjustmentAction* eact = create_adjustment_action( "MassAction", - _("Mass:"), _("Increase to make the pen drag behind, as if slowed by inertia"), - "tools.calligraphic", "mass", 0.02, - GTK_WIDGET(desktop->canvas), NULL, holder, FALSE, NULL, - 0.0, 1.0, 0.01, 0.1, - labels, values, G_N_ELEMENTS(labels), - sp_ddc_mass_value_changed, 0.01, 2 ); + _("Pen Mass"), _("Mass:"), + _("Increase to make the pen drag behind, as if slowed by inertia"), + "tools.calligraphic", "mass", 0.02, + GTK_WIDGET(desktop->canvas), NULL, holder, FALSE, NULL, + 0.0, 1.0, 0.01, 0.1, + labels, values, G_N_ELEMENTS(labels), + sp_ddc_mass_value_changed, 0.01, 2 ); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); gtk_action_set_sensitive( GTK_ACTION(eact), TRUE ); } @@ -2559,41 +3420,15 @@ sp_calligraphy_toolbox_new(SPDesktop *desktop) /* Reset */ { - GtkAction* act = gtk_action_new( "ResetAction", + GtkAction* act = gtk_action_new( "CalligraphyResetAction", _("Defaults"), - _("Reset shape parameters to defaults (use Inkscape Preferences > Tools to change defaults)"), + _("Reset all parameters to defaults"), GTK_STOCK_CLEAR ); g_signal_connect_after( G_OBJECT(act), "activate", G_CALLBACK(sp_ddc_defaults), holder ); gtk_action_group_add_action( mainActions, act ); gtk_action_set_sensitive( act, TRUE ); } } - - - GtkUIManager* mgr = gtk_ui_manager_new(); - GError* errVal = 0; - - gtk_ui_manager_insert_action_group( mgr, mainActions, 0 ); - gtk_ui_manager_add_ui_from_string( mgr, descr, -1, &errVal ); - - GtkWidget* toolBar = gtk_ui_manager_get_widget( mgr, "/ui/CalligraphyToolbar" ); - gtk_toolbar_set_style( GTK_TOOLBAR(toolBar), GTK_TOOLBAR_ICONS ); - gtk_toolbar_set_icon_size( GTK_TOOLBAR(toolBar), GTK_ICON_SIZE_SMALL_TOOLBAR ); - - - gtk_table_attach( GTK_TABLE(holder), toolBar, 0, 1, 0, 1, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), 0, 0 ); - - Inkscape::UI::Widget::StyleSwatch *swatch = new Inkscape::UI::Widget::StyleSwatch(NULL, _("Style of new calligraphic strokes")); - swatch->setDesktop (desktop); - swatch->setClickVerb (SP_VERB_CONTEXT_CALLIGRAPHIC_PREFS); - swatch->setWatchedTool ("tools.calligraphic", true); - GtkWidget *swatch_ = GTK_WIDGET(swatch->gobj()); - gtk_table_attach( GTK_TABLE(holder), swatch_, 1, 2, 0, 1, (GtkAttachOptions)(GTK_SHRINK | GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), AUX_BETWEEN_BUTTON_GROUPS, 0 ); - - gtk_widget_show_all(holder); - //sp_set_font_size_smaller (tbl); - - return holder; } @@ -2601,14 +3436,13 @@ sp_calligraphy_toolbox_new(SPDesktop *desktop) //## Circle / Arc ## //######################## -static void -sp_arctb_sensitivize (GtkWidget *tbl, double v1, double v2) +static void sp_arctb_sensitivize( GObject *tbl, double v1, double v2 ) { - GtkAction *ocb = GTK_ACTION( g_object_get_data(G_OBJECT(tbl), "open_action") ); - GtkAction *make_whole = GTK_ACTION( g_object_get_data(G_OBJECT(tbl), "make_whole") ); + GtkAction *ocb = GTK_ACTION( g_object_get_data( tbl, "open_action" ) ); + GtkAction *make_whole = GTK_ACTION( g_object_get_data( tbl, "make_whole" ) ); if (v1 == 0 && v2 == 0) { - if (gtk_object_get_data(GTK_OBJECT(tbl), "single")) { // only for a single selected ellipse (for now) + if (g_object_get_data( tbl, "single" )) { // only for a single selected ellipse (for now) gtk_action_set_sensitive( ocb, FALSE ); gtk_action_set_sensitive( make_whole, FALSE ); } @@ -2619,21 +3453,21 @@ sp_arctb_sensitivize (GtkWidget *tbl, double v1, double v2) } static void -sp_arctb_startend_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_name, gchar const *other_name) +sp_arctb_startend_value_changed(GtkAdjustment *adj, GObject *tbl, gchar const *value_name, gchar const *other_name) { - SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop"); + SPDesktop *desktop = (SPDesktop *) g_object_get_data( tbl, "desktop" ); if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) { prefs_set_double_attribute("tools.shapes.arc", value_name, (adj->value * M_PI)/ 180); } // quit if run by the attr_changed listener - if (g_object_get_data(G_OBJECT(tbl), "freeze")) { + if (g_object_get_data( tbl, "freeze" )) { return; } // in turn, prevent listener from responding - g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(TRUE)); + g_object_set_data( tbl, "freeze", GINT_TO_POINTER(TRUE) ); gchar* namespaced_name = g_strconcat("sodipodi:", value_name, NULL); @@ -2664,38 +3498,32 @@ sp_arctb_startend_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const g_free(namespaced_name); - GtkAdjustment *other = (GtkAdjustment *)gtk_object_get_data(GTK_OBJECT(tbl), other_name); + GtkAdjustment *other = GTK_ADJUSTMENT( g_object_get_data( tbl, other_name ) ); - sp_arctb_sensitivize (tbl, adj->value, other->value); + sp_arctb_sensitivize( tbl, adj->value, other->value ); if (modmade) { sp_document_maybe_done(sp_desktop_document(desktop), value_name, SP_VERB_CONTEXT_ARC, _("Arc: Change start/end")); } - // defocus spinbuttons by moving focus to the canvas, unless "stay" is on - spinbutton_defocus(GTK_OBJECT(tbl)); - - g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE)); + g_object_set_data( tbl, "freeze", GINT_TO_POINTER(FALSE) ); } -static void -sp_arctb_start_value_changed(GtkAdjustment *adj, GtkWidget *tbl) +static void sp_arctb_start_value_changed(GtkAdjustment *adj, GObject *tbl) { sp_arctb_startend_value_changed(adj, tbl, "start", "end"); } -static void -sp_arctb_end_value_changed(GtkAdjustment *adj, GtkWidget *tbl) +static void sp_arctb_end_value_changed(GtkAdjustment *adj, GObject *tbl) { sp_arctb_startend_value_changed(adj, tbl, "end", "start"); } -static void -sp_arctb_open_state_changed( EgeSelectOneAction *act, GtkObject *tbl ) +static void sp_arctb_open_state_changed( EgeSelectOneAction *act, GObject *tbl ) { - SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop"); + SPDesktop *desktop = (SPDesktop *) g_object_get_data( tbl, "desktop" ); if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) { if ( ege_select_one_action_get_active( act ) != 0 ) { prefs_set_string_attribute("tools.shapes.arc", "open", "true"); @@ -2705,12 +3533,12 @@ sp_arctb_open_state_changed( EgeSelectOneAction *act, GtkObject *tbl ) } // quit if run by the attr_changed listener - if (g_object_get_data(G_OBJECT(tbl), "freeze")) { + if (g_object_get_data( tbl, "freeze" )) { return; } // in turn, prevent listener from responding - g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(TRUE)); + g_object_set_data( tbl, "freeze", GINT_TO_POINTER(TRUE) ); bool modmade = false; @@ -2745,55 +3573,51 @@ sp_arctb_open_state_changed( EgeSelectOneAction *act, GtkObject *tbl ) _("Arc: Change open/closed")); } - g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE)); - - spinbutton_defocus(GTK_OBJECT(tbl)); + g_object_set_data( tbl, "freeze", GINT_TO_POINTER(FALSE) ); } -static void sp_arctb_defaults(GtkWidget *, GtkObject *obj) +static void sp_arctb_defaults(GtkWidget *, GObject *obj) { - GtkWidget *tbl = GTK_WIDGET(obj); - GtkAdjustment *adj; - adj = (GtkAdjustment*)gtk_object_get_data(obj, "start"); + adj = GTK_ADJUSTMENT( g_object_get_data(obj, "start") ); gtk_adjustment_set_value(adj, 0.0); gtk_adjustment_value_changed(adj); - adj = (GtkAdjustment*)gtk_object_get_data(obj, "end"); + adj = GTK_ADJUSTMENT( g_object_get_data(obj, "end") ); gtk_adjustment_set_value(adj, 0.0); gtk_adjustment_value_changed(adj); - spinbutton_defocus(GTK_OBJECT(tbl)); + spinbutton_defocus( GTK_OBJECT(obj) ); } -static void arc_tb_event_attr_changed(Inkscape::XML::Node *repr, gchar const *name, - gchar const *old_value, gchar const *new_value, - bool is_interactive, gpointer data) +static void arc_tb_event_attr_changed(Inkscape::XML::Node *repr, gchar const */*name*/, + gchar const */*old_value*/, gchar const */*new_value*/, + bool /*is_interactive*/, gpointer data) { - GtkWidget *tbl = GTK_WIDGET(data); + GObject *tbl = G_OBJECT(data); // quit if run by the _changed callbacks - if (g_object_get_data(G_OBJECT(tbl), "freeze")) { + if (g_object_get_data( tbl, "freeze" )) { return; } // in turn, prevent callbacks from responding - g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(TRUE)); + g_object_set_data( tbl, "freeze", GINT_TO_POINTER(TRUE) ); gdouble start = sp_repr_get_double_attribute(repr, "sodipodi:start", 0.0); gdouble end = sp_repr_get_double_attribute(repr, "sodipodi:end", 0.0); GtkAdjustment *adj1,*adj2; - adj1 = (GtkAdjustment*)gtk_object_get_data(GTK_OBJECT(tbl), "start"); + adj1 = GTK_ADJUSTMENT( g_object_get_data( tbl, "start" ) ); gtk_adjustment_set_value(adj1, mod360((start * 180)/M_PI)); - adj2 = (GtkAdjustment*)gtk_object_get_data(GTK_OBJECT(tbl), "end"); + adj2 = GTK_ADJUSTMENT( g_object_get_data( tbl, "end" ) ); gtk_adjustment_set_value(adj2, mod360((end * 180)/M_PI)); - sp_arctb_sensitivize (tbl, adj1->value, adj2->value); + sp_arctb_sensitivize( tbl, adj1->value, adj2->value ); char const *openstr = NULL; openstr = repr->attribute("sodipodi:open"); - EgeSelectOneAction *ocb = EGE_SELECT_ONE_ACTION( g_object_get_data(G_OBJECT(tbl), "open_action") ); + EgeSelectOneAction *ocb = EGE_SELECT_ONE_ACTION( g_object_get_data( tbl, "open_action" ) ); if (openstr) { ege_select_one_action_set_active( ocb, 1 ); @@ -2801,7 +3625,7 @@ static void arc_tb_event_attr_changed(Inkscape::XML::Node *repr, gchar const *na ege_select_one_action_set_active( ocb, 0 ); } - g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE)); + g_object_set_data( tbl, "freeze", GINT_TO_POINTER(FALSE) ); } static Inkscape::XML::NodeEventVector arc_tb_repr_events = { @@ -2813,12 +3637,12 @@ static Inkscape::XML::NodeEventVector arc_tb_repr_events = { }; -static void -sp_arc_toolbox_selection_changed(Inkscape::Selection *selection, GtkObject *tbl) +static void sp_arc_toolbox_selection_changed(Inkscape::Selection *selection, GObject *tbl) { int n_selected = 0; Inkscape::XML::Node *repr = NULL; - Inkscape::XML::Node *oldrepr = NULL; + + purge_repr_listener( tbl, tbl ); for (GSList const *items = selection->itemList(); items != NULL; @@ -2830,26 +3654,17 @@ sp_arc_toolbox_selection_changed(Inkscape::Selection *selection, GtkObject *tbl) } } - EgeOutputAction* act = EGE_OUTPUT_ACTION( gtk_object_get_data(GTK_OBJECT(tbl), "mode_action") ); + EgeOutputAction* act = EGE_OUTPUT_ACTION( g_object_get_data( tbl, "mode_action" ) ); - g_object_set_data(G_OBJECT(tbl), "single", GINT_TO_POINTER(FALSE)); + g_object_set_data( tbl, "single", GINT_TO_POINTER(FALSE) ); if (n_selected == 0) { g_object_set( G_OBJECT(act), "label", _("New:"), NULL ); } else if (n_selected == 1) { - g_object_set_data(G_OBJECT(tbl), "single", GINT_TO_POINTER(TRUE)); + g_object_set_data( tbl, "single", GINT_TO_POINTER(TRUE) ); g_object_set( G_OBJECT(act), "label", _("Change:"), NULL ); - oldrepr = (Inkscape::XML::Node *) gtk_object_get_data(GTK_OBJECT(tbl), "repr"); - - if (oldrepr) { // remove old listener - sp_repr_remove_listener_by_data(oldrepr, tbl); - Inkscape::GC::release(oldrepr); - oldrepr = 0; - g_object_set_data(G_OBJECT(tbl), "repr", NULL); - } - if (repr) { - g_object_set_data(G_OBJECT(tbl), "repr", repr); + g_object_set_data( tbl, "repr", repr ); Inkscape::GC::anchor(repr); sp_repr_add_listener(repr, &arc_tb_repr_events, tbl); sp_repr_synthesize_events(repr, &arc_tb_repr_events, tbl); @@ -2858,34 +3673,13 @@ sp_arc_toolbox_selection_changed(Inkscape::Selection *selection, GtkObject *tbl) // FIXME: implement averaging of all parameters for multiple selected //gtk_label_set_markup(GTK_LABEL(l), _("Average:")); g_object_set( G_OBJECT(act), "label", _("Change:"), NULL ); - sp_arctb_sensitivize (GTK_WIDGET(tbl), 1, 0); + sp_arctb_sensitivize( tbl, 1, 0 ); } } -static GtkWidget * -sp_arc_toolbox_new(SPDesktop *desktop) +static void sp_arc_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder) { - GtkWidget *holder = gtk_hbox_new(FALSE, 0); - gtk_object_set_data(GTK_OBJECT(holder), "dtw", desktop->canvas); - gtk_object_set_data(GTK_OBJECT(holder), "desktop", desktop); - - gchar const * descr = - "" - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - ""; - GtkActionGroup* mainActions = gtk_action_group_new("main"); - EgeAdjustmentAction* eact = 0; @@ -2893,13 +3687,14 @@ sp_arc_toolbox_new(SPDesktop *desktop) EgeOutputAction* act = ege_output_action_new( "ArcStateAction", _("New:"), "", 0 ); ege_output_action_set_use_markup( act, TRUE ); gtk_action_group_add_action( mainActions, GTK_ACTION( act ) ); - gtk_object_set_data( GTK_OBJECT(holder), "mode_action", act ); + g_object_set_data( holder, "mode_action", act ); } /* Start */ { eact = create_adjustment_action( "ArcStartAction", - _("Start:"), _("The angle (in degrees) from the horizontal to the arc's start point"), + _("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), NULL/*us*/, holder, TRUE, "altx-arc", -360.0, 360.0, 1.0, 10.0, @@ -2911,7 +3706,8 @@ sp_arc_toolbox_new(SPDesktop *desktop) /* End */ { eact = create_adjustment_action( "ArcEndAction", - _("End:"), _("The angle (in degrees) from the horizontal to the arc's end point"), + _("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), NULL/*us*/, holder, FALSE, NULL, -360.0, 360.0, 1.0, 10.0, @@ -2939,9 +3735,9 @@ sp_arc_toolbox_new(SPDesktop *desktop) 2, "circle_open_arc", -1 ); - EgeSelectOneAction* act = ege_select_one_action_new( "ArcOpenAction", _(""), _(""), NULL, GTK_TREE_MODEL(model) ); + EgeSelectOneAction* act = ege_select_one_action_new( "ArcOpenAction", (""), (""), NULL, GTK_TREE_MODEL(model) ); gtk_action_group_add_action( mainActions, GTK_ACTION(act) ); - gtk_object_set_data( GTK_OBJECT(holder), "open_action", act ); + g_object_set_data( holder, "open_action", act ); ege_select_one_action_set_appearance( act, "full" ); ege_select_one_action_set_radio_action_type( act, INK_RADIO_ACTION_TYPE ); @@ -2952,7 +3748,7 @@ sp_arc_toolbox_new(SPDesktop *desktop) gchar const *openstr = prefs_get_string_attribute("tools.shapes.arc", "open"); bool isClosed = (!openstr || (openstr && !strcmp(openstr, "false"))); ege_select_one_action_set_active( act, isClosed ? 0 : 1 ); - g_signal_connect_after( G_OBJECT(act), "changed", G_CALLBACK(sp_arctb_open_state_changed), holder); + g_signal_connect_after( G_OBJECT(act), "changed", G_CALLBACK(sp_arctb_open_state_changed), holder ); } /* Make Whole */ @@ -2965,47 +3761,23 @@ sp_arc_toolbox_new(SPDesktop *desktop) g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_arctb_defaults), holder ); gtk_action_group_add_action( mainActions, GTK_ACTION(inky) ); gtk_action_set_sensitive( GTK_ACTION(inky), TRUE ); - gtk_object_set_data( GTK_OBJECT(holder), "make_whole", inky ); + g_object_set_data( holder, "make_whole", inky ); } g_object_set_data( G_OBJECT(holder), "single", GINT_TO_POINTER(TRUE) ); // sensitivize make whole and open checkbox { - GtkAdjustment *adj1 = GTK_ADJUSTMENT(gtk_object_get_data(GTK_OBJECT(holder), "start")); - GtkAdjustment *adj2 = GTK_ADJUSTMENT(gtk_object_get_data(GTK_OBJECT(holder), "end")); + GtkAdjustment *adj1 = GTK_ADJUSTMENT( g_object_get_data( holder, "start" ) ); + GtkAdjustment *adj2 = GTK_ADJUSTMENT( g_object_get_data( holder, "end" ) ); sp_arctb_sensitivize( holder, adj1->value, adj2->value ); } - GtkUIManager* mgr = gtk_ui_manager_new(); - GError* errVal = 0; - - gtk_ui_manager_insert_action_group( mgr, mainActions, 0 ); - gtk_ui_manager_add_ui_from_string( mgr, descr, -1, &errVal ); - - GtkWidget* toolBar = gtk_ui_manager_get_widget( mgr, "/ui/ArcToolbar" ); - gtk_toolbar_set_style( GTK_TOOLBAR(toolBar), GTK_TOOLBAR_ICONS ); - gtk_toolbar_set_icon_size( GTK_TOOLBAR(toolBar), GTK_ICON_SIZE_SMALL_TOOLBAR ); - - - gtk_box_pack_start( GTK_BOX(holder), toolBar, TRUE, TRUE, 0 ); - sigc::connection *connection = new sigc::connection( - sp_desktop_selection(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_arc_toolbox_selection_changed), (GtkObject *)holder)) - ); - g_signal_connect(G_OBJECT(holder), "destroy", G_CALLBACK(delete_connection), connection); - - Inkscape::UI::Widget::StyleSwatch *swatch = new Inkscape::UI::Widget::StyleSwatch(NULL, _("Style of new ellipses")); - swatch->setDesktop (desktop); - swatch->setClickVerb (SP_VERB_CONTEXT_ARC_PREFS); - swatch->setWatchedTool ("tools.shapes.arc", true); - GtkWidget *swatch_ = GTK_WIDGET(swatch->gobj()); - gtk_box_pack_end(GTK_BOX(holder), swatch_, FALSE, FALSE, 0); - - gtk_widget_show_all( holder ); - sp_set_font_size_smaller( holder ); - - return holder; + sp_desktop_selection(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_arc_toolbox_selection_changed), (GObject *)holder)) + ); + g_signal_connect( holder, "destroy", G_CALLBACK(delete_connection), connection ); + g_signal_connect( holder, "destroy", G_CALLBACK(purge_repr_listener), holder ); } @@ -3017,100 +3789,24 @@ sp_arc_toolbox_new(SPDesktop *desktop) //## Dropper ## //######################## -static void toggle_dropper_pick_alpha (GtkWidget *button, gpointer tbl) { - prefs_set_int_attribute ("tools.dropper", "pick", - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button))); - GtkWidget *set_checkbox = (GtkWidget*) g_object_get_data(G_OBJECT(tbl), "set_checkbox"); - if (set_checkbox) { - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button))) { - gtk_widget_set_sensitive (GTK_WIDGET (set_checkbox), TRUE); +static void toggle_dropper_pick_alpha( GtkToggleAction* act, gpointer tbl ) { + prefs_set_int_attribute( "tools.dropper", "pick", gtk_toggle_action_get_active( act ) ); + GtkAction* set_action = GTK_ACTION( g_object_get_data(G_OBJECT(tbl), "set_action") ); + if ( set_action ) { + if ( gtk_toggle_action_get_active( act ) ) { + gtk_action_set_sensitive( set_action, TRUE ); } else { - gtk_widget_set_sensitive (GTK_WIDGET (set_checkbox), FALSE); + gtk_action_set_sensitive( set_action, FALSE ); } } - spinbutton_defocus(GTK_OBJECT(tbl)); -} -static void toggle_dropper_set_alpha (GtkWidget *button, gpointer tbl) { - prefs_set_int_attribute ("tools.dropper", "setalpha", - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)) ? 1 : 0); spinbutton_defocus(GTK_OBJECT(tbl)); } - -/** - * Copy the current saved desktop color to the clipboard as full hex + alpha - * color representation. This is useful for passing values between various - * input boxes, or directly to xml. - */ -/* static void -sp_dropper_copy( GtkWidget *widget, GtkObject *obj) -{ - GtkWidget *tbl = GTK_WIDGET(obj); - - SPDesktop *desktop = - (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop"); - - - sp_dropper_c32_color_copy( sp_desktop_get_color(desktop, true) ); -}*/ - - -/** - * Copies currently saved desktop color to the clipboard as a hex value. This - * is useful for editing webpages and needing a value quickly for web - * colors. - * - * TODO: When the toggle of the dropper is set to not mix color against - * page background, this still just gets the color of the page and - * doesn't get the actual mixed against background which is needed - * for the hex value ppl. want for web pages, etc. - */ - -/* static void -sp_dropper_copy_as_hex ( GtkWidget *widget, GtkObject *obj) -{ - GtkWidget *tbl = GTK_WIDGET(obj); - - SPDesktop *desktop = - (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop"); - - sp_dropper_c32_color_copy_hex( sp_desktop_get_color(desktop, true) ); -}*/ - - -/** - * Sets the input boxes with the changed color and opacity. This is used as a - * callback for style changing. - */ -/* static bool -sp_style_changed (const SPCSSAttr *css, gpointer data) -{ - // GrDrag *drag = (GrDrag *) data; - - // set fill of text entry box - if (css->attribute("fill")) - gtk_entry_set_text((GtkEntry *)dropper_rgb_entry, - css->attribute("fill")); - - // set opacity of text entry box - if (css->attribute("fill-opacity")) - gtk_entry_set_text((GtkEntry *)dropper_opacity_entry, - css->attribute("fill-opacity")); - - // set fill of text entry box - if (css->attribute("stroke")) - gtk_entry_set_text((GtkEntry *)dropper_rgb_entry, - css->attribute("stroke")); - - // set opacity of text entry box - if (css->attribute("stroke-opacity")) - gtk_entry_set_text((GtkEntry *)dropper_opacity_entry, - css->attribute("stroke-opacity")); - return false; - +static void toggle_dropper_set_alpha( GtkToggleAction* act, gpointer tbl ) { + prefs_set_int_attribute( "tools.dropper", "setalpha", gtk_toggle_action_get_active( act ) ? 1 : 0 ); + spinbutton_defocus(GTK_OBJECT(tbl)); } -*/ /** @@ -3120,162 +3816,35 @@ sp_style_changed (const SPCSSAttr *css, gpointer data) * TODO: Add queue of last 5 or so colors selected with new swatches so that * can drag and drop places. Will provide a nice mixing palette. */ -static GtkWidget * -sp_dropper_toolbox_new(SPDesktop *desktop) +static void sp_dropper_toolbox_prep(SPDesktop */*desktop*/, GtkActionGroup* mainActions, GObject* holder) { - GtkWidget *tbl = gtk_hbox_new(FALSE, 0); - - gtk_object_set_data(GTK_OBJECT(tbl), "dtw", desktop->canvas); - gtk_object_set_data(GTK_OBJECT(tbl), "desktop", desktop); - - GtkTooltips *tt = gtk_tooltips_new(); - - - gtk_box_pack_start(GTK_BOX(tbl), gtk_hbox_new(FALSE, 0), FALSE, FALSE, - AUX_BETWEEN_BUTTON_GROUPS); - // sp_toolbox_add_label(tbl, _("New:")); - - - - /* RGB Input Field */ - /* { - GtkWidget *hb = gtk_hbox_new(FALSE, 1); - GtkWidget *dropper_rgba_label = gtk_label_new ("Color:"); - gtk_widget_show (dropper_rgba_label); - gtk_container_add(GTK_CONTAINER(hb), dropper_rgba_label); - - dropper_rgb_entry = gtk_entry_new (); - sp_dialog_defocus_on_enter (dropper_rgb_entry); - gtk_entry_set_max_length (GTK_ENTRY (dropper_rgb_entry), 7); - gtk_entry_set_width_chars (GTK_ENTRY (dropper_rgb_entry), 7); - gtk_tooltips_set_tip(tt, dropper_rgb_entry, - _("Hexidecimal representation of last selected " - "color"), - NULL); - gtk_widget_show (dropper_rgb_entry); - gtk_container_add(GTK_CONTAINER(hb), dropper_rgb_entry); - - gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, - AUX_BETWEEN_BUTTON_GROUPS); - } */ - - /* Opacity Input Field */ -/* { - GtkWidget *hb = gtk_hbox_new(FALSE, 1); - GtkWidget *dropper_opacity_label = gtk_label_new ( _("Opacity:") ); - gtk_widget_show (dropper_opacity_label); - gtk_container_add(GTK_CONTAINER(hb), dropper_opacity_label); - - dropper_opacity_entry = gtk_entry_new (); - sp_dialog_defocus_on_enter (dropper_opacity_entry); - gtk_entry_set_max_length (GTK_ENTRY (dropper_opacity_entry), 11); - gtk_entry_set_width_chars (GTK_ENTRY (dropper_opacity_entry), 11); - gtk_tooltips_set_tip(tt, dropper_opacity_entry, - _("Opacity of last selected color"), - NULL); - gtk_widget_show (dropper_opacity_entry); - gtk_container_add(GTK_CONTAINER(hb), dropper_opacity_entry); - - gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, - AUX_BETWEEN_BUTTON_GROUPS); - } */ - - - /* Copy to Clipboard */ -/* { - GtkWidget *hb = gtk_hbox_new(FALSE, 1); - GtkWidget *b = gtk_button_new_with_label(_("Copy as RGBA")); - gtk_tooltips_set_tip(tt, b, _("Copy last saved color as hexidecimal " - "RGB + Alpha (RGBA) to " - "clipboard"), - NULL); - gtk_widget_show(b); - gtk_container_add(GTK_CONTAINER(hb), b); - gtk_signal_connect(GTK_OBJECT(b), "clicked", - GTK_SIGNAL_FUNC(sp_dropper_copy), tbl); - gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, - AUX_BETWEEN_BUTTON_GROUPS); - } */ - - - /* Copy to Clipboard as HEX */ -/* { - GtkWidget *hb = gtk_hbox_new(FALSE, 1); - GtkWidget *b = gtk_button_new_with_label(_("Copy as HEX")); - gtk_tooltips_set_tip(tt, b, _("Copy last saved color as " - "hexidecimal RGB without alpha " - "to clipboard"), NULL); - gtk_widget_show(b); - gtk_container_add(GTK_CONTAINER(hb), b); - gtk_signal_connect(GTK_OBJECT(b), "clicked", - GTK_SIGNAL_FUNC(sp_dropper_copy_as_hex), tbl); - gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, - AUX_BETWEEN_BUTTON_GROUPS); - } */ - - // aux_toolbox_space(tbl, AUX_BETWEEN_BUTTON_GROUPS); + gint pickAlpha = prefs_get_int_attribute( "tools.dropper", "pick", 1 ); { - GtkWidget *hb = gtk_hbox_new(FALSE, 1); - - GtkWidget *button = gtk_check_button_new_with_label(_("Pick alpha")); - gtk_tooltips_set_tip(tt, button, _("Pick both the color and the alpha (transparency) under cursor; otherwise, pick only the visible color premultiplied by alpha"), NULL); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), - prefs_get_int_attribute ("tools.dropper", - "pick", 1)); - gtk_widget_show(button); - gtk_container_add (GTK_CONTAINER (hb), button); - gtk_object_set_data(GTK_OBJECT(tbl), "pick_checkbox", button); - g_signal_connect (G_OBJECT (button), "toggled", G_CALLBACK (toggle_dropper_pick_alpha), tbl); - gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, - AUX_BETWEEN_BUTTON_GROUPS); + InkToggleAction* act = ink_toggle_action_new( "DropperPickAlphaAction", + _("Pick alpha"), + _("Pick both the color and the alpha (transparency) under cursor; otherwise, pick only the visible color premultiplied by alpha"), + "color_alpha_get", + Inkscape::ICON_SIZE_DECORATION ); + gtk_action_group_add_action( mainActions, GTK_ACTION( act ) ); + g_object_set_data( holder, "pick_action", act ); + gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), pickAlpha ); + g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_dropper_pick_alpha), holder ); } { - GtkWidget *hb = gtk_hbox_new(FALSE, 1); - - GtkWidget *button = gtk_check_button_new_with_label(_("Set alpha")); - gtk_tooltips_set_tip(tt, button, _("If alpha was picked, assign it to selection as fill or stroke transparency"), NULL); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), - prefs_get_int_attribute ("tools.dropper", - "setalpha", 1)); - gtk_widget_show(button); - gtk_container_add (GTK_CONTAINER (hb), button); - gtk_object_set_data(GTK_OBJECT(tbl), "set_checkbox", button); - g_signal_connect (G_OBJECT (button), "toggled", G_CALLBACK (toggle_dropper_set_alpha), tbl); - + InkToggleAction* act = ink_toggle_action_new( "DropperSetAlphaAction", + _("Set alpha"), + _("If alpha was picked, assign it to selection as fill or stroke transparency"), + "color_alpha_set", + Inkscape::ICON_SIZE_DECORATION ); + gtk_action_group_add_action( mainActions, GTK_ACTION( act ) ); + g_object_set_data( holder, "set_action", act ); + gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs_get_int_attribute( "tools.dropper", "setalpha", 1 ) ); // make sure it's disabled if we're not picking alpha - GtkWidget *pick_checkbox = (GtkWidget*) g_object_get_data(G_OBJECT(tbl), "pick_checkbox"); - if (pick_checkbox) { - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (pick_checkbox))) { - gtk_widget_set_sensitive (GTK_WIDGET (button), TRUE); - } else { - gtk_widget_set_sensitive (GTK_WIDGET (button), FALSE); - } - } - - gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, - AUX_BETWEEN_BUTTON_GROUPS); + gtk_action_set_sensitive( GTK_ACTION(act), pickAlpha ); + g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_dropper_set_alpha), holder ); } - - aux_toolbox_space(tbl, AUX_BETWEEN_BUTTON_GROUPS); - - - // where new gtkmm stuff should go - - gtk_widget_show_all(tbl); - sp_set_font_size_smaller (tbl); - - /* - sigc::connection *connection = new sigc::connection( - desktop->connectSetStyle( - sigc::bind(sigc::ptr_fun(sp_style_changed), - desktop)) ); - - g_signal_connect(G_OBJECT(tbl), "destroy", G_CALLBACK(delete_connection), - connection); */ - - return tbl; } @@ -3318,11 +3887,10 @@ namespace { bool visible = false; void -sp_text_toolbox_selection_changed (Inkscape::Selection *selection, GObject *tbl) +sp_text_toolbox_selection_changed (Inkscape::Selection */*selection*/, GObject *tbl) { - SPStyle *query = - sp_style_new (); + sp_style_new (SP_ACTIVE_DOCUMENT); int result_family = sp_desktop_query_style (SP_ACTIVE_DESKTOP, query, QUERY_STYLE_PROPERTY_FONTFAMILY); @@ -3468,16 +4036,18 @@ sp_text_toolbox_selection_changed (Inkscape::Selection *selection, GObject *tbl) g_object_set_data (G_OBJECT (button), "block", gpointer(0)); g_object_set_data (G_OBJECT (button1), "block", gpointer(0)); } + + sp_style_unref(query); } void -sp_text_toolbox_selection_modified (Inkscape::Selection *selection, guint flags, GObject *tbl) +sp_text_toolbox_selection_modified (Inkscape::Selection *selection, guint /*flags*/, GObject *tbl) { sp_text_toolbox_selection_changed (selection, tbl); } void -sp_text_toolbox_subselection_changed (gpointer dragger, GObject *tbl) +sp_text_toolbox_subselection_changed (gpointer /*dragger*/, GObject *tbl) { sp_text_toolbox_selection_changed (NULL, tbl); } @@ -3493,6 +4063,8 @@ sp_text_toolbox_family_changed (GtkTreeSelection *selection, GtkTreeIter iter; char *family = 0; + (void)popdown; + gdk_pointer_ungrab (GDK_CURRENT_TIME); gdk_keyboard_ungrab (GDK_CURRENT_TIME); @@ -3508,13 +4080,10 @@ sp_text_toolbox_family_changed (GtkTreeSelection *selection, return; } - gtk_widget_hide (popdown); - visible = false; - gtk_entry_set_text (GTK_ENTRY (entry), family); SPStyle *query = - sp_style_new (); + sp_style_new (SP_ACTIVE_DOCUMENT); int result_numbers = sp_desktop_query_style (SP_ACTIVE_DESKTOP, query, QUERY_STYLE_PROPERTY_FONTNUMBERS); @@ -3533,6 +4102,8 @@ sp_text_toolbox_family_changed (GtkTreeSelection *selection, sp_desktop_set_style (desktop, css, true, true); } + sp_style_unref(query); + sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP), SP_VERB_CONTEXT_TEXT, _("Text: Change font family")); sp_repr_css_attr_unref (css); @@ -3605,7 +4176,7 @@ sp_text_toolbox_anchoring_toggled (GtkRadioButton *button, } SPStyle *query = - sp_style_new (); + sp_style_new (SP_ACTIVE_DOCUMENT); int result_numbers = sp_desktop_query_style (SP_ACTIVE_DESKTOP, query, QUERY_STYLE_PROPERTY_FONTNUMBERS); @@ -3615,6 +4186,8 @@ sp_text_toolbox_anchoring_toggled (GtkRadioButton *button, sp_repr_css_change (inkscape_get_repr (INKSCAPE, "tools.text"), css, "style"); } + sp_style_unref(query); + sp_desktop_set_style (desktop, css, true, true); sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP), SP_VERB_CONTEXT_TEXT, _("Text: Change alignment")); @@ -3651,7 +4224,7 @@ sp_text_toolbox_style_toggled (GtkToggleButton *button, } SPStyle *query = - sp_style_new (); + sp_style_new (SP_ACTIVE_DOCUMENT); int result_numbers = sp_desktop_query_style (SP_ACTIVE_DESKTOP, query, QUERY_STYLE_PROPERTY_FONTNUMBERS); @@ -3661,6 +4234,8 @@ sp_text_toolbox_style_toggled (GtkToggleButton *button, sp_repr_css_change (inkscape_get_repr (INKSCAPE, "tools.text"), css, "style"); } + sp_style_unref(query); + sp_desktop_set_style (desktop, css, true, true); sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP), SP_VERB_CONTEXT_TEXT, _("Text: Change font style")); @@ -3698,7 +4273,7 @@ sp_text_toolbox_orientation_toggled (GtkRadioButton *button, } SPStyle *query = - sp_style_new (); + sp_style_new (SP_ACTIVE_DOCUMENT); int result_numbers = sp_desktop_query_style (SP_ACTIVE_DESKTOP, query, QUERY_STYLE_PROPERTY_FONTNUMBERS); @@ -3717,7 +4292,7 @@ sp_text_toolbox_orientation_toggled (GtkRadioButton *button, } gboolean -sp_text_toolbox_size_keypress (GtkWidget *w, GdkEventKey *event, gpointer data) +sp_text_toolbox_size_keypress (GtkWidget */*w*/, GdkEventKey *event, gpointer /*data*/) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; if (!desktop) return FALSE; @@ -3737,7 +4312,7 @@ sp_text_toolbox_size_keypress (GtkWidget *w, GdkEventKey *event, gpointer data) } gboolean -sp_text_toolbox_family_keypress (GtkWidget *w, GdkEventKey *event, GObject *tbl) +sp_text_toolbox_family_keypress (GtkWidget */*w*/, GdkEventKey *event, GObject *tbl) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; if (!desktop) return FALSE; @@ -3753,12 +4328,14 @@ sp_text_toolbox_family_keypress (GtkWidget *w, GdkEventKey *event, GObject *tbl) } gboolean -sp_text_toolbox_family_list_keypress (GtkWidget *w, GdkEventKey *event, GObject *tbl) +sp_text_toolbox_family_list_keypress (GtkWidget *w, GdkEventKey *event, GObject */*tbl*/) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; if (!desktop) return FALSE; switch (get_group0_keyval (event)) { + case GDK_KP_Enter: + case GDK_Return: case GDK_Escape: // defocus gtk_widget_hide (w); visible = false; @@ -3778,23 +4355,14 @@ sp_text_toolbox_size_changed (GtkComboBox *cbox, if (g_object_get_data (tbl, "size-block")) return; -#if GTK_CHECK_VERSION(2,6,0) char *text = gtk_combo_box_get_active_text (cbox); -#else // GTK_CHECK_VERSION(2,6,0) - GtkTreeModel *model = gtk_combo_box_get_model (cbox); - GtkTreeIter iter; - char *text = NULL; - - if (gtk_combo_box_get_active_iter (cbox, &iter) && model) - gtk_tree_model_get (model, &iter, 0, &text, -1); -#endif // GTK_CHECK_VERSION(2,6,0) SPCSSAttr *css = sp_repr_css_attr_new (); sp_repr_css_set_property (css, "font-size", text); free (text); SPStyle *query = - sp_style_new (); + sp_style_new (SP_ACTIVE_DOCUMENT); int result_numbers = sp_desktop_query_style (SP_ACTIVE_DESKTOP, query, QUERY_STYLE_PROPERTY_FONTNUMBERS); @@ -3804,6 +4372,8 @@ sp_text_toolbox_size_changed (GtkComboBox *cbox, sp_repr_css_change (inkscape_get_repr (INKSCAPE, "tools.text"), css, "style"); } + sp_style_unref(query); + sp_desktop_set_style (desktop, css, true, true); sp_document_maybe_done (sp_desktop_document (SP_ACTIVE_DESKTOP), "ttb:size", SP_VERB_NONE, _("Text: Change font size")); @@ -3815,7 +4385,7 @@ sp_text_toolbox_size_changed (GtkComboBox *cbox, } void -sp_text_toolbox_text_popdown_clicked (GtkButton *button, +sp_text_toolbox_text_popdown_clicked (GtkButton */*button*/, GObject *tbl) { GtkWidget *popdown = GTK_WIDGET (g_object_get_data (tbl, "family-popdown-window")); @@ -3849,8 +4419,8 @@ sp_text_toolbox_text_popdown_clicked (GtkButton *button, gboolean sp_text_toolbox_entry_focus_in (GtkWidget *entry, - GdkEventFocus *event, - GObject *tbl) + GdkEventFocus */*event*/, + GObject */*tbl*/) { gtk_entry_select_region (GTK_ENTRY (entry), 0, -1); return FALSE; @@ -3858,8 +4428,8 @@ sp_text_toolbox_entry_focus_in (GtkWidget *entry, gboolean sp_text_toolbox_popdown_focus_out (GtkWidget *popdown, - GdkEventFocus *event, - GObject *tbl) + GdkEventFocus */*event*/, + GObject */*tbl*/) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; @@ -3870,11 +4440,11 @@ sp_text_toolbox_popdown_focus_out (GtkWidget *popdown, } void -cell_data_func (GtkTreeViewColumn *column, +cell_data_func (GtkTreeViewColumn */*column*/, GtkCellRenderer *cell, GtkTreeModel *tree_model, GtkTreeIter *iter, - gpointer data) + gpointer /*data*/) { char *family, *family_escaped, @@ -3896,7 +4466,7 @@ cell_data_func (GtkTreeViewColumn *column, free (sample_escaped); } -static void delete_completion(GObject *obj, GtkWidget *entry) { +static void delete_completion(GObject */*obj*/, GtkWidget *entry) { GObject *completion = (GObject *) gtk_object_get_data(GTK_OBJECT(entry), "completion"); if (completion) { gtk_entry_set_completion (GTK_ENTRY(entry), NULL); @@ -3952,9 +4522,7 @@ sp_text_toolbox_new (SPDesktop *desktop) gtk_tree_view_set_model (GTK_TREE_VIEW (treeview), GTK_TREE_MODEL (Glib::unwrap(store))); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); -#if GTK_CHECK_VERSION(2,6,0) gtk_tree_view_set_fixed_height_mode (GTK_TREE_VIEW (treeview), TRUE); -#endif // GTK_CHECK_VERSION(2,6,0) //gtk_tree_view_set_enable_search (GTK_TREE_VIEW (treeview), TRUE); @@ -4149,168 +4717,6 @@ sp_text_toolbox_new (SPDesktop *desktop) Inkscape::ConnectionPool::connect_destroy (G_OBJECT (tbl), pool); -#if 0 - // horizontal - { - GtkWidget *px= sp_icon_new(Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_WRITING_MODE_LR); - GtkWidget *b = group = gtk_radio_button_new (NULL); - gtk_container_add (GTK_CONTAINER (b), px); - gtk_tooltips_set_tip (tt, b, _("Horizontal text"), NULL); - gtk_button_set_relief (GTK_BUTTON (b), GTK_RELIEF_NONE); - gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE ); - gtk_box_pack_start (GTK_BOX (tbl), b, FALSE, FALSE, 0); - } - - // vertical - { - GtkWidget *px = sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_WRITING_MODE_TB); - GtkWidget *b = gtk_radio_button_new (gtk_radio_button_group (GTK_RADIO_BUTTON (group))); - gtk_container_add (GTK_CONTAINER (b), px); - gtk_tooltips_set_tip (tt, b, _("Vertical text"), NULL); - gtk_button_set_relief (GTK_BUTTON (b), GTK_RELIEF_NONE); - gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE ); - gtk_box_pack_start (GTK_BOX (tbl), b, FALSE, FALSE, 0); - } - - aux_toolbox_space(tbl, AUX_BETWEEN_BUTTON_GROUPS); - - // letter spacing - { - { - GtkWidget *image = sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_TEXT_LETTER_SPACING); - GtkWidget *hb = gtk_hbox_new(FALSE, 1); - gtk_container_add (GTK_CONTAINER (hb), image); - gtk_widget_show(image); - gtk_box_pack_start (GTK_BOX (tbl), hb, FALSE, FALSE, 0); - } - - { - GtkWidget *hb = sp_tb_spinbutton(_(""), _("Spacing between letters"), - "tools.text", "letter_spacing", 0.0, - us, tbl, FALSE, NULL, - -1000.0, 1000.0, 0.1, 0.1, - sp_text_letter_changed, 0.1, 1); - gtk_widget_set_size_request (hb, 45, 6); - gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, 6); - } - } - - // line spacing - { - { - GtkWidget *image = sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_TEXT_LINE_SPACING); - GtkWidget *hb = gtk_hbox_new(FALSE, 1); - gtk_container_add (GTK_CONTAINER (hb), image); - gtk_widget_show(image); - gtk_box_pack_start (GTK_BOX (tbl), hb, FALSE, FALSE, 0); - } - - { - GtkWidget *hb = sp_tb_spinbutton(_(""), _("Spacing between lines"), - "tools.text", "line_spacing", 0, - us, tbl, FALSE, NULL, - -1000.0, 1000.0, 0.1, 0.1, - sp_text_line_changed, 0.1, 1); - gtk_widget_set_size_request (hb, 45, 0); - gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, 3); - } - } - - { - // horizontal kerning/vertical kerning units menu: create - GtkWidget *us = sp_unit_selector_new(SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE); - sp_unit_selector_setsize(us, AUX_OPTION_MENU_WIDTH, AUX_OPTION_MENU_HEIGHT); - sp_unit_selector_set_unit(SP_UNIT_SELECTOR(us), desktop->namedview->doc_units); - - aux_toolbox_space(tbl, AUX_BETWEEN_BUTTON_GROUPS); - - // horizontal kerning - { - { - GtkWidget *image = sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_TEXT_HORZ_KERN); - GtkWidget *hb = gtk_hbox_new(FALSE, 1); - gtk_container_add (GTK_CONTAINER (hb), image); - gtk_widget_show(image); - gtk_box_pack_start (GTK_BOX (tbl), hb, FALSE, FALSE, 0); - } - - { - GtkWidget *hb = sp_tb_spinbutton(_(""), _("Horizontal kerning"), - "tools.text", "horizontal_kerning", 0, - us, tbl, FALSE, NULL, - -100.00, 100.00, 0.01, 0.1, - sp_text_horiz_kern_changed); - gtk_widget_set_size_request (hb, 45, 0); - gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, 6); - } - } - - // vertical kerning - { - { - GtkWidget *image = sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_TEXT_VERT_KERN); - GtkWidget *hb = gtk_hbox_new(FALSE, 1); - gtk_container_add (GTK_CONTAINER (hb), image); - gtk_widget_show(image); - gtk_box_pack_start (GTK_BOX (tbl), hb, FALSE, FALSE, 0); - } - - { - GtkWidget *hb = sp_tb_spinbutton(_(""), _("Vertical kerning"), - "tools.text", "vertical_kerning", 0, - us, tbl, FALSE, NULL, - -100.00, 100.00, 0.01, 0.1, - sp_text_vert_kern_changed); - gtk_widget_set_size_request (hb, 45, 0); - gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, 5); - } - } - - // add the units menu - gtk_widget_show(us); - gtk_box_pack_start(GTK_BOX(tbl), us, FALSE, FALSE, 1); - gtk_object_set_data(GTK_OBJECT(tbl), "units", us); - } - - // letter rotation - aux_toolbox_space(tbl, AUX_BETWEEN_BUTTON_GROUPS); - { - { - GtkWidget *image = sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_TEXT_ROTATION); - GtkWidget *hb = gtk_hbox_new(FALSE, 1); - gtk_container_add (GTK_CONTAINER (hb), image); - gtk_widget_show(image); - gtk_box_pack_start (GTK_BOX (tbl), hb, FALSE, FALSE, 0); - } - { - GtkWidget *hb = sp_tb_spinbutton(_(""), _("Letter rotation"), - "tools.text", "letter_rotation", 0, - us, tbl, FALSE, NULL, - -180.0, 180.0, 0.1, 0.1, - sp_text_letter_rotation_changed, 0.1, 1); - gtk_widget_set_size_request (hb, 45, 0); - gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, 6); - } - // rotation degree label - { - GtkWidget *label = gtk_widget_new (GTK_TYPE_LABEL, "label", "\302\260", "xalign", 0.0, NULL); - gtk_box_pack_start(GTK_BOX(tbl), label, FALSE, FALSE, 0); - } - } - - // Remove Manual Kerns - { - GtkWidget *px = sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_TEXT_REMOVE_KERNS); - GtkWidget *button = gtk_button_new (); - gtk_container_add (GTK_CONTAINER (button), px); - gtk_widget_show(button); - gtk_tooltips_set_tip (tt, button, _("Remove manual kerns"), NULL); - gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); - gtk_widget_set_sensitive(button, TRUE); - gtk_box_pack_start (GTK_BOX (tbl), button, FALSE, FALSE, AUX_BETWEEN_BUTTON_GROUPS); - } -#endif - gtk_widget_show_all (tbl); return tbl; @@ -4320,7 +4726,7 @@ sp_text_toolbox_new (SPDesktop *desktop) //######################### -//## Connector Toolbox ## +//## Connector ## //######################### static void sp_connector_path_set_avoid(void) @@ -4336,15 +4742,14 @@ static void sp_connector_path_set_ignore(void) -static void connector_spacing_changed(GtkAdjustment *adj, GtkWidget *tbl) +static void connector_spacing_changed(GtkAdjustment *adj, GObject* tbl) { // quit if run by the _changed callbacks - if (g_object_get_data(G_OBJECT(tbl), "freeze")) { + if (g_object_get_data( tbl, "freeze" )) { return; } - SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), - "desktop"); + SPDesktop *desktop = (SPDesktop *) g_object_get_data( tbl, "desktop" ); SPDocument *doc = sp_desktop_document(desktop); if (!sp_document_get_undo_sensitive(doc)) @@ -4352,11 +4757,21 @@ static void connector_spacing_changed(GtkAdjustment *adj, GtkWidget *tbl) return; } - // in turn, prevent callbacks from responding - g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(TRUE)); - Inkscape::XML::Node *repr = SP_OBJECT_REPR(desktop->namedview); + if ( repr->attribute("inkscape:connector-spacing") ) { + gdouble priorValue = gtk_adjustment_get_value(adj); + sp_repr_get_double( repr, "inkscape:connector-spacing", &priorValue ); + if ( priorValue == gtk_adjustment_get_value(adj) ) { + return; + } + } else if ( adj->value == defaultConnSpacing ) { + return; + } + + // in turn, prevent callbacks from responding + g_object_set_data( tbl, "freeze", GINT_TO_POINTER(TRUE) ); + sp_repr_set_css_double(repr, "inkscape:connector-spacing", adj->value); SP_OBJECT(desktop->namedview)->updateRepr(); @@ -4374,7 +4789,7 @@ static void connector_spacing_changed(GtkAdjustment *adj, GtkWidget *tbl) sp_document_done(doc, SP_VERB_CONTEXT_CONNECTOR, _("Change connector spacing")); - g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE)); + g_object_set_data( tbl, "freeze", GINT_TO_POINTER(FALSE) ); spinbutton_defocus(GTK_OBJECT(tbl)); } @@ -4394,10 +4809,9 @@ static void sp_connector_graph_layout(void) sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, _("Arrange connector network")); } -static void -sp_directed_graph_layout_toggled(GtkWidget *widget, GtkObject *tbl) +static void sp_directed_graph_layout_toggled( GtkToggleAction* act, GtkObject */*tbl*/ ) { - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) { + if ( gtk_toggle_action_get_active( act ) ) { prefs_set_string_attribute("tools.connector", "directedlayout", "true"); } else { @@ -4405,10 +4819,10 @@ sp_directed_graph_layout_toggled(GtkWidget *widget, GtkObject *tbl) "false"); } } -static void -sp_nooverlaps_graph_layout_toggled(GtkWidget *widget, GtkObject *tbl) + +static void sp_nooverlaps_graph_layout_toggled( GtkToggleAction* act, GtkObject */*tbl*/ ) { - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) { + if ( gtk_toggle_action_get_active( act ) ) { prefs_set_string_attribute("tools.connector", "avoidoverlaplayout", "true"); } else { @@ -4418,15 +4832,15 @@ sp_nooverlaps_graph_layout_toggled(GtkWidget *widget, GtkObject *tbl) } -static void connector_length_changed(GtkAdjustment *adj, GtkWidget *tbl) +static void connector_length_changed(GtkAdjustment *adj, GObject* tbl) { prefs_set_double_attribute("tools.connector", "length", adj->value); spinbutton_defocus(GTK_OBJECT(tbl)); } static void connector_tb_event_attr_changed(Inkscape::XML::Node *repr, - gchar const *name, gchar const *old_value, gchar const *new_value, - bool is_interactive, gpointer data) + gchar const *name, gchar const */*old_value*/, gchar const */*new_value*/, + bool /*is_interactive*/, gpointer data) { GtkWidget *tbl = GTK_WIDGET(data); @@ -4455,155 +4869,169 @@ static Inkscape::XML::NodeEventVector connector_tb_repr_events = { }; -static GtkWidget * -sp_connector_toolbox_new(SPDesktop *desktop) +static void sp_connector_toolbox_prep( SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder ) { - GtkTooltips *tt = gtk_tooltips_new(); - GtkWidget *tbl = gtk_hbox_new(FALSE, 0); - - gtk_object_set_data(GTK_OBJECT(tbl), "dtw", desktop->canvas); - gtk_object_set_data(GTK_OBJECT(tbl), "desktop", desktop); - - gtk_box_pack_start(GTK_BOX(tbl), gtk_hbox_new(FALSE, 0), FALSE, FALSE, - AUX_BETWEEN_BUTTON_GROUPS); - - sp_toolbox_button_new(tbl, Inkscape::ICON_SIZE_SMALL_TOOLBAR, - "connector_avoid", GTK_SIGNAL_FUNC(sp_connector_path_set_avoid), - tt, _("Make connectors avoid selected objects")); + { + InkAction* inky = ink_action_new( "ConnectorAvoidAction", + _("Avoid"), + _("Make connectors avoid selected objects"), + "connector_avoid", + Inkscape::ICON_SIZE_SMALL_TOOLBAR ); + g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_connector_path_set_avoid), holder ); + gtk_action_group_add_action( mainActions, GTK_ACTION(inky) ); + } - sp_toolbox_button_new(tbl, Inkscape::ICON_SIZE_SMALL_TOOLBAR, - "connector_ignore", GTK_SIGNAL_FUNC(sp_connector_path_set_ignore), - tt, _("Make connectors ignore selected objects")); + { + InkAction* inky = ink_action_new( "ConnectorIgnoreAction", + _("Ignore"), + _("Make connectors ignore selected objects"), + "connector_ignore", + Inkscape::ICON_SIZE_SMALL_TOOLBAR ); + g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_connector_path_set_ignore), holder ); + gtk_action_group_add_action( mainActions, GTK_ACTION(inky) ); + } - // interval - gtk_box_pack_start(GTK_BOX(tbl), gtk_hbox_new(FALSE, 0), FALSE, FALSE, - AUX_BETWEEN_BUTTON_GROUPS); + EgeAdjustmentAction* eact = 0; // Spacing spinbox - { - GtkWidget *object_spacing = sp_tb_spinbutton(_("Spacing:"), - _("The amount of space left around objects by auto-routing connectors"), - "tools.connector", "spacing", 10, NULL, tbl, TRUE, - "inkscape:connector-spacing", 0, 100, 1.0, 10.0, - connector_spacing_changed, 1, 0); + eact = create_adjustment_action( "ConnectorSpacingAction", + _("Connector Spacing"), _("Spacing:"), + _("The amount of space left around objects by auto-routing connectors"), + "tools.connector", "spacing", defaultConnSpacing, + GTK_WIDGET(desktop->canvas), NULL, holder, TRUE, "inkscape:connector-spacing", + 0, 100, 1.0, 10.0, + 0, 0, 0, + connector_spacing_changed, 1, 0 ); + gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); - gtk_box_pack_start(GTK_BOX(tbl), object_spacing, FALSE, FALSE, - AUX_SPACING); - } // Graph (connector network) layout - sp_toolbox_button_new(tbl, Inkscape::ICON_SIZE_SMALL_TOOLBAR, - "graph_layout", GTK_SIGNAL_FUNC(sp_connector_graph_layout), - tt, _("Nicely arrange selected connector network")); - // Default connector length spinbox { - GtkWidget *connector_length = sp_tb_spinbutton(_("Length:"), - _("Ideal length for connectors when layout is applied"), - "tools.connector", "length", 100, NULL, tbl, TRUE, - "inkscape:connector-length", 10, 1000, 10.0, 100.0, - connector_length_changed, 1, 0); - - gtk_box_pack_start(GTK_BOX(tbl), connector_length, FALSE, FALSE, - AUX_SPACING); + InkAction* inky = ink_action_new( "ConnectorGraphAction", + _("Graph"), + _("Nicely arrange selected connector network"), + "graph_layout", + Inkscape::ICON_SIZE_SMALL_TOOLBAR ); + g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_connector_graph_layout), holder ); + gtk_action_group_add_action( mainActions, GTK_ACTION(inky) ); } - gchar const *tbuttonstate; + + // Default connector length spinbox + eact = create_adjustment_action( "ConnectorLengthAction", + _("Connector Length"), _("Length:"), + _("Ideal length for connectors when layout is applied"), + "tools.connector", "length", 100, + GTK_WIDGET(desktop->canvas), NULL, holder, TRUE, "inkscape:connector-length", + 10, 1000, 10.0, 100.0, + 0, 0, 0, + connector_length_changed, 1, 0 ); + gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); + + // Directed edges toggle button { - GtkWidget *tbutton = gtk_toggle_button_new (); - gtk_button_set_relief (GTK_BUTTON (tbutton), GTK_RELIEF_NONE); - gtk_container_add (GTK_CONTAINER (tbutton), sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, "directed_graph")); - gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (tbutton), FALSE); - gtk_tooltips_set_tip(tt, tbutton, _("Make connectors with end-markers (arrows) point downwards"), NULL); - - gtk_box_pack_start (GTK_BOX (tbl), tbutton, FALSE, FALSE, 0); - g_signal_connect(G_OBJECT(tbutton), "toggled", GTK_SIGNAL_FUNC(sp_directed_graph_layout_toggled), tbl); - tbuttonstate = prefs_get_string_attribute("tools.connector", "directedlayout"); - gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(tbutton), - (tbuttonstate && !strcmp(tbuttonstate, "true"))?TRUE:FALSE ); + InkToggleAction* act = ink_toggle_action_new( "ConnectorDirectedAction", + _("Downwards"), + _("Make connectors with end-markers (arrows) point downwards"), + "directed_graph", + Inkscape::ICON_SIZE_DECORATION ); + gtk_action_group_add_action( mainActions, GTK_ACTION( act ) ); + + gchar const* tbuttonstate = prefs_get_string_attribute( "tools.connector", "directedlayout" ); + gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), + (tbuttonstate && !strcmp(tbuttonstate, "true")) ? TRUE:FALSE ); + + g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(sp_directed_graph_layout_toggled), holder ); } + // Avoid overlaps toggle button { - GtkWidget *tbutton = gtk_toggle_button_new (); - gtk_button_set_relief (GTK_BUTTON (tbutton), GTK_RELIEF_NONE); - gtk_container_add (GTK_CONTAINER (tbutton), sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, "remove_overlaps")); - gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (tbutton), FALSE); - gtk_tooltips_set_tip(tt, tbutton, _("Do not allow overlapping shapes"), NULL); + InkToggleAction* act = ink_toggle_action_new( "ConnectorOverlapAction", + _("Remove overlaps"), + _("Do not allow overlapping shapes"), + "remove_overlaps", + Inkscape::ICON_SIZE_DECORATION ); + gtk_action_group_add_action( mainActions, GTK_ACTION( act ) ); - gtk_box_pack_start (GTK_BOX (tbl), tbutton, FALSE, FALSE, 0); - g_signal_connect(G_OBJECT(tbutton), "toggled", GTK_SIGNAL_FUNC(sp_nooverlaps_graph_layout_toggled), tbl); - tbuttonstate = prefs_get_string_attribute("tools.connector", "avoidoverlaplayout"); - gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(tbutton), - (tbuttonstate && !strcmp(tbuttonstate, "true"))?TRUE:FALSE ); - } + gchar const* tbuttonstate = prefs_get_string_attribute( "tools.connector", "avoidoverlaplayout" ); + gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), + (tbuttonstate && !strcmp(tbuttonstate, "true")) ? TRUE:FALSE ); - gtk_widget_show_all(tbl); - sp_set_font_size_smaller (tbl); + g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(sp_nooverlaps_graph_layout_toggled), holder ); + } // Code to watch for changes to the connector-spacing attribute in // the XML. Inkscape::XML::Node *repr = SP_OBJECT_REPR(desktop->namedview); g_assert(repr != NULL); - Inkscape::XML::Node *oldrepr = (Inkscape::XML::Node *) - gtk_object_get_data(GTK_OBJECT(tbl), "repr"); - - if (oldrepr) { // remove old listener - sp_repr_remove_listener_by_data(oldrepr, tbl); - Inkscape::GC::release(oldrepr); - oldrepr = NULL; - g_object_set_data(G_OBJECT(tbl), "repr", NULL); - } + purge_repr_listener( holder, holder ); if (repr) { - g_object_set_data(G_OBJECT(tbl), "repr", repr); + g_object_set_data( holder, "repr", repr ); Inkscape::GC::anchor(repr); - sp_repr_add_listener(repr, &connector_tb_repr_events, tbl); - sp_repr_synthesize_events(repr, &connector_tb_repr_events, tbl); + sp_repr_add_listener( repr, &connector_tb_repr_events, holder ); + sp_repr_synthesize_events( repr, &connector_tb_repr_events, holder ); } +} // end of sp_connector_toolbox_prep() - return tbl; -} // end of sp_connector_toolbox_new() +//######################### +//## Paintbucket ## +//######################### -static void paintbucket_channels_changed(EgeSelectOneAction* act, GtkWidget* tbl) +static void paintbucket_channels_changed(EgeSelectOneAction* act, GObject* /*tbl*/) { gint channels = ege_select_one_action_get_active( act ); flood_channels_set_channels( channels ); } -static void paintbucket_threshold_changed(GtkAdjustment *adj, GtkWidget *tbl) +static void paintbucket_threshold_changed(GtkAdjustment *adj, GObject */*tbl*/) { prefs_set_int_attribute("tools.paintbucket", "threshold", (gint)adj->value); } -static void paintbucket_offset_changed(GtkAdjustment *adj, GtkWidget *tbl) +static void paintbucket_autogap_changed(EgeSelectOneAction* act, GObject */*tbl*/) { - UnitTracker* tracker = reinterpret_cast(gtk_object_get_data(GTK_OBJECT(tbl), "tracker")); - SPUnit const *unit = tracker->getActiveUnit(); + prefs_set_int_attribute("tools.paintbucket", "autogap", ege_select_one_action_get_active( act )); +} +static void paintbucket_offset_changed(GtkAdjustment *adj, GObject *tbl) +{ + UnitTracker* tracker = static_cast(g_object_get_data( tbl, "tracker" )); + SPUnit const *unit = tracker->getActiveUnit(); prefs_set_double_attribute("tools.paintbucket", "offset", (gdouble)sp_units_get_pixels(adj->value, *unit)); - spinbutton_defocus(GTK_OBJECT(tbl)); + + prefs_set_string_attribute("tools.paintbucket", "offsetunits", sp_unit_get_abbreviation(unit)); } -static GtkWidget * -sp_paintbucket_toolbox_new(SPDesktop *desktop) +static void paintbucket_defaults(GtkWidget *, GObject *dataKludge) { - GtkWidget *holder = gtk_hbox_new(FALSE, 0); - gtk_object_set_data(GTK_OBJECT(holder), "dtw", desktop->canvas); - gtk_object_set_data(GTK_OBJECT(holder), "desktop", desktop); + // FIXME: make defaults settable via Inkscape Options + struct KeyValue { + char const *key; + double value; + } const key_values[] = { + {"threshold", 15}, + {"offset", 0.0} + }; - gchar const * descr = - "" - " " - " " - " " - " " - " " - " " - " " - ""; - GtkActionGroup* mainActions = gtk_action_group_new("main"); + for (unsigned i = 0; i < G_N_ELEMENTS(key_values); ++i) { + KeyValue const &kv = key_values[i]; + GtkAdjustment* adj = static_cast(g_object_get_data(dataKludge, kv.key)); + if ( adj ) { + gtk_adjustment_set_value(adj, kv.value); + } + } + + EgeSelectOneAction* channels_action = EGE_SELECT_ONE_ACTION( g_object_get_data( dataKludge, "channels_action" ) ); + ege_select_one_action_set_active( channels_action, FLOOD_CHANNELS_RGB ); + EgeSelectOneAction* autogap_action = EGE_SELECT_ONE_ACTION( g_object_get_data( dataKludge, "autogap_action" ) ); + ege_select_one_action_set_active( autogap_action, 0 ); +} +static void sp_paintbucket_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder) +{ EgeAdjustmentAction* eact = 0; { @@ -4620,17 +5048,20 @@ sp_paintbucket_toolbox_new(SPDesktop *desktop) } g_list_free( items ); items = 0; - EgeSelectOneAction* act1 = ege_select_one_action_new( "ChannelsAction", _("Fill by:"), _(""), NULL, GTK_TREE_MODEL(model) ); + EgeSelectOneAction* act1 = ege_select_one_action_new( "ChannelsAction", _("Fill by"), (""), NULL, GTK_TREE_MODEL(model) ); + g_object_set( act1, "short_label", _("Fill by:"), NULL ); + ege_select_one_action_set_appearance( act1, "compact" ); ege_select_one_action_set_active( act1, prefs_get_int_attribute("tools.paintbucket", "channels", 0) ); g_signal_connect( G_OBJECT(act1), "changed", G_CALLBACK(paintbucket_channels_changed), holder ); gtk_action_group_add_action( mainActions, GTK_ACTION(act1) ); + g_object_set_data( holder, "channels_action", act1 ); } // Spacing spinbox { eact = create_adjustment_action( "ThresholdAction", - _("Threshold:"), + _("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), NULL, holder, TRUE, "inkscape:paintbucket-threshold", 0, 100.0, 1.0, 10.0, @@ -4642,10 +5073,10 @@ sp_paintbucket_toolbox_new(SPDesktop *desktop) // Create the units menu. UnitTracker* tracker = new UnitTracker( SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE ); - tracker->setActiveUnit( sp_desktop_namedview(desktop)->doc_units ); - gtk_object_set_data( GTK_OBJECT(holder), "tracker", tracker ); + tracker->setActiveUnit(sp_unit_get_by_abbreviation(prefs_get_string_attribute("tools.paintbucket", "offsetunits"))); + g_object_set_data( holder, "tracker", tracker ); { - GtkAction* act = tracker->createAction( "PaintbucketUnitsAction", _("Units"), _("") ); + GtkAction* act = tracker->createAction( "PaintbucketUnitsAction", _("Units"), ("") ); gtk_action_group_add_action( mainActions, act ); } @@ -4653,7 +5084,7 @@ sp_paintbucket_toolbox_new(SPDesktop *desktop) { eact = create_adjustment_action( "OffsetAction", - _("Grow/shrink by:"), + _("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), NULL/*us*/, holder, TRUE, "inkscape:paintbucket-offset", -1e6, 1e6, 0.1, 0.5, @@ -4664,31 +5095,41 @@ sp_paintbucket_toolbox_new(SPDesktop *desktop) gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); } + /* Auto Gap */ + { + GtkListStore* model = gtk_list_store_new( 2, G_TYPE_STRING, G_TYPE_INT ); - GtkUIManager* mgr = gtk_ui_manager_new(); - GError* errVal = 0; - - gtk_ui_manager_insert_action_group( mgr, mainActions, 0 ); - gtk_ui_manager_add_ui_from_string( mgr, descr, -1, &errVal ); - - GtkWidget* toolBar = gtk_ui_manager_get_widget( mgr, "/ui/PaintbucketToolbar" ); - gtk_toolbar_set_style( GTK_TOOLBAR(toolBar), GTK_TOOLBAR_ICONS ); - gtk_toolbar_set_icon_size( GTK_TOOLBAR(toolBar), GTK_ICON_SIZE_SMALL_TOOLBAR ); - - gtk_box_pack_start( GTK_BOX(holder), toolBar, TRUE, TRUE, 0 ); - - - Inkscape::UI::Widget::StyleSwatch *swatch = new Inkscape::UI::Widget::StyleSwatch(NULL, _("Style of Paint Bucket fill objects")); - swatch->setDesktop (desktop); - swatch->setClickVerb (SP_VERB_CONTEXT_PAINTBUCKET_PREFS); - swatch->setWatchedTool ("tools.paintbucket", true); - GtkWidget *swatch_ = GTK_WIDGET(swatch->gobj()); - gtk_box_pack_end( GTK_BOX(holder), swatch_, FALSE, FALSE, 0 ); + GList* items = 0; + gint count = 0; + for ( items = flood_autogap_dropdown_items_list(); items ; items = g_list_next(items) ) + { + GtkTreeIter iter; + gtk_list_store_append( model, &iter ); + gtk_list_store_set( model, &iter, 0, reinterpret_cast(items->data), 1, count, -1 ); + count++; + } + g_list_free( items ); + items = 0; + EgeSelectOneAction* act2 = ege_select_one_action_new( "AutoGapAction", _("Close gaps"), (""), NULL, GTK_TREE_MODEL(model) ); + g_object_set( act2, "short_label", _("Close gaps:"), NULL ); + ege_select_one_action_set_appearance( act2, "compact" ); + ege_select_one_action_set_active( act2, prefs_get_int_attribute("tools.paintbucket", "autogap", 0) ); + g_signal_connect( G_OBJECT(act2), "changed", G_CALLBACK(paintbucket_autogap_changed), holder ); + gtk_action_group_add_action( mainActions, GTK_ACTION(act2) ); + g_object_set_data( holder, "autogap_action", act2 ); + } - gtk_widget_show_all( holder ); - sp_set_font_size_smaller( holder ); + /* Reset */ + { + GtkAction* act = gtk_action_new( "PaintbucketResetAction", + _("Defaults"), + _("Reset paint bucket parameters to defaults (use Inkscape Preferences > Tools to change defaults)"), + GTK_STOCK_CLEAR ); + g_signal_connect_after( G_OBJECT(act), "activate", G_CALLBACK(paintbucket_defaults), holder ); + gtk_action_group_add_action( mainActions, act ); + gtk_action_set_sensitive( act, TRUE ); + } - return holder; } /*