X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Fsrc%2Fgtkmm%2Fmod_mirror%2Fstate_mirror.cpp;h=39fc212909ca1d4c426b21eaf59a225e2c53a1ac;hb=09ad82c53956ead13857cf2634342d0b7a457309;hp=cf2b82788655b1f8ac2343fd817e59b178049760;hpb=14a260f30125c023a5a23161adfb2634de0ba1e6;p=synfig.git diff --git a/synfig-studio/src/gtkmm/mod_mirror/state_mirror.cpp b/synfig-studio/src/gtkmm/mod_mirror/state_mirror.cpp index cf2b827..39fc212 100644 --- a/synfig-studio/src/gtkmm/mod_mirror/state_mirror.cpp +++ b/synfig-studio/src/gtkmm/mod_mirror/state_mirror.cpp @@ -6,6 +6,7 @@ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** 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 @@ -36,6 +37,7 @@ #include #include "state_mirror.h" +#include "../state_normal.h" #include "../canvasview.h" #include "../workarea.h" #include "../app.h" @@ -91,46 +93,45 @@ public: class studio::StateMirror_Context : public sigc::trackable { etl::handle canvas_view_; - - synfigapp::Settings& settings; + CanvasView::IsWorking is_working; etl::handle duck_dragger_; Gtk::Table options_table; - Gtk::CheckButton checkbutton_axis_x; - Gtk::CheckButton checkbutton_axis_y; + + sigc::connection keypress_connect; + sigc::connection keyrelease_connect; + bool shift_is_pressed; + Gtk::RadioButton::Group radiobutton_group; + Gtk::RadioButton radiobutton_axis_x; + Gtk::RadioButton radiobutton_axis_y; public: - Axis get_axis()const { return checkbutton_axis_x.get_active()?AXIS_X:AXIS_Y; } + Axis get_axis()const { return radiobutton_axis_x.get_active()?AXIS_X:AXIS_Y; } void set_axis(Axis a) { if(a==AXIS_X) - { - checkbutton_axis_x.set_active(true); - checkbutton_axis_y.set_active(false); - } + radiobutton_axis_x.set_active(true); else - { - checkbutton_axis_y.set_active(true); - checkbutton_axis_x.set_active(false); - } + radiobutton_axis_y.set_active(true); duck_dragger_->axis=get_axis(); } - void update_axis_y() + void update_axes() { - checkbutton_axis_x.set_active(!checkbutton_axis_y.get_active()); - duck_dragger_->axis=get_axis(); - } - void update_axis_x() - { - checkbutton_axis_y.set_active(!checkbutton_axis_x.get_active()); duck_dragger_->axis=get_axis(); + get_work_area()->set_cursor(get_axis() == AXIS_X?Gdk::SB_H_DOUBLE_ARROW:Gdk::SB_V_DOUBLE_ARROW); } + + + + + Smach::event_result event_stop_handler(const Smach::event& x); Smach::event_result event_refresh_tool_options(const Smach::event& x); + Smach::event_result event_mouse_motion_handler(const Smach::event& x); void refresh_tool_options(); @@ -143,8 +144,10 @@ public: synfig::Canvas::Handle get_canvas()const{return canvas_view_->get_canvas();} WorkArea * get_work_area()const{return canvas_view_->get_work_area();} - void load_settings(); - void save_settings(); + bool key_press_event(GdkEventKey *event); + bool key_release_event(GdkEventKey *event); + + }; // END of class StateMirror_Context /* === M E T H O D S ======================================================= */ @@ -153,41 +156,33 @@ StateMirror::StateMirror(): Smach::state("mirror") { insert(event_def(EVENT_REFRESH_TOOL_OPTIONS,&StateMirror_Context::event_refresh_tool_options)); + insert(event_def(EVENT_STOP,&StateMirror_Context::event_stop_handler)); + insert(event_def(EVENT_WORKAREA_MOUSE_MOTION, &StateMirror_Context::event_mouse_motion_handler)); + insert(event_def(EVENT_WORKAREA_MOUSE_BUTTON_DRAG, &StateMirror_Context::event_mouse_motion_handler)); } StateMirror::~StateMirror() { } -void -StateMirror_Context::load_settings() -{ - String value; - - settings.get_value("mirror.axis",value); - set_axis((Axis)atoi(value.c_str())); -} - -void -StateMirror_Context::save_settings() -{ - settings.set_value("mirror.lock_aspect",strprintf("%d",(int)get_axis())); -} - StateMirror_Context::StateMirror_Context(CanvasView* canvas_view): canvas_view_(canvas_view), - settings(synfigapp::Main::get_selected_input_device()->settings()), + is_working(*canvas_view), duck_dragger_(new DuckDrag_Mirror()), - checkbutton_axis_x(_("Horizontal")), - checkbutton_axis_y(_("Vertical")) + radiobutton_axis_x(radiobutton_group,_("Horizontal")), + radiobutton_axis_y(radiobutton_group,_("Vertical")) { // Set up the tool options dialog options_table.attach(*manage(new Gtk::Label(_("Mirror Tool"))), 0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); - options_table.attach(checkbutton_axis_x, 0, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); - options_table.attach(checkbutton_axis_y, 0, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + options_table.attach(radiobutton_axis_x, 0, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + options_table.attach(radiobutton_axis_y, 0, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + options_table.attach(*manage(new Gtk::Label(_("(Shift key toggles axis)"))), 0, 2, 3, 4, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); - checkbutton_axis_x.signal_toggled().connect(sigc::mem_fun(*this,&StateMirror_Context::update_axis_x)); - checkbutton_axis_y.signal_toggled().connect(sigc::mem_fun(*this,&StateMirror_Context::update_axis_y)); + radiobutton_axis_x.signal_toggled().connect(sigc::mem_fun(*this,&StateMirror_Context::update_axes)); + radiobutton_axis_y.signal_toggled().connect(sigc::mem_fun(*this,&StateMirror_Context::update_axes)); + shift_is_pressed=false; + keypress_connect=get_work_area()->signal_key_press_event().connect(sigc::mem_fun(*this,&StateMirror_Context::key_press_event),false); + keyrelease_connect=get_work_area()->signal_key_release_event().connect(sigc::mem_fun(*this,&StateMirror_Context::key_release_event),false); options_table.show_all(); refresh_tool_options(); @@ -196,13 +191,40 @@ StateMirror_Context::StateMirror_Context(CanvasView* canvas_view): get_work_area()->set_allow_layer_clicks(true); get_work_area()->set_duck_dragger(duck_dragger_); -// get_canvas_view()->work_area->set_cursor(Gdk::CROSSHAIR); - get_canvas_view()->work_area->reset_cursor(); + get_work_area()->set_cursor(Gdk::SB_H_DOUBLE_ARROW); +// get_work_area()->reset_cursor(); App::toolbox->refresh(); - set_axis(AXIS_X); - load_settings(); + set_axis(AXIS_Y); +} + +bool +StateMirror_Context::key_press_event(GdkEventKey *event) +{ + if (event->keyval==GDK_Shift_L || event->keyval==GDK_Shift_R ) + { + if (shift_is_pressed) return false; + shift_is_pressed=true; + set_axis(get_axis()==AXIS_X ? AXIS_Y:AXIS_X); + update_axes(); + } + + return false; //Pass on the event to other handlers, just in case +} + +bool +StateMirror_Context::key_release_event(GdkEventKey *event) +{ + if (event->keyval==GDK_Shift_L || event->keyval==GDK_Shift_R ) + { + if (!shift_is_pressed) return false; + shift_is_pressed = false; + set_axis(get_axis()==AXIS_X ? AXIS_Y:AXIS_X); + update_axes(); + } + + return false; //Pass on the event to other handlers, just in case } void @@ -221,12 +243,36 @@ StateMirror_Context::event_refresh_tool_options(const Smach::event& /*x*/) return Smach::RESULT_ACCEPT; } -StateMirror_Context::~StateMirror_Context() +Smach::event_result +StateMirror_Context::event_stop_handler(const Smach::event& /*x*/) { - save_settings(); + throw &state_normal; + return Smach::RESULT_OK; +} +Smach::event_result +StateMirror_Context::event_mouse_motion_handler(const Smach::event& x) +{ + // synfig::info("STATE NORMAL: Received mouse button down Event"); + + const EventMouse& event(*reinterpret_cast(&x)); + bool shift_state = event.modifier&GDK_SHIFT_MASK; + if (shift_state != shift_is_pressed) + { + shift_is_pressed = !shift_is_pressed; + set_axis(get_axis()==AXIS_X ? AXIS_Y:AXIS_X); + } + + return Smach::RESULT_OK; +} + +StateMirror_Context::~StateMirror_Context() +{ get_work_area()->clear_duck_dragger(); - get_canvas_view()->work_area->reset_cursor(); + get_work_area()->reset_cursor(); + + keypress_connect.disconnect(); + keyrelease_connect.disconnect(); App::dialog_tool_options->clear(); @@ -279,7 +325,7 @@ DuckDrag_Mirror::duck_drag(Duckmatic* duckmatic, const synfig::Vector& vector) if (axis==AXIS_X) p[0] = -(p[0]-center[0]) + center[0]; else if (axis==AXIS_Y) p[1] = -(p[1]-center[1]) + center[1]; - (*iter)->set_trans_point(p, time); + (*iter)->set_trans_point(p); } // then do the other ducks @@ -296,7 +342,7 @@ DuckDrag_Mirror::duck_drag(Duckmatic* duckmatic, const synfig::Vector& vector) if (axis==AXIS_X) p[0] = -(p[0]-center[0]) + center[0]; else if (axis==AXIS_Y) p[1] = -(p[1]-center[1]) + center[1]; - (*iter)->set_trans_point(p, time); + (*iter)->set_trans_point(p); } }