Add an icon to show the Setup dialog.

[synfig.git] / synfig-studio / trunk / src / gtkmm / toolbox.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/toolbox.cpp b/synfig-studio/trunk/src/gtkmm/toolbox.cpp
index 5524bd3..9f08cc4 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/toolbox.cpp
+++ b/synfig-studio/trunk/src/gtkmm/toolbox.cpp
@@ -6,7 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**     Copyright (c) 2007 Chris Moore
+**     Copyright (c) 2007, 2008 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
@@ -227,12 +227,12 @@ 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());
@@ -259,7 +259,7 @@ Toolbox::Toolbox():
 
        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)));
+               sigc::ptr_fun(studio::App::dialog_help)));
        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)));
@@ -280,11 +280,15 @@ Toolbox::Toolbox():
        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,17 +296,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();