Merge lp:~elementary-pantheon/switchboard-plug-pantheon-shell/fix-1102623 into lp:~elementary-apps/switchboard-plug-pantheon-shell/trunk

[Danielle Foré]

Saves the selected picture source (and the most recent 'custom' path) fixes lp:1102623

This is a manual merge of KJ's old branch into trunk. Everything appears to work

[Danielle Foré (danrabbit)]

Actually it looks like it still needs fixing. It merges cleanly now, but this would revert the view from a flowbox :p

review: Needs Fixing

Unmerged revisions

300. By Danielle Foré on 2014-12-27

merge kj's old branch into trunk

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-12-21 18:38:47 +0000
+++ CMakeLists.txt	2014-12-27 22:12:25 +0000
@@ -48,6 +48,10 @@
 include (CPack)
 add_custom_target (dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
 
+
+include(GSettings)
+add_schema("data/schema/org.pantheon.switchboard.plug.shell.gschema.xml")
+
 # Files
 file (GLOB resources "${CMAKE_CURRENT_SOURCE_DIR}/data/*.png")
 
@@ -58,4 +62,4 @@
 # Info-plug
 install (FILES ${resources} DESTINATION ${PKGDATADIR})
 
-add_subdirectory(src)
+add_subdirectory(src)
 \ No newline at end of file
 
=== added directory 'data/schema'
=== added file 'data/schema/org.pantheon.switchboard.plug.shell.gschema.xml'
--- data/schema/org.pantheon.switchboard.plug.shell.gschema.xml	1970-01-01 00:00:00 +0000
+++ data/schema/org.pantheon.switchboard.plug.shell.gschema.xml	2014-12-27 22:12:25 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+	<schema path="/org/pantheon/switchboard/plug/shell/" id="org.pantheon.switchboard.plug.shell" gettext-domain="switchboard">
+		<key name="custom-wallpaper-path" type="s">
+			<default>""</default>
+			<summary>Saves the custom background images path.</summary>
+			<description>Saves the custom background images path.</description>
+		</key>
+		<key name="selected-wallpaper-path" type="s">
+			<default>""</default>
+			<summary>Saves the selected background path item.</summary>
+			<description>Saves the selected background path item.</description>
+		</key>
+	</schema>
+</schemalist>
 \ No newline at end of file
 
=== modified file 'src/Wallpaper.vala'
--- src/Wallpaper.vala	2014-11-16 12:33:17 +0000
+++ src/Wallpaper.vala	2014-12-27 22:12:25 +0000
@@ -63,31 +63,19 @@
 
 class Wallpaper : EventBox {
 
-    class WallpaperContainer : Gtk.FlowBoxChild {
-        public string uri { get; construct; }
-
-        Gtk.Image image;
-
-        public WallpaperContainer (string uri) {
-            Object (uri: uri);
-
-            try {
-                image = new Gtk.Image.from_pixbuf (new Gdk.Pixbuf.from_file_at_scale (GLib.Filename.from_uri (uri), 150, 100, false));
-                add (image);
-            } catch (Error e) {
-                warning ("Failed to load wallpaper thumbnail: %s", e.message);
-            }
-        }
-    }
-
     GLib.Settings settings;
+    GLib.Settings plug_settings;
 
-    Gtk.FlowBox wallpaper_view;
+    ListStore store;
+    GLib.List <TreeIter?> iters = new GLib.List <TreeIter?> ();
+    Gtk.TreeIter selected_plug;
+    IconView wallpaper_view;
     ComboBoxText combo;
     ComboBoxText folder_combo;
     ColorButton color;
     string current_wallpaper_path;
-    Cancellable last_cancellable;
+    string custom_wallpaper_path;
+    string selected_wallpaper_path;
 
     Switchboard.Plug plug;
 
@@ -102,16 +90,36 @@
         plug = _plug;
 
         settings = new GLib.Settings ("org.gnome.desktop.background");
+        plug_settings = new GLib.Settings ("org.pantheon.switchboard.plug.shell");
+
+        store = new Gtk.ListStore (2, typeof (Gdk.Pixbuf), typeof (string));
 
         var vbox = new Box (Orientation.VERTICAL, 4);
 
-        wallpaper_view = new Gtk.FlowBox ();
-        wallpaper_view.activate_on_single_click = true;
-        wallpaper_view.column_spacing = wallpaper_view.row_spacing = 6;
-        wallpaper_view.margin = 12;
-        wallpaper_view.homogeneous = true;
-        wallpaper_view.selection_mode = Gtk.SelectionMode.SINGLE;
-        wallpaper_view.child_activated.connect (update_wallpaper);
+        string icon_style = """
+            .wallpaper-view {
+                background-color: @background_color;
+            }
+            .wallpaper-view:selected {
+                background-color: shade (#DEDEDE, 0.80);
+                color: #323232; 
+            }
+        """;
+        var icon_view_style = new Gtk.CssProvider ();
+
+        try {
+            icon_view_style.load_from_data (icon_style, -1);
+        } catch (Error e) {
+            warning (e.message);
+        }
+
+        wallpaper_view = new IconView ();
+        wallpaper_view.set_selection_mode (Gtk.SelectionMode.SINGLE);
+        wallpaper_view.set_pixbuf_column (0);
+        wallpaper_view.set_model (this.store);
+        wallpaper_view.selection_changed.connect (update_wallpaper);
+        wallpaper_view.get_style_context ().add_class ("wallpaper-view");
+        wallpaper_view.get_style_context ().add_provider (icon_view_style, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
 
         TargetEntry e = {"text/uri-list", 0, 0};
         wallpaper_view.drag_data_received.connect (on_drag_data_received);
@@ -123,11 +131,7 @@
         vbox.pack_start (scrolled, true, true, 5);
 
         folder_combo = new ComboBoxText ();
-        folder_combo.append ("pic", _("Pictures"));
-        folder_combo.append ("sys", _("Backgrounds"));
-        folder_combo.append ("cus", _("Custom…"));
         folder_combo.changed.connect (update_wallpaper_folder);
-        folder_combo.set_active (1);
 
         combo = new ComboBoxText ();
         combo.append ("none", _("Solid Color"));
@@ -142,6 +146,7 @@
         color.color_set.connect (update_color);
 
         load_settings ();
+        build_paths_menu (selected_wallpaper_path);
 
         var hbox = new Box (Orientation.HORIZONTAL, 0);
 
@@ -181,12 +186,37 @@
         color.set_color (c);
 
         current_wallpaper_path = settings.get_string ("picture-uri");
-    }
-
-    void update_wallpaper (Gtk.FlowBox box, Gtk.FlowBoxChild child) {
-        var selected = (WallpaperContainer) wallpaper_view.get_selected_children ().data;
-        current_wallpaper_path = selected.uri;
-        settings.set_string ("picture-uri", current_wallpaper_path);
+        custom_wallpaper_path = plug_settings.get_string ("custom-wallpaper-path");
+            selected_wallpaper_path = plug_settings.get_string ("selected-wallpaper-path");
+    }
+
+    void build_paths_menu (string select_item = "") {
+        folder_combo.remove_all ();
+        folder_combo.append ("pic", _("Pictures"));
+        folder_combo.append ("sys", _("Backgrounds"));
+            
+        if (custom_wallpaper_path.length > 0) {
+            var saved_file = GLib.File.new_for_path (custom_wallpaper_path);
+            folder_combo.append ("save", saved_file.get_basename ());
+        }
+
+        folder_combo.append ("cus", _("Custom…"));
+        folder_combo.set_active_id ((select_item.length > 0) ? select_item : "sys");
+    }
+
+    void update_wallpaper () {
+        var selected = wallpaper_view.get_selected_items ();
+        if (selected.length() == 1) {
+            GLib.Value filename;
+            // Get the filename of the selected wallpaper.
+            var item = selected.nth_data(0);
+            this.store.get_iter(out this.selected_plug, item);
+            this.store.get_value(this.selected_plug, 1, out filename);
+
+            current_wallpaper_path = filename.get_string();
+
+            settings.set_string ("picture-uri", filename.get_string ());
+        }
     }
 
     void update_color () {
@@ -200,47 +230,50 @@
     }
 
     void update_wallpaper_folder () {
-        if (last_cancellable != null)
-            last_cancellable.cancel ();
-
-        var cancellable = new Cancellable ();
-        last_cancellable = cancellable;
-        if (folder_combo.get_active () == 0) {
-            clean_wallpapers ();
-            var picture_dir = GLib.File.new_for_path (GLib.Environment.get_user_special_dir (GLib.UserDirectory.PICTURES));
-            load_wallpapers (picture_dir.get_uri (), cancellable);
-        } else if (folder_combo.get_active () == 1) {
-            clean_wallpapers ();
-
-            var system_uri = "file:///usr/share/backgrounds";
-            var user_uri = GLib.File.new_for_path (GLib.Environment.get_user_data_dir () + "/backgrounds").get_uri ();
-
-            load_wallpapers (system_uri, cancellable);
-            load_wallpapers (user_uri, cancellable);
-        } else if (folder_combo.get_active () == 2) {
-            var dialog = new Gtk.FileChooserDialog (_("Select a folder"), null, FileChooserAction.SELECT_FOLDER);
-            dialog.add_button (_("Cancel"), ResponseType.CANCEL);
-            dialog.add_button (_("Open"), ResponseType.ACCEPT);
-            dialog.set_default_response (ResponseType.ACCEPT);
-
-            if (dialog.run () == ResponseType.ACCEPT) {
-                clean_wallpapers ();
-                load_wallpapers (dialog.get_file ().get_uri (), cancellable);
-                dialog.destroy ();
-            } else {
-                dialog.destroy ();
-            }
+        switch (folder_combo.active_id) {
+            case "pic":
+                var picture_file = GLib.File.new_for_path (GLib.Environment.get_user_special_dir (GLib.UserDirectory.PICTURES));
+                load_wallpapers.begin (picture_file.get_uri ());
+                break;
+            case "sys":
+                load_wallpapers.begin ("file:///usr/share/backgrounds", true, () => {
+                    var backgrounds_file = GLib.File.new_for_path (GLib.Environment.get_user_data_dir () + "/backgrounds");
+                    load_wallpapers.begin (backgrounds_file.get_uri (), false);
+                });
+                break;
+            case "save":
+                var saved_file = GLib.File.new_for_uri (custom_wallpaper_path);
+                load_wallpapers.begin (saved_file.get_uri ());
+                break;
+            case "cus":
+                var dialog = new Gtk.FileChooserDialog (_("Select a folder"), null, FileChooserAction.SELECT_FOLDER);
+                dialog.add_button (_("Cancel"), ResponseType.CANCEL);
+                dialog.add_button (_("Open"), ResponseType.ACCEPT);
+                dialog.set_default_response (ResponseType.ACCEPT);
+
+                if (dialog.run () == ResponseType.ACCEPT) {
+                    custom_wallpaper_path = dialog.get_file ().get_uri ();
+                    plug_settings.set_string ("custom-wallpaper-path", custom_wallpaper_path);
+                    build_paths_menu ("save");
+                    load_wallpapers.begin (custom_wallpaper_path);
+                } else {
+                    build_paths_menu (selected_wallpaper_path);
+                }
+
+                dialog.destroy ();
+                break;
         }
+
+        plug_settings.set_string ("selected-wallpaper-path", (folder_combo.active_id == "cus") ? "save" : folder_combo.active_id);
     }
 
-    async void load_wallpapers (string basefolder, Cancellable cancellable) {
-        if (cancellable.is_cancelled () == true) {
-            return;
-        }
+    async void load_wallpapers (string path, bool clear_wallpapers = true) {
+        if (clear_wallpapers) 
+            clean_wallpapers ();
 
         folder_combo.set_sensitive (false);
 
-        var directory = File.new_for_uri (basefolder);
+        var directory = File.new_for_uri (path);
 
         // The number of wallpapers we've added so far
         double done = 0.0;
@@ -256,9 +289,6 @@
             var e = yield directory.enumerate_children_async (FileAttribute.STANDARD_NAME + "," + FileAttribute.STANDARD_TYPE + "," + FileAttribute.STANDARD_CONTENT_TYPE, 0, Priority.DEFAULT);
 
             while (true) {
-                if (cancellable.is_cancelled () == true) {
-                    return;
-                }
                 // Grab a batch of 10 wallpapers
                 var files = yield e.next_files_async (10, Priority.DEFAULT);
                 // Stop the loop if we've run out of wallpapers
@@ -267,40 +297,35 @@
                 }
                 // Loop through and add each wallpaper in the batch
                 foreach (var info in files) {
-                    if (cancellable.is_cancelled () == true) {
-                        return;
-                    }
                     // We're going to add another wallpaper
                     done++;
-
-                    if (info.get_file_type () == FileType.DIRECTORY) {
-                        // Spawn off another loader for the subdirectory
-                        load_wallpapers (basefolder + "/" + info.get_name (), cancellable);
-                        continue;
-                    } else if (!IOHelper.is_valid_file_type (info)) {
-                        // Skip non-picture files
+                    // Skip the file if it's not a picture
+                    if (!IOHelper.is_valid_file_type(info)) {
                         continue;
                     }
-
-                    var file = File.new_for_uri (basefolder + "/" + info.get_name ());
-                    string uri = file.get_uri ();
-
+                    var file = File.new_for_uri (directory.get_uri () + "/" + info.get_name ());
+                    string filename = file.get_path ();
                     // Skip the default_wallpaper as seen in the description of the
                     // default_link variable
-                    if (uri == default_link) {
+                    if (filename == default_link) {
                         continue;
                     }
 
                     try {
-                        var wallpaper = new WallpaperContainer (uri);
-                        wallpaper_view.add (wallpaper);
-                        wallpaper.show_all ();
+                        // Create a thumbnail of the image and load it into the IconView
+                        var image = new Gdk.Pixbuf.from_file_at_scale(filename, 150, 100, false);
+                        // Add the wallpaper name and thumbnail to the IconView
+                        Gtk.TreeIter root;
+                        this.store.append(out root);
+                        this.store.set(root, 0, image, -1);
+                        this.store.set(root, 1, filename, -1);
 
                         // Select the wallpaper if it is the current wallpaper
-                        if (current_wallpaper_path.has_suffix (uri)) {
-                            this.wallpaper_view.select_child (wallpaper);
+                        if (current_wallpaper_path.has_suffix (filename)) {
+                            this.wallpaper_view.select_path (this.store.get_path (root));
                         }
 
+                        this.iters.append (root);
                         // Have GTK update the UI even while we're busy
                         // working on file IO.
                         while(Gtk.events_pending ()) {
@@ -322,20 +347,12 @@
     }
 
     void clean_wallpapers () {
-        foreach (var child in wallpaper_view.get_children ())
-            child.destroy ();
+        store.clear ();
     }
 
     void on_drag_data_received (Widget widget, Gdk.DragContext ctx, int x, int y, SelectionData sel, uint information, uint timestamp) {
         if (sel.get_length () > 0) {
             File file = File.new_for_uri (sel.get_uris ()[0]);
-            var info = file.query_info (FileAttribute.STANDARD_TYPE + "," + FileAttribute.STANDARD_CONTENT_TYPE, 0);
-
-            if (!IOHelper.is_valid_file_type (info)) {
-                Gtk.drag_finish (ctx, false, false, timestamp);
-                return;
-            }
-
 
             string display_name = Filename.display_basename (file.get_path ());
 
@@ -345,22 +362,37 @@
                 try {
                     dest_folder.make_directory ();
                 } catch (Error e) {
-                    warning ("Creating local wallpaper directory failed: %s", e.message);
+                    warning (e.message);
                 }
             }
 
             try {
                 file.copy (dest, 0);
             } catch (Error e) {
-                warning ("Copying wallpaper to local directory failed: %s", e.message);
-            }
-
-            string uri = dest.get_uri ();
-
+                warning (e.message);
+            }
+
+            string filename = dest.get_uri ();
+
+            string extension = display_name.split (".")[display_name.split (".").length - 1];
+
+            if (extension != "jpg" && extension != "png" && extension != "jpeg" && extension != "gif") {
+                Gtk.drag_finish (ctx, false, false, timestamp);
+                return;
+            }
+
+            // Create a thumbnail of the image and load it into the IconView
+            Gdk.Pixbuf image = null;
+            try {
+                image = new Gdk.Pixbuf.from_file_at_scale(filename, 180, 120, false);
+            } catch (Error e) {
+                warning (e.message);
+            }
             // Add the wallpaper name and thumbnail to the IconView
-            var wallpaper = new WallpaperContainer (uri);
-            wallpaper_view.add (wallpaper);
-            wallpaper.show_all ();
+            Gtk.TreeIter root;
+            this.store.append(out root);
+            this.store.set(root, 0, image, -1);
+            this.store.set(root, 1, filename, -1);
 
             Gtk.drag_finish (ctx, true, false, timestamp);
             return;