X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_fill.cpp;h=5da8db20cf49d724c0a7c20544fca9458d4a724b;hb=6ee1233ccd00e071d9a1b1f305d980ed91bd1939;hp=07d2aad09c45d805aa233221051a78e18890a6f1;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/state_fill.cpp b/synfig-studio/trunk/src/gtkmm/state_fill.cpp index 07d2aad..5da8db2 100644 --- a/synfig-studio/trunk/src/gtkmm/state_fill.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_fill.cpp @@ -1,20 +1,21 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file state_fill.cpp ** \brief Template File ** ** $Id: state_fill.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $ ** ** \legal -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** -** 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 */ /* ========================================================================= */ @@ -30,14 +31,14 @@ #include "state_fill.h" #include "workarea.h" -#include +#include #include "app.h" #include "dialog_color.h" #include "event_mouse.h" #include "event_layerclick.h" #include "toolbox.h" #include "canvasview.h" -#include +#include #endif @@ -45,7 +46,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; /* === M A C R O S ========================================================= */ @@ -69,8 +70,8 @@ public: 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();} @@ -101,7 +102,7 @@ StateFill_Context::StateFill_Context(CanvasView *canvas_view): canvas_view(canvas_view), is_working(*canvas_view) { - sinfg::info("Enterted Fill State"); + synfig::info("Enterted Fill State"); canvas_view->work_area->set_cursor(Gdk::CROSSHAIR); App::toolbox->refresh(); @@ -109,7 +110,7 @@ StateFill_Context::StateFill_Context(CanvasView *canvas_view): StateFill_Context::~StateFill_Context() { - sinfg::info("Left Fill State"); + synfig::info("Left Fill State"); canvas_view->work_area->reset_cursor(); App::toolbox->refresh(); } @@ -117,7 +118,7 @@ StateFill_Context::~StateFill_Context() Smach::event_result StateFill_Context::event_stop_handler(const Smach::event& x) { - sinfg::info("STATE FILL: Received Stop Event"); + synfig::info("STATE FILL: Received Stop Event"); throw Smach::egress_exception(); // canvas_view->get_smach().pop_state(); // return Smach::RESULT_ACCEPT; @@ -126,7 +127,7 @@ StateFill_Context::event_stop_handler(const Smach::event& x) Smach::event_result StateFill_Context::event_refresh_handler(const Smach::event& x) { - sinfg::info("STATE FILL: Received Refresh Event"); + synfig::info("STATE FILL: Received Refresh Event"); canvas_view->work_area->queue_render_preview(); return Smach::RESULT_ACCEPT; } @@ -134,7 +135,7 @@ StateFill_Context::event_refresh_handler(const Smach::event& x) Smach::event_result StateFill_Context::event_workarea_layer_clicked_handler(const Smach::event& x) { - sinfg::info("STATE FILL: Received layer clicked Event"); + synfig::info("STATE FILL: Received layer clicked Event"); const EventLayerClick& event(*reinterpret_cast(&x)); if(!event.layer) @@ -144,10 +145,10 @@ StateFill_Context::event_workarea_layer_clicked_handler(const Smach::event& x) } - //sinfgapp::Action::Handle action(sinfgapp::Action::create("value_desc_set")); - sinfgapp::ValueDesc value_desc(event.layer,"color"); + //synfigapp::Action::Handle action(synfigapp::Action::create("value_desc_set")); + synfigapp::ValueDesc value_desc(event.layer,"color"); - if(!get_canvas_interface()->change_value(value_desc,ValueBase(sinfgapp::Main::get_foreground_color()))) + if(!get_canvas_interface()->change_value(value_desc,ValueBase(synfigapp::Main::get_foreground_color()))) { get_canvas_view()->get_ui_interface()->warning(_("Unable to set layer color")); return Smach::RESULT_ERROR; @@ -161,9 +162,9 @@ StateFill_Context::event_workarea_layer_clicked_handler(const Smach::event& x) action->set_param("time",get_canvas_interface()->get_time()); //action->set_param("layer",event.layer); //if(!action->set_param("param",String("color"))) - // sinfg::error("LayerParamConnect didn't like \"param\""); - if(!action->set_param("new_value",ValueBase(sinfgapp::Main::get_foreground_color()))) - sinfg::error("LayerParamConnect didn't like \"foreground_color\""); + // synfig::error("LayerParamConnect didn't like \"param\""); + if(!action->set_param("new_value",ValueBase(synfigapp::Main::get_foreground_color()))) + synfig::error("LayerParamConnect didn't like \"foreground_color\""); if(!get_canvas_interface()->get_instance()->perform_action(action)) {