X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Flyr_std%2Fimport.cpp;h=3fd781a73d34ebba1f9e34732a9f72d1af491116;hb=fa569546257fc9ef11a6774f514d5abe9cf09542;hp=f6dae6c59e43f414411501983f5e285543d72f3c;hpb=97e3e97762a5163aca7feecf86b300d27b6977de;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 f6dae6c..3fd781a 100644 --- a/synfig-core/trunk/src/modules/lyr_std/import.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/import.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 @@ -54,7 +55,7 @@ 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$"); @@ -83,7 +84,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()) { @@ -143,7 +144,7 @@ Import::set_param(const String & param, const ValueBase &value) 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 newimporter; @@ -151,7 +152,7 @@ Import::set_param(const String & param, const ValueBase &value) 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()));