Changeset 14578 in vbox for trunk/src/VBox/Frontends/VirtualBox4/include

Timestamp:

Nov 25, 2008 3:30:32 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

39877

Message:

Fe/Qt4: Systray: First implementation for IPC handling.

Location:

trunk/src/VBox/Frontends/VirtualBox4/include

Files:

• VBoxDefs.h (modified) (2 diffs)
• VBoxGlobal.h (modified) (4 diffs)
• VBoxSelectorWnd.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxDefs.h

@@ -119 +119 @@
         ChangeGUILanguageEventType,
 #if defined (VBOX_GUI_WITH_SYSTRAY)
-        ChangeGUITrayIconEventType,
+        CanShowTrayIconEventType,
+        ChangeTrayIconEventType,
 #endif
         AddVDMUrlsEventType
@@ -152 +153 @@
     static const char* GUI_LastVMSelected;
     static const char* GUI_InfoDlgState;
+#ifdef VBOX_GUI_WITH_SYSTRAY
+    static const char* GUI_TrayIconWinID;
+#endif
 };
 

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxGlobal.h

@@ -391 +391 @@
 
 #ifdef VBOX_GUI_WITH_SYSTRAY
-class VBoxChangeGUITrayIconEvent : public QEvent
-{
-public:
-    VBoxChangeGUITrayIconEvent (bool aEnabled)
-        : QEvent ((QEvent::Type) VBoxDefs::ChangeGUITrayIconEventType)
+class VBoxCanShowTrayIconEvent : public QEvent
+{
+public:
+    VBoxCanShowTrayIconEvent (bool aCanShow)
+        : QEvent ((QEvent::Type) VBoxDefs::CanShowTrayIconEventType)
+        , mCanShow (aCanShow)
+        {}
+
+    const bool mCanShow;
+};
+
+class VBoxChangeTrayIconEvent : public QEvent
+{
+public:
+    VBoxChangeTrayIconEvent (bool aEnabled)
+        : QEvent ((QEvent::Type) VBoxDefs::ChangeTrayIconEventType)
         , mEnabled (aEnabled)
         {}
@@ -470 +481 @@
     QWidget *mainWindow() const { return mMainWindow; }
 
-
     bool isVMConsoleProcess() const { return !vmUuid.isNull(); }
+#ifdef VBOX_GUI_WITH_SYSTRAY
+    bool isTrayIcon() const;
+    bool trayIconInstall();
+#endif
     QUuid managedVMUuid() const { return vmUuid; }
 
@@ -938 +952 @@
     void snapshotChanged (const VBoxSnapshotEvent &e);
 #ifdef VBOX_GUI_WITH_SYSTRAY
-    void systrayIconChanged (const VBoxChangeGUITrayIconEvent &e);
+    void trayIconCanShow (const VBoxCanShowTrayIconEvent &e);
+    void trayIconChanged (const VBoxChangeTrayIconEvent &e);
 #endif
 
@@ -980 +995 @@
     QUuid vmUuid;
 
+#ifdef VBOX_GUI_WITH_SYSTRAY
+    bool mIsTrayIcon;           /* Is current instance responsible for tray icon? */
+#endif
     QThread *mMediaEnumThread;
     VBoxMediaList mMediaList;

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxSelectorWnd.h

@@ -133 +133 @@
     void snapshotChanged (const VBoxSnapshotEvent &e);
 #ifdef VBOX_GUI_WITH_SYSTRAY
-    void systrayIconChanged (const VBoxChangeGUITrayIconEvent &e);
+    void trayIconCanShow (const VBoxCanShowTrayIconEvent &e);
+    void trayIconChanged (const VBoxChangeTrayIconEvent &e);
 #endif