Compare commits

..

2 Commits

Author SHA1 Message Date
Keith Edmunds
243bc765f9 Clean up editing
No need to disable (and re-enable) play controls.

Fixes #191
2023-12-01 22:44:28 +00:00
Keith Edmunds
1b92b79cf0 Stop inadvertent editing of cell after cancelling search 2023-12-01 18:45:30 +00:00
2 changed files with 5 additions and 35 deletions

View File

@ -1222,12 +1222,6 @@ class Window(QMainWindow, Ui_MainWindow):
self.txtSearch.setText("") self.txtSearch.setText("")
self.txtSearch.setHidden(True) self.txtSearch.setHidden(True)
def search_playlist_return(self) -> None:
"""Initiate search when return pressed"""
self.active_tab().set_search(self.txtSearch.text())
self.enable_play_next_controls()
def search_playlist_text_changed(self) -> None: def search_playlist_text_changed(self) -> None:
""" """
Incremental search of playlist Incremental search of playlist

View File

@ -212,8 +212,6 @@ class PlaylistTab(QTableView):
Override closeEditor to enable play controls and update display. Override closeEditor to enable play controls and update display.
""" """
self.musicmuster.enable_play_next_controls()
self.musicmuster.actionSetNext.setEnabled(True)
self.musicmuster.action_Clear_selection.setEnabled(True) self.musicmuster.action_Clear_selection.setEnabled(True)
super(PlaylistTab, self).closeEditor(editor, hint) super(PlaylistTab, self).closeEditor(editor, hint)
@ -255,33 +253,6 @@ class PlaylistTab(QTableView):
event.accept() event.accept()
@overload
def edit(self, index: QModelIndex) -> None:
...
@overload
def edit(
self,
index: QModelIndex,
trigger: QAbstractItemView.EditTrigger,
event: Optional[QEvent]
) -> bool:
...
def edit(self, index, trigger, event):
"""
Override QAbstractItemView.edit to catch when editing starts
Editing only ever starts with a double click on a cell
"""
# 'result' will only be true on double-click
result = super().edit(index, trigger, event)
if result:
self.musicmuster.disable_play_next_controls()
return result
def mouseReleaseEvent(self, event): def mouseReleaseEvent(self, event):
""" """
Enable dragging if rows are selected Enable dragging if rows are selected
@ -460,6 +431,11 @@ class PlaylistTab(QTableView):
"""Unselect all tracks and reset drag mode""" """Unselect all tracks and reset drag mode"""
self.clearSelection() self.clearSelection()
# We want to remove the focus from any widget otherwise keyboard
# activity may edit a cell.
fw = self.musicmuster.focusWidget()
if fw:
fw.clearFocus()
self.setDragEnabled(False) self.setDragEnabled(False)
def _column_resize(self, column_number: int, _old: int, _new: int) -> None: def _column_resize(self, column_number: int, _old: int, _new: int) -> None: