kae/musicmuster
1
0
Fork 0
Code Issues 28 Pull Requests Projects Releases 1 Activity

Co-ordinate right-click play next - Fixes #2

Browse Source
This commit is contained in:
Keith Edmunds 2021-05-30 21:51:23 +01:00
parent b10e729627
commit 453fe87bf9
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/musicmuster.py
View File

@ -264,7 +264,7 @@ class Window(QMainWindow, Ui_MainWindow):
the database object, get it populated and then add tab. the database object, get it populated and then add tab.
""" """
playlist_table = Playlist() playlist_table = Playlist(self)
playlist_table.db = playlist_db playlist_table.db = playlist_db
playlist_table.populate() playlist_table.populate()
idx = self.tabPlaylist.addTab(playlist_table, playlist_db.name) idx = self.tabPlaylist.addTab(playlist_table, playlist_db.name)
@ -389,10 +389,11 @@ class Window(QMainWindow, Ui_MainWindow):
playlist = Playlists.open(dlg.plid) playlist = Playlists.open(dlg.plid)
self.load_playlist(playlist) self.load_playlist(playlist)
def set_next_track(self): def set_next_track(self, next_track_id=None):
"Set selected track as next" "Set selected track as next"
next_track_id = self.visible_playlist().set_selected_as_next() if not next_track_id:
next_track_id = self.visible_playlist().set_selected_as_next()
if next_track_id: if next_track_id:
if self.next_track_playlist != self.visible_playlist(): if self.next_track_playlist != self.visible_playlist():
if self.next_track_playlist: if self.next_track_playlist:

10
app/playlists.py
View File

@ -37,6 +37,7 @@ class Playlist(QTableWidget):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.master_process = self.parent()
self.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers) self.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
self.setAlternatingRowColors(True) self.setAlternatingRowColors(True)
self.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection) self.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection)
@ -642,12 +643,11 @@ class Playlist(QTableWidget):
if row in self._meta_get_notes(): if row in self._meta_get_notes():
return None return None
if self.item(row, self.COL_INDEX): track_id = self._get_row_id(row)
self._meta_set_next(row) if track_id:
self._meta_set_next(self.currentRow())
self._repaint(save_playlist=False) self._repaint(save_playlist=False)
return self._get_row_id(row) self.master_process.set_next_track(track_id)
else:
return None
def _repaint(self, clear_selection=True, save_playlist=True): def _repaint(self, clear_selection=True, save_playlist=True):
"Set row colours, fonts, etc, and save playlist" "Set row colours, fonts, etc, and save playlist"