aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/plugins/FileDialogs/FileDialogs.pro2
-rw-r--r--src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp53
-rw-r--r--src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.h38
-rw-r--r--src/qmmpui/qtfiledialog.cpp8
-rw-r--r--src/qmmpui/qtfiledialog_p.h7
5 files changed, 19 insertions, 89 deletions
diff --git a/src/plugins/FileDialogs/FileDialogs.pro b/src/plugins/FileDialogs/FileDialogs.pro
index ea5213012..4e2ceeeae 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/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp
index a358d6d7d..483b0abde 100644
--- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp
+++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp
@@ -1,5 +1,5 @@
/**************************************************************************
-* Copyright (C) 2008-2012 by Ilya Kotov *
+* Copyright (C) 2008-2016 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -31,10 +31,6 @@ QmmpFileDialog::QmmpFileDialog()
connect(m_dialog,SIGNAL(filesAdded(const QStringList&)),this,SIGNAL(filesAdded(const QStringList&)));
}
-void QmmpFileDialog::handleSelected(/*const QStringList& s */)
-{
-}
-
QmmpFileDialog::~QmmpFileDialog()
{
qWarning("QmmpFileDialog::~QmmpFileDialog()");
@@ -49,37 +45,12 @@ void QmmpFileDialog::raise(const QString &dir, Mode mode, const QString &caption
m_dialog->raise();
}
-QString QmmpFileDialog::existingDirectory(QWidget *parent, const QString &caption, const QString &dir)
-{
- QmmpFileDialogImpl *dialog = new QmmpFileDialogImpl(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 QmmpFileDialog::openFileName(QWidget *parent, const QString &caption,
- const QString &dir, const QString &filter, QString*)
-{
- QmmpFileDialogImpl *dialog = new QmmpFileDialogImpl(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 QmmpFileDialog::openFileNames(QWidget *parent, const QString &caption,
- const QString &dir, const QString &filter, QString *)
+QStringList QmmpFileDialog::exec(QWidget *parent, const QString &dir, FileDialog::Mode mode,
+ const QString &caption, const QString &filter, QString *)
{
QmmpFileDialogImpl *dialog = new QmmpFileDialogImpl(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();
@@ -87,22 +58,6 @@ QStringList QmmpFileDialog::openFileNames(QWidget *parent, const QString &captio
return l;
}
-QString QmmpFileDialog::saveFileName (QWidget *parent, const QString &caption,
- const QString &dir, const QString &filter, QString*)
-{
- QmmpFileDialogImpl *dialog = new QmmpFileDialogImpl(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* QmmpFileDialogFactory::create()
{
return new QmmpFileDialog();
diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.h b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.h
index d6ce93055..44cda36d1 100644
--- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.h
+++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.h
@@ -1,5 +1,5 @@
/**************************************************************************
-* Copyright (C) 2008-2012 by Ilya Kotov *
+* Copyright (C) 2008-2016 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -18,7 +18,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-
#ifndef QMMPFILEDIALOG_H
#define QMMPFILEDIALOG_H
@@ -33,43 +32,18 @@ public:
QmmpFileDialog();
virtual ~QmmpFileDialog();
- void raise(const QString &dir = QString(),
- Mode mode = AddFiles,
- const QString &caption = QString(),
- const QStringList &mask = QStringList());
-
- QString existingDirectory(QWidget *parent = 0,
- const QString &caption = QString(),
- const QString &dir = QString());
-
- QString openFileName(QWidget *parent = 0,
- const QString &caption = QString(),
- const QString &dir = QString(),
- const QString &filter = QString(),
- QString *selectedFilter = 0);
-
- QStringList openFileNames(QWidget *parent = 0,
- const QString &caption = QString(),
- const QString &dir = QString(),
- const QString &filter = QString(),
- QString *selectedFilter = 0);
+protected:
+ void raise(const QString &dir, Mode mode, const QString &caption,
+ const QStringList &mask);
- QString saveFileName (QWidget *parent = 0,
- const QString &caption = QString(),
- const QString &dir = QString(),
- const QString &filter = QString(),
- QString *selectedFilter = 0);
-
-public slots:
- void handleSelected();
+ QStringList exec(QWidget *parent, const QString &dir, Mode mode,
+ const QString &caption, const QString &filter, QString *);
private:
QmmpFileDialogImpl *m_dialog;
};
-
-
class QmmpFileDialogFactory : public QObject, public FileDialogFactory
{
Q_OBJECT
diff --git a/src/qmmpui/qtfiledialog.cpp b/src/qmmpui/qtfiledialog.cpp
index 2a13c6a5e..122de1c9b 100644
--- a/src/qmmpui/qtfiledialog.cpp
+++ b/src/qmmpui/qtfiledialog.cpp
@@ -55,19 +55,19 @@ QStringList QtFileDialog::exec(QWidget *parent, const QString &dir, FileDialog::
const QString &caption, const QString &filter, QString *selectedFilter)
{
QStringList list;
- if(mode == FileDialog::AddFile)
+ if(mode == AddFile)
{
list << QFileDialog::getOpenFileName(parent,caption,dir,filter,selectedFilter);
}
- else if(mode == FileDialog::AddDir || mode == FileDialog::AddDirs)
+ else if(mode == AddDir || mode == AddDirs)
{
list << QFileDialog::getExistingDirectory(parent,caption,dir, QFileDialog::ShowDirsOnly);
}
- else if(mode == FileDialog::AddFiles || mode == FileDialog::AddDirsFiles || mode == FileDialog::PlayDirsFiles)
+ else if(mode == AddFiles || mode == AddDirsFiles || mode == PlayDirsFiles)
{
list << QFileDialog::getOpenFileNames(parent,caption,dir,filter,selectedFilter);
}
- else if(mode == FileDialog::SaveFile)
+ else if(mode == SaveFile)
{
list << QFileDialog::getSaveFileName(parent,caption,dir,filter,selectedFilter);
}
diff --git a/src/qmmpui/qtfiledialog_p.h b/src/qmmpui/qtfiledialog_p.h
index a33992bd1..ffa6bf3a5 100644
--- a/src/qmmpui/qtfiledialog_p.h
+++ b/src/qmmpui/qtfiledialog_p.h
@@ -50,9 +50,10 @@ class QtFileDialog : public FileDialog
public:
virtual ~QtFileDialog();
- virtual QStringList exec(QWidget *parent, const QString &dir, Mode mode,
- const QString &caption, const QString &filter,
- QString *selectedFilter);
+protected:
+ QStringList exec(QWidget *parent, const QString &dir, Mode mode,
+ const QString &caption, const QString &filter,
+ QString *selectedFilter);
};
#endif
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-15 11:15:52 +0000