diff --git a/app/musicmuster.py b/app/musicmuster.py index 8711bf6..735c907 100755 --- a/app/musicmuster.py +++ b/app/musicmuster.py @@ -107,7 +107,6 @@ class Window(QMainWindow, Ui_MainWindow): # Clear the search bar self.search_playlist_clear() - def closeEvent(self, event: QEvent) -> None: """Handle attempt to close main window""" @@ -152,11 +151,6 @@ class Window(QMainWindow, Ui_MainWindow): event.accept() def connect_signals_slots(self) -> None: - self.actionFind_next.triggered.connect( - lambda: self.tabPlaylist.currentWidget().search_next()) - self.actionFind_previous.triggered.connect( - lambda: self.tabPlaylist.currentWidget().search_previous()) - self.actionInsertSectionHeader.triggered.connect(self.insert_header) self.action_Clear_selection.triggered.connect(self.clear_selection) self.actionClosePlaylist.triggered.connect(self.close_playlist_tab) self.actionDownload_CSV_of_played_tracks.triggered.connect( @@ -164,27 +158,32 @@ class Window(QMainWindow, Ui_MainWindow): self.actionEnable_controls.triggered.connect( self.enable_play_next_controls) self.actionExport_playlist.triggered.connect(self.export_playlist_tab) -# self.actionImport.triggered.connect(self.import_track) self.actionFade.triggered.connect(self.fade) + self.actionFind_next.triggered.connect( + lambda: self.tabPlaylist.currentWidget().search_next()) + self.actionFind_previous.triggered.connect( + lambda: self.tabPlaylist.currentWidget().search_previous()) +# self.actionImport.triggered.connect(self.import_track) + self.actionInsertSectionHeader.triggered.connect(self.insert_header) + self.actionInsertTrack.triggered.connect(self.insert_track) # self.actionMoveSelected.triggered.connect(self.move_selected) self.actionNewPlaylist.triggered.connect(self.create_playlist) self.actionOpenPlaylist.triggered.connect(self.open_playlist) self.actionPlay_next.triggered.connect(self.play_next) self.actionSearch.triggered.connect(self.search_playlist) - self.actionInsertTrack.triggered.connect(self.insert_track) self.actionSelect_next_track.triggered.connect(self.select_next_row) # self.actionSelect_played_tracks.triggered.connect(self.select_played) self.actionSelect_previous_track.triggered.connect( self.select_previous_row) # self.actionSelect_unplayed_tracks.triggered.connect( -# self.select_unplayed) +# self.select_unplayed) self.actionSetNext.triggered.connect( lambda: self.tabPlaylist.currentWidget().set_selected_as_next()) self.actionSkipToNext.triggered.connect(self.play_next) self.actionStop.triggered.connect(self.stop) self.btnDrop3db.clicked.connect(self.drop3db) - self.btnHidePlayed.clicked.connect(self.hide_played) self.btnFade.clicked.connect(self.fade) + self.btnHidePlayed.clicked.connect(self.hide_played) self.btnStop.clicked.connect(self.stop) self.tabPlaylist.tabCloseRequested.connect(self.close_tab) self.txtSearch.returnPressed.connect(self.search_playlist_return) @@ -680,7 +679,7 @@ class Window(QMainWindow, Ui_MainWindow): # """Select all played tracks in playlist""" # # self.visible_playlist_tab().select_played_tracks() -# + def select_previous_row(self) -> None: """Select previous or first row in playlist""" @@ -1013,7 +1012,7 @@ class DbDialog(QDialog): item = self.ui.matchList.currentItem() track = item.data(Qt.UserRole) self.ui.dbPath.setText(track.path) - + def title_artist_toggle(self) -> None: """ Handle switching between searching for artists and searching for @@ -1097,7 +1096,8 @@ if __name__ == "__main__": # # group.add_argument('-f', '--full-update', # # action="store_true", dest="full_update", # # default=False, help="Update database") - # # group.add_argument('-i', '--import', dest="fname", help="Input file") + # # group.add_argument('-i', '--import', dest="fname", help="Input + # file") # args = p.parse_args() # # # Run as required diff --git a/app/playlists.py b/app/playlists.py index e5d8bae..cc9da55 100644 --- a/app/playlists.py +++ b/app/playlists.py @@ -719,7 +719,8 @@ class PlaylistTab(QTableWidget): Populate from the associated playlist ID """ - # data: List[Union[Tuple[List[int], Tracks], Tuple[List[int], Notes]]] \ + # data: List[Union[Tuple[List[int], Tracks], Tuple[List[int], + # Notes]]] \ # = [] # item: Union[Notes, Tracks] # note: Notes @@ -1276,9 +1277,6 @@ class PlaylistTab(QTableWidget): if start_row is None: start_row = 0 - - - def _find_next_track_row(self, session: Session, starting_row: int = None) -> Optional[int]: """ @@ -1460,7 +1458,8 @@ class PlaylistTab(QTableWidget): info.exec() # # def _insert_note(self, session: Session, note: Notes, -# row: Optional[int] = None, repaint: bool = True) -> None: +# row: Optional[int] = None, repaint: bool = True) -> +# None: # """ # Insert a note to playlist tab. #