X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Ftoolbox.cpp;h=55c43ae454dc31bd6573ea00b1bb954764af4f4d;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=f65be468e71d25c14cfafbef7ee4ca961c8e349a;hpb=0701c9f1b64c96d5ed536c110dfd6cff531cca61;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/toolbox.cpp b/synfig-studio/trunk/src/gtkmm/toolbox.cpp
index f65be46..55c43ae 100644
--- a/synfig-studio/trunk/src/gtkmm/toolbox.cpp
+++ b/synfig-studio/trunk/src/gtkmm/toolbox.cpp
@@ -7,6 +7,7 @@
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **	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
@@ -232,7 +233,7 @@ Toolbox::Toolbox():
 	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());
@@ -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,13 +290,17 @@ 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::bind(sigc::ptr_fun(studio::App::dialog_open), ""));
 	button_save->signal_clicked().connect(sigc::ptr_fun(save_selected_instance));
@@ -292,17 +310,19 @@ 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();