Update/add copyrights for people who modified the code.

[synfig.git] / synfig-studio / trunk / src / gtkmm / state_rectangle.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp b/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp
index d20bf15..60bbc87 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp
@@ -6,6 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**  Copyright (c) 2008 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -103,12 +104,12 @@ class studio::StateRectangle_Context : public sigc::trackable
        Gtk::CheckButton checkbutton_layer_outline;
        Gtk::CheckButton checkbutton_layer_curve_gradient;
        Gtk::CheckButton checkbutton_layer_plant;
-       Gtk::CheckButton checkbutton_layer_link_offsets;
+       Gtk::CheckButton checkbutton_layer_link_origins;
 
 public:
 
        // this only counts the layers which use blines - they're the only
-       // ones we link the offsets for
+       // ones we link the origins for
        int layers_to_create()const
        {
                return
@@ -145,8 +146,8 @@ public:
        bool get_layer_plant_flag()const { return checkbutton_layer_plant.get_active(); }
        void set_layer_plant_flag(bool x) { return checkbutton_layer_plant.set_active(x); }
 
-       bool get_layer_link_offsets_flag()const { return checkbutton_layer_link_offsets.get_active(); }
-       void set_layer_link_offsets_flag(bool x) { return checkbutton_layer_link_offsets.set_active(x); }
+       bool get_layer_link_origins_flag()const { return checkbutton_layer_link_origins.get_active(); }
+       void set_layer_link_origins_flag(bool x) { return checkbutton_layer_link_origins.set_active(x); }
 
        void refresh_tool_options(); //to refresh the toolbox
 
@@ -253,10 +254,10 @@ StateRectangle_Context::load_settings()
        else
                set_layer_plant_flag(false);
 
-       if(settings.get_value("rectangle.layer_link_offsets",value) && value=="0")
-               set_layer_link_offsets_flag(false);
+       if(settings.get_value("rectangle.layer_link_origins",value) && value=="0")
+               set_layer_link_origins_flag(false);
        else
-               set_layer_link_offsets_flag(true);
+               set_layer_link_origins_flag(true);
 }
 
 void
@@ -271,7 +272,7 @@ StateRectangle_Context::save_settings()
        settings.set_value("rectangle.layer_region",get_layer_region_flag()?"1":"0");
        settings.set_value("rectangle.layer_curve_gradient",get_layer_curve_gradient_flag()?"1":"0");
        settings.set_value("rectangle.layer_plant",get_layer_plant_flag()?"1":"0");
-       settings.set_value("rectangle.layer_link_offsets",get_layer_link_offsets_flag()?"1":"0");
+       settings.set_value("rectangle.layer_link_origins",get_layer_link_origins_flag()?"1":"0");
 }
 
 void
@@ -342,7 +343,7 @@ StateRectangle_Context::StateRectangle_Context(CanvasView* canvas_view):
        checkbutton_layer_outline(_("Create Outline BLine")),
        checkbutton_layer_curve_gradient(_("Create Curve Gradient BLine")),
        checkbutton_layer_plant(_("Create Plant BLine")),
-       checkbutton_layer_link_offsets(_("Link BLine Offsets"))
+       checkbutton_layer_link_origins(_("Link BLine Origins"))
 {
        egress_on_selection_change=true;
        load_settings();
@@ -367,7 +368,7 @@ StateRectangle_Context::StateRectangle_Context(CanvasView* canvas_view):
        options_table.attach(checkbutton_layer_region,                                          0, 2,  9, 10, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
        options_table.attach(checkbutton_layer_plant,                                           0, 2, 10, 11, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
        options_table.attach(checkbutton_layer_curve_gradient,                          0, 2, 11, 12, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
-       options_table.attach(checkbutton_layer_link_offsets,                            0, 2, 12, 13, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+       options_table.attach(checkbutton_layer_link_origins,                            0, 2, 12, 13, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
 
        options_table.show_all();
 
@@ -497,8 +498,8 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2)
        ValueNode_BLine::Handle value_node_bline(ValueNode_BLine::create(new_list));
        assert(value_node_bline);
 
-       ValueNode_Const::Handle value_node_offset(ValueNode_Const::create(Vector()));
-       assert(value_node_offset);
+       ValueNode_Const::Handle value_node_origin(ValueNode_Const::create(Vector()));
+       assert(value_node_origin);
 
        // Set the looping flag
        value_node_bline->set_loop(true);
@@ -577,8 +578,8 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2)
                        }
                }
 
-               // only link the curve gradient's offset parameter if the option is selected and we're creating more than one layer
-               if (get_layer_link_offsets_flag() && layers_to_create > 1)
+               // only link the curve gradient's origin parameter if the option is selected and we're creating more than one layer
+               if (get_layer_link_origins_flag() && layers_to_create > 1)
                {
                        synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
                        assert(action);
@@ -586,9 +587,9 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2)
                        action->set_param("canvas",get_canvas());
                        action->set_param("canvas_interface",get_canvas_interface());
                        action->set_param("layer",layer);
-                       if(!action->set_param("param",String("offset")))
+                       if(!action->set_param("param",String("origin")))
                                synfig::error("LayerParamConnect didn't like \"param\"");
-                       if(!action->set_param("value_node",ValueNode::Handle(value_node_offset)))
+                       if(!action->set_param("value_node",ValueNode::Handle(value_node_origin)))
                                synfig::error("LayerParamConnect didn't like \"value_node\"");
 
                        if(!get_canvas_interface()->get_instance()->perform_action(action))
@@ -636,8 +637,8 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2)
                        }
                }
 
-               // only link the plant's offset parameter if the option is selected and we're creating more than one layer
-               if (get_layer_link_offsets_flag() && layers_to_create > 1)
+               // only link the plant's origin parameter if the option is selected and we're creating more than one layer
+               if (get_layer_link_origins_flag() && layers_to_create > 1)
                {
                        synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
                        assert(action);
@@ -645,9 +646,9 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2)
                        action->set_param("canvas",get_canvas());
                        action->set_param("canvas_interface",get_canvas_interface());
                        action->set_param("layer",layer);
-                       if(!action->set_param("param",String("offset")))
+                       if(!action->set_param("param",String("origin")))
                                synfig::error("LayerParamConnect didn't like \"param\"");
-                       if(!action->set_param("value_node",ValueNode::Handle(value_node_offset)))
+                       if(!action->set_param("value_node",ValueNode::Handle(value_node_origin)))
                                synfig::error("LayerParamConnect didn't like \"value_node\"");
 
                        if(!get_canvas_interface()->get_instance()->perform_action(action))
@@ -706,8 +707,8 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2)
                        }
                }
 
-               // only link the region's offset parameter if the option is selected and we're creating more than one layer
-               if (get_layer_link_offsets_flag() && layers_to_create > 1)
+               // only link the region's origin parameter if the option is selected and we're creating more than one layer
+               if (get_layer_link_origins_flag() && layers_to_create > 1)
                {
                        synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
                        assert(action);
@@ -715,9 +716,9 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2)
                        action->set_param("canvas",get_canvas());
                        action->set_param("canvas_interface",get_canvas_interface());
                        action->set_param("layer",layer);
-                       if(!action->set_param("param",String("offset")))
+                       if(!action->set_param("param",String("origin")))
                                synfig::error("LayerParamConnect didn't like \"param\"");
-                       if(!action->set_param("value_node",ValueNode::Handle(value_node_offset)))
+                       if(!action->set_param("value_node",ValueNode::Handle(value_node_origin)))
                                synfig::error("LayerParamConnect didn't like \"value_node\"");
 
                        if(!get_canvas_interface()->get_instance()->perform_action(action))
@@ -769,8 +770,8 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2)
                        }
                }
 
-               // only link the outline's offset parameter if the option is selected and we're creating more than one layer
-               if (get_layer_link_offsets_flag() && layers_to_create > 1)
+               // only link the outline's origin parameter if the option is selected and we're creating more than one layer
+               if (get_layer_link_origins_flag() && layers_to_create > 1)
                {
                        synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
                        assert(action);
@@ -778,9 +779,9 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2)
                        action->set_param("canvas",get_canvas());
                        action->set_param("canvas_interface",get_canvas_interface());
                        action->set_param("layer",layer);
-                       if(!action->set_param("param",String("offset")))
+                       if(!action->set_param("param",String("origin")))
                                synfig::error("LayerParamConnect didn't like \"param\"");
-                       if(!action->set_param("value_node",ValueNode::Handle(value_node_offset)))
+                       if(!action->set_param("value_node",ValueNode::Handle(value_node_origin)))
                                synfig::error("LayerParamConnect didn't like \"value_node\"");
 
                        if(!get_canvas_interface()->get_instance()->perform_action(action))
@@ -829,6 +830,7 @@ StateRectangle_Context::event_mouse_click_handler(const Smach::event& x)
 
        if(event.key==EVENT_WORKAREA_MOUSE_BUTTON_DRAG && event.button==BUTTON_LEFT)
        {
+               if (!point2_duck) return Smach::RESULT_OK;
                point2_duck->set_point(get_work_area()->snap_point_to_grid(event.pos));
                get_work_area()->queue_draw();
                return Smach::RESULT_ACCEPT;