Make it possible to jump between filters by pressing the tab key

MKleusberg · MKleusberg · commit eb8e801b577a · 2014-10-11T15:45:30.000+02:00
Allow jumping between the filter input fields by pressing Tab and Shift+Tab. See issue sqlitebrowser#106.
diff --git a/src/ExtendedTableWidget.cpp b/src/ExtendedTableWidget.cpp
@@ -67,8 +67,8 @@ void ExtendedTableWidget::keyPressEvent(QKeyEvent* event)
     // Call a custom copy method when Ctrl-C is pressed
     if(event->matches(QKeySequence::Copy))
         copy();
-    else
-        QTableView::keyPressEvent(event);
+    else if((event->key() != Qt::Key_Tab && event->key() != Qt::Key_Backtab) || hasFocus()) // This prevents the current selection from being changed when pressing
+        QTableView::keyPressEvent(event);                                                   // tab to move to the next filter
 }
 
 void ExtendedTableWidget::updateGeometries()
diff --git a/src/FilterTableHeader.cpp b/src/FilterTableHeader.cpp
@@ -3,6 +3,41 @@
 #include <QLineEdit>
 #include <QTableView>
 #include <QScrollBar>
+#include <QKeyEvent>
+#include <QDebug>
+
+class FilterLineEdit : public QLineEdit
+{
+public:
+    explicit FilterLineEdit(QWidget* parent, QList<FilterLineEdit*>* filters, int columnnum) : QLineEdit(parent), filterList(filters), columnNumber(columnnum)
+    {
+        setPlaceholderText(tr("Filter"));
+        setProperty("column", columnnum);            // Store the column number for later use
+    }
+
+protected:
+    void keyReleaseEvent(QKeyEvent* event)
+    {
+        if(event->key() == Qt::Key_Tab)
+        {
+            if(columnNumber < filterList->size() - 1)
+            {
+                filterList->at(columnNumber + 1)->setFocus();
+                event->accept();
+            }
+        } else if(event->key() == Qt::Key_Backtab) {
+            if(columnNumber > 0)
+            {
+                filterList->at(columnNumber - 1)->setFocus();
+                event->accept();
+            }
+        }
+    }
+
+private:
+    QList<FilterLineEdit*>* filterList;
+    int columnNumber;
+};
 
 FilterTableHeader::FilterTableHeader(QTableView* parent) :
     QHeaderView(Qt::Horizontal, parent)
@@ -37,9 +72,7 @@ void FilterTableHeader::generateFilters(int number, bool bKeepValues)
     // And generate a bunch of new ones
     for(int i=0;i < number; ++i)
     {
-        QLineEdit* l = new QLineEdit(this);
-        l->setPlaceholderText(tr("Filter"));
-        l->setProperty("column", i);            // Store the column number for later use
+        FilterLineEdit* l = new FilterLineEdit(this, &filterWidgets, i);
         l->setVisible(i>0);                     // This hides the first input widget which belongs to the hidden rowid column
         connect(l, SIGNAL(textChanged(QString)), this, SLOT(inputChanged(QString)));
         if(bKeepValues && !oldvalues[i].isEmpty())  // restore old values
diff --git a/src/FilterTableHeader.h b/src/FilterTableHeader.h
@@ -6,6 +6,7 @@
 
 class QLineEdit;
 class QTableView;
+class FilterLineEdit;
 
 class FilterTableHeader : public QHeaderView
 {
@@ -29,7 +30,7 @@ private slots:
     void inputChanged(const QString& new_value);
 
 private:
-    QList<QLineEdit*> filterWidgets;
+    QList<FilterLineEdit*> filterWidgets;
 };
 
 #endif
