X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdock_history.cpp;h=c8fc3da8bd49ef673ff6cdc802a7232620047e80;hb=1f453e8ab546a357781372fe98aa1d004387d4b1;hp=4277f16c10302d0ec4c9da7a2f321c1d2f63ab68;hpb=756c0d29ac1742f231e6615f9a577e574e35a4af;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/dock_history.cpp b/synfig-studio/trunk/src/gtkmm/dock_history.cpp
index 4277f16..c8fc3da 100644
--- a/synfig-studio/trunk/src/gtkmm/dock_history.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_history.cpp
@@ -95,6 +95,17 @@ Dock_History::Dock_History():
 		)
 	);
 	action_group->add(Gtk::Action::create(
+		"clear-undo-and-redo",
+		Gtk::Stock::CLEAR,
+		_("Clear Undo and Redo Stacks"),
+		_("Clear the undo and redo stacks")
+	),
+		sigc::mem_fun(
+			*this,
+			&Dock_History::clear_undo_and_redo
+		)
+	);
+	action_group->add(Gtk::Action::create(
 		"undo",
 		Gtk::StockID("gtk-undo"),
 		_("Undo"),
@@ -121,6 +132,7 @@ Dock_History::Dock_History():
 	"	<toolitem action='redo' />"
 	"	<toolitem action='clear-undo' />"
 	"	<toolitem action='clear-redo' />"
+	"	<toolitem action='clear-undo-and-redo' />"
 	"	</toolbar>"
 	"</ui>"
 	;
@@ -260,17 +272,26 @@ Dock_History::create_action_tree()
 void
 Dock_History::clear_undo()
 {
-	if(selected_instance && App::dialog_yes_no(_("Clear History"), _("You will not be able to undo any changes that you have made!\nAre you sure you want to clear the undo stack?")))
-	{
+	if(selected_instance && App::dialog_yes_no(_("Clear History"),
+			_("You will not be able to undo any changes that you have made!\nAre you sure you want to clear the undo stack?")))
 		selected_instance->clear_undo_stack();
-	}
 }
 
 void
 Dock_History::clear_redo()
 {
-	if(selected_instance && App::dialog_yes_no(_("Clear History"), _("You will not be able to redo any changes that you have made!\nAre you sure you want to clear the redo stack?")))
+	if(selected_instance && App::dialog_yes_no(_("Clear History"),
+			_("You will not be able to redo any changes that you have made!\nAre you sure you want to clear the redo stack?")))
+		selected_instance->clear_redo_stack();
+}
+
+void
+Dock_History::clear_undo_and_redo()
+{
+	if(selected_instance && App::dialog_yes_no(_("Clear History"),
+			_("You will not be able to undo or redo any changes that you have made!\nAre you sure you want to clear the undo and redo stacks?")))
 	{
+		selected_instance->clear_undo_stack();
 		selected_instance->clear_redo_stack();
 	}
 }
@@ -285,18 +306,53 @@ Dock_History::update_undo_redo()
 		action_group->get_action("clear-undo")->set_sensitive(instance->get_undo_status());
 		action_group->get_action("redo")->set_sensitive(instance->get_redo_status());
 		action_group->get_action("clear-redo")->set_sensitive(instance->get_redo_status());
+		action_group->get_action("clear-undo-and-redo")->set_sensitive(instance->get_undo_status() || instance->get_redo_status());
 	}
 }
 
 void
+Dock_History::on_undo_tree_changed()
+{
+	Gtk::TreeModel::Children children(selected_instance->history_tree_store()->children());
+
+	if (!children.size())
+		return;
+
+	studio::HistoryTreeStore::Model model;
+
+	Gtk::TreeModel::Children::iterator iter, prev = children.end();
+	for (iter = children.begin(); iter != children.end(); prev = iter++)
+		if ((*iter)[model.is_redo])
+		{
+			if (prev == children.end())
+				action_tree->get_selection()->unselect_all();
+			else
+			{
+				action_tree->scroll_to_row(Gtk::TreePath(prev), 0.5);
+				action_tree->get_selection()->select(prev);
+			}
+			return;
+		}
+
+	action_tree->scroll_to_row(Gtk::TreePath(prev), 0.5);
+	action_tree->get_selection()->select(prev);
+}
+
+void
 Dock_History::set_selected_instance_(etl::handle<studio::Instance> instance)
 {
 	if(studio::App::shutdown_in_progress)
 		return;
 
+	if (on_undo_tree_changed_connection)
+		on_undo_tree_changed_connection.disconnect();
+
 	selected_instance=instance;
 	if(instance)
 	{
+		on_undo_tree_changed_connection = selected_instance->history_tree_store()->signal_undo_tree_changed().connect(
+			sigc::mem_fun(*this,&Dock_History::on_undo_tree_changed));
+
 		action_tree->set_model(instance->history_tree_store());
 		action_tree->show();
 		update_undo_redo();