From d7a37151b71c48611108c49b4db16b7cf6b25eb7 Mon Sep 17 00:00:00 2001 From: Keith Edmunds Date: Mon, 22 Jul 2024 16:27:31 +0100 Subject: [PATCH] Fixup type hints, renamed function --- app/musicmuster.py | 4 +- app/playlistmodel.py | 65 ++++----- app/ui/main_window.ui | 2 +- app/ui/main_window_ui.py | 304 +++++++++------------------------------ 4 files changed, 107 insertions(+), 268 deletions(-) diff --git a/app/musicmuster.py b/app/musicmuster.py index 99ad8f9..2150365 100755 --- a/app/musicmuster.py +++ b/app/musicmuster.py @@ -472,7 +472,7 @@ class Window(QMainWindow, Ui_MainWindow): self.actionPaste.triggered.connect(self.paste_rows) self.actionPlay_next.triggered.connect(self.play_next) self.actionRenamePlaylist.triggered.connect(self.rename_playlist) - self.actionReplace_files.triggered.connect(self.replace_files) + self.actionReplace_files.triggered.connect(self.import_files) self.actionResume.triggered.connect(self.resume) self.actionSave_as_template.triggered.connect(self.save_as_template) self.actionSearch_title_in_Songfacts.triggered.connect( @@ -1290,7 +1290,7 @@ class Window(QMainWindow, Ui_MainWindow): self.tabBar.setTabText(idx, new_name) session.commit() - def replace_files(self) -> None: + def import_files(self) -> None: """ Scan source directory and offer to replace existing files with "similar" files, or import the source file as a new track. diff --git a/app/playlistmodel.py b/app/playlistmodel.py index c925354..ee5e9bb 100644 --- a/app/playlistmodel.py +++ b/app/playlistmodel.py @@ -4,7 +4,7 @@ from __future__ import annotations from operator import attrgetter from random import shuffle -from typing import List, Optional +from typing import Optional import datetime as dt import re @@ -349,7 +349,7 @@ class PlaylistModel(QAbstractTableModel): # Fall through to no-op return QVariant() - def delete_rows(self, row_numbers: List[int]) -> None: + def delete_rows(self, row_numbers: list[int]) -> None: """ Delete passed rows from model @@ -506,7 +506,7 @@ class PlaylistModel(QAbstractTableModel): return QVariant(boldfont) - def get_duplicate_rows(self) -> List[int]: + def get_duplicate_rows(self) -> list[int]: """ Return a list of duplicate rows. If track appears in rows 2, 3 and 4, return [3, 4] (ie, ignore the first, not-yet-duplicate, track). @@ -572,7 +572,7 @@ class PlaylistModel(QAbstractTableModel): return self.playlist_rows[row_number].path - def get_rows_duration(self, row_numbers: List[int]) -> int: + def get_rows_duration(self, row_numbers: list[int]) -> int: """ Return the total duration of the passed rows """ @@ -583,7 +583,7 @@ class PlaylistModel(QAbstractTableModel): return duration - def get_unplayed_rows(self) -> List[int]: + def get_unplayed_rows(self) -> list[int]: """ Return a list of unplayed row numbers """ @@ -782,7 +782,7 @@ class PlaylistModel(QAbstractTableModel): self.index(modified_row, self.columnCount() - 1), ) - def invalidate_rows(self, modified_rows: List[int]) -> None: + def invalidate_rows(self, modified_rows: list[int]) -> None: """ Signal to view to refresh invlidated rows """ @@ -818,7 +818,7 @@ class PlaylistModel(QAbstractTableModel): return None - def mark_unplayed(self, row_numbers: List[int]) -> None: + def mark_unplayed(self, row_numbers: list[int]) -> None: """ Mark row as unplayed """ @@ -832,9 +832,10 @@ class PlaylistModel(QAbstractTableModel): session.commit() self.refresh_row(session, row_number) + self.update_track_times() self.invalidate_rows(row_numbers) - def move_rows(self, from_rows: List[int], to_row_number: int) -> None: + def move_rows(self, from_rows: list[int], to_row_number: int) -> None: """ Move the playlist rows given to to_row and below. """ @@ -895,7 +896,7 @@ class PlaylistModel(QAbstractTableModel): # For SQLAlchemy, build a list of dictionaries that map plrid to # new row number: - sqla_map: List[dict[str, int]] = [] + sqla_map: list[dict[str, int]] = [] for oldrow, newrow in row_map.items(): plrid = self.playlist_rows[oldrow].plrid sqla_map.append({"plrid": plrid, "plr_rownum": newrow}) @@ -911,7 +912,7 @@ class PlaylistModel(QAbstractTableModel): self.invalidate_rows(list(row_map.keys())) def move_rows_between_playlists( - self, from_rows: List[int], to_row_number: int, to_playlist_id: int + self, from_rows: list[int], to_row_number: int, to_playlist_id: int ) -> None: """ Move the playlist rows given to to_row and below of to_playlist. @@ -1149,8 +1150,8 @@ class PlaylistModel(QAbstractTableModel): self.update_track_times() def _reversed_contiguous_row_groups( - self, row_numbers: List[int] - ) -> List[List[int]]: + self, row_numbers: list[int] + ) -> list[list[int]]: """ Take the list of row numbers and split into groups of contiguous rows. Return as a list of lists with the highest row numbers first. @@ -1162,8 +1163,8 @@ class PlaylistModel(QAbstractTableModel): log.debug(f"_reversed_contiguous_row_groups({row_numbers=} called") - result: List[List[int]] = [] - temp: List[int] = [] + result: list[list[int]] = [] + temp: list[int] = [] last_value = row_numbers[0] - 1 for idx in range(len(row_numbers)): @@ -1324,14 +1325,14 @@ class PlaylistModel(QAbstractTableModel): return False - def sort_by_artist(self, row_numbers: List[int]) -> None: + def sort_by_artist(self, row_numbers: list[int]) -> None: """ Sort selected rows by artist """ self.sort_by_attribute(row_numbers, "artist") - def sort_by_attribute(self, row_numbers: List[int], attr_name: str) -> None: + def sort_by_attribute(self, row_numbers: list[int], attr_name: str) -> None: """ Sort selected rows by passed attribute name where 'attribute' is a key in PlaylistRowData @@ -1346,21 +1347,21 @@ class PlaylistModel(QAbstractTableModel): ] self.move_rows(sorted_list, min(sorted_list)) - def sort_by_duration(self, row_numbers: List[int]) -> None: + def sort_by_duration(self, row_numbers: list[int]) -> None: """ Sort selected rows by duration """ self.sort_by_attribute(row_numbers, "duration") - def sort_by_lastplayed(self, row_numbers: List[int]) -> None: + def sort_by_lastplayed(self, row_numbers: list[int]) -> None: """ Sort selected rows by lastplayed """ self.sort_by_attribute(row_numbers, "lastplayed") - def sort_randomly(self, row_numbers: List[int]) -> None: + def sort_randomly(self, row_numbers: list[int]) -> None: """ Sort selected rows randomly """ @@ -1368,7 +1369,7 @@ class PlaylistModel(QAbstractTableModel): shuffle(row_numbers) self.move_rows(row_numbers, min(row_numbers)) - def sort_by_title(self, row_numbers: List[int]) -> None: + def sort_by_title(self, row_numbers: list[int]) -> None: """ Sort selected rows by title """ @@ -1596,13 +1597,13 @@ class PlaylistProxyModel(QSortFilterProxyModel): def current_track_started(self): return self.source_model.current_track_started() - def delete_rows(self, row_numbers: List[int]) -> None: + def delete_rows(self, row_numbers: list[int]) -> None: return self.source_model.delete_rows(row_numbers) - def get_duplicate_rows(self) -> List[int]: + def get_duplicate_rows(self) -> list[int]: return self.source_model.get_duplicate_rows() - def get_rows_duration(self, row_numbers: List[int]) -> int: + def get_rows_duration(self, row_numbers: list[int]) -> int: return self.source_model.get_rows_duration(row_numbers) def get_row_info(self, row_number: int) -> _PlaylistRowData: @@ -1611,7 +1612,7 @@ class PlaylistProxyModel(QSortFilterProxyModel): def get_row_track_path(self, row_number: int) -> str: return self.source_model.get_row_track_path(row_number) - def get_unplayed_rows(self) -> List[int]: + def get_unplayed_rows(self) -> list[int]: return self.source_model.get_unplayed_rows() def hide_played_tracks(self, hide: bool) -> None: @@ -1634,14 +1635,14 @@ class PlaylistProxyModel(QSortFilterProxyModel): def is_track_in_playlist(self, track_id: int) -> Optional[_PlaylistRowData]: return self.source_model.is_track_in_playlist(track_id) - def mark_unplayed(self, row_numbers: List[int]) -> None: + def mark_unplayed(self, row_numbers: list[int]) -> None: return self.source_model.mark_unplayed(row_numbers) - def move_rows(self, from_rows: List[int], to_row_number: int) -> None: + def move_rows(self, from_rows: list[int], to_row_number: int) -> None: return self.source_model.move_rows(from_rows, to_row_number) def move_rows_between_playlists( - self, from_rows: List[int], to_row_number: int, to_playlist_id: int + self, from_rows: list[int], to_row_number: int, to_playlist_id: int ) -> None: return self.source_model.move_rows_between_playlists( from_rows, to_row_number, to_playlist_id @@ -1674,19 +1675,19 @@ class PlaylistProxyModel(QSortFilterProxyModel): def set_next_row(self, row_number: Optional[int]) -> bool: return self.source_model.set_next_row(row_number) - def sort_by_artist(self, row_numbers: List[int]) -> None: + def sort_by_artist(self, row_numbers: list[int]) -> None: return self.source_model.sort_by_artist(row_numbers) - def sort_by_duration(self, row_numbers: List[int]) -> None: + def sort_by_duration(self, row_numbers: list[int]) -> None: return self.source_model.sort_by_duration(row_numbers) - def sort_by_lastplayed(self, row_numbers: List[int]) -> None: + def sort_by_lastplayed(self, row_numbers: list[int]) -> None: return self.source_model.sort_by_lastplayed(row_numbers) - def sort_randomly(self, row_numbers: List[int]) -> None: + def sort_randomly(self, row_numbers: list[int]) -> None: return self.source_model.sort_randomly(row_numbers) - def sort_by_title(self, row_numbers: List[int]) -> None: + def sort_by_title(self, row_numbers: list[int]) -> None: return self.source_model.sort_by_title(row_numbers) def update_track_times(self) -> None: diff --git a/app/ui/main_window.ui b/app/ui/main_window.ui index d7491b4..7a26f6f 100644 --- a/app/ui/main_window.ui +++ b/app/ui/main_window.ui @@ -1367,7 +1367,7 @@ padding-left: 8px; - Replace files... + Import files... diff --git a/app/ui/main_window_ui.py b/app/ui/main_window_ui.py index 204c1b6..e41eff2 100644 --- a/app/ui/main_window_ui.py +++ b/app/ui/main_window_ui.py @@ -15,11 +15,7 @@ class Ui_MainWindow(object): MainWindow.resize(1280, 857) MainWindow.setMinimumSize(QtCore.QSize(1280, 0)) icon = QtGui.QIcon() - icon.addPixmap( - QtGui.QPixmap(":/icons/musicmuster"), - QtGui.QIcon.Mode.Normal, - QtGui.QIcon.State.Off, - ) + icon.addPixmap(QtGui.QPixmap(":/icons/musicmuster"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) MainWindow.setWindowIcon(icon) MainWindow.setStyleSheet("") self.centralwidget = QtWidgets.QWidget(parent=MainWindow) @@ -31,62 +27,39 @@ class Ui_MainWindow(object): self.verticalLayout_3 = QtWidgets.QVBoxLayout() self.verticalLayout_3.setObjectName("verticalLayout_3") self.previous_track_2 = QtWidgets.QLabel(parent=self.centralwidget) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Policy.Preferred, - QtWidgets.QSizePolicy.Policy.Preferred, - ) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth( - self.previous_track_2.sizePolicy().hasHeightForWidth() - ) + sizePolicy.setHeightForWidth(self.previous_track_2.sizePolicy().hasHeightForWidth()) self.previous_track_2.setSizePolicy(sizePolicy) self.previous_track_2.setMaximumSize(QtCore.QSize(230, 16777215)) font = QtGui.QFont() font.setFamily("Sans") font.setPointSize(20) self.previous_track_2.setFont(font) - self.previous_track_2.setStyleSheet( - "background-color: #f8d7da;\n" "border: 1px solid rgb(85, 87, 83);" - ) - self.previous_track_2.setAlignment( - QtCore.Qt.AlignmentFlag.AlignRight - | QtCore.Qt.AlignmentFlag.AlignTrailing - | QtCore.Qt.AlignmentFlag.AlignVCenter - ) + self.previous_track_2.setStyleSheet("background-color: #f8d7da;\n" +"border: 1px solid rgb(85, 87, 83);") + self.previous_track_2.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.previous_track_2.setObjectName("previous_track_2") self.verticalLayout_3.addWidget(self.previous_track_2) self.current_track_2 = QtWidgets.QLabel(parent=self.centralwidget) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Policy.Preferred, - QtWidgets.QSizePolicy.Policy.Preferred, - ) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth( - self.current_track_2.sizePolicy().hasHeightForWidth() - ) + sizePolicy.setHeightForWidth(self.current_track_2.sizePolicy().hasHeightForWidth()) self.current_track_2.setSizePolicy(sizePolicy) self.current_track_2.setMaximumSize(QtCore.QSize(230, 16777215)) font = QtGui.QFont() font.setFamily("Sans") font.setPointSize(20) self.current_track_2.setFont(font) - self.current_track_2.setStyleSheet( - "background-color: #d4edda;\n" "border: 1px solid rgb(85, 87, 83);" - ) - self.current_track_2.setAlignment( - QtCore.Qt.AlignmentFlag.AlignRight - | QtCore.Qt.AlignmentFlag.AlignTrailing - | QtCore.Qt.AlignmentFlag.AlignVCenter - ) + self.current_track_2.setStyleSheet("background-color: #d4edda;\n" +"border: 1px solid rgb(85, 87, 83);") + self.current_track_2.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.current_track_2.setObjectName("current_track_2") self.verticalLayout_3.addWidget(self.current_track_2) self.next_track_2 = QtWidgets.QLabel(parent=self.centralwidget) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Policy.Preferred, - QtWidgets.QSizePolicy.Policy.Preferred, - ) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.next_track_2.sizePolicy().hasHeightForWidth()) @@ -96,29 +69,19 @@ class Ui_MainWindow(object): font.setFamily("Sans") font.setPointSize(20) self.next_track_2.setFont(font) - self.next_track_2.setStyleSheet( - "background-color: #fff3cd;\n" "border: 1px solid rgb(85, 87, 83);" - ) - self.next_track_2.setAlignment( - QtCore.Qt.AlignmentFlag.AlignRight - | QtCore.Qt.AlignmentFlag.AlignTrailing - | QtCore.Qt.AlignmentFlag.AlignVCenter - ) + self.next_track_2.setStyleSheet("background-color: #fff3cd;\n" +"border: 1px solid rgb(85, 87, 83);") + self.next_track_2.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.next_track_2.setObjectName("next_track_2") self.verticalLayout_3.addWidget(self.next_track_2) self.horizontalLayout_3.addLayout(self.verticalLayout_3) self.verticalLayout = QtWidgets.QVBoxLayout() self.verticalLayout.setObjectName("verticalLayout") self.hdrPreviousTrack = QtWidgets.QLabel(parent=self.centralwidget) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Policy.Preferred, - QtWidgets.QSizePolicy.Policy.Preferred, - ) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth( - self.hdrPreviousTrack.sizePolicy().hasHeightForWidth() - ) + sizePolicy.setHeightForWidth(self.hdrPreviousTrack.sizePolicy().hasHeightForWidth()) self.hdrPreviousTrack.setSizePolicy(sizePolicy) self.hdrPreviousTrack.setMinimumSize(QtCore.QSize(0, 0)) self.hdrPreviousTrack.setMaximumSize(QtCore.QSize(16777215, 16777215)) @@ -126,43 +89,32 @@ class Ui_MainWindow(object): font.setFamily("Sans") font.setPointSize(20) self.hdrPreviousTrack.setFont(font) - self.hdrPreviousTrack.setStyleSheet( - "background-color: #f8d7da;\n" "border: 1px solid rgb(85, 87, 83);" - ) + self.hdrPreviousTrack.setStyleSheet("background-color: #f8d7da;\n" +"border: 1px solid rgb(85, 87, 83);") self.hdrPreviousTrack.setText("") self.hdrPreviousTrack.setWordWrap(False) self.hdrPreviousTrack.setObjectName("hdrPreviousTrack") self.verticalLayout.addWidget(self.hdrPreviousTrack) self.hdrCurrentTrack = QtWidgets.QPushButton(parent=self.centralwidget) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Policy.Preferred, - QtWidgets.QSizePolicy.Policy.Preferred, - ) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth( - self.hdrCurrentTrack.sizePolicy().hasHeightForWidth() - ) + sizePolicy.setHeightForWidth(self.hdrCurrentTrack.sizePolicy().hasHeightForWidth()) self.hdrCurrentTrack.setSizePolicy(sizePolicy) font = QtGui.QFont() font.setPointSize(20) self.hdrCurrentTrack.setFont(font) - self.hdrCurrentTrack.setStyleSheet( - "background-color: #d4edda;\n" - "border: 1px solid rgb(85, 87, 83);\n" - "text-align: left;\n" - "padding-left: 8px;\n" - "" - ) + self.hdrCurrentTrack.setStyleSheet("background-color: #d4edda;\n" +"border: 1px solid rgb(85, 87, 83);\n" +"text-align: left;\n" +"padding-left: 8px;\n" +"") self.hdrCurrentTrack.setText("") self.hdrCurrentTrack.setFlat(True) self.hdrCurrentTrack.setObjectName("hdrCurrentTrack") self.verticalLayout.addWidget(self.hdrCurrentTrack) self.hdrNextTrack = QtWidgets.QPushButton(parent=self.centralwidget) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Policy.Preferred, - QtWidgets.QSizePolicy.Policy.Preferred, - ) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.hdrNextTrack.sizePolicy().hasHeightForWidth()) @@ -170,12 +122,10 @@ class Ui_MainWindow(object): font = QtGui.QFont() font.setPointSize(20) self.hdrNextTrack.setFont(font) - self.hdrNextTrack.setStyleSheet( - "background-color: #fff3cd;\n" - "border: 1px solid rgb(85, 87, 83);\n" - "text-align: left;\n" - "padding-left: 8px;" - ) + self.hdrNextTrack.setStyleSheet("background-color: #fff3cd;\n" +"border: 1px solid rgb(85, 87, 83);\n" +"text-align: left;\n" +"padding-left: 8px;") self.hdrNextTrack.setText("") self.hdrNextTrack.setFlat(True) self.hdrNextTrack.setObjectName("hdrNextTrack") @@ -222,12 +172,7 @@ class Ui_MainWindow(object): self.cartsWidget.setObjectName("cartsWidget") self.horizontalLayout_Carts = QtWidgets.QHBoxLayout(self.cartsWidget) self.horizontalLayout_Carts.setObjectName("horizontalLayout_Carts") - spacerItem = QtWidgets.QSpacerItem( - 40, - 20, - QtWidgets.QSizePolicy.Policy.Expanding, - QtWidgets.QSizePolicy.Policy.Minimum, - ) + spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_Carts.addItem(spacerItem) self.gridLayout_4.addWidget(self.cartsWidget, 2, 0, 1, 1) self.frame_6 = QtWidgets.QFrame(parent=self.centralwidget) @@ -272,11 +217,7 @@ class Ui_MainWindow(object): self.btnPreview = QtWidgets.QPushButton(parent=self.FadeStopInfoFrame) self.btnPreview.setMinimumSize(QtCore.QSize(132, 41)) icon1 = QtGui.QIcon() - icon1.addPixmap( - QtGui.QPixmap(":/icons/headphones"), - QtGui.QIcon.Mode.Normal, - QtGui.QIcon.State.Off, - ) + icon1.addPixmap(QtGui.QPixmap(":/icons/headphones"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.btnPreview.setIcon(icon1) self.btnPreview.setIconSize(QtCore.QSize(30, 30)) self.btnPreview.setCheckable(True) @@ -298,16 +239,8 @@ class Ui_MainWindow(object): self.btnPreviewArm.setMaximumSize(QtCore.QSize(44, 23)) self.btnPreviewArm.setText("") icon2 = QtGui.QIcon() - icon2.addPixmap( - QtGui.QPixmap(":/icons/record-button.png"), - QtGui.QIcon.Mode.Normal, - QtGui.QIcon.State.Off, - ) - icon2.addPixmap( - QtGui.QPixmap(":/icons/record-red-button.png"), - QtGui.QIcon.Mode.Normal, - QtGui.QIcon.State.On, - ) + icon2.addPixmap(QtGui.QPixmap(":/icons/record-button.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + icon2.addPixmap(QtGui.QPixmap(":/icons/record-red-button.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.On) self.btnPreviewArm.setIcon(icon2) self.btnPreviewArm.setCheckable(True) self.btnPreviewArm.setObjectName("btnPreviewArm") @@ -328,16 +261,8 @@ class Ui_MainWindow(object): self.btnPreviewMark.setMaximumSize(QtCore.QSize(44, 23)) self.btnPreviewMark.setText("") icon3 = QtGui.QIcon() - icon3.addPixmap( - QtGui.QPixmap(":/icons/star.png"), - QtGui.QIcon.Mode.Normal, - QtGui.QIcon.State.On, - ) - icon3.addPixmap( - QtGui.QPixmap(":/icons/star_empty.png"), - QtGui.QIcon.Mode.Disabled, - QtGui.QIcon.State.Off, - ) + icon3.addPixmap(QtGui.QPixmap(":/icons/star.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.On) + icon3.addPixmap(QtGui.QPixmap(":/icons/star_empty.png"), QtGui.QIcon.Mode.Disabled, QtGui.QIcon.State.Off) self.btnPreviewMark.setIcon(icon3) self.btnPreviewMark.setObjectName("btnPreviewMark") self.btnPreviewFwd = QtWidgets.QPushButton(parent=self.groupBoxIntroControls) @@ -438,15 +363,10 @@ class Ui_MainWindow(object): self.verticalLayout_7.addWidget(self.label_silent_timer) self.horizontalLayout.addWidget(self.frame_silent) self.widgetFadeVolume = PlotWidget(parent=self.InfoFooterFrame) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Policy.Preferred, - QtWidgets.QSizePolicy.Policy.Preferred, - ) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(1) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth( - self.widgetFadeVolume.sizePolicy().hasHeightForWidth() - ) + sizePolicy.setHeightForWidth(self.widgetFadeVolume.sizePolicy().hasHeightForWidth()) self.widgetFadeVolume.setSizePolicy(sizePolicy) self.widgetFadeVolume.setMinimumSize(QtCore.QSize(0, 0)) self.widgetFadeVolume.setObjectName("widgetFadeVolume") @@ -463,11 +383,7 @@ class Ui_MainWindow(object): self.btnFade.setMinimumSize(QtCore.QSize(132, 32)) self.btnFade.setMaximumSize(QtCore.QSize(164, 16777215)) icon4 = QtGui.QIcon() - icon4.addPixmap( - QtGui.QPixmap(":/icons/fade"), - QtGui.QIcon.Mode.Normal, - QtGui.QIcon.State.Off, - ) + icon4.addPixmap(QtGui.QPixmap(":/icons/fade"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.btnFade.setIcon(icon4) self.btnFade.setIconSize(QtCore.QSize(30, 30)) self.btnFade.setObjectName("btnFade") @@ -475,11 +391,7 @@ class Ui_MainWindow(object): self.btnStop = QtWidgets.QPushButton(parent=self.frame) self.btnStop.setMinimumSize(QtCore.QSize(0, 36)) icon5 = QtGui.QIcon() - icon5.addPixmap( - QtGui.QPixmap(":/icons/stopsign"), - QtGui.QIcon.Mode.Normal, - QtGui.QIcon.State.Off, - ) + icon5.addPixmap(QtGui.QPixmap(":/icons/stopsign"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.btnStop.setIcon(icon5) self.btnStop.setObjectName("btnStop") self.verticalLayout_5.addWidget(self.btnStop) @@ -505,71 +417,39 @@ class Ui_MainWindow(object): MainWindow.setStatusBar(self.statusbar) self.actionPlay_next = QtGui.QAction(parent=MainWindow) icon6 = QtGui.QIcon() - icon6.addPixmap( - QtGui.QPixmap("app/ui/../../../../../../.designer/backup/icon-play.png"), - QtGui.QIcon.Mode.Normal, - QtGui.QIcon.State.Off, - ) + icon6.addPixmap(QtGui.QPixmap("app/ui/../../../../../../.designer/backup/icon-play.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.actionPlay_next.setIcon(icon6) self.actionPlay_next.setObjectName("actionPlay_next") self.actionSkipToNext = QtGui.QAction(parent=MainWindow) icon7 = QtGui.QIcon() - icon7.addPixmap( - QtGui.QPixmap(":/icons/next"), - QtGui.QIcon.Mode.Normal, - QtGui.QIcon.State.Off, - ) + icon7.addPixmap(QtGui.QPixmap(":/icons/next"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.actionSkipToNext.setIcon(icon7) self.actionSkipToNext.setObjectName("actionSkipToNext") self.actionInsertTrack = QtGui.QAction(parent=MainWindow) icon8 = QtGui.QIcon() - icon8.addPixmap( - QtGui.QPixmap( - "app/ui/../../../../../../.designer/backup/icon_search_database.png" - ), - QtGui.QIcon.Mode.Normal, - QtGui.QIcon.State.Off, - ) + icon8.addPixmap(QtGui.QPixmap("app/ui/../../../../../../.designer/backup/icon_search_database.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.actionInsertTrack.setIcon(icon8) self.actionInsertTrack.setObjectName("actionInsertTrack") self.actionAdd_file = QtGui.QAction(parent=MainWindow) icon9 = QtGui.QIcon() - icon9.addPixmap( - QtGui.QPixmap( - "app/ui/../../../../../../.designer/backup/icon_open_file.png" - ), - QtGui.QIcon.Mode.Normal, - QtGui.QIcon.State.Off, - ) + icon9.addPixmap(QtGui.QPixmap("app/ui/../../../../../../.designer/backup/icon_open_file.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.actionAdd_file.setIcon(icon9) self.actionAdd_file.setObjectName("actionAdd_file") self.actionFade = QtGui.QAction(parent=MainWindow) icon10 = QtGui.QIcon() - icon10.addPixmap( - QtGui.QPixmap("app/ui/../../../../../../.designer/backup/icon-fade.png"), - QtGui.QIcon.Mode.Normal, - QtGui.QIcon.State.Off, - ) + icon10.addPixmap(QtGui.QPixmap("app/ui/../../../../../../.designer/backup/icon-fade.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.actionFade.setIcon(icon10) self.actionFade.setObjectName("actionFade") self.actionStop = QtGui.QAction(parent=MainWindow) icon11 = QtGui.QIcon() - icon11.addPixmap( - QtGui.QPixmap(":/icons/stop"), - QtGui.QIcon.Mode.Normal, - QtGui.QIcon.State.Off, - ) + icon11.addPixmap(QtGui.QPixmap(":/icons/stop"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.actionStop.setIcon(icon11) self.actionStop.setObjectName("actionStop") self.action_Clear_selection = QtGui.QAction(parent=MainWindow) self.action_Clear_selection.setObjectName("action_Clear_selection") self.action_Resume_previous = QtGui.QAction(parent=MainWindow) icon12 = QtGui.QIcon() - icon12.addPixmap( - QtGui.QPixmap(":/icons/previous"), - QtGui.QIcon.Mode.Normal, - QtGui.QIcon.State.Off, - ) + icon12.addPixmap(QtGui.QPixmap(":/icons/previous"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.action_Resume_previous.setIcon(icon12) self.action_Resume_previous.setObjectName("action_Resume_previous") self.actionE_xit = QtGui.QAction(parent=MainWindow) @@ -616,9 +496,7 @@ class Ui_MainWindow(object): self.actionImport = QtGui.QAction(parent=MainWindow) self.actionImport.setObjectName("actionImport") self.actionDownload_CSV_of_played_tracks = QtGui.QAction(parent=MainWindow) - self.actionDownload_CSV_of_played_tracks.setObjectName( - "actionDownload_CSV_of_played_tracks" - ) + self.actionDownload_CSV_of_played_tracks.setObjectName("actionDownload_CSV_of_played_tracks") self.actionSearch = QtGui.QAction(parent=MainWindow) self.actionSearch.setObjectName("actionSearch") self.actionInsertSectionHeader = QtGui.QAction(parent=MainWindow) @@ -646,13 +524,9 @@ class Ui_MainWindow(object): self.actionResume = QtGui.QAction(parent=MainWindow) self.actionResume.setObjectName("actionResume") self.actionSearch_title_in_Wikipedia = QtGui.QAction(parent=MainWindow) - self.actionSearch_title_in_Wikipedia.setObjectName( - "actionSearch_title_in_Wikipedia" - ) + self.actionSearch_title_in_Wikipedia.setObjectName("actionSearch_title_in_Wikipedia") self.actionSearch_title_in_Songfacts = QtGui.QAction(parent=MainWindow) - self.actionSearch_title_in_Songfacts.setObjectName( - "actionSearch_title_in_Songfacts" - ) + self.actionSearch_title_in_Songfacts.setObjectName("actionSearch_title_in_Songfacts") self.actionSelect_duplicate_rows = QtGui.QAction(parent=MainWindow) self.actionSelect_duplicate_rows.setObjectName("actionSelect_duplicate_rows") self.actionReplace_files = QtGui.QAction(parent=MainWindow) @@ -707,7 +581,7 @@ class Ui_MainWindow(object): self.retranslateUi(MainWindow) self.tabPlaylist.setCurrentIndex(-1) self.tabInfolist.setCurrentIndex(-1) - self.actionE_xit.triggered.connect(MainWindow.close) # type: ignore + self.actionE_xit.triggered.connect(MainWindow.close) # type: ignore QtCore.QMetaObject.connectSlotsByName(MainWindow) def retranslateUi(self, MainWindow): @@ -749,58 +623,38 @@ class Ui_MainWindow(object): self.actionFade.setShortcut(_translate("MainWindow", "Ctrl+Z")) self.actionStop.setText(_translate("MainWindow", "S&top")) self.actionStop.setShortcut(_translate("MainWindow", "Ctrl+Alt+S")) - self.action_Clear_selection.setText( - _translate("MainWindow", "Clear &selection") - ) + self.action_Clear_selection.setText(_translate("MainWindow", "Clear &selection")) self.action_Clear_selection.setShortcut(_translate("MainWindow", "Esc")) - self.action_Resume_previous.setText( - _translate("MainWindow", "&Resume previous") - ) + self.action_Resume_previous.setText(_translate("MainWindow", "&Resume previous")) self.actionE_xit.setText(_translate("MainWindow", "E&xit")) self.actionTest.setText(_translate("MainWindow", "&Test")) self.actionOpenPlaylist.setText(_translate("MainWindow", "O&pen...")) self.actionNewPlaylist.setText(_translate("MainWindow", "&New...")) self.actionTestFunction.setText(_translate("MainWindow", "&Test function")) - self.actionSkipToFade.setText( - _translate("MainWindow", "&Skip to start of fade") - ) + self.actionSkipToFade.setText(_translate("MainWindow", "&Skip to start of fade")) self.actionSkipToEnd.setText(_translate("MainWindow", "Skip to &end of track")) self.actionClosePlaylist.setText(_translate("MainWindow", "&Close")) self.actionRenamePlaylist.setText(_translate("MainWindow", "&Rename...")) self.actionDeletePlaylist.setText(_translate("MainWindow", "Dele&te...")) - self.actionMoveSelected.setText( - _translate("MainWindow", "Mo&ve selected tracks to...") - ) + self.actionMoveSelected.setText(_translate("MainWindow", "Mo&ve selected tracks to...")) self.actionExport_playlist.setText(_translate("MainWindow", "E&xport...")) self.actionSetNext.setText(_translate("MainWindow", "Set &next")) self.actionSetNext.setShortcut(_translate("MainWindow", "Ctrl+N")) - self.actionSelect_next_track.setText( - _translate("MainWindow", "Select next track") - ) + self.actionSelect_next_track.setText(_translate("MainWindow", "Select next track")) self.actionSelect_next_track.setShortcut(_translate("MainWindow", "J")) - self.actionSelect_previous_track.setText( - _translate("MainWindow", "Select previous track") - ) + self.actionSelect_previous_track.setText(_translate("MainWindow", "Select previous track")) self.actionSelect_previous_track.setShortcut(_translate("MainWindow", "K")) - self.actionSelect_played_tracks.setText( - _translate("MainWindow", "Select played tracks") - ) - self.actionMoveUnplayed.setText( - _translate("MainWindow", "Move &unplayed tracks to...") - ) + self.actionSelect_played_tracks.setText(_translate("MainWindow", "Select played tracks")) + self.actionMoveUnplayed.setText(_translate("MainWindow", "Move &unplayed tracks to...")) self.actionAdd_note.setText(_translate("MainWindow", "Add note...")) self.actionAdd_note.setShortcut(_translate("MainWindow", "Ctrl+T")) self.actionEnable_controls.setText(_translate("MainWindow", "Enable controls")) self.actionImport.setText(_translate("MainWindow", "Import track...")) self.actionImport.setShortcut(_translate("MainWindow", "Ctrl+Shift+I")) - self.actionDownload_CSV_of_played_tracks.setText( - _translate("MainWindow", "Download CSV of played tracks...") - ) + self.actionDownload_CSV_of_played_tracks.setText(_translate("MainWindow", "Download CSV of played tracks...")) self.actionSearch.setText(_translate("MainWindow", "Search...")) self.actionSearch.setShortcut(_translate("MainWindow", "/")) - self.actionInsertSectionHeader.setText( - _translate("MainWindow", "Insert §ion header...") - ) + self.actionInsertSectionHeader.setText(_translate("MainWindow", "Insert §ion header...")) self.actionInsertSectionHeader.setShortcut(_translate("MainWindow", "Ctrl+H")) self.actionRemove.setText(_translate("MainWindow", "&Remove track")) self.actionFind_next.setText(_translate("MainWindow", "Find next")) @@ -808,12 +662,8 @@ class Ui_MainWindow(object): self.actionFind_previous.setText(_translate("MainWindow", "Find previous")) self.actionFind_previous.setShortcut(_translate("MainWindow", "P")) self.action_About.setText(_translate("MainWindow", "&About")) - self.actionSave_as_template.setText( - _translate("MainWindow", "Save as template...") - ) - self.actionNew_from_template.setText( - _translate("MainWindow", "New from template...") - ) + self.actionSave_as_template.setText(_translate("MainWindow", "Save as template...")) + self.actionNew_from_template.setText(_translate("MainWindow", "New from template...")) self.actionDebug.setText(_translate("MainWindow", "Debug")) self.actionAdd_cart.setText(_translate("MainWindow", "Edit cart &1...")) self.actionMark_for_moving.setText(_translate("MainWindow", "Mark for moving")) @@ -822,23 +672,11 @@ class Ui_MainWindow(object): self.actionPaste.setShortcut(_translate("MainWindow", "Ctrl+V")) self.actionResume.setText(_translate("MainWindow", "Resume")) self.actionResume.setShortcut(_translate("MainWindow", "Ctrl+R")) - self.actionSearch_title_in_Wikipedia.setText( - _translate("MainWindow", "Search title in Wikipedia") - ) - self.actionSearch_title_in_Wikipedia.setShortcut( - _translate("MainWindow", "Ctrl+W") - ) - self.actionSearch_title_in_Songfacts.setText( - _translate("MainWindow", "Search title in Songfacts") - ) - self.actionSearch_title_in_Songfacts.setShortcut( - _translate("MainWindow", "Ctrl+S") - ) - self.actionSelect_duplicate_rows.setText( - _translate("MainWindow", "Select duplicate rows...") - ) - self.actionReplace_files.setText(_translate("MainWindow", "Replace files...")) - - -from infotabs import InfoTabs + self.actionSearch_title_in_Wikipedia.setText(_translate("MainWindow", "Search title in Wikipedia")) + self.actionSearch_title_in_Wikipedia.setShortcut(_translate("MainWindow", "Ctrl+W")) + self.actionSearch_title_in_Songfacts.setText(_translate("MainWindow", "Search title in Songfacts")) + self.actionSearch_title_in_Songfacts.setShortcut(_translate("MainWindow", "Ctrl+S")) + self.actionSelect_duplicate_rows.setText(_translate("MainWindow", "Select duplicate rows...")) + self.actionReplace_files.setText(_translate("MainWindow", "Import files...")) +from infotabs import InfoTabs # type: ignore from pyqtgraph import PlotWidget # type: ignore