X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Frender.cpp;h=6ce562e3fda37a26ebf30486ce435f42460b3e14;hb=82e842447ea3effc0a57ec6d2ed088f7e882e44c;hp=4a5a4b64686f9ad3e6000804e2bec88df7c01988;hpb=7d58afa900b7d7792de3bf09c3b32aa4313ff4cb;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/render.cpp b/synfig-studio/trunk/src/gtkmm/render.cpp
index 4a5a4b6..6ce562e 100644
--- a/synfig-studio/trunk/src/gtkmm/render.cpp
+++ b/synfig-studio/trunk/src/gtkmm/render.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
@@ -189,12 +190,7 @@ RenderSettings::~RenderSettings()
 void
 RenderSettings::set_entry_filename()
 {
-	String filename(canvas_interface_->get_canvas()->get_file_name());
-
-	// if the basename of the filename has an extension, remove it
-	String base = basename(filename);
-	if(find(base.begin(),base.end(),'.')!=base.end())
-		filename = String(filename.begin(), filename.begin()+filename.find_last_of('.'));
+	String filename(filename_sans_extension(canvas_interface_->get_canvas()->get_file_name()));
 
 	// if this isn't the root canvas, append (<canvasname>) to the filename
 	etl::handle<synfig::Canvas> canvas = canvas_interface_->get_canvas();
@@ -241,6 +237,7 @@ void
 RenderSettings::on_render_pressed()
 {
 	String filename=entry_filename.get_text();
+	synfig::String calculated_target_name(target_name);
 
 	if(filename.empty())
 	{
@@ -250,15 +247,23 @@ RenderSettings::on_render_pressed()
 
 	// If the target type is not yet defined,
 	// try to figure it out from the outfile.
-	if(target_name.empty())
+	if(calculated_target_name.empty())
 	{
 		try
 		{
-			String ext=String(find(filename.begin(),filename.end(),'.')+1,filename.end());
+			String ext(filename_extension(filename));
+			if (ext.size()) ext=ext.substr(1); // skip initial '.'
+			synfig::info("render target filename: '%s'; extension: '%s'", filename.c_str(), ext.c_str());
 			if(Target::ext_book().count(ext))
-				target_name=Target::ext_book()[ext];
+			{
+				calculated_target_name=Target::ext_book()[ext];
+				synfig::info("'%s' is a known extension - using target '%s'", ext.c_str(), calculated_target_name.c_str());
+			}
 			else
-				target_name=ext;
+			{
+				calculated_target_name=ext;
+				synfig::info("unknown extension");
+			}
 		}
 		catch(std::runtime_error x)
 		{
@@ -267,13 +272,13 @@ RenderSettings::on_render_pressed()
 		}
 	}
 
-	if(filename.empty() && target_name!="null")
+	if(filename.empty() && calculated_target_name!="null")
 	{
 		canvas_interface_->get_ui_interface()->error(_("A filename is required for this target"));
 		return;
 	}
 
-	Target::Handle target=Target::create(target_name,filename);
+	Target::Handle target=Target::create(calculated_target_name,filename);
 	if(!target)
 	{
 		canvas_interface_->get_ui_interface()->error(_("Unable to create target for ")+filename);