Fix key press handling in project tree:

http://www.kdenlive.org/mantis/view.php?id=1707

svn path=/trunk/kdenlive/; revision=4645

diff --git a/src/projectlistview.cpp b/src/projectlistview.cpp
index 201f495b643479e6c0311c14d3ef65b2334f4260..af8ccc2011f25ec30bea37f9fac6866038b58b3f 100644 (file)
--- a/src/projectlistview.cpp
+++ b/src/projectlistview.cpp
@@ -54,12 +54,14 @@ ProjectListView::ProjectListView(QWidget *parent) :
     headerView->setContextMenuPolicy(Qt::CustomContextMenu);
     connect(headerView, SIGNAL(customContextMenuRequested(const QPoint&)),
             this, SLOT(configureColumns(const QPoint&)));
+    connect(this, SIGNAL(itemCollapsed(QTreeWidgetItem *)), this, SLOT(slotCollapsed(QTreeWidgetItem *)));
+    connect(this, SIGNAL(itemExpanded(QTreeWidgetItem *)), this, SLOT(slotExpanded(QTreeWidgetItem *)));
     headerView->setClickable(true);
     headerView->setSortIndicatorShown(true);
     headerView->setMovable(false);
     sortByColumn(0, Qt::AscendingOrder);
     setSortingEnabled(true);
-
+    installEventFilter(this);
     if (!KdenliveSettings::showdescriptioncolumn()) hideColumn(1);
     if (!KdenliveSettings::showratingcolumn()) hideColumn(2);
 }
@@ -114,18 +116,43 @@ void ProjectListView::contextMenuEvent(QContextMenuEvent * event)
     emit requestMenu(event->globalPos(), itemAt(event->pos()));
 }
 
-// virtual
-void ProjectListView::keyPressEvent(QKeyEvent * event)
+void ProjectListView::slotCollapsed(QTreeWidgetItem *item)
 {
-    if (event->key() == Qt::Key_Return) {
-        QTreeWidgetItem *it = currentItem();
-        if (it) {
-            it->setExpanded(!it->isExpanded());
-            if (it->type() == PROJECTFOLDERTYPE) {
-                static_cast <FolderProjectItem *>(it)->switchIcon();
-            }
+    if (item->type() == PROJECTFOLDERTYPE) {
+        blockSignals(true);
+        static_cast <FolderProjectItem *>(item)->switchIcon();
+        blockSignals(false);
+    }
+}
+
+void ProjectListView::slotExpanded(QTreeWidgetItem *item)
+{
+    if (item->type() == PROJECTFOLDERTYPE) {
+        blockSignals(true);
+        static_cast <FolderProjectItem *>(item)->switchIcon();
+        blockSignals(false);
+    }
+}
+
+bool ProjectListView::eventFilter(QObject *obj, QEvent *event)
+{
+    if (event->type() == QEvent::KeyPress || event->type() == QEvent::ShortcutOverride) {
+        QKeyEvent* ke = (QKeyEvent*) event;
+        if (ke->key() == Qt::Key_Plus) {
+            if (currentItem()) currentItem()->setExpanded(true);
+            event->accept();
+            return true;
+        } else if (ke->key() == Qt::Key_Minus) {
+            if (currentItem()) currentItem()->setExpanded(false);
+            event->accept();
+            return true;
+        } else {
+            return false;
         }
-    } else QTreeWidget::keyPressEvent(event);
+    } else {
+        // pass the event on to the parent class
+        return QTreeWidget::eventFilter(obj, event);
+    }
 }
 
 // virtual
@@ -143,7 +170,6 @@ void ProjectListView::mouseDoubleClickEvent(QMouseEvent * event)
             int offset = pix.width() + indentation();
             if (event->pos().x() < offset) {
                 it->setExpanded(!it->isExpanded());
-                static_cast <FolderProjectItem *>(it)->switchIcon();
                 event->accept();
             } else QTreeWidget::mouseDoubleClickEvent(event);
         }

diff --git a/src/projectlistview.h b/src/projectlistview.h
index c8a3a89bbfda8d0ecf34346edff7d196a1cd53ec..1c0824f902b149c5dee665f8b7bed25c10ca0cb9 100644 (file)
--- a/src/projectlistview.h
+++ b/src/projectlistview.h
@@ -47,7 +47,9 @@ protected:
     virtual QStringList mimeTypes() const;
     virtual Qt::DropActions supportedDropActions() const;
     virtual void dragLeaveEvent(QDragLeaveEvent *);
-    virtual void keyPressEvent(QKeyEvent * event);
+
+    /** @brief Filters key events to make sure user can expand items with + / -. */
+    virtual bool eventFilter(QObject *obj, QEvent *ev);
 
 public slots:
 
@@ -58,6 +60,8 @@ private:
 
 private slots:
     void configureColumns(const QPoint& pos);
+    void slotCollapsed(QTreeWidgetItem *item);
+    void slotExpanded(QTreeWidgetItem *item);
 
 signals:
     void requestMenu(const QPoint &, QTreeWidgetItem *);