Compare commits

...

3 Commits

Author SHA1 Message Date
Keith Edmunds
01b531aabf Scroll to show moved tracks on drag and drop
Fixes #75
2021-09-24 15:10:17 +01:00
Keith Edmunds
6ccfae0ab1 Add note colouring by keyword
Fixes #71
2021-09-24 14:58:35 +01:00
Keith Edmunds
9cf9ef9a59 Add ^T shortcut to add note
Fixes #69
2021-09-24 14:43:33 +01:00
5 changed files with 30 additions and 1 deletions

View File

@ -38,6 +38,12 @@ class Config(object):
MILLISECOND_SIGFIGS = 0
MYSQL_CONNECT = os.environ.get('MYSQL_CONNECT') or "mysql+mysqldb://musicmuster:musicmuster@localhost/musicmuster_dev" # noqa E501
NORMALISE_ON_IMPORT = True
NOTE_COLOURS = {
'track': "#ffff00",
'request': "#7cf000",
'wrap': "#fffacd",
'story': "#dda0dd",
}
ROOT = os.environ.get('ROOT') or "/home/kae/music"
TESTMODE = True
TIMER_MS = 500

View File

@ -166,6 +166,7 @@ class Window(QMainWindow, Ui_MainWindow):
def connect_signals_slots(self):
self.actionAdd_file.triggered.connect(self.add_file)
self.actionAdd_note.triggered.connect(self.insert_note)
self.action_Clear_selection.triggered.connect(self.clear_selection)
self.actionClosePlaylist.triggered.connect(self.close_playlist_tab)
self.actionExport_playlist.triggered.connect(self.export_playlist_tab)

View File

@ -141,6 +141,8 @@ class PlaylistTab(QTableWidget):
self.setSpan(row, self.COL_NOTE, self.NOTE_ROW_SPAN,
self.NOTE_COL_SPAN)
# Scroll to drop zone
self.scrollToItem(self.item(row, 1))
super().dropEvent(event)
DEBUG(
@ -1028,8 +1030,14 @@ class PlaylistTab(QTableWidget):
if row_time:
next_start_time = row_time
# Set colour
note_colour = Config.COLOUR_NOTES_PLAYLIST
note_text = self.item(row, self.COL_TITLE).text()
note_tokens = note_text.split(":", 1)
if len(note_tokens) == 2:
if note_tokens[0] in Config.NOTE_COLOURS:
note_colour = Config.NOTE_COLOURS[note_tokens[0]]
self._set_row_colour(
row, QColor(Config.COLOUR_NOTES_PLAYLIST)
row, QColor(note_colour)
)
self._set_row_bold(row)

View File

@ -770,6 +770,7 @@ border: 1px solid rgb(85, 87, 83);</string>
<addaction name="separator"/>
<addaction name="actionSearch_database"/>
<addaction name="actionAdd_file"/>
<addaction name="actionAdd_note"/>
<addaction name="action_Clear_selection"/>
<addaction name="separator"/>
<addaction name="actionSelect_unplayed_tracks"/>
@ -1004,6 +1005,14 @@ border: 1px solid rgb(85, 87, 83);</string>
<string>Select unplayed tracks</string>
</property>
</action>
<action name="actionAdd_note">
<property name="text">
<string>Add note...</string>
</property>
<property name="shortcut">
<string>Ctrl+T</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>

View File

@ -438,6 +438,8 @@ class Ui_MainWindow(object):
self.actionSelect_played_tracks.setObjectName("actionSelect_played_tracks")
self.actionSelect_unplayed_tracks = QtWidgets.QAction(MainWindow)
self.actionSelect_unplayed_tracks.setObjectName("actionSelect_unplayed_tracks")
self.actionAdd_note = QtWidgets.QAction(MainWindow)
self.actionAdd_note.setObjectName("actionAdd_note")
self.menuFile.addAction(self.actionE_xit)
self.menuPlaylist.addAction(self.actionNewPlaylist)
self.menuPlaylist.addAction(self.actionOpenPlaylist)
@ -447,6 +449,7 @@ class Ui_MainWindow(object):
self.menuPlaylist.addSeparator()
self.menuPlaylist.addAction(self.actionSearch_database)
self.menuPlaylist.addAction(self.actionAdd_file)
self.menuPlaylist.addAction(self.actionAdd_note)
self.menuPlaylist.addAction(self.action_Clear_selection)
self.menuPlaylist.addSeparator()
self.menuPlaylist.addAction(self.actionSelect_unplayed_tracks)
@ -545,5 +548,7 @@ class Ui_MainWindow(object):
self.actionSelect_previous_track.setShortcut(_translate("MainWindow", "K"))
self.actionSelect_played_tracks.setText(_translate("MainWindow", "Select played tracks"))
self.actionSelect_unplayed_tracks.setText(_translate("MainWindow", "Select unplayed tracks"))
self.actionAdd_note.setText(_translate("MainWindow", "Add note..."))
self.actionAdd_note.setShortcut(_translate("MainWindow", "Ctrl+T"))
from musicmuster import ElideLabel
import icons_rc