[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. 518e68b71807bd78bbf6aabceb18137163a997b6

Modestas Vainius modax-guest at alioth.debian.org
Sun Mar 1 14:00:57 UTC 2009


The following commit has been merged in the master branch:
commit 518e68b71807bd78bbf6aabceb18137163a997b6
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Mar 1 15:58:14 2009 +0200

    Do not show tool tips over detailsLabel.
    
    Since detailsLabel shows the same text as the tooltip, the tooltip
    just distracts attention.
    
    Signed-off-by: Modestas Vainius <modestas at vainius.eu>

diff --git a/richradiobutton.cpp b/richradiobutton.cpp
index 50548cc..6755490 100644
--- a/richradiobutton.cpp
+++ b/richradiobutton.cpp
@@ -30,9 +30,12 @@
 class EventEater : public QObject
 {
 public:
-    EventEater(QObject *parent) : QObject(parent) {}
+    EventEater(QObject *parent, bool enableToolTips=true)
+        : QObject(parent), m_enableToolTips(enableToolTips) {}
 protected:
     virtual bool eventFilter(QObject *watched, QEvent *event);
+private:
+    bool m_enableToolTips;
 };
 
 bool EventEater::eventFilter(QObject *watched, QEvent *event)
@@ -48,6 +51,12 @@ bool EventEater::eventFilter(QObject *watched, QEvent *event)
         case QEvent::HoverMove:
             event->ignore();
             return true;
+        case QEvent::QEvent::ToolTip:
+            if (m_enableToolTips) {
+                return QObject::eventFilter(watched, event);
+            } else {
+                return true; // discard event
+            }
         default:
             return QObject::eventFilter(watched, event);
     }
@@ -122,9 +131,10 @@ void RichRadioButton::Private::init(RichRadioButton *q)
 
     //install event filter to reject keyboard & mouse events from child objects
     EventEater *eventEater = new EventEater(q);
+    EventEater *eventEaterNoTT = new EventEater(q, false);
     m_button->installEventFilter(eventEater);
     m_label->installEventFilter(eventEater);
-    m_detailsLabel->installEventFilter(eventEater);
+    m_detailsLabel->installEventFilter(eventEaterNoTT);
 
     q->setCheckable(true);
     q->setAutoExclusive(true);

-- 
Kaboom - Debian KDE 3->4 migration tool



More information about the pkg-kde-commits mailing list