Changeset 277

Timestamp:

Nov 2, 2009, 3:00:35 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: QSystemTrayIcon: Implemented reaction to notification messages from the system tray and emitting them as signals.

Location:

trunk/src/gui

Files:

• util/qsystemtrayicon_pm.cpp (modified) (2 diffs)
• widgets/qmenu.cpp (modified) (3 diffs)

trunk/src/gui/util/qsystemtrayicon_pm.cpp

@@ -46 +46 @@
 #ifndef QT_NO_SYSTEMTRAYICON
 
+
+
 #include "qt_os2.h"
 
@@ -133 +135 @@
     switch(msg->msg) {
 
-        case WM_XST_MYNOTIFY:
-        {
-            // @todo
+        case WM_XST_MYNOTIFY: {
+            switch (SHORT2FROMMP(msg->mp1)) {
+                case XST_IN_MOUSE: {
+                    PXSTMOUSEMSG pMsg = (PXSTMOUSEMSG)msg->mp2;
+                    switch (pMsg->ulMouseMsg) {
+                        case WM_BUTTON1CLICK:
+                            emit q->activated(QSystemTrayIcon::Trigger);
+                            break;
+                        case WM_BUTTON1DBLCLK:
+                            emit q->activated(QSystemTrayIcon::DoubleClick);
+                            break;
+                        case WM_BUTTON3CLICK:
+                            emit q->activated(QSystemTrayIcon::MiddleClick);
+                            break;
+                        default:
+                            break;
+                    }
+                    break;
+                }
+                case XST_IN_CONTEXT: {
+                    PXSTCONTEXTMSG pMsg = (PXSTCONTEXTMSG)msg->mp2;
+                    if (q->contextMenu()) {
+                        QPoint gpos(pMsg->ptsPointerPos.x,
+                                    // flip y coordinate
+                                    QApplication::desktop()->height() -
+                                        (pMsg->ptsPointerPos.y + 1));
+                        q->contextMenu()->popup(gpos);
+                        q->contextMenu()->activateWindow();
+                        // Must be activated for proper keyboardfocus and
+                        // menu closing on OS/2
+                    }
+                    emit q->activated(QSystemTrayIcon::Context);
+                    break;
+                }
+                default:
+                    break;
+            }
             break;
         }
 
-        default:
-        {
-            if (msg->msg == WM_XST_CREATED)
-            {
+        default: {
+            if (msg->msg == WM_XST_CREATED) {
                 addToTray();
                 return true;

trunk/src/gui/widgets/qmenu.cpp

@@ -165 +165 @@
 }
 
-//Windows and KDE allows menus to cover the taskbar, while GNOME and Mac don't
+// and KDE allows menus to cover the taskbar, while GNOME and Mac don't
 QRect QMenuPrivate::popupGeometry(int screen) const
 {
-#ifdef Q_WS_WIN
+#if
     return QApplication::desktop()->screenGeometry(screen);
 #elif defined Q_WS_X11
@@ -1096 +1096 @@
             QList< QPointer<QWidget> > list;
             for(QWidget *widget = q->parentWidget(); widget; ) {
-                if (qobject_cast<QMenu*>(widget) 
+                if (qobject_cast<QMenu*>(widget)
 #ifndef QT_NO_MENUBAR
                     || qobject_cast<QMenuBar*>(widget)
@@ -1262 +1262 @@
     is represented vertically and rendered by QStyle. In addition, actions
     can have a text label, an optional icon drawn on the very left side,
-    and shortcut key sequence such as "Ctrl+X". 
+    and shortcut key sequence such as "Ctrl+X".
 
     The existing actions held by a menu can be found with actions().