aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2016-03-01 11:29:45 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2016-03-01 11:29:45 +0000
commit5b7ac8f9364adc4f455f7efe499c255431bb5ee8 (patch)
tree9b9143ad747e4f1aafad626e840211fd996495fb /src
parent50aa40ece52716e14363fc094701b7a167c50f44 (diff)
downloadqmmp-5b7ac8f9364adc4f455f7efe499c255431bb5ee8.tar.gz
qmmp-5b7ac8f9364adc4f455f7efe499c255431bb5ee8.tar.bz2
qmmp-5b7ac8f9364adc4f455f7efe499c255431bb5ee8.zip
changed dialog api
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6143 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src')
-rw-r--r--src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp2
-rw-r--r--src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp2
-rw-r--r--src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.h2
-rw-r--r--src/qmmpui/filedialog.cpp4
-rw-r--r--src/qmmpui/filedialog.h4
5 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp
index 483b0abde..71c01a04c 100644
--- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp
+++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp
@@ -28,7 +28,7 @@
QmmpFileDialog::QmmpFileDialog()
{
m_dialog = new QmmpFileDialogImpl();
- connect(m_dialog,SIGNAL(filesAdded(const QStringList&)),this,SIGNAL(filesAdded(const QStringList&)));
+ connect(m_dialog,SIGNAL(filesSelected(QStringList, bool)),SIGNAL(filesSelected(QStringList, bool)));
}
QmmpFileDialog::~QmmpFileDialog()
diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp
index e899dc16a..d21e753fd 100644
--- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp
+++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp
@@ -406,7 +406,7 @@ void QmmpFileDialogImpl::addFiles(const QStringList &list)
return;
if (!isModal())
{
- emit filesAdded(list);
+ emit filesSelected(list);
if (closeOnAddToolButton->isChecked())
reject();
}
diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.h b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.h
index 4adc38d68..bd6a8e75f 100644
--- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.h
+++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.h
@@ -53,7 +53,7 @@ protected slots:
void on_fileTypeComboBox_activated(int);
signals:
- void filesAdded(const QStringList&);
+ void filesSelected(const QStringList&, bool play = false);
protected:
virtual void hideEvent (QHideEvent *event);
diff --git a/src/qmmpui/filedialog.cpp b/src/qmmpui/filedialog.cpp
index 6086a8fa5..d1e802d18 100644
--- a/src/qmmpui/filedialog.cpp
+++ b/src/qmmpui/filedialog.cpp
@@ -221,8 +221,8 @@ void FileDialog::init(QObject* receiver, const char* member, QString *dir)
disconnect();
if (receiver && member)
{
- connect(this,SIGNAL(filesAdded(QStringList)), receiver, member);
- connect(this,SIGNAL(filesAdded(QStringList)), SLOT(updateLastDir(QStringList)));
+ connect(this,SIGNAL(filesSelected(QStringList)), receiver, member);
+ connect(this,SIGNAL(filesSelected(QStringList)), SLOT(updateLastDir(QStringList)));
m_initialized = true;
}
}
diff --git a/src/qmmpui/filedialog.h b/src/qmmpui/filedialog.h
index 6eb8a394e..6520e2a97 100644
--- a/src/qmmpui/filedialog.h
+++ b/src/qmmpui/filedialog.h
@@ -147,9 +147,9 @@ public:
signals:
/*!
- * Emitted when the add button has pressed. Subclass should emit this signal.
+ * Emitted when the add/open button has pressed. Subclass should emit this signal.
*/
- void filesAdded(const QStringList&);
+ void filesSelected(const QStringList &selected, bool play = false);
protected:
/*!