From: dooglus <dooglus@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Fri, 1 Feb 2008 16:03:50 +0000 (+0000)
Subject: With the re-enabling of 'Alpha Brighten', the toolbox has become a little wider.... 
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=7ff03cf9a5dfb6960044ac4b5b2bd8ffe5327b9c;p=synfig.git

With the re-enabling of 'Alpha Brighten', the toolbox has become a little wider.  Some foreign translations of the blend method could also push it wider.  And since we have 15 tool icons by default, I've made the toolbox 5 icons wide instead of 4, and rearranged them slightly.  The top row is now all for "moving ducks", the middle row for "drawing stuff", and the bottom row is more drawing on the left and looking at stuff (eyedrop, zoom) on the right.


git-svn-id: http://svn.voria.com/code@1547 1f10aa63-cdf2-0310-b900-c93c546f37ac
---

diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp
index c01ee32..ba154c2 100644
--- a/synfig-studio/trunk/src/gtkmm/app.cpp
+++ b/synfig-studio/trunk/src/gtkmm/app.cpp
@@ -1128,30 +1128,27 @@ App::App(int *argc, char ***argv):
 		device_tracker=new studio::DeviceTracker();
 
 		studio_init_cb.task(_("Init Tools..."));
+
+		/* row 1 */
 		state_manager->add_state(&state_normal);
 		state_manager->add_state(&state_smooth_move);
 		state_manager->add_state(&state_scale);
 		state_manager->add_state(&state_rotate);
+		studio_init_cb.task(_("Init ModMirror...")); module_list_.push_back(new ModMirror()); module_list_.back()->start();
 
+		/* row 2 */
 		state_manager->add_state(&state_bline);
-
-
 		state_manager->add_state(&state_circle);
 		state_manager->add_state(&state_rectangle);
-
 		state_manager->add_state(&state_gradient);
-		state_manager->add_state(&state_eyedrop);
-		state_manager->add_state(&state_fill);
-
-		state_manager->add_state(&state_zoom);
-
-		// Enabled - it's useful to be able to work with polygons without tangent ducks getting in the way.
-		// I know we can switch tangent ducks off, but why not allow this kind of layer as well?
-		if(!getenv("SYNFIG_DISABLE_POLYGON")) state_manager->add_state(&state_polygon);
+		if(!getenv("SYNFIG_DISABLE_POLYGON")) state_manager->add_state(&state_polygon); // Enabled - for working without ducks
 
-		// Enabled for now.  Let's see whether they're good enough yet.
-		if(!getenv("SYNFIG_DISABLE_DRAW"   )) state_manager->add_state(&state_draw);
+		/* row 3 */
+		if(!getenv("SYNFIG_DISABLE_DRAW"   )) state_manager->add_state(&state_draw); // Enabled for now.  Let's see whether they're good enough yet.
 		if(!getenv("SYNFIG_DISABLE_SKETCH" )) state_manager->add_state(&state_sketch);
+		state_manager->add_state(&state_fill);
+		state_manager->add_state(&state_eyedrop);
+		state_manager->add_state(&state_zoom);
 
 		// Disabled by default - it doesn't work properly?
 		if(getenv("SYNFIG_ENABLE_WIDTH"    )) state_manager->add_state(&state_width);
@@ -1159,10 +1156,6 @@ App::App(int *argc, char ***argv):
 		studio_init_cb.task(_("Init ModPalette..."));
 		module_list_.push_back(new ModPalette()); module_list_.back()->start();
 
-		studio_init_cb.task(_("Init ModMirror..."));
-		module_list_.push_back(new ModMirror()); module_list_.back()->start();
-
-
 		studio_init_cb.task(_("Init Setup Dialog..."));
 		dialog_setup=new studio::Dialog_Setup();
 
diff --git a/synfig-studio/trunk/src/gtkmm/toolbox.cpp b/synfig-studio/trunk/src/gtkmm/toolbox.cpp
index 8406164..5524bd3 100644
--- a/synfig-studio/trunk/src/gtkmm/toolbox.cpp
+++ b/synfig-studio/trunk/src/gtkmm/toolbox.cpp
@@ -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);
@@ -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);