projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make link_name(), link_local_name, and get_link_index_from_name non pure virtual...
[synfig.git]
/
synfig-core
/
src
/
synfig
/
layer_pastecanvas.cpp
diff --git
a/synfig-core/src/synfig/layer_pastecanvas.cpp
b/synfig-core/src/synfig/layer_pastecanvas.cpp
index
1eea2e9
..
2181a83
100644
(file)
--- a/
synfig-core/src/synfig/layer_pastecanvas.cpp
+++ b/
synfig-core/src/synfig/layer_pastecanvas.cpp
@@
-87,17
+87,14
@@
Layer_PasteCanvas::Layer_PasteCanvas():
depth(0),
zoom(0),
time_offset(0),
depth(0),
zoom(0),
time_offset(0),
- extra_reference(false),
- origin_static(false),
- focus_static(false),
- canvas_static(false),
- zoom_static(false),
- offset_static(false),
- children_lock_static(true)
+ extra_reference(false)
{
children_lock=false;
muck_with_time_=true;
curr_time=Time::begin();
{
children_lock=false;
muck_with_time_=true;
curr_time=Time::begin();
+ Layer::Vocab voc(get_param_vocab());
+ Layer::fill_static(voc);
+ set_param_static("children_lock", true);
}
Layer_PasteCanvas::~Layer_PasteCanvas()
}
Layer_PasteCanvas::~Layer_PasteCanvas()
@@
-145,10
+142,12
@@
Layer_PasteCanvas::get_param_vocab()const
ret.push_back(ParamDesc("time_offset")
.set_local_name(_("Time Offset"))
ret.push_back(ParamDesc("time_offset")
.set_local_name(_("Time Offset"))
+ .set_description(_("Time Offset to apply to the context"))
);
ret.push_back(ParamDesc("children_lock")
.set_local_name(_("Children Lock"))
);
ret.push_back(ParamDesc("children_lock")
.set_local_name(_("Children Lock"))
+ .set_description(_("When checked prevents to select the children using the mouse click"))
);
ret.push_back(ParamDesc("focus")
);
ret.push_back(ParamDesc("focus")
@@
-576,13
+575,6
@@
void Layer_PasteCanvas::get_times_vfunc(Node::time_set &set) const
bool
Layer_PasteCanvas::set_param_static(const String ¶m, const bool x)
{
bool
Layer_PasteCanvas::set_param_static(const String ¶m, const bool x)
{
- SET_STATIC(origin, x)
- SET_STATIC(focus, x)
- SET_STATIC(canvas, x)
- SET_STATIC(zoom, x)
- SET_STATIC(time_offset, x)
- SET_STATIC(children_lock, x)
-
return Layer_Composite::set_param_static(param, x);
}
return Layer_Composite::set_param_static(param, x);
}
@@
-590,12
+582,5
@@
Layer_PasteCanvas::set_param_static(const String ¶m, const bool x)
bool
Layer_PasteCanvas::get_param_static(const String ¶m) const
{
bool
Layer_PasteCanvas::get_param_static(const String ¶m) const
{
- GET_STATIC(origin)
- GET_STATIC(focus)
- GET_STATIC(canvas)
- GET_STATIC(zoom)
- GET_STATIC(time_offset)
- GET_STATIC(children_lock)
-
return Layer_Composite::get_param_static(param);
}
return Layer_Composite::get_param_static(param);
}