X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Ftoolbox.cpp;h=55c43ae454dc31bd6573ea00b1bb954764af4f4d;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=aeed4f59d47f7170be14aac015291e9ecee6c4ed;hpb=c2813b4d63804cac9b4067146a9e6eca717cb3e4;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/toolbox.cpp b/synfig-studio/trunk/src/gtkmm/toolbox.cpp index aeed4f5..55c43ae 100644 --- a/synfig-studio/trunk/src/gtkmm/toolbox.cpp +++ b/synfig-studio/trunk/src/gtkmm/toolbox.cpp @@ -6,7 +6,8 @@ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley -** Copyright (c) 2007 Chris Moore +** Copyright (c) 2007, 2008 Chris Moore +** Copyright (c) 2008 Paul Wise ** ** This package is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License as @@ -87,7 +88,7 @@ using namespace std; using namespace etl; using namespace synfig; using namespace studio; -using namespace SigC; +using namespace sigc; /* === M A C R O S ========================================================= */ @@ -227,16 +228,16 @@ Toolbox::Toolbox(): filemenu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::Stock::NEW, sigc::ptr_fun(&studio::App::new_instance))); filemenu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::Stock::OPEN, - sigc::ptr_fun(&studio::App::dialog_open))); + sigc::bind(sigc::ptr_fun(&studio::App::dialog_open), ""))); filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Open Recent"),*recent_files_menu)); filemenu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("synfig-saveall"), - sigc::ptr_fun(&studio::App::dialog_not_implemented))); + sigc::ptr_fun(save_all))); filemenu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::Stock::CLOSE, sigc::ptr_fun(close_selected_instance))); filemenu->items().push_back(Gtk::Menu_Helpers::SeparatorElem()); - filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Dialogs"),*dock_dialogs)); + filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Panels"),*dock_dialogs)); //filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Canvas Browser..."), // sigc::mem_fun(studio::App::show_comp_view))); @@ -257,9 +258,22 @@ Toolbox::Toolbox(): filemenu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID(Gtk::Stock::QUIT), sigc::ptr_fun(studio::App::quit))); +#define WIKI(title,page) \ + helpmenu->items().push_back(Gtk::Menu_Helpers::MenuElem(title, \ + sigc::bind(sigc::ptr_fun(&studio::App::open_url),String("http://synfig.org")+page))) + Gtk::Menu *helpmenu = manage(new class Gtk::Menu()); - helpmenu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::Stock::HELP, - sigc::ptr_fun(studio::App::dialog_not_implemented))); + helpmenu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::Stock::HELP, sigc::ptr_fun(studio::App::dialog_help))); + helpmenu->items().push_back(Gtk::Menu_Helpers::SeparatorElem()); + + /* TRANSLATORS: Help menu entry */ WIKI(_("Synfig Wiki"), /* TRANSLATORS: a wiki page */ _("/Main_Page") ); + /* TRANSLATORS: Help menu entry */ WIKI(_("Tutorials"), /* TRANSLATORS: a wiki page */ _("/Tutorials") ); + /* TRANSLATORS: Help menu entry */ WIKI(_("Frequently Asked Questions"),/* TRANSLATORS: a wiki page */ _("/FAQ") ); + /* TRANSLATORS: Help menu entry */ WIKI(_("Get Support"), /* TRANSLATORS: a wiki page */ _("/Contact") ); + /* TRANSLATORS: Help menu entry */ WIKI(_("Keyboard Shortcuts"), /* TRANSLATORS: a wiki page */ _("/Keyboard_Shortcuts") ); + /* TRANSLATORS: Help menu entry */ WIKI(_("Mouse Shortcuts"), /* TRANSLATORS: a wiki page */ _("/Mouse_Shortcuts") ); + /* TRANSLATORS: Help menu entry */ WIKI(_("All Pages"), "/Special:Allpages" ); + helpmenu->items().push_back(Gtk::Menu_Helpers::SeparatorElem()); helpmenu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("synfig-about"), sigc::ptr_fun(studio::App::dialog_about))); @@ -276,15 +290,19 @@ Toolbox::Toolbox(): 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",_("Save as...")); + 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_setup,"gtk-properties",_("Setup")); ADD_TOOLBOX_BUTTON(button_about,"synfig-about",_("About Synfig Studio")); + ADD_TOOLBOX_BUTTON(button_help,"gtk-help",_("Help")); + button_setup->signal_clicked().connect(sigc::ptr_fun(studio::App::show_setup)); button_about->signal_clicked().connect(sigc::ptr_fun(studio::App::dialog_about)); + button_help->signal_clicked().connect(sigc::ptr_fun(studio::App::dialog_help)); 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_open->signal_clicked().connect(sigc::bind(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(save_all)); @@ -292,21 +310,23 @@ Toolbox::Toolbox(): button_redo->signal_clicked().connect(sigc::ptr_fun(studio::App::redo)); // Create the file button cluster - Gtk::Table *file_buttons=manage(new class Gtk::Table(4, 4, false)); + Gtk::Table *file_buttons=manage(new class Gtk::Table()); 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, 4,5, 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_undo, 0,1, 1,2, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + file_buttons->attach(*button_redo, 1,2, 1,2, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + file_buttons->attach(*button_setup, 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_help, 4,5, 1,2, Gtk::SHRINK, Gtk::SHRINK, 0, 0); file_buttons->show(); - tool_table=manage(new class Gtk::Table(4, 4, false)); + tool_table=manage(new class Gtk::Table()); tool_table->show(); Gtk::HandleBox* handle_tools(manage(new Gtk::HandleBox())); handle_tools->add(*tool_table); @@ -497,8 +517,8 @@ 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; + int row=state_button_map.size()/5; + int col=state_button_map.size()%5; tool_table->attach(*button,col,col+1,row,row+1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);