Resolves #58: Added ability to right click on songs in Play Queue

sublime/app.py

@@ -132,6 +132,7 @@ class SublimeMusicApp(Gtk.Application):
             self.on_stack_change,
         )
         self.window.connect('song-clicked', self.on_song_clicked)
+        self.window.connect('songs-removed', self.on_songs_removed)
         self.window.connect('refresh-window', self.on_refresh_window)
         self.window.player_controls.connect('song-scrub', self.on_song_scrub)
         self.window.player_controls.connect(
@@ -607,6 +608,24 @@ class SublimeMusicApp(Gtk.Application):
             play_queue=song_queue,
         )
 
+    def on_songs_removed(self, win, song_indexes_to_remove):
+        self.state.play_queue = [
+            song_id for i, song_id in enumerate(self.state.play_queue)
+            if i not in song_indexes_to_remove
+        ]
+        before_current = [
+            i for i in song_indexes_to_remove
+            if i < self.state.current_song_index
+        ]
+
+        if self.state.current_song_index in song_indexes_to_remove:
+            self.state.current_song_index -= len(before_current)
+            self.play_song(self.state.current_song_index, reset=True)
+        else:
+            self.state.current_song_index -= len(before_current)
+            self.update_window()
+            self.save_play_queue()
+
     @dbus_propagate()
     def on_song_scrub(self, _, scrub_value):
         if not hasattr(self.state, 'current_song'):

sublime/ui/main.py

@@ -14,6 +14,11 @@ class MainWindow(Gtk.ApplicationWindow):
             GObject.TYPE_NONE,
             (int, object, object),
         ),
+        'songs-removed': (
+            GObject.SignalFlags.RUN_FIRST,
+            GObject.TYPE_NONE,
+            (object, ),
+        ),
         'refresh-window': (
             GObject.SignalFlags.RUN_FIRST,
             GObject.TYPE_NONE,
@@ -40,6 +45,8 @@ class MainWindow(Gtk.ApplicationWindow):
         self.player_controls = player_controls.PlayerControls()
         self.player_controls.connect(
             'song-clicked', lambda _, *a: self.emit('song-clicked', *a))
+        self.player_controls.connect(
+            'songs-removed', lambda _, *a: self.emit('songs-removed', *a))
 
         flowbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
         flowbox.pack_start(self.stack, True, True, 0)

sublime/ui/player_controls.py

@@ -39,6 +39,11 @@ class PlayerControls(Gtk.ActionBar):
             GObject.TYPE_NONE,
             (int, object, object),
         ),
+        'songs-removed': (
+            GObject.SignalFlags.RUN_FIRST,
+            GObject.TYPE_NONE,
+            (object, ),
+        ),
     }
     editing: bool = False
     current_song = None
@@ -127,7 +132,7 @@ class PlayerControls(Gtk.ActionBar):
 
         # Update the current song information.
         # TODO add popup of bigger cover art photo here
-        if has_current_song:
+        if state.current_song is not None:
             self.update_cover_art(state.current_song.coverArt, size='70')
 
             self.song_title.set_text(util.esc(state.current_song.title))
@@ -255,20 +260,42 @@ class PlayerControls(Gtk.ActionBar):
 
     def on_play_queue_button_press(self, listbox, event):
         if event.button == 3:  # Right click
-            rows = listbox.get_selected_rows()
-            allow_deselect = False
-
-            def on_download_state_change(song_id=None):
-                print('todo')
-                # GLib.idle_add(self.update_playlist_view, self.playlist_id)
-
-            ids = [
-                self.play_queue_store[row.get_index()].song_id for row in rows
+            clicked_row = listbox.get_row_at_y(event.y)
+            clicked_row_index = clicked_row.get_index()
+            selected_indexes = [
+                r.get_index() for r in listbox.get_selected_rows()
             ]
 
-            # If the click was on a selected row, don't deselect anything.
-            if not allow_deselect:
-                return True
+            if clicked_row_index not in selected_indexes:
+                listbox.unselect_all()
+                listbox.select_row(clicked_row)
+                selected_indexes = [clicked_row_index]
+
+            def on_download_state_change(song_id=None):
+                # TODO should probably refresh the entire window here.
+                pass
+
+            song_ids = [
+                self.play_queue_store[idx].song_id for idx in selected_indexes
+            ]
+
+            remove_text = (
+                'Remove ' + util.pluralize('song', len(song_ids))
+                + ' from queue')
+
+            def on_remove_songs_click(_):
+                self.emit('songs-removed', selected_indexes)
+
+            util.show_song_popover(
+                song_ids,
+                event.x,
+                event.y,
+                listbox,
+                on_download_state_change=on_download_state_change,
+                extra_menu_items=[
+                    (Gtk.ModelButton(text=remove_text), on_remove_songs_click),
+                ],
+            )
 
     def create_song_display(self):
         box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)