Move Transform Tool into Normal Tool

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

diff --git a/synfig-studio/src/gtkmm/app.cpp b/synfig-studio/src/gtkmm/app.cpp
index 47776c6..4076a41 100644 (file)
--- a/synfig-studio/src/gtkmm/app.cpp
+++ b/synfig-studio/src/gtkmm/app.cpp
@@ -89,11 +89,9 @@
 #include "state_circle.h"
 #include "state_rectangle.h"
 #include "state_smoothmove.h"
-#include "state_scale.h"
 #include "state_star.h"
 #include "state_text.h"
 #include "state_width.h"
-#include "state_rotate.h"
 #include "state_zoom.h"
 
 #include "devicetracker.h"
@@ -1098,8 +1096,8 @@ init_ui_manager()
        ACCEL("<Mod1>4",                                                                                                        "<Actions>/canvasview/mask-radius-ducks"                                );
        ACCEL("<Mod1>5",                                                                                                        "<Actions>/canvasview/mask-width-ducks"                         );
        ACCEL("<Mod1>6",                                                                                                        "<Actions>/canvasview/mask-angle-ducks"                         );
-       ACCEL2(Gtk::AccelKey(GDK_Page_Up,Gdk::SHIFT_MASK,                                       "<Actions>/action_group_layer_ops/action-LayerRaise"                            ));
-       ACCEL2(Gtk::AccelKey(GDK_Page_Down,Gdk::SHIFT_MASK,                                     "<Actions>/action_group_layer_ops/action-LayerLower"                            ));
+       ACCEL2(Gtk::AccelKey(GDK_Page_Up,Gdk::SHIFT_MASK,                                       "<Actions>/action_group_layer_action_manager/action-LayerRaise"                         ));
+       ACCEL2(Gtk::AccelKey(GDK_Page_Down,Gdk::SHIFT_MASK,                                     "<Actions>/action_group_layer_action_manager/action-LayerLower"                         ));
        ACCEL("<Control>1",                                                                                                     "<Actions>/canvasview/quality-01"                                               );
        ACCEL("<Control>2",                                                                                                     "<Actions>/canvasview/quality-02"                                               );
        ACCEL("<Control>3",                                                                                                     "<Actions>/canvasview/quality-03"                                               );
@@ -1292,30 +1290,28 @@ App::App(int *argc, char ***argv):
 
                studio_init_cb.task(_("Init Tools..."));
 
-               /* row 1 */
+               /* editing tools */
                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();
+               if(!getenv("SYNFIG_DISABLE_WIDTH"  )) state_manager->add_state(&state_width); // Enabled since 0.61.09
 
-               /* row 2 */
+               /* new objects */
+               state_manager->add_state(&state_bline);         
                state_manager->add_state(&state_circle);
                state_manager->add_state(&state_rectangle);
                state_manager->add_state(&state_star);
                state_manager->add_state(&state_gradient);
                if(!getenv("SYNFIG_DISABLE_POLYGON")) state_manager->add_state(&state_polygon); // Enabled - for working without ducks
-
-               /* row 3 */
-               state_manager->add_state(&state_bline);
                state_manager->add_state(&state_text);
+               if(!getenv("SYNFIG_DISABLE_DRAW"   )) state_manager->add_state(&state_draw); // Enabled for now.  Let's see whether they're good enough yet.
+
+               /* other */
+
                state_manager->add_state(&state_fill);
                state_manager->add_state(&state_eyedrop);
                state_manager->add_state(&state_zoom);
-
-               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);
-               if(!getenv("SYNFIG_DISABLE_WIDTH"  )) state_manager->add_state(&state_width); // Enabled since 0.61.09
 
                studio_init_cb.task(_("Init ModPalette..."));
                module_list_.push_back(new ModPalette()); module_list_.back()->start();