imported fixes from 0.2

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

2 files changed, 13 insertions, 3 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]);