X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwidgets%2Ftoolbox.cpp;h=1e4401f106d9bb364dafeaa88bb199aff09ce92c;hb=f7c0e9e8ec67fe896289e0434cee2f6dae571ce7;hp=7ff4f115e2e00d4ef5732fdb84f0442d1d822c7f;hpb=4ec52515516e3a6bf2fbc3ed01a7e179bde16d20;p=inkscape.git diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 7ff4f115e..1e4401f10 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -76,6 +76,7 @@ #include "../prefs-utils.h" #include "../inkscape-stock.h" #include "icon.h" +#include "graphlayout/graphlayout.h" #include "mod360.h" @@ -851,7 +852,7 @@ sp_stb_magnitude_value_changed(GtkAdjustment *adj, GtkWidget *tbl) } } if (modmade) sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_STAR, - /* TODO: annotate */ "toolbox.cpp:854"); + _("Star: Change number of corners")); g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE)); @@ -896,7 +897,7 @@ sp_stb_proportion_value_changed(GtkAdjustment *adj, GtkWidget *tbl) } if (modmade) sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_STAR, - /* TODO: annotate */ "toolbox.cpp:899"); + _("Star: Change spike ratio")); g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE)); @@ -950,7 +951,7 @@ sp_stb_sides_flat_state_changed(GtkWidget *widget, GtkObject *tbl) } } if (modmade) sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_STAR, - /* TODO: annotate */ "toolbox.cpp:953"); + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))? _("Make polygon") : _("Make star")); g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE)); @@ -987,7 +988,7 @@ sp_stb_rounded_value_changed(GtkAdjustment *adj, GtkWidget *tbl) } } if (modmade) sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_STAR, - /* TODO: annotate */ "toolbox.cpp:990"); + _("Star: Change rounding")); g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE)); @@ -1025,7 +1026,7 @@ sp_stb_randomized_value_changed(GtkAdjustment *adj, GtkWidget *tbl) } } if (modmade) sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_STAR, - /* TODO: annotate */ "toolbox.cpp:1028"); + _("Star: Change randomization")); g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE)); @@ -1365,7 +1366,7 @@ sp_rtb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_name if (modmade) { sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_RECT, - /* TODO: annotate */ "toolbox.cpp:1368"); + _("Change rectangle")); } g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE)); @@ -1682,7 +1683,7 @@ sp_spl_tb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_n if (modmade) { sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_SPIRAL, - /* TODO: annotate */ "toolbox.cpp:1685"); + _("Change spiral")); } g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE)); @@ -1942,9 +1943,9 @@ sp_ddc_mass_value_changed(GtkAdjustment *adj, GtkWidget *tbl) } static void -sp_ddc_drag_value_changed(GtkAdjustment *adj, GtkWidget *tbl) +sp_ddc_wiggle_value_changed(GtkAdjustment *adj, GtkWidget *tbl) { - prefs_set_double_attribute("tools.calligraphic", "drag", adj->value); + prefs_set_double_attribute("tools.calligraphic", "wiggle", adj->value); spinbutton_defocus(GTK_OBJECT(tbl)); } @@ -1983,6 +1984,13 @@ sp_ddc_tremor_value_changed(GtkAdjustment *adj, GtkWidget *tbl) spinbutton_defocus(GTK_OBJECT(tbl)); } +static void +sp_ddc_cap_rounding_value_changed(GtkAdjustment *adj, GtkWidget *tbl) +{ + prefs_set_double_attribute("tools.calligraphic", "cap_rounding", adj->value); + spinbutton_defocus(GTK_OBJECT(tbl)); +} + static void sp_ddc_pressure_state_changed(GtkWidget *button, gpointer data) { @@ -2005,12 +2013,13 @@ static void sp_ddc_defaults(GtkWidget *, GtkWidget *tbl) double value; } const key_values[] = { {"mass", 0.02}, - {"drag", 1.0}, + {"wiggle", 0.0}, {"angle", 30.0}, {"width", 15}, {"thinning", 0.1}, {"tremor", 0.0}, - {"flatness", 0.9} + {"flatness", 0.9}, + {"cap_rounding", 0.0} }; for (unsigned i = 0; i < G_N_ELEMENTS(key_values); ++i) { @@ -2070,7 +2079,7 @@ sp_calligraphy_toolbox_new(SPDesktop *desktop) /* Fixation */ { - GtkWidget *hb = sp_tb_spinbutton(_("Fixation:"), _("How fixed is the pen angle (0 = always perpendicular to stroke direction, 1 = fixed)"), + GtkWidget *hb = sp_tb_spinbutton(_("Fixation:"), _("Angle behavior (0 = nib always perpendicular to stroke direction, 1 = fixed angle)"), "tools.calligraphic", "flatness", 0.9, NULL, tbl, FALSE, NULL, 0.0, 1.0, 0.01, 0.1, @@ -2078,36 +2087,48 @@ sp_calligraphy_toolbox_new(SPDesktop *desktop) gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, AUX_SPACING); } + /* Cap Rounding */ + { + // TRANSLATORS: "cap" means "end" (both start and finish) here + GtkWidget *hb = sp_tb_spinbutton(_("Round:"), _("Increase to round the ends of strokes"), + "tools.calligraphic", "cap_rounding", 0.0, + NULL, tbl, FALSE, NULL, + 0.0, 1.0, 0.01, 0.1, + sp_ddc_cap_rounding_value_changed, 0.01, 2); + gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, AUX_SPACING); + } + // interval gtk_box_pack_start(GTK_BOX(tbl), gtk_hbox_new(FALSE, 0), FALSE, FALSE, AUX_BETWEEN_BUTTON_GROUPS); /* Tremor */ { - GtkWidget *hb = sp_tb_spinbutton(_("Tremor:"), _("How uneven or trembling is the pen stroke"), + GtkWidget *hb = sp_tb_spinbutton(_("Tremor:"), _("Increase to make strokes rugged and trembling"), "tools.calligraphic", "tremor", 0.0, NULL, tbl, FALSE, NULL, 0.0, 1.0, 0.01, 0.1, sp_ddc_tremor_value_changed, 0.01, 2); gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, AUX_SPACING); } - /* Mass */ + + /* Wiggle */ { - GtkWidget *hb = sp_tb_spinbutton(_("Mass:"), _("How much inertia affects the movement of the pen"), - "tools.calligraphic", "mass", 0.02, + GtkWidget *hb = sp_tb_spinbutton(_("Wiggle:"), _("Increase to make the pen waver and wiggle"), + "tools.calligraphic", "wiggle", 0.0, NULL, tbl, FALSE, NULL, 0.0, 1.0, 0.01, 0.1, - sp_ddc_mass_value_changed, 0.01, 2); + sp_ddc_wiggle_value_changed, 0.01, 2); gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, AUX_SPACING); } - /* Drag */ + + /* Mass */ { - // TRANSLATORS: "drag" means "resistance" here - GtkWidget *hb = sp_tb_spinbutton(_("Drag:"), _("How much resistance affects the movement of the pen"), - "tools.calligraphic", "drag", 1, + GtkWidget *hb = sp_tb_spinbutton(_("Mass:"), _("Increase to make the pen drag behind, as if slowed by inertia"), + "tools.calligraphic", "mass", 0.02, NULL, tbl, FALSE, NULL, 0.0, 1.0, 0.01, 0.1, - sp_ddc_drag_value_changed, 0.01, 2); + sp_ddc_mass_value_changed, 0.01, 2); gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, AUX_SPACING); } @@ -2244,7 +2265,7 @@ sp_arctb_startend_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const if (modmade) { sp_document_maybe_done(sp_desktop_document(desktop), value_name, SP_VERB_CONTEXT_ARC, - /* TODO: annotate */ "toolbox.cpp:2247"); + _("Arc: Change start/end")); } // defocus spinbuttons by moving focus to the canvas, unless "stay" is on @@ -2317,7 +2338,7 @@ sp_arctb_open_state_changed(GtkWidget *widget, GtkObject *tbl) if (modmade) { sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_ARC, - /* TODO: annotate */ "toolbox.cpp:2320"); + _("Arc: Change open/closed")); } g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE)); @@ -2535,10 +2556,22 @@ sp_arc_toolbox_new(SPDesktop *desktop) //## Dropper ## //######################## -static void toggle_dropper_color_pick (GtkWidget *button, gpointer data) { +static void toggle_dropper_pick_alpha (GtkWidget *button, gpointer tbl) { prefs_set_int_attribute ("tools.dropper", "pick", - // 0 and 1 are backwards here because of pref - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)) ? 0 : 1); + 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); + } else { + gtk_widget_set_sensitive (GTK_WIDGET (set_checkbox), FALSE); + } + } +} + +static void toggle_dropper_set_alpha (GtkWidget *button, gpointer data) { + prefs_set_int_attribute ("tools.dropper", "setalpha", + gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)) ? 1 : 0); } @@ -2721,26 +2754,43 @@ sp_dropper_toolbox_new(SPDesktop *desktop) { GtkWidget *hb = gtk_hbox_new(FALSE, 1); - - GtkWidget *button = - sp_button_new_from_data( Inkscape::ICON_SIZE_DECORATION, - SP_BUTTON_TYPE_TOGGLE, - NULL, - "pick_color", - _("When pressed, picks visible color " - "without alpha and when not pressed, " - "picks color including its " - "alpha"), - tt); + 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); + } - g_signal_connect_after (G_OBJECT (button), "clicked", - G_CALLBACK (toggle_dropper_color_pick), NULL); + { + 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", - "pick", 0)); + 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); + + // 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); } @@ -3021,7 +3071,7 @@ sp_text_toolbox_family_changed (GtkTreeSelection *selection, } sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP), SP_VERB_CONTEXT_TEXT, - /* TODO: annotate */ "toolbox.cpp:3024"); + _("Text: Change font family")); sp_repr_css_attr_unref (css); free (family); gtk_widget_hide (GTK_WIDGET (g_object_get_data (G_OBJECT(tbl), "warning-image"))); @@ -3104,7 +3154,7 @@ sp_text_toolbox_anchoring_toggled (GtkRadioButton *button, sp_desktop_set_style (desktop, css, true, true); sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP), SP_VERB_CONTEXT_TEXT, - /* TODO: annotate */ "toolbox.cpp:3107"); + _("Text: Change alignment")); sp_repr_css_attr_unref (css); gtk_widget_grab_focus (GTK_WIDGET(desktop->canvas)); @@ -3150,7 +3200,7 @@ sp_text_toolbox_style_toggled (GtkToggleButton *button, sp_desktop_set_style (desktop, css, true, true); sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP), SP_VERB_CONTEXT_TEXT, - /* TODO: annotate */ "toolbox.cpp:3153"); + _("Text: Change font style")); sp_repr_css_attr_unref (css); gtk_widget_grab_focus (GTK_WIDGET(desktop->canvas)); @@ -3197,7 +3247,7 @@ sp_text_toolbox_orientation_toggled (GtkRadioButton *button, sp_desktop_set_style (desktop, css, true, true); sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP), SP_VERB_CONTEXT_TEXT, - /* TODO: annotate */ "toolbox.cpp:3200"); + _("Text: Change orientation")); sp_repr_css_attr_unref (css); gtk_widget_grab_focus (GTK_WIDGET(desktop->canvas)); @@ -3293,7 +3343,7 @@ sp_text_toolbox_size_changed (GtkComboBox *cbox, sp_desktop_set_style (desktop, css, true, true); sp_document_maybe_done (sp_desktop_document (SP_ACTIVE_DESKTOP), "ttb:size", SP_VERB_NONE, - /* TODO: annotate */ "toolbox.cpp:3296"); + _("Text: Change font size")); sp_repr_css_attr_unref (css); @@ -3383,6 +3433,14 @@ cell_data_func (GtkTreeViewColumn *column, free (sample_escaped); } +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); + g_object_unref (completion); + } +} + GtkWidget* sp_text_toolbox_new (SPDesktop *desktop) { @@ -3408,8 +3466,10 @@ sp_text_toolbox_new (SPDesktop *desktop) gtk_entry_completion_set_minimum_key_length (completion, 1); g_object_set (G_OBJECT(completion), "inline-completion", TRUE, "popup-completion", TRUE, NULL); gtk_entry_set_completion (GTK_ENTRY(entry), completion); + gtk_object_set_data(GTK_OBJECT(entry), "completion", completion); aux_toolbox_space (tbl, 1); gtk_box_pack_start (GTK_BOX (tbl), entry, FALSE, FALSE, 0); + g_signal_connect(G_OBJECT(tbl), "destroy", G_CALLBACK(delete_completion), entry); //Button GtkWidget *button = gtk_button_new (); @@ -3812,6 +3872,7 @@ static void sp_connector_path_set_ignore(void) } + static void connector_spacing_changed(GtkAdjustment *adj, GtkWidget *tbl) { // quit if run by the _changed callbacks @@ -3848,13 +3909,57 @@ static void connector_spacing_changed(GtkAdjustment *adj, GtkWidget *tbl) } sp_document_done(doc, SP_VERB_CONTEXT_CONNECTOR, - /* TODO: annotate */ "toolbox.cpp:3851"); + _("Change connector spacing")); g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE)); spinbutton_defocus(GTK_OBJECT(tbl)); } +static void sp_connector_graph_layout(void) +{ + if (!SP_ACTIVE_DESKTOP) return; + + // hack for clones, see comment in align-and-distribute.cpp + int saved_compensation = prefs_get_int_attribute("options.clonecompensation", "value", SP_CLONE_COMPENSATION_UNMOVED); + prefs_set_int_attribute("options.clonecompensation", "value", SP_CLONE_COMPENSATION_UNMOVED); + + graphlayout(sp_desktop_selection(SP_ACTIVE_DESKTOP)->itemList()); + + prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation); + + 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) +{ + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) { + prefs_set_string_attribute("tools.connector", "directedlayout", + "true"); + } else { + prefs_set_string_attribute("tools.connector", "directedlayout", + "false"); + } +} +static void +sp_nooverlaps_graph_layout_toggled(GtkWidget *widget, GtkObject *tbl) +{ + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) { + prefs_set_string_attribute("tools.connector", "avoidoverlaplayout", + "true"); + } else { + prefs_set_string_attribute("tools.connector", "avoidoverlaplayout", + "false"); + } +} + + +static void connector_length_changed(GtkAdjustment *adj, GtkWidget *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, @@ -3922,6 +4027,50 @@ sp_connector_toolbox_new(SPDesktop *desktop) 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); + } + gchar const *tbuttonstate; + // 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 ); + } + // 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); + + 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 ); + } gtk_widget_show_all(tbl); sp_set_font_size_smaller (tbl);