projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document --start-time.
[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
4761c4c
..
f65be46
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
**
** \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
**
** 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
+87,7
@@
using namespace std;
using namespace etl;
using namespace synfig;
using namespace studio;
using namespace etl;
using namespace synfig;
using namespace studio;
-using namespace
SigC
;
+using namespace
sigc
;
/* === M A C R O S ========================================================= */
/* === M A C R O S ========================================================= */
@@
-227,7
+227,7
@@
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,
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::MenuElem(_("Open Recent"),*recent_files_menu));
@@
-236,7
+236,7
@@
Toolbox::Toolbox():
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::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(_("
Dialog
s"),*dock_dialogs));
+ filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("
Panel
s"),*dock_dialogs));
//filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Canvas Browser..."),
// sigc::mem_fun(studio::App::show_comp_view)));
//filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Canvas Browser..."),
// sigc::mem_fun(studio::App::show_comp_view)));
@@
-284,7
+284,7
@@
Toolbox::Toolbox():
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_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_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));
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));
@@
-306,7
+306,7
@@
Toolbox::Toolbox():
file_buttons->show();
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);
tool_table->show();
Gtk::HandleBox* handle_tools(manage(new Gtk::HandleBox()));
handle_tools->add(*tool_table);
@@
-388,7
+388,7
@@
Toolbox::~Toolbox()
}
void
}
void
-Toolbox::set_active_state(const String& statename)
+Toolbox::set_active_state(const
synfig::
String& statename)
{
std::map<synfig::String,Gtk::ToggleButton *>::iterator iter;
{
std::map<synfig::String,Gtk::ToggleButton *>::iterator iter;
@@
-497,8
+497,8
@@
Toolbox::add_state(const Smach::state_base *state)
icon->show();
button->show();
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);
tool_table->attach(*button,col,col+1,row,row+1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);