Rename 'Normal Tool' to 'Transform Tool'.

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

diff --git a/synfig-studio/src/gtkmm/state_normal.cpp b/synfig-studio/src/gtkmm/state_normal.cpp
index 8228921..e9667cc 100644 (file)
--- a/synfig-studio/src/gtkmm/state_normal.cpp
+++ b/synfig-studio/src/gtkmm/state_normal.cpp
@@ -96,7 +96,7 @@ class DuckDrag_Combo : public DuckDrag_Base
        bool move_only;
 
 public:
-       etl::handle<CanvasView> canvas_view_;
+       CanvasView* canvas_view_;
        bool scale;
        bool rotate;
        bool constrain;
@@ -111,7 +111,7 @@ public:
 
 class studio::StateNormal_Context : public sigc::trackable
 {
-       etl::handle<CanvasView> canvas_view_;
+       CanvasView* canvas_view_;
 
        synfigapp::Settings& settings;
 
@@ -144,7 +144,7 @@ public:
 
        ~StateNormal_Context();
 
-       const etl::handle<CanvasView>& get_canvas_view()const{return canvas_view_;}
+       CanvasView* get_canvas_view()const{return canvas_view_;}
        etl::handle<synfigapp::CanvasInterface> get_canvas_interface()const{return canvas_view_->canvas_interface();}
        synfig::Canvas::Handle get_canvas()const{return canvas_view_->get_canvas();}
        WorkArea * get_work_area()const{return canvas_view_->get_work_area();}
@@ -231,7 +231,7 @@ StateNormal_Context::StateNormal_Context(CanvasView* canvas_view):
        duck_dragger_->canvas_view_=get_canvas_view();
 
        // Set up the tool options dialog
-       options_table.attach(*manage(new Gtk::Label(_("Normal Tool"))), 0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+       options_table.attach(*manage(new Gtk::Label(_("Transform Tool"))),      0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
        options_table.attach(checkbutton_rotate,                                                        0, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
        options_table.attach(checkbutton_scale,                                                 0, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
        options_table.attach(checkbutton_constrain,                                                     0, 2, 3, 4, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
@@ -244,7 +244,7 @@ StateNormal_Context::StateNormal_Context(CanvasView* canvas_view):
        options_table.show_all();
        refresh_tool_options();
        //App::dialog_tool_options->set_widget(options_table);
-       App::dialog_tool_options->present();
+       //App::dialog_tool_options->present();
 
        get_work_area()->set_allow_layer_clicks(true);
        get_work_area()->set_duck_dragger(duck_dragger_);
@@ -253,7 +253,7 @@ StateNormal_Context::StateNormal_Context(CanvasView* canvas_view):
        keyrelease_connect=get_work_area()->signal_key_release_event().connect(sigc::mem_fun(*this,&StateNormal_Context::key_released),false);
 
        //these will segfault
-//     get_canvas_view()->work_area->set_cursor(Gdk::CROSSHAIR);
+//     get_work_area()->set_cursor(Gdk::CROSSHAIR);
 //     get_work_area()->reset_cursor();
 
        App::toolbox->refresh();
@@ -313,7 +313,7 @@ StateNormal_Context::refresh_tool_options()
 {
        App::dialog_tool_options->clear();
        App::dialog_tool_options->set_widget(options_table);
-       App::dialog_tool_options->set_local_name(_("Normal Tool"));
+       App::dialog_tool_options->set_local_name(_("Transform Tool"));
        App::dialog_tool_options->set_name("normal");
 }
 
@@ -324,7 +324,7 @@ StateNormal_Context::~StateNormal_Context()
        save_settings();
 
        get_work_area()->clear_duck_dragger();
-       get_canvas_view()->work_area->reset_cursor();
+       get_work_area()->reset_cursor();
 
        keypress_connect.disconnect();
        keyrelease_connect.disconnect();