From 566dc060676b41e1e58a446b7dcc4159e242fee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 23 Sep 2014 09:36:45 +0200 Subject: Imported Upstream version 0.20.0 --- src/CollectionPage.vala | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/CollectionPage.vala') diff --git a/src/CollectionPage.vala b/src/CollectionPage.vala index 070452c..22dcdee 100644 --- a/src/CollectionPage.vala +++ b/src/CollectionPage.vala @@ -701,17 +701,21 @@ public abstract class CollectionPage : MediaPage { MediaSourceCollection.filter_media((Gee.Collection) get_view().get_selected_sources(), photos, null); + bool desktop, screensaver; if (photos.size == 1) { - AppWindow.get_instance().set_busy_cursor(); - DesktopIntegration.set_background(photos[0]); - AppWindow.get_instance().set_normal_cursor(); + SetBackgroundPhotoDialog dialog = new SetBackgroundPhotoDialog(); + if (dialog.execute(out desktop, out screensaver)) { + AppWindow.get_instance().set_busy_cursor(); + DesktopIntegration.set_background(photos[0], desktop, screensaver); + AppWindow.get_instance().set_normal_cursor(); + } } else if (photos.size > 1) { SetBackgroundSlideshowDialog dialog = new SetBackgroundSlideshowDialog(); int delay; - if (dialog.execute(out delay)) { + if (dialog.execute(out delay, out desktop, out screensaver)) { AppWindow.get_instance().set_busy_cursor(); DesktopIntegration.set_background_slideshow(photos, delay, - DESKTOP_SLIDESHOW_TRANSITION_SEC); + DESKTOP_SLIDESHOW_TRANSITION_SEC, desktop, screensaver); AppWindow.get_instance().set_normal_cursor(); } } -- cgit v1.2.3