X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Ftoolbox.cpp;h=0318892da973703a7ac53c4bc4661013c767d3ff;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=4761c4c4f5cf0bd2b6677785850cd67954945a75;hpb=abfec44e244e596baab670309160fb84e5edc8b6;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/toolbox.cpp b/synfig-studio/trunk/src/gtkmm/toolbox.cpp
index 4761c4c..0318892 100644
--- 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
@@ -87,7 +87,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 ========================================================= */
 
@@ -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::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)));
@@ -306,7 +306,7 @@ Toolbox::Toolbox():
 
 	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);
@@ -388,7 +388,7 @@ Toolbox::~Toolbox()
 }
 
 void
-Toolbox::set_active_state(const String& statename)
+Toolbox::set_active_state(const synfig::String& statename)
 {
 	std::map<synfig::String,Gtk::ToggleButton *>::iterator iter;
 
@@ -497,8 +497,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);