X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=f12fcf0af0ba69d727a388c4e3ef9c362c8a293a;hb=2ccf682bfdcdf0ac006e454942f90399fde01312;hp=18cfb43d4330e0ed12aa80186abbfe25a701e851;hpb=bea2b75edf4c73c23938abc4f1aa8952c41d6847;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index 18cfb43..f12fcf0 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -2842,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_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();
@@ -3319,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)));
 
@@ -3461,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;
@@ -3569,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