fixed several bugs

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

1 files changed, 4 insertions, 46 deletions

diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.cpp b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.cpp
index be67c0e53..3285f5dda 100644
--- a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.cpp
+++ b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.cpp
@@ -1,5 +1,5 @@
 /**************************************************************************
-*   Copyright (C) 2008-2012 by Ilya Kotov                                 *
+*   Copyright (C) 2016 by Ilya Kotov                                      *
 *   forkotov02@hotmail.ru                                                 *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
@@ -28,7 +28,7 @@
 TwoPanelFileDialog::TwoPanelFileDialog()
 {
     m_dialog = new TwoPanelFileDialogImpl();
-    connect(m_dialog, SIGNAL(filesAdded(QStringList)), SIGNAL(filesAdded(QStringList)));
+    connect(m_dialog, SIGNAL(filesSelected(QStringList, bool)), SIGNAL(filesSelected(QStringList,bool)));
 }
 
 TwoPanelFileDialog::~TwoPanelFileDialog()
@@ -45,37 +45,11 @@ void TwoPanelFileDialog::raise(const QString &dir, Mode mode, const QString &cap
     m_dialog->raise();
 }
 
-QString TwoPanelFileDialog::existingDirectory(QWidget *parent, const QString &caption, const QString &dir)
+QStringList TwoPanelFileDialog::exec(QWidget *parent, const QString &dir, FileDialog::Mode mode, const QString &caption, const QString &filter, QString *)
 {
     TwoPanelFileDialogImpl *dialog = new TwoPanelFileDialogImpl(parent);
     dialog->setWindowTitle(caption);
-    dialog->setModeAndMask(dir, FileDialog::AddDir);
-    QStringList l;
-    if (dialog->exec() == QDialog::Accepted)
-        l = dialog->selectedFiles();
-    dialog->deleteLater();
-    return l.isEmpty() ? QString() : l.at(0);
-}
-
-QString TwoPanelFileDialog::openFileName(QWidget *parent, const QString &caption,
-                                     const QString &dir, const QString &filter, QString*)
-{
-    TwoPanelFileDialogImpl *dialog = new TwoPanelFileDialogImpl(parent);
-    dialog->setWindowTitle(caption);
-    dialog->setModeAndMask(dir, FileDialog::AddFile, filter.split(";;"));
-    QStringList l;
-    if (dialog->exec() == QDialog::Accepted)
-        l = dialog->selectedFiles();
-    dialog->deleteLater();
-    return l.isEmpty() ? QString() : l.at(0);
-}
-
-QStringList TwoPanelFileDialog::openFileNames(QWidget *parent, const QString &caption,
-        const QString &dir, const QString &filter, QString *)
-{
-    TwoPanelFileDialogImpl *dialog = new TwoPanelFileDialogImpl(parent);
-    dialog->setWindowTitle(caption);
-    dialog->setModeAndMask(dir, FileDialog::AddFiles, filter.split(";;"));
+    dialog->setModeAndMask(dir, mode, filter.split(";;", QString::SkipEmptyParts));
     QStringList l;
     if (dialog->exec() == QDialog::Accepted)
         l = dialog->selectedFiles();
@@ -83,22 +57,6 @@ QStringList TwoPanelFileDialog::openFileNames(QWidget *parent, const QString &ca
     return l;
 }
 
-QString TwoPanelFileDialog::saveFileName (QWidget *parent, const QString &caption,
-                                      const QString &dir, const QString &filter, QString*)
-{
-    TwoPanelFileDialogImpl *dialog = new TwoPanelFileDialogImpl(parent);
-    dialog->setWindowTitle(caption);
-    dialog->setModeAndMask(dir, FileDialog::SaveFile, filter.split(";;"));
-    QStringList l;
-    if (dialog->exec() == QDialog::Accepted)
-        l = dialog->selectedFiles();
-    dialog->deleteLater();
-    if (l.isEmpty())
-        return QString();
-    else
-        return l.at(0);
-}
-
 FileDialog* TwoPanelFileDialogFactory::create()
 {
     return new TwoPanelFileDialog();