"jump to track" dialog: always use double click (#918)

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

2 files changed, 30 insertions, 2 deletions

diff --git a/src/qmmpui/forms/jumptotrackdialog.ui b/src/qmmpui/forms/jumptotrackdialog.ui
index 8b5d9696f..2aec05b05 100644
--- a/src/qmmpui/forms/jumptotrackdialog.ui
+++ b/src/qmmpui/forms/jumptotrackdialog.ui
@@ -66,6 +66,9 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
        <property name="text">
         <string>Queue</string>
        </property>
@@ -79,6 +82,9 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
        <property name="text">
         <string>Refresh</string>
        </property>
@@ -92,6 +98,9 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
        <property name="text">
         <string>Jump To</string>
        </property>
@@ -105,6 +114,9 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
        <property name="standardButtons">
         <set>QDialogButtonBox::Close</set>
        </property>
diff --git a/src/qmmpui/jumptotrackdialog.cpp b/src/qmmpui/jumptotrackdialog.cpp
index 8fbd6d8d9..2fa623125 100644
--- a/src/qmmpui/jumptotrackdialog.cpp
+++ b/src/qmmpui/jumptotrackdialog.cpp
@@ -48,8 +48,8 @@ JumpToTrackDialog::JumpToTrackDialog(PlayListModel *model, QWidget* parent)
     m_proxyModel->setSortLocaleAware(true);
     songsListView->setModel(m_proxyModel);
 
-    connect(songsListView,SIGNAL(activated(QModelIndex)),SLOT(jumpTo(QModelIndex)));
-    connect(songsListView,SIGNAL(activated(QModelIndex)),SLOT(accept()));
+    connect(songsListView,SIGNAL(doubleClicked(QModelIndex)),SLOT(jumpTo(QModelIndex)));
+    connect(songsListView,SIGNAL(doubleClicked(QModelIndex)),SLOT(accept()));
     connect(songsListView->selectionModel(),SIGNAL(currentRowChanged(QModelIndex, QModelIndex)),
             SLOT(queueUnqueue(QModelIndex, QModelIndex)));
 
@@ -60,6 +60,7 @@ JumpToTrackDialog::JumpToTrackDialog(PlayListModel *model, QWidget* parent)
     new QShortcut(tr("F5"),this,SLOT(on_refreshPushButton_clicked()));
 
     filterLineEdit->installEventFilter(this);
+    songsListView->installEventFilter(this);
     connect(filterLineEdit, SIGNAL(textChanged(QString)),
             m_proxyModel, SLOT(setFilterFixedString(QString)));
 
@@ -176,5 +177,20 @@ bool JumpToTrackDialog::eventFilter(QObject *o, QEvent *e)
             return true;
         }
     }
+    else if(o == songsListView && e->type() == QEvent::KeyPress)
+    {
+        QKeyEvent *key_event = static_cast<QKeyEvent *>(e);
+        QModelIndex index = songsListView->currentIndex();
+
+        if(key_event->key() == Qt::Key_Return)
+        {
+            if(index.isValid())
+            {
+                jumpTo(index);
+                accept();
+            }
+            return true;
+        }
+    }
     return QDialog::eventFilter(o, e);
 }