X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdock_history.cpp;h=9e9a5ba17b95578a7a2464598c0b32ba261c784b;hb=1745915d4d6e1100b381a64d4cfd595165dbf037;hp=5dfe8ddf29a9827638f0a807b8bf1141bdc6e7f4;hpb=c6af6e1c3816eb3b15c573089b32e6ae65cd2f49;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/dock_history.cpp b/synfig-studio/trunk/src/gtkmm/dock_history.cpp
index 5dfe8dd..9e9a5ba 100644
--- a/synfig-studio/trunk/src/gtkmm/dock_history.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_history.cpp
@@ -2,10 +2,11 @@
 /*!	\file dock_history.cpp
 **	\brief Template File
 **
-**	$Id: dock_history.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 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
@@ -43,6 +44,8 @@
 #include <synfigapp/action.h>
 #include "historytreestore.h"
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -72,8 +75,8 @@ Dock_History::Dock_History():
 	action_group->add(Gtk::Action::create(
 		"clear-undo",
 		Gtk::StockID("synfig-clear_undo"),
-		_("Clear the UNDO Stack"),
-		_("Clear the UNDO Stack")
+		_("Clear Undo Stack"),
+		_("Clear the undo stack")
 	),
 		sigc::mem_fun(
 			*this,
@@ -83,8 +86,8 @@ Dock_History::Dock_History():
 	action_group->add(Gtk::Action::create(
 		"clear-redo",
 		Gtk::StockID("synfig-clear_redo"),
-		_("Clear the REDO Stack"),
-		_("Clear the REDO Stack")
+		_("Clear Redo Stack"),
+		_("Clear the redo stack")
 	),
 		sigc::mem_fun(
 			*this,
@@ -94,30 +97,30 @@ Dock_History::Dock_History():
 	action_group->add(Gtk::Action::create(
 		"undo",
 		Gtk::StockID("gtk-undo"),
-		_("Undo previous action"),
-		_("Undo previous action")
+		_("Undo"),
+		_("Undo the previous action")
 	),
 		sigc::ptr_fun(studio::App::undo)
 	);
 	action_group->add(Gtk::Action::create(
 		"redo",
 		Gtk::StockID("gtk-redo"),
-		_("Redo previous action"),
-		_("Redo previous action")
+		_("Redo"),
+		_("Redo the previously undone action")
 	),
 		sigc::ptr_fun(studio::App::redo)
 	);
 
-	action_group->add( Gtk::Action::create("toolbar-history", "History") );
+	action_group->add( Gtk::Action::create("toolbar-history", _("History")) );
 	App::ui_manager()->insert_action_group(action_group);
 
 	Glib::ustring ui_info =
 	"<ui>"
 	"	<toolbar action='toolbar-history'>"
 	"	<toolitem action='undo' />"
+	"	<toolitem action='redo' />"
 	"	<toolitem action='clear-undo' />"
 	"	<toolitem action='clear-redo' />"
-	"	<toolitem action='redo' />"
 	"	</toolbar>"
 	"</ui>"
 	;
@@ -182,7 +185,7 @@ Dock_History::create_action_tree()
 		action_tree->append_column(*column);
 	}
 	/*{
-		Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column("Canvas") );
+		Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Canvas")) );
 		Gtk::CellRendererText *text_cr=Gtk::manage(new Gtk::CellRendererText());
 		text_cr->property_foreground()=Glib::ustring("#7f7f7f");
 
@@ -198,7 +201,7 @@ Dock_History::create_action_tree()
 		Gtk::CellRendererText* cell_renderer_jump=Gtk::manage(new Gtk::CellRendererText());
 		column->pack_start(*cell_renderer_jump,true);
 
-		cell_renderer_jump->property_text()="(JMP)";
+		cell_renderer_jump->property_text()=_("(JMP)");
 		cell_renderer_jump->property_foreground()="#003a7f";
 
 		column->set_resizable();
@@ -210,7 +213,7 @@ Dock_History::create_action_tree()
 		//column->clicked();
 	}
 	{
-		Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column("Action") );
+		Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Action")) );
 
 		Gtk::CellRendererText *text_cr=Gtk::manage(new Gtk::CellRendererText());
 		text_cr->property_foreground()=Glib::ustring("#7f7f7f");
@@ -225,6 +228,9 @@ Dock_History::create_action_tree()
 		action_tree->append_column(*column);
 	}
 
+	action_tree->set_enable_search(true);
+	action_tree->set_search_column(history_tree_model.name);
+	action_tree->set_search_equal_func(sigc::ptr_fun(&studio::HistoryTreeStore::search_func));
 
 	action_tree->set_rules_hint();
 //	action_tree->signal_row_activated().connect(sigc::mem_fun(*this,&Dock_History::on_row_activate));