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

Fix merge error

Browse Source
This commit is contained in:
Keith Edmunds 2023-03-05 20:23:43 +00:00
parent e80a74cc40
commit ea5e4a2215
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/playlists.py
View File

@ -1515,19 +1515,9 @@ class PlaylistTab(QTableWidget):
# Set note text in correct column for section head # Set note text in correct column for section head
_ = self._set_item_text(row, HEADER_NOTES_COLUMN, plr.note) _ = self._set_item_text(row, HEADER_NOTES_COLUMN, plr.note)
<<<<<<< HEAD
_ = self._set_row_note_colour(session, row, plr.note,
section_header=True)
||||||| c5f89db
note_colour = NoteColours.get_colour(session, plr.note)
if not note_colour:
note_colour = Config.COLOUR_NOTES_PLAYLIST
self._set_row_colour(row, QColor(note_colour))
=======
_ = self._set_row_note_colour(session, row, plr.note, _ = self._set_row_note_colour(session, row, plr.note,
section_header=True) section_header=True)
self._update_start_end_times() self._update_start_end_times()
>>>>>>> dev
self.clear_selection() self.clear_selection()
# Set track start/end times after track list is populated # Set track start/end times after track list is populated