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

diff --git a/synfig-studio/trunk/src/gtkmm/render.cpp b/synfig-studio/trunk/src/gtkmm/render.cpp
index 43ea5b6..7b9e70d 100644
--- a/synfig-studio/trunk/src/gtkmm/render.cpp
+++ b/synfig-studio/trunk/src/gtkmm/render.cpp
@@ -38,6 +38,8 @@
 #include <synfig/canvas.h>
 #include "asyncrenderer.h"
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -55,7 +57,7 @@ using namespace studio;
 
 /* === M E T H O D S ======================================================= */
 
-RenderSettings::RenderSettings(Gtk::Window& parent,handle<synfigapp::CanvasInterface> canvas_interface):
+RenderSettings::RenderSettings(Gtk::Window& parent, etl::handle<synfigapp::CanvasInterface> canvas_interface):
 	Gtk::Dialog(_("Render Settings"),parent,false,true),
 	canvas_interface_(canvas_interface),
 	adjustment_quality(3,0,9),
@@ -175,7 +177,7 @@ RenderSettings::RenderSettings(Gtk::Window& parent,handle<synfigapp::CanvasInter
 	set_title(_("Render Settings")+String(" - ")+canvas_interface_->get_canvas()->get_name());
 
 
-	toggle_single_frame.set_active(true);
+	toggle_single_frame.set_active(false);
 	widget_rend_desc.disable_time_section();
 
 	set_entry_filename();
@@ -195,10 +197,12 @@ RenderSettings::set_entry_filename()
 	// 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";
 
@@ -229,7 +233,7 @@ void
 RenderSettings::on_choose_pressed()
 {
 	String filename=entry_filename.get_text();
-	if(App::dialog_save_file("Save Render As",filename))
+	if(App::dialog_save_file("Save Render As", filename, RENDER_DIR_PREFERENCE))
 		entry_filename.set_text(filename);
 }
 
@@ -237,6 +241,7 @@ void
 RenderSettings::on_render_pressed()
 {
 	String filename=entry_filename.get_text();
+	synfig::String calculated_target_name(target_name);
 
 	if(filename.empty())
 	{
@@ -246,7 +251,7 @@ 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
 		{
@@ -255,12 +260,12 @@ RenderSettings::on_render_pressed()
 			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());
+				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");
 			}
 		}
@@ -271,13 +276,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);
@@ -297,7 +302,7 @@ RenderSettings::on_render_pressed()
 	target->set_rend_desc(&rend_desc);
 	target->set_quality((int)adjustment_quality.get_value());
 	if( !target->init() ){
-		canvas_interface_->get_ui_interface()->error(_("Target initialisation failure"));
+		canvas_interface_->get_ui_interface()->error(_("Target initialization failure"));
 		return;
 	}