From 2d80e20d5b6153c92eb169bffda63be4c9d5e1f8 Mon Sep 17 00:00:00 2001
From: Keith Edmunds <kae@tiger-computing.co.uk>
Date: Mon, 19 Apr 2021 21:01:09 +0100
Subject: [PATCH] New layout

---
 app/musicmuster.py    |  5 ++--
 app/ui/main_window.ui | 64 +++++++++++++++++++++++++++++++++++--------
 2 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/app/musicmuster.py b/app/musicmuster.py
index 8afc859..c335ccd 100755
--- a/app/musicmuster.py
+++ b/app/musicmuster.py
@@ -113,11 +113,12 @@ class Window(QMainWindow, Ui_MainWindow):
         self.actionTestFunction.triggered.connect(self.test_function)
         self.btnAddFile.clicked.connect(self.add_file)
         self.btnAddNote.clicked.connect(self.insert_note)
-        self.btnPrevious.clicked.connect(self.play_previous)
         self.btnDatabase.clicked.connect(self.search_database)
+        self.btnFade.clicked.connect(self.fade)
+        self.btnPlay.clicked.connect(self.play_next)
+        self.btnPrevious.clicked.connect(self.play_previous)
         self.btnSetNext.clicked.connect(self.set_next_track)
         self.btnSkipNext.clicked.connect(self.play_next)
-        self.btnStop.clicked.connect(self.fade)
 
         self.timer.timeout.connect(self.tick)
 
diff --git a/app/ui/main_window.ui b/app/ui/main_window.ui
index 66ed9d9..d84e4b7 100644
--- a/app/ui/main_window.ui
+++ b/app/ui/main_window.ui
@@ -17,7 +17,7 @@
    <string notr="true"/>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <layout class="QGridLayout" name="gridLayout_2">
+   <layout class="QGridLayout" name="gridLayout_3">
     <item row="0" column="0">
      <layout class="QHBoxLayout" name="horizontalLayout_3">
       <item>
@@ -121,9 +121,21 @@ border: 1px solid rgb(85, 87, 83);</string>
        </layout>
       </item>
       <item>
-       <layout class="QVBoxLayout" name="verticalLayout_4">
+       <layout class="QVBoxLayout" name="verticalLayout">
         <item>
          <widget class="QLabel" name="previous_track">
+          <property name="minimumSize">
+           <size>
+            <width>16</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>16777215</width>
+            <height>16777215</height>
+           </size>
+          </property>
           <property name="font">
            <font>
             <family>Sans</family>
@@ -176,18 +188,48 @@ border: 1px solid rgb(85, 87, 83);</string>
        </layout>
       </item>
       <item>
-       <widget class="QLabel" name="lblTOD">
-        <property name="font">
-         <font>
-          <pointsize>35</pointsize>
-         </font>
+       <widget class="QFrame" name="frame_2">
+        <property name="maximumSize">
+         <size>
+          <width>230</width>
+          <height>16777215</height>
+         </size>
         </property>
-        <property name="text">
-         <string>00:00:00</string>
+        <property name="frameShape">
+         <enum>QFrame::StyledPanel</enum>
         </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
+        <property name="frameShadow">
+         <enum>QFrame::Raised</enum>
         </property>
+        <layout class="QGridLayout" name="gridLayout_2">
+         <item row="0" column="0">
+          <widget class="QLabel" name="lblTOD">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>102</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="font">
+            <font>
+             <pointsize>35</pointsize>
+            </font>
+           </property>
+           <property name="text">
+            <string>00:00:00</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </widget>
       </item>
      </layout>