X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Ftoolbox.cpp;h=7559f32c5ee70d0eea1e28d56b1f302039043962;hb=f59b7cc0fa5bcd11c52025fe7b06287cffae4cd5;hp=9dddf7920b2d2a5a95c710b8073ab1699e9db31a;hpb=ae4d70fa2a858944c2274fb432eac107da9942ac;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/toolbox.cpp b/synfig-studio/trunk/src/gtkmm/toolbox.cpp index 9dddf79..7559f32 100644 --- a/synfig-studio/trunk/src/gtkmm/toolbox.cpp +++ b/synfig-studio/trunk/src/gtkmm/toolbox.cpp @@ -148,6 +148,14 @@ save_as_selected_instance() } void +save_all() +{ + std::list >::iterator iter; + for(iter=App::instance_list.begin();iter!=App::instance_list.end();iter++) + (*iter)->save(); +} + +void close_selected_instance() { etl::handle instance=studio::App::get_selected_instance(); @@ -184,12 +192,6 @@ void _create_stock_dialog2() dock_dialog->present(); } -static void -show_dialog_color() -{ - App::dialog_color->present(); -} - Toolbox::Toolbox(): Gtk::Window(Gtk::WINDOW_TOPLEVEL), dialog_settings(this,"toolbox") @@ -267,44 +269,37 @@ Toolbox::Toolbox(): Gtk::Image *icon; - ADD_TOOLBOX_BUTTON(button_new,"gtk-new","New"); - ADD_TOOLBOX_BUTTON(button_open,"gtk-open","Open"); + ADD_TOOLBOX_BUTTON(button_new,"gtk-new","New..."); + ADD_TOOLBOX_BUTTON(button_open,"gtk-open","Open..."); ADD_TOOLBOX_BUTTON(button_save,"gtk-save","Save"); - ADD_TOOLBOX_BUTTON(button_saveas,"gtk-save-as","SaveAs"); + ADD_TOOLBOX_BUTTON(button_saveas,"gtk-save-as","Save as..."); ADD_TOOLBOX_BUTTON(button_save_all,"synfig-saveall","Save All"); TOOLBOX_BUTTON(button_undo,"gtk-undo","Undo"); TOOLBOX_BUTTON(button_redo,"gtk-redo","Redo"); ADD_TOOLBOX_BUTTON(button_about,"synfig-about","About Synfig Studio"); - ADD_TOOLBOX_BUTTON(button_color,"synfig-color","Color Dialog"); - - TOOLBOX_BUTTON(button_rotoscope_bline,"synfig-rotoscope_bline",_("Old Rotoscope BLine")); - TOOLBOX_BUTTON(button_rotoscope_polygon,"synfig-rotoscope_polygon",_("Rotoscope Polygon")); - TOOLBOX_BUTTON(button_eyedrop,"synfig-eyedrop",_("Eyedrop Tool")); - TOOLBOX_BUTTON(button_rotoscope,"synfig-rotoscope_bline",_("Rotoscope 2")); - - button_about->signal_clicked().connect(sigc::ptr_fun(studio::App::dialog_about)); button_new->signal_clicked().connect(sigc::ptr_fun(studio::App::new_instance)); button_open->signal_clicked().connect(sigc::ptr_fun(studio::App::dialog_open)); button_save->signal_clicked().connect(sigc::ptr_fun(save_selected_instance)); button_saveas->signal_clicked().connect(sigc::ptr_fun(save_as_selected_instance)); - button_save_all->signal_clicked().connect(sigc::ptr_fun(studio::App::dialog_not_implemented)); + button_save_all->signal_clicked().connect(sigc::ptr_fun(save_all)); button_undo->signal_clicked().connect(sigc::ptr_fun(studio::App::undo)); button_redo->signal_clicked().connect(sigc::ptr_fun(studio::App::redo)); - button_color->signal_clicked().connect(sigc::ptr_fun(show_dialog_color)); // Create the file button cluster Gtk::Table *file_buttons=manage(new class Gtk::Table(4, 4, false)); - file_buttons->attach(*button_new,0,1,0,1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); - file_buttons->attach(*button_open,1,2,0,1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); - file_buttons->attach(*button_save,2,3,0,1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); - file_buttons->attach(*button_saveas,3,4,0,1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); - file_buttons->attach(*button_save_all,0,1,1,2, Gtk::SHRINK, Gtk::SHRINK, 0, 0); - file_buttons->attach(*button_undo,1,2,1,2, Gtk::SHRINK, Gtk::SHRINK, 0, 0); - file_buttons->attach(*button_redo,2,3,1,2, Gtk::SHRINK, Gtk::SHRINK, 0, 0); - file_buttons->attach(*button_about,3,4,1,2, Gtk::SHRINK, Gtk::SHRINK, 0, 0); - //file_buttons->attach(*button_color,0,1,2,3, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + + file_buttons->attach(*button_new, 0,1, 0,1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + file_buttons->attach(*button_open, 1,2, 0,1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + file_buttons->attach(*button_save, 2,3, 0,1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + file_buttons->attach(*button_saveas, 3,4, 0,1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + + file_buttons->attach(*button_save_all, 0,1, 1,2, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + file_buttons->attach(*button_undo, 1,2, 1,2, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + file_buttons->attach(*button_redo, 2,3, 1,2, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + file_buttons->attach(*button_about, 3,4, 1,2, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + file_buttons->show(); tool_table=manage(new class Gtk::Table(4, 4, false)); @@ -327,11 +322,11 @@ Toolbox::Toolbox(): Gtk::Table *table1 = manage(new class Gtk::Table(1, 2, false)); table1->set_row_spacings(0); table1->set_col_spacings(0); - table1->attach(*menubar1, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::SHRINK, 0, 0); - table1->attach(*file_buttons, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND,Gtk::EXPAND|Gtk::FILL, 0, 0); + table1->attach(*menubar1, 0,1, 0,1, Gtk::FILL|Gtk::EXPAND, Gtk::SHRINK, 0, 0); + table1->attach(*file_buttons, 0,1, 1,2, Gtk::FILL|Gtk::EXPAND,Gtk::EXPAND|Gtk::FILL, 0, 0); //table1->attach(*manage(new Gtk::Label(_("Tools"))), 0, 1, 2, 3, Gtk::FILL|Gtk::EXPAND,Gtk::EXPAND|Gtk::FILL, 0, 0); - table1->attach(*handle_tools, 0, 1, 3, 4, Gtk::FILL|Gtk::EXPAND,Gtk::EXPAND|Gtk::FILL, 0, 0); - table1->attach(*handle_defaults, 0, 1, 4, 5, Gtk::FILL|Gtk::EXPAND,Gtk::EXPAND|Gtk::FILL, 0, 0); + table1->attach(*handle_tools, 0,1, 3,4, Gtk::FILL|Gtk::EXPAND,Gtk::EXPAND|Gtk::FILL, 0, 0); + table1->attach(*handle_defaults, 0,1, 4,5, Gtk::FILL|Gtk::EXPAND,Gtk::EXPAND|Gtk::FILL, 0, 0); table1->show_all(); @@ -358,11 +353,6 @@ Toolbox::Toolbox(): button_undo->set_sensitive(false); button_redo->set_sensitive(false); - button_rotoscope_bline->set_sensitive(false); - button_rotoscope->set_sensitive(false); - button_rotoscope_polygon->set_sensitive(false); - button_eyedrop->set_sensitive(false); - std::list listTargets; listTargets.push_back( Gtk::TargetEntry("text/plain") ); @@ -500,9 +490,6 @@ Toolbox::add_state(const Smach::state_base *state) icon->show(); button->show(); - - - int row=state_button_map.size()/4; int col=state_button_map.size()%4; @@ -517,7 +504,6 @@ Toolbox::add_state(const Smach::state_base *state) ) ); - refresh(); } @@ -534,7 +520,7 @@ Toolbox::update_undo_redo() // This should probably go elsewhere, but it should // work fine here with no troubles. - // These next several lines just adjust the rotoscope buttons + // These next several lines just adjust the tool buttons // so that they are only clickable when they should be. if(instance && App::get_selected_canvas_view()) {