From 5dae362c853ea05480a3a835826d8d61dc66d63c Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Tue, 1 Mar 2016 11:46:50 +0000
Subject: added new dialog api support

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6145 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/FileDialogs/FileDialogs.pro |  2 +-
 src/qmmpui/uihelper.cpp                 | 21 +++++++++++++++------
 src/qmmpui/uihelper.h                   |  1 +
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/plugins/FileDialogs/FileDialogs.pro b/src/plugins/FileDialogs/FileDialogs.pro
index 4e2ceeeae..fcf8a2d83 100644
--- a/src/plugins/FileDialogs/FileDialogs.pro
+++ b/src/plugins/FileDialogs/FileDialogs.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS += QmmpFileDialog #TwoPanelFileDialog
+SUBDIRS += QmmpFileDialog TwoPanelFileDialog
diff --git a/src/qmmpui/uihelper.cpp b/src/qmmpui/uihelper.cpp
index 2e8863580..4548bce42 100644
--- a/src/qmmpui/uihelper.cpp
+++ b/src/qmmpui/uihelper.cpp
@@ -138,8 +138,9 @@ void UiHelper::addFiles(QWidget *parent, PlayListModel *model)
     filters << tr("All Supported Bitstreams")+" (" +
             MetaDataManager::instance()->nameFilters().join (" ") +")";
     filters << MetaDataManager::instance()->filters();
-    FileDialog::popup(parent, FileDialog::AddDirsFiles, &m_lastDir,
-                      model, SLOT(add(const QStringList&)),
+    m_model = model;
+    FileDialog::popup(parent, FileDialog::PlayDirsFiles, &m_lastDir,
+                      this, SLOT(addSelectedFiles(QStringList,bool)),
                       tr("Select one or more files to open"), filters.join(";;"));
 }
 
@@ -151,7 +152,7 @@ void UiHelper::playFiles(QWidget *parent, PlayListModel *model)
     filters << MetaDataManager::instance()->filters();
     m_model = model;
     FileDialog::popup(parent, FileDialog::AddDirsFiles, &m_lastDir,
-                      this, SLOT(playSelectedFiles(const QStringList &)),
+                      this, SLOT(playSelectedFiles(QStringList)),
                       tr("Select one or more files to play"), filters.join(";;"));
 
 }
@@ -285,11 +286,19 @@ void UiHelper::removeAction(QObject *action)
     removeAction((QAction *) action);
 }
 
-void UiHelper::playSelectedFiles(const QStringList &files)
+void UiHelper::addSelectedFiles(const QStringList &files, bool play)
 {
-    if(files.isEmpty())
+    if(files.isEmpty() || !PlayListManager::instance()->playLists().contains(m_model))
         return;
-    if(!PlayListManager::instance()->playLists().contains(m_model))
+    if(play)
+        playSelectedFiles(files);
+    else
+        m_model->add(files);
+}
+
+void UiHelper::playSelectedFiles(const QStringList &files)
+{
+    if(files.isEmpty() || !PlayListManager::instance()->playLists().contains(m_model))
         return;
     m_model->clear();
     PlayListManager::instance()->activatePlayList(m_model);
diff --git a/src/qmmpui/uihelper.h b/src/qmmpui/uihelper.h
index 309b871f3..cf9065921 100644
--- a/src/qmmpui/uihelper.h
+++ b/src/qmmpui/uihelper.h
@@ -174,6 +174,7 @@ signals:
 
 private slots:
     void removeAction(QObject *action);
+    void addSelectedFiles(const QStringList &files, bool play);
     void playSelectedFiles(const QStringList &files);
     void disconnectPl();
 
-- 
cgit v1.2.3-13-gbd6f