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

Clear drag mode with clear selection

Browse Source
This commit is contained in:
Keith Edmunds 2022-08-07 11:54:18 +01:00
parent 96255e83ea
commit 91841cfc18
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/musicmuster.py
View File

@ -91,14 +91,14 @@ class Window(QMainWindow, Ui_MainWindow):
# self.txtSearch.setHidden(True) # self.txtSearch.setHidden(True)
# self.hide_played_tracks = False # self.hide_played_tracks = False
# #
# self.visible_playlist_tab: Callable[[], PlaylistTab] = \ self.visible_playlist_tab: Callable[[], PlaylistTab] = \
# self.tabPlaylist.currentWidget self.tabPlaylist.currentWidget
# #
self._load_last_playlists() self._load_last_playlists()
# self.enable_play_next_controls() # self.enable_play_next_controls()
# self.check_audacity() # self.check_audacity()
# self.timer.start(Config.TIMER_MS) # self.timer.start(Config.TIMER_MS)
# self.connect_signals_slots() self.connect_signals_slots()
# #
# def set_main_window_size(self) -> None: # def set_main_window_size(self) -> None:
# """Set size of window from database""" # """Set size of window from database"""
@ -133,12 +133,12 @@ class Window(QMainWindow, Ui_MainWindow):
# #
# if helpers.ask_yes_no("Audacity not running", "Start Audacity?"): # if helpers.ask_yes_no("Audacity not running", "Start Audacity?"):
# QProcess.startDetached(Config.AUDACITY_COMMAND, []) # QProcess.startDetached(Config.AUDACITY_COMMAND, [])
#
# def clear_selection(self): def clear_selection(self) -> None:
# """ Clear selected row""" """ Clear selected row"""
#
# if self.visible_playlist_tab(): if self.visible_playlist_tab():
# self.visible_playlist_tab().clearSelection() self.visible_playlist_tab().clear_selection()
# #
# def closeEvent(self, event: QEvent) -> None: # def closeEvent(self, event: QEvent) -> None:
# """Don't allow window to close when a track is playing""" # """Don't allow window to close when a track is playing"""
@ -178,10 +178,10 @@ class Window(QMainWindow, Ui_MainWindow):
# self.next_track_playlist_tab.close() # self.next_track_playlist_tab.close()
# #
# event.accept() # event.accept()
#
# def connect_signals_slots(self) -> None: def connect_signals_slots(self) -> None:
# self.actionAdd_note.triggered.connect(self.create_note) # self.actionAdd_note.triggered.connect(self.create_note)
# self.action_Clear_selection.triggered.connect(self.clear_selection) self.action_Clear_selection.triggered.connect(self.clear_selection)
# self.actionClosePlaylist.triggered.connect(self.close_playlist_tab) # self.actionClosePlaylist.triggered.connect(self.close_playlist_tab)
# self.actionDownload_CSV_of_played_tracks.triggered.connect( # self.actionDownload_CSV_of_played_tracks.triggered.connect(
# self.download_played_tracks) # self.download_played_tracks)

13
app/playlists.py
View File

@ -1,9 +1,6 @@
from collections import namedtuple from collections import namedtuple
# from enum import Enum, auto
from typing import List, Optional from typing import List, Optional
# from typing import Dict, List, Optional, Set, Tuple, Union
#
# from PyQt5 import QtCore # from PyQt5 import QtCore
from PyQt5.QtCore import Qt from PyQt5.QtCore import Qt
from PyQt5.QtGui import ( from PyQt5.QtGui import (
@ -305,6 +302,12 @@ class PlaylistTab(QTableWidget):
# # ########## Externally called functions ########## # # ########## Externally called functions ##########
# #
def clear_selection(self) -> None:
"""Unselect all tracks and reset drag mode"""
self.clearSelection()
self.setDragEnabled(False)
# def closeEvent(self, event) -> None: # def closeEvent(self, event) -> None:
# """Save column widths""" # """Save column widths"""
# #
@ -876,7 +879,7 @@ class PlaylistTab(QTableWidget):
# Clear selection if required # Clear selection if required
if clear_selection: if clear_selection:
self.clearSelection() self.clear_selection()
current_row: Optional[int] = self._get_current_track_row() current_row: Optional[int] = self._get_current_track_row()
next_row: Optional[int] = self._get_next_track_row() next_row: Optional[int] = self._get_next_track_row()
@ -1712,7 +1715,7 @@ class PlaylistTab(QTableWidget):
# #
# # Need to allow multiple rows to be selected # # Need to allow multiple rows to be selected
# self.setSelectionMode(QtWidgets.QAbstractItemView.MultiSelection) # self.setSelectionMode(QtWidgets.QAbstractItemView.MultiSelection)
# self.clearSelection() # self.clear_selection()
# #
# if played: # if played:
# rows = self._get_played_track_rows() # rows = self._get_played_track_rows()