diff --git a/app/musicmuster.py b/app/musicmuster.py index 3386825..4b59e78 100755 --- a/app/musicmuster.py +++ b/app/musicmuster.py @@ -1740,7 +1740,11 @@ class Window(QMainWindow, Ui_MainWindow): time_to_end = self.current_track.duration - playtime # Elapsed time - self.label_elapsed_timer.setText(helpers.ms_to_mmss(playtime)) + self.label_elapsed_timer.setText( + helpers.ms_to_mmss(playtime) + + " / " + + helpers.ms_to_mmss(self.current_track.duration) + ) # Time to fade self.label_fade_timer.setText(helpers.ms_to_mmss(time_to_fade)) @@ -1770,9 +1774,6 @@ class Window(QMainWindow, Ui_MainWindow): self.label_silent_timer.setText(helpers.ms_to_mmss(time_to_silence)) - # Time to end - self.label_end_timer.setText(helpers.ms_to_mmss(time_to_end)) - # Autoplay next track # if time_to_silence <= 1500: # self.play_next() diff --git a/app/ui/main_window.ui b/app/ui/main_window.ui index fd55109..94cee40 100644 --- a/app/ui/main_window.ui +++ b/app/ui/main_window.ui @@ -29,7 +29,7 @@ - + @@ -290,6 +290,25 @@ padding-left: 8px; + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + @@ -364,391 +383,339 @@ padding-left: 8px; QFrame::Raised - + - - - - - - 152 - 112 - - - - - 184 - 16777215 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - - 132 - 36 - - - - - 164 - 16777215 - - - - Fade - - - - :/icons/fade:/icons/fade - - - - 30 - 30 - - - - - - - - - 132 - 36 - - - - Preview - - - - :/icons/headphones:/icons/headphones - - - - 30 - 30 - - - - true - - - - - - - - - - - 152 - 112 - - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - Elapsed time - - - Qt::AlignCenter - - - - - - - - FreeSans - 40 - 50 - false - - - - color: black; - - - 00:00 - - - Qt::AlignCenter - - - - - - - - - - - 152 - 112 - - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - Fade - - - Qt::AlignCenter - - - - - - - - FreeSans - 40 - 50 - false - - - - 00:00 - - - Qt::AlignCenter - - - - - - - - - - - 1 - 0 - - - - - 0 - 0 - - - - - - - - - 152 - 112 - - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - Silent - - - Qt::AlignCenter - - - - - - - - FreeSans - 40 - 50 - false - - - - 00:00 - - - Qt::AlignCenter - - - - - - - - - - - 152 - 112 - - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - End - - - Qt::AlignCenter - - - - - - - - FreeSans - 40 - 50 - false - - - - 00:00 - - - Qt::AlignCenter - - - - - - - - - - - 152 - 112 - - - - - 184 - 16777215 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - - 132 - 36 - - - - - 164 - 16777215 - - - - -3dB to talk - - - true - - - - - - - - 132 - 36 - - - - - 164 - 16777215 - - - - Hide played - - - true - - - - - - - - - - - - - - - - - - Qt::Horizontal - - + + - 40 - 20 + 152 + 112 - + + + 184 + 16777215 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + 132 + 41 + + + + Preview + + + + :/icons/headphones:/icons/headphones + + + + 30 + 30 + + + + true + + + + + + + + FreeSans + 18 + 50 + false + + + + color: black; + + + 00:00 / 00:00 + + + Qt::AlignCenter + + + + + + + + + + + 152 + 112 + + + + + 184 + 16777215 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + 132 + 41 + + + + + 164 + 16777215 + + + + -3dB to talk + + + true + + + + + + + + 132 + 41 + + + + + 164 + 16777215 + + + + Hide played + + + true + + + + + + + + + + + 152 + 112 + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + Fade + + + Qt::AlignCenter + + + + + + + + FreeSans + 40 + 50 + false + + + + 00:00 + + + Qt::AlignCenter + + + + + + + + + + + 152 + 112 + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + 10 + 10 + 45 + 24 + + + + Silent + + + Qt::AlignCenter + + + + + + 10 + 48 + 132 + 54 + + + + + FreeSans + 40 + 50 + false + + + + 00:00 + + + Qt::AlignCenter + + + + + + + + + 1 + 0 + + + + + 0 + 0 + + + + + + + + + 151 + 0 + + + + + 151 + 16777215 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + 132 + 32 + + + + + 164 + 16777215 + + + + Fade + + + + :/icons/fade:/icons/fade + + + + 30 + 30 + + + + + + + + + 0 + 36 + + + + Stop + + + + :/icons/stopsign:/icons/stopsign + + + + + diff --git a/app/ui/main_window_ui.py b/app/ui/main_window_ui.py index c1bb1ac..b062af1 100644 --- a/app/ui/main_window_ui.py +++ b/app/ui/main_window_ui.py @@ -1,6 +1,6 @@ # Form implementation generated from reading ui file 'app/ui/main_window.ui' # -# Created by: PyQt6 UI code generator 6.5.0 +# Created by: PyQt6 UI code generator 6.5.1 # # WARNING: Any manual changes made to this file will be lost when pyuic6 is # run again. Do not edit this file unless you know what you are doing. @@ -22,8 +22,8 @@ class Ui_MainWindow(object): self.centralwidget.setObjectName("centralwidget") self.gridLayout_4 = QtWidgets.QGridLayout(self.centralwidget) self.gridLayout_4.setObjectName("gridLayout_4") - self.TrackHeaderLayout = QtWidgets.QHBoxLayout() - self.TrackHeaderLayout.setObjectName("TrackHeaderLayout") + self.horizontalLayout_3 = QtWidgets.QHBoxLayout() + self.horizontalLayout_3.setObjectName("horizontalLayout_3") self.verticalLayout_3 = QtWidgets.QVBoxLayout() self.verticalLayout_3.setObjectName("verticalLayout_3") self.previous_track_2 = QtWidgets.QLabel(parent=self.centralwidget) @@ -74,7 +74,7 @@ class Ui_MainWindow(object): 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.TrackHeaderLayout.addLayout(self.verticalLayout_3) + self.horizontalLayout_3.addLayout(self.verticalLayout_3) self.verticalLayout = QtWidgets.QVBoxLayout() self.verticalLayout.setObjectName("verticalLayout") self.hdrPreviousTrack = QtWidgets.QLabel(parent=self.centralwidget) @@ -130,7 +130,7 @@ class Ui_MainWindow(object): self.hdrNextTrack.setFlat(True) self.hdrNextTrack.setObjectName("hdrNextTrack") self.verticalLayout.addWidget(self.hdrNextTrack) - self.TrackHeaderLayout.addLayout(self.verticalLayout) + self.horizontalLayout_3.addLayout(self.verticalLayout) self.frame_2 = QtWidgets.QFrame(parent=self.centralwidget) self.frame_2.setMaximumSize(QtCore.QSize(230, 16777215)) self.frame_2.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) @@ -146,8 +146,8 @@ class Ui_MainWindow(object): self.lblTOD.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.lblTOD.setObjectName("lblTOD") self.gridLayout_2.addWidget(self.lblTOD, 0, 0, 1, 1) - self.TrackHeaderLayout.addWidget(self.frame_2) - self.gridLayout_4.addLayout(self.TrackHeaderLayout, 0, 0, 1, 1) + self.horizontalLayout_3.addWidget(self.frame_2) + self.gridLayout_4.addLayout(self.horizontalLayout_3, 0, 0, 1, 1) self.frame_4 = QtWidgets.QFrame(parent=self.centralwidget) self.frame_4.setMinimumSize(QtCore.QSize(0, 16)) self.frame_4.setAutoFillBackground(False) @@ -156,6 +156,13 @@ class Ui_MainWindow(object): self.frame_4.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.frame_4.setObjectName("frame_4") self.gridLayout_4.addWidget(self.frame_4, 1, 0, 1, 1) + self.cartsWidget = QtWidgets.QWidget(parent=self.centralwidget) + 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) + self.horizontalLayout_Carts.addItem(spacerItem) + self.gridLayout_4.addWidget(self.cartsWidget, 2, 0, 1, 1) self.frame_6 = QtWidgets.QFrame(parent=self.centralwidget) self.frame_6.setMinimumSize(QtCore.QSize(0, 16)) self.frame_6.setAutoFillBackground(False) @@ -184,9 +191,7 @@ class Ui_MainWindow(object): self.InfoFooterFrame.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) self.InfoFooterFrame.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.InfoFooterFrame.setObjectName("InfoFooterFrame") - self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.InfoFooterFrame) - self.horizontalLayout_2.setObjectName("horizontalLayout_2") - self.horizontalLayout = QtWidgets.QHBoxLayout() + self.horizontalLayout = QtWidgets.QHBoxLayout(self.InfoFooterFrame) self.horizontalLayout.setObjectName("horizontalLayout") self.FadeStopInfoFrame = QtWidgets.QFrame(parent=self.InfoFooterFrame) self.FadeStopInfoFrame.setMinimumSize(QtCore.QSize(152, 112)) @@ -194,43 +199,21 @@ class Ui_MainWindow(object): self.FadeStopInfoFrame.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) self.FadeStopInfoFrame.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.FadeStopInfoFrame.setObjectName("FadeStopInfoFrame") - self.gridLayout = QtWidgets.QGridLayout(self.FadeStopInfoFrame) - self.gridLayout.setObjectName("gridLayout") - self.btnFade = QtWidgets.QPushButton(parent=self.FadeStopInfoFrame) - self.btnFade.setMinimumSize(QtCore.QSize(132, 36)) - self.btnFade.setMaximumSize(QtCore.QSize(164, 16777215)) - icon1 = QtGui.QIcon() - icon1.addPixmap(QtGui.QPixmap(":/icons/fade"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) - self.btnFade.setIcon(icon1) - self.btnFade.setIconSize(QtCore.QSize(30, 30)) - self.btnFade.setObjectName("btnFade") - self.gridLayout.addWidget(self.btnFade, 0, 0, 1, 2) + self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.FadeStopInfoFrame) + self.verticalLayout_4.setObjectName("verticalLayout_4") self.btnPreview = QtWidgets.QPushButton(parent=self.FadeStopInfoFrame) - self.btnPreview.setMinimumSize(QtCore.QSize(132, 36)) - icon2 = QtGui.QIcon() - icon2.addPixmap(QtGui.QPixmap(":/icons/headphones"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) - self.btnPreview.setIcon(icon2) + self.btnPreview.setMinimumSize(QtCore.QSize(132, 41)) + icon1 = QtGui.QIcon() + 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) self.btnPreview.setObjectName("btnPreview") - self.gridLayout.addWidget(self.btnPreview, 1, 0, 1, 2) - self.horizontalLayout.addWidget(self.FadeStopInfoFrame) - self.frame_elapsed = QtWidgets.QFrame(parent=self.InfoFooterFrame) - self.frame_elapsed.setMinimumSize(QtCore.QSize(152, 112)) - self.frame_elapsed.setStyleSheet("") - self.frame_elapsed.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) - self.frame_elapsed.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) - self.frame_elapsed.setObjectName("frame_elapsed") - self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.frame_elapsed) - self.verticalLayout_4.setObjectName("verticalLayout_4") - self.label = QtWidgets.QLabel(parent=self.frame_elapsed) - self.label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) - self.label.setObjectName("label") - self.verticalLayout_4.addWidget(self.label) - self.label_elapsed_timer = QtWidgets.QLabel(parent=self.frame_elapsed) + self.verticalLayout_4.addWidget(self.btnPreview) + self.label_elapsed_timer = QtWidgets.QLabel(parent=self.FadeStopInfoFrame) font = QtGui.QFont() font.setFamily("FreeSans") - font.setPointSize(40) + font.setPointSize(18) font.setBold(False) font.setWeight(50) self.label_elapsed_timer.setFont(font) @@ -238,7 +221,28 @@ class Ui_MainWindow(object): self.label_elapsed_timer.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.label_elapsed_timer.setObjectName("label_elapsed_timer") self.verticalLayout_4.addWidget(self.label_elapsed_timer) - self.horizontalLayout.addWidget(self.frame_elapsed) + self.horizontalLayout.addWidget(self.FadeStopInfoFrame) + self.frame_toggleplayed_3db = QtWidgets.QFrame(parent=self.InfoFooterFrame) + self.frame_toggleplayed_3db.setMinimumSize(QtCore.QSize(152, 112)) + self.frame_toggleplayed_3db.setMaximumSize(QtCore.QSize(184, 16777215)) + self.frame_toggleplayed_3db.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) + self.frame_toggleplayed_3db.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) + self.frame_toggleplayed_3db.setObjectName("frame_toggleplayed_3db") + self.verticalLayout_6 = QtWidgets.QVBoxLayout(self.frame_toggleplayed_3db) + self.verticalLayout_6.setObjectName("verticalLayout_6") + self.btnDrop3db = QtWidgets.QPushButton(parent=self.frame_toggleplayed_3db) + self.btnDrop3db.setMinimumSize(QtCore.QSize(132, 41)) + self.btnDrop3db.setMaximumSize(QtCore.QSize(164, 16777215)) + self.btnDrop3db.setCheckable(True) + self.btnDrop3db.setObjectName("btnDrop3db") + self.verticalLayout_6.addWidget(self.btnDrop3db) + self.btnHidePlayed = QtWidgets.QPushButton(parent=self.frame_toggleplayed_3db) + self.btnHidePlayed.setMinimumSize(QtCore.QSize(132, 41)) + self.btnHidePlayed.setMaximumSize(QtCore.QSize(164, 16777215)) + self.btnHidePlayed.setCheckable(True) + self.btnHidePlayed.setObjectName("btnHidePlayed") + self.verticalLayout_6.addWidget(self.btnHidePlayed) + self.horizontalLayout.addWidget(self.frame_toggleplayed_3db) self.frame_fade = QtWidgets.QFrame(parent=self.InfoFooterFrame) self.frame_fade.setMinimumSize(QtCore.QSize(152, 112)) self.frame_fade.setStyleSheet("") @@ -262,6 +266,27 @@ class Ui_MainWindow(object): self.label_fade_timer.setObjectName("label_fade_timer") self.verticalLayout_2.addWidget(self.label_fade_timer) self.horizontalLayout.addWidget(self.frame_fade) + self.frame_silent = QtWidgets.QFrame(parent=self.InfoFooterFrame) + self.frame_silent.setMinimumSize(QtCore.QSize(152, 112)) + self.frame_silent.setStyleSheet("") + self.frame_silent.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) + self.frame_silent.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) + self.frame_silent.setObjectName("frame_silent") + self.label_5 = QtWidgets.QLabel(parent=self.frame_silent) + self.label_5.setGeometry(QtCore.QRect(10, 10, 45, 24)) + self.label_5.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) + self.label_5.setObjectName("label_5") + self.label_silent_timer = QtWidgets.QLabel(parent=self.frame_silent) + self.label_silent_timer.setGeometry(QtCore.QRect(10, 48, 132, 54)) + font = QtGui.QFont() + font.setFamily("FreeSans") + font.setPointSize(40) + font.setBold(False) + font.setWeight(50) + self.label_silent_timer.setFont(font) + self.label_silent_timer.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) + self.label_silent_timer.setObjectName("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.setHorizontalStretch(1) @@ -271,82 +296,32 @@ class Ui_MainWindow(object): self.widgetFadeVolume.setMinimumSize(QtCore.QSize(0, 0)) self.widgetFadeVolume.setObjectName("widgetFadeVolume") self.horizontalLayout.addWidget(self.widgetFadeVolume) - self.frame_silent = QtWidgets.QFrame(parent=self.InfoFooterFrame) - self.frame_silent.setMinimumSize(QtCore.QSize(152, 112)) - self.frame_silent.setStyleSheet("") - self.frame_silent.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) - self.frame_silent.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) - self.frame_silent.setObjectName("frame_silent") - self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.frame_silent) + self.frame = QtWidgets.QFrame(parent=self.InfoFooterFrame) + self.frame.setMinimumSize(QtCore.QSize(151, 0)) + self.frame.setMaximumSize(QtCore.QSize(151, 16777215)) + self.frame.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) + self.frame.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) + self.frame.setObjectName("frame") + self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.frame) self.verticalLayout_5.setObjectName("verticalLayout_5") - self.label_5 = QtWidgets.QLabel(parent=self.frame_silent) - self.label_5.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) - self.label_5.setObjectName("label_5") - self.verticalLayout_5.addWidget(self.label_5) - self.label_silent_timer = QtWidgets.QLabel(parent=self.frame_silent) - font = QtGui.QFont() - font.setFamily("FreeSans") - font.setPointSize(40) - font.setBold(False) - font.setWeight(50) - self.label_silent_timer.setFont(font) - self.label_silent_timer.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) - self.label_silent_timer.setObjectName("label_silent_timer") - self.verticalLayout_5.addWidget(self.label_silent_timer) - self.horizontalLayout.addWidget(self.frame_silent) - self.frame_end = QtWidgets.QFrame(parent=self.InfoFooterFrame) - self.frame_end.setMinimumSize(QtCore.QSize(152, 112)) - self.frame_end.setStyleSheet("") - self.frame_end.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) - self.frame_end.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) - self.frame_end.setObjectName("frame_end") - self.gridLayout_5 = QtWidgets.QGridLayout(self.frame_end) - self.gridLayout_5.setObjectName("gridLayout_5") - self.label_6 = QtWidgets.QLabel(parent=self.frame_end) - self.label_6.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) - self.label_6.setObjectName("label_6") - self.gridLayout_5.addWidget(self.label_6, 0, 0, 1, 1) - self.label_end_timer = QtWidgets.QLabel(parent=self.frame_end) - font = QtGui.QFont() - font.setFamily("FreeSans") - font.setPointSize(40) - font.setBold(False) - font.setWeight(50) - self.label_end_timer.setFont(font) - self.label_end_timer.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) - self.label_end_timer.setObjectName("label_end_timer") - self.gridLayout_5.addWidget(self.label_end_timer, 1, 0, 1, 1) - self.horizontalLayout.addWidget(self.frame_end) - self.frame_toggleplayed_3db = QtWidgets.QFrame(parent=self.InfoFooterFrame) - self.frame_toggleplayed_3db.setMinimumSize(QtCore.QSize(152, 112)) - self.frame_toggleplayed_3db.setMaximumSize(QtCore.QSize(184, 16777215)) - self.frame_toggleplayed_3db.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) - self.frame_toggleplayed_3db.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) - self.frame_toggleplayed_3db.setObjectName("frame_toggleplayed_3db") - self.gridLayout_3 = QtWidgets.QGridLayout(self.frame_toggleplayed_3db) - self.gridLayout_3.setObjectName("gridLayout_3") - self.btnDrop3db = QtWidgets.QPushButton(parent=self.frame_toggleplayed_3db) - self.btnDrop3db.setMinimumSize(QtCore.QSize(132, 36)) - self.btnDrop3db.setMaximumSize(QtCore.QSize(164, 16777215)) - self.btnDrop3db.setCheckable(True) - self.btnDrop3db.setObjectName("btnDrop3db") - self.gridLayout_3.addWidget(self.btnDrop3db, 0, 0, 1, 1) - self.btnHidePlayed = QtWidgets.QPushButton(parent=self.frame_toggleplayed_3db) - self.btnHidePlayed.setMinimumSize(QtCore.QSize(132, 36)) - self.btnHidePlayed.setMaximumSize(QtCore.QSize(164, 16777215)) - self.btnHidePlayed.setCheckable(True) - self.btnHidePlayed.setObjectName("btnHidePlayed") - self.gridLayout_3.addWidget(self.btnHidePlayed, 1, 0, 1, 1) - self.horizontalLayout.addWidget(self.frame_toggleplayed_3db) - self.horizontalLayout_2.addLayout(self.horizontalLayout) + self.btnFade = QtWidgets.QPushButton(parent=self.frame) + self.btnFade.setMinimumSize(QtCore.QSize(132, 32)) + self.btnFade.setMaximumSize(QtCore.QSize(164, 16777215)) + icon2 = QtGui.QIcon() + icon2.addPixmap(QtGui.QPixmap(":/icons/fade"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + self.btnFade.setIcon(icon2) + self.btnFade.setIconSize(QtCore.QSize(30, 30)) + self.btnFade.setObjectName("btnFade") + self.verticalLayout_5.addWidget(self.btnFade) + self.btnStop = QtWidgets.QPushButton(parent=self.frame) + self.btnStop.setMinimumSize(QtCore.QSize(0, 36)) + icon3 = QtGui.QIcon() + icon3.addPixmap(QtGui.QPixmap(":/icons/stopsign"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + self.btnStop.setIcon(icon3) + self.btnStop.setObjectName("btnStop") + self.verticalLayout_5.addWidget(self.btnStop) + self.horizontalLayout.addWidget(self.frame) self.gridLayout_4.addWidget(self.InfoFooterFrame, 5, 0, 1, 1) - self.cartsWidget = QtWidgets.QWidget(parent=self.centralwidget) - 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) - self.horizontalLayout_Carts.addItem(spacerItem) - self.gridLayout_4.addWidget(self.cartsWidget, 2, 0, 1, 1) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtWidgets.QMenuBar(parent=MainWindow) self.menubar.setGeometry(QtCore.QRect(0, 0, 1280, 29)) @@ -366,41 +341,41 @@ class Ui_MainWindow(object): self.statusbar.setObjectName("statusbar") MainWindow.setStatusBar(self.statusbar) self.actionPlay_next = QtGui.QAction(parent=MainWindow) - icon3 = QtGui.QIcon() - icon3.addPixmap(QtGui.QPixmap("app/ui/../../../../.designer/backup/icon-play.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) - self.actionPlay_next.setIcon(icon3) + icon4 = QtGui.QIcon() + icon4.addPixmap(QtGui.QPixmap("app/ui/../../../../.designer/backup/icon-play.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + self.actionPlay_next.setIcon(icon4) self.actionPlay_next.setObjectName("actionPlay_next") self.actionSkipToNext = QtGui.QAction(parent=MainWindow) - icon4 = QtGui.QIcon() - icon4.addPixmap(QtGui.QPixmap(":/icons/next"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) - self.actionSkipToNext.setIcon(icon4) + icon5 = QtGui.QIcon() + icon5.addPixmap(QtGui.QPixmap(":/icons/next"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + self.actionSkipToNext.setIcon(icon5) self.actionSkipToNext.setObjectName("actionSkipToNext") self.actionInsertTrack = QtGui.QAction(parent=MainWindow) - icon5 = QtGui.QIcon() - icon5.addPixmap(QtGui.QPixmap("app/ui/../../../../.designer/backup/icon_search_database.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) - self.actionInsertTrack.setIcon(icon5) + icon6 = QtGui.QIcon() + icon6.addPixmap(QtGui.QPixmap("app/ui/../../../../.designer/backup/icon_search_database.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + self.actionInsertTrack.setIcon(icon6) self.actionInsertTrack.setObjectName("actionInsertTrack") self.actionAdd_file = QtGui.QAction(parent=MainWindow) - icon6 = QtGui.QIcon() - icon6.addPixmap(QtGui.QPixmap("app/ui/../../../../.designer/backup/icon_open_file.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) - self.actionAdd_file.setIcon(icon6) + icon7 = QtGui.QIcon() + icon7.addPixmap(QtGui.QPixmap("app/ui/../../../../.designer/backup/icon_open_file.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + self.actionAdd_file.setIcon(icon7) self.actionAdd_file.setObjectName("actionAdd_file") self.actionFade = QtGui.QAction(parent=MainWindow) - icon7 = QtGui.QIcon() - icon7.addPixmap(QtGui.QPixmap("app/ui/../../../../.designer/backup/icon-fade.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) - self.actionFade.setIcon(icon7) + icon8 = QtGui.QIcon() + icon8.addPixmap(QtGui.QPixmap("app/ui/../../../../.designer/backup/icon-fade.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + self.actionFade.setIcon(icon8) self.actionFade.setObjectName("actionFade") self.actionStop = QtGui.QAction(parent=MainWindow) - icon8 = QtGui.QIcon() - icon8.addPixmap(QtGui.QPixmap(":/icons/stop"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) - self.actionStop.setIcon(icon8) + icon9 = QtGui.QIcon() + icon9.addPixmap(QtGui.QPixmap(":/icons/stop"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + self.actionStop.setIcon(icon9) 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) - icon9 = QtGui.QIcon() - icon9.addPixmap(QtGui.QPixmap(":/icons/previous"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) - self.action_Resume_previous.setIcon(icon9) + icon10 = QtGui.QIcon() + icon10.addPixmap(QtGui.QPixmap(":/icons/previous"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + self.action_Resume_previous.setIcon(icon10) self.action_Resume_previous.setObjectName("action_Resume_previous") self.actionE_xit = QtGui.QAction(parent=MainWindow) self.actionE_xit.setObjectName("actionE_xit") @@ -540,18 +515,16 @@ class Ui_MainWindow(object): self.current_track_2.setText(_translate("MainWindow", "Current track:")) self.next_track_2.setText(_translate("MainWindow", "Next track:")) self.lblTOD.setText(_translate("MainWindow", "00:00:00")) - self.btnFade.setText(_translate("MainWindow", " Fade")) self.btnPreview.setText(_translate("MainWindow", " Preview")) - self.label.setText(_translate("MainWindow", "Elapsed time")) - self.label_elapsed_timer.setText(_translate("MainWindow", "00:00")) + self.label_elapsed_timer.setText(_translate("MainWindow", "00:00 / 00:00")) + self.btnDrop3db.setText(_translate("MainWindow", "-3dB to talk")) + self.btnHidePlayed.setText(_translate("MainWindow", "Hide played")) self.label_4.setText(_translate("MainWindow", "Fade")) self.label_fade_timer.setText(_translate("MainWindow", "00:00")) self.label_5.setText(_translate("MainWindow", "Silent")) self.label_silent_timer.setText(_translate("MainWindow", "00:00")) - self.label_6.setText(_translate("MainWindow", "End")) - self.label_end_timer.setText(_translate("MainWindow", "00:00")) - self.btnDrop3db.setText(_translate("MainWindow", "-3dB to talk")) - self.btnHidePlayed.setText(_translate("MainWindow", "Hide played")) + self.btnFade.setText(_translate("MainWindow", " Fade")) + self.btnStop.setText(_translate("MainWindow", " Stop")) self.menuFile.setTitle(_translate("MainWindow", "&Playlists")) self.menuPlaylist.setTitle(_translate("MainWindow", "Sho&wtime")) self.menuSearc_h.setTitle(_translate("MainWindow", "&Search"))