kae/musicmuster
1
0
Fork 0
Code Issues 28 Pull Requests Projects Releases 1 Activity

Add stop command; some refactoring

Browse Source
This commit is contained in:
Keith Edmunds 2021-04-04 22:17:09 +01:00
parent 8cdeb3d1a9
commit 8f749fa78d
3 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/musicmuster.py
View File

@ -91,6 +91,7 @@ class Window(QMainWindow, Ui_MainWindow):
self.actionFade.triggered.connect(self.fade) self.actionFade.triggered.connect(self.fade)
self.actionPlay_next.triggered.connect(self.play_next) self.actionPlay_next.triggered.connect(self.play_next)
self.actionSearch_database.triggered.connect(self.search_database) self.actionSearch_database.triggered.connect(self.search_database)
self.actionSkip_next.triggered.connect(self.play_next)
self.btnPrevious.clicked.connect(self.play_previous) self.btnPrevious.clicked.connect(self.play_previous)
self.btnSearchDatabase.clicked.connect(self.search_database) self.btnSearchDatabase.clicked.connect(self.search_database)
self.btnSetNextTrack.clicked.connect(self.set_next_track) self.btnSetNextTrack.clicked.connect(self.set_next_track)

29
app/playlists.py
View File

@ -432,43 +432,54 @@ class Playlist(QTableWidget):
notes = self.meta_get_notes() notes = self.meta_get_notes()
# Set colours and start times # Set colours and start times
previous_end = None running_end_time = None
for row in range(self.rowCount()): for row in range(self.rowCount()):
if row == current: if row == current:
self.set_row_colour( self.set_row_colour(
row, QColor(Config.COLOUR_CURRENT_PLAYLIST) row, QColor(Config.COLOUR_CURRENT_PLAYLIST)
) )
previous_end = datetime.strptime(self.item( running_end_time = datetime.strptime(self.item(
row, self.COL_ENDTIME).text(), "%H:%M:%S") row, self.COL_ENDTIME).text(), "%H:%M:%S")
self.set_row_bold(row) self.set_row_bold(row)
elif row == next: elif row == next:
self.set_row_colour( self.set_row_colour(
row, QColor(Config.COLOUR_NEXT_PLAYLIST) row, QColor(Config.COLOUR_NEXT_PLAYLIST)
) )
if previous_end: if running_end_time:
previous_end = self.get_row_endtime(row, previous_end) running_end_time = self.get_row_endtime(
item = QTableWidgetItem(previous_end.strftime("%H:%M:%S")) row, running_end_time)
item = QTableWidgetItem(
running_end_time.strftime("%H:%M:%S"))
self.setItem(row, self.COL_ENDTIME, item) self.setItem(row, self.COL_ENDTIME, item)
self.set_row_bold(row) self.set_row_bold(row)
elif row in notes: elif row in notes:
self.set_row_colour( self.set_row_colour(
row, QColor(Config.COLOUR_NOTES_PLAYLIST) row, QColor(Config.COLOUR_NOTES_PLAYLIST)
) )
self.set_row_bold(row) self.set_row_bold(row)
else: else:
# Stripe rows
if row % 2: if row % 2:
colour = QColor(Config.COLOUR_ODD_PLAYLIST) colour = QColor(Config.COLOUR_ODD_PLAYLIST)
else: else:
colour = QColor(Config.COLOUR_EVEN_PLAYLIST) colour = QColor(Config.COLOUR_EVEN_PLAYLIST)
self.set_row_colour(row, colour) self.set_row_colour(row, colour)
# Add running end time
if self.item(row, self.COL_INDEX): if self.item(row, self.COL_INDEX):
if int(self.item(row, self.COL_INDEX).text()) > 0: if int(self.item(row, self.COL_INDEX).text()) > 0:
if previous_end: if running_end_time:
previous_end = self.get_row_endtime( running_end_time = self.get_row_endtime(
row, previous_end) row, running_end_time)
item = QTableWidgetItem( item = QTableWidgetItem(
previous_end.strftime("%H:%M:%S")) running_end_time.strftime("%H:%M:%S"))
self.setItem(row, self.COL_ENDTIME, item) self.setItem(row, self.COL_ENDTIME, item)
# Dim played tracks
track_id = int(self.item(row, self.COL_INDEX).text()) track_id = int(self.item(row, self.COL_INDEX).text())
if track_id in self.played_tracks: if track_id in self.played_tracks:
self.set_row_not_bold(row) self.set_row_not_bold(row)

9
app/ui/main_window.ui
View File

@ -688,12 +688,12 @@ border: 1px solid rgb(85, 87, 83);</string>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="btnTrackInfo"> <widget class="QPushButton" name="btnInsertNote">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>true</bool>
</property> </property>
<property name="text"> <property name="text">
<string>Track &amp;info</string> <string>Insert no&amp;te</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -766,6 +766,9 @@ border: 1px solid rgb(85, 87, 83);</string>
<property name="text"> <property name="text">
<string>Skip to &amp;next</string> <string>Skip to &amp;next</string>
</property> </property>
<property name="shortcut">
<string>Ctrl+Return</string>
</property>
</action> </action>
<action name="actionSearch_database"> <action name="actionSearch_database">
<property name="icon"> <property name="icon">