X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluedescexport.cpp;h=65252cfac62763423b9b1395ccd3720134163b46;hb=4ba22fb51d97f1ecce04dcc5e40569a4354c1bae;hp=9fd634c74e85b754185208f729459e6e9c49c308;hpb=735ec949e5d002bcc2e871cddb1a3098067d4767;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp
index 9fd634c..65252cf 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp
@@ -35,6 +35,7 @@
 #include "canvasadd.h"
 #include "valuedescexport.h"
 #include "layerparamconnect.h"
+#include "layerparamset.h"
 
 #include <synfigapp/canvasinterface.h>
 #include <synfig/valuenode_const.h>
@@ -52,7 +53,7 @@ using namespace Action;
 /* === M A C R O S ========================================================= */
 
 ACTION_INIT_NO_GET_LOCAL_NAME(Action::ValueDescExport);
-ACTION_SET_NAME(Action::ValueDescExport,"value_desc_export");
+ACTION_SET_NAME(Action::ValueDescExport,"ValueDescExport");
 ACTION_SET_LOCAL_NAME(Action::ValueDescExport,N_("Export"));
 ACTION_SET_TASK(Action::ValueDescExport,"export");
 ACTION_SET_CATEGORY(Action::ValueDescExport,Action::CATEGORY_VALUEDESC);
@@ -103,8 +104,22 @@ Action::ValueDescExport::is_candidate(const ParamList &x)
 	if(candidate_check(get_param_vocab(),x))
 	{
 		ValueDesc value_desc=x.find("value_desc")->second.get_value_desc();
-		if(!value_desc || value_desc.parent_is_canvas() || (value_desc.is_value_node() && value_desc.get_value_node()->is_exported()))
+		if(!value_desc ||
+		   value_desc.parent_is_canvas() ||
+		   (value_desc.is_value_node() && value_desc.get_value_node()->is_exported()) ||
+		   (value_desc.get_value_type()==ValueBase::TYPE_CANVAS && !value_desc.get_value().get(Canvas::Handle())->is_inline()))
+		{
+//			if (!value_desc)
+//				synfig::info("%s:%d no export because no value_desc", __FILE__, __LINE__);
+//			else if (value_desc.parent_is_canvas())
+//				synfig::info("%s:%d no export because parent is canvas", __FILE__, __LINE__);
+//			else if (value_desc.is_value_node() && value_desc.get_value_node()->is_exported())
+//				synfig::info("%s:%d no export because exported value node", __FILE__, __LINE__);
+//			else if (value_desc.get_value_type()==ValueBase::TYPE_CANVAS && !value_desc.get_value().get(Canvas::Handle())->is_inline())
+//				synfig::info("%s:%d no export because canvas isn't inline", __FILE__, __LINE__);
+
 			return false;
+		}
 		return true;
 	}
 	return false;
@@ -151,6 +166,7 @@ Action::ValueDescExport::prepare()
 		if(!value_desc.is_const())
 			throw Error(_("Can only export Canvas when used as constant parameter"));
 		Canvas::Handle canvas(value_desc.get_value().get(Canvas::Handle()));
+		if (canvas) canvas=canvas->clone();
 
 		Action::Handle action(CanvasAdd::create());
 
@@ -165,6 +181,24 @@ Action::ValueDescExport::prepare()
 
 		add_action_front(action);
 
+		if(value_desc.parent_is_layer_param() && !value_desc.is_value_node())
+		{
+			// action: LayerParamSet
+			Action::Handle action(LayerParamSet::create());
+
+			action->set_param("canvas",get_canvas());
+			action->set_param("canvas_interface",get_canvas_interface());
+			action->set_param("layer",value_desc.get_layer());
+			action->set_param("param",value_desc.get_param_name());
+			action->set_param("new_value",ValueBase(canvas));
+
+			assert(action->is_ready());
+			if(!action->is_ready())
+				throw Error(Error::TYPE_NOTREADY);
+
+			add_action_front(action);
+		}
+
 		return;
 	}