From ca995c879409622cab7d6648d4e045cf26d45b63 Mon Sep 17 00:00:00 2001
From: Keith Edmunds <kae@tiger-computing.co.uk>
Date: Sun, 2 May 2021 09:04:34 +0100
Subject: [PATCH] Change playlist menu names

---
 app/musicmuster.py    |  7 +++----
 app/playlists.py      |  2 ++
 app/ui/main_window.ui | 39 +++++++++++++++++++++++++++++++++------
 3 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/app/musicmuster.py b/app/musicmuster.py
index e82f47d..f196dc8 100755
--- a/app/musicmuster.py
+++ b/app/musicmuster.py
@@ -7,8 +7,7 @@ import sys
 from datetime import datetime, timedelta
 from log import DEBUG, EXCEPTION
 
-from PyQt5 import Qt
-from PyQt5.QtCore import QTimer
+from PyQt5.QtCore import Qt, QTimer
 from PyQt5.QtWidgets import (
     QApplication,
     QDialog,
@@ -120,7 +119,7 @@ class Window(QMainWindow, Ui_MainWindow):
         self.actionNewPlaylist.triggered.connect(self.create_playlist)
         self.actionPlay_next.triggered.connect(self.play_next)
         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.actionSkipToEnd.triggered.connect(self.test_skip_to_end)
         self.actionSkipToFade.triggered.connect(self.test_skip_to_fade)
@@ -494,7 +493,7 @@ class DbDialog(QDialog):
 
     def add_track(self, 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
         self.select_searchtext()
 
diff --git a/app/playlists.py b/app/playlists.py
index 1d16288..d26c5c5 100644
--- a/app/playlists.py
+++ b/app/playlists.py
@@ -406,6 +406,8 @@ class Playlist(QTableWidget):
     def _get_row_id(self, row):
         "Return item id as integer from passed row"
 
+        if row is None:
+            return
         if self.item(row, self.COL_INDEX):
             try:
                 return int(self.item(row, self.COL_INDEX).text())
diff --git a/app/ui/main_window.ui b/app/ui/main_window.ui
index 9409a15..6f449ca 100644
--- a/app/ui/main_window.ui
+++ b/app/ui/main_window.ui
@@ -751,12 +751,15 @@ border: 1px solid rgb(85, 87, 83);</string>
     <property name="title">
      <string>Pla&amp;ylist</string>
     </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="actionAdd_file"/>
     <addaction name="action_Clear_selection"/>
-    <addaction name="separator"/>
-    <addaction name="actionSelectPlaylist"/>
-    <addaction name="actionNewPlaylist"/>
    </widget>
    <widget class="QMenu" name="menu_Tracks">
     <property name="title">
@@ -886,14 +889,14 @@ border: 1px solid rgb(85, 87, 83);</string>
     <string>&amp;Test</string>
    </property>
   </action>
-  <action name="actionSelectPlaylist">
+  <action name="actionOpenPlaylist">
    <property name="text">
-    <string>Select &amp;playlist</string>
+    <string>O&amp;pen...</string>
    </property>
   </action>
   <action name="actionNewPlaylist">
    <property name="text">
-    <string>&amp;New playlist</string>
+    <string>&amp;New...</string>
    </property>
   </action>
   <action name="actionTestFunction">
@@ -911,6 +914,30 @@ border: 1px solid rgb(85, 87, 83);</string>
     <string>Skip to &amp;end of track</string>
    </property>
   </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>
  <resources>
   <include location="icons.qrc"/>