X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Fcanvasinterface.cpp;h=030fb8747790d1898cfdcf1083236eaa9edf83e3;hb=493f4126a799967d1ab9381aaf07d1d5915712e4;hp=e58802f85e8ca9e41643ac5bf9b8e09769b4f67e;hpb=c34eaa5441242b3e9a7b7645e9ee4983d14eae85;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
index e58802f..030fb87 100644
--- a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
+++ b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
@@ -2,10 +2,11 @@
 /*!	\file canvasinterface.cpp
 **	\brief Template File
 **
-**	$Id: canvasinterface.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
+**	$Id$
 **
 **	\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
@@ -103,7 +104,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 +206,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)
@@ -463,20 +471,20 @@ CanvasInterface::jump_to_prev_keyframe()
 }
 
 bool
-CanvasInterface::import(const synfig::String &filename, bool copy)
+CanvasInterface::import(const synfig::String &filename, bool /*copy*/)
 {
 	Action::PassiveGrouper group(get_instance().get(),_("Import Image"));
 
 	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
@@ -489,7 +497,7 @@ CanvasInterface::import(const synfig::String &filename, bool copy)
 
 		Layer::Handle layer(add_layer_to("PasteCanvas",get_canvas()));
 		if(!layer)
-			throw String(_("Unable to create \"PasteCanvas\" layer"));
+			throw String(_("Unable to create \"Paste Canvas\" layer"));
 		if(!layer->set_param("canvas",ValueBase(outside_canvas)))
 			throw int();
 
@@ -508,8 +516,6 @@ CanvasInterface::import(const synfig::String &filename, bool copy)
 		return false;
 	}
 
-
-
 	if(!Importer::book().count(ext))
 	{
 		get_ui_interface()->error(_("I don't know how to open images of this type -- ")+ext);
@@ -617,7 +623,7 @@ CanvasInterface::waypoint_remove(synfigapp::ValueDesc value_desc,synfig::Waypoin
 
 
 void
-CanvasInterface::auto_export(ValueNode::Handle value_node)
+CanvasInterface::auto_export(ValueNode::Handle /*value_node*/)
 {
 /*
 	// Check to see if we are already exported.
@@ -643,7 +649,7 @@ CanvasInterface::auto_export(ValueNode::Handle value_node)
 }
 
 void
-CanvasInterface::auto_export(const ValueDesc& value_desc)
+CanvasInterface::auto_export(const ValueDesc& /*value_desc*/)
 {
 	// THIS FUNCTION IS DEPRECATED, AND IS NOW A STUB.
 #if 0
@@ -821,10 +827,10 @@ CanvasInterface::seek_frame(int frames)
 	Time newtime(get_time()+(float)frames/fps);
 	newtime=newtime.round(fps);
 
-	if(newtime<=get_canvas()->rend_desc().get_frame_start())
-		newtime=get_canvas()->rend_desc().get_frame_start();
-	if(newtime>=get_canvas()->rend_desc().get_frame_end())
-		newtime=get_canvas()->rend_desc().get_frame_end();
+	if(newtime<=get_canvas()->rend_desc().get_time_start())
+		newtime=get_canvas()->rend_desc().get_time_start();
+	if(newtime>=get_canvas()->rend_desc().get_time_end())
+		newtime=get_canvas()->rend_desc().get_time_end();
 	set_time(newtime);
 }
 
@@ -843,7 +849,7 @@ CanvasInterface::seek_time(synfig::Time time)
 	}
 	if(time<=synfig::Time::begin())
 	{
-		set_time(get_canvas()->rend_desc().get_time_end());
+		set_time(get_canvas()->rend_desc().get_time_start());
 		return;
 	}