Merge branch 'master' into nikitakit_master

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

diff --git a/synfig-studio/src/gtkmm/toolbox.cpp b/synfig-studio/src/gtkmm/toolbox.cpp
index 55c43ae..ea40e7d 100644 (file)
--- a/synfig-studio/src/gtkmm/toolbox.cpp
+++ b/synfig-studio/src/gtkmm/toolbox.cpp
@@ -8,6 +8,7 @@
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **     Copyright (c) 2007, 2008 Chris Moore
 **  Copyright (c) 2008 Paul Wise
+**     Copyright (c) 2009 Nikita Kitaev
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -239,16 +240,6 @@ Toolbox::Toolbox():
        filemenu->items().push_back(Gtk::Menu_Helpers::SeparatorElem());
        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)));
-       //filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Gradient Editor..."),
-       //      sigc::mem_fun(show_dialog_gradient)));
-       //filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Tool Options"),
-       //      sigc::mem_fun(show_dialog_tool_options)));
-       //filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Colors..."),
-       //      sigc::mem_fun(show_dialog_color)));
-       //filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Color Palette..."),
-       //      sigc::mem_fun(show_dialog_palette)));
        filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Input Devices..."),
                sigc::ptr_fun(&show_dialog_input)));
        filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Setup..."),
@@ -348,9 +339,8 @@ Toolbox::Toolbox():
        table1->set_col_spacings(0);
        table1->attach(*menubar1,        0,1, 0,1, Gtk::FILL|Gtk::EXPAND, Gtk::SHRINK, 0, 0);
        table1->attach(*file_buttons,    0,1, 1,2, Gtk::FILL|Gtk::EXPAND,Gtk::EXPAND|Gtk::FILL, 0, 0);
-       //table1->attach(*manage(new Gtk::Label(_("Tools"))), 0, 1, 2, 3, Gtk::FILL|Gtk::EXPAND,Gtk::EXPAND|Gtk::FILL, 0, 0);
-       table1->attach(*handle_tools,    0,1, 3,4, Gtk::FILL|Gtk::EXPAND,Gtk::EXPAND|Gtk::FILL, 0, 0);
-       table1->attach(*handle_defaults, 0,1, 4,5, Gtk::FILL|Gtk::EXPAND,Gtk::EXPAND|Gtk::FILL, 0, 0);
+       table1->attach(*handle_tools,    0,1, 2,3, Gtk::FILL|Gtk::EXPAND,Gtk::EXPAND|Gtk::FILL, 0, 0);
+       table1->attach(*handle_defaults, 0,1, 3,4, Gtk::FILL|Gtk::EXPAND,Gtk::EXPAND|Gtk::FILL, 0, 0);
        table1->show_all();
 
 
@@ -474,16 +464,7 @@ Toolbox::change_state_(const Smach::state_base *state)
        {
                etl::handle<studio::CanvasView> canvas_view(studio::App::get_selected_canvas_view());
                if(canvas_view)
-               {
-                       if(state->get_name()==String("normal"))
-                       {
-                               canvas_view->get_smach().egress();
-                       }
-                       else
-                       {
                                canvas_view->get_smach().enter(state);
-                       }
-               }
                else
                        refresh();
        }