X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Fsrc%2Fgtkmm%2Fmod_mirror%2Fstate_mirror.cpp;h=bcb0a3ac0b729ad228fbafb63bbff2288c939859;hb=aa9ae3cd386660a2e09c962c16894e0a58510c70;hp=b9688d0b09ccb9296d75f3cb545f208cf0d5ccca;hpb=adfc80c126f482d7ea2bac38001a2c4a7c7df88c;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 b9688d0..bcb0a3a 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,45 +93,41 @@ public: class studio::StateMirror_Context : public sigc::trackable { etl::handle canvas_view_; + CanvasView::IsWorking is_working; synfigapp::Settings& settings; + sigc::connection keypress_connect; + sigc::connection keyrelease_connect; + etl::handle duck_dragger_; Gtk::Table options_table; - Gtk::CheckButton checkbutton_axis_x; - Gtk::CheckButton checkbutton_axis_y; + 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() - { - checkbutton_axis_x.set_active(!checkbutton_axis_y.get_active()); - duck_dragger_->axis=get_axis(); - } - void update_axis_x() + void update_axes() { - 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); void refresh_tool_options(); @@ -145,6 +143,8 @@ public: void load_settings(); void save_settings(); + + bool key_event(GdkEventKey *event); }; // END of class StateMirror_Context /* === M E T H O D S ======================================================= */ @@ -153,6 +153,7 @@ 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)); } StateMirror::~StateMirror() @@ -176,18 +177,20 @@ StateMirror_Context::save_settings() StateMirror_Context::StateMirror_Context(CanvasView* canvas_view): canvas_view_(canvas_view), + is_working(*canvas_view), settings(synfigapp::Main::get_selected_input_device()->settings()), 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)); options_table.show_all(); refresh_tool_options(); @@ -196,8 +199,11 @@ 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(); + keypress_connect=get_work_area()->signal_key_press_event().connect(sigc::mem_fun(*this,&StateMirror_Context::key_event),false); + keyrelease_connect=get_work_area()->signal_key_release_event().connect(sigc::mem_fun(*this,&StateMirror_Context::key_event),false); + + get_work_area()->set_cursor(Gdk::SB_H_DOUBLE_ARROW); +// get_work_area()->reset_cursor(); App::toolbox->refresh(); @@ -205,6 +211,18 @@ StateMirror_Context::StateMirror_Context(CanvasView* canvas_view): load_settings(); } +bool +StateMirror_Context::key_event(GdkEventKey *event) +{ + if (event->keyval==GDK_Shift_L || event->keyval==GDK_Shift_R ) + { + set_axis(get_axis()==AXIS_X ? AXIS_Y:AXIS_X); + get_work_area()->set_cursor(get_axis() == AXIS_X?Gdk::SB_H_DOUBLE_ARROW:Gdk::SB_V_DOUBLE_ARROW); + } + + return false; //Pass on the event to other handlers, just in case +} + void StateMirror_Context::refresh_tool_options() { @@ -221,12 +239,22 @@ StateMirror_Context::event_refresh_tool_options(const Smach::event& /*x*/) return Smach::RESULT_ACCEPT; } +Smach::event_result +StateMirror_Context::event_stop_handler(const Smach::event& /*x*/) +{ + throw &state_normal; + return Smach::RESULT_OK; +} + StateMirror_Context::~StateMirror_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(); App::dialog_tool_options->clear(); @@ -267,6 +295,8 @@ DuckDrag_Mirror::duck_drag(Duckmatic* duckmatic, const synfig::Vector& vector) const DuckList selected_ducks(duckmatic->get_selected_ducks()); DuckList::const_iterator iter; + Time time(duckmatic->get_time()); + // do the Vertex and Position ducks first for(i=0,iter=selected_ducks.begin();iter!=selected_ducks.end();++iter,i++) if ((*iter)->get_type() == Duck::TYPE_VERTEX ||