diff options
| -rw-r--r-- | src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.ui | 5 | ||||
| -rw-r--r-- | src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp | 11 | ||||
| -rw-r--r-- | src/qmmp/decoder.cpp | 1 |
3 files changed, 13 insertions, 4 deletions
diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.ui b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.ui index 0cbf7001c..6c249b46f 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.ui +++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.ui @@ -109,7 +109,7 @@ <item row="1" column="0" colspan="3" > <widget class="QStackedWidget" name="stackedWidget" > <property name="currentIndex" > - <number>1</number> + <number>0</number> </property> <widget class="QWidget" name="page" > <layout class="QVBoxLayout" > @@ -153,6 +153,9 @@ <property name="itemsExpandable" > <bool>false</bool> </property> + <property name="sortingEnabled" > + <bool>true</bool> + </property> <property name="allColumnsShowFocus" > <bool>true</bool> </property> diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp index 55ef890a5..f3648d7e0 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp +++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp @@ -199,9 +199,16 @@ void QmmpFileDialogImpl::on_addPushButton_clicked() QStringList l; if (m_mode != FileDialog::SaveFile) { - QModelIndexList ml = fileListView->selectionModel()->selectedIndexes(); + QModelIndexList ml; + if (stackedWidget->currentIndex() == 0) + ml = fileListView->selectionModel()->selectedIndexes(); + else + ml = treeView->selectionModel()->selectedIndexes(); foreach(QModelIndex i,ml) - l << m_model->filePath(i); + { + if (!l.contains(m_model->filePath(i))) + l << m_model->filePath(i); + } if (!l.isEmpty()) { addToHistory(l[0]); diff --git a/src/qmmp/decoder.cpp b/src/qmmp/decoder.cpp index 952a21db2..6ee84ba5f 100644 --- a/src/qmmp/decoder.cpp +++ b/src/qmmp/decoder.cpp @@ -146,7 +146,6 @@ Decoder *Decoder::create(QObject *parent, const QString &source, Output *output) { Decoder *decoder = 0; - qDebug(qPrintable(source)); DecoderFactory *fact = 0; if (!input->open(QIODevice::ReadOnly)) |