projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated Synfig Studio French translation. Thanks to Rore
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
synfigapp
/
instance.cpp
diff --git
a/synfig-studio/trunk/src/synfigapp/instance.cpp
b/synfig-studio/trunk/src/synfigapp/instance.cpp
index
fd62d75
..
92fd239
100644
(file)
--- a/
synfig-studio/trunk/src/synfigapp/instance.cpp
+++ b/
synfig-studio/trunk/src/synfigapp/instance.cpp
@@
-6,6
+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, 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
@@
-37,8
+38,13
@@
#include <synfig/valuenode_composite.h>
#include <synfig/valuenode_radialcomposite.h>
#include <synfig/valuenode_reference.h>
#include <synfig/valuenode_composite.h>
#include <synfig/valuenode_radialcomposite.h>
#include <synfig/valuenode_reference.h>
+#include <synfig/valuenode_blinecalctangent.h>
+#include <synfig/valuenode_blinecalcvertex.h>
+#include <synfig/valuenode_blinecalcwidth.h>
#include <map>
#include <map>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-64,6
+70,9
@@
synfigapp::is_editable(synfig::ValueNode::Handle value_node)
|| ValueNode_Composite::Handle::cast_dynamic(value_node)
|| ValueNode_RadialComposite::Handle::cast_dynamic(value_node)
|| ValueNode_Reference::Handle::cast_dynamic(value_node)
|| ValueNode_Composite::Handle::cast_dynamic(value_node)
|| ValueNode_RadialComposite::Handle::cast_dynamic(value_node)
|| ValueNode_Reference::Handle::cast_dynamic(value_node)
+ || ValueNode_BLineCalcVertex::Handle::cast_dynamic(value_node)
+ || ValueNode_BLineCalcTangent::Handle::cast_dynamic(value_node)
+ || ValueNode_BLineCalcWidth::Handle::cast_dynamic(value_node)
)
return true;
return false;
)
return true;
return false;
@@
-79,7
+88,7
@@
synfigapp::find_instance(etl::handle<synfig::Canvas> canvas)
/* === M E T H O D S ======================================================= */
/* === M E T H O D S ======================================================= */
-Instance::Instance(
Canvas::Handle
canvas):
+Instance::Instance(
etl::handle<synfig::Canvas>
canvas):
CVSInfo(canvas->get_file_name()),
canvas_(canvas)
{
CVSInfo(canvas->get_file_name()),
canvas_(canvas)
{
@@
-91,7
+100,7
@@
Instance::Instance(Canvas::Handle canvas):
} // END of synfigapp::Instance::Instance()
handle<Instance>
} // END of synfigapp::Instance::Instance()
handle<Instance>
-Instance::create(
Canvas::Handle
canvas)
+Instance::create(
etl::handle<synfig::Canvas>
canvas)
{
// Construct a new instance
handle<Instance> instance(new Instance(canvas));
{
// Construct a new instance
handle<Instance> instance(new Instance(canvas));
@@
-115,11
+124,13
@@
Instance::set_file_name(const synfig::String &name)
Instance::~Instance()
{
instance_map_.erase(canvas_);
Instance::~Instance()
{
instance_map_.erase(canvas_);
- synfig::info("studio::Instance::~Instance(): Deleted");
-} // END of studio::Instance::~Instance()
+
+ if (getenv("SYNFIG_DEBUG_DESTRUCTORS"))
+ synfig::info("Instance::~Instance(): Deleted");
+}
handle<CanvasInterface>
handle<CanvasInterface>
-Instance::find_canvas_interface(
handle<Canvas>
canvas)
+Instance::find_canvas_interface(
synfig::Canvas::Handle
canvas)
{
if(!canvas)
return 0;
{
if(!canvas)
return 0;
@@
-148,7
+159,7
@@
Instance::save()const
}
bool
}
bool
-Instance::save_as(const s
td::s
tring &file_name)
+Instance::save_as(const s
ynfig::S
tring &file_name)
{
bool ret;
{
bool ret;