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

List:       kde-commits
Subject:    branches/KDE/4.5
From:       Marco Martin <notmart () gmail ! com>
Date:       2010-08-04 13:51:47
Message-ID: 20100804135147.CFE4AAC7BC () svn ! kde ! org
[Download RAW message or body]

SVN commit 1159138 by mart:

backport: korgac fix by adding ItemIsMenu property


 M  +1 -1      kdebase/workspace/plasma/generic/applets/systemtray/protocols/dbussystemtray/dbussystemtraytask.cpp \
  M  +5 -0      kdelibs/kdeui/notifications/kstatusnotifieritemdbus_p.cpp  
 M  +6 -0      kdelibs/kdeui/notifications/kstatusnotifieritemdbus_p.h  
 M  +2 -0      kdelibs/kdeui/notifications/org.kde.StatusNotifierItem.xml  


--- branches/KDE/4.5/kdebase/workspace/plasma/generic/applets/systemtray/protocols/dbussystemtray/dbussystemtraytask.cpp \
#1159137:1159138 @@ -174,7 +174,7 @@
     foreach (QGraphicsWidget *widget, widgetsByHost()) {
         DBusSystemTrayWidget *iconWidget = qobject_cast<DBusSystemTrayWidget \
*>(widget);  if (iconWidget) {
-            iconWidget->setItemIsMenu(properties["WindowId"].toInt() == 0);
+            iconWidget->setItemIsMenu(properties["ItemIsMenu"].toBool());
         }
     }
 
--- branches/KDE/4.5/kdelibs/kdeui/notifications/kstatusnotifieritemdbus_p.cpp \
#1159137:1159138 @@ -187,6 +187,11 @@
     return m_service;
 }
 
+bool KStatusNotifierItemDBus::ItemIsMenu() const
+{
+    return (m_statusNotifierItem->d->associatedWidget == \
m_statusNotifierItem->d->menu); +}
+
 //DBUS slots
 
 QString KStatusNotifierItemDBus::Category() const
--- branches/KDE/4.5/kdelibs/kdeui/notifications/kstatusnotifieritemdbus_p.h \
#1159137:1159138 @@ -57,6 +57,7 @@
     Q_PROPERTY(QString Title READ Title)
     Q_PROPERTY(QString Status READ Status)
     Q_PROPERTY(int WindowId READ WindowId)
+    Q_PROPERTY(bool ItemIsMenu READ ItemIsMenu)
     Q_PROPERTY(QString IconName READ IconName)
     Q_PROPERTY(KDbusImageVector IconPixmap READ IconPixmap)
     Q_PROPERTY(QString OverlayIconName READ OverlayIconName)
@@ -111,6 +112,11 @@
     int WindowId() const;
 
     /**
+     * @return The item only support the context menu, the visualization should \
prefer sending ContextMenu() instead of Activate() +     */
+    bool ItemIsMenu() const;
+
+    /**
      * @return the name of the main icon to be displayed
      * if image() is not empty this will always return an empty string
      */
--- branches/KDE/4.5/kdelibs/kdeui/notifications/org.kde.StatusNotifierItem.xml \
#1159137:1159138 @@ -7,9 +7,11 @@
     <property name="Title" type="s" access="read"/>
     <property name="Status" type="s" access="read"/>
     <property name="WindowId" type="i" access="read"/>
+
     <!-- An additional path to add to the theme search path to find the icons \
specified above. -->  <property name="IconThemePath" type="s" access="read"/>
     <property name="Menu" type="o" access="read"/>
+    <property name="ItemIsMenu" type="b" access="read"/>
 
 
     <!-- main icon -->


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