qsui: fixed playlist duration update

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9129 90c681e8-e032-0410-971d-27865f9a5e38

2 files changed, 20 insertions, 2 deletions

diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp
index 83563325b..8db863d2a 100644
--- a/src/plugins/Ui/qsui/mainwindow.cpp
+++ b/src/plugins/Ui/qsui/mainwindow.cpp
@@ -110,13 +110,14 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     //playlist manager
     connect(m_positionSlider, SIGNAL(sliderReleased()), SLOT(seek()));
     connect(m_pl_manager, SIGNAL(currentPlayListChanged(PlayListModel*,PlayListModel*)),
-            SLOT(updateTabs()));
+            SLOT(onCurrentPlayListChanged(PlayListModel*,PlayListModel*)));
     connect(m_pl_manager, SIGNAL(selectedPlayListChanged(PlayListModel*,PlayListModel*)),
             SLOT(updateTabs()));
     connect(m_pl_manager, SIGNAL(playListRemoved(int)), SLOT(removeTab(int)));
     connect(m_pl_manager, SIGNAL(playListAdded(int)), SLOT(addTab(int)));
     connect(m_pl_manager, SIGNAL(selectedPlayListChanged(PlayListModel*,PlayListModel*)),
             m_listWidget, SLOT(setModel(PlayListModel*,PlayListModel*)));
+    connect(m_pl_manager->currentPlayList(), SIGNAL(listChanged(int)), SLOT(onListChanged(int)));
     connect(m_tabWidget,SIGNAL(currentChanged(int)), m_pl_manager, SLOT(selectPlayList(int)));
     connect(m_tabWidget, SIGNAL(tabCloseRequested(int)), m_pl_manager, SLOT(removePlayList(int)));
     connect(m_tabWidget, SIGNAL(tabMoved(int,int)), m_pl_manager, SLOT(move(int,int)));
@@ -391,7 +392,7 @@ void MainWindow::updateStatus()
         m_statusLabel->setText(tr("<b>%1</b>|tracks: %2|total time: %3|")
                                .arg(tr("Stopped"))
                                .arg(tracks)
-                               .arg(MetaDataFormatter::formatDuration(duration)));
+                               .arg(MetaDataFormatter::formatDuration(duration, false)));
     }
     else
         m_statusLabel->clear();
@@ -947,3 +948,18 @@ void MainWindow::restoreWindowTitle()
 {
     setWindowTitle(tr("Qmmp"));
 }
+
+void MainWindow::onListChanged(int flags)
+{
+    if(flags & PlayListModel::STRUCTURE)
+        updateStatus();
+}
+
+void MainWindow::onCurrentPlayListChanged(PlayListModel *current, PlayListModel *previous)
+{
+    updateTabs();
+    updateStatus();
+    connect(current, SIGNAL(listChanged(int)), SLOT(onListChanged(int)));
+    if(previous)
+        disconnect(current, SIGNAL(listChanged(int)), this, SLOT(onListChanged(int)));
+}
diff --git a/src/plugins/Ui/qsui/mainwindow.h b/src/plugins/Ui/qsui/mainwindow.h
index 4193a5652..17ea17c03 100644
--- a/src/plugins/Ui/qsui/mainwindow.h
+++ b/src/plugins/Ui/qsui/mainwindow.h
@@ -92,6 +92,8 @@ private slots:
     void setToolBarsBlocked(bool blocked);
     void editToolBar();
     void restoreWindowTitle();
+    void onListChanged(int flags);
+    void onCurrentPlayListChanged(PlayListModel *current, PlayListModel *previous);
 
 private:
     void closeEvent(QCloseEvent *) override;