undo annotations

(bzr r1793)

6 files changed, 31 insertions, 29 deletions

diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp
index cd6afac12..d0034611f 100644
--- a/src/widgets/gradient-toolbar.cpp
+++ b/src/widgets/gradient-toolbar.cpp
@@ -143,7 +143,7 @@ gr_item_activate (GtkMenuItem *menuitem, gpointer data)
     gr_apply_gradient (selection, ev? ev->get_drag() : NULL, gr);
 
     sp_document_done (sp_desktop_document (desktop), SP_VERB_CONTEXT_GRADIENT,
-                      /* TODO: annotate */ "gradient-toolbar.cpp:146");
+                      _("Assign gradient to object"));
 }
 
 gchar *
@@ -416,7 +416,7 @@ gr_fork (GtkWidget *button, GtkWidget *widget)
             if (gr_new != gr) {
                 gr_apply_gradient (selection, ev? ev->get_drag() : NULL, gr_new);
                 sp_document_done (document, SP_VERB_CONTEXT_GRADIENT,
-                                  /* TODO: annotate */ "gradient-toolbar.cpp:419");
+                                  _("Duplicate gradient"));
             }
         }
     }
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index f7f71e100..046aff2c2 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -358,6 +358,7 @@ sp_gvs_gradient_activate (GtkMenuItem *mi, SPGradientVectorSelector *gvs)
 	if (norm != gr) {
 		/* We do extra undo push here */
 		/* If handler has already done it, it is just NOP */
+		// FIXME: looks like this is never a valid undo step, consider removing this
 	    sp_document_done (SP_OBJECT_DOCUMENT (norm), SP_VERB_CONTEXT_GRADIENT,
 			      /* TODO: annotate */ "gradient-vector.cpp:350");
 	}
@@ -655,7 +656,7 @@ offadjustmentChanged( GtkAdjustment *adjustment, GtkWidget *vb)
     sp_repr_set_css_double(SP_OBJECT_REPR(stop), "offset", stop->offset);
 
     sp_document_done (SP_OBJECT_DOCUMENT (stop), SP_VERB_CONTEXT_GRADIENT,
-		      /* TODO: annotate */ "gradient-vector.cpp:642");
+							_("Change gradient stop offset"));
 
 	blocked = FALSE;
 }
@@ -728,7 +729,7 @@ sp_grd_ed_add_stop (GtkWidget *widget,  GtkWidget *vb)
 	gtk_widget_set_sensitive (offslide, TRUE);
 	gtk_widget_set_sensitive (GTK_WIDGET (offspin), TRUE);
 	sp_document_done (SP_OBJECT_DOCUMENT (gradient), SP_VERB_CONTEXT_GRADIENT, 
-			  /* TODO: annotate */ "gradient-vector.cpp:715");
+			  _("Add gradient stop"));
 }
 
 static void
@@ -760,7 +761,7 @@ sp_grd_ed_del_stop (GtkWidget *widget,  GtkWidget *vb)
 		sp_gradient_vector_widget_load_gradient (vb, gradient);
 		update_stop_list(GTK_WIDGET(mnu), gradient, NULL);
 		sp_document_done (SP_OBJECT_DOCUMENT (gradient), SP_VERB_CONTEXT_GRADIENT, 
-				  /* TODO: annotate */ "gradient-vector.cpp:747");
+				  _("Delete gradient stop"));
 	}
 
 }
@@ -1168,7 +1169,7 @@ sp_gradient_vector_color_changed (SPColorSelector *csel, GtkObject *object)
 		//SP_OBJECT_REPR (stop)->setAttribute("style", c);
 
 	sp_document_done (SP_OBJECT_DOCUMENT (ngr), SP_VERB_CONTEXT_GRADIENT,
-			  /* TODO: annotate */ "gradient-vector.cpp:1124");
+			  _("Change gradient stop color"));
 
 	blocked = FALSE;
 }
diff --git a/src/widgets/layer-selector.cpp b/src/widgets/layer-selector.cpp
index 3b732c90d..66f4aebf4 100644
--- a/src/widgets/layer-selector.cpp
+++ b/src/widgets/layer-selector.cpp
@@ -578,16 +578,16 @@ void LayerSelector::_prepareLabelRenderer(
 void LayerSelector::_lockLayer(bool lock) {
     if ( _layer && SP_IS_ITEM(_layer) ) {
         SP_ITEM(_layer)->setLocked(lock);
-        sp_document_maybe_done(sp_desktop_document(_desktop), "LayerSelector:lock", SP_VERB_NONE, 
-                               /* TODO: annotate */ "layer-selector.cpp:582");
+        sp_document_done(sp_desktop_document(_desktop), SP_VERB_NONE, 
+                         lock? _("Lock layer") : _("Unlock layer"));
     }
 }
 
 void LayerSelector::_hideLayer(bool hide) {
     if ( _layer && SP_IS_ITEM(_layer) ) {
         SP_ITEM(_layer)->setHidden(hide);
-        sp_document_maybe_done(sp_desktop_document(_desktop), "LayerSelector:hide", SP_VERB_NONE, 
-                               /* TODO: annotate */ "layer-selector.cpp:590");
+        sp_document_done(sp_desktop_document(_desktop), SP_VERB_NONE, 
+                         hide? _("Hide layer") : _("Unhide layer"));
     }
 }
 
diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp
index 2f42d590f..c1a92aa76 100644
--- a/src/widgets/select-toolbar.cpp
+++ b/src/widgets/select-toolbar.cpp
@@ -220,7 +220,7 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw)
 
         sp_selection_apply_affine(selection, scaler);
         sp_document_maybe_done (document, actionkey, SP_VERB_CONTEXT_SELECT, 
-                                /* TODO: annotate */ "select-toolbar.cpp:223");
+                                _("Transform by toolbar"));
 
         // defocus spinbuttons by moving focus to the canvas, unless "stay" is on
         spinbutton_defocus(GTK_OBJECT(spw));
diff --git a/src/widgets/sp-xmlview-content.cpp b/src/widgets/sp-xmlview-content.cpp
index 7961a4511..356c1384e 100644
--- a/src/widgets/sp-xmlview-content.cpp
+++ b/src/widgets/sp-xmlview-content.cpp
@@ -17,6 +17,7 @@
 #include "desktop-handles.h"
 #include "document-private.h"
 #include "inkscape.h"
+#include <glibmm/i18n.h>
 
 static void sp_xmlview_content_class_init (SPXMLViewContentClass * klass);
 static void sp_xmlview_content_init (SPXMLViewContent * text);
@@ -160,7 +161,7 @@ sp_xmlview_content_changed (GtkTextBuffer *tb, SPXMLViewContent *text)
 		text->repr->setContent(data);
 		g_free (data);
 		text->blocked = FALSE;
-		sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP), SP_VERB_NONE, 
-				  /* TODO: annotate */ "sp-xmlview-content.cpp:164");
+		sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP), SP_VERB_DIALOG_XML_EDITOR, 
+									_("Type text in a text node"));
 	}
 }
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index a4c550418..1e4401f10 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -852,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));
 
@@ -897,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));
 
@@ -951,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));
 
@@ -988,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));
 
@@ -1026,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));
 
@@ -1366,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));
@@ -1683,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));
@@ -2265,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
@@ -2338,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));
@@ -3071,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")));        
@@ -3154,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));
@@ -3200,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));
@@ -3247,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));
@@ -3343,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);
 
 
@@ -3909,7 +3909,7 @@ static void connector_spacing_changed(GtkAdjustment *adj, GtkWidget *tbl)
     }
     
     sp_document_done(doc, SP_VERB_CONTEXT_CONNECTOR, 
-            _("Change connector spacing distance"));
+            _("Change connector spacing"));
 
     g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));
     
@@ -3928,7 +3928,7 @@ static void sp_connector_graph_layout(void)
 
     prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation);
 
-    sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, /* TODO: annotate */ "toolbox.cpp:129");
+    sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, _("Arrange connector network"));
 }
 
 static void