X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=1abce20c75656624769ff40fc86450d01b5f0783;hb=ab058f0ef6558002cc82022cc9d91d1cf5e8a88f;hp=e0f52a820303a4bf1faf78a03633c598bb9ed1a9;hpb=30bac40d07f5e98a81a82bb44138d1515221b8b4;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index e0f52a8..1abce20 100644
--- 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);
@@ -3431,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;
@@ -3539,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