projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initialise the GUID for all Transform objects. Using random GUID values was causing...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
canvasview.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index
0973da6
..
3154ae4
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@
-2173,7
+2173,7
@@
CanvasView::build_tables()
void
CanvasView::on_layer_toggle(synfig::Layer::Handle layer)
{
void
CanvasView::on_layer_toggle(synfig::Layer::Handle layer)
{
- synfigapp::Action::Handle action(synfigapp::Action::create("
layer_a
ctivate"));
+ synfigapp::Action::Handle action(synfigapp::Action::create("
LayerA
ctivate"));
assert(action);
if(!action)
assert(action);
if(!action)
@@
-2842,12
+2842,12
@@
CanvasView::rebuild_ducks_layer_(synfig::TransformStack& transform_stack, synfig
Vector origin(layer->get_param("origin").get(Vector()));
Canvas::Handle child_canvas(layer->get_param("canvas").get(Canvas::Handle()));
Vector origin(layer->get_param("origin").get(Vector()));
Canvas::Handle child_canvas(layer->get_param("canvas").get(Canvas::Handle()));
- Vector focus(
child_canvas->rend_desc().get_focus(
));
+ Vector focus(
layer->get_param("focus").get(Vector()
));
if(!scale.is_equal_to(Vector(1,1)))
if(!scale.is_equal_to(Vector(1,1)))
- transform_stack.push(new Transform_Scale(scale,origin+focus));
+ transform_stack.push(new Transform_Scale(
layer->get_guid(),
scale,origin+focus));
if(!origin.is_equal_to(Vector(0,0)))
if(!origin.is_equal_to(Vector(0,0)))
- transform_stack.push(new Transform_Translate(origin));
+ transform_stack.push(new Transform_Translate(
layer->get_guid(),
origin));
rebuild_ducks_layer_(transform_stack,child_canvas,selected_list);
rebuild_ducks_layer_(transform_stack,child_canvas,selected_list);
@@
-3195,7
+3195,7
@@
set_waypoint_model(std::set<synfig::Waypoint, std::less<UniqueID> > waypoints,
Waypoint waypoint(*iter);
waypoint.apply_model(model);
Waypoint waypoint(*iter);
waypoint.apply_model(model);
- synfigapp::Action::Handle action(synfigapp::Action::create("
waypoint_s
et"));
+ synfigapp::Action::Handle action(synfigapp::Action::create("
WaypointS
et"));
assert(action);
assert(action);
@@
-3371,7
+3371,7
@@
CanvasView::on_waypoint_changed()
param_list.add("waypoint",waypoint_dialog.get_waypoint());
// param_list.add("time",canvas_interface()->get_time());
param_list.add("waypoint",waypoint_dialog.get_waypoint());
// param_list.add("time",canvas_interface()->get_time());
- get_instance()->process_action("
waypoint_set_s
mart", param_list);
+ get_instance()->process_action("
WaypointSetS
mart", param_list);
}
void
}
void
@@
-3384,7
+3384,7
@@
CanvasView::on_waypoint_delete()
param_list.add("waypoint",waypoint_dialog.get_waypoint());
// param_list.add("time",canvas_interface()->get_time());
param_list.add("waypoint",waypoint_dialog.get_waypoint());
// param_list.add("time",canvas_interface()->get_time());
- get_instance()->process_action("
waypoint_r
emove", param_list);
+ get_instance()->process_action("
WaypointR
emove", param_list);
}
void
}
void
@@
-3408,7
+3408,7
@@
CanvasView::on_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& con
if(!layer->set_param("text",ValueBase(selection_data)))
break;
if(!layer->set_param("text",ValueBase(selection_data)))
break;
- synfigapp::Action::Handle action(synfigapp::Action::create("
layer_a
dd"));
+ synfigapp::Action::Handle action(synfigapp::Action::create("
LayerA
dd"));
assert(action);
if(!action)
assert(action);
if(!action)
@@
-3493,7
+3493,7
@@
CanvasView::on_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& con
void
CanvasView::on_keyframe_add_pressed()
{
void
CanvasView::on_keyframe_add_pressed()
{
- synfigapp::Action::Handle action(synfigapp::Action::create("
keyframe_a
dd"));
+ synfigapp::Action::Handle action(synfigapp::Action::create("
KeyframeA
dd"));
if(!action)
{
if(!action)
{
@@
-3521,7
+3521,7
@@
CanvasView::on_keyframe_duplicate_pressed()
}
keyframe=row[model.keyframe];
}
keyframe=row[model.keyframe];
- synfigapp::Action::Handle action(synfigapp::Action::create("
keyframe_d
uplicate"));
+ synfigapp::Action::Handle action(synfigapp::Action::create("
KeyframeD
uplicate"));
if(!action)
{
if(!action)
{
@@
-3550,7
+3550,7
@@
CanvasView::on_keyframe_remove_pressed()
}
keyframe=row[model.keyframe];
}
keyframe=row[model.keyframe];
- synfigapp::Action::Handle action(synfigapp::Action::create("
keyframe_r
emove"));
+ synfigapp::Action::Handle action(synfigapp::Action::create("
KeyframeR
emove"));
if(!action)
{
if(!action)
{