From: buliabyak Date: Thu, 5 Oct 2006 09:26:44 +0000 (+0000) Subject: undo annotations X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=469c9ea92e7d1cc3fec6a26cc79ac54c6ff5b3df;p=inkscape.git undo annotations --- diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp index 731db1403..65cc56964 100644 --- a/src/dropper-context.cpp +++ b/src/dropper-context.cpp @@ -392,7 +392,7 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event) if (!(sp_desktop_selection(ec->desktop)->isEmpty())) { sp_document_done(sp_desktop_document(ec->desktop), SP_VERB_CONTEXT_DROPPER, - /* TODO: annotate */ "dropper-context.cpp:389"); + _("Set picked color")); } ret = TRUE; diff --git a/src/dyna-draw-context.cpp b/src/dyna-draw-context.cpp index e4fac3293..ed7384804 100644 --- a/src/dyna-draw-context.cpp +++ b/src/dyna-draw-context.cpp @@ -27,6 +27,7 @@ #include #include +#include #include "svg/svg.h" #include "display/canvas-bpath.h" @@ -698,7 +699,7 @@ set_to_accumulated(SPDynaDrawContext *dc) } sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_CALLIGRAPHIC, - /* TODO: annotate */ "dyna-draw-context.cpp:689"); + _("Create calligraphic stroke")); } static void diff --git a/src/file.cpp b/src/file.cpp index f8ebc9809..3a2301c6d 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -463,7 +463,7 @@ sp_file_vacuum() unsigned int diff = vacuum_document (doc); sp_document_done(doc, SP_VERB_FILE_VACUUM, - /* TODO: annotate */ "file.cpp:515"); + _("Vacuum <defs>")); SPDesktop *dt = SP_ACTIVE_DESKTOP; if (diff > 0) { @@ -849,7 +849,7 @@ file_import(SPDocument *in_doc, const Glib::ustring &uri, sp_document_unref(doc); sp_document_done(in_doc, SP_VERB_FILE_IMPORT, - /* TODO: annotate */ "file.cpp:900"); + _("Import")); } else { gchar *text = g_strdup_printf(_("Failed to load the requested file %s"), uri.c_str()); diff --git a/src/gradient-context.cpp b/src/gradient-context.cpp index bf1281f82..05080b3e0 100644 --- a/src/gradient-context.cpp +++ b/src/gradient-context.cpp @@ -161,7 +161,7 @@ static gint sp_gradient_context_root_handler(SPEventContext *event_context, GdkE } sp_document_done (sp_desktop_document (desktop), SP_VERB_CONTEXT_GRADIENT, - /* TODO: annotate */ "gradient-context.cpp:164"); + _("Create default gradient")); ret = TRUE; } @@ -367,7 +367,7 @@ static gint sp_gradient_context_root_handler(SPEventContext *event_context, GdkE } // we did an undoable action sp_document_done (sp_desktop_document (desktop), SP_VERB_CONTEXT_GRADIENT, - /* TODO: annotate */ "gradient-context.cpp:370"); + _("Invert gradient")); ret = TRUE; } break; diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp index e4c7a62da..465f57b86 100644 --- a/src/gradient-drag.cpp +++ b/src/gradient-drag.cpp @@ -383,7 +383,7 @@ gr_knot_moved_handler(SPKnot *knot, NR::Point const *ppointer, guint state, gpoi d_new->updateTip (); d_new->updateDependencies(true); sp_document_done (sp_desktop_document (d_new->parent->desktop), SP_VERB_CONTEXT_GRADIENT, - /* TODO: annotate */ "gradient-drag.cpp:386"); + _("Merge gradient handles")); return; } } @@ -515,7 +515,7 @@ gr_knot_ungrabbed_handler (SPKnot *knot, unsigned int state, gpointer data) // we did an undoable action sp_document_done (sp_desktop_document (dragger->parent->desktop), SP_VERB_CONTEXT_GRADIENT, - /* TODO: annotate */ "gradient-drag.cpp:518"); + _("Move gradient handle")); } /** @@ -1068,7 +1068,7 @@ GrDrag::selected_move (double x, double y) // we did an undoable action sp_document_done (sp_desktop_document (desktop), SP_VERB_CONTEXT_GRADIENT, - /* TODO: annotate */ "gradient-drag.cpp:1071"); + _("Move gradient handle")); } void diff --git a/src/interface.cpp b/src/interface.cpp index b31853cf3..17248a206 100644 --- a/src/interface.cpp +++ b/src/interface.cpp @@ -1040,7 +1040,7 @@ sp_ui_drag_data_received(GtkWidget *widget, SPDocument *doc = SP_ACTIVE_DOCUMENT; sp_document_done( doc , SP_VERB_NONE, - /* TODO: annotate */ "interface.cpp:1047"); + _("Drop color")); if ( srgbProf ) { cmsCloseProfile( srgbProf ); @@ -1082,7 +1082,7 @@ sp_ui_drag_data_received(GtkWidget *widget, SPDocument *doc = SP_ACTIVE_DOCUMENT; sp_document_done( doc , SP_VERB_NONE, - /* TODO: annotate */ "interface.cpp:1089"); + _("Drop color")); } } } @@ -1136,7 +1136,7 @@ sp_ui_drag_data_received(GtkWidget *widget, Inkscape::GC::release(newgroup); sp_document_done(doc, SP_VERB_NONE, - /* TODO: annotate */ "interface.cpp:1143"); + _("Drop SVG")); break; } @@ -1196,7 +1196,7 @@ sp_ui_drag_data_received(GtkWidget *widget, Inkscape::GC::release(newImage); sp_document_done( doc , SP_VERB_NONE, - /* TODO: annotate */ "interface.cpp:1203"); + _("Drop bitmap image")); break; } } diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp index 1415f85e6..99d22edc7 100644 --- a/src/path-chemistry.cpp +++ b/src/path-chemistry.cpp @@ -230,7 +230,7 @@ sp_selected_path_break_apart(void) if (did) { sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_BREAK_APART, - _("Break Apart")); + _("Break apart")); } else { sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("No path(s) to break apart in the selection.")); return; @@ -297,7 +297,7 @@ sp_selected_path_to_curves0(gboolean interactive, guint32 text_grouping_policy) if (interactive) { if (did) { sp_document_done(sp_desktop_document(desktop), SP_VERB_OBJECT_TO_CURVE, - _("Object to Path")); + _("Object to path")); } else { sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("No objects to convert to path in the selection.")); return; @@ -386,7 +386,7 @@ sp_selected_path_reverse() if (did) { sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_REVERSE, - /* TODO: annotate */ "path-chemistry.cpp:378"); + _("Reverse path")); } else { sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("No paths to reverse in the selection.")); } diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp index 0f7031f56..422d033ca 100644 --- a/src/sp-item-group.cpp +++ b/src/sp-item-group.cpp @@ -444,8 +444,8 @@ sp_item_group_ungroup (SPGroup *group, GSList **children, bool do_done) items = g_slist_remove (items, items->data); } - if (do_done) sp_document_done (doc, SP_VERB_NONE, - /* TODO: annotate */ "sp-item-group.cpp:448"); + if (do_done) + sp_document_done (doc, SP_VERB_NONE, _("Ungroup")); } /* diff --git a/src/spiral-context.cpp b/src/spiral-context.cpp index 348cd8811..5ef0267c7 100644 --- a/src/spiral-context.cpp +++ b/src/spiral-context.cpp @@ -463,7 +463,7 @@ sp_spiral_finish(SPSpiralContext *sc) sp_desktop_selection(desktop)->set(sc->item); sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_SPIRAL, - /* TODO: annotate */ "spiral-context.cpp:462"); + _("Create spiral")); sc->item = NULL; } diff --git a/src/splivarot.cpp b/src/splivarot.cpp index a0c21d23d..6759515f2 100644 --- a/src/splivarot.cpp +++ b/src/splivarot.cpp @@ -91,7 +91,7 @@ sp_selected_path_cut() void sp_selected_path_slice() { - sp_selected_path_boolop(bool_op_slice, SP_VERB_SELECTION_SLICE, _("Cut Path")); + sp_selected_path_boolop(bool_op_slice, SP_VERB_SELECTION_SLICE, _("Cut path")); } @@ -406,7 +406,7 @@ sp_selected_path_boolop(bool_op bop, const unsigned int verb, const Glib::ustrin SP_OBJECT(l->data)->deleteObject(); } sp_document_done(sp_desktop_document(desktop), SP_VERB_NONE, - /* TODO: annotate */ "splivarot.cpp:409"); + description); selection->clear(); delete res; @@ -568,8 +568,7 @@ sp_selected_path_outline() Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) { - // TRANSLATORS: "to outline" means "to convert stroke to path" - desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select path(s) to outline.")); + desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select stroked path(s) to convert stroke to path.")); return; } @@ -845,10 +844,10 @@ sp_selected_path_outline() if (did) { sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_OUTLINE, - /* TODO: annotate */ "splivarot.cpp:846"); + _("Convert stroke to path")); } else { // TRANSLATORS: "to outline" means "to convert stroke to path" - desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("No stroked paths to outline in the selection.")); + desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("No stroked paths in the selection.")); return; } } @@ -1050,7 +1049,7 @@ sp_selected_path_create_offset_object(int expand, bool updating) // pas vraiment de points sur le resultat // donc il ne reste rien sp_document_done(sp_desktop_document(desktop), SP_VERB_NONE, - /* TODO: annotate */ "splivarot.cpp:1051"); + _("Create offset object")); selection->clear(); delete res; @@ -1115,7 +1114,7 @@ sp_selected_path_create_offset_object(int expand, bool updating) } sp_document_done(sp_desktop_document(desktop), SP_VERB_NONE, - /* TODO: annotate */ "splivarot.cpp:1116"); + _("Create offset object")); delete res; delete orig; @@ -1358,7 +1357,7 @@ sp_selected_path_do_offset(bool expand, double prefOffset) if (did) { sp_document_done(sp_desktop_document(desktop), SP_VERB_NONE, - /* TODO: annotate */ "splivarot.cpp:1359"); + _("Inset/outset path")); } else { desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("No paths to inset/outset in the selection.")); return; diff --git a/src/star-context.cpp b/src/star-context.cpp index 3147dd213..3a40c0ed8 100644 --- a/src/star-context.cpp +++ b/src/star-context.cpp @@ -475,7 +475,7 @@ sp_star_finish (SPStarContext * sc) sp_desktop_selection(desktop)->set(sc->item); sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_STAR, - /* TODO: annotate */ "star-context.cpp:474"); + _("Create star")); sc->item = NULL; } diff --git a/src/ui/context-menu.cpp b/src/ui/context-menu.cpp index c17fd7269..a96e1589d 100644 --- a/src/ui/context-menu.cpp +++ b/src/ui/context-menu.cpp @@ -169,7 +169,7 @@ sp_item_create_link(GtkMenuItem *menuitem, SPItem *item) repr->addChild(child, NULL); child->setAttribute("id", id); sp_document_done(SP_OBJECT_DOCUMENT(object), SP_VERB_NONE, - /* TODO: annotate */ "context-menu.cpp:172"); + _("Create link")); sp_object_attributes_dialog(object, "SPAnchor"); diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index ad4c7a9cd..90efd2da5 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -427,7 +427,7 @@ void SelectedStyle::dragDataReceived( GtkWidget *widget, sp_desktop_set_style( tracker->parent->_desktop, css ); sp_repr_css_attr_unref( css ); sp_document_done( sp_desktop_document(tracker->parent->_desktop) , SP_VERB_NONE, - /* TODO: annotate */ "selected-style.cpp:429"); + _("Drop color")); } } break; @@ -440,7 +440,7 @@ void SelectedStyle::on_fill_remove() { sp_desktop_set_style (_desktop, css, true, true); sp_repr_css_attr_unref (css); sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, - /* TODO: annotate */ "selected-style.cpp:442"); + _("Remove fill")); } void SelectedStyle::on_stroke_remove() { @@ -449,7 +449,7 @@ void SelectedStyle::on_stroke_remove() { sp_desktop_set_style (_desktop, css, true, true); sp_repr_css_attr_unref (css); sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, - /* TODO: annotate */ "selected-style.cpp:451"); + _("Remove stroke")); } void SelectedStyle::on_fill_unset() { @@ -458,7 +458,7 @@ void SelectedStyle::on_fill_unset() { sp_desktop_set_style (_desktop, css, true, true); sp_repr_css_attr_unref (css); sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, - /* TODO: annotate */ "selected-style.cpp:460"); + _("Unset fill")); } void SelectedStyle::on_stroke_unset() { @@ -467,7 +467,7 @@ void SelectedStyle::on_stroke_unset() { sp_desktop_set_style (_desktop, css, true, true); sp_repr_css_attr_unref (css); sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, - /* TODO: annotate */ "selected-style.cpp:469"); + _("Unset stroke")); } void SelectedStyle::on_fill_opaque() { @@ -476,7 +476,7 @@ void SelectedStyle::on_fill_opaque() { sp_desktop_set_style (_desktop, css, true); sp_repr_css_attr_unref (css); sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, - /* TODO: annotate */ "selected-style.cpp:478"); + _("Make fill opaque")); } void SelectedStyle::on_stroke_opaque() { @@ -485,7 +485,7 @@ void SelectedStyle::on_stroke_opaque() { sp_desktop_set_style (_desktop, css, true); sp_repr_css_attr_unref (css); sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, - /* TODO: annotate */ "selected-style.cpp:487"); + _("Make fill opaque")); } void SelectedStyle::on_fill_lastused() { @@ -497,7 +497,7 @@ void SelectedStyle::on_fill_lastused() { sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, - /* TODO: annotate */ "selected-style.cpp:499"); + _("Apply last set color to fill")); } void SelectedStyle::on_stroke_lastused() { @@ -509,7 +509,7 @@ void SelectedStyle::on_stroke_lastused() { sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, - /* TODO: annotate */ "selected-style.cpp:511"); + _("Apply last set color to stroke")); } void SelectedStyle::on_fill_lastselected() { @@ -520,7 +520,7 @@ void SelectedStyle::on_fill_lastselected() { sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, - /* TODO: annotate */ "selected-style.cpp:522"); + _("Apply last selected color to fill")); } void SelectedStyle::on_stroke_lastselected() { @@ -531,7 +531,7 @@ void SelectedStyle::on_stroke_lastselected() { sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, - /* TODO: annotate */ "selected-style.cpp:533"); + _("Apply last selected color to stroke")); } void SelectedStyle::on_fill_invert() { @@ -551,7 +551,7 @@ void SelectedStyle::on_fill_invert() { sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, - /* TODO: annotate */ "selected-style.cpp:553"); + _("Invert fill")); } void SelectedStyle::on_stroke_invert() { @@ -571,7 +571,7 @@ void SelectedStyle::on_stroke_invert() { sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, - /* TODO: annotate */ "selected-style.cpp:573"); + _("Invert stroke")); } void SelectedStyle::on_fill_white() { @@ -583,7 +583,7 @@ void SelectedStyle::on_fill_white() { sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, - /* TODO: annotate */ "selected-style.cpp:585"); + _("White fill")); } void SelectedStyle::on_stroke_white() { @@ -595,7 +595,7 @@ void SelectedStyle::on_stroke_white() { sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, - /* TODO: annotate */ "selected-style.cpp:597"); + _("White stroke")); } void SelectedStyle::on_fill_black() { @@ -607,7 +607,7 @@ void SelectedStyle::on_fill_black() { sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, - /* TODO: annotate */ "selected-style.cpp:609"); + _("Black fill")); } void SelectedStyle::on_stroke_black() { @@ -619,7 +619,7 @@ void SelectedStyle::on_stroke_black() { sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, - /* TODO: annotate */ "selected-style.cpp:621"); + _("Black stroke")); } void SelectedStyle::on_fill_copy() { @@ -662,7 +662,7 @@ void SelectedStyle::on_fill_paste() { sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, - /* TODO: annotate */ "selected-style.cpp:664"); + _("Paste fill")); } } @@ -680,15 +680,13 @@ void SelectedStyle::on_stroke_paste() { sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, - /* TODO: annotate */ "selected-style.cpp:682"); + _("Paste stroke")); } } void SelectedStyle::on_fillstroke_swap() { SPCSSAttr *css = sp_repr_css_attr_new (); - g_message("on_fillstroke_swap()"); - switch (_mode[SS_FILL]) { case SS_NA: case SS_MANY: @@ -736,7 +734,7 @@ void SelectedStyle::on_fillstroke_swap() { sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, - /* TODO: annotate */ "selected-style.cpp:738"); + _("Swap fill and stroke")); } void SelectedStyle::on_fill_edit() { @@ -804,7 +802,7 @@ SelectedStyle::on_opacity_click(GdkEventButton *event) sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); sp_document_done (sp_desktop_document (_desktop), SP_VERB_DIALOG_FILL_STROKE, - /* TODO: annotate */ "selected-style.cpp:806"); + _("Change opacity")); return true; } @@ -838,7 +836,7 @@ void SelectedStyle::on_popup_preset(int i) { sp_desktop_set_style (_desktop, css, true); sp_repr_css_attr_unref (css); sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_SWATCHES, - /* TODO: annotate */ "selected-style.cpp:840"); + _("Change opacity")); } void @@ -1079,7 +1077,7 @@ void SelectedStyle::on_opacity_changed () { sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); sp_document_maybe_done (sp_desktop_document (_desktop), "fillstroke:opacity", SP_VERB_DIALOG_FILL_STROKE, - /* TODO: annotate */ "selected-style.cpp:1082"); + _("Change opacity")); spinbutton_defocus(GTK_OBJECT(_opacity_sb.gobj())); _opacity_blocked = false; }