From 8c69f108cb9ee16aa76e39fc59c9e9dd42d7840a Mon Sep 17 00:00:00 2001 From: Keith Edmunds Date: Fri, 4 Mar 2022 16:01:20 +0000 Subject: [PATCH] Change LH clock box Fixes #102, #99 --- app/musicmuster.py | 28 +++++++---- app/ui/main_window.ui | 94 +++++++++++++++++----------------- app/ui/main_window_ui.py | 106 +++++++++++++++++++-------------------- 3 files changed, 118 insertions(+), 110 deletions(-) diff --git a/app/musicmuster.py b/app/musicmuster.py index f7303b3..c60f1e7 100755 --- a/app/musicmuster.py +++ b/app/musicmuster.py @@ -299,9 +299,14 @@ class Window(QMainWindow, Ui_MainWindow): # Reset clocks self.frame_fade.setStyleSheet("") - self.label_silent_timer.setText("00:00") self.frame_silent.setStyleSheet("") + self.label_elapsed_timer.setText("00:00") self.label_end_timer.setText("00:00") + self.label_fade_length.setText("0:00") + self.label_fade_timer.setText("00:00") + self.label_silence_length.setText("0:00") + self.label_silent_timer.setText("00:00") + self.label_track_length.setText("0:00") # Update headers self.update_headers() @@ -541,14 +546,16 @@ class Window(QMainWindow, Ui_MainWindow): self.update_headers() # Update clocks - now = datetime.now() - self.label_start_tod.setText(now.strftime("%H:%M:%S")) - silence_at = self.current_track.silence_at - silence_time = now + timedelta(milliseconds=silence_at) - self.label_silent_tod.setText(silence_time.strftime("%H:%M:%S")) - self.label_fade_length.setText( - helpers.ms_to_mmss(silence_at - self.current_track.fade_at) + self.label_track_length.setText( + helpers.ms_to_mmss(self.current_track.duration) ) + fade_at = self.current_track.fade_at + silence_at = self.current_track.silence_at + length = self.current_track.duration + self.label_fade_length.setText( + helpers.ms_to_mmss(silence_at - fade_at)) + self.label_silence_length.setText( + helpers.ms_to_mmss(length - silence_at)) def search_database(self) -> None: """Show dialog box to select and cue track from database""" @@ -752,11 +759,12 @@ class Window(QMainWindow, Ui_MainWindow): # Elapsed time if time_to_end < 500: self.label_elapsed_timer.setText( - helpers.ms_to_mmss(self.current_track.duration) + helpers.ms_to_mmss(playtime) ) else: self.label_elapsed_timer.setText( - helpers.ms_to_mmss(playtime)) + helpers.ms_to_mmss(playtime) + ) # Time to fade self.label_fade_timer.setText(helpers.ms_to_mmss(time_to_fade)) diff --git a/app/ui/main_window.ui b/app/ui/main_window.ui index d8c9f35..881901e 100644 --- a/app/ui/main_window.ui +++ b/app/ui/main_window.ui @@ -6,7 +6,7 @@ 0 0 - 1164 + 1280 857 @@ -17,7 +17,7 @@ - + @@ -488,11 +488,11 @@ border: 1px solid rgb(85, 87, 83); QFrame::Raised - + - + - Started at: + Track length: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -500,7 +500,7 @@ border: 1px solid rgb(85, 87, 83); - + FreeSans @@ -508,7 +508,7 @@ border: 1px solid rgb(85, 87, 83); - 00:00:00 + 0:00 false @@ -516,32 +516,6 @@ border: 1px solid rgb(85, 87, 83); - - - Silent at: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - FreeSans - 16 - - - - 00:00:00 - - - false - - - - Fade length: @@ -551,7 +525,7 @@ border: 1px solid rgb(85, 87, 83); - + @@ -567,6 +541,32 @@ border: 1px solid rgb(85, 87, 83); + + + + Silence length: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + FreeSans + 16 + + + + 0:00 + + + false + + + @@ -581,8 +581,8 @@ border: 1px solid rgb(85, 87, 83); QFrame::Raised - - + + Elapsed time @@ -592,7 +592,7 @@ border: 1px solid rgb(85, 87, 83); - + @@ -624,8 +624,8 @@ border: 1px solid rgb(85, 87, 83); QFrame::Raised - - + + Fade @@ -635,7 +635,7 @@ border: 1px solid rgb(85, 87, 83); - + @@ -667,8 +667,8 @@ border: 1px solid rgb(85, 87, 83); QFrame::Raised - - + + Silent @@ -678,7 +678,7 @@ border: 1px solid rgb(85, 87, 83); - + @@ -710,8 +710,8 @@ border: 1px solid rgb(85, 87, 83); QFrame::Raised - - + + End @@ -721,7 +721,7 @@ border: 1px solid rgb(85, 87, 83); - + @@ -751,7 +751,7 @@ border: 1px solid rgb(85, 87, 83); 0 0 - 1164 + 1280 29 diff --git a/app/ui/main_window_ui.py b/app/ui/main_window_ui.py index 7589421..8d9d08f 100644 --- a/app/ui/main_window_ui.py +++ b/app/ui/main_window_ui.py @@ -14,12 +14,12 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName("MainWindow") - MainWindow.resize(1164, 857) + MainWindow.resize(1280, 857) MainWindow.setStyleSheet("") self.centralwidget = QtWidgets.QWidget(MainWindow) self.centralwidget.setObjectName("centralwidget") - self.gridLayout_3 = QtWidgets.QGridLayout(self.centralwidget) - self.gridLayout_3.setObjectName("gridLayout_3") + self.gridLayout_6 = QtWidgets.QGridLayout(self.centralwidget) + self.gridLayout_6.setObjectName("gridLayout_6") self.horizontalLayout_3 = QtWidgets.QHBoxLayout() self.horizontalLayout_3.setObjectName("horizontalLayout_3") self.verticalLayout_3 = QtWidgets.QVBoxLayout() @@ -129,7 +129,7 @@ class Ui_MainWindow(object): self.lblTOD.setObjectName("lblTOD") self.gridLayout_2.addWidget(self.lblTOD, 0, 0, 1, 1) self.horizontalLayout_3.addWidget(self.frame_2) - self.gridLayout_3.addLayout(self.horizontalLayout_3, 0, 0, 1, 1) + self.gridLayout_6.addLayout(self.horizontalLayout_3, 0, 0, 1, 1) self.frame_5 = QtWidgets.QFrame(self.centralwidget) self.frame_5.setFrameShape(QtWidgets.QFrame.StyledPanel) self.frame_5.setFrameShadow(QtWidgets.QFrame.Raised) @@ -206,49 +206,37 @@ class Ui_MainWindow(object): self.spnVolume.setProperty("value", 100) self.spnVolume.setObjectName("spnVolume") self.horizontalLayout.addWidget(self.spnVolume) - self.gridLayout_3.addWidget(self.frame_5, 1, 0, 1, 1) + self.gridLayout_6.addWidget(self.frame_5, 1, 0, 1, 1) self.tabPlaylist = QtWidgets.QTabWidget(self.centralwidget) self.tabPlaylist.setDocumentMode(False) self.tabPlaylist.setTabsClosable(True) self.tabPlaylist.setMovable(True) self.tabPlaylist.setObjectName("tabPlaylist") - self.gridLayout_3.addWidget(self.tabPlaylist, 2, 0, 1, 1) + self.gridLayout_6.addWidget(self.tabPlaylist, 2, 0, 1, 1) self.horizontalLayout_2 = QtWidgets.QHBoxLayout() self.horizontalLayout_2.setObjectName("horizontalLayout_2") self.frame = QtWidgets.QFrame(self.centralwidget) self.frame.setFrameShape(QtWidgets.QFrame.StyledPanel) self.frame.setFrameShadow(QtWidgets.QFrame.Raised) self.frame.setObjectName("frame") - self.gridLayout = QtWidgets.QGridLayout(self.frame) - self.gridLayout.setObjectName("gridLayout") - self.label_2 = QtWidgets.QLabel(self.frame) - self.label_2.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) - self.label_2.setObjectName("label_2") - self.gridLayout.addWidget(self.label_2, 0, 0, 1, 1) - self.label_start_tod = QtWidgets.QLabel(self.frame) + self.formLayout = QtWidgets.QFormLayout(self.frame) + self.formLayout.setObjectName("formLayout") + self.label_x = QtWidgets.QLabel(self.frame) + self.label_x.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_x.setObjectName("label_x") + self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_x) + self.label_track_length = QtWidgets.QLabel(self.frame) font = QtGui.QFont() font.setFamily("FreeSans") font.setPointSize(16) - self.label_start_tod.setFont(font) - self.label_start_tod.setScaledContents(False) - self.label_start_tod.setObjectName("label_start_tod") - self.gridLayout.addWidget(self.label_start_tod, 0, 1, 1, 1) - self.label_3 = QtWidgets.QLabel(self.frame) - self.label_3.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) - self.label_3.setObjectName("label_3") - self.gridLayout.addWidget(self.label_3, 1, 0, 1, 1) - self.label_silent_tod = QtWidgets.QLabel(self.frame) - font = QtGui.QFont() - font.setFamily("FreeSans") - font.setPointSize(16) - self.label_silent_tod.setFont(font) - self.label_silent_tod.setScaledContents(False) - self.label_silent_tod.setObjectName("label_silent_tod") - self.gridLayout.addWidget(self.label_silent_tod, 1, 1, 1, 1) + self.label_track_length.setFont(font) + self.label_track_length.setScaledContents(False) + self.label_track_length.setObjectName("label_track_length") + self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.label_track_length) self.label_7 = QtWidgets.QLabel(self.frame) self.label_7.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.label_7.setObjectName("label_7") - self.gridLayout.addWidget(self.label_7, 2, 0, 1, 1) + self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_7) self.label_fade_length = QtWidgets.QLabel(self.frame) font = QtGui.QFont() font.setFamily("FreeSans") @@ -256,19 +244,31 @@ class Ui_MainWindow(object): self.label_fade_length.setFont(font) self.label_fade_length.setScaledContents(False) self.label_fade_length.setObjectName("label_fade_length") - self.gridLayout.addWidget(self.label_fade_length, 2, 1, 1, 1) + self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.label_fade_length) + self.label_3 = QtWidgets.QLabel(self.frame) + self.label_3.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_3.setObjectName("label_3") + self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_3) + self.label_silence_length = QtWidgets.QLabel(self.frame) + font = QtGui.QFont() + font.setFamily("FreeSans") + font.setPointSize(16) + self.label_silence_length.setFont(font) + self.label_silence_length.setScaledContents(False) + self.label_silence_length.setObjectName("label_silence_length") + self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.label_silence_length) self.horizontalLayout_2.addWidget(self.frame) self.frame_elapsed = QtWidgets.QFrame(self.centralwidget) self.frame_elapsed.setStyleSheet("") self.frame_elapsed.setFrameShape(QtWidgets.QFrame.StyledPanel) self.frame_elapsed.setFrameShadow(QtWidgets.QFrame.Raised) self.frame_elapsed.setObjectName("frame_elapsed") - self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.frame_elapsed) - self.verticalLayout_5.setObjectName("verticalLayout_5") + self.gridLayout = QtWidgets.QGridLayout(self.frame_elapsed) + self.gridLayout.setObjectName("gridLayout") self.label = QtWidgets.QLabel(self.frame_elapsed) self.label.setAlignment(QtCore.Qt.AlignCenter) self.label.setObjectName("label") - self.verticalLayout_5.addWidget(self.label) + self.gridLayout.addWidget(self.label, 0, 0, 1, 1) self.label_elapsed_timer = QtWidgets.QLabel(self.frame_elapsed) font = QtGui.QFont() font.setFamily("FreeSans") @@ -278,19 +278,19 @@ class Ui_MainWindow(object): self.label_elapsed_timer.setFont(font) self.label_elapsed_timer.setAlignment(QtCore.Qt.AlignCenter) self.label_elapsed_timer.setObjectName("label_elapsed_timer") - self.verticalLayout_5.addWidget(self.label_elapsed_timer) + self.gridLayout.addWidget(self.label_elapsed_timer, 1, 0, 1, 1) self.horizontalLayout_2.addWidget(self.frame_elapsed) self.frame_fade = QtWidgets.QFrame(self.centralwidget) self.frame_fade.setStyleSheet("") self.frame_fade.setFrameShape(QtWidgets.QFrame.StyledPanel) self.frame_fade.setFrameShadow(QtWidgets.QFrame.Raised) self.frame_fade.setObjectName("frame_fade") - self.verticalLayout_6 = QtWidgets.QVBoxLayout(self.frame_fade) - self.verticalLayout_6.setObjectName("verticalLayout_6") + self.gridLayout_3 = QtWidgets.QGridLayout(self.frame_fade) + self.gridLayout_3.setObjectName("gridLayout_3") self.label_4 = QtWidgets.QLabel(self.frame_fade) self.label_4.setAlignment(QtCore.Qt.AlignCenter) self.label_4.setObjectName("label_4") - self.verticalLayout_6.addWidget(self.label_4) + self.gridLayout_3.addWidget(self.label_4, 0, 0, 1, 1) self.label_fade_timer = QtWidgets.QLabel(self.frame_fade) font = QtGui.QFont() font.setFamily("FreeSans") @@ -300,19 +300,19 @@ class Ui_MainWindow(object): self.label_fade_timer.setFont(font) self.label_fade_timer.setAlignment(QtCore.Qt.AlignCenter) self.label_fade_timer.setObjectName("label_fade_timer") - self.verticalLayout_6.addWidget(self.label_fade_timer) + self.gridLayout_3.addWidget(self.label_fade_timer, 1, 0, 1, 1) self.horizontalLayout_2.addWidget(self.frame_fade) self.frame_silent = QtWidgets.QFrame(self.centralwidget) self.frame_silent.setStyleSheet("") self.frame_silent.setFrameShape(QtWidgets.QFrame.StyledPanel) self.frame_silent.setFrameShadow(QtWidgets.QFrame.Raised) self.frame_silent.setObjectName("frame_silent") - self.verticalLayout_7 = QtWidgets.QVBoxLayout(self.frame_silent) - self.verticalLayout_7.setObjectName("verticalLayout_7") + self.gridLayout_4 = QtWidgets.QGridLayout(self.frame_silent) + self.gridLayout_4.setObjectName("gridLayout_4") self.label_5 = QtWidgets.QLabel(self.frame_silent) self.label_5.setAlignment(QtCore.Qt.AlignCenter) self.label_5.setObjectName("label_5") - self.verticalLayout_7.addWidget(self.label_5) + self.gridLayout_4.addWidget(self.label_5, 0, 0, 1, 1) self.label_silent_timer = QtWidgets.QLabel(self.frame_silent) font = QtGui.QFont() font.setFamily("FreeSans") @@ -322,19 +322,19 @@ class Ui_MainWindow(object): self.label_silent_timer.setFont(font) self.label_silent_timer.setAlignment(QtCore.Qt.AlignCenter) self.label_silent_timer.setObjectName("label_silent_timer") - self.verticalLayout_7.addWidget(self.label_silent_timer) + self.gridLayout_4.addWidget(self.label_silent_timer, 1, 0, 1, 1) self.horizontalLayout_2.addWidget(self.frame_silent) self.frame_end = QtWidgets.QFrame(self.centralwidget) self.frame_end.setStyleSheet("") self.frame_end.setFrameShape(QtWidgets.QFrame.StyledPanel) self.frame_end.setFrameShadow(QtWidgets.QFrame.Raised) self.frame_end.setObjectName("frame_end") - self.verticalLayout_8 = QtWidgets.QVBoxLayout(self.frame_end) - self.verticalLayout_8.setObjectName("verticalLayout_8") + self.gridLayout_5 = QtWidgets.QGridLayout(self.frame_end) + self.gridLayout_5.setObjectName("gridLayout_5") self.label_6 = QtWidgets.QLabel(self.frame_end) self.label_6.setAlignment(QtCore.Qt.AlignCenter) self.label_6.setObjectName("label_6") - self.verticalLayout_8.addWidget(self.label_6) + self.gridLayout_5.addWidget(self.label_6, 0, 0, 1, 1) self.label_end_timer = QtWidgets.QLabel(self.frame_end) font = QtGui.QFont() font.setFamily("FreeSans") @@ -344,12 +344,12 @@ class Ui_MainWindow(object): self.label_end_timer.setFont(font) self.label_end_timer.setAlignment(QtCore.Qt.AlignCenter) self.label_end_timer.setObjectName("label_end_timer") - self.verticalLayout_8.addWidget(self.label_end_timer) + self.gridLayout_5.addWidget(self.label_end_timer, 1, 0, 1, 1) self.horizontalLayout_2.addWidget(self.frame_end) - self.gridLayout_3.addLayout(self.horizontalLayout_2, 3, 0, 1, 1) + self.gridLayout_6.addLayout(self.horizontalLayout_2, 3, 0, 1, 1) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtWidgets.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 1164, 29)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 1280, 29)) self.menubar.setObjectName("menubar") self.menuFile = QtWidgets.QMenu(self.menubar) self.menuFile.setObjectName("menuFile") @@ -492,12 +492,12 @@ class Ui_MainWindow(object): self.btnSetNext.setText(_translate("MainWindow", "Set next")) self.btnStop.setText(_translate("MainWindow", "Stop")) self.btnFade.setText(_translate("MainWindow", "Fade")) - self.label_2.setText(_translate("MainWindow", "Started at:")) - self.label_start_tod.setText(_translate("MainWindow", "00:00:00")) - self.label_3.setText(_translate("MainWindow", "Silent at:")) - self.label_silent_tod.setText(_translate("MainWindow", "00:00:00")) + self.label_x.setText(_translate("MainWindow", "Track length:")) + self.label_track_length.setText(_translate("MainWindow", "0:00")) self.label_7.setText(_translate("MainWindow", "Fade length:")) self.label_fade_length.setText(_translate("MainWindow", "0:00")) + self.label_3.setText(_translate("MainWindow", "Silence length:")) + self.label_silence_length.setText(_translate("MainWindow", "0:00")) self.label.setText(_translate("MainWindow", "Elapsed time")) self.label_elapsed_timer.setText(_translate("MainWindow", "00:00")) self.label_4.setText(_translate("MainWindow", "Fade"))