X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Fcanvasinterface.cpp;h=33b62734c59611dc555def88f8b8e96e64e954b2;hb=312541920425e9ca481a0218c440f369dd25306f;hp=825284c76b9fd993abb6198d70f435ff7f225d26;hpb=cc40453812ad15727a94bf91371facf1e18d1d4e;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
index 825284c..33b6273 100644
--- a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
+++ b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 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
@@ -59,6 +60,8 @@
 
 #include <synfig/gradient.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -76,7 +79,7 @@ using namespace synfigapp;
 
 /* === M E T H O D S ======================================================= */
 
-CanvasInterface::CanvasInterface(loose_handle<Instance> instance,handle<Canvas> canvas):
+CanvasInterface::CanvasInterface(etl::loose_handle<Instance> instance,etl::handle<synfig::Canvas> canvas):
 	instance_(instance),
 	canvas_(canvas),
 	cur_time_(canvas->rend_desc().get_frame_start()),
@@ -107,8 +110,9 @@ CanvasInterface::set_time(synfig::Time x)
 
 	// update the time in all the child canvases
 	Canvas::Children children = get_canvas()->get_root()->children();
+	handle<CanvasInterface> interface;
 	for (Canvas::Children::iterator iter = children.begin(); iter != children.end(); iter++)
-		if (handle<CanvasInterface> interface = get_instance()->find_canvas_interface(*iter))
+		if ((interface = get_instance()->find_canvas_interface(*iter)) != this)
 			interface->set_time(interface->get_canvas()->get_time());
 
 	signal_time_changed()();
@@ -130,7 +134,7 @@ CanvasInterface::refresh_current_values()
 }
 
 etl::handle<CanvasInterface>
-CanvasInterface::create(loose_handle<Instance> instance,handle<Canvas> canvas)
+CanvasInterface::create(etl::loose_handle<Instance> instance, etl::handle<synfig::Canvas> canvas)
 {
 	etl::handle<CanvasInterface> intrfc;
 	intrfc=new CanvasInterface(instance,canvas);
@@ -172,7 +176,7 @@ CanvasInterface::get_mode()const
 
 
 Layer::Handle
-CanvasInterface::add_layer_to(String name, Canvas::Handle canvas, int depth)
+CanvasInterface::add_layer_to(synfig::String name, synfig::Canvas::Handle canvas, int depth)
 {
 	synfigapp::Action::PassiveGrouper group(get_instance().get(),_("Add Layer To"));
 
@@ -189,6 +193,22 @@ CanvasInterface::add_layer_to(String name, Canvas::Handle canvas, int depth)
 		return 0;
 	}
 
+	// automatically export the Index parameter of new Duplicate layers
+	if (name == "duplicate")
+		for (int i = 1; ; i++)
+		{
+			String name = strprintf(_("Index %d"), i);
+			try
+			{
+				canvas->find_value_node(name);
+			}
+			catch (Exception::IDNotFound x)
+			{
+				add_value_node(layer->dynamic_param_list().find("index")->second, name);
+				break;
+			}
+		}
+
 	layer->set_canvas(canvas);
 
 	// Apply some defaults
@@ -204,7 +224,7 @@ CanvasInterface::add_layer_to(String name, Canvas::Handle canvas, int depth)
 	layer->set_param("blend_method",synfigapp::Main::get_blend_method());
 
 	{
-		// Grab the layer's list pf parameters
+		// Grab the layer's list of parameters
 		Layer::ParamList paramlist=layer->get_param_list();
 		Layer::ParamList::iterator iter;
 		for(iter=paramlist.begin();iter!=paramlist.end();++iter)
@@ -280,7 +300,7 @@ CanvasInterface::add_layer_to(String name, Canvas::Handle canvas, int depth)
 
 
 bool
-CanvasInterface::convert(ValueDesc value_desc, String type)
+CanvasInterface::convert(ValueDesc value_desc, synfig::String type)
 {
 	Action::Handle 	action(Action::ValueDescConvert::create());
 
@@ -292,6 +312,7 @@ CanvasInterface::convert(ValueDesc value_desc, String type)
 	action->set_param("canvas_interface",etl::loose_handle<CanvasInterface>(this));
 	action->set_param("value_desc",value_desc);
 	action->set_param("type",type);
+	action->set_param("time",get_time());
 
 	if(!action->is_ready())
 	{
@@ -416,7 +437,7 @@ CanvasInterface::set_rend_desc(const synfig::RendDesc &rend_desc)
 }
 
 bool
-CanvasInterface::set_name(const String &x)
+CanvasInterface::set_name(const synfig::String &x)
 {
 	//! \todo This needs to be converted into an action
 	get_canvas()->set_name(x);
@@ -425,7 +446,7 @@ CanvasInterface::set_name(const String &x)
 }
 
 bool
-CanvasInterface::set_description(const String &x)
+CanvasInterface::set_description(const synfig::String &x)
 {
 	//! \todo This needs to be converted into an action
 	get_canvas()->set_description(x);
@@ -433,7 +454,7 @@ CanvasInterface::set_description(const String &x)
 }
 
 bool
-CanvasInterface::set_id(const String &x)
+CanvasInterface::set_id(const synfig::String &x)
 {
 	//! \todo This needs to be converted into an action
 	get_canvas()->set_id(x);
@@ -475,14 +496,14 @@ CanvasInterface::import(const synfig::String &filename, bool /*copy*/)
 
 	synfig::info("Attempting to import "+filename);
 
-
-	if(find(filename.begin(),filename.end(),'.')==filename.end())
+	if (filename_extension(filename) == "")
 	{
-		get_ui_interface()->error("Filename must have an extension!");
+		get_ui_interface()->error(_("Filename must have an extension!"));
 		return false;
 	}
 
-	String ext(String(filename.begin()+filename.find_last_of('.')+1,filename.end()));
+	String ext(filename_extension(filename));
+	if (ext.size()) ext = ext.substr(1); // skip initial '.'
 	std::transform(ext.begin(),ext.end(),ext.begin(),&::tolower);
 
 	// If this is a SIF file, then we need to do things slightly differently
@@ -621,7 +642,7 @@ CanvasInterface::waypoint_remove(synfigapp::ValueDesc value_desc,synfig::Waypoin
 
 
 void
-CanvasInterface::auto_export(ValueNode::Handle /*value_node*/)
+CanvasInterface::auto_export(synfig::ValueNode::Handle /*value_node*/)
 {
 /*
 	// Check to see if we are already exported.