Merge lp:~hauzer-d/noise/now-playing-label-context-menu into lp:~elementary-apps/noise/trunk

[Danielle Foré]

Adds context menu to now playing track label

[Danielle Foré (danrabbit)]

The "Other Actions" and "Add to Playlist" submenus don't seem to be populated until after a submenu is activated elsewhere in the app

review: Needs Fixing

[Robert Roth (evfool)]

@hauzer-d: Could you please address the issue pointed out by Daniel?

Unmerged revisions

1564. By Никола Вукосављевић on 2014-03-25

Added a context menu to the label which displays the currently playing song.

=== modified file 'src/LibraryWindow.vala'
--- src/LibraryWindow.vala	2014-03-16 23:04:30 +0000
+++ src/LibraryWindow.vala	2014-04-20 16:56:17 +0000
@@ -657,7 +657,7 @@
             match_tvs.set (library_manager.p_music, music_tvs);
         }
         // Add Music Library View
-        var music_view_wrapper = new MusicViewWrapper (music_tvs, library_manager);
+        var music_view_wrapper = new MusicViewWrapper (music_tvs, library_manager, topDisplay);
         int view_number = view_container.add_view (music_view_wrapper);
         var entry = source_list_view.add_item  (view_number, _("Music"), ViewWrapper.Hint.MUSIC, Icons.MUSIC.gicon);
         match_playlist_entry.set (library_manager.p_music, entry);
@@ -1361,4 +1361,4 @@
 
         return base.configure_event (event);
     }
-}
 \ No newline at end of file
+}
 
=== modified file 'src/Views/ListView/ListView.vala'
--- src/Views/ListView/ListView.vala	2014-02-02 11:47:19 +0000
+++ src/Views/ListView/ListView.vala	2014-04-20 16:56:17 +0000
@@ -20,7 +20,6 @@
  * Contains the column browser and list view.
  */
 public class Noise.ListView : ContentView, Gtk.Box {
-
     public signal void reordered ();
 
     // Wrapper for the list view and miller columns
@@ -425,4 +424,4 @@
             list_text_overlay.message_visible = true;
         }
     }
-}
 \ No newline at end of file
+}
 
=== modified file 'src/Views/ListView/Lists/MusicListView.vala'
--- src/Views/ListView/Lists/MusicListView.vala	2014-02-02 11:47:19 +0000
+++ src/Views/ListView/Lists/MusicListView.vala	2014-04-20 16:56:17 +0000
@@ -66,6 +66,7 @@
     Gtk.MenuItem importToLibrary;
     Gtk.MenuItem mediaScrollToCurrent;
     Gtk.MenuItem mediaScrollToCurrentSeparator;
+    GLib.List<Media> mediaMenuData;
     bool is_queue = false;
     bool read_only = false;
 
@@ -230,7 +231,7 @@
 
                 playlist_item.activate.connect (() => {
                     var to_add = new Gee.LinkedList<Media> ();
-                    foreach (var m in get_selected_medias ())
+                    foreach (var m in mediaMenuData)
                         to_add.add (m);
                     playlist.add_medias (to_add);
                 });
@@ -243,7 +244,7 @@
             // if half and half, change text to 'Download %external of %total'
             int temporary_count = 0;
             int total_count = 0;
-            foreach (var m in get_selected_medias ()) {
+            foreach (var m in mediaMenuData) {
                 if (m.isTemporary)
                     temporary_count++;
                 total_count++;
@@ -261,7 +262,7 @@
             }
 
             int set_rating = -1;
-            foreach (Media m in get_selected_medias ()) {
+            foreach (Media m in mediaMenuData) {
                 if (set_rating == -1) {
                     set_rating = (int) m.rating;
                 } else if (set_rating != m.rating) {
@@ -280,10 +281,9 @@
 
             try {
                 var files = new Gee.HashSet<File> (); //for automatic deduplication
-                var selected_medias = get_selected_medias (); //to avoid querying it every time
-                debug ("Number of selected medias obtained by MusicListView class: %u\n", selected_medias.length ());
+                debug ("Number of selected medias obtained by MusicListView class: %u\n", mediaMenuData.length ());
 
-                foreach (var media in selected_medias) {
+                foreach (var media in mediaMenuData) {
                     if (media.file.query_exists ()) {
                         files.add (media.file);
                         //if the file was marked nonexistent, update its status
@@ -301,7 +301,7 @@
 
                 var contracts = Granite.Services.ContractorProxy.get_contracts_for_files (files.to_array ());
                 foreach (var contract in contracts) {
-                    var menu_item = new ContractMenuItem (contract, selected_medias);
+                    var menu_item = new ContractMenuItem (contract, mediaMenuData);
                     contractorSubMenu.append (menu_item);
                 }
                 this.queue_draw ();
@@ -310,8 +310,8 @@
                 warning ("Failed to obtain Contractor actions: %s", err.message);
                 mediaMenuContractorEntry.sensitive = false;
             }
-
-            mediaActionMenu.popup (null, null, null, 3, Gtk.get_current_event_time());
+            
+            popupMediaMenu();
 
             return true;
         }
@@ -391,12 +391,31 @@
         tvs.sort_direction = sort_dir;
     }
 
+    public void popupMediaMenu (bool data_is_cur_playing = false) {
+        mediaMenuData.foreach((x) => {
+            mediaMenuData.remove(x);
+        });
+        
+        if (data_is_cur_playing) {
+            mediaMenuData.append (App.player.media_info.media);
+            mediaScrollToCurrent.hide();
+            mediaScrollToCurrentSeparator.hide();
+        }
+        else {
+            mediaMenuData = get_selected_medias ();
+            mediaScrollToCurrent.show();
+            mediaScrollToCurrentSeparator.show();
+        }
+        
+        mediaActionMenu.popup (null, null, null, 3, Gtk.get_current_event_time());
+    }
+
     /** media menu popup clicks **/
     void mediaMenuEditClicked () {
         var to_edit = new Gee.LinkedList<int> ();
         var to_edit_med = new Gee.LinkedList<Media> ();
 
-        foreach (Media m in get_selected_medias ()) {
+        foreach (Media m in mediaMenuData) {
             to_edit.add (m.rowid);
             if (to_edit.size == 1)
                 to_edit_med.add (m);
@@ -435,7 +454,7 @@
     }
 
     protected void mediaFileBrowseClicked () {
-        foreach (Media m in get_selected_medias ()) {
+        foreach (Media m in mediaMenuData) {
             try {
                 var file = File.new_for_uri (m.uri);
                 Gtk.show_uri (null, file.get_parent ().get_uri (), 0);
@@ -450,7 +469,7 @@
     protected virtual void mediaMenuQueueClicked () {
         var to_queue = new Gee.LinkedList<Media> ();
 
-        foreach (Media m in get_selected_medias ()) {
+        foreach (Media m in mediaMenuData) {
             to_queue.add (m);
         }
 
@@ -461,7 +480,7 @@
         var p = new StaticPlaylist ();
 
         var to_add = new Gee.LinkedList<Media> ();
-        foreach (Media m in get_selected_medias ()) {
+        foreach (Media m in mediaMenuData) {
             to_add.add (m);
         }
         p.add_medias (to_add);
@@ -473,7 +492,7 @@
         var los = new Gee.LinkedList<Media> ();
         int new_rating = mediaRateMedia.rating_value;
 
-        foreach (Media m in get_selected_medias ()) {
+        foreach (Media m in mediaMenuData) {
             m.rating = new_rating;
             los.add (m);
         }
@@ -483,7 +502,7 @@
     protected override void mediaRemoveClicked () {
         var to_remove = new Gee.LinkedList<Media> ();
 
-        foreach (Media m in get_selected_medias ()) {
+        foreach (Media m in mediaMenuData) {
             to_remove.add (m);
         }
 
@@ -505,7 +524,7 @@
     void importToLibraryClicked () {
         var to_import = new Gee.LinkedList<Media> ();
 
-        foreach (Media m in get_selected_medias ()) {
+        foreach (Media m in mediaMenuData) {
             to_import.add (m);
         }
 
@@ -515,7 +534,7 @@
     protected virtual void onDragDataGet (Gdk.DragContext context, Gtk.SelectionData selection_data, uint info, uint time_) {
         string[] uris = null;
 
-        foreach (Media m in get_selected_medias ()) {
+        foreach (Media m in mediaMenuData) {
             debug ("adding %s\n", m.uri);
             uris += (m.uri);
         }
 
=== modified file 'src/Views/Wrappers/MusicViewWrapper.vala'
--- src/Views/Wrappers/MusicViewWrapper.vala	2014-04-13 08:28:46 +0000
+++ src/Views/Wrappers/MusicViewWrapper.vala	2014-04-20 16:56:17 +0000
@@ -22,15 +22,14 @@
  */
 
 public class Noise.MusicViewWrapper : ViewWrapper {
-    
-    public MusicViewWrapper (TreeViewSetup? tvs = null, Library library) {
+    public MusicViewWrapper (TreeViewSetup? tvs = null, Library library, TopDisplay topDisplay) {
         base (Hint.MUSIC, library);
-        build_async.begin (tvs);
+        build_async.begin (tvs, topDisplay);
     }
 
     private Gee.HashMap<unowned Device, int> _devices;
 
-    private async void build_async (TreeViewSetup? tvs = null) {
+    private async void build_async (TreeViewSetup? tvs = null, TopDisplay topDisplay) {
         Idle.add_full (VIEW_CONSTRUCT_PRIORITY, build_async.callback);
         yield;
         // Add grid view
@@ -45,6 +44,7 @@
         else
             music_setup = tvs;
         list_view = new ListView (this, music_setup, true);
+        topDisplay.set_list_view(list_view.list_view);
 
         // Welcome screen
         welcome_screen = new Granite.Widgets.Welcome (_("Get Some Tunes"),
@@ -165,4 +165,4 @@
             }
         }
     }
-}
 \ No newline at end of file
+}
 
=== modified file 'src/Widgets/TopDisplay.vala'
--- src/Widgets/TopDisplay.vala	2014-02-02 11:47:19 +0000
+++ src/Widgets/TopDisplay.vala	2014-04-20 16:56:17 +0000
@@ -28,6 +28,7 @@
     Gtk.Scale scale;
     Gtk.ProgressBar progressbar;
     Gtk.Button cancelButton;
+    MusicListView list_view;
 
     private bool is_seeking = false;
     private uint timeout_id = 0;
@@ -62,6 +63,9 @@
         label.set_justify (Gtk.Justification.CENTER);
         label.set_single_line_mode (false);
         label.ellipsize = Pango.EllipsizeMode.END;
+        var label_eventbox = new Gtk.EventBox();
+        label_eventbox.add(label);
+	    label_eventbox.button_press_event.connect(label_clicked);
         
         cancelButton.set_image (Icons.PROCESS_STOP.render_image (Gtk.IconSize.MENU));
         cancelButton.set_relief (Gtk.ReliefStyle.NONE);
@@ -71,7 +75,7 @@
 
         // all but cancel
         var info = new Gtk.Grid ();
-        info.attach (label, 0, 0, 1, 1);
+        info.attach (label_eventbox, 0, 0, 1, 1);
         info.attach (progressbar, 0, 1, 1, 1);
         info.attach (scale_grid, 0, 1, 1, 1);
         
@@ -110,6 +114,10 @@
         libraries_manager.local_library.media_updated.connect(media_updated);
     }
     
+    public void set_list_view(MusicListView list_view) {
+        this.list_view = list_view;
+    }
+    
     /** label functions **/
     public void set_label_text(string text) {
         label.set_text(text);
@@ -127,6 +135,15 @@
         label.set_visible (val);
     }
     
+    public virtual bool label_clicked (Gdk.EventButton event) {
+        if (event.button == 3) {
+            list_view.popupMediaMenu (true);
+            return true;
+        }
+        
+        return false;
+    }
+
     /** progressbar functions **/
     public void set_scale_sensitivity (bool val) {
         scale.set_sensitive(val);
@@ -304,4 +321,4 @@
                 set_media (current_media);
         }
     }
-}
 \ No newline at end of file
+}