X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Fcanvasinterface.cpp;h=da1a802733c4887f60f2e32b60b747cfc2d049b4;hb=f83c48489a30958935cdab2e9f5b7c34bd72b390;hp=40d14df59b8a164123b20fa9649605ecb1e5c1bf;hpb=21b7221174dff900ae2f2bc2dd5987c717bab9a3;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
index 40d14df..da1a802 100644
--- a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
+++ b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
@@ -560,7 +560,7 @@ CanvasInterface::jump_to_prev_keyframe()
 }
 
 bool
-CanvasInterface::import(const synfig::String &filename, bool /*copy*/)
+CanvasInterface::import(const synfig::String &filename, synfig::String &errors, synfig::String &warnings, bool resize_image)
 {
 	Action::PassiveGrouper group(get_instance().get(),_("Import Image"));
 
@@ -579,16 +579,16 @@ CanvasInterface::import(const synfig::String &filename, bool /*copy*/)
 	// If this is a SIF file, then we need to do things slightly differently
 	if(ext=="sif" || ext=="sifz")try
 	{
-
-		Canvas::Handle outside_canvas(synfig::open_canvas(filename));
+		Canvas::Handle outside_canvas(synfig::open_canvas(filename, errors, warnings));
 		if(!outside_canvas)
-			throw String(_("Unable to open this composition"));
+			throw String(_("Unable to open this composition")) + ":\n\n" + errors;
 
 		Layer::Handle layer(add_layer_to("PasteCanvas",get_canvas()));
 		if(!layer)
 			throw String(_("Unable to create \"Paste Canvas\" layer"));
 		if(!layer->set_param("canvas",ValueBase(outside_canvas)))
 			throw int();
+		get_canvas()->register_external_canvas(filename, outside_canvas);
 
 		//layer->set_description(basename(filename));
 		signal_layer_new_description()(layer,filename);
@@ -596,7 +596,7 @@ CanvasInterface::import(const synfig::String &filename, bool /*copy*/)
 	}
 	catch(String x)
 	{
-		get_ui_interface()->error(x+" -- "+filename);
+		get_ui_interface()->error(filename + ": " + x);
 		return false;
 	}
 	catch(...)
@@ -623,22 +623,34 @@ CanvasInterface::import(const synfig::String &filename, bool /*copy*/)
 		h=layer->get_param("_height").get(int());
 		if(w&&h)
 		{
-			Vector size=ValueBase(get_canvas()->rend_desc().get_br()-get_canvas()->rend_desc().get_tl());
-			Vector x;
-			if(size[0]<size[1])
+			Vector x, size=ValueBase(get_canvas()->rend_desc().get_br()-get_canvas()->rend_desc().get_tl());
+
+			// vector from top left of canvas to bottom right
+			if (resize_image)
 			{
-				x[0]=size[0];
-				x[1]=size[0]/w*h;
-				if((size[0]<0) ^ (size[1]<0))
-					x[1]=-x[1];
+				if(abs(size[0])<abs(size[1]))	// if canvas is tall and thin
+				{
+					x[0]=size[0];	// use full width
+					x[1]=size[0]/w*h; // and scale for height
+					if((size[0]<0) ^ (size[1]<0))
+						x[1]=-x[1];
+				}
+				else				// else canvas is short and fat (or maybe square)
+				{
+					x[1]=size[1];	// use full height
+					x[0]=size[1]/h*w; // and scale for width
+					if((size[0]<0) ^ (size[1]<0))
+						x[0]=-x[0];
+				}
 			}
 			else
 			{
-				x[1]=size[1];
-				x[0]=size[1]/h*w;
-				if((size[0]<0) ^ (size[1]<0))
-					x[0]=-x[0];
+				x[0] = w/60.0;
+				x[1] = h/60.0;
+				if((size[0]<0)) x[0]=-x[0];
+				if((size[1]<0)) x[1]=-x[1];
 			}
+
 			if(!layer->set_param("tl",ValueBase(-x/2)))
 				throw int();
 			if(!layer->set_param("br",ValueBase(x/2)))