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

Change playlist menu names

Browse Source
This commit is contained in:
Keith Edmunds 2021-05-02 09:04:34 +01:00
parent 90b322f282
commit ca995c8794
3 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/musicmuster.py
View File

@ -7,8 +7,7 @@ import sys
from datetime import datetime, timedelta from datetime import datetime, timedelta
from log import DEBUG, EXCEPTION from log import DEBUG, EXCEPTION
from PyQt5 import Qt from PyQt5.QtCore import Qt, QTimer
from PyQt5.QtCore import QTimer
from PyQt5.QtWidgets import ( from PyQt5.QtWidgets import (
QApplication, QApplication,
QDialog, QDialog,
@ -120,7 +119,7 @@ class Window(QMainWindow, Ui_MainWindow):
self.actionNewPlaylist.triggered.connect(self.create_playlist) self.actionNewPlaylist.triggered.connect(self.create_playlist)
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.actionSelectPlaylist.triggered.connect(self.select_playlist) self.actionOpenPlaylist.triggered.connect(self.select_playlist)
self.actionSkip_next.triggered.connect(self.play_next) self.actionSkip_next.triggered.connect(self.play_next)
self.actionSkipToEnd.triggered.connect(self.test_skip_to_end) self.actionSkipToEnd.triggered.connect(self.test_skip_to_end)
self.actionSkipToFade.triggered.connect(self.test_skip_to_fade) self.actionSkipToFade.triggered.connect(self.test_skip_to_fade)
@ -494,7 +493,7 @@ class DbDialog(QDialog):
def add_track(self, track_id): def add_track(self, track_id):
track = Tracks.track_from_id(track_id) track = Tracks.track_from_id(track_id)
self.parent().add_to_playlist(track) self.parent().current_playlist().add_to_playlist(track)
# Select search text to make it easier for next search # Select search text to make it easier for next search
self.select_searchtext() self.select_searchtext()

2
app/playlists.py
View File

@ -406,6 +406,8 @@ class Playlist(QTableWidget):
def _get_row_id(self, row): def _get_row_id(self, row):
"Return item id as integer from passed row" "Return item id as integer from passed row"
if row is None:
return
if self.item(row, self.COL_INDEX): if self.item(row, self.COL_INDEX):
try: try:
return int(self.item(row, self.COL_INDEX).text()) return int(self.item(row, self.COL_INDEX).text())

39
app/ui/main_window.ui
View File

@ -751,12 +751,15 @@ border: 1px solid rgb(85, 87, 83);</string>
<property name="title"> <property name="title">
<string>Pla&amp;ylist</string> <string>Pla&amp;ylist</string>
</property> </property>
<addaction name="actionNewPlaylist"/>
<addaction name="actionOpenPlaylist"/>
<addaction name="actionClosePlaylist"/>
<addaction name="actionRenamePlaylist"/>
<addaction name="actionDeletePlaylist"/>
<addaction name="separator"/>
<addaction name="actionSearch_database"/> <addaction name="actionSearch_database"/>
<addaction name="actionAdd_file"/> <addaction name="actionAdd_file"/>
<addaction name="action_Clear_selection"/> <addaction name="action_Clear_selection"/>
<addaction name="separator"/>
<addaction name="actionSelectPlaylist"/>
<addaction name="actionNewPlaylist"/>
</widget> </widget>
<widget class="QMenu" name="menu_Tracks"> <widget class="QMenu" name="menu_Tracks">
<property name="title"> <property name="title">
@ -886,14 +889,14 @@ border: 1px solid rgb(85, 87, 83);</string>
<string>&amp;Test</string> <string>&amp;Test</string>
</property> </property>
</action> </action>
<action name="actionSelectPlaylist"> <action name="actionOpenPlaylist">
<property name="text"> <property name="text">
<string>Select &amp;playlist</string> <string>O&amp;pen...</string>
</property> </property>
</action> </action>
<action name="actionNewPlaylist"> <action name="actionNewPlaylist">
<property name="text"> <property name="text">
<string>&amp;New playlist</string> <string>&amp;New...</string>
</property> </property>
</action> </action>
<action name="actionTestFunction"> <action name="actionTestFunction">
@ -911,6 +914,30 @@ border: 1px solid rgb(85, 87, 83);</string>
<string>Skip to &amp;end of track</string> <string>Skip to &amp;end of track</string>
</property> </property>
</action> </action>
<action name="actionClosePlaylist">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>&amp;Close</string>
</property>
</action>
<action name="actionRenamePlaylist">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>&amp;Rename...</string>
</property>
</action>
<action name="actionDeletePlaylist">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Dele&amp;te...</string>
</property>
</action>
</widget> </widget>
<resources> <resources>
<include location="icons.qrc"/> <include location="icons.qrc"/>