projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The text layer fix in r965 caused the text in this icon to render upside down. That...
[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
95d7df4
..
6c048b2
100644
(file)
--- a/
synfig-studio/trunk/src/synfigapp/instance.cpp
+++ b/
synfig-studio/trunk/src/synfigapp/instance.cpp
@@
-2,10
+2,11
@@
/*! \file synfigapp/instance.cpp
** \brief Instance
**
/*! \file synfigapp/instance.cpp
** \brief Instance
**
-** $Id
: instance.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp
$
+** $Id$
**
** \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
**
** 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
@@
-39,6
+40,8
@@
#include <synfig/valuenode_reference.h>
#include <map>
#include <synfig/valuenode_reference.h>
#include <map>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-60,7
+63,6
@@
bool
synfigapp::is_editable(synfig::ValueNode::Handle value_node)
{
if(ValueNode_Const::Handle::cast_dynamic(value_node)
synfigapp::is_editable(synfig::ValueNode::Handle value_node)
{
if(ValueNode_Const::Handle::cast_dynamic(value_node)
- || ValueNode_TimedSwap::Handle::cast_dynamic(value_node)
|| ValueNode_Animated::Handle::cast_dynamic(value_node)
|| ValueNode_Composite::Handle::cast_dynamic(value_node)
|| ValueNode_RadialComposite::Handle::cast_dynamic(value_node)
|| ValueNode_Animated::Handle::cast_dynamic(value_node)
|| ValueNode_Composite::Handle::cast_dynamic(value_node)
|| ValueNode_RadialComposite::Handle::cast_dynamic(value_node)
@@
-149,18
+151,6
@@
Instance::save()const
}
bool
}
bool
-Instance::save_as(const std::string &file_name)const
-{
- bool ret=save_canvas(file_name,canvas_);
- if(ret)
- {
- reset_action_count();
- const_cast<sigc::signal<void>& >(signal_saved_)();
- }
- return ret;
-}
-
-bool
Instance::save_as(const std::string &file_name)
{
bool ret;
Instance::save_as(const std::string &file_name)
{
bool ret;
@@
-177,9
+167,7
@@
Instance::save_as(const std::string &file_name)
signal_saved_();
}
else
signal_saved_();
}
else
- {
set_file_name(old_file_name);
set_file_name(old_file_name);
- }
signal_filename_changed_();
signal_filename_changed_();