InterceptEscapeWhenEditingTableCell.py

@@ -1,81 +0,0 @@
-#!/usr/bin/env python3
-
-from PyQt6.QtCore import Qt, QEvent, QObject
-from PyQt6.QtWidgets import (
-    QAbstractItemDelegate,
-    QAbstractItemView,
-    QApplication,
-    QMainWindow,
-    QMessageBox,
-    QPlainTextEdit,
-    QStyledItemDelegate,
-    QStyleOptionViewItem,
-    QTableWidget,
-    QTableWidgetItem,
-)
-
-from PyQt6.QtGui import QKeyEvent
-
-from typing import cast
-
-
-class EscapeDelegate(QStyledItemDelegate):
-    def __init__(self, parent=None):
-        super().__init__(parent)
-
-    def createEditor(self, parent, option, index):
-        return QPlainTextEdit(parent)
-
-    def eventFilter(self, editor: QObject, event: QEvent):
-        """By default, QPlainTextEdit doesn't handle enter or return"""
-
-        print("EscapeDelegate event handler")
-        if event.type() == QEvent.Type.KeyPress:
-            key_event = cast(QKeyEvent, event)
-            if key_event.key() == Qt.Key.Key_Return:
-                if key_event.modifiers() == (
-                    Qt.KeyboardModifier.ControlModifier
-                ):
-                    print("save data")
-                    self.commitData.emit(editor)
-                    self.closeEditor.emit(editor)
-                    return True
-            elif key_event.key() == Qt.Key.Key_Escape:
-                discard_edits = QMessageBox.question(
-                    self.parent(), "Abandon edit", "Discard changes?")
-                if discard_edits == QMessageBox.StandardButton.Yes:
-                    print("abandon edit")
-                    self.closeEditor.emit(editor)
-                    return True
-        return False
-
-
-class MyTableWidget(QTableWidget):
-    def __init__(self, parent=None):
-        super().__init__(parent)
-        self.setItemDelegate(EscapeDelegate(self))
-        self.setEditTriggers(QAbstractItemView.EditTrigger.DoubleClicked)
-
-
-class MainWindow(QMainWindow):
-    def __init__(self, parent=None):
-        super().__init__(parent)
-        self.table_widget = MyTableWidget(self)
-        self.table_widget.setRowCount(2)
-        self.table_widget.setColumnCount(2)
-        for row in range(2):
-            for col in range(2):
-                item = QTableWidgetItem()
-                item.setText(f"Row {row}, Col {col}")
-                self.table_widget.setItem(row, col, item)
-        self.setCentralWidget(self.table_widget)
-
-        self.table_widget.resizeColumnsToContents()
-        self.table_widget.resizeRowsToContents()
-
-
-if __name__ == '__main__':
-    app = QApplication([])
-    window = MainWindow()
-    window.show()
-    app.exec()

app/music.py

@@ -130,7 +130,7 @@ class Music:
 
         return status
 
-    def set_volume(self, volume=None, set_default=True):
+    def set_volume(self, volume, set_default=True):
         """Set maximum volume used for player"""
 
         if not self.player:
@@ -139,9 +139,6 @@ class Music:
         if set_default:
             self.max_volume = volume
 
-        if volume is None:
-            volume = Config.VOLUME_VLC_DEFAULT
-
         self.player.audio_set_volume(volume)
 
     def stop(self) -> float:

app/musicmuster.py

@@ -301,29 +301,6 @@ class Window(QMainWindow, Ui_MainWindow):
         self.timer.start(Config.TIMER_MS)
         self.connect_signals_slots()
 
-    def about(self) -> None:
-        """Get git tag and database name"""
-
-        try:
-            git_tag = str(
-                subprocess.check_output(
-                    ['git', 'describe'], stderr=subprocess.STDOUT
-                )
-            ).strip('\'b\\n')
-        except subprocess.CalledProcessError as exc_info:
-            git_tag = str(exc_info.output)
-
-        with Session() as session:
-            if session.bind:
-                dbname = session.bind.engine.url.database
-
-        QMessageBox.information(
-            self,
-            "About",
-            f"MusicMuster {git_tag}\n\nDatabase: {dbname}",
-            QMessageBox.StandardButton.Ok
-        )
-
     def cart_configure(self, cart: Carts, btn: CartButton) -> None:
         """Configure button with cart data"""
 
@@ -844,6 +821,29 @@ class Window(QMainWindow, Ui_MainWindow):
 
         self.stop_playing(fade=True)
 
+    def about(self) -> None:
+        """Get git tag and database name"""
+
+        try:
+            git_tag = str(
+                subprocess.check_output(
+                    ['git', 'describe'], stderr=subprocess.STDOUT
+                )
+            ).strip('\'b\\n')
+        except subprocess.CalledProcessError as exc_info:
+            git_tag = str(exc_info.output)
+
+        with Session() as session:
+            if session.bind:
+                dbname = session.bind.engine.url.database
+
+        QMessageBox.information(
+            self,
+            "About",
+            f"MusicMuster {git_tag}\n\nDatabase: {dbname}",
+            QMessageBox.StandardButton.Ok
+        )
+
     def get_one_track(self, session: scoped_session) -> Optional[Tracks]:
         """Show dialog box to select one track and return it to caller"""
 
@@ -1234,18 +1234,6 @@ class Window(QMainWindow, Ui_MainWindow):
             # Play (new) current track
             self.current_track.start()
             self.music.play(self.current_track.path, position)
-            # For as-yet unknown reasons. sometimes the volume gets
-            # reset to zero within 200mS or so of starting play. This
-            # only happened since moving to Debian 12, which uses
-            # Pipewire for sound (which may be irrelevant).
-            for _ in range(3):
-                if self.music.player:
-                    volume = self.music.player.audio_get_volume()
-                    if volume < 10:
-                        self.music.set_volume()
-                        log.error(f"Reset from {volume=}")
-                        break
-                sleep(0.1)
 
             # Tell database to record it as played
             Playdates(session, self.current_track.track_id)

app/playlists.py

@@ -99,16 +99,20 @@ BITRATE = columns["bitrate"].idx
 ROW_NOTES = columns["row_notes"].idx
 
 
-class EscapeDelegate(QStyledItemDelegate):
+class NoSelectDelegate(QStyledItemDelegate):
     """
+    This originally used the following link to not select text on edit;
+    however, using a QPlainTextBox means a) text isn't selected anyway and
+    b) it provides a multiline edit.
+
+    https://stackoverflow.com/questions/72790705/
+    dont-select-text-in-qtablewidget-cell-when-editing/72792962#72792962
+
+    Now this:
      - increases the height of a row when editing to make editing easier
      - closes the edit on control-return
-     - checks with user before abandoning edit on Escape
     """
 
-    def __init__(self, parent) -> None:
-        super().__init__(parent)
-
     def createEditor(self, parent: QWidget, option: QStyleOptionViewItem,
                      index: QModelIndex):
         """
@@ -124,7 +128,7 @@ class EscapeDelegate(QStyledItemDelegate):
             return QPlainTextEdit(parent)
         return super().createEditor(parent, option, index)
 
-    def eventFilter(self, editor: QObject, event: QEvent) -> bool:
+    def eventFilter(self, editor: QObject, event: QEvent):
         """By default, QPlainTextEdit doesn't handle enter or return"""
 
         if event.type() == QEvent.Type.KeyPress:
@@ -135,14 +139,8 @@ class EscapeDelegate(QStyledItemDelegate):
                 ):
                     self.commitData.emit(editor)
                     self.closeEditor.emit(editor)
-                    return True
-            elif key_event.key() == Qt.Key.Key_Escape:
-                discard_edits = QMessageBox.question(
-                    self.parent(), "Abandon edit", "Discard changes?")
-                if discard_edits == QMessageBox.StandardButton.Yes:
-                    self.closeEditor.emit(editor)
-                    return True
-        return False
+
+        return super().eventFilter(editor, event)
 
 
 class PlaylistTab(QTableWidget):
@@ -163,13 +161,13 @@ class PlaylistTab(QTableWidget):
 
         # Set up widget
         self.menu = QMenu()
-        self.setItemDelegate(EscapeDelegate(self))
+        self.setItemDelegate(NoSelectDelegate(self))
+        self.setEditTriggers(QAbstractItemView.EditTrigger.DoubleClicked)
         self.setAlternatingRowColors(True)
         self.setSelectionMode(
             QAbstractItemView.SelectionMode.ExtendedSelection)
         self.setSelectionBehavior(
             QAbstractItemView.SelectionBehavior.SelectRows)
-        self.setEditTriggers(QAbstractItemView.EditTrigger.DoubleClicked)
         self.setVerticalScrollMode(QAbstractItemView.ScrollMode.ScrollPerPixel)
         self.setRowCount(0)
         self.setColumnCount(len(columns))
@@ -293,8 +291,8 @@ class PlaylistTab(QTableWidget):
             self.setDragEnabled(False)
         super().mouseReleaseEvent(event)
 
-# ########## Cell editing ##########
-
+    # ########## Cell editing ##########
+    #
     # We only want to allow cell editing on tracks, artists and notes,
     # although notes may be section headers.
     #
@@ -394,7 +392,6 @@ class PlaylistTab(QTableWidget):
         self.edit_cell_type = None
         self.musicmuster.enable_play_next_controls()
         self.musicmuster.actionSetNext.setEnabled(True)
-        self.musicmuster.action_Clear_selection.setEnabled(True)
 
         super(PlaylistTab, self).closeEditor(editor, hint)
 
@@ -444,7 +441,6 @@ class PlaylistTab(QTableWidget):
             # disturb playing
             self.musicmuster.disable_play_next_controls()
             self.musicmuster.actionSetNext.setEnabled(False)
-            self.musicmuster.action_Clear_selection.setEnabled(False)
 
             # If this is a note cell, we need to remove any existing section
             # timing so user can't edit that. Keep it simple: refresh text