Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/gtkmm/state_bline.cpp b/synfig-studio/trunk/src/gtkmm/state_bline.cpp
index b9de1fe..7a27d84 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/state_bline.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_bline.cpp
@@ -631,7 +631,7 @@ StateBLine_Context::run_()
                        get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description());
 
                        {
-                               synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
+                               synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect"));
                                assert(action);
 
                                action->set_param("canvas",get_canvas());
@@ -654,7 +654,7 @@ StateBLine_Context::run_()
                        // 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"));
+                               synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect"));
                                assert(action);
 
                                action->set_param("canvas",get_canvas());
@@ -694,7 +694,7 @@ StateBLine_Context::run_()
                        get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description());
 
                        {
-                               synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
+                               synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect"));
                                assert(action);
 
                                action->set_param("canvas",get_canvas());
@@ -717,7 +717,7 @@ StateBLine_Context::run_()
                        // 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"));
+                               synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect"));
                                assert(action);
 
                                action->set_param("canvas",get_canvas());
@@ -762,13 +762,10 @@ StateBLine_Context::run_()
                                get_canvas_interface()->signal_layer_param_changed()(layer,"feather");
                        }
 
-                       if(get_layer_outline_flag())
-                               layer->set_param("color",synfigapp::Main::get_background_color());
-
-                       // I don't know if it's safe to reuse the same layer_param_connect action, so I'm
+                       // I don't know if it's safe to reuse the same LayerParamConnect action, so I'm
                        // using 2 separate ones.
                        {
-                               synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
+                               synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect"));
                                assert(action);
 
                                action->set_param("canvas",get_canvas());
@@ -791,7 +788,7 @@ StateBLine_Context::run_()
                        // 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"));
+                               synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect"));
                                assert(action);
 
                                action->set_param("canvas",get_canvas());
@@ -836,7 +833,7 @@ StateBLine_Context::run_()
                        }
 
                        {
-                               synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
+                               synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect"));
                                assert(action);
 
                                action->set_param("canvas",get_canvas());
@@ -859,7 +856,7 @@ StateBLine_Context::run_()
                        // 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"));
+                               synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect"));
                                assert(action);
 
                                action->set_param("canvas",get_canvas());
@@ -983,10 +980,6 @@ StateBLine_Context::event_mouse_click_handler(const Smach::event& x)
                        return Smach::RESULT_ACCEPT;
                }
 
-       case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu
-               if (!getenv("SYNFIG_ENABLE_POPUP_MENU_IN_ALL_TOOLS"))
-                       return Smach::RESULT_ACCEPT;
-
        default:
                return Smach::RESULT_OK;
        }