Add music file[s] from within app

src/Application.vala

@@ -9,12 +9,14 @@ public class Music.Application : Gtk.Application {
     public const string ACTION_PLAY_PAUSE = "action-play-pause";
     public const string ACTION_PREVIOUS = "action-previous";
     public const string ACTION_SHUFFLE = "action-shuffle";
+    public const string ACTION_OPEN = "action-open";
 
     private const ActionEntry[] ACTION_ENTRIES = {
         { ACTION_PLAY_PAUSE, action_play_pause, null, "false" },
         { ACTION_NEXT, action_next },
         { ACTION_PREVIOUS, action_previous },
-        { ACTION_SHUFFLE, action_shuffle }
+        { ACTION_SHUFFLE, action_shuffle },
+        { ACTION_OPEN, action_open }
     };
 
     private PlaybackManager? playback_manager = null;
@@ -175,6 +177,51 @@ public class Music.Application : Gtk.Application {
         playback_manager.shuffle ();
     }
 
+    private void action_open () {
+        var all_files_filter = new Gtk.FileFilter () {
+            name = _("All files"),
+        };
+        all_files_filter.add_pattern ("*");
+        var music_files_filter = new Gtk.FileFilter () {
+            name = _("Music Files"),
+        };
+        music_files_filter.add_mime_type ("audio/*");
+
+        var filter_model = new ListStore (typeof (Gtk.FileFilter));
+        filter_model.append (all_files_filter);
+        filter_model.append (music_files_filter);
+
+        var file_chooser = new Gtk.FileChooserNative (
+            _("Open some files"),
+            active_window,
+            Gtk.FileChooserAction.OPEN,
+            _("Open"),
+            _("Cancel")
+        );
+        file_chooser.add_filter (music_files_filter);
+        file_chooser.add_filter (all_files_filter);
+        file_chooser.select_multiple = true;
+
+        file_chooser.response.connect ((response) => {
+            SList<weak File> file_list = null;
+            if (response == Gtk.ResponseType.ACCEPT) {
+                var files = file_chooser.get_files ();
+                File? file;
+                int index = 0;
+                while (files.get_item (index) != null) {
+                    file_list.prepend ((File)(files.get_item (index)));
+                    index++;
+                }
+
+                ((MainWindow)active_window).queue_files (file_list);
+            }
+
+            file_chooser.destroy ();
+        });
+
+        file_chooser.show ();
+    }
+
     private void on_bus_acquired (DBusConnection connection, string name) {
         try {
             connection.register_object ("/org/mpris/MediaPlayer2", new MprisRoot ());

src/MainWindow.vala

@@ -48,10 +48,26 @@ public class Music.MainWindow : Gtk.ApplicationWindow {
 
         var drop_target = new Gtk.DropTarget (typeof (Gdk.FileList), Gdk.DragAction.COPY);
 
+        var add_button_label = new Gtk.Label (_("Add Music…"));
+        var add_button_box = new Gtk.Box (HORIZONTAL, 0);
+        add_button_box.append (new Gtk.Image.from_icon_name ("list-add-symbolic"));
+        add_button_box.append (add_button_label);
+
+        var add_button = new Gtk.Button () {
+            child = add_button_box,
+            action_name = Application.ACTION_PREFIX + Application.ACTION_OPEN
+        };
+        add_button.add_css_class (Granite.STYLE_CLASS_FLAT);
+
+        var queue_action_bar = new Gtk.ActionBar ();
+        queue_action_bar.pack_start (add_button);
+        queue_action_bar.add_css_class (Granite.STYLE_CLASS_FLAT);
+
         var queue = new Gtk.Grid ();
         queue.add_css_class (Granite.STYLE_CLASS_VIEW);
         queue.attach (queue_header, 0, 0);
         queue.attach (scrolled, 0, 1);
+        queue.attach (queue_action_bar, 0, 2);
         queue.add_controller (drop_target);
 
         var error_toast = new Granite.Toast ("");
@@ -115,24 +131,8 @@ public class Music.MainWindow : Gtk.ApplicationWindow {
 
         drop_target.drop.connect ((target, value, x, y) => {
             if (value.type () == typeof (Gdk.FileList)) {
-                File[] files;
-                SList<File> file_list = null;
-                foreach (unowned var file in (SList<File>) value.get_boxed ()) {
-                    var file_type = file.query_file_type (FileQueryInfoFlags.NONE);
-                    if (file_type == FileType.DIRECTORY) {
-                        prepend_directory_files (file, ref file_list);
-                    } else {
-                        file_list.prepend (file);
-                    }
-                }
-
-                file_list.reverse ();
-                foreach (unowned var file in file_list) {
-                    files += file;
-                }
-
-                playback_manager.queue_files (files);
-
+                var list = (Gdk.FileList)value;
+                queue_files (list.get_files ());
                 return true;
             }
 
@@ -161,6 +161,25 @@ public class Music.MainWindow : Gtk.ApplicationWindow {
         });
     }
 
+    public void queue_files (SList<weak File> files) {
+        File[] file_array = {};
+        SList<File> file_list = null;
+        foreach (unowned var file in files) {
+            var file_type = file.query_file_type (FileQueryInfoFlags.NONE);
+            if (file_type == FileType.DIRECTORY) {
+                prepend_directory_files (file, ref file_list);
+            } else {
+                file_list.prepend (file);
+            }
+        }
+
+        file_list.reverse ();
+        foreach (unowned var file in file_list) {
+            file_array += file;
+        }
+
+        PlaybackManager.get_default ().queue_files (file_array);
+    }
     //Array concatenation not permitted for parameters so use a list instead
     private void prepend_directory_files (GLib.File dir, ref SList<File> file_list) {
         try {