X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Fsrc%2Fgtkmm%2Fmod_mirror%2Fstate_mirror.cpp;h=89b39c9263a808e17e4ebe916a1930a3f9b7eea5;hb=2081f34927d55fee5c3de25b5ed4bc81e2de216f;hp=b9688d0b09ccb9296d75f3cb545f208cf0d5ccca;hpb=a095981e18cc37a8ecc7cd237cc22b9c10329264;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..89b39c9 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,27 @@ 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; - public: - Axis get_axis()const { return checkbutton_axis_x.get_active()?AXIS_X:AXIS_Y; } + Axis get_axis()const { return duck_dragger_->axis; } void set_axis(Axis a) { - if(a==AXIS_X) - { - checkbutton_axis_x.set_active(true); - checkbutton_axis_y.set_active(false); - } - else + if (duck_dragger_->axis != a) { - checkbutton_axis_y.set_active(true); - checkbutton_axis_x.set_active(false); + duck_dragger_->axis = a; + get_work_area()->set_cursor(get_axis() == AXIS_X?Gdk::SB_H_DOUBLE_ARROW:Gdk::SB_V_DOUBLE_ARROW); } - - 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() - { - checkbutton_axis_y.set_active(!checkbutton_axis_x.get_active()); - duck_dragger_->axis=get_axis(); - } + 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 +126,6 @@ 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(); }; // END of class StateMirror_Context /* === M E T H O D S ======================================================= */ @@ -153,41 +134,23 @@ 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()), - duck_dragger_(new DuckDrag_Mirror()), - checkbutton_axis_x(_("Horizontal")), - checkbutton_axis_y(_("Vertical")) + is_working(*canvas_view), + duck_dragger_(new DuckDrag_Mirror()) { // 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); - - 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)); + options_table.attach(*manage(new Gtk::Label(_("Shift to mirror horizontally"), Gtk::ALIGN_LEFT)), 0, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); options_table.show_all(); refresh_tool_options(); @@ -196,13 +159,12 @@ 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); } void @@ -221,12 +183,29 @@ 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*/) +{ + throw &state_normal; + return Smach::RESULT_OK; +} + +Smach::event_result +StateMirror_Context::event_mouse_motion_handler(const Smach::event& x) { - save_settings(); + // synfig::info("STATE NORMAL: Received mouse button down Event"); + + const EventMouse& event(*reinterpret_cast(&x)); + + set_axis(event.modifier&GDK_SHIFT_MASK ? AXIS_X : AXIS_Y); + + 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(); App::dialog_tool_options->clear(); @@ -267,6 +246,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 ||