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

More typing fixes

Browse Source
This commit is contained in:
Keith Edmunds 2023-02-04 15:01:39 +00:00
parent f182f49f15
commit 9e6c700644
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/musicmuster.py
View File

@ -77,7 +77,8 @@ class CartButton(QPushButton):
self.setFont(font) self.setFont(font)
self.setObjectName("cart_" + str(cart.cart_number)) 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) self.pgb.setVisible(False)
palette = self.pgb.palette() palette = self.pgb.palette()
palette.setColor(QPalette.Highlight, palette.setColor(QPalette.Highlight,
@ -1541,7 +1542,7 @@ class CartDialog(QDialog):
class DbDialog(QDialog): class DbDialog(QDialog):
"""Select track from database""" """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: get_one_track: bool = False) -> None:
""" """
Subclassed QDialog to manage track selection Subclassed QDialog to manage track selection
@ -1563,7 +1564,6 @@ class DbDialog(QDialog):
self.ui.matchList.itemSelectionChanged.connect(self.selection_changed) self.ui.matchList.itemSelectionChanged.connect(self.selection_changed)
self.ui.radioTitle.toggled.connect(self.title_artist_toggle) self.ui.radioTitle.toggled.connect(self.title_artist_toggle)
self.ui.searchString.textEdited.connect(self.chars_typed) self.ui.searchString.textEdited.connect(self.chars_typed)
self.ui.track = None
if get_one_track: if get_one_track:
self.ui.txtNote.hide() self.ui.txtNote.hide()
@ -1597,7 +1597,7 @@ class DbDialog(QDialog):
item = self.ui.matchList.currentItem() item = self.ui.matchList.currentItem()
if item: if item:
track = item.data(Qt.UserRole) track = item.data(Qt.UserRole)
self.add_track(track) self.add_track(track)
def add_selected_and_close(self) -> None: def add_selected_and_close(self) -> None:
"""Handle Add and Close button""" """Handle Add and Close button"""

13
app/playlists.py
View File

@ -5,7 +5,7 @@ import threading
from collections import namedtuple from collections import namedtuple
from datetime import datetime, timedelta from datetime import datetime, timedelta
from typing import List, Optional from typing import cast, List, Optional
from PyQt5.QtCore import ( from PyQt5.QtCore import (
pyqtSignal, pyqtSignal,
@ -21,6 +21,7 @@ from PyQt5.QtGui import (
QColor, QColor,
QFont, QFont,
QDropEvent, QDropEvent,
QKeyEvent
) )
from PyQt5.QtWidgets import ( from PyQt5.QtWidgets import (
QAbstractItemDelegate, QAbstractItemDelegate,
@ -111,10 +112,12 @@ class NoSelectDelegate(QStyledItemDelegate):
def eventFilter(self, editor: QObject, event: QEvent): def eventFilter(self, editor: QObject, event: QEvent):
"""By default, QPlainTextEdit doesn't handle enter or return""" """By default, QPlainTextEdit doesn't handle enter or return"""
if event.type() == QEvent.KeyPress and event.key() == Qt.Key_Return: if event.type() == QEvent.KeyPress:
if event.modifiers() == Qt.ControlModifier: key_event = cast(QKeyEvent, event)
self.commitData.emit(editor) if key_event.key() == Qt.Key_Return:
self.closeEditor.emit(editor) if key_event.modifiers() == Qt.ControlModifier:
self.commitData.emit(editor)
self.closeEditor.emit(editor)
return super().eventFilter(editor, event) return super().eventFilter(editor, event)