patch from Gustav Broberg: undo annotations and history dialog

(bzr r1315)

5 files changed, 31 insertions, 14 deletions

diff --git a/src/ui/dialog/Makefile_insert b/src/ui/dialog/Makefile_insert
index 4e40b645d..4a76a68ca 100644
--- a/src/ui/dialog/Makefile_insert
+++ b/src/ui/dialog/Makefile_insert
@@ -42,6 +42,9 @@ ui_dialog_libuidialog_a_SOURCES =		\
 	ui/dialog/transformation.h		\
 	ui/dialog/tree-editor.cpp		\
 	ui/dialog/tree-editor.h			\
+	ui/dialog/undo-history.cpp		\
+	ui/dialog/undo-history.h		\
+	$(inkboard_dialogs)	\
 	ui/dialog/xml-editor.cpp		\
 	ui/dialog/xml-editor.h			\
 	ui/dialog/aboutbox.cpp		\
diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 08e197586..a7b2aa991 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -215,7 +215,8 @@ private :
         prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation);
 
         if (changed) {
-            sp_document_done ( sp_desktop_document (desktop) );
+            sp_document_done ( sp_desktop_document (desktop) , SP_VERB_DIALOG_ALIGN_DISTRIBUTE,
+                               /* TODO: annotate */ "align-and-distribute.cpp:219" );
         }
 
 
@@ -374,7 +375,8 @@ private :
         prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation);
 
         if (changed) {
-            sp_document_done ( sp_desktop_document (desktop) );
+            sp_document_done ( sp_desktop_document (desktop), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, 
+                               /* TODO: annotate */ "align-and-distribute.cpp:379");
         }
     }
     guint _index;
@@ -484,7 +486,8 @@ private :
         // restore compensation setting
         prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation);
 
-        sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP));
+        sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, 
+                         /* TODO: annotate */ "align-and-distribute.cpp:490");
     }
 };
 
@@ -513,7 +516,8 @@ private :
         // restore compensation setting
         prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation);
 
-        sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP));
+        sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, 
+                         /* TODO: annotate */ "align-and-distribute.cpp:520");
     }
 };
 
@@ -542,7 +546,8 @@ private :
         // restore compensation setting
         prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation);
 
-        sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP));
+        sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, 
+                          /* TODO: annotate */ "align-and-distribute.cpp:550");
     }
 };
 
@@ -605,7 +610,8 @@ private :
         // restore compensation setting
         prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation);
 
-        sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP));
+        sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, 
+                          /* TODO: annotate */ "align-and-distribute.cpp:614");
     }
 };
 
@@ -717,7 +723,8 @@ private :
         }
 
         if (changed) {
-            sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP));
+            sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, 
+                              /* TODO: annotate */ "align-and-distribute.cpp:727");
         }
     }
 };
diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp
index f4099b050..d685f2e59 100644
--- a/src/ui/dialog/dialog-manager.cpp
+++ b/src/ui/dialog/dialog-manager.cpp
@@ -32,7 +32,7 @@
 #include "ui/dialog/text-properties.h"
 #include "ui/dialog/tracedialog.h"
 #include "ui/dialog/transformation.h"
-
+#include "ui/dialog/undo-history.h"
 #include "ui/dialog/xml-editor.h"
 
 #include "dialogs/tiledialog.h"
@@ -85,6 +85,7 @@ DialogManager::DialogManager() {
     registerFactory("TileDialog",          &create<TileDialog>);
     registerFactory("Trace",               &create<TraceDialog>);
     registerFactory("Transformation",      &create<Transformation>);
+    registerFactory("UndoHistory",         &create<UndoHistory>);
     registerFactory("XmlEditor",           &create<XmlEditor>);
 }
 
diff --git a/src/ui/dialog/session-player.cpp b/src/ui/dialog/session-player.cpp
index 97ef5618e..921d71bb8 100644
--- a/src/ui/dialog/session-player.cpp
+++ b/src/ui/dialog/session-player.cpp
@@ -182,7 +182,8 @@ SessionPlaybackDialogImpl::_respCallback(int resp)
 			switch (result) {
 				case Gtk::RESPONSE_OK:
 					this->_sm->clearDocument();
-					sp_document_done(sp_desktop_document(this->_desktop));
+					sp_document_done(sp_desktop_document(this->_desktop), SP_VERB_NONE, 
+							 /* TODO: annotate */ "session-player.cpp:186");
 					this->_sm->loadSessionFile(sessionfiledlg.get_filename());
 					this->_openfile.set_text(this->_sfp->filename());
 					break;
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index 8fa2c5dcb..2cd21a560 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -581,7 +581,8 @@ Transformation::applyPageMove(Inkscape::Selection *selection)
             x - bbox.min()[NR::X], y - bbox.min()[NR::Y]);
     }
 
-    sp_document_done ( sp_desktop_document (selection->desktop()) );
+    sp_document_done ( sp_desktop_document (selection->desktop()) , SP_VERB_DIALOG_TRANSFORM, 
+                       /* TODO: annotate */ "transformation.cpp:585");
 }
 
 void
@@ -632,7 +633,8 @@ Transformation::applyPageScale(Inkscape::Selection *selection)
         sp_selection_scale_relative(selection, center, scale);
     }
 
-    sp_document_done(sp_desktop_document(selection->desktop()));
+    sp_document_done(sp_desktop_document(selection->desktop()), SP_VERB_DIALOG_TRANSFORM, 
+                     /* TODO: annotate */ "transformation.cpp:637");
 }
 
 void
@@ -650,7 +652,8 @@ Transformation::applyPageRotate(Inkscape::Selection *selection)
         sp_selection_rotate_relative(selection, center, angle);
     }
 
-    sp_document_done(sp_desktop_document(selection->desktop()));
+    sp_document_done(sp_desktop_document(selection->desktop()), SP_VERB_DIALOG_TRANSFORM, 
+                     /* TODO: annotate */ "transformation.cpp:656");
 }
 
 void
@@ -702,7 +705,8 @@ Transformation::applyPageSkew(Inkscape::Selection *selection)
         }
     }
 
-    sp_document_done(sp_desktop_document(selection->desktop()));
+    sp_document_done(sp_desktop_document(selection->desktop()), SP_VERB_DIALOG_TRANSFORM, 
+                     /* TODO: annotate */ "transformation.cpp:709");
 }
 
 
@@ -728,7 +732,8 @@ Transformation::applyPageTransform(Inkscape::Selection *selection)
         sp_selection_apply_affine(selection, displayed); // post-multiply each object's transform
     }
 
-    sp_document_done(sp_desktop_document(selection->desktop()));
+    sp_document_done(sp_desktop_document(selection->desktop()), SP_VERB_DIALOG_TRANSFORM, 
+                     /* TODO: annotate */ "transformation.cpp:736");
 }