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 b2263f6..3154ae4 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -1980,6 +1980,18 @@ CanvasView::refresh_rend_desc()
        }
 
        //clamp time to big bounds...
+       if(time_window_adjustment().get_value() < begin_time)
+       {
+               time_window_adjustment().set_value(begin_time);
+               time_window_adjustment().value_changed();
+       }
+
+       if(time_window_adjustment().get_value() + time_window_adjustment().get_page_size() > end_time)
+       {
+               time_window_adjustment().set_value(end_time - time_window_adjustment().get_page_size());
+               time_window_adjustment().value_changed();
+       }
+
        if(time_adjustment().get_value() < begin_time)
        {
                time_adjustment().set_value(begin_time);
@@ -2161,7 +2173,7 @@ CanvasView::build_tables()
 void
 CanvasView::on_layer_toggle(synfig::Layer::Handle layer)
 {
-       synfigapp::Action::Handle action(synfigapp::Action::create("layer_activate"));
+       synfigapp::Action::Handle action(synfigapp::Action::create("LayerActivate"));
        assert(action);
 
        if(!action)
@@ -2830,15 +2842,16 @@ 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 focus(layer->get_param("focus").get(Vector()));
 
                        if(!scale.is_equal_to(Vector(1,1)))
-                               transform_stack.push(new Transform_Scale(scale,origin));
-                       if(!scale.is_equal_to(Vector(0,0)))
-                               transform_stack.push(new Transform_Translate(origin));
+                               transform_stack.push(new Transform_Scale(layer->get_guid(), scale,origin+focus));
+                       if(!origin.is_equal_to(Vector(0,0)))
+                               transform_stack.push(new Transform_Translate(layer->get_guid(), origin));
 
                        rebuild_ducks_layer_(transform_stack,child_canvas,selected_list);
 
-                       if(!scale.is_equal_to(Vector(0,0)))
+                       if(!origin.is_equal_to(Vector(0,0)))
                                transform_stack.pop();
                        if(!scale.is_equal_to(Vector(1,1)))
                                transform_stack.pop();
@@ -3182,7 +3195,7 @@ set_waypoint_model(std::set<synfig::Waypoint, std::less<UniqueID> > waypoints,
                Waypoint waypoint(*iter);
                waypoint.apply_model(model);
 
-               synfigapp::Action::Handle action(synfigapp::Action::create("waypoint_set"));
+               synfigapp::Action::Handle action(synfigapp::Action::create("WaypointSet"));
 
                assert(action);
 
@@ -3307,6 +3320,16 @@ CanvasView::on_waypoint_clicked_canvasview(synfigapp::ValueDesc value_desc,
                }
 
                // ------------------------------------------------------------------------
+               if (size == 1)
+               {
+                       const synfigapp::ValueDesc value_desc(synfig::ValueNode_Animated::Handle::cast_reinterpret(waypoint.get_parent_value_node()), time);
+                       get_instance()->make_param_menu(waypoint_menu,canvas_interface()->get_canvas(),value_desc,0.5f);
+
+                       // ------------------------------------------------------------------------
+                       waypoint_menu->items().push_back(Gtk::Menu_Helpers::SeparatorElem());
+               }
+
+               // ------------------------------------------------------------------------
                waypoint_menu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("_Jump To"),
                        sigc::bind(sigc::mem_fun(*canvas_interface(), &synfigapp::CanvasInterface::set_time), time)));
 
@@ -3348,7 +3371,7 @@ CanvasView::on_waypoint_changed()
        param_list.add("waypoint",waypoint_dialog.get_waypoint());
 //     param_list.add("time",canvas_interface()->get_time());
 
-       get_instance()->process_action("waypoint_set_smart", param_list);
+       get_instance()->process_action("WaypointSetSmart", param_list);
 }
 
 void
@@ -3361,7 +3384,7 @@ CanvasView::on_waypoint_delete()
        param_list.add("waypoint",waypoint_dialog.get_waypoint());
 //     param_list.add("time",canvas_interface()->get_time());
 
-       get_instance()->process_action("waypoint_remove", param_list);
+       get_instance()->process_action("WaypointRemove", param_list);
 }
 
 void
@@ -3385,7 +3408,7 @@ CanvasView::on_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& con
                        if(!layer->set_param("text",ValueBase(selection_data)))
                                break;
 
-                       synfigapp::Action::Handle       action(synfigapp::Action::create("layer_add"));
+                       synfigapp::Action::Handle       action(synfigapp::Action::create("LayerAdd"));
 
                        assert(action);
                        if(!action)
@@ -3449,8 +3472,11 @@ CanvasView::on_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& con
                                }
                                else
                                {
-                                       if(canvas_interface()->import(filename))
+                                       String errors, warnings;
+                                       if(canvas_interface()->import(filename, errors, warnings, App::resize_imported_images))
                                                success=true;
+                                       if (warnings != "")
+                                               App::dialog_warning_blocking(_("Warnings"), strprintf("%s:\n\n%s", _("Warnings"), warnings.c_str()));
                                }
 
                                continue;
@@ -3467,7 +3493,7 @@ CanvasView::on_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& con
 void
 CanvasView::on_keyframe_add_pressed()
 {
-       synfigapp::Action::Handle action(synfigapp::Action::create("keyframe_add"));
+       synfigapp::Action::Handle action(synfigapp::Action::create("KeyframeAdd"));
 
        if(!action)
        {
@@ -3495,7 +3521,7 @@ CanvasView::on_keyframe_duplicate_pressed()
        }
        keyframe=row[model.keyframe];
 
-       synfigapp::Action::Handle action(synfigapp::Action::create("keyframe_duplicate"));
+       synfigapp::Action::Handle action(synfigapp::Action::create("KeyframeDuplicate"));
 
        if(!action)
        {
@@ -3524,7 +3550,7 @@ CanvasView::on_keyframe_remove_pressed()
        }
        keyframe=row[model.keyframe];
 
-       synfigapp::Action::Handle action(synfigapp::Action::create("keyframe_remove"));
+       synfigapp::Action::Handle action(synfigapp::Action::create("KeyframeRemove"));
 
        if(!action)
        {
@@ -3557,8 +3583,13 @@ CanvasView::image_import()
 {
        // String filename(dirname(get_canvas()->get_file_name()));
        String filename("*.*");
+       String errors, warnings;
        if(App::dialog_open_file(_("Import Image"), filename, IMAGE_DIR_PREFERENCE))
-               canvas_interface()->import(filename);
+       {
+               canvas_interface()->import(filename, errors, warnings, App::resize_imported_images);
+               if (warnings != "")
+                       App::dialog_warning_blocking(_("Warnings"), strprintf("%s:\n\n%s", _("Warnings"), warnings.c_str()));
+       }
 }
 
 Smach::event_result