Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/gtkmm/state_draw.cpp b/synfig-studio/trunk/src/gtkmm/state_draw.cpp
index 10f050e..4d053bc 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/state_draw.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_draw.cpp
@@ -625,7 +625,7 @@ StateDraw_Context::event_stroke(const Smach::event& x)
 
        assert(event.stroke_data);
 
-       get_work_area()->add_stroke(event.stroke_data,synfigapp::Main::get_foreground_color());
+       get_work_area()->add_stroke(event.stroke_data,synfigapp::Main::get_outline_color());
 
        if(nested==0)
        {
@@ -677,7 +677,7 @@ StateDraw_Context::process_stroke(StrokeData stroke_data, WidthData width_data,
                }
        }
 
-       //get_work_area()->add_stroke(event.stroke_data,synfigapp::Main::get_foreground_color());
+       //get_work_area()->add_stroke(event.stroke_data,synfigapp::Main::get_outline_color());
        //stroke_list.push_back(event.stroke_data);
        //refresh_ducks();
 
@@ -1089,7 +1089,7 @@ StateDraw_Context::new_bline(std::list<synfig::BLinePoint> bline,bool loop_bline
                        get_canvas_interface()->
                          change_value(synfigapp::ValueDesc(layer,"origin"),shift_origin_vector);
 
-               synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
+               synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect"));
 
                assert(action);
 
@@ -1555,7 +1555,7 @@ StateDraw_Context::new_region(std::list<synfig::BLinePoint> bline, synfig::Real
                                // synfig::info(__FILE__":%d: value_prev 0x%08X:%d",__LINE__,value_prev.get_parent_value_node().get(),value_prev.get_index());
                                // synfig::info(__FILE__":%d: value_desc 0x%08X:%d",__LINE__,value_desc.get_parent_value_node().get(),value_desc.get_index());
                                // synfig::info(__FILE__":%d: value_next 0x%08X:%d",__LINE__,value_next.get_parent_value_node().get(),value_next.get_index());
-                                               
+
                                /*
                                  if(value_prev.parent_is_value_node() && value_desc.parent_is_value_node() && value_next.parent_is_value_node())
                                  {
@@ -1605,7 +1605,7 @@ StateDraw_Context::new_region(std::list<synfig::BLinePoint> bline, synfig::Real
                                                //                 (*(value_desc.get_parent_value_node()))(get_time()).get_loop()
                                                //                 // value_desc.get_value_node().get_loop(),
                                                //              );
-                                               // 
+                                               //
                                                //      // Fill in missing vertices
                                                //      // \todo take loops into account: seeing (15, 2, 3, 4) probably means that (0, 1) is missing, not 14 through 3
                                                //      if(value_desc.get_index()<value_next.get_index()-1)
@@ -1798,7 +1798,7 @@ StateDraw_Context::new_region(std::list<synfig::BLinePoint> bline, synfig::Real
                        group.cancel();
                        return Smach::RESULT_ERROR;
                }
-               layer->set_param("color",synfigapp::Main::get_background_color());
+
                if(get_feather())
                {
                        layer->set_param("feather",get_feather());
@@ -1806,7 +1806,7 @@ StateDraw_Context::new_region(std::list<synfig::BLinePoint> bline, synfig::Real
                }
                get_canvas_interface()->signal_layer_param_changed()(layer,"color");
 
-               synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
+               synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect"));
 
                assert(action);
 
@@ -1858,7 +1858,7 @@ StateDraw_Context::extend_bline_from_begin(ValueNode_BLine::Handle value_node,st
 
        if (complete_loop)
        {
-               synfigapp::Action::Handle action(synfigapp::Action::create("value_node_dynamic_list_loop"));
+               synfigapp::Action::Handle action(synfigapp::Action::create("ValueNodeDynamicListLoop"));
                assert(action);
 
                action->set_param("canvas",get_canvas());
@@ -1878,7 +1878,7 @@ StateDraw_Context::extend_bline_from_begin(ValueNode_BLine::Handle value_node,st
        {
                ValueNode_Composite::Handle composite(ValueNode_Composite::create(*iter));
 
-               synfigapp::Action::Handle action(synfigapp::Action::create("value_node_dynamic_list_insert"));
+               synfigapp::Action::Handle action(synfigapp::Action::create("ValueNodeDynamicListInsert"));
 
                assert(action);
                synfigapp::ValueDesc value_desc(value_node,0);
@@ -1909,7 +1909,7 @@ StateDraw_Context::extend_bline_from_end(ValueNode_BLine::Handle value_node,std:
 
        if (complete_loop)
        {
-               synfigapp::Action::Handle action(synfigapp::Action::create("value_node_dynamic_list_loop"));
+               synfigapp::Action::Handle action(synfigapp::Action::create("ValueNodeDynamicListLoop"));
                assert(action);
 
                action->set_param("canvas",get_canvas());
@@ -1929,7 +1929,7 @@ StateDraw_Context::extend_bline_from_end(ValueNode_BLine::Handle value_node,std:
        {
                ValueNode_Composite::Handle composite(ValueNode_Composite::create(*iter));
 
-               synfigapp::Action::Handle action(synfigapp::Action::create("value_node_dynamic_list_insert"));
+               synfigapp::Action::Handle action(synfigapp::Action::create("ValueNodeDynamicListInsert"));
 
                assert(action);
                synfigapp::ValueDesc value_desc(value_node,value_node->link_count());
@@ -1996,10 +1996,9 @@ StateDraw_Context::fill_last_stroke_and_unselect_other_layers()
        get_canvas_interface()->get_selection_manager()->clear_selected_layers();
        layer=get_canvas_interface()->add_layer_to("region", canvas, depth);
        if (!layer) return Smach::RESULT_ERROR;
-       layer->set_param("color",synfigapp::Main::get_background_color());
        layer->set_description(last_stroke_id + _(" Region"));
 
-       synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
+       synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect"));
 
        assert(action);