X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Fcanvasinterface.cpp;h=0de2d97436b33defe703ad7e64970db87eb90eed;hb=e1907fab9d7cf65d9fc84be9617959e59fc6e20c;hp=1757952669647fc0b1c9c7f718320eb4610d0ad7;hpb=6fc1a2c4d3eb4de9e3c9c88b7a770e4feb7f5243;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
index 1757952..0de2d97 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 =========================================================== */
@@ -103,7 +106,14 @@ CanvasInterface::set_time(synfig::Time x)
 	}
 	if(cur_time_.is_equal(x))
 		return;
-	cur_time_=x;
+	get_canvas()->set_time(cur_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 ((interface = get_instance()->find_canvas_interface(*iter)) != this)
+			interface->set_time(interface->get_canvas()->get_time());
 
 	signal_time_changed()();
 	signal_dirty_preview()();
@@ -198,7 +208,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)
@@ -469,14 +479,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!");
 		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