X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcompview.cpp;h=3688c518f8bb24e934d40f0da491e3af79469940;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=0d86cc037fc6749dde7f57a8f3047e735899b8bf;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/compview.cpp b/synfig-studio/trunk/src/gtkmm/compview.cpp index 0d86cc0..3688c51 100644 --- a/synfig-studio/trunk/src/gtkmm/compview.cpp +++ b/synfig-studio/trunk/src/gtkmm/compview.cpp @@ -1,18 +1,23 @@ -/*! ======================================================================== -** Synfig -** Template File -** $Id: compview.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $ +/* === S Y N F I G ========================================================= */ +/*! \file compview.cpp +** \brief writeme ** -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** $Id$ ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. +** \legal +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2008 Chris Moore ** -** You may not copy, print, publish, or in any -** other way distribute this software without -** a prior written agreement with -** the copyright holder. +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. +** +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** \endlegal ** ** === N O T E S =========================================================== ** @@ -39,6 +44,8 @@ #include "canvasview.h" #include +#include "general.h" + #endif /* === M A C R O S ========================================================= */ @@ -56,7 +63,7 @@ using namespace studio; #define COLUMNID_JUMP (787584) #define ColumnID int - + /* === G L O B A L S ======================================================= */ /* === P R O C E D U R E S ================================================= */ @@ -79,16 +86,16 @@ CompView::CompView(): table->attach(*notebook, 0, 1, 1,2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); - notebook->append_page(*create_canvas_tree(),"Canvases"); - notebook->append_page(*create_action_tree(),"History"); + notebook->append_page(*create_canvas_tree(),_("Canvases")); + notebook->append_page(*create_action_tree(),_("History")); + - /* studio::Instance::ImageColumnModel image_column_model; image_list=manage(new class Gtk::TreeView()); - image_list->append_column("Name",image_column_model.name); + image_list->append_column(_("Name"),image_column_model.name); image_list->signal_row_activated().connect(sigc::mem_fun(*this,&CompView::on_image_activate)); image_list->set_rules_hint(); @@ -100,10 +107,10 @@ CompView::CompView(): image_page->attach(*image_list_scroll, 0, 1, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); Gtk::HBox *image_buttons=manage(new class Gtk::HBox()); image_page->attach(*image_buttons, 0, 1, 1,2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK, 0, 0); - ADD_TOOLBOX_BUTTON(button_image_new,"gtk-new","Create a new image"); - ADD_TOOLBOX_BUTTON(button_image_delete,"gtk-delete","Delete image"); - ADD_TOOLBOX_BUTTON(button_image_rename,"gtk-rename","Rename image"); - ADD_TOOLBOX_BUTTON(button_image_copy,"gtk-copy","Duplicate image"); + ADD_TOOLBOX_BUTTON(button_image_new,"gtk-new",_("Create a new image")); + ADD_TOOLBOX_BUTTON(button_image_delete,"gtk-delete",_("Delete image")); + ADD_TOOLBOX_BUTTON(button_image_rename,"gtk-rename",_("Rename image")); + ADD_TOOLBOX_BUTTON(button_image_copy,"gtk-copy",_("Duplicate image")); button_image_new->signal_clicked().connect(sigc::mem_fun(*this,&CompView::new_image)); button_image_delete->signal_clicked().connect(sigc::mem_fun(*this,&CompView::delete_image)); button_image_rename->signal_clicked().connect(sigc::mem_fun(*this,&CompView::rename_image)); @@ -115,7 +122,7 @@ CompView::CompView(): studio::Instance::ValueNodeColumnModel valuenode_column_model; valuenode_list=manage(new class Gtk::TreeView()); - valuenode_list->append_column("Name",valuenode_column_model.name); + valuenode_list->append_column(_("Name"),valuenode_column_model.name); valuenode_list->signal_row_activated().connect(sigc::mem_fun(*this,&CompView::on_valuenode_activate)); valuenode_list->set_rules_hint(); @@ -127,10 +134,10 @@ CompView::CompView(): valuenode_page->attach(*valuenode_list_scroll, 0, 1, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); Gtk::HBox *valuenode_buttons=manage(new class Gtk::HBox()); valuenode_page->attach(*valuenode_buttons, 0, 1, 1,2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK, 0, 0); - ADD_TOOLBOX_BUTTON(button_valuenode_new,"gtk-new","Create a new value_node"); - ADD_TOOLBOX_BUTTON(button_valuenode_delete,"gtk-delete","Delete value_node"); - ADD_TOOLBOX_BUTTON(button_valuenode_rename,"gtk-rename","Rename value_node"); - ADD_TOOLBOX_BUTTON(button_valuenode_copy,"gtk-copy","Duplicate value_node"); + ADD_TOOLBOX_BUTTON(button_valuenode_new,"gtk-new",_("Create a new value_node")); + ADD_TOOLBOX_BUTTON(button_valuenode_delete,"gtk-delete",_("Delete value_node")); + ADD_TOOLBOX_BUTTON(button_valuenode_rename,"gtk-rename",_("Rename value_node")); + ADD_TOOLBOX_BUTTON(button_valuenode_copy,"gtk-copy",_("Duplicate value_node")); button_valuenode_new->signal_clicked().connect(sigc::mem_fun(*this,&CompView::new_value_node)); button_valuenode_delete->signal_clicked().connect(sigc::mem_fun(*this,&CompView::delete_value_node)); button_valuenode_rename->signal_clicked().connect(sigc::mem_fun(*this,&CompView::rename_value_node)); @@ -141,8 +148,8 @@ CompView::CompView(): valuenode_buttons->pack_start(*button_valuenode_copy); - notebook->append_page(*image_page,"Images"); - notebook->append_page(*valuenode_page,"ValueNodes"); + notebook->append_page(*image_page,_("Images")); + notebook->append_page(*valuenode_page,_("ValueNodes")); image_page->show_all(); valuenode_page->show_all(); @@ -152,12 +159,12 @@ CompView::CompView(): App::signal_instance_created().connect(sigc::mem_fun(*this,&studio::CompView::new_instance)); App::signal_instance_deleted().connect(sigc::mem_fun(*this,&studio::CompView::delete_instance)); App::signal_instance_selected().connect(sigc::mem_fun(*this,&studio::CompView::set_selected_instance_signal)); - + table->show_all(); add(*table); - set_title("Canvas Browser"); + set_title(_("Canvas Browser")); set_modal(false); set_resizable(true); property_window_position().set_value(Gtk::WIN_POS_NONE); @@ -180,7 +187,7 @@ CompView::create_canvas_tree() studio::Instance::CanvasTreeModel canvas_tree_model; canvas_tree=manage(new class Gtk::TreeView()); { - Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column("ID") ); + Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("ID")) ); // Gtk::CellRendererPixbuf* icon_cellrenderer = Gtk::manage( new Gtk::CellRendererPixbuf() ); //column->pack_start(*icon_cellrenderer,false); @@ -190,7 +197,7 @@ CompView::create_canvas_tree() //#ifdef NDEBUG // column->add_attribute(icon_cellrenderer->property_pixbuf(), canvas_tree_model.icon); //#endif - + canvas_tree->append_column(*column); } canvas_tree->set_rules_hint(); @@ -220,23 +227,23 @@ CompView::create_action_tree() Gtk::CellRendererToggle* toggle_cr = Gtk::manage( new Gtk::CellRendererToggle() ); toggle_cr->signal_toggled().connect(sigc::mem_fun(*this, &studio::CompView::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::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); }*/ { @@ -244,35 +251,35 @@ CompView::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(); column->set_clickable(); - - column->set_sort_column_id(COLUMNID_JUMP); + + column->set_sort_column(COLUMNID_JUMP); action_tree->append_column(*column); //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"); - + //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,&CompView::on_row_activate)); action_tree->signal_event().connect(sigc::mem_fun(*this,&CompView::on_action_event)); @@ -292,14 +299,14 @@ CompView::create_action_tree() Gtk::Button* clear_redo_button(manage(new Gtk::Button(_("Clear Redo")))); clear_redo_button->signal_pressed().connect(sigc::mem_fun(*this,&studio::CompView::clear_redo)); - + Gtk::Table* table(manage(new Gtk::Table())); table->attach(*scrolledwindow, 0, 2, 0,1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); table->attach(*clear_button, 0, 1, 1,2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK, 0, 0); table->attach(*clear_redo_button, 1, 2, 1,2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK, 0, 0); - + table->show_all(); - + return table; } @@ -323,7 +330,7 @@ void CompView::clear_history() { 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(); } } @@ -332,7 +339,7 @@ void CompView::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(); } } @@ -436,7 +443,7 @@ CompView::set_selected_instance(etl::loose_handle x) else instance_selector->set_history(0); - set_selected_instance_(x); + set_selected_instance_(x); } void @@ -444,11 +451,11 @@ CompView::new_instance(etl::handle instance) { if(studio::App::shutdown_in_progress) return; - + assert(instance); - + etl::loose_handle loose_instance(instance); - + instance->synfigapp::Instance::signal_filename_changed().connect(sigc::mem_fun(*this,&CompView::refresh_instances)); instance->synfigapp::Instance::signal_filename_changed().connect( sigc::bind >( @@ -456,7 +463,7 @@ CompView::new_instance(etl::handle instance) loose_instance ) ); - + { std::string name=basename(instance->get_file_name()); @@ -532,7 +539,7 @@ CompView::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) { @@ -549,7 +556,7 @@ CompView::on_action_event(GdkEvent *event) } } } - + case GDK_BUTTON_RELEASE: break; default: @@ -574,7 +581,7 @@ CompView::on_tree_event(GdkEvent *event) synfigapp::Action::ParamList param_list; param_list.add("canvas",synfig::Canvas::Handle(get_selected_canvas())); param_list.add("canvas_interface",get_selected_instance()->find_canvas_interface(get_selected_canvas())); - get_selected_instance()->find_canvas_view(get_selected_canvas())->add_actions_to_menu(&menu, param_list,synfigapp::Action::CATEGORY_CANVAS); + get_selected_instance()->find_canvas_view(get_selected_canvas())->add_actions_to_menu(&menu, param_list,synfigapp::Action::CATEGORY_CANVAS); menu.popup(0,0); menu.show(); break; @@ -599,10 +606,10 @@ CompView::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()); }