Take the 'Focus Point' into account when transforming ducks for layers inside pasteca...

[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 0501e09..0973da6 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -1240,6 +1240,14 @@ CanvasView::init_menus()
                sigc::mem_fun(*work_area,&studio::WorkArea::select_all_ducks)
        );
 
+       action_group->add( Gtk::Action::create("unselect-all-ducks", _("Unselect All Ducks")),
+               sigc::mem_fun(*work_area,&studio::WorkArea::unselect_all_ducks)
+       );
+
+       action_group->add( Gtk::Action::create("select-all-layers", _("Select All Layers")),
+               sigc::mem_fun(*this,&CanvasView::on_select_layers)
+       );
+
        action_group->add( Gtk::Action::create("unselect-all-layers", _("Unselect All Layers")),
                sigc::mem_fun(*this,&CanvasView::on_unselect_layers)
        );
@@ -1520,6 +1528,8 @@ CanvasView::init_menus()
 //     editmenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("gtk-paste"),NOT_IMPLEMENTED_SLOT));
 //     editmenu.items().push_back(Gtk::Menu_Helpers::SeparatorElem());
 //     editmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Select All Ducks"),Gtk::AccelKey('E',Gdk::CONTROL_MASK),sigc::mem_fun(*work_area,&studio::WorkArea::select_all_ducks)));
+//     editmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Unselect All Ducks"),Gtk::AccelKey('E',Gdk::CONTROL_MASK),sigc::mem_fun(*work_area,&studio::WorkArea::unselect_all_ducks)));
+//     editmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Select All Layers"),Gtk::AccelKey('A',Gdk::CONTROL_MASK),sigc::mem_fun(*this,&CanvasView::on_select_layers)));
 //     editmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Unselect All Layers"),Gtk::AccelKey('D',Gdk::CONTROL_MASK),sigc::mem_fun(*this,&CanvasView::on_unselect_layers)));
 //     editmenu.items().push_back(Gtk::Menu_Helpers::SeparatorElem());
 //
@@ -1719,6 +1729,14 @@ CanvasView::init_menus()
 }
 
 void
+CanvasView::on_select_layers()
+{
+       Canvas::Handle canvas(get_canvas());
+       for (CanvasBase::iterator iter = canvas->begin(); iter != canvas->end(); iter++)
+               layer_tree->select_all_children_layers(*iter);
+}
+
+void
 CanvasView::on_unselect_layers()
 {
        layer_tree->clear_selected_layers();
@@ -1962,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);
@@ -2628,6 +2658,7 @@ CanvasView::on_duck_changed(const synfig::Point &value,const synfigapp::ValueDes
                        break;
 
                case ValueBase::TYPE_VECTOR:
+               {
                        Vector old_tangent = (*bline_tangent)(get_time()).get(Vector());
                        Angle old_angle = old_tangent.angle();
                        Real old_length = old_tangent.mag();
@@ -2648,6 +2679,9 @@ CanvasView::on_duck_changed(const synfig::Point &value,const synfigapp::ValueDes
                                return false;
                        return canvas_interface()->change_value(synfigapp::ValueDesc(bline_tangent,offset_index), old_offset + new_angle - old_angle);
                }
+               default:
+                       break;
+               }
        }
 
        switch(value_desc.get_value_type())
@@ -2808,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(child_canvas->rend_desc().get_focus());
 
                        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_Scale(scale,origin+focus));
+                       if(!origin.is_equal_to(Vector(0,0)))
                                transform_stack.push(new Transform_Translate(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();
@@ -3285,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)));
 
@@ -3427,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;
@@ -3535,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