app/musicmuster.py

@@ -1022,21 +1022,18 @@ class Window(QMainWindow, Ui_MainWindow):
         if self.move_source_rows is None or self.move_source_model is None:
             return
 
-        to_playlist_model = self.active_tab().data_model
+        to_playlist_id = self.active_tab().playlist_id
         selected_rows = self.active_tab().get_selected_rows()
         if selected_rows:
             destination_row = selected_rows[0]
         else:
             destination_row = self.active_model().rowCount()
 
-        if (
+        if to_playlist_id == self.move_source_model.data_model.playlist_id:
-            to_playlist_model.playlist_id
-            == self.move_source_model.data_model.playlist_id
-        ):
             self.move_source_model.move_rows(self.move_source_rows, destination_row)
         else:
             self.move_source_model.move_rows_between_playlists(
-                self.move_source_rows, destination_row, to_playlist_model
+                self.move_source_rows, destination_row, to_playlist_id
             )
         self.move_source_rows = self.move_source_model = None
 
@@ -1084,8 +1081,6 @@ class Window(QMainWindow, Ui_MainWindow):
 
         # Show closing volume graph
         if track_sequence.now.fade_graph:
-            # TODO: remove if this is not a problem
-            stackprinter.format(show_vals="all")
             track_sequence.now.fade_graph.plot()
 
         # Play (new) current track
@@ -1330,10 +1325,7 @@ class Window(QMainWindow, Ui_MainWindow):
                     self.tabPlaylist.setCurrentIndex(idx)
                     break
 
-        display_row = self.active_model().mapFromSource(
+        self.tabPlaylist.currentWidget().scroll_to_top(plt.plr_rownum)
-            self.active_model().data_model.index(plt.plr_rownum, 0)
-        ).row()
-        self.tabPlaylist.currentWidget().scroll_to_top(display_row)
 
     def solicit_playlist_name(
         self, session: scoped_session, default: str = ""

app/playlistmodel.py

@@ -1,5 +1,3 @@
-# Allow forward reference to PlaylistModel
-from __future__ import annotations
 import obsws_python as obs  # type: ignore
 import re
 from dataclasses import dataclass
@@ -175,6 +173,10 @@ class PlaylistModel(QAbstractTableModel):
                 # Add any further note (header will already have a note)
                 if note:
                     plr.note += "\n" + note
+                # Reset header row spanning
+                self.signals.span_cells_signal.emit(
+                    self.playlist_id, row_number, HEADER_NOTES_COLUMN, 1, 1
+                )
                 # Update local copy
                 self.refresh_row(session, row_number)
                 # Repaint row
@@ -378,14 +380,15 @@ class PlaylistModel(QAbstractTableModel):
         Return text for display
         """
 
-        # Set / reset column span
-        column_span = 1
-        if self.is_header_row(row) and column == HEADER_NOTES_COLUMN:
-            column_span = self.columnCount() - 1
-        self.signals.span_cells_signal.emit(self.playlist_id, row, HEADER_NOTES_COLUMN, 1,
-                                            column_span)
         if self.is_header_row(row):
             if column == HEADER_NOTES_COLUMN:
+                self.signals.span_cells_signal.emit(
+                    self.playlist_id,
+                    row,
+                    HEADER_NOTES_COLUMN,
+                    1,
+                    self.columnCount() - 1,
+                )
                 header_text = self.header_text(prd)
                 if not header_text:
                     return QVariant(Config.TEXT_NO_TRACK_NO_NOTE)
@@ -776,21 +779,6 @@ class PlaylistModel(QAbstractTableModel):
 
         return None
 
-    def mark_unplayed(self, row_numbers: List[int]) -> None:
-        """
-        Mark row as unplayed
-        """
-
-        with Session() as session:
-            for row_number in row_numbers:
-                plr = session.get(PlaylistRows, self.playlist_rows[row_number].plrid)
-                if not plr:
-                    return
-                plr.played = False
-                self.refresh_row(session, row_number)
-
-        self.invalidate_rows(row_numbers)
-
     def move_rows(self, from_rows: List[int], to_row_number: int) -> None:
         """
         Move the playlist rows given to to_row and below.
@@ -825,6 +813,13 @@ class PlaylistModel(QAbstractTableModel):
             if old_row != new_row:
                 row_map[old_row] = new_row
 
+        # Reset any header rows that we're moving
+        for moving_row in row_map:
+            if self.is_header_row(moving_row):
+                # Reset column span
+                self.signals.span_cells_signal.emit(
+                    self.playlist_id, moving_row, HEADER_NOTES_COLUMN, 1, 1
+                )
         # Check to see whether any rows in track_sequence have moved
         if track_sequence.previous.plr_rownum in row_map:
             track_sequence.previous.plr_rownum = row_map[
@@ -851,15 +846,28 @@ class PlaylistModel(QAbstractTableModel):
         self.reset_track_sequence_row_numbers()
         self.invalidate_rows(list(row_map.keys()))
 
+    def mark_unplayed(self, row_numbers: List[int]) -> None:
+        """
+        Mark row as unplayed
+        """
+
+        with Session() as session:
+            for row_number in row_numbers:
+                plr = session.get(PlaylistRows, self.playlist_rows[row_number].plrid)
+                if not plr:
+                    return
+                plr.played = False
+                self.refresh_row(session, row_number)
+
+        self.invalidate_rows(row_numbers)
+
     def move_rows_between_playlists(
-        self, from_rows: List[int], to_row_number: int, to_playlist_model: PlaylistModel
+        self, from_rows: List[int], to_row_number: int, to_playlist_id: int
     ) -> None:
         """
         Move the playlist rows given to to_row and below of to_playlist.
         """
 
-        to_playlist_id = to_playlist_model.playlist_id
-
         # Row removal must be wrapped in beginRemoveRows ..
         # endRemoveRows and the row range must be contiguous. Process
         # the highest rows first so the lower row numbers are unchanged
@@ -878,7 +886,6 @@ class PlaylistModel(QAbstractTableModel):
                 max_destination_row_number
                 and to_row_number <= max_destination_row_number
             ):
-                # Move the destination playlist rows down to make room.
                 PlaylistRows.move_rows_down(
                     session, to_playlist_id, to_row_number, len(from_rows)
                 )

app/playlists.py

@@ -77,8 +77,7 @@ class EscapeDelegate(QStyledItemDelegate):
             row = index.row()
             row_height = p.rowHeight(row)
             p.setRowHeight(row, row_height + Config.MINIMUM_ROW_HEIGHT)
-            self.editor = QPlainTextEdit(parent)
+            return QPlainTextEdit(parent)
-            return self.editor
         return super().createEditor(parent, option, index)
 
     def destroyEditor(self, editor: Optional[QWidget], index: QModelIndex) -> None:
@@ -103,10 +102,6 @@ class EscapeDelegate(QStyledItemDelegate):
                     self.closeEditor.emit(editor)
                     return True
             elif key_event.key() == Qt.Key.Key_Escape:
-                if self.original_text == self.editor.toPlainText():
-                    # No changes made
-                    self.closeEditor.emit(editor)
-                    return True
                 discard_edits = QMessageBox.question(
                     cast(QWidget, self.parent()), "Abandon edit", "Discard changes?"
                 )
@@ -122,8 +117,8 @@ class EscapeDelegate(QStyledItemDelegate):
         else:
             edit_index = index
 
-        self.original_text = self.data_model.data(edit_index, Qt.ItemDataRole.EditRole)
+        value = self.data_model.data(edit_index, Qt.ItemDataRole.EditRole)
-        editor.setPlainText(self.original_text.value())
+        editor.setPlainText(value.value())
 
     def setModelData(self, editor, model, index):
         model = index.model()
@@ -193,6 +188,12 @@ class PlaylistTab(QTableView):
         self.customContextMenuRequested.connect(self._context_menu)
 
         # Connect signals
+        # This dancing is to satisfy mypy
+        h_header = self.horizontalHeader()
+        if isinstance(h_header, QHeaderView):
+            h_header.sectionResized.connect(self._column_resize)
+            h_header.setStretchLastSection(True)
+        # self.signals.set_next_track_signal.connect(self._reset_next)
         self.signals = MusicMusterSignals()
         self.signals.resize_rows_signal.connect(self.resizeRowsToContents)
         self.signals.span_cells_signal.connect(self._span_cells)
@@ -204,7 +205,7 @@ class PlaylistTab(QTableView):
         # Load playlist rows
         self.setModel(self.proxy_model)
         self._set_column_widths()
-        self.resizeRowsToContents()
+        QTimer.singleShot(0, lambda: self.resizeRowsToContents())
 
     # ########## Overrident class functions ##########
 
@@ -694,12 +695,6 @@ class PlaylistTab(QTableView):
                     self.setColumnWidth(column_number, record.f_int)
                 else:
                     self.setColumnWidth(column_number, Config.DEFAULT_COLUMN_WIDTH)
-        # Stretch last column *after* setting column widths which is
-        # *much* faster
-        h_header = self.horizontalHeader()
-        if isinstance(h_header, QHeaderView):
-            h_header.sectionResized.connect(self._column_resize)
-            h_header.setStretchLastSection(True)
 
     def set_row_as_next_track(self) -> None:
         """

test_playlistmodel.py

@@ -303,7 +303,7 @@ def test_move_one_row_between_playlists_to_end(monkeypatch, session):
     model_src = create_model_with_playlist_rows(session, create_rowcount, name="source")
     model_dst = create_model_with_playlist_rows(session, create_rowcount, name="destination")
 
-    model_src.move_rows_between_playlists(from_rows, to_row, model_dst)
+    model_src.move_rows_between_playlists(from_rows, to_row, model_dst.playlist_id)
     model_dst.refresh_data(session)
 
     assert len(model_src.playlist_rows) == create_rowcount - len(from_rows)
@@ -323,7 +323,7 @@ def test_move_one_row_between_playlists_to_middle(monkeypatch, session):
     model_src = create_model_with_playlist_rows(session, create_rowcount, name="source")
     model_dst = create_model_with_playlist_rows(session, create_rowcount, name="destination")
 
-    model_src.move_rows_between_playlists(from_rows, to_row, model_dst)
+    model_src.move_rows_between_playlists(from_rows, to_row, model_dst.playlist_id)
     model_dst.refresh_data(session)
 
     # Check the rows of the destination model
@@ -347,7 +347,7 @@ def test_move_multiple_rows_between_playlists_to_end(monkeypatch, session):
     model_src = create_model_with_playlist_rows(session, create_rowcount, name="source")
     model_dst = create_model_with_playlist_rows(session, create_rowcount, name="destination")
 
-    model_src.move_rows_between_playlists(from_rows, to_row, model_dst)
+    model_src.move_rows_between_playlists(from_rows, to_row, model_dst.playlist_id)
     model_dst.refresh_data(session)
 
     # Check the rows of the destination model