Take Andre's advice and implement the focus tracking using the event

filter.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33853 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiSelectionManager.cpp b/src/frontends/qt4/GuiSelectionManager.cpp
index ca30a05e5307b1a057e96bbc71be038f7879414f..19d0f78300a8670a796b2a9e1fae4eb6643664de 100644 (file)
--- a/src/frontends/qt4/GuiSelectionManager.cpp
+++ b/src/frontends/qt4/GuiSelectionManager.cpp
@@ -78,12 +78,8 @@ GuiSelectionManager::GuiSelectionManager(
                this, SLOT(upPB_clicked()));
        connect(downPB, SIGNAL(clicked()), 
                this, SLOT(downPB_clicked()));
-       connect(availableLV, SIGNAL(clicked(QModelIndex)), 
-               this, SLOT(availableLV_clicked(QModelIndex)));
        connect(availableLV, SIGNAL(doubleClicked(QModelIndex)), 
                this, SLOT(availableLV_doubleClicked(QModelIndex)));
-       connect(selectedLV, SIGNAL(clicked(QModelIndex)), 
-               this, SLOT(selectedLV_clicked(QModelIndex)));
        
        availableLV->installEventFilter(this);
        selectedLV->installEventFilter(this);
@@ -325,18 +321,6 @@ void GuiSelectionManager::downPB_clicked()
 }
 
 
-// FIXME These slots do not really do what they need to do, since focus
-// can enter the QListView in other ways. But there are no signals sent
-// in that case. We need to reimplement focusInEvent() to capture those,
-// which means subclassing QListView. (rgh)
-// Or by installing an event listener.. (andre)
-void GuiSelectionManager::availableLV_clicked(const QModelIndex &)
-{
-       selectedHasFocus_ = false;
-       updateHook();
-}
-
-
 void GuiSelectionManager::availableLV_doubleClicked(const QModelIndex & idx)
 {
        if (isSelected(idx) || !addPB->isEnabled())
@@ -349,74 +333,82 @@ void GuiSelectionManager::availableLV_doubleClicked(const QModelIndex & idx)
 }
 
 
-void GuiSelectionManager::selectedLV_clicked(const QModelIndex &)
-{
-       selectedHasFocus_ = true;
-       updateHook();
-}
-
-
 bool GuiSelectionManager::eventFilter(QObject * obj, QEvent * event) 
 {
+       QEvent::Type etype = event->type();
        if (obj == availableLV) {
-               if (event->type() != QEvent::KeyPress)
-                       return QObject::eventFilter(obj, event);
-               QKeyEvent * keyEvent = static_cast<QKeyEvent *>(event);
-               int const keyPressed = keyEvent->key();
-               Qt::KeyboardModifiers const keyModifiers = keyEvent->modifiers();
-               // Enter key without modifier will add current item.
-               // Ctrl-Enter will add it and close the dialog.
-               // This is designed to work both with the main enter key
-               // and the one on the numeric keypad.
-               if (keyPressed == Qt::Key_Enter || keyPressed == Qt::Key_Return) {
-                       if (!keyModifiers)
-                               addPB_clicked();
-                       else if (keyModifiers == Qt::ControlModifier ||
-                                       keyModifiers == Qt::KeypadModifier  ||
-                                       keyModifiers == (Qt::ControlModifier | Qt::KeypadModifier)) {
-                               if (addPB->isEnabled()) {
+               if (etype == QEvent::KeyPress) {
+                       QKeyEvent * keyEvent = static_cast<QKeyEvent *>(event);
+                       int const keyPressed = keyEvent->key();
+                       Qt::KeyboardModifiers const keyModifiers = keyEvent->modifiers();
+                       // Enter key without modifier will add current item.
+                       // Ctrl-Enter will add it and close the dialog.
+                       // This is designed to work both with the main enter key
+                       // and the one on the numeric keypad.
+                       if (keyPressed == Qt::Key_Enter || keyPressed == Qt::Key_Return) {
+                               if (!keyModifiers)
                                        addPB_clicked();
-                                       okHook(); //signal
+                               else if (keyModifiers == Qt::ControlModifier ||
+                                               keyModifiers == Qt::KeypadModifier  ||
+                                               keyModifiers == (Qt::ControlModifier | Qt::KeypadModifier)) {
+                                       if (addPB->isEnabled()) {
+                                               addPB_clicked();
+                                               okHook(); //signal
+                                       }
                                }
+                               event->accept();
+                               return true;
+                       }
+               } else if (etype == QEvent::FocusIn) {
+                       if (selectedHasFocus_) {
+                               selectedHasFocus_ = false;
+                               updateHook();
                        }
                        event->accept();
                        return true;
-               }
-       } else if (obj == selectedLV) {
-               if (event->type() != QEvent::KeyPress)
-                       return QObject::eventFilter(obj, event);
-               QKeyEvent * keyEvent = static_cast<QKeyEvent *>(event);
-               int const keyPressed = keyEvent->key();
-               Qt::KeyboardModifiers const keyModifiers = keyEvent->modifiers();
-               // Delete or backspace key will delete current item
-               // ...with control modifier will clear the list
-               if (keyPressed == Qt::Key_Delete || keyPressed == Qt::Key_Backspace) {
-                       if (keyModifiers == Qt::NoModifier && deletePB->isEnabled()) {
-                               deletePB_clicked();
-                               updateHook();
-                       } else if (keyModifiers == Qt::ControlModifier) {
-                               selectedModel->removeRows(0, selectedModel->rowCount());
-                               updateHook();
-                       } else
-                               return QObject::eventFilter(obj, event);
                } 
-               // Ctrl-Up activates upPB
-               else if (keyPressed == Qt::Key_Up) {
-                       if (keyModifiers == Qt::ControlModifier) {
-                               if (upPB->isEnabled())
-                                       upPB_clicked();
-                               event->accept();
-                               return true;
+       } else if (obj == selectedLV) {
+               if (etype == QEvent::KeyPress) {
+                       QKeyEvent * keyEvent = static_cast<QKeyEvent *>(event);
+                       int const keyPressed = keyEvent->key();
+                       Qt::KeyboardModifiers const keyModifiers = keyEvent->modifiers();
+                       // Delete or backspace key will delete current item
+                       // ...with control modifier will clear the list
+                       if (keyPressed == Qt::Key_Delete || keyPressed == Qt::Key_Backspace) {
+                               if (keyModifiers == Qt::NoModifier && deletePB->isEnabled()) {
+                                       deletePB_clicked();
+                                       updateHook();
+                               } else if (keyModifiers == Qt::ControlModifier) {
+                                       selectedModel->removeRows(0, selectedModel->rowCount());
+                                       updateHook();
+                               } else
+                                       return QObject::eventFilter(obj, event);
+                       } 
+                       // Ctrl-Up activates upPB
+                       else if (keyPressed == Qt::Key_Up) {
+                               if (keyModifiers == Qt::ControlModifier) {
+                                       if (upPB->isEnabled())
+                                               upPB_clicked();
+                                       event->accept();
+                                       return true;
+                               }
+                       } 
+                       // Ctrl-Down activates downPB
+                       else if (keyPressed == Qt::Key_Down) {
+                               if (keyModifiers == Qt::ControlModifier) {
+                                       if (downPB->isEnabled())
+                                               downPB_clicked();
+                                       event->accept();
+                                       return true;
+                               }
                        }
-               } 
-               // Ctrl-Down activates downPB
-               else if (keyPressed == Qt::Key_Down) {
-                       if (keyModifiers == Qt::ControlModifier) {
-                               if (downPB->isEnabled())
-                                       downPB_clicked();
-                               event->accept();
-                               return true;
+               } else if (etype == QEvent::FocusIn) {
+                       if (!selectedHasFocus_) {
+                               selectedHasFocus_ = true;
+                               updateHook();
                        }
+                       event->accept();
+                       return true;
                }
        }
        return QObject::eventFilter(obj, event);

diff --git a/src/frontends/qt4/GuiSelectionManager.h b/src/frontends/qt4/GuiSelectionManager.h
index 7f188e3705008d90f8c6854dff0d840d991737d3..1a9d1ce9bde751c375f7ab10bbf90f71c6c7fb5e 100644 (file)
--- a/src/frontends/qt4/GuiSelectionManager.h
+++ b/src/frontends/qt4/GuiSelectionManager.h
@@ -123,12 +123,8 @@ protected Q_SLOTS:
        ///
        virtual void downPB_clicked();
        ///
-       void availableLV_clicked(const QModelIndex &);
-       ///
        void availableLV_doubleClicked(const QModelIndex &);
        ///
-       void selectedLV_clicked(const QModelIndex &);
-       ///
        bool eventFilter(QObject *, QEvent *);
 
 private: