X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_stroke.cpp;h=a0f7eca3e81c4f42d8e60ed99d9ee386a37fc7d4;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=f4e91a9fab3a25a94ced012161bd8d1a35d8c6c8;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/state_stroke.cpp b/synfig-studio/trunk/src/gtkmm/state_stroke.cpp index f4e91a9..a0f7eca 100644 --- a/synfig-studio/trunk/src/gtkmm/state_stroke.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_stroke.cpp @@ -1,20 +1,22 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file state_stroke.cpp ** \brief Template File ** -** $Id: state_stroke.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $ +** $Id$ ** ** \legal -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2007 Chris Moore ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. ** -** You may not copy, print, publish, or in any -** other way distribute this software without -** a prior written agreement with -** the copyright holder. +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. ** \endlegal */ /* ========================================================================= */ @@ -31,20 +33,22 @@ #include #include -#include +#include #include "state_stroke.h" #include "canvasview.h" #include "workarea.h" #include "app.h" -#include +#include #include #include #include #include "event_mouse.h" #include "event_layerclick.h" #include "toolbox.h" -#include +#include + +#include "general.h" #endif @@ -52,7 +56,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; /* === M A C R O S ========================================================= */ @@ -67,12 +71,12 @@ class studio::StateStroke_Context : public sigc::trackable { etl::handle canvas_view_; CanvasView::IsWorking is_working; - + Duckmatic::Push duckmatic_push; - - etl::smart_ptr > stroke_data; - etl::smart_ptr > width_data; + etl::smart_ptr > stroke_data; + + etl::smart_ptr > width_data; Gdk::ModifierType modifier; @@ -92,10 +96,10 @@ public: ~StateStroke_Context(); const etl::handle& get_canvas_view()const{return canvas_view_;} - etl::handle get_canvas_interface()const{return canvas_view_->canvas_interface();} - sinfg::Canvas::Handle get_canvas()const{return canvas_view_->get_canvas();} + etl::handle 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();} - + }; // END of class StateStroke_Context @@ -110,7 +114,7 @@ StateStroke::StateStroke(): insert(event_def(EVENT_WORKAREA_MOUSE_BUTTON_UP,&StateStroke_Context::event_mouse_up_handler)); insert(event_def(EVENT_WORKAREA_MOUSE_BUTTON_DRAG,&StateStroke_Context::event_mouse_draw_handler)); insert(event_def(EVENT_REFRESH_TOOL_OPTIONS,&StateStroke_Context::event_refresh_tool_options)); -} +} StateStroke::~StateStroke() { @@ -125,17 +129,14 @@ StateStroke_Context::StateStroke_Context(CanvasView* canvas_view): width_data.spawn(); stroke_data.spawn(); - get_work_area()->add_stroke(stroke_data, sinfgapp::Main::get_foreground_color()); - - sinfg::info("Now Scribbling..."); + get_work_area()->add_stroke(stroke_data, synfigapp::Main::get_outline_color()); } StateStroke_Context::~StateStroke_Context() { duckmatic_push.restore(); - + App::toolbox->refresh(); - sinfg::info("No longer scribbling"); // Send the stroke data to whatever previously called this state. if(stroke_data->size()>=2) @@ -143,19 +144,19 @@ StateStroke_Context::~StateStroke_Context() } Smach::event_result -StateStroke_Context::event_refresh_tool_options(const Smach::event& x) +StateStroke_Context::event_refresh_tool_options(const Smach::event& /*x*/) { return Smach::RESULT_ACCEPT; } Smach::event_result -StateStroke_Context::event_stop_handler(const Smach::event& x) +StateStroke_Context::event_stop_handler(const Smach::event& /*x*/) { throw Smach::pop_exception(); } Smach::event_result -StateStroke_Context::event_refresh_handler(const Smach::event& x) +StateStroke_Context::event_refresh_handler(const Smach::event& /*x*/) { return Smach::RESULT_ACCEPT; } @@ -171,11 +172,8 @@ StateStroke_Context::event_mouse_up_handler(const Smach::event& x) modifier=event.modifier; throw Smach::pop_exception(); } - - case BUTTON_RIGHT: // Intercept the right-button click to short-circut the pop-up menu - return Smach::RESULT_ACCEPT; - - default: + + default: return Smach::RESULT_OK; } } @@ -190,14 +188,11 @@ StateStroke_Context::event_mouse_draw_handler(const Smach::event& x) { stroke_data->push_back(event.pos); width_data->push_back(event.pressure); - get_work_area()->queue_draw(); + get_work_area()->queue_draw(); return Smach::RESULT_ACCEPT; } - - case BUTTON_RIGHT: // Intercept the right-button click to short-circut the pop-up menu - return Smach::RESULT_ACCEPT; - - default: + + default: return Smach::RESULT_OK; } }