Merge lp:~elementary-dev-community/switchboard-plug-pantheon-shell/bug-1182413 into lp:~elementary-apps/switchboard-plug-pantheon-shell/trunk

[Richard Stromer]

Search recursively for images in all sub-folders (does not cover loops)

[David Gomes (davidgomes)]

Diff line 41 should be:
    plug.switchboard_controller.progress_bar_set_text (_("Importing wallpapers from %s.").printf (basefolder));

Diff lines 58-60 should be:

    if (info.get_file_type () == FileType.DIRECTORY) {
        load_wallpapers (basefolder + "/" + info.get_name ());
    } else if (!IOHelper.is_valid_file_type (info)) {

review: Needs Fixing

[lp:~elementary-dev-community/switchboard-plug-pantheon-shell/bug-1182413]

174. By Richard Stromer <email address hidden> on 2014-02-04

add some missing spaces after function names

[Danielle Foré (danrabbit)]

OP, can you update this branch to fix the text conflicts please?

review: Needs Fixing

[Richard Stromer (noxan)]

Got some other stuff to be done first, but I will have a look at it next week.

[lp:~elementary-dev-community/switchboard-plug-pantheon-shell/bug-1182413]

175. By Richard Stromer on 2014-07-21

Merged upstream changes

[Richard Stromer (noxan)]

sorry, the merge with bzr does somehow not work as intended (I'm more some kind of git user) and furthermore I do not get the right versions of the required dependencies (switchboard-2.0, gtk+-3.0). I guess I got to wait till the beta release or submit some untested diff/patch files if those do help in any way.

[Cameron Norman (cameronnemo)]

I have worked on this and rebased it. Merge request here.

This is how the conflicts text is formatted:

    conflict-free code
<<<<<<< TREE
    pre-merge code
=======
    code from where you were trying to merge from
>>>>>>> MERGE-SOURCE
    conflict-free code

Once you merge the code from all of those types of sections in a file, you just use `bzr resolve FileName.vala`.

[Cameron Norman (cameronnemo)]

And by here I mean here: https://code.launchpad.net/~elementary-dev-community/switchboard-plug-pantheon-shell/fix-1182413/+merge/227667

:)

=== modified file 'src/Wallpaper.vala'
--- src/Wallpaper.vala	2013-11-24 00:08:31 +0000
+++ src/Wallpaper.vala	2014-07-21 19:39:36 +0000
@@ -216,16 +216,28 @@
     void update_wallpaper_folder () {
         if (folder_combo.get_active () == 0) {
             clean_wallpapers ();
+<<<<<<< TREE
+            WALLPAPER_DIR = GLib.Environment.get_user_special_dir (GLib.UserDirectory.PICTURES);
+            load_wallpapers (WALLPAPER_DIR);
+=======
             var picture_file = GLib.File.new_for_path (GLib.Environment.get_user_special_dir (GLib.UserDirectory.PICTURES));
             WALLPAPER_DIR = picture_file.get_uri ();
             load_wallpapers.begin ();
+>>>>>>> MERGE-SOURCE
         } else if (folder_combo.get_active () == 1) {
             clean_wallpapers ();
+<<<<<<< TREE
+            WALLPAPER_DIR = "/usr/share/backgrounds";
+            load_wallpapers.begin (WALLPAPER_DIR, () => {
+                WALLPAPER_DIR = Environment.get_user_data_dir () + "/backgrounds";
+                load_wallpapers (WALLPAPER_DIR);
+=======
             WALLPAPER_DIR = "file:///usr/share/backgrounds";
             load_wallpapers.begin (() => {
                 var backgrounds_file = GLib.File.new_for_path (GLib.Environment.get_user_data_dir () + "/backgrounds");
                 WALLPAPER_DIR = backgrounds_file.get_uri ();
                 load_wallpapers.begin ();
+>>>>>>> MERGE-SOURCE
             });
         } else if (folder_combo.get_active () == 2) {
             var dialog = new Gtk.FileChooserDialog (_("Select a folder"), null, FileChooserAction.SELECT_FOLDER);
@@ -235,8 +247,13 @@
 
             if (dialog.run () == ResponseType.ACCEPT) {
                 clean_wallpapers ();
+<<<<<<< TREE
+                WALLPAPER_DIR = dialog.get_filename ();
+                load_wallpapers (WALLPAPER_DIR);
+=======
                 WALLPAPER_DIR = dialog.get_file ().get_uri ();
                 load_wallpapers.begin ();
+>>>>>>> MERGE-SOURCE
                 dialog.destroy ();
             } else {
                 dialog.destroy ();
@@ -244,10 +261,21 @@
         }
     }
 
-    async void load_wallpapers () {
+    async void load_wallpapers (string basefolder) {
         folder_combo.set_sensitive (false);
 
+<<<<<<< TREE
+        // Make the progress bar visible, since we're gonna be using it.
+        try {
+            plug.switchboard_controller.progress_bar_set_text (_("Importing wallpapers from %s").printf(basefolder));
+        } catch (Error e) {
+            warning (e.message);
+        }
+
+        var directory = File.new_for_path (basefolder);
+=======
         var directory = File.new_for_uri (WALLPAPER_DIR);
+>>>>>>> MERGE-SOURCE
         // The number of wallpapers we've added so far
         double done = 0.0;
 
@@ -272,12 +300,18 @@
                 foreach (var info in files) {
                     // We're going to add another wallpaper
                     done++;
-                    // Skip the file if it's not a picture
-                    if (!IOHelper.is_valid_file_type(info)) {
+                    // Skip the file if it's not a picture and continue search for directories
+                    if (info.get_file_type () == FileType.DIRECTORY) {
+                        load_wallpapers (basefolder + "/" + info.get_name());
+                    } else if (!IOHelper.is_valid_file_type (info)) {
                         continue;
                     }
+<<<<<<< TREE
+                    string filename = basefolder + "/" + info.get_name ();
+=======
                     var file = File.new_for_uri (WALLPAPER_DIR + "/" + info.get_name ());
                     string filename = file.get_path ();
+>>>>>>> MERGE-SOURCE
                     // Skip the default_wallpaper as seen in the description of the
                     // default_link variable
                     if (filename == default_link) {