projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidying.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
render.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/render.cpp
b/synfig-studio/trunk/src/gtkmm/render.cpp
index
43ea5b6
..
4696a47
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/render.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/render.cpp
@@
-6,7
+6,7
@@
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-** Copyright (c) 2007 Chris Moore
+** Copyright (c) 2007
, 2008
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
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-38,6
+38,8
@@
#include <synfig/canvas.h>
#include "asyncrenderer.h"
#include <synfig/canvas.h>
#include "asyncrenderer.h"
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-55,7
+57,7
@@
using namespace studio;
/* === M E T H O D S ======================================================= */
/* === 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),
Gtk::Dialog(_("Render Settings"),parent,false,true),
canvas_interface_(canvas_interface),
adjustment_quality(3,0,9),
@@
-174,9
+176,8
@@
RenderSettings::RenderSettings(Gtk::Window& parent,handle<synfigapp::CanvasInter
set_title(_("Render Settings")+String(" - ")+canvas_interface_->get_canvas()->get_name());
set_title(_("Render Settings")+String(" - ")+canvas_interface_->get_canvas()->get_name());
-
- toggle_single_frame.set_active(true);
- widget_rend_desc.disable_time_section();
+ toggle_single_frame.set_active(false);
+ widget_rend_desc.enable_time_section();
set_entry_filename();
set_entry_filename();
@@
-195,10
+196,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 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()+')';
if(canvas->get_name().empty())
filename+=" ("+canvas->get_id()+')';
else
filename+=" ("+canvas->get_name()+')';
+ }
filename += ".png";
filename += ".png";
@@
-229,7
+232,7
@@
void
RenderSettings::on_choose_pressed()
{
String filename=entry_filename.get_text();
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);
}
entry_filename.set_text(filename);
}
@@
-237,6
+240,7
@@
void
RenderSettings::on_render_pressed()
{
String filename=entry_filename.get_text();
RenderSettings::on_render_pressed()
{
String filename=entry_filename.get_text();
+ synfig::String calculated_target_name(target_name);
if(filename.empty())
{
if(filename.empty())
{
@@
-246,7
+250,7
@@
RenderSettings::on_render_pressed()
// If the target type is not yet defined,
// try to figure it out from the outfile.
// 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
{
{
try
{
@@
-255,12
+259,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))
{
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
{
}
else
{
- target_name=ext;
+
calculated_
target_name=ext;
synfig::info("unknown extension");
}
}
synfig::info("unknown extension");
}
}
@@
-271,13
+275,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;
}
{
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);
if(!target)
{
canvas_interface_->get_ui_interface()->error(_("Unable to create target for ")+filename);
@@
-297,7
+301,7
@@
RenderSettings::on_render_pressed()
target->set_rend_desc(&rend_desc);
target->set_quality((int)adjustment_quality.get_value());
if( !target->init() ){
target->set_rend_desc(&rend_desc);
target->set_quality((int)adjustment_quality.get_value());
if( !target->init() ){
- canvas_interface_->get_ui_interface()->error(_("Target initiali
s
ation failure"));
+ canvas_interface_->get_ui_interface()->error(_("Target initiali
z
ation failure"));
return;
}
return;
}