Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-studio / trunk / src / gtkmm / dock_history.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/dock_history.cpp b/synfig-studio/trunk/src/gtkmm/dock_history.cpp
index 9e9a5ba..c8fc3da 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dock_history.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_history.cpp
@@ -6,7 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**     Copyright (c) 2007 Chris Moore
+**     Copyright (c) 2007, 2008 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -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>"
        ;
@@ -207,7 +219,7 @@ Dock_History::create_action_tree()
                column->set_resizable();
                column->set_clickable();
 
-               column->set_sort_column_id(COLUMNID_JUMP);
+               column->set_sort_column(COLUMNID_JUMP);
 
                action_tree->append_column(*column);
                //column->clicked();
@@ -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();