patch from Gustav Broberg: undo annotations and history dialog

(bzr r1315)

6 files changed, 53 insertions, 26 deletions

diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp
index 2ba59b10c..da84eafca 100644
--- a/src/widgets/gradient-toolbar.cpp
+++ b/src/widgets/gradient-toolbar.cpp
@@ -142,7 +142,8 @@ 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_document_done (sp_desktop_document (desktop), SP_VERB_CONTEXT_GRADIENT,
+                      /* TODO: annotate */ "gradient-toolbar.cpp:146");
 }
 
 gchar *
@@ -414,7 +415,8 @@ gr_fork (GtkWidget *button, GtkWidget *widget)
             SPGradient *gr_new = sp_gradient_fork_vector_if_necessary (gr);
             if (gr_new != gr) {
                 gr_apply_gradient (selection, ev? ev->get_drag() : NULL, gr_new);
-                sp_document_done (document);
+                sp_document_done (document, SP_VERB_CONTEXT_GRADIENT,
+                                  /* TODO: annotate */ "gradient-toolbar.cpp:419");
             }
         }
     }
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 5befb11d0..be1adcfe0 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -346,7 +346,8 @@ 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 */
-		sp_document_done (SP_OBJECT_DOCUMENT (norm));
+	    sp_document_done (SP_OBJECT_DOCUMENT (norm), SP_VERB_CONTEXT_GRADIENT,
+			      /* TODO: annotate */ "gradient-vector.cpp:350");
 	}
 }
 
@@ -637,7 +638,8 @@ offadjustmentChanged( GtkAdjustment *adjustment, GtkWidget *vb)
     stop->offset = adjustment->value;
     sp_repr_set_css_double(SP_OBJECT_REPR(stop), "offset", stop->offset);
 
-    sp_document_done (SP_OBJECT_DOCUMENT (stop));
+    sp_document_done (SP_OBJECT_DOCUMENT (stop), SP_VERB_CONTEXT_GRADIENT,
+		      /* TODO: annotate */ "gradient-vector.cpp:642");
 
 	blocked = FALSE;
 }
@@ -709,7 +711,8 @@ sp_grd_ed_add_stop (GtkWidget *widget,  GtkWidget *vb)
 	GtkWidget *offslide =GTK_WIDGET (g_object_get_data (G_OBJECT (vb), "offslide"));
 	gtk_widget_set_sensitive (offslide, TRUE);
 	gtk_widget_set_sensitive (GTK_WIDGET (offspin), TRUE);
-	sp_document_done (SP_OBJECT_DOCUMENT (gradient));
+	sp_document_done (SP_OBJECT_DOCUMENT (gradient), SP_VERB_CONTEXT_GRADIENT, 
+			  /* TODO: annotate */ "gradient-vector.cpp:715");
 }
 
 static void
@@ -740,7 +743,8 @@ sp_grd_ed_del_stop (GtkWidget *widget,  GtkWidget *vb)
 		SP_OBJECT_REPR(gradient)->removeChild(SP_OBJECT_REPR(stop));
 		sp_gradient_vector_widget_load_gradient (vb, gradient);
 		update_stop_list(GTK_WIDGET(mnu), gradient, NULL);
-		sp_document_done (SP_OBJECT_DOCUMENT (gradient));
+		sp_document_done (SP_OBJECT_DOCUMENT (gradient), SP_VERB_CONTEXT_GRADIENT, 
+				  /* TODO: annotate */ "gradient-vector.cpp:747");
 	}
 
 }
@@ -1116,7 +1120,8 @@ sp_gradient_vector_color_changed (SPColorSelector *csel, GtkObject *object)
 		//	g_snprintf (c, 256, "stop-color:#%06x;stop-opacity:%g;", rgb >> 8, (gdouble) alpha);
 		//SP_OBJECT_REPR (stop)->setAttribute("style", c);
 
-	sp_document_done (SP_OBJECT_DOCUMENT (ngr));
+	sp_document_done (SP_OBJECT_DOCUMENT (ngr), SP_VERB_CONTEXT_GRADIENT,
+			  /* TODO: annotate */ "gradient-vector.cpp:1124");
 
 	blocked = FALSE;
 }
diff --git a/src/widgets/layer-selector.cpp b/src/widgets/layer-selector.cpp
index 94a891dc2..3b732c90d 100644
--- a/src/widgets/layer-selector.cpp
+++ b/src/widgets/layer-selector.cpp
@@ -30,6 +30,7 @@
 #include "dialogs/layer-properties.h"
 #include "layer-manager.h"
 #include "xml/node-event-vector.h"
+#include "verbs.h"
 
 namespace Inkscape {
 namespace Widgets {
@@ -577,14 +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_document_maybe_done(sp_desktop_document(_desktop), "LayerSelector:lock", SP_VERB_NONE, 
+                               /* TODO: annotate */ "layer-selector.cpp:582");
     }
 }
 
 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_document_maybe_done(sp_desktop_document(_desktop), "LayerSelector:hide", SP_VERB_NONE, 
+                               /* TODO: annotate */ "layer-selector.cpp:590");
     }
 }
 
diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp
index 6bcb24d2d..2f42d590f 100644
--- a/src/widgets/select-toolbar.cpp
+++ b/src/widgets/select-toolbar.cpp
@@ -219,7 +219,8 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw)
         NR::Matrix scaler = get_scale_transform_with_stroke (bbox, strokewidth, transform_stroke, x0, y0, x1, y1);
 
         sp_selection_apply_affine(selection, scaler);
-        sp_document_maybe_done (document, actionkey);
+        sp_document_maybe_done (document, actionkey, SP_VERB_CONTEXT_SELECT, 
+                                /* TODO: annotate */ "select-toolbar.cpp:223");
 
         // 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 ffec0b723..7961a4511 100644
--- a/src/widgets/sp-xmlview-content.cpp
+++ b/src/widgets/sp-xmlview-content.cpp
@@ -160,6 +160,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_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP), SP_VERB_NONE, 
+				  /* TODO: annotate */ "sp-xmlview-content.cpp:164");
 	}
 }
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index c8e484e3b..7ff4f115e 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -850,7 +850,8 @@ sp_stb_magnitude_value_changed(GtkAdjustment *adj, GtkWidget *tbl)
             modmade = true;
         }
     }
-    if (modmade)  sp_document_done(sp_desktop_document(desktop));
+    if (modmade)  sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_STAR, 
+                                   /* TODO: annotate */ "toolbox.cpp:854");
 
     g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));
 
@@ -894,7 +895,8 @@ sp_stb_proportion_value_changed(GtkAdjustment *adj, GtkWidget *tbl)
         }
     }
 
-    if (modmade) sp_document_done(sp_desktop_document(desktop));
+    if (modmade) sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_STAR, 
+                                  /* TODO: annotate */ "toolbox.cpp:899");
 
     g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));
 
@@ -947,7 +949,8 @@ sp_stb_sides_flat_state_changed(GtkWidget *widget, GtkObject *tbl)
             }
         }
     }
-    if (modmade) sp_document_done(sp_desktop_document(desktop));
+    if (modmade) sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_STAR, 
+                                  /* TODO: annotate */ "toolbox.cpp:953");
 
     g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));
 
@@ -983,7 +986,8 @@ sp_stb_rounded_value_changed(GtkAdjustment *adj, GtkWidget *tbl)
             modmade = true;
         }
     }
-    if (modmade)  sp_document_done(sp_desktop_document(desktop));
+    if (modmade)  sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_STAR, 
+                                   /* TODO: annotate */ "toolbox.cpp:990");
 
     g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));
 
@@ -1020,7 +1024,8 @@ sp_stb_randomized_value_changed(GtkAdjustment *adj, GtkWidget *tbl)
             modmade = true;
         }
     }
-    if (modmade)  sp_document_done(sp_desktop_document(desktop));
+    if (modmade)  sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_STAR, 
+                                   /* TODO: annotate */ "toolbox.cpp:1028");
 
     g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));
 
@@ -1359,7 +1364,8 @@ sp_rtb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_name
     sp_rtb_sensitivize (tbl);
 
     if (modmade) {
-        sp_document_done(sp_desktop_document(desktop));
+        sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_RECT, 
+                         /* TODO: annotate */ "toolbox.cpp:1368");
     }
 
     g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));
@@ -1675,7 +1681,8 @@ sp_spl_tb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_n
     g_free(namespaced_name);
 
     if (modmade) {
-        sp_document_done(sp_desktop_document(desktop));
+        sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_SPIRAL, 
+                         /* TODO: annotate */ "toolbox.cpp:1685");
     }
 
     g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));
@@ -2236,7 +2243,8 @@ sp_arctb_startend_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const
     sp_arctb_sensitivize (tbl, adj->value, other->value);
 
     if (modmade) {
-        sp_document_maybe_done(sp_desktop_document(desktop), value_name);
+        sp_document_maybe_done(sp_desktop_document(desktop), value_name, SP_VERB_CONTEXT_ARC, 
+                               /* TODO: annotate */ "toolbox.cpp:2247");
     }
 
     // defocus spinbuttons by moving focus to the canvas, unless "stay" is on
@@ -2308,7 +2316,8 @@ sp_arctb_open_state_changed(GtkWidget *widget, GtkObject *tbl)
     }
 
     if (modmade) {
-        sp_document_done(sp_desktop_document(desktop));
+        sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_ARC, 
+                         /* TODO: annotate */ "toolbox.cpp:2320");
     }
 
     g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));
@@ -3011,7 +3020,8 @@ sp_text_toolbox_family_changed (GtkTreeSelection    *selection,
         sp_desktop_set_style (desktop, css, true, true);
     }
 
-    sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP));
+    sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP), SP_VERB_CONTEXT_TEXT, 
+                      /* TODO: annotate */ "toolbox.cpp:3024");
     sp_repr_css_attr_unref (css);
     free (family);
     gtk_widget_hide (GTK_WIDGET (g_object_get_data (G_OBJECT(tbl), "warning-image")));        
@@ -3093,7 +3103,8 @@ 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_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP), SP_VERB_CONTEXT_TEXT, 
+                      /* TODO: annotate */ "toolbox.cpp:3107");
     sp_repr_css_attr_unref (css);
 
     gtk_widget_grab_focus (GTK_WIDGET(desktop->canvas));
@@ -3138,7 +3149,8 @@ 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_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP), SP_VERB_CONTEXT_TEXT, 
+                      /* TODO: annotate */ "toolbox.cpp:3153");
     sp_repr_css_attr_unref (css);
 
     gtk_widget_grab_focus (GTK_WIDGET(desktop->canvas));
@@ -3184,7 +3196,8 @@ 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_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP), SP_VERB_CONTEXT_TEXT, 
+                      /* TODO: annotate */ "toolbox.cpp:3200");
     sp_repr_css_attr_unref (css);
 
     gtk_widget_grab_focus (GTK_WIDGET(desktop->canvas));
@@ -3279,7 +3292,8 @@ 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_document_maybe_done (sp_desktop_document (SP_ACTIVE_DESKTOP), "ttb:size", SP_VERB_NONE, 
+                            /* TODO: annotate */ "toolbox.cpp:3296");
     sp_repr_css_attr_unref (css);
 
 
@@ -3833,7 +3847,8 @@ static void connector_spacing_changed(GtkAdjustment *adj, GtkWidget *tbl)
         g_slist_free(items);
     }
     
-    sp_document_done(doc);
+    sp_document_done(doc, SP_VERB_CONTEXT_CONNECTOR, 
+                     /* TODO: annotate */ "toolbox.cpp:3851");
 
     g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));