diff --git a/app/musicmuster.py b/app/musicmuster.py index 5ae8258..15724d7 100755 --- a/app/musicmuster.py +++ b/app/musicmuster.py @@ -215,9 +215,11 @@ class Window(QMainWindow, Ui_MainWindow): # Set time clocks now = datetime.now() self.label_start_tod.setText(now.strftime("%H:%M:%S")) - silence_time = now + timedelta( - milliseconds=self.music.get_current_silence_at()) + silence_at = self.music.get_current_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(ms_to_mmss( + silence_at - self.music.get_current_fade_at())) def play_selected(self): if self.playlist.selectionModel().hasSelection(): diff --git a/app/ui/main_window.ui b/app/ui/main_window.ui index f5b4c58..9d15348 100644 --- a/app/ui/main_window.ui +++ b/app/ui/main_window.ui @@ -14,7 +14,7 @@ MainWindow - + @@ -25,7 +25,7 @@ - 116 + 230 16777215 @@ -60,7 +60,7 @@ border: 1px solid rgb(85, 87, 83); border: 1px solid rgb(85, 87, 83); - Before the goldrush - Neil Young [3:46] + @@ -74,7 +74,7 @@ border: 1px solid rgb(85, 87, 83); - 116 + 230 16777215 @@ -109,7 +109,7 @@ border: 1px solid rgb(85, 87, 83); border: 1px solid rgb(85, 87, 83); - During the goldrush - Neil Young [3:46] + @@ -123,7 +123,7 @@ border: 1px solid rgb(85, 87, 83); - 116 + 230 16777215 @@ -158,7 +158,7 @@ border: 1px solid rgb(85, 87, 83); border: 1px solid rgb(85, 87, 83); - After the goldrush - Neil Young [3:46] + @@ -243,66 +243,84 @@ border: 1px solid rgb(85, 87, 83); QFrame::Raised - - - - - - - Started at: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - FreeSans - 16 - - - - 10:17:37 - - - false - - - - + + + + + Started at: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + - - - - - - Silent at: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - FreeSans - 16 - - - - 10:21:28 - - - false - - - - + + + + + FreeSans + 16 + + + + 00:00:00 + + + false + + + + + + + Silent at: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + FreeSans + 16 + + + + 00:00:00 + + + false + + + + + + + Fade length: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + FreeSans + 16 + + + + 0:00 + + + false + + @@ -353,7 +371,7 @@ border: 1px solid rgb(85, 87, 83); - 2:46 + 00:00 Qt::AlignCenter @@ -409,7 +427,7 @@ border: 1px solid rgb(85, 87, 83); - 2:46 + 00:00 Qt::AlignCenter @@ -465,7 +483,7 @@ border: 1px solid rgb(85, 87, 83); - 2:46 + 00:00 Qt::AlignCenter @@ -521,7 +539,7 @@ border: 1px solid rgb(85, 87, 83); - 2:46 + 00:00 Qt::AlignCenter @@ -551,16 +569,6 @@ border: 1px solid rgb(85, 87, 83); current_track previous_track next_track - horizontalSpacer - horizontalSpacer_2 - horizontalSpacer_3 - horizontalSpacer_4 - frame_elapsed - frame - frame_elapsed_2 - frame_elapsed_3 - frame_elapsed_4 - horizontalSpacer_5 current_track_2 next_track_2 previous_track_2