Typo: 'pf' -> 'of'.

[synfig.git] / synfig-studio / trunk / src / synfigapp / canvasinterface.cpp

diff --git a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
index 9b1f6a9..030fb87 100644 (file)
--- 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
@@ -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);
 }