X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_rectangle.cpp;h=e672d6cade04d56bd52464d895e49d3169bd401d;hb=b6c331ec41a1788c39606b9c398a25f801bacb4a;hp=297b477e18c5f4344b15bebb68e1ccdec49ece2c;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp b/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp index 297b477..e672d6c 100644 --- a/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp @@ -1,20 +1,21 @@ -/* === S I N F G =========================================================== */ -/*! \file state_gradient.cpp +/* === S Y N F I G ========================================================= */ +/*! \file state_rectangle.cpp ** \brief Template File ** -** $Id: state_rectangle.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 ** -** 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,22 +32,24 @@ #include #include -#include -#include +#include +#include #include "state_rectangle.h" #include "canvasview.h" #include "workarea.h" #include "app.h" -#include +#include #include "event_mouse.h" #include "event_layerclick.h" #include "toolbox.h" #include "dialog_tooloptions.h" #include #include "duck.h" -#include +#include + +#include "general.h" #endif @@ -54,7 +57,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; /* === M A C R O S ========================================================= */ @@ -69,42 +72,42 @@ class studio::StateRectangle_Context : public sigc::trackable { etl::handle canvas_view_; CanvasView::IsWorking is_working; - + Duckmatic::Push duckmatic_push; - + Point point_holder; - + etl::handle point2_duck; void refresh_ducks(); - + bool prev_workarea_layer_status_; - + //Toolbox settings - sinfgapp::Settings& settings; - + synfigapp::Settings& settings; + //Toolbox display Gtk::Table options_table; - + Gtk::Entry entry_id; //what to name the layer - + Gtk::Adjustment adj_expand; Gtk::SpinButton spin_expand; - + Gtk::CheckButton check_invert; - + public: - sinfg::String get_id()const { return entry_id.get_text(); } - void set_id(const sinfg::String& x) { return entry_id.set_text(x); } + synfig::String get_id()const { return entry_id.get_text(); } + void set_id(const synfig::String& x) { return entry_id.set_text(x); } Real get_expand()const { return adj_expand.get_value(); } void set_expand(Real f) { adj_expand.set_value(f); } - + bool get_invert()const { return check_invert.get_active(); } void set_invert(bool i) { check_invert.set_active(i); } - - void refresh_tool_options(); //to refresh the toolbox + + void refresh_tool_options(); //to refresh the toolbox //events Smach::event_result event_stop_handler(const Smach::event& x); @@ -118,25 +121,25 @@ public: //Canvas interaction 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();} - + //Modifying settings etc. void load_settings(); void save_settings(); void reset(); void increment_id(); - bool no_egress_on_selection_change; - Smach::event_result event_layer_selection_changed_handler(const Smach::event& x) + bool egress_on_selection_change; + Smach::event_result event_layer_selection_changed_handler(const Smach::event& /*x*/) { - if(!no_egress_on_selection_change) + if(egress_on_selection_change) throw Smach::egress_exception(); return Smach::RESULT_OK; } void make_rectangle(const Point& p1, const Point& p2); - + }; // END of class StateGradient_Context /* === M E T H O D S ======================================================= */ @@ -160,9 +163,9 @@ StateRectangle::~StateRectangle() void StateRectangle_Context::load_settings() -{ +{ String value; - + //parse the arguments yargh! if(settings.get_value("rectangle.id",value)) set_id(value); @@ -173,7 +176,7 @@ StateRectangle_Context::load_settings() set_expand(atof(value.c_str())); else set_expand(0); - + if(settings.get_value("rectangle.invert",value) && value != "0") set_invert(true); else @@ -182,7 +185,7 @@ StateRectangle_Context::load_settings() void StateRectangle_Context::save_settings() -{ +{ settings.set_value("rectangle.id",get_id().c_str()); settings.set_value("rectangle.expand",strprintf("%f",get_expand())); settings.set_value("rectangle.invert",get_invert()?"1":"0"); @@ -200,22 +203,25 @@ StateRectangle_Context::increment_id() String id(get_id()); int number=1; int digits=0; - + if(id.empty()) id="Circle"; - + // If there is a number // already at the end of the // id, then remove it. if(id[id.size()-1]<='9' && id[id.size()-1]>='0') { // figure out how many digits it is - for(digits=0;(int)id.size()-1>=digits && id[id.size()-1-digits]<='9' && id[id.size()-1-digits]>='0';digits++)while(false); - + for (digits = 0; + (int)id.size()-1 >= digits && id[id.size()-1-digits] <= '9' && id[id.size()-1-digits] >= '0'; + digits++) + ; + String str_number; str_number=String(id,id.size()-digits,id.size()); id=String(id,0,id.size()-digits); - + number=atoi(str_number.c_str()); } else @@ -223,15 +229,15 @@ StateRectangle_Context::increment_id() number=1; digits=3; } - + number++; - + // Add the number back onto the id { const String format(strprintf("%%0%dd",digits)); id+=strprintf(format.c_str(),number); } - + // Set the ID set_id(id); } @@ -240,39 +246,39 @@ StateRectangle_Context::StateRectangle_Context(CanvasView* canvas_view): canvas_view_(canvas_view), is_working(*canvas_view), duckmatic_push(get_work_area()), - prev_workarea_layer_status_(get_work_area()->allow_layer_clicks), - settings(sinfgapp::Main::get_selected_input_device()->settings()), + prev_workarea_layer_status_(get_work_area()->get_allow_layer_clicks()), + settings(synfigapp::Main::get_selected_input_device()->settings()), entry_id(), adj_expand(0,0,1,0.01,0.1), spin_expand(adj_expand,0.1,3), check_invert(_("Invert")) { - no_egress_on_selection_change=false; + egress_on_selection_change=true; load_settings(); - + // Set up the tool options dialog - //options_table.attach(*manage(new Gtk::Label(_("Circle Tool"))), 0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + //options_table.attach(*manage(new Gtk::Label(_("Circle Tool"))), 0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); options_table.attach(entry_id, 0, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); //expand stuff options_table.attach(*manage(new Gtk::Label(_("Expansion:"))), 0, 1, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); options_table.attach(spin_expand, 1, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); - + //invert flag options_table.attach(check_invert, 1, 2, 4, 5, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); - + options_table.show_all(); - + //App::dialog_tool_options->set_widget(options_table); refresh_tool_options(); App::dialog_tool_options->present(); // Turn off layer clicking - get_work_area()->allow_layer_clicks=false; - + get_work_area()->set_allow_layer_clicks(false); + // clear out the ducks get_work_area()->clear_ducks(); - + // Refresh the work area get_work_area()->queue_draw(); @@ -281,10 +287,10 @@ StateRectangle_Context::StateRectangle_Context(CanvasView* canvas_view): // Hide the tables if they are showing //prev_table_status=get_canvas_view()->tables_are_visible(); //if(prev_table_status)get_canvas_view()->hide_tables(); - - // Hide the time bar - //get_canvas_view()->hide_timebar(); - + + // Disable the time bar + //get_canvas_view()->set_sensitive_timebar(false); + // Connect a signal //get_work_area()->signal_user_click().connect(sigc::mem_fun(*this,&studio::StateRectangle_Context::on_user_click)); @@ -301,7 +307,7 @@ StateRectangle_Context::refresh_tool_options() } Smach::event_result -StateRectangle_Context::event_refresh_tool_options(const Smach::event& x) +StateRectangle_Context::event_refresh_tool_options(const Smach::event& /*x*/) { refresh_tool_options(); return Smach::RESULT_ACCEPT; @@ -312,19 +318,18 @@ StateRectangle_Context::~StateRectangle_Context() save_settings(); // Restore layer clicking - get_work_area()->allow_layer_clicks = prev_workarea_layer_status_; + get_work_area()->set_allow_layer_clicks(prev_workarea_layer_status_); get_canvas_view()->work_area->reset_cursor(); App::dialog_tool_options->clear(); - // Show the time bar - if(get_canvas_view()->get_canvas()->rend_desc().get_time_start()!=get_canvas_view()->get_canvas()->rend_desc().get_time_end()) - get_canvas_view()->show_timebar(); + // Enable the time bar + //get_canvas_view()->set_sensitive_timebar(true); // Bring back the tables if they were out before //if(prev_table_status)get_canvas_view()->show_tables(); - + // Refresh the work area get_work_area()->queue_draw(); @@ -332,13 +337,13 @@ StateRectangle_Context::~StateRectangle_Context() } Smach::event_result -StateRectangle_Context::event_stop_handler(const Smach::event& x) +StateRectangle_Context::event_stop_handler(const Smach::event& /*x*/) { throw Smach::egress_exception(); } Smach::event_result -StateRectangle_Context::event_refresh_handler(const Smach::event& x) +StateRectangle_Context::event_refresh_handler(const Smach::event& /*x*/) { refresh_ducks(); return Smach::RESULT_ACCEPT; @@ -347,14 +352,14 @@ StateRectangle_Context::event_refresh_handler(const Smach::event& x) void StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2) { - sinfgapp::Action::PassiveGrouper group(get_canvas_interface()->get_instance().get(),_("New Rectangle")); - sinfgapp::PushMode push_mode(get_canvas_interface(),sinfgapp::MODE_NORMAL); + synfigapp::Action::PassiveGrouper group(get_canvas_interface()->get_instance().get(),_("New Rectangle")); + synfigapp::PushMode push_mode(get_canvas_interface(),synfigapp::MODE_NORMAL); Layer::Handle layer; - + Canvas::Handle canvas(get_canvas_view()->get_canvas()); int depth(0); - + // we are temporarily using the layer to hold something layer=get_canvas_view()->get_selection_manager()->get_selected_layer(); if(layer) @@ -366,30 +371,30 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2) //create the layer layer=get_canvas_interface()->add_layer_to("rectangle",canvas,depth); - const sinfg::TransformStack& transform(get_canvas_view()->get_curr_transform_stack()); + const synfig::TransformStack& transform(get_canvas_view()->get_curr_transform_stack()); const Point p1(transform.unperform(_p1)); const Point p2(transform.unperform(_p2)); - + //set all the parameters layer->set_param("point1",p1); get_canvas_interface()->signal_layer_param_changed()(layer,"point1"); layer->set_param("point2",p2); get_canvas_interface()->signal_layer_param_changed()(layer,"point2"); - + layer->set_param("expand",get_expand()); get_canvas_interface()->signal_layer_param_changed()(layer,"expand"); layer->set_param("invert",get_invert()); get_canvas_interface()->signal_layer_param_changed()(layer,"invert"); - + //name layer->set_description(get_id()); get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description()); - no_egress_on_selection_change=true; + egress_on_selection_change=false; get_canvas_interface()->get_selection_manager()->clear_selected_layers(); get_canvas_interface()->get_selection_manager()->set_selected_layer(layer); - no_egress_on_selection_change=false; + egress_on_selection_change=true; //post clean up stuff... reset(); @@ -400,7 +405,7 @@ Smach::event_result StateRectangle_Context::event_mouse_click_handler(const Smach::event& x) { const EventMouse& event(*reinterpret_cast(&x)); - + if(event.key==EVENT_WORKAREA_MOUSE_BUTTON_DOWN && event.button==BUTTON_LEFT) { point_holder=get_work_area()->snap_point_to_grid(event.pos); @@ -423,7 +428,7 @@ StateRectangle_Context::event_mouse_click_handler(const Smach::event& x) if(event.key==EVENT_WORKAREA_MOUSE_BUTTON_DRAG && event.button==BUTTON_LEFT) { point2_duck->set_point(get_work_area()->snap_point_to_grid(event.pos)); - get_work_area()->queue_draw(); + get_work_area()->queue_draw(); return Smach::RESULT_ACCEPT; }