patch from Gustav Broberg: undo annotations and history dialog

(bzr r1315)

8 files changed, 73 insertions, 35 deletions

diff --git a/src/ui/widget/color-picker.cpp b/src/ui/widget/color-picker.cpp
index f79334e31..d5c4899c6 100644
--- a/src/ui/widget/color-picker.cpp
+++ b/src/ui/widget/color-picker.cpp
@@ -126,7 +126,8 @@ sp_color_picker_color_mod(SPColorSelector *csel, GObject *cp)
     (ptr->_preview).setRgba32 (rgba);
 
     if (ptr->_undo && SP_ACTIVE_DESKTOP)
-        sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP));
+        sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP), SP_VERB_NONE, 
+                         /* TODO: annotate */ "color-picker.cpp:130");
 
     ptr->on_changed (rgba);
     _in_use = false;
diff --git a/src/ui/widget/entity-entry.cpp b/src/ui/widget/entity-entry.cpp
index 1b4048ab0..6563040dc 100644
--- a/src/ui/widget/entity-entry.cpp
+++ b/src/ui/widget/entity-entry.cpp
@@ -97,7 +97,8 @@ EntityLineEntry::on_changed()
     SPDocument *doc = SP_ACTIVE_DOCUMENT;
     char const *text = reinterpret_cast<Gtk::Entry*>(_packable)->get_text().c_str();
     if (rdf_set_work_entity (doc, _entity, text))
-        sp_document_done (doc);
+        sp_document_done (doc, SP_VERB_NONE, 
+                          /* TODO: annotate */ "entity-entry.cpp:101");
     _wr->setUpdating (false);
 }
 
@@ -141,7 +142,8 @@ EntityMultiLineEntry::on_changed()
     Gtk::TextView *tv = reinterpret_cast<Gtk::TextView*>(s->get_child());
     char const *text = tv->get_buffer()->get_text().c_str();
     if (rdf_set_work_entity (doc, _entity, text))
-        sp_document_done (doc);
+        sp_document_done (doc, SP_VERB_NONE, 
+                          /* TODO: annotate */ "entity-entry.cpp:146");
     _wr->setUpdating (false);
 }
 
diff --git a/src/ui/widget/licensor.cpp b/src/ui/widget/licensor.cpp
index 72c4663e4..50c49e912 100644
--- a/src/ui/widget/licensor.cpp
+++ b/src/ui/widget/licensor.cpp
@@ -61,7 +61,8 @@ LicenseItem::on_toggled()
 
     _wr.setUpdating (true);
     rdf_set_license (SP_ACTIVE_DOCUMENT, _lic->details ? _lic : 0);
-    sp_document_done (SP_ACTIVE_DOCUMENT);
+    sp_document_done (SP_ACTIVE_DOCUMENT, SP_VERB_NONE, 
+                      /* TODO: annotate */ "licensor.cpp:65");
     _wr.setUpdating (false);
     reinterpret_cast<Gtk::Entry*>(_eep->_packable)->set_text (_lic->uri);
     _eep->on_changed();
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index b6b8503c4..5882d4651 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -297,7 +297,8 @@ PageSizer::setDim (double w, double h)
         SPDocument *doc = sp_desktop_document(SP_ACTIVE_DESKTOP);
         sp_document_set_width (doc, w, &_px_unit);
         sp_document_set_height (doc, h, &_px_unit);
-        sp_document_done (doc);
+        sp_document_done (doc, SP_VERB_NONE, 
+                          /* TODO: annotate */ "page-sizer.cpp:301");
     } 
     
     _landscape = w>h;
diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp
index 1bfcb1f84..4ac73e484 100644
--- a/src/ui/widget/registered-widget.cpp
+++ b/src/ui/widget/registered-widget.cpp
@@ -33,6 +33,7 @@
 #include "sp-namedview.h"
 
 #include "registered-widget.h"
+#include "verbs.h"
 
 namespace Inkscape {
 namespace UI {
@@ -98,7 +99,8 @@ RegisteredCheckButton::on_toggled()
     sp_repr_set_boolean(repr, _key.c_str(), _button->get_active());
     doc->rroot->setAttribute("sodipodi:modified", "true");
     sp_document_set_undo_sensitive (doc, saved);
-    sp_document_done (doc);
+    sp_document_done (doc, SP_VERB_NONE,
+                      /* TODO: annotate */ "registered-widget.cpp:103");
     
     _wr->setUpdating (false);
 }
@@ -156,7 +158,8 @@ RegisteredUnitMenu::on_changed()
     repr->setAttribute(_key.c_str(), os.str().c_str());
     doc->rroot->setAttribute("sodipodi:modified", "true");
     sp_document_set_undo_sensitive (doc, saved);
-    sp_document_done (doc);
+    sp_document_done (doc, SP_VERB_NONE, 
+                      /* TODO: annotate */ "registered-widget.cpp:162");
     
     _wr->setUpdating (false);
 }
@@ -223,7 +226,8 @@ RegisteredScalarUnit::on_value_changed()
     repr->setAttribute(_key.c_str(), os.str().c_str());
     doc->rroot->setAttribute("sodipodi:modified", "true");
     sp_document_set_undo_sensitive (doc, saved);
-    sp_document_done (doc);
+    sp_document_done (doc, SP_VERB_NONE, 
+                      /* TODO: annotate */ "registered-widget.cpp:230");
     
     _wr->setUpdating (false);
 }
@@ -333,7 +337,8 @@ RegisteredSuffixedInteger::on_value_changed()
     os << value;
 
     repr->setAttribute(_key.c_str(), os.str().c_str());
-    sp_document_done(sp_desktop_document(dt));
+    sp_document_done(sp_desktop_document(dt), SP_VERB_NONE, 
+                     /* TODO: annotate */ "registered-widget.cpp:341");
     
     _wr->setUpdating (false);
 }
@@ -396,7 +401,8 @@ RegisteredRadioButtonPair::on_value_changed()
     repr->setAttribute(_key.c_str(), second ? "true" : "false");
     doc->rroot->setAttribute("sodipodi:modified", "true");
     sp_document_set_undo_sensitive (doc, saved);
-    sp_document_done (doc);
+    sp_document_done (doc, SP_VERB_NONE, 
+                      /* TODO: annotate */ "registered-widget.cpp:405");
     
     _wr->setUpdating (false);
 }
diff --git a/src/ui/widget/ruler.cpp b/src/ui/widget/ruler.cpp
index eab05ca44..30a1761bd 100644
--- a/src/ui/widget/ruler.cpp
+++ b/src/ui/widget/ruler.cpp
@@ -29,6 +29,7 @@
 #include "desktop-handles.h"
 #include "document.h"
 #include "sp-namedview.h"
+#include "verbs.h"
 
 namespace Inkscape {
 namespace UI {
@@ -152,7 +153,8 @@ Ruler::on_button_release_event(GdkEventButton *evb)
             sp_repr_set_svg_double(repr, "position", guide_pos_dt);
             SP_OBJECT_REPR(_dt->namedview)->appendChild(repr);
             Inkscape::GC::release(repr);
-            sp_document_done(sp_desktop_document(_dt));
+            sp_document_done(sp_desktop_document(_dt), SP_VERB_NONE, 
+                             /* TODO: annotate */ "ruler.cpp:157");
         }
         _dt->set_coordinate_status(event_dt);
     }
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index a2e57d600..ad4c7a9cd 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -35,6 +35,7 @@
 #include "svg/svg-color.h"
 #include "svg/css-ostringstream.h"
 #include "helper/units.h"
+#include "verbs.h"
 
 static gdouble const _sw_presets[]     = { 32 ,  16 ,  10 ,  8 ,  6 ,  4 ,  3 ,  2 ,  1.5 ,  1 ,  0.75 ,  0.5 ,  0.25 ,  0.1 };
 static gchar* const _sw_presets_str[] = {"32", "16", "10", "8", "6", "4", "3", "2", "1.5", "1", "0.75", "0.5", "0.25", "0.1"};
@@ -425,7 +426,8 @@ void SelectedStyle::dragDataReceived( GtkWidget *widget,
                 sp_repr_css_set_property( css, (tracker->item == SS_FILL) ? "fill":"stroke", c );
                 sp_desktop_set_style( tracker->parent->_desktop, css );
                 sp_repr_css_attr_unref( css );
-                sp_document_done( sp_desktop_document(tracker->parent->_desktop) );
+                sp_document_done( sp_desktop_document(tracker->parent->_desktop) , SP_VERB_NONE, 
+                                  /* TODO: annotate */ "selected-style.cpp:429");
             }
         }
         break;
@@ -437,7 +439,8 @@ void SelectedStyle::on_fill_remove() {
     sp_repr_css_set_property (css, "fill", "none");
     sp_desktop_set_style (_desktop, css, true, true); 
     sp_repr_css_attr_unref (css);
-    sp_document_done (sp_desktop_document(_desktop));
+    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE,
+                      /* TODO: annotate */ "selected-style.cpp:442");
 }
 
 void SelectedStyle::on_stroke_remove() {
@@ -445,7 +448,8 @@ void SelectedStyle::on_stroke_remove() {
     sp_repr_css_set_property (css, "stroke", "none");
     sp_desktop_set_style (_desktop, css, true, true); 
     sp_repr_css_attr_unref (css);
-    sp_document_done (sp_desktop_document(_desktop));
+    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE,
+                      /* TODO: annotate */ "selected-style.cpp:451");
 }
 
 void SelectedStyle::on_fill_unset() {
@@ -453,7 +457,8 @@ void SelectedStyle::on_fill_unset() {
     sp_repr_css_unset_property (css, "fill");
     sp_desktop_set_style (_desktop, css, true, true); 
     sp_repr_css_attr_unref (css);
-    sp_document_done (sp_desktop_document(_desktop));
+    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE,
+                      /* TODO: annotate */ "selected-style.cpp:460");
 }
 
 void SelectedStyle::on_stroke_unset() {
@@ -461,7 +466,8 @@ void SelectedStyle::on_stroke_unset() {
     sp_repr_css_unset_property (css, "stroke");
     sp_desktop_set_style (_desktop, css, true, true);
     sp_repr_css_attr_unref (css);
-    sp_document_done (sp_desktop_document(_desktop));
+    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE,
+                      /* TODO: annotate */ "selected-style.cpp:469");
 }
 
 void SelectedStyle::on_fill_opaque() {
@@ -469,7 +475,8 @@ void SelectedStyle::on_fill_opaque() {
     sp_repr_css_set_property (css, "fill-opacity", "1");
     sp_desktop_set_style (_desktop, css, true);
     sp_repr_css_attr_unref (css);
-    sp_document_done (sp_desktop_document(_desktop));
+    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE,
+                      /* TODO: annotate */ "selected-style.cpp:478");
 }
 
 void SelectedStyle::on_stroke_opaque() {
@@ -477,7 +484,8 @@ void SelectedStyle::on_stroke_opaque() {
     sp_repr_css_set_property (css, "stroke-opacity", "1");
     sp_desktop_set_style (_desktop, css, true);
     sp_repr_css_attr_unref (css);
-    sp_document_done (sp_desktop_document(_desktop));
+    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE,
+                      /* TODO: annotate */ "selected-style.cpp:487");
 }
 
 void SelectedStyle::on_fill_lastused() {
@@ -488,7 +496,8 @@ void SelectedStyle::on_fill_lastused() {
     sp_repr_css_set_property (css, "fill", c);
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (sp_desktop_document(_desktop));
+    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, 
+                      /* TODO: annotate */ "selected-style.cpp:499");
 }
 
 void SelectedStyle::on_stroke_lastused() {
@@ -499,7 +508,8 @@ void SelectedStyle::on_stroke_lastused() {
     sp_repr_css_set_property (css, "stroke", c);
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (sp_desktop_document(_desktop));
+    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, 
+                      /* TODO: annotate */ "selected-style.cpp:511");
 }
 
 void SelectedStyle::on_fill_lastselected() {
@@ -509,7 +519,8 @@ void SelectedStyle::on_fill_lastselected() {
     sp_repr_css_set_property (css, "fill", c);
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (sp_desktop_document(_desktop));
+    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE,
+                      /* TODO: annotate */ "selected-style.cpp:522");
 }
 
 void SelectedStyle::on_stroke_lastselected() {
@@ -519,7 +530,8 @@ void SelectedStyle::on_stroke_lastselected() {
     sp_repr_css_set_property (css, "stroke", c);
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (sp_desktop_document(_desktop));
+    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, 
+                      /* TODO: annotate */ "selected-style.cpp:533");
 }
 
 void SelectedStyle::on_fill_invert() {
@@ -538,7 +550,8 @@ void SelectedStyle::on_fill_invert() {
     sp_repr_css_set_property (css, "fill", c);
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (sp_desktop_document(_desktop));
+    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE,
+                      /* TODO: annotate */ "selected-style.cpp:553");
 }
 
 void SelectedStyle::on_stroke_invert() {
@@ -557,7 +570,8 @@ void SelectedStyle::on_stroke_invert() {
     sp_repr_css_set_property (css, "stroke", c);
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (sp_desktop_document(_desktop));
+    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE,
+                      /* TODO: annotate */ "selected-style.cpp:573");
 } 
 
 void SelectedStyle::on_fill_white() {
@@ -568,7 +582,8 @@ void SelectedStyle::on_fill_white() {
     sp_repr_css_set_property (css, "fill-opacity", "1");
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (sp_desktop_document(_desktop));
+    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE,
+                      /* TODO: annotate */ "selected-style.cpp:585");
 }
 
 void SelectedStyle::on_stroke_white() {
@@ -579,7 +594,8 @@ void SelectedStyle::on_stroke_white() {
     sp_repr_css_set_property (css, "stroke-opacity", "1");
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (sp_desktop_document(_desktop));
+    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, 
+                      /* TODO: annotate */ "selected-style.cpp:597");
 }
 
 void SelectedStyle::on_fill_black() {
@@ -590,7 +606,8 @@ void SelectedStyle::on_fill_black() {
     sp_repr_css_set_property (css, "fill-opacity", "1.0");
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (sp_desktop_document(_desktop));
+    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, 
+                      /* TODO: annotate */ "selected-style.cpp:609");
 }
 
 void SelectedStyle::on_stroke_black() {
@@ -601,7 +618,8 @@ void SelectedStyle::on_stroke_black() {
     sp_repr_css_set_property (css, "stroke-opacity", "1.0");
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (sp_desktop_document(_desktop));
+    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, 
+                      /* TODO: annotate */ "selected-style.cpp:621");
 }
 
 void SelectedStyle::on_fill_copy() {
@@ -643,7 +661,8 @@ void SelectedStyle::on_fill_paste() {
         sp_repr_css_set_property (css, "fill", text.c_str());
         sp_desktop_set_style (_desktop, css);
         sp_repr_css_attr_unref (css);
-        sp_document_done (sp_desktop_document(_desktop));
+        sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, 
+                          /* TODO: annotate */ "selected-style.cpp:664");
     }
 }
 
@@ -660,7 +679,8 @@ void SelectedStyle::on_stroke_paste() {
         sp_repr_css_set_property (css, "stroke", text.c_str());
         sp_desktop_set_style (_desktop, css);
         sp_repr_css_attr_unref (css);
-        sp_document_done (sp_desktop_document(_desktop));
+        sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE,
+                          /* TODO: annotate */ "selected-style.cpp:682");
     }
 }
 
@@ -715,7 +735,8 @@ 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_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, 
+                      /* TODO: annotate */ "selected-style.cpp:738");
 }
 
 void SelectedStyle::on_fill_edit() {
@@ -782,7 +803,8 @@ SelectedStyle::on_opacity_click(GdkEventButton *event)
         sp_repr_css_set_property (css, "opacity", opacity);
         sp_desktop_set_style (_desktop, css);
         sp_repr_css_attr_unref (css);
-        sp_document_done (sp_desktop_document (_desktop));
+        sp_document_done (sp_desktop_document (_desktop), SP_VERB_DIALOG_FILL_STROKE,
+                          /* TODO: annotate */ "selected-style.cpp:806");
         return true;
     }
 
@@ -815,7 +837,8 @@ void SelectedStyle::on_popup_preset(int i) {
     sp_repr_css_set_property (css, "stroke-width", os.str().c_str());
     sp_desktop_set_style (_desktop, css, true);
     sp_repr_css_attr_unref (css);
-    sp_document_done (sp_desktop_document(_desktop));
+    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_SWATCHES,
+                      /* TODO: annotate */ "selected-style.cpp:840");
 }
 
 void
@@ -1055,7 +1078,8 @@ void SelectedStyle::on_opacity_changed () {
     sp_repr_css_set_property (css, "opacity", os.str().c_str());
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_maybe_done (sp_desktop_document (_desktop), "fillstroke:opacity");
+    sp_document_maybe_done (sp_desktop_document (_desktop), "fillstroke:opacity", SP_VERB_DIALOG_FILL_STROKE,
+                            /* TODO: annotate */ "selected-style.cpp:1082");
     spinbutton_defocus(GTK_OBJECT(_opacity_sb.gobj()));
     _opacity_blocked = false;
 }
diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp
index 654936814..b7839284a 100644
--- a/src/ui/widget/tolerance-slider.cpp
+++ b/src/ui/widget/tolerance-slider.cpp
@@ -169,7 +169,8 @@ ToleranceSlider::update (double val)
     repr->setAttribute(_key.c_str(), os.str().c_str());
     doc->rroot->setAttribute("sodipodi:modified", "true");
     sp_document_set_undo_sensitive (doc, saved);
-    sp_document_done (doc);
+    sp_document_done (doc, SP_VERB_NONE,
+                      /* TODO: annotate */ "tolerance-slider.cpp:173");
     
     _wr->setUpdating (false);
 }