projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor fix
[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
9328b2b
..
ac6e907
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/render.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/render.cpp
@@
-1,20
+1,21
@@
-/* === S
I N F G ==
========================================================= */
+/* === S
Y N F I G
========================================================= */
/*! \file render.cpp
** \brief Template File
**
** $Id: render.cpp,v 1.2 2005/01/10 08:13:44 darco Exp $
**
** \legal
/*! \file render.cpp
** \brief Template File
**
** $Id: render.cpp,v 1.2 2005/01/10 08:13:44 darco Exp $
**
** \legal
-** Copyright (c) 2002
Robert B. Quattlebaum Jr.
+** Copyright (c) 2002
-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
**
-** This software and associated documentation
-** are CONFIDENTIAL and PROPRIETARY property of
-** the above-mentioned copyright holder.
+** This package is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License as
+** published by the Free Software Foundation; either version 2 of
+** the License, or (at your option) any later version.
**
**
-**
You may not copy, print, publish, or in any
-**
other way distribute this software without
-**
a prior written agreement with
-**
the copyright holder
.
+**
This package is distributed in the hope that it will be useful,
+**
but WITHOUT ANY WARRANTY; without even the implied warranty of
+**
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**
General Public License for more details
.
** \endlegal
*/
/* ========================================================================= */
** \endlegal
*/
/* ========================================================================= */
@@
-31,8
+32,8
@@
#include "render.h"
#include "app.h"
#include <gtkmm/frame.h>
#include "render.h"
#include "app.h"
#include <gtkmm/frame.h>
-#include <s
inf
g/target_scanline.h>
-#include <s
inf
g/canvas.h>
+#include <s
ynfi
g/target_scanline.h>
+#include <s
ynfi
g/canvas.h>
#include "asyncrenderer.h"
#endif
#include "asyncrenderer.h"
#endif
@@
-41,7
+42,7
@@
using namespace std;
using namespace etl;
using namespace std;
using namespace etl;
-using namespace s
inf
g;
+using namespace s
ynfi
g;
using namespace studio;
/* === M A C R O S ========================================================= */
using namespace studio;
/* === M A C R O S ========================================================= */
@@
-52,7
+53,7
@@
using namespace studio;
/* === M E T H O D S ======================================================= */
/* === M E T H O D S ======================================================= */
-RenderSettings::RenderSettings(Gtk::Window& parent,handle<s
inf
gapp::CanvasInterface> canvas_interface):
+RenderSettings::RenderSettings(Gtk::Window& parent,handle<s
ynfi
gapp::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),
@@
-73,8
+74,8
@@
RenderSettings::RenderSettings(Gtk::Window& parent,handle<sinfgapp::CanvasInterf
sigc::bind(sigc::mem_fun(*this,&RenderSettings::set_target),String())
));
sigc::bind(sigc::mem_fun(*this,&RenderSettings::set_target),String())
));
- s
inf
g::Target::Book::iterator iter;
- s
infg::Target::Book book(sinf
g::Target::book());
+ s
ynfi
g::Target::Book::iterator iter;
+ s
ynfig::Target::Book book(synfi
g::Target::book());
for(iter=book.begin();iter!=book.end();iter++)
{
for(iter=book.begin();iter!=book.end();iter++)
{
@@
-144,11
+145,11
@@
RenderSettings::RenderSettings(Gtk::Window& parent,handle<sinfgapp::CanvasInterf
try
{
try
{
- entry_filename.set_text(Glib::build_filename(Glib::get_home_dir(),
"Desktop/output.png"
));
+ entry_filename.set_text(Glib::build_filename(Glib::get_home_dir(),
Glib::ustring("Desktop")+ETL_DIRECTORY_SEPERATOR+Glib::ustring("output.png")
));
}
catch(...)
{
}
catch(...)
{
- s
inf
g::warning("Averted crash!");
+ s
ynfi
g::warning("Averted crash!");
entry_filename.set_text("output.png");
}
entry_filename.set_text("output.png");
}
@@
-166,7
+167,7
@@
RenderSettings::on_rend_desc_changed()
}
void
}
void
-RenderSettings::set_target(s
inf
g::String name)
+RenderSettings::set_target(s
ynfi
g::String name)
{
target_name=name;
}
{
target_name=name;
}