X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdock_history.cpp;h=248f554dd3a75927a4ec2e937e5f7c505d404165;hb=37600b4b217caa5e316984ec0b035c5e8f9698af;hp=af43e0488640b0a3aa92ab470f6bf6399e2e6e37;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git
diff --git a/synfig-studio/trunk/src/gtkmm/dock_history.cpp b/synfig-studio/trunk/src/gtkmm/dock_history.cpp
index af43e04..248f554 100644
--- a/synfig-studio/trunk/src/gtkmm/dock_history.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_history.cpp
@@ -1,11 +1,12 @@
/* === S Y N F I G ========================================================= */
-/*! \file dialog_history.cpp
+/*! \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
@@ -68,12 +69,12 @@ Dock_History::Dock_History():
{
App::signal_instance_deleted().connect(sigc::mem_fun(*this,&studio::Dock_History::delete_instance));
App::signal_instance_selected().connect(sigc::mem_fun(*this,&studio::Dock_History::set_selected_instance_signal));
-
+
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 +84,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,18 +95,18 @@ 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)
+ 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)
+ sigc::ptr_fun(studio::App::redo)
);
action_group->add( Gtk::Action::create("toolbar-history", "History") );
@@ -115,9 +116,9 @@ Dock_History::Dock_History():
""
" "
" "
+ " "
" "
" "
- " "
" "
""
;
@@ -126,9 +127,9 @@ Dock_History::Dock_History():
action_group->set_sensitive(false);
- set_toolbar(*dynamic_cast(App::ui_manager()->get_widget("/toolbar-history")));
+ set_toolbar(*dynamic_cast(App::ui_manager()->get_widget("/toolbar-history")));
add(*create_action_tree());
-
+
/*
add_button(
Gtk::StockID("synfig-clear_undo"),
@@ -173,23 +174,23 @@ Dock_History::create_action_tree()
Gtk::CellRendererToggle* toggle_cr = Gtk::manage( new Gtk::CellRendererToggle() );
toggle_cr->signal_toggled().connect(sigc::mem_fun(*this, &studio::Dock_History::on_action_toggle) );
-
+
column->pack_start(*toggle_cr); //false = don't expand.
column->add_attribute(toggle_cr->property_active(),history_tree_model.is_active);
column->set_resizable();
column->set_clickable();
-
+
action_tree->append_column(*column);
}
/*{
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");
-
+
column->pack_start(*text_cr);
column->add_attribute(text_cr->property_text(),history_tree_model.canvas_id);
column->add_attribute(text_cr->property_foreground_set(),history_tree_model.is_redo);
-
+
action_tree->append_column(*column);
}*/
{
@@ -197,13 +198,13 @@ 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_foreground()="#003a7f";
-
+
column->set_resizable();
column->set_clickable();
-
+
column->set_sort_column_id(COLUMNID_JUMP);
action_tree->append_column(*column);
@@ -215,17 +216,17 @@ Dock_History::create_action_tree()
Gtk::CellRendererText *text_cr=Gtk::manage(new Gtk::CellRendererText());
text_cr->property_foreground()=Glib::ustring("#7f7f7f");
-
+
//column->pack_start(history_tree_model.icon, false); //false = don't expand.
column->pack_start(*text_cr);
column->add_attribute(text_cr->property_text(),history_tree_model.name);
column->add_attribute(text_cr->property_foreground_set(),history_tree_model.is_redo);
-
+
action_tree->append_column(*column);
}
-
+
action_tree->set_rules_hint();
// action_tree->signal_row_activated().connect(sigc::mem_fun(*this,&Dock_History::on_row_activate));
action_tree->signal_event().connect(sigc::mem_fun(*this,&Dock_History::on_action_event));
@@ -255,7 +256,7 @@ 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?")))
- {
+ {
selected_instance->clear_undo_stack();
}
}
@@ -264,7 +265,7 @@ 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?")))
- {
+ {
selected_instance->clear_redo_stack();
}
}
@@ -322,7 +323,7 @@ Dock_History::set_selected_instance(etl::loose_handle x)
std::list >::iterator iter;
- set_selected_instance_(x);
+ set_selected_instance_(x);
}
void
@@ -357,7 +358,7 @@ Dock_History::on_action_event(GdkEvent *event)
)
) break;
const Gtk::TreeRow row = *(action_tree->get_model()->get_iter(path));
-
+
//signal_user_click()(event->button.button,row,(ColumnID)column->get_sort_column_id());
if((ColumnID)column->get_sort_column_id()==COLUMNID_JUMP)
{
@@ -382,7 +383,7 @@ Dock_History::on_action_event(GdkEvent *event)
}
}
}
-
+
case GDK_BUTTON_RELEASE:
break;
default:
@@ -397,10 +398,10 @@ Dock_History::on_action_toggle(const Glib::ustring& path_string)
studio::HistoryTreeStore::Model history_tree_model;
Gtk::TreePath path(path_string);
-
+
const Gtk::TreeRow row = *(selected_instance->history_tree_store()->get_iter(path));
handle action=row[history_tree_model.action];
-
+
selected_instance->synfigapp::Instance::set_action_status(action,!action->is_active());
}