X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_polygon.cpp;h=c016f1d5bfc520a60d30c2167023a58d8fedccb4;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=410947a4d550edf8130646a30ca88bbdb85beb7d;hpb=7c7a0076ee45cffd2165eefe4ede81e4a631ac18;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/state_polygon.cpp b/synfig-studio/trunk/src/gtkmm/state_polygon.cpp
index 410947a..c016f1d 100644
--- a/synfig-studio/trunk/src/gtkmm/state_polygon.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_polygon.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
@@ -34,6 +35,7 @@
 
 #include <synfig/valuenode_dynamiclist.h>
 #include <synfigapp/action_system.h>
+#include <synfig/valuenode_bline.h>
 
 #include "state_polygon.h"
 #include "canvasview.h"
@@ -92,12 +94,57 @@ class studio::StatePolygon_Context : public sigc::trackable
 
 	Gtk::Table options_table;
 	Gtk::Entry entry_id;
+	Gtk::CheckButton checkbutton_invert;
+	Gtk::CheckButton checkbutton_layer_polygon;
+	Gtk::CheckButton checkbutton_layer_region;
+	Gtk::CheckButton checkbutton_layer_outline;
+	Gtk::CheckButton checkbutton_layer_curve_gradient;
+	Gtk::CheckButton checkbutton_layer_plant;
+	Gtk::CheckButton checkbutton_layer_link_origins;
 	Gtk::Button button_make;
+	Gtk::Adjustment	 adj_feather;
+	Gtk::SpinButton  spin_feather;
 
 public:
+
+	// this counts the layers we create - they all have origins we can link
+	int layers_to_create()const
+	{
+		return
+			get_layer_polygon_flag() +
+			get_layer_region_flag() +
+			get_layer_outline_flag() +
+			get_layer_curve_gradient_flag() +
+			get_layer_plant_flag();
+	}
+
 	synfig::String get_id()const { return entry_id.get_text(); }
 	void set_id(const synfig::String& x) { return entry_id.set_text(x); }
 
+	bool get_invert()const { return checkbutton_invert.get_active(); }
+	void set_invert(bool i) { checkbutton_invert.set_active(i); }
+
+	bool get_layer_polygon_flag()const { return checkbutton_layer_polygon.get_active(); }
+	void set_layer_polygon_flag(bool x) { return checkbutton_layer_polygon.set_active(x); }
+
+	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_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_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); }
+
+	Real get_feather() const { return adj_feather.get_value(); }
+	void set_feather(Real x) { return adj_feather.set_value(x); }
+
 	Smach::event_result event_stop_handler(const Smach::event& x);
 
 	Smach::event_result event_refresh_handler(const Smach::event& x);
@@ -157,12 +204,61 @@ StatePolygon_Context::load_settings()
 		set_id(value);
 	else
 		set_id("Polygon");
+
+	if(settings.get_value("polygon.invert",value) && value != "0")
+		set_invert(true);
+	else
+		set_invert(false);
+
+	if(settings.get_value("polygon.layer_polygon",value) && value=="0")
+		set_layer_polygon_flag(false);
+	else
+		set_layer_polygon_flag(true);
+
+	if(settings.get_value("polygon.layer_region",value) && value=="1")
+		set_layer_region_flag(true);
+	else
+		set_layer_region_flag(false);
+
+	if(settings.get_value("polygon.layer_outline",value) && value=="1")
+		set_layer_outline_flag(true);
+	else
+		set_layer_outline_flag(false);
+
+	if(settings.get_value("polygon.layer_curve_gradient",value) && value=="1")
+		set_layer_curve_gradient_flag(true);
+	else
+		set_layer_curve_gradient_flag(false);
+
+	if(settings.get_value("polygon.layer_plant",value) && value=="1")
+		set_layer_plant_flag(true);
+	else
+		set_layer_plant_flag(false);
+
+	if(settings.get_value("polygon.layer_link_origins",value) && value=="0")
+		set_layer_link_origins_flag(false);
+	else
+		set_layer_link_origins_flag(true);
+
+	if(settings.get_value("polygon.feather",value))
+	{
+		Real n = atof(value.c_str());
+		set_feather(n);
+	}
 }
 
 void
 StatePolygon_Context::save_settings()
 {
 	settings.set_value("polygon.id",get_id().c_str());
+	settings.set_value("polygon.invert",get_invert()?"1":"0");
+	settings.set_value("polygon.layer_polygon",get_layer_polygon_flag()?"1":"0");
+	settings.set_value("polygon.layer_outline",get_layer_outline_flag()?"1":"0");
+	settings.set_value("polygon.layer_region",get_layer_region_flag()?"1":"0");
+	settings.set_value("polygon.layer_curve_gradient",get_layer_curve_gradient_flag()?"1":"0");
+	settings.set_value("polygon.layer_plant",get_layer_plant_flag()?"1":"0");
+	settings.set_value("polygon.layer_link_origins",get_layer_link_origins_flag()?"1":"0");
+	settings.set_value("polygon.feather",strprintf("%f",get_feather()));
 }
 
 void
@@ -224,14 +320,38 @@ StatePolygon_Context::StatePolygon_Context(CanvasView* canvas_view):
 	duckmatic_push(get_work_area()),
 	settings(synfigapp::Main::get_selected_input_device()->settings()),
 	entry_id(),
-	button_make(_("Make"))
+	checkbutton_invert(_("Invert")),
+	checkbutton_layer_polygon(_("Create Polygon Layer")),
+	checkbutton_layer_region(_("Create Region BLine")),
+	checkbutton_layer_outline(_("Create Outline BLine")),
+	checkbutton_layer_curve_gradient(_("Create Curve Gradient BLine")),
+	checkbutton_layer_plant(_("Create Plant BLine")),
+	checkbutton_layer_link_origins(_("Link Origins")),
+	button_make(_("Make")),
+	adj_feather(0,0,10000,0.01,0.1),
+	spin_feather(adj_feather,0.01,4)
 {
 	egress_on_selection_change=true;
 	load_settings();
 
 	// Set up the tool options dialog
-	//options_table.attach(*manage(new Gtk::Label(_("Polygon 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(*manage(new Gtk::Label(_("Polygon 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_polygon,						0, 2, 2,  3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+	options_table.attach(checkbutton_layer_outline,						0, 2, 3,  4, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+	options_table.attach(checkbutton_layer_region,						0, 2, 4,  5, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+	options_table.attach(checkbutton_layer_plant,						0, 2, 5,  6, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+	options_table.attach(checkbutton_layer_curve_gradient,				0, 2, 6,  7, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+	options_table.attach(checkbutton_layer_link_origins,				0, 2, 7,  8, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+
+	//invert flag
+	options_table.attach(checkbutton_invert,							0, 2, 8,  9, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+
+	//feather stuff
+	options_table.attach(*manage(new Gtk::Label(_("Feather"))), 		0, 1, 9, 10, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+	options_table.attach(spin_feather,									1, 2, 9, 10, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+
 	//options_table.attach(button_make, 0, 2, 4, 5, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
 	button_make.signal_pressed().connect(sigc::mem_fun(*this,&StatePolygon_Context::run));
 	options_table.show_all();
@@ -353,65 +473,406 @@ StatePolygon_Context::run()
 		get_canvas_view()->get_ui_interface()->error("You need at least 3 points to create a polygon");
 		return;
 	}
-		Layer::Handle layer;
-		Canvas::Handle canvas(get_canvas_view()->get_canvas());
-		int depth(0);
 
-		// we are temporarily using the layer to hold something
-		layer=get_canvas_view()->get_selection_manager()->get_selected_layer();
-		if(layer)
+	synfigapp::Action::PassiveGrouper group(get_canvas_interface()->get_instance().get(),_("New Polygon"));
+
+	Layer::Handle layer;
+
+	Canvas::Handle canvas;
+	int depth(0);
+
+	// we are temporarily using the layer to hold something
+	layer=get_canvas_view()->get_selection_manager()->get_selected_layer();
+	if(layer)
+	{
+		depth=layer->get_depth();
+		canvas=layer->get_canvas();
+	}
+
+	synfigapp::SelectionManager::LayerList layer_selection;
+	if (!getenv("SYNFIG_TOOLS_CLEAR_SELECTION"))
+		layer_selection = get_canvas_view()->get_selection_manager()->get_selected_layers();
+
+	const synfig::TransformStack& transform(get_canvas_view()->get_curr_transform_stack());
+
+	std::vector<BLinePoint> new_list;
+	std::list<synfig::Point>::iterator iter;
+	int i;
+	for(i=0,iter=polygon_point_list.begin();iter!=polygon_point_list.end();++iter,++i)
+	{
+		*iter = transform.unperform(*iter);
+		new_list.push_back(*(new BLinePoint));
+		new_list[i].set_width(1);
+		new_list[i].set_vertex(*iter);
+		new_list[i].set_tangent(Point(0,0));
+	}
+
+	ValueNode_BLine::Handle value_node_bline(ValueNode_BLine::create(new_list));
+	assert(value_node_bline);
+
+	ValueNode_Const::Handle value_node_origin(ValueNode_Const::create(Vector()));
+	assert(value_node_origin);
+
+	// Set the looping flag
+	value_node_bline->set_loop(true);
+
+	if(!canvas)
+		canvas=get_canvas_view()->get_canvas();
+
+	value_node_bline->set_member_canvas(canvas);
+
+	// count how many layers we're going to be creating
+	int layers_to_create = this->layers_to_create();
+
+	///////////////////////////////////////////////////////////////////////////
+	//   P O L Y G O N
+	///////////////////////////////////////////////////////////////////////////
+
+	if (get_layer_polygon_flag())
+	{
+		layer=get_canvas_interface()->add_layer_to("polygon",canvas,depth);
+		if (!layer)
 		{
-			depth=layer->get_depth();
-			canvas=layer->get_canvas();
+			get_canvas_view()->get_ui_interface()->error(_("Unable to create layer"));
+			group.cancel();
+			return;
 		}
+		layer_selection.push_back(layer);
 
+		layer->set_param("invert",get_invert());
+		get_canvas_interface()->signal_layer_param_changed()(layer,"invert");
+
+		if(get_feather())
 		{
-			synfigapp::Action::PassiveGrouper group(get_canvas_interface()->get_instance().get(),_("New Polygon"));
-			synfigapp::PushMode push_mode(get_canvas_interface(),synfigapp::MODE_NORMAL);
+			layer->set_param("feather",get_feather());
+			get_canvas_interface()->signal_layer_param_changed()(layer,"feather");
+		}
 
-			Layer::Handle layer(get_canvas_interface()->add_layer_to("polygon",canvas,depth));
-			layer->set_description(get_id());
-			get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description());
+		layer->set_description(get_id());
+		get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description());
 
-			layer->disconnect_dynamic_param("vector_list");
-			if(!layer->set_param("vector_list",polygon_point_list))
+		layer->disconnect_dynamic_param("vector_list");
+		if(!layer->set_param("vector_list",polygon_point_list))
+		{
+			group.cancel();
+			get_canvas_view()->get_ui_interface()->error("Unable to set layer parameter");
+			return;
+		}
+
+		{
+			synfigapp::Action::Handle action(synfigapp::Action::create("ValueDescConvert"));
+			synfigapp::ValueDesc value_desc(layer,"vector_list");
+			action->set_param("canvas",get_canvas());
+			action->set_param("canvas_interface",get_canvas_interface());
+			action->set_param("value_desc",value_desc);
+			action->set_param("type","dynamic_list");
+			action->set_param("time",get_canvas_interface()->get_time());
+			if(!get_canvas_interface()->get_instance()->perform_action(action))
 			{
 				group.cancel();
-				get_canvas_view()->get_ui_interface()->error("Unable to set layer parameter");
+				get_canvas_view()->get_ui_interface()->error("Unable to execute action \"ValueDescConvert\"");
 				return;
 			}
+		}
 
+		// only link the polygon'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("LayerParamConnect"));
+			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("origin")))
+				synfig::error("LayerParamConnect didn't like \"param\"");
+			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))
 			{
-				synfigapp::Action::Handle action(synfigapp::Action::create("value_desc_convert"));
-				synfigapp::ValueDesc value_desc(layer,"vector_list");
-				action->set_param("canvas",get_canvas());
-				action->set_param("canvas_interface",get_canvas_interface());
-				action->set_param("value_desc",value_desc);
-				action->set_param("type","dynamic_list");
-				action->set_param("time",get_canvas_interface()->get_time());
-				if(!get_canvas_interface()->get_instance()->perform_action(action))
-				{
-					group.cancel();
-					get_canvas_view()->get_ui_interface()->error("Unable to execute action \"value_desc_convert\"");
-					return;
-				}
+				get_canvas_view()->get_ui_interface()->error(_("Unable to create Polygon layer"));
+				group.cancel();
+				throw String(_("Unable to create Polygon layer"));
+				return;
 			}
-			egress_on_selection_change=false;
-			get_canvas_interface()->get_selection_manager()->clear_selected_layers();
-			get_canvas_interface()->get_selection_manager()->set_selected_layer(layer);
-			egress_on_selection_change=true;
-			//get_canvas_interface()->signal_dirty_preview()();
 		}
-/*
-		else
+	}
+
+	///////////////////////////////////////////////////////////////////////////
+	//   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("curve_gradient",canvas,depth));
+		if (!layer)
 		{
-			ValueNode::Handle value_node=(ValueNode_Const::create(polygon_point_list));
-			std::string valuenode_name="Poly";
-			while(studio::App::dialog_entry("New Polygon", "Please enter the new ID for this value_node",valuenode_name))
-				if(get_canvas_interface()->add_value_node(value_node,valuenode_name))
-					return true;
+			get_canvas_view()->get_ui_interface()->error(_("Unable to create layer"));
+			group.cancel();
+			return;
 		}
-*/
+		layer_selection.push_back(layer);
+		layer->set_description(get_id()+_(" Gradient"));
+		get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description());
+
+		{
+			synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect"));
+			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;
+			}
+		}
+
+		// 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("LayerParamConnect"));
+			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("origin")))
+				synfig::error("LayerParamConnect didn't like \"param\"");
+			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))
+			{
+				//get_canvas_view()->get_ui_interface()->error(_("Unable to create BLine layer"));
+				group.cancel();
+				throw String(_("Unable to create Gradient layer"));
+				return;
+			}
+		}
+	}
+
+	///////////////////////////////////////////////////////////////////////////
+	//   P L A N T
+	///////////////////////////////////////////////////////////////////////////
+
+	if(get_layer_plant_flag())
+	{
+		synfigapp::PushMode push_mode(get_canvas_interface(),synfigapp::MODE_NORMAL);
+
+		Layer::Handle layer(get_canvas_interface()->add_layer_to("plant",canvas,depth));
+		if (!layer)
+		{
+			get_canvas_view()->get_ui_interface()->error(_("Unable to create layer"));
+			group.cancel();
+			return;
+		}
+		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("LayerParamConnect"));
+			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;
+			}
+		}
+
+		// 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("LayerParamConnect"));
+			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("origin")))
+				synfig::error("LayerParamConnect didn't like \"param\"");
+			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))
+			{
+				//get_canvas_view()->get_ui_interface()->error(_("Unable to create BLine layer"));
+				group.cancel();
+				throw String(_("Unable to create Plant layer"));
+				return;
+			}
+		}
+	}
+
+	///////////////////////////////////////////////////////////////////////////
+	//   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("region",canvas,depth));
+		if (!layer)
+		{
+			get_canvas_view()->get_ui_interface()->error(_("Unable to create layer"));
+			group.cancel();
+			return;
+		}
+		layer_selection.push_back(layer);
+		layer->set_description(get_id()+_(" Region"));
+		get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description());
+
+		layer->set_param("feather",get_feather());
+		get_canvas_interface()->signal_layer_param_changed()(layer,"feather");
+
+		layer->set_param("invert",get_invert());
+		get_canvas_interface()->signal_layer_param_changed()(layer,"invert");
+
+		// 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("LayerParamConnect"));
+			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;
+			}
+		}
+
+		// 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("LayerParamConnect"));
+			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("origin")))
+				synfig::error("LayerParamConnect didn't like \"param\"");
+			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))
+			{
+				//get_canvas_view()->get_ui_interface()->error(_("Unable to create Region layer"));
+				group.cancel();
+				throw String(_("Unable to create Region layer"));
+				return;
+			}
+		}
+	}
+
+	///////////////////////////////////////////////////////////////////////////
+	//   O U T L I N E
+	///////////////////////////////////////////////////////////////////////////
+
+	if (get_layer_outline_flag())
+	{
+		Layer::Handle layer(get_canvas_interface()->add_layer_to("outline",canvas,depth));
+		if (!layer)
+		{
+			get_canvas_view()->get_ui_interface()->error(_("Unable to create layer"));
+			group.cancel();
+			return;
+		}
+		layer_selection.push_back(layer);
+		layer->set_description(get_id()+_(" Outline"));
+		get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description());
+
+		layer->set_param("feather",get_feather());
+		get_canvas_interface()->signal_layer_param_changed()(layer,"feather");
+
+		layer->set_param("invert",get_invert());
+		get_canvas_interface()->signal_layer_param_changed()(layer,"invert");
+
+		{
+			synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect"));
+			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;
+			}
+		}
+
+		// 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("LayerParamConnect"));
+			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("origin")))
+				synfig::error("LayerParamConnect didn't like \"param\"");
+			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))
+			{
+				//get_canvas_view()->get_ui_interface()->error(_("Unable to create BLine layer"));
+				group.cancel();
+				throw String(_("Unable to create Outline layer"));
+				return;
+			}
+		}
+	}
+
+	egress_on_selection_change=false;
+	get_canvas_interface()->get_selection_manager()->clear_selected_layers();
+	get_canvas_interface()->get_selection_manager()->set_selected_layers(layer_selection);
+	egress_on_selection_change=true;
+
+	//post clean up stuff...
 	reset();
 	increment_id();
 }
@@ -428,10 +889,6 @@ StatePolygon_Context::event_mouse_click_handler(const Smach::event& x)
 		refresh_ducks();
 		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;
 	}