X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Frender.cpp;h=43ea5b6d82accc4cd8ee7fcd6197d7e09b00b344;hb=78af29bd0ee6cf83e3fbfb569d81e178dd2203fe;hp=0ee1423d31bc1b193df636f4924f8d97e8a8fc84;hpb=c34eaa5441242b3e9a7b7645e9ee4983d14eae85;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/render.cpp b/synfig-studio/trunk/src/gtkmm/render.cpp
index 0ee1423..43ea5b6 100644
--- a/synfig-studio/trunk/src/gtkmm/render.cpp
+++ b/synfig-studio/trunk/src/gtkmm/render.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
-/*!	\file render.cpp
+/*!	\file gtkmm/render.cpp
 **	\brief Template File
 **
-**	$Id: render.cpp,v 1.2 2005/01/10 08:13:44 darco Exp $
+**	$Id$
 **
 **	\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
@@ -177,22 +178,39 @@ RenderSettings::RenderSettings(Gtk::Window& parent,handle<synfigapp::CanvasInter
 	toggle_single_frame.set_active(true);
 	widget_rend_desc.disable_time_section();
 
+	set_entry_filename();
+
+	get_vbox()->show_all();
+}
+
+RenderSettings::~RenderSettings()
+{
+}
+
+void
+RenderSettings::set_entry_filename()
+{
+	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();
+	if (!canvas->is_root())
+		if(canvas->get_name().empty())
+			filename+=" ("+canvas->get_id()+')';
+		else
+			filename+=" ("+canvas->get_name()+')';
+
+	filename += ".png";
 
 	try
 	{
-		entry_filename.set_text(Glib::build_filename(Glib::get_home_dir(),Glib::ustring("Desktop")+ETL_DIRECTORY_SEPERATOR+Glib::ustring("output.png")));
+		entry_filename.set_text((filename));
 	}
 	catch(...)
 	{
 		synfig::warning("Averted crash!");
 		entry_filename.set_text("output.png");
 	}
-
-	get_vbox()->show_all();
-}
-
-RenderSettings::~RenderSettings()
-{
 }
 
 void
@@ -211,7 +229,7 @@ void
 RenderSettings::on_choose_pressed()
 {
 	String filename=entry_filename.get_text();
-	if(App::dialog_saveas_file("Save Render As",filename))
+	if(App::dialog_save_file("Save Render As",filename))
 		entry_filename.set_text(filename);
 }
 
@@ -232,11 +250,19 @@ RenderSettings::on_render_pressed()
 	{
 		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];
+				synfig::info("'%s' is a known extension - using target '%s'", ext.c_str(), target_name.c_str());
+			}
 			else
+			{
 				target_name=ext;
+				synfig::info("unknown extension");
+			}
 		}
 		catch(std::runtime_error x)
 		{
@@ -294,7 +320,7 @@ RenderSettings::on_render_pressed()
 	}
 
 	// Success!
-	canvas_interface_->get_ui_interface()->task(filename+_(" rendered sucessfuly"));
+	canvas_interface_->get_ui_interface()->task(filename+_(" rendered successfully"));
 	canvas_interface_->get_ui_interface()->amount_complete(0,10000);
 	*/
 	return;
@@ -303,7 +329,7 @@ RenderSettings::on_render_pressed()
 void
 RenderSettings::on_finished()
 {
-	canvas_interface_->get_ui_interface()->task(_("File rendered sucessfuly"));
+	canvas_interface_->get_ui_interface()->task(_("File rendered successfully"));
 	canvas_interface_->get_ui_interface()->amount_complete(0,10000);
 }