X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_bline.cpp;h=0a010f19484cbb1e7aea60f209dbaa09caf57575;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=0b61bb18a06c5f91f914ded5b0346334aade12bc;hpb=fb79e7ea31ff262ac2d6802f5946f902b1abbb14;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/state_bline.cpp b/synfig-studio/trunk/src/gtkmm/state_bline.cpp
index 0b61bb1..0a010f1 100644
--- a/synfig-studio/trunk/src/gtkmm/state_bline.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_bline.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 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
@@ -50,6 +51,8 @@
 #include <synfig/transform.h>
 #include <synfigapp/main.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -111,8 +114,10 @@ class studio::StateBLine_Context : public sigc::trackable
 	Gtk::Table options_table;
 	Gtk::Entry entry_id;
 	Gtk::CheckButton checkbutton_layer_region;
-	Gtk::CheckButton checkbutton_layer_bline;
+	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_auto_export;
 	Gtk::Button button_make;
 	Gtk::Button button_clear;
@@ -126,9 +131,10 @@ public:
 	int layers_to_create()const
 	{
 		return
-			get_layer_region_flag()+
-			get_layer_bline_flag()+
-			get_layer_curve_gradient_flag();
+			get_layer_region_flag() +
+			get_layer_outline_flag() +
+			get_layer_curve_gradient_flag() +
+			get_layer_plant_flag();
 	}
 
 	void sanity_check()
@@ -143,12 +149,18 @@ public:
 	bool get_layer_region_flag()const { return checkbutton_layer_region.get_active(); }
 	void set_layer_region_flag(bool x) { return checkbutton_layer_region.set_active(x); }
 
-	bool get_layer_bline_flag()const { return checkbutton_layer_bline.get_active(); }
-	void set_layer_bline_flag(bool x) { return checkbutton_layer_bline.set_active(x); }
+	bool get_layer_outline_flag()const { return checkbutton_layer_outline.get_active(); }
+	void set_layer_outline_flag(bool x) { return checkbutton_layer_outline.set_active(x); }
 
 	bool get_layer_curve_gradient_flag()const { return checkbutton_layer_curve_gradient.get_active(); }
 	void set_layer_curve_gradient_flag(bool x) { return checkbutton_layer_curve_gradient.set_active(x); }
 
+	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); }
+
 	Real get_feather() const { return adj_feather.get_value(); }
 	void set_feather(Real x) { return adj_feather.set_value(x); }
 	synfig::String get_id()const { return entry_id.get_text(); }
@@ -227,16 +239,26 @@ StateBLine_Context::load_settings()
 	else
 		set_layer_region_flag(true);
 
-	if(settings.get_value("bline.layer_bline",value) && value=="0")
-		set_layer_bline_flag(false);
+	if(settings.get_value("bline.layer_outline",value) && value=="0")
+		set_layer_outline_flag(false);
 	else
-		set_layer_bline_flag(true);
+		set_layer_outline_flag(true);
 
 	if(settings.get_value("bline.layer_curve_gradient",value) && value=="1")
 		set_layer_curve_gradient_flag(true);
 	else
 		set_layer_curve_gradient_flag(false);
 
+	if(settings.get_value("bline.layer_plant",value) && value=="1")
+		set_layer_plant_flag(true);
+	else
+		set_layer_plant_flag(false);
+
+	if(settings.get_value("bline.layer_link_offsets",value) && value=="0")
+		set_layer_link_offsets_flag(false);
+	else
+		set_layer_link_offsets_flag(true);
+
 	if(settings.get_value("bline.auto_export",value) && value=="1")
 		set_auto_export_flag(true);
 	else
@@ -260,9 +282,11 @@ void
 StateBLine_Context::save_settings()
 {
 	sanity_check();
-	settings.set_value("bline.layer_bline",get_layer_bline_flag()?"1":"0");
+	settings.set_value("bline.layer_outline",get_layer_outline_flag()?"1":"0");
 	settings.set_value("bline.layer_region",get_layer_region_flag()?"1":"0");
 	settings.set_value("bline.layer_curve_gradient",get_layer_curve_gradient_flag()?"1":"0");
+	settings.set_value("bline.layer_plant",get_layer_plant_flag()?"1":"0");
+	settings.set_value("bline.layer_link_offsets",get_layer_link_offsets_flag()?"1":"0");
 	settings.set_value("bline.auto_export",get_auto_export_flag()?"1":"0");
 	settings.set_value("bline.id",get_id().c_str());
 	settings.set_value("bline.feather",strprintf("%f",get_feather()));
@@ -292,7 +316,10 @@ StateBLine_Context::increment_id()
 	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());
@@ -329,8 +356,10 @@ StateBLine_Context::StateBLine_Context(CanvasView* canvas_view):
 	settings(synfigapp::Main::get_selected_input_device()->settings()),
 	entry_id(),
 	checkbutton_layer_region(_("Fill")),
-	checkbutton_layer_bline(_("Outline")),
+	checkbutton_layer_outline(_("Outline")),
 	checkbutton_layer_curve_gradient(_("Gradient")),
+	checkbutton_layer_plant(_("Plant")),
+	checkbutton_layer_link_offsets(_("Link Offsets")),
 	checkbutton_auto_export(_("Auto Export")),
 	button_make(_("Make")),
 	button_clear(_("Clear")),
@@ -343,13 +372,15 @@ StateBLine_Context::StateBLine_Context(CanvasView* canvas_view):
 
 	// Set up the tool options dialog
 	//options_table.attach(*manage(new Gtk::Label(_("BLine 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);
-	options_table.attach(checkbutton_layer_region, 0, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
-	options_table.attach(checkbutton_layer_bline, 0, 2, 3, 4, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
-	options_table.attach(checkbutton_layer_curve_gradient, 0, 2, 4, 5, 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);
+	options_table.attach(checkbutton_layer_outline,				0, 2,  2,  3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+	options_table.attach(checkbutton_layer_region,				0, 2,  3,  4, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+	options_table.attach(checkbutton_layer_plant,				0, 2,  4,  5, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+	options_table.attach(checkbutton_layer_curve_gradient,		0, 2,  5,  6, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+	options_table.attach(checkbutton_layer_link_offsets,		0, 2,  6,  7, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+	options_table.attach(checkbutton_auto_export,				0, 2,  7,  8, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
 	options_table.attach(*manage(new Gtk::Label(_("Feather"))), 0, 1, 10, 11, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
-	options_table.attach(spin_feather, 1, 2, 10, 11, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
-	options_table.attach(checkbutton_auto_export, 0, 2, 11, 12, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+	options_table.attach(spin_feather,							1, 2, 10, 11, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
 	//options_table.attach(button_make, 0, 2, 5, 6, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
 	//button_make.signal_pressed().connect(sigc::mem_fun(*this,&StateBLine_Context::run));
 	options_table.show_all();
@@ -533,9 +564,11 @@ StateBLine_Context::run_()
 		}
 
 		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);
+
 		// Set the looping flag
 		value_node_bline->set_loop(loop_);
 
@@ -569,130 +602,253 @@ StateBLine_Context::run_()
 
 		synfigapp::SelectionManager::LayerList layer_selection;
 
-		// If we were asked to create a region layer, go ahead and do so
-		if(get_layer_region_flag())
+		///////////////////////////////////////////////////////////////////////////
+		//   C U R V E   G R A D I E N T
+		///////////////////////////////////////////////////////////////////////////
+
+		if(get_layer_curve_gradient_flag())
 		{
 			synfigapp::PushMode push_mode(get_canvas_interface(),synfigapp::MODE_NORMAL);
 
-			Layer::Handle layer(get_canvas_interface()->add_layer_to("region",canvas,depth));
-			layer_selection.push_back(layer);
+			Layer::Handle layer(get_canvas_interface()->add_layer_to("curve_gradient",canvas,depth));
 			assert(layer);
-			layer->set_description(get_id()+_(" Region"));
+			layer_selection.push_back(layer);
+			layer->set_description(get_id()+_(" Gradient"));
 			get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description());
 
-			if(get_feather())
 			{
-				layer->set_param("feather",get_feather());
-				get_canvas_interface()->signal_layer_param_changed()(layer,"feather");
+				synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
+				assert(action);
+
+				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("bline")))
+					synfig::error("LayerParamConnect didn't like \"param\"");
+				if(!action->set_param("value_node",ValueNode::Handle(value_node_bline)))
+					synfig::error("LayerParamConnect didn't like \"value_node\"");
+
+				if(!get_canvas_interface()->get_instance()->perform_action(action))
+				{
+					//get_canvas_view()->get_ui_interface()->error(_("Unable to create BLine layer"));
+					group.cancel();
+					throw String(_("Unable to create Gradient layer"));
+					return false;
+				}
 			}
 
-			if(get_layer_bline_flag())
-				layer->set_param("color",synfigapp::Main::get_background_color());
+			if (get_layer_link_offsets_flag())
+			{
+				synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
+				assert(action);
+
+				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")))
+					synfig::error("LayerParamConnect didn't like \"param\"");
+				if(!action->set_param("value_node",ValueNode::Handle(value_node_offset)))
+					synfig::error("LayerParamConnect didn't like \"value_node\"");
+
+				if(!get_canvas_interface()->get_instance()->perform_action(action))
+				{
+					//get_canvas_view()->get_ui_interface()->error(_("Unable to create BLine layer"));
+					group.cancel();
+					throw String(_("Unable to create Gradient layer"));
+					return false;
+				}
+			}
+		}
 
-			synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
+		///////////////////////////////////////////////////////////////////////////
+		//   P L A N T
+		///////////////////////////////////////////////////////////////////////////
 
-			assert(action);
+		if(get_layer_plant_flag())
+		{
+			synfigapp::PushMode push_mode(get_canvas_interface(),synfigapp::MODE_NORMAL);
 
-			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("bline")))
-				synfig::error("LayerParamConnect didn't like \"param\"");
-			if(!action->set_param("value_node",ValueNode::Handle(value_node_bline)))
-				synfig::error("LayerParamConnect didn't like \"value_node\"");
+			Layer::Handle layer(get_canvas_interface()->add_layer_to("plant",canvas,depth));
+			assert(layer);
+			layer_selection.push_back(layer);
+			layer->set_description(get_id()+_(" Plant"));
+			get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description());
+
+			{
+				synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
+				assert(action);
+
+				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("bline")))
+					synfig::error("LayerParamConnect didn't like \"param\"");
+				if(!action->set_param("value_node",ValueNode::Handle(value_node_bline)))
+					synfig::error("LayerParamConnect didn't like \"value_node\"");
+
+				if(!get_canvas_interface()->get_instance()->perform_action(action))
+				{
+					//get_canvas_view()->get_ui_interface()->error(_("Unable to create BLine layer"));
+					group.cancel();
+					throw String(_("Unable to create Plant layer"));
+					return false;
+				}
+			}
 
-			if(!get_canvas_interface()->get_instance()->perform_action(action))
+			// plants don't have offsets?
+			if (get_layer_link_offsets_flag())
 			{
-				//get_canvas_view()->get_ui_interface()->error(_("Unable to create Region layer"));
-				group.cancel();
-				throw String(_("Unable to create Region layer"));
-				return false;
+				synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
+				assert(action);
+
+				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")))
+					synfig::error("LayerParamConnect didn't like \"param\"");
+				if(!action->set_param("value_node",ValueNode::Handle(value_node_offset)))
+					synfig::error("LayerParamConnect didn't like \"value_node\"");
+
+				if(!get_canvas_interface()->get_instance()->perform_action(action))
+				{
+					//get_canvas_view()->get_ui_interface()->error(_("Unable to create BLine layer"));
+					group.cancel();
+					throw String(_("Unable to create Plant layer"));
+					return false;
+				}
 			}
 		}
 
-		// If we were asked to create a BLine layer, go ahead and do so
-		if(get_layer_bline_flag())
+		///////////////////////////////////////////////////////////////////////////
+		//   R E G I O N
+		///////////////////////////////////////////////////////////////////////////
+
+		if(get_layer_region_flag())
 		{
 			synfigapp::PushMode push_mode(get_canvas_interface(),synfigapp::MODE_NORMAL);
 
-			Layer::Handle layer(get_canvas_interface()->add_layer_to("outline",canvas,depth));
+			Layer::Handle layer(get_canvas_interface()->add_layer_to("region",canvas,depth));
+			assert(layer);
 			layer_selection.push_back(layer);
-			layer->set_description(get_id()+_(" Outline"));
+			layer->set_description(get_id()+_(" Region"));
 			get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description());
+
 			if(get_feather())
 			{
 				layer->set_param("feather",get_feather());
 				get_canvas_interface()->signal_layer_param_changed()(layer,"feather");
 			}
 
-			assert(layer);
-
-
-			synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
-
-			assert(action);
-
-			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("bline")))
-				synfig::error("LayerParamConnect didn't like \"param\"");
-			if(!action->set_param("value_node",ValueNode::Handle(value_node_bline)))
-				synfig::error("LayerParamConnect didn't like \"value_node\"");
+			if(get_layer_outline_flag())
+				layer->set_param("color",synfigapp::Main::get_background_color());
 
-			if(!get_canvas_interface()->get_instance()->perform_action(action))
+			// I don't know if it's safe to reuse the same layer_param_connect action, so I'm
+			// using 2 separate ones.
 			{
-				//get_canvas_view()->get_ui_interface()->error(_("Unable to create BLine layer"));
-				group.cancel();
-				throw String(_("Unable to create Outline layer"));
-				return false;
+				synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
+				assert(action);
+
+				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("bline")))
+					synfig::error("LayerParamConnect didn't like \"param\"");
+				if(!action->set_param("value_node",ValueNode::Handle(value_node_bline)))
+					synfig::error("LayerParamConnect didn't like \"value_node\"");
+
+				if(!get_canvas_interface()->get_instance()->perform_action(action))
+				{
+					//get_canvas_view()->get_ui_interface()->error(_("Unable to create Region layer"));
+					group.cancel();
+					throw String(_("Unable to create Region layer"));
+					return false;
+				}
 			}
 
-			/*if(get_layer_region_flag() && !get_auto_export_flag())
+			if (get_layer_link_offsets_flag())
 			{
-				get_canvas_interface()->auto_export(synfigapp::ValueDesc(layer,"bline"));
-			}*/
+				synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
+				assert(action);
+
+				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")))
+					synfig::error("LayerParamConnect didn't like \"param\"");
+				if(!action->set_param("value_node",ValueNode::Handle(value_node_offset)))
+					synfig::error("LayerParamConnect didn't like \"value_node\"");
+
+				if(!get_canvas_interface()->get_instance()->perform_action(action))
+				{
+					//get_canvas_view()->get_ui_interface()->error(_("Unable to create Region layer"));
+					group.cancel();
+					throw String(_("Unable to create Region layer"));
+					return false;
+				}
+			}
 		}
 
+		///////////////////////////////////////////////////////////////////////////
+		//   O U T L I N E
+		///////////////////////////////////////////////////////////////////////////
 
-
-		// If we were asked to create a CurveGradient layer, go ahead and do so
-		if(get_layer_curve_gradient_flag())
+		if(get_layer_outline_flag())
 		{
 			synfigapp::PushMode push_mode(get_canvas_interface(),synfigapp::MODE_NORMAL);
 
-			Layer::Handle layer(get_canvas_interface()->add_layer_to("curve_gradient",canvas,depth));
+			Layer::Handle layer(get_canvas_interface()->add_layer_to("outline",canvas,depth));
+			assert(layer);
 			layer_selection.push_back(layer);
-			layer->set_description(get_id()+_(" Gradient"));
+			layer->set_description(get_id()+_(" Outline"));
 			get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description());
+			if(get_feather())
+			{
+				layer->set_param("feather",get_feather());
+				get_canvas_interface()->signal_layer_param_changed()(layer,"feather");
+			}
 
-			assert(layer);
-
-
-			synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
-
-			assert(action);
-
-			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("bline")))
-				synfig::error("LayerParamConnect didn't like \"param\"");
-			if(!action->set_param("value_node",ValueNode::Handle(value_node_bline)))
-				synfig::error("LayerParamConnect didn't like \"value_node\"");
-
-			if(!get_canvas_interface()->get_instance()->perform_action(action))
 			{
-				//get_canvas_view()->get_ui_interface()->error(_("Unable to create BLine layer"));
-				group.cancel();
-				throw String(_("Unable to create Gradient layer"));
-				return false;
+				synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
+				assert(action);
+
+				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("bline")))
+					synfig::error("LayerParamConnect didn't like \"param\"");
+				if(!action->set_param("value_node",ValueNode::Handle(value_node_bline)))
+					synfig::error("LayerParamConnect didn't like \"value_node\"");
+
+				if(!get_canvas_interface()->get_instance()->perform_action(action))
+				{
+					//get_canvas_view()->get_ui_interface()->error(_("Unable to create BLine layer"));
+					group.cancel();
+					throw String(_("Unable to create Outline layer"));
+					return false;
+				}
 			}
 
-			/*if(get_layer_region_flag() && !get_auto_export_flag())
+			if (get_layer_link_offsets_flag())
 			{
-				get_canvas_interface()->auto_export(synfigapp::ValueDesc(layer,"bline"));
-			}*/
+				synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
+				assert(action);
+
+				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")))
+					synfig::error("LayerParamConnect didn't like \"param\"");
+				if(!action->set_param("value_node",ValueNode::Handle(value_node_offset)))
+					synfig::error("LayerParamConnect didn't like \"value_node\"");
+
+				if(!get_canvas_interface()->get_instance()->perform_action(action))
+				{
+					//get_canvas_view()->get_ui_interface()->error(_("Unable to create BLine layer"));
+					group.cancel();
+					throw String(_("Unable to create Outline layer"));
+					return false;
+				}
+			}
 		}
 
 		egress_on_selection_change=false;
@@ -798,8 +954,9 @@ StateBLine_Context::event_mouse_click_handler(const Smach::event& x)
 			return Smach::RESULT_ACCEPT;
 		}
 
-	case BUTTON_RIGHT: // Intercept the right-button click to short-circut the pop-up menu
-		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;
@@ -1069,16 +1226,16 @@ StateBLine_Context::popup_vertex_menu(synfig::ValueNode_Const::Handle value_node
 
 	if(loop_)
 	{
-		menu.items().push_back(Gtk::Menu_Helpers::MenuElem("Unloop BLine",
+		menu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Unloop BLine"),
 				sigc::mem_fun(*this,&studio::StateBLine_Context::unloop_bline)
 		));
 	} else {
-		menu.items().push_back(Gtk::Menu_Helpers::MenuElem("Loop BLine",
+		menu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Loop BLine"),
 				sigc::mem_fun(*this,&studio::StateBLine_Context::loop_bline)
 		));
 	}
 
-	menu.items().push_back(Gtk::Menu_Helpers::MenuElem("Delete Vertex",
+	menu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Delete Vertex"),
 		sigc::bind(
 			sigc::mem_fun(*this,&studio::StateBLine_Context::bline_delete_vertex),
 			value_node
@@ -1093,7 +1250,7 @@ StateBLine_Context::popup_bezier_menu(float location, synfig::ValueNode_Const::H
 {
 	menu.items().clear();
 
-	menu.items().push_back(Gtk::Menu_Helpers::MenuElem("Insert Vertex",
+	menu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Insert Vertex"),
 		sigc::bind(
 			sigc::bind(
 				sigc::mem_fun(*this,&studio::StateBLine_Context::bline_insert_vertex),
@@ -1162,7 +1319,7 @@ StateBLine_Context::bline_insert_vertex(synfig::ValueNode_Const::Handle value_no
 
 	if(iter==bline_point_list.end())
 	{
-		get_canvas_view()->get_ui_interface()->error("Unable to find where to insert vertex, internal error, please report this bug");
+		get_canvas_view()->get_ui_interface()->error(_("Unable to find where to insert vertex, internal error, please report this bug"));
 	}
 
 	refresh_ducks(false);
@@ -1181,7 +1338,7 @@ StateBLine_Context::bline_delete_vertex(synfig::ValueNode_Const::Handle value_no
 		}
 	if(iter==bline_point_list.end())
 	{
-		get_canvas_view()->get_ui_interface()->error("Unable to remove vertex, internal error, please report this bug");
+		get_canvas_view()->get_ui_interface()->error(_("Unable to remove vertex, internal error, please report this bug"));
 	}
 
 	refresh_ducks(false);
@@ -1195,14 +1352,14 @@ StateBLine_Context::popup_handle_menu(synfig::ValueNode_Const::Handle value_node
 	BLinePoint bline_point(value_node->get_value().get(BLinePoint()));
 
 	if(bline_point.get_split_tangent_flag())
-		menu.items().push_back(Gtk::Menu_Helpers::MenuElem("Merge Tangents",
+		menu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Merge Tangents"),
 			sigc::bind(
 				sigc::mem_fun(*this,&studio::StateBLine_Context::bline_attach_handle),
 				value_node
 			)
 		));
 	else
-		menu.items().push_back(Gtk::Menu_Helpers::MenuElem("Split Tangents",
+		menu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Split Tangents"),
 			sigc::bind(
 				sigc::mem_fun(*this,&studio::StateBLine_Context::bline_detach_handle),
 				value_node