projects / synfig.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
The star and circle tool were both causing warnings from gtkmm 2.14. This prevents...
[synfig.git] / synfig-studio / trunk / src / gtkmm / state_star.cpp
diff --git a/synfig-studio/trunk/src/gtkmm/state_star.cpp b/synfig-studio/trunk/src/gtkmm/state_star.cpp
index 3ebb6fe..ed8c75e 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/state_star.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_star.cpp
@@ -118,12 +118,12 @@ class studio::StateStar_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
@@ -181,8 +181,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
 
@@ -324,10 +324,10 @@ StateStar_Context::load_settings()
        else
                set_layer_plant_flag(false);
 
-       if(settings.get_value("star.layer_link_offsets",value) && value=="0")
-               set_layer_link_offsets_flag(false);
+       if(settings.get_value("star.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
@@ -349,7 +349,7 @@ StateStar_Context::save_settings()
        settings.set_value("star.layer_region",get_layer_region_flag()?"1":"0");
        settings.set_value("star.layer_curve_gradient",get_layer_curve_gradient_flag()?"1":"0");
        settings.set_value("star.layer_plant",get_layer_plant_flag()?"1":"0");
-       settings.set_value("star.layer_link_offsets",get_layer_link_offsets_flag()?"1":"0");
+       settings.set_value("star.layer_link_origins",get_layer_link_origins_flag()?"1":"0");
 }
 
 void
@@ -409,15 +409,15 @@ StateStar_Context::StateStar_Context(CanvasView* canvas_view):
        duckmatic_push(get_work_area()),
        prev_workarea_layer_status_(get_work_area()->get_allow_layer_clicks()),
        settings(synfigapp::Main::get_selected_input_device()->settings()),
-       entry_id(),
-       adj_feather(0,0,1,0.01,0.1),
-       adj_number_of_points(4,2,120,1,1,1), // value, lower, upper, step_increment, page_increment, page_size
-       adj_inner_tangent(0,-10,10,.01,.1,.1),
-       adj_outer_tangent(0,-10,10,.01,.1,.1),
-       adj_inner_width(1,-10,10,.01,.1,.1),
-       adj_outer_width(1,-10,10,.01,.1,.1),
-       adj_radius_ratio(0.5,-10,10,.01,.1,.1), // value, lower, upper, step_increment, page_increment, page_size
-       adj_angle_offset(0,-360,360,.1,1,1), // value, lower, upper, step_increment, page_increment, page_size
+       entry_id(),             //   value lower upper  step page
+       adj_feather(                    0,    0,    1, 0.01, 0.1),
+       adj_number_of_points(   0,    2,  120, 1   , 1  ),
+       adj_inner_tangent(              0,  -10,   10, 0.01, 0.1),
+       adj_outer_tangent(              0,  -10,   10, 0.01, 0.1),
+       adj_inner_width(                0,  -10,   10, 0.01, 0.1),
+       adj_outer_width(                0,  -10,   10, 0.01, 0.1),
+       adj_radius_ratio(               0,  -10,   10, 0.01, 0.1),
+       adj_angle_offset(               0, -360,  360, 0.1 , 1  ),
        spin_feather(adj_feather,0.1,3),
        spin_number_of_points(adj_number_of_points,1,0),
        spin_inner_tangent(adj_inner_tangent,1,2),
@@ -433,7 +433,7 @@ StateStar_Context::StateStar_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;
 
@@ -451,7 +451,7 @@ StateStar_Context::StateStar_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.attach(*manage(new Gtk::Label(_("Number of Points:"))),   0, 1, 13, 14, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
        options_table.attach(spin_number_of_points,                                                             1, 2, 13, 14, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
        options_table.attach(*manage(new Gtk::Label(_("Inner Tangent:"))),              0, 1, 14, 15, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
@@ -613,8 +613,8 @@ StateStar_Context::make_star(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);
@@ -636,8 +636,8 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2)
                layer=get_canvas_interface()->add_layer_to("star",canvas,depth);
                layer_selection.push_back(layer);
 
-               layer->set_param("offset",p1);
-               get_canvas_interface()->signal_layer_param_changed()(layer,"offset");
+               layer->set_param("origin",p1);
+               get_canvas_interface()->signal_layer_param_changed()(layer,"origin");
 
                layer->set_param("radius1",(p2-p1).mag());
                get_canvas_interface()->signal_layer_param_changed()(layer,"radius1");
@@ -705,8 +705,8 @@ StateStar_Context::make_star(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);
@@ -714,9 +714,9 @@ StateStar_Context::make_star(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))
@@ -764,8 +764,8 @@ StateStar_Context::make_star(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);
@@ -773,9 +773,9 @@ StateStar_Context::make_star(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))
@@ -834,8 +834,8 @@ StateStar_Context::make_star(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);
@@ -843,9 +843,9 @@ StateStar_Context::make_star(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))
@@ -897,8 +897,8 @@ StateStar_Context::make_star(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);
@@ -906,9 +906,9 @@ StateStar_Context::make_star(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))
@@ -960,6 +960,7 @@ StateStar_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(point_holder-get_work_area()->snap_point_to_grid(event.pos));
                get_work_area()->queue_draw();
                return Smach::RESULT_ACCEPT;
Synfig (Bombe’s repository)