app/musicmuster.py

@@ -139,8 +139,9 @@ class Window(QMainWindow, Ui_MainWindow):
         self.btnFade.clicked.connect(self.fade)
         self.btnPlay.clicked.connect(self.play_next)
         self.btnSetNext.clicked.connect(self.set_next_track)
-        self.btnSongInfo.clicked.connect(self.song_info_search)
+        self.btnSongfacts.clicked.connect(self.songfacts_search)
         self.btnStop.clicked.connect(self.stop)
+        self.btnWikipedia.clicked.connect(self.wikipedia_search)
         self.spnVolume.valueChanged.connect(self.change_volume)
         self.tabPlaylist.currentChanged.connect(self.tab_change)
 
@@ -406,28 +407,11 @@ class Window(QMainWindow, Ui_MainWindow):
 
         QMessageBox.warning(None, title, msg, buttons=QMessageBox.Cancel)
 
-    def song_info_search(self):
-        """
-        Open browser tabs for Wikipedia and Songfacts, searching for
-        the first that exists of:
-            - selected track
-            - current track
-            - next track
-        """
+    def songfacts_search(self):
+        "Open a browser window in Songfacts searching for selected title"
 
         title = self.visible_playlist().get_selected_title()
-        if not title:
-            if self.current_track:
-                title = self.current_track.title
-        if not title:
-            if self.next_track:
-                title = self.next_track.title
         if title:
-            # Wikipedia
-            str = urllib.parse.quote_plus(title)
-            url = f"https://www.wikipedia.org/w/index.php?search={str}"
-            webbrowser.open(url, new=2)
-            # Songfacts
             slug = slugify(title, replacements=([["'", ""]]))
             url = f"https://www.songfacts.com/search/songs/{slug}"
             webbrowser.open(url, new=2)
@@ -556,8 +540,6 @@ class Window(QMainWindow, Ui_MainWindow):
                 self.current_track_playlist = None
                 self.previous_track_position = 0
                 self.update_headers()
-                # Release player
-                self.music.stop()
 
     def update_headers(self):
         "Update last / current / next track headers"
@@ -586,6 +568,15 @@ class Window(QMainWindow, Ui_MainWindow):
         except AttributeError:
             self.hdrNextTrack.setText("")
 
+    def wikipedia_search(self):
+        "Open a browser window in Wikipedia searching for selected title"
+
+        title = self.visible_playlist().get_selected_title()
+        if title:
+            str = urllib.parse.quote_plus(title)
+            url = f"https://www.wikipedia.org/w/index.php?search={str}"
+            webbrowser.open(url, new=2)
+
 
 class DbDialog(QDialog):
     def __init__(self, parent=None):

app/playlists.py

@@ -242,7 +242,7 @@ class Playlist(QTableWidget):
         # Add empty start time for now as background
         # colour won't be set for columns without items
         item = QTableWidgetItem()
-        self.setItem(row, self.COL_START_TIME, item)
+        self.setItem(row, self.COL_PATH, item)
 
         # Scroll to new row
         self.scrollToItem(titleitem, QAbstractItemView.PositionAtCenter)
@@ -333,7 +333,6 @@ class Playlist(QTableWidget):
     def play_stopped(self):
         self._meta_clear_current()
         self.current_track_start_time = None
-        self._repaint(save_playlist=False)
 
     def populate(self):
         # add them in row order. We don't mandate that an item will be

app/ui/main_window.ui

@@ -260,36 +260,6 @@ border: 1px solid rgb(85, 87, 83);</string>
          </property>
         </widget>
        </item>
-       <item>
-        <spacer name="horizontalSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>68</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QPushButton" name="btnSongInfo">
-         <property name="text">
-          <string>Song info</string>
-         </property>
-         <property name="icon">
-          <iconset resource="icons.qrc">
-           <normaloff>:/icons/wikipedia</normaloff>:/icons/wikipedia</iconset>
-         </property>
-         <property name="iconSize">
-          <size>
-           <width>30</width>
-           <height>30</height>
-          </size>
-         </property>
-        </widget>
-       </item>
        <item>
         <widget class="QPushButton" name="btnSetNext">
          <property name="text">
@@ -308,13 +278,43 @@ border: 1px solid rgb(85, 87, 83);</string>
         </widget>
        </item>
        <item>
-        <widget class="QPushButton" name="btnDatabase">
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>68</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QPushButton" name="btnWikipedia">
          <property name="text">
-          <string>Database</string>
+          <string>Wikipedia</string>
          </property>
          <property name="icon">
           <iconset resource="icons.qrc">
-           <normaloff>:/icons/search_db</normaloff>:/icons/search_db</iconset>
+           <normaloff>:/icons/wikipedia</normaloff>:/icons/wikipedia</iconset>
+         </property>
+         <property name="iconSize">
+          <size>
+           <width>30</width>
+           <height>30</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="btnSongfacts">
+         <property name="text">
+          <string>Songfacts</string>
+         </property>
+         <property name="icon">
+          <iconset resource="icons.qrc">
+           <normaloff>:/icons/songsearch</normaloff>:/icons/songsearch</iconset>
          </property>
          <property name="iconSize">
           <size>
@@ -368,13 +368,13 @@ border: 1px solid rgb(85, 87, 83);</string>
         </spacer>
        </item>
        <item>
-        <widget class="QPushButton" name="btnAddNote">
+        <widget class="QPushButton" name="btnDatabase">
          <property name="text">
-          <string>Add note</string>
+          <string>Database</string>
          </property>
          <property name="icon">
           <iconset resource="icons.qrc">
-           <normaloff>:/icons/note</normaloff>:/icons/note</iconset>
+           <normaloff>:/icons/search_db</normaloff>:/icons/search_db</iconset>
          </property>
          <property name="iconSize">
           <size>
@@ -401,6 +401,23 @@ border: 1px solid rgb(85, 87, 83);</string>
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QPushButton" name="btnAddNote">
+         <property name="text">
+          <string>Add note</string>
+         </property>
+         <property name="icon">
+          <iconset resource="icons.qrc">
+           <normaloff>:/icons/note</normaloff>:/icons/note</iconset>
+         </property>
+         <property name="iconSize">
+          <size>
+           <width>30</width>
+           <height>30</height>
+          </size>
+         </property>
+        </widget>
+       </item>
        <item>
         <spacer name="horizontalSpacer_3">
          <property name="orientation">
@@ -734,7 +751,7 @@ border: 1px solid rgb(85, 87, 83);</string>
      <x>0</x>
      <y>0</y>
      <width>1164</width>
-     <height>26</height>
+     <height>18</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">

run_debug.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-gdb -ex r --args /home/kae/git/musicmuster/.direnv/python-3.9.2/bin/python app/musicmuster.py
+gdb -ex r --args /home/kae/git/musicmuster/.direnv/python-3.7.3/bin/python app/musicmuster.py