[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets/tasks
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2009-06-27 15:02:40
Message-ID: 1246114960.854796.15430.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 988181 by aseigo:

* clear out a bunch of cruft in the form of unused members
* be sure not to tip for expanded groups


 M  +20 -28    abstracttaskitem.cpp  
 M  +2 -10     abstracttaskitem.h  
 M  +3 -3      taskgroupitem.cpp  
 M  +1 -1      tasks.cpp  
 M  +1 -1      tasks.h  
 M  +1 -1      windowtaskitem.cpp  


--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/abstracttaskitem.cpp #988180:988181
@@ -65,19 +65,17 @@
     : QGraphicsWidget(parent),
       m_abstractItem(0),
       m_applet(applet),
-      m_activateTimer(0),
       m_flags(0),
       m_animId(0),
       m_alpha(1),
       m_backgroundPrefix("normal"),
+      m_activateTimerId(0),
       m_updateGeometryTimerId(0),
       m_updateTimerId(0),
       m_hoverEffectTimerId(0),
       m_attentionTimerId(0),
       m_attentionTicks(0),
-      m_fadeIn(true),
-      m_showTooltip(showTooltip),
-      m_showingTooltip(false)
+      m_fadeIn(true)
 {
     setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
     setAcceptsHoverEvents(true);
@@ -151,10 +149,10 @@
 {
     TaskGroupItem *group = qobject_cast<TaskGroupItem *>(this);
 
-    if (group && !group->collapsed()) {
-        m_showTooltip = false;
-    } else if (m_showTooltip != m_applet->showTooltip()) {
-        m_showTooltip = !m_showTooltip;
+    if (m_applet->showToolTip() && (!group || group->collapsed())) {
+        Plasma::ToolTipManager::self()->registerWidget(this);
+    } else {
+        Plasma::ToolTipManager::self()->unregisterWidget(this);
     }
 }
 
@@ -163,11 +161,6 @@
     m_abstractItem = 0;
 }
 
-void AbstractTaskItem::setShowTooltip(const bool showit)
-{
-    m_showTooltip = showit;
-}
-
 void AbstractTaskItem::setText(const QString &text)
 {
     m_text = text;
@@ -247,8 +240,7 @@
 
 void AbstractTaskItem::toolTipAboutToShow()
 {
-    if (m_showTooltip) {
-        m_showingTooltip = true;
+    if (m_applet->showToolTip()) {
         updateToolTip();
         connect(Plasma::ToolTipManager::self(),
                 SIGNAL(windowPreviewActivated(WId,Qt::MouseButtons,Qt::KeyboardModifiers,QPoint)),
@@ -260,7 +252,6 @@
 
 void AbstractTaskItem::toolTipHidden()
 {
-    m_showingTooltip = false;
     Plasma::ToolTipManager::self()->clearContent(this);
     disconnect(Plasma::ToolTipManager::self(),
                SIGNAL(windowPreviewActivated(WId,Qt::MouseButtons,Qt::KeyboardModifiers,QPoint)),
@@ -389,7 +380,11 @@
 
 void AbstractTaskItem::timerEvent(QTimerEvent *event)
 {
-    if (event->timerId() == m_updateGeometryTimerId) {
+    if (event->timerId() == m_activateTimerId) {
+        killTimer(m_activateTimerId);
+        m_activateTimerId = 0;
+        activate();
+    } else if (event->timerId() == m_updateGeometryTimerId) {
         killTimer(m_updateGeometryTimerId);
         m_updateGeometryTimerId = 0;
         publishIconGeometry();
@@ -794,14 +789,9 @@
 
     event->accept();
 
-    if (!m_activateTimer) {
-        m_activateTimer = new QTimer(this);
-        m_activateTimer->setSingleShot(true);
-        m_activateTimer->setInterval(300);
-        connect(m_activateTimer, SIGNAL(timeout()), this, SLOT(activate()));
+    if (!m_activateTimerId) {
+        m_activateTimerId = startTimer(300);
     }
-
-    m_activateTimer->start();
 }
 
 void AbstractTaskItem::dragMoveEvent(QGraphicsSceneDragDropEvent *event)
@@ -810,8 +800,9 @@
 
     // restart the timer so that activate() is only called after the mouse
     // stops moving
-    if (m_activateTimer) {
-        m_activateTimer->start();
+    if (m_activateTimerId) {
+        killTimer(m_activateTimerId);
+        m_activateTimerId = startTimer(300);
     }
 }
 
@@ -819,8 +810,9 @@
 {
     Q_UNUSED(event);
 
-    delete m_activateTimer;
-    m_activateTimer = 0;
+    if (m_activateTimerId) {
+        killTimer(m_activateTimerId);
+    }
 }
 
 QRect AbstractTaskItem::iconGeometry() const
--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/abstracttaskitem.h #988180:988181
@@ -59,9 +59,6 @@
      /** Destruct the representation for an abstract task. */
     ~AbstractTaskItem();
 
-    /** Switch on/off tooltips above tasks */
-    void setShowTooltip(const bool showit);
-
     /** Sets the text for this task item. */
     void setText(const QString &text);
 
@@ -210,10 +207,7 @@
     LayoutWidget *m_layoutWidget;
 
     Tasks *m_applet;
-    LayoutWidget *m_parentWidget;
-    QTimer* m_activateTimer;
 
-
     TaskFlags m_flags;
 
     QIcon m_icon;
@@ -225,9 +219,9 @@
     QString m_backgroundPrefix;
     QRectF m_activeRect;
 
-    QPointF _dragOffset;
     QTime m_lastGeometryUpdate;
     QTime m_lastUpdate;
+    int m_activateTimerId;
     int m_updateGeometryTimerId;
     int m_updateTimerId;
     int m_hoverEffectTimerId;
@@ -235,11 +229,9 @@
     int m_attentionTicks;
 
     bool m_fadeIn : 1;
-    bool m_showTooltip : 1;
-    bool m_showingTooltip : 1;
+
     // distance (in pixels) between a task's icon and its text
     static const int IconTextSpacing = 4;
-
     static const int TaskItemHorizontalMargin = 4;
     static const int TaskItemVerticalMargin = 4;
 };
--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/taskgroupitem.cpp #988180:988181
@@ -232,7 +232,7 @@
         setText(m_group->name());
     }
 
-    if (m_showingTooltip &&
+    if (Plasma::ToolTipManager::self()->isVisible(this) &&
         (changes & TaskManager::IconChanged ||
         changes & TaskManager::NameChanged ||
         changes & TaskManager::DesktopChanged)) {
@@ -407,11 +407,11 @@
     }
 
     if (groupableItem->isGroupItem()) {
-        TaskGroupItem *groupItem = new TaskGroupItem(this, m_applet, m_applet->showTooltip());
+        TaskGroupItem *groupItem = new TaskGroupItem(this, m_applet, m_applet->showToolTip());
         groupItem->setGroup(static_cast<TaskManager::TaskGroup*>(groupableItem));
         item = groupItem;
     } else { //it's a window task
-        WindowTaskItem *windowItem = new WindowTaskItem(this, m_applet, m_applet->showTooltip());
+        WindowTaskItem *windowItem = new WindowTaskItem(this, m_applet, m_applet->showToolTip());
         windowItem->setTask(static_cast<TaskManager::TaskItem*>(groupableItem));
         item = windowItem;
     }
--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/tasks.cpp #988180:988181
@@ -390,7 +390,7 @@
     }
 }
 
-bool Tasks::showTooltip() const
+bool Tasks::showToolTip() const
 {
     return m_showTooltip;
 }
--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/tasks.h #988180:988181
@@ -103,7 +103,7 @@
 
         Qt::KeyboardModifiers groupModifierKey() const;
 
-        bool showTooltip() const;
+        bool showToolTip() const;
 
         void needsVisualFocus();
 
--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/windowtaskitem.cpp #988180:988181
@@ -167,7 +167,7 @@
         setText(m_task->name());
     }
 
-    if (m_showingTooltip &&
+    if (Plasma::ToolTipManager::self()->isVisible(this) &&
         (changes & TaskManager::IconChanged ||
          changes & TaskManager::NameChanged ||
          changes & TaskManager::DesktopChanged)) {

[prev in list] [next in list] [prev in thread] [next in thread]