Add a new signal_subcanvas_changed() that is signalled whenever a PasteCanvas' subcan...

[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..1abce20 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);
@@ -3449,8 +3461,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;
@@ -3557,8 +3572,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