From 9e6c70064406207430bf36c72cd996b6080628cb Mon Sep 17 00:00:00 2001
From: Keith Edmunds <kae@tiger-computing.co.uk>
Date: Sat, 4 Feb 2023 15:01:39 +0000
Subject: [PATCH] More typing fixes

---
 app/musicmuster.py |  8 ++++----
 app/playlists.py   | 13 ++++++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/musicmuster.py b/app/musicmuster.py
index e9c731f..6f5d3e8 100755
--- a/app/musicmuster.py
+++ b/app/musicmuster.py
@@ -77,7 +77,8 @@ class CartButton(QPushButton):
         self.setFont(font)
         self.setObjectName("cart_" + str(cart.cart_number))
 
-        self.pgb = QProgressBar(self, textVisible=False)
+        self.pgb = QProgressBar(self)
+        self.pgb.setTextVisible(False)
         self.pgb.setVisible(False)
         palette = self.pgb.palette()
         palette.setColor(QPalette.Highlight,
@@ -1541,7 +1542,7 @@ class CartDialog(QDialog):
 class DbDialog(QDialog):
     """Select track from database"""
 
-    def __init__(self, parent: QMainWindow, session: scoped_session,
+    def __init__(self, parent: Window, session: scoped_session,
                  get_one_track: bool = False) -> None:
         """
         Subclassed QDialog to manage track selection
@@ -1563,7 +1564,6 @@ class DbDialog(QDialog):
         self.ui.matchList.itemSelectionChanged.connect(self.selection_changed)
         self.ui.radioTitle.toggled.connect(self.title_artist_toggle)
         self.ui.searchString.textEdited.connect(self.chars_typed)
-        self.ui.track = None
 
         if get_one_track:
             self.ui.txtNote.hide()
@@ -1597,7 +1597,7 @@ class DbDialog(QDialog):
         item = self.ui.matchList.currentItem()
         if item:
             track = item.data(Qt.UserRole)
-        self.add_track(track)
+            self.add_track(track)
 
     def add_selected_and_close(self) -> None:
         """Handle Add and Close button"""
diff --git a/app/playlists.py b/app/playlists.py
index 6b22417..b855af8 100644
--- a/app/playlists.py
+++ b/app/playlists.py
@@ -5,7 +5,7 @@ import threading
 
 from collections import namedtuple
 from datetime import datetime, timedelta
-from typing import List, Optional
+from typing import cast, List, Optional
 
 from PyQt5.QtCore import (
     pyqtSignal,
@@ -21,6 +21,7 @@ from PyQt5.QtGui import (
     QColor,
     QFont,
     QDropEvent,
+    QKeyEvent
 )
 from PyQt5.QtWidgets import (
     QAbstractItemDelegate,
@@ -111,10 +112,12 @@ class NoSelectDelegate(QStyledItemDelegate):
     def eventFilter(self, editor: QObject, event: QEvent):
         """By default, QPlainTextEdit doesn't handle enter or return"""
 
-        if event.type() == QEvent.KeyPress and event.key() == Qt.Key_Return:
-            if event.modifiers() == Qt.ControlModifier:
-                self.commitData.emit(editor)
-                self.closeEditor.emit(editor)
+        if event.type() == QEvent.KeyPress:
+            key_event = cast(QKeyEvent, event)
+            if key_event.key() == Qt.Key_Return:
+                if key_event.modifiers() == Qt.ControlModifier:
+                    self.commitData.emit(editor)
+                    self.closeEditor.emit(editor)
 
         return super().eventFilter(editor, event)