X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Flyr_std%2Fimport.cpp;h=442521d8ad039f26eb3c64105e3d9910763e5fec;hb=c99d377aa4707033745107db74afdb83adea9a59;hp=ca5ab2e11ec723c46f8bd10cd1ac60266db31cb7;hpb=21bfc670b83d4c45da9ed1b95063b7e6a007168c;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/lyr_std/import.cpp b/synfig-core/trunk/src/modules/lyr_std/import.cpp
index ca5ab2e..442521d 100644
--- a/synfig-core/trunk/src/modules/lyr_std/import.cpp
+++ b/synfig-core/trunk/src/modules/lyr_std/import.cpp
@@ -1,8 +1,10 @@
-/*! ========================================================================
-** Synfig
-** Image Import Layer Implementation
-** $Id: import.cpp,v 1.2 2005/03/19 04:26:42 darco Exp $
+/* === S Y N F I G ========================================================= */
+/*!	\file import.cpp
+**	\brief Image Import Layer Implementation
 **
+**	$Id$
+**
+**	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
 **	This package is free software; you can redistribute it and/or
@@ -14,6 +16,7 @@
 **	but WITHOUT ANY WARRANTY; without even the implied warranty of
 **	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 **	General Public License for more details.
+**	\endlegal
 **
 ** === N O T E S ===========================================================
 **
@@ -51,10 +54,10 @@ using namespace etl;
 
 SYNFIG_LAYER_INIT(Import);
 SYNFIG_LAYER_SET_NAME(Import,"import");
-SYNFIG_LAYER_SET_LOCAL_NAME(Import,_("Import"));
+SYNFIG_LAYER_SET_LOCAL_NAME(Import,_("Import Image"));
 SYNFIG_LAYER_SET_CATEGORY(Import,_("Other"));
 SYNFIG_LAYER_SET_VERSION(Import,"0.1");
-SYNFIG_LAYER_SET_CVS_ID(Import,"$Id: import.cpp,v 1.2 2005/03/19 04:26:42 darco Exp $");
+SYNFIG_LAYER_SET_CVS_ID(Import,"$Id$");
 
 /* === P R O C E D U R E S ================================================= */
 
@@ -80,7 +83,7 @@ Import::set_param(const String & param, const ValueBase &value)
 {
 	try{
 	IMPORT(time_offset);
-	if(param=="filename" && value.same_as(filename))
+	if(param=="filename" && value.same_type_as(filename))
 	{
 		if(!get_canvas())
 		{
@@ -89,29 +92,29 @@ Import::set_param(const String & param, const ValueBase &value)
 			surface.clear();
 			return true;
 		}
-		
+
 		String newfilename=value.get(string());
 		String filename_with_path;
-		
+
 		// Get rid of any %20 crap
 		{
-			unsigned int n;
+			String::size_type n;
 			while((n=newfilename.find("%20"))!=String::npos)
 				newfilename.replace(n,3," ");
 		}
-		
+
 		//if(get_canvas()->get_file_path()==dirname(newfilename))
 		//{
 		//	synfig::info("Image seems to be in local directory. Adjusting path...");
 		//	newfilename=basename(newfilename);
 		//}
-		
+
 #ifndef WIN32
 		if(is_absolute_path(newfilename))
 		{
 			string curpath(cleanup_path(absolute_path(get_canvas()->get_file_path())));
 			while(basename(curpath)==".")curpath=dirname(curpath);
-				
+
 			newfilename=relative_path(curpath,newfilename);
 			synfig::info("basename(curpath)=%s, Path adjusted to %s",basename(curpath).c_str(),newfilename.c_str());
 		}
@@ -127,28 +130,28 @@ Import::set_param(const String & param, const ValueBase &value)
 			surface.clear();
 			return true;
 		}
-		
+
 		// If we are already loaded, don't reload
 		if(filename==newfilename && importer)
 		{
 			synfig::warning(strprintf(_("Filename seems to already be set to \"%s\" (%s)"),filename.c_str(),newfilename.c_str()));
 			return true;
 		}
-		
+
 		assert(get_canvas());
-		
+
 		if(is_absolute_path(newfilename))
 			filename_with_path=newfilename;
 		else
-			filename_with_path=get_canvas()->get_file_path()+ETL_DIRECTORY_SEPERATOR+newfilename;
-			
+			filename_with_path=get_canvas()->get_file_path()+ETL_DIRECTORY_SEPARATOR+newfilename;
+
 		handle<Importer> newimporter;
-		
+
 		newimporter=Importer::open(absolute_path(filename_with_path));
 
 		if(!newimporter)
 		{
-			newimporter=Importer::open(get_canvas()->get_file_path()+ETL_DIRECTORY_SEPERATOR+basename(newfilename));
+			newimporter=Importer::open(get_canvas()->get_file_path()+ETL_DIRECTORY_SEPARATOR+basename(newfilename));
 			if(!newimporter)
 			{
 				synfig::error(strprintf("Unable to create an importer object with file \"%s\"",filename_with_path.c_str()));
@@ -166,11 +169,11 @@ Import::set_param(const String & param, const ValueBase &value)
 		importer=newimporter;
 		filename=newfilename;
 		abs_filename=absolute_path(filename_with_path);
-		
+
 		return true;
 	}
 	} catch(...) { set_amount(0); return false; }
-	
+
 	return Layer_Bitmap::set_param(param,value);
 }
 
@@ -192,15 +195,15 @@ Import::get_param(const String & param)const
 
 	EXPORT_NAME();
 	EXPORT_VERSION();
-		
-	return Layer_Bitmap::get_param(param);	
+
+	return Layer_Bitmap::get_param(param);
 }
 
 Layer::Vocab
 Import::get_param_vocab()const
 {
 	Layer::Vocab ret(Layer_Bitmap::get_param_vocab());
-	
+
 	ret.push_back(ParamDesc("filename")
 		.set_local_name(_("Filename"))
 		.set_description(_("File to import"))
@@ -209,7 +212,7 @@ Import::get_param_vocab()const
 	ret.push_back(ParamDesc("time_offset")
 		.set_local_name(_("Time Offset"))
 	);
-	
+
 	return ret;
 }