Changeset 14578 in vbox for trunk/src

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxDefs.h (modified) (2 diffs)
• include/VBoxGlobal.h (modified) (4 diffs)
• include/VBoxSelectorWnd.h (modified) (1 diff)
• src/VBoxDefs.cpp (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (7 diffs)
• src/VBoxSelectorWnd.cpp (modified) (8 diffs)
• src/main.cpp (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
 

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxDefs.cpp

@@ -45 +45 @@
 const char* VBoxDefs::GUI_LastVMSelected = "GUI/LastVMSelected";
 const char* VBoxDefs::GUI_InfoDlgState = "GUI/InfoDlgState";
+#ifdef VBOX_GUI_WITH_SYSTRAY
+const char* VBoxDefs::GUI_TrayIconWinID = "GUI/TrayIconWinID";
+#endif

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp

@@ -654 +654 @@
     VBoxCallback (VBoxGlobal &aGlobal)
         : mGlobal (aGlobal)
-        , mIsRegDlgOwner (false), mIsUpdDlgOwner (false)
+        , mIsRegDlgOwner (false)
+        , mIsUpdDlgOwner (false)
+#ifdef VBOX_GUI_WITH_SYSTRAY
+        , mIsTrayIconOwner (false)
+#endif
     {
 #if defined (Q_OS_WIN32)
@@ -763 +767 @@
                     return S_OK;
                 }
-
+#ifdef VBOX_GUI_WITH_SYSTRAY
+                if (sKey == VBoxDefs::GUI_TrayIconWinID)
+                {
+                    if (mIsTrayIconOwner)
+                    {
+                        if (sVal.isEmpty() ||
+                            sVal == QString ("%1")
+                                .arg ((qulonglong) vboxGlobal().mainWindow()->winId()))
+                            *allowChange = TRUE;
+                        else
+                            *allowChange = FALSE;
+                    }
+                    else
+                        *allowChange = TRUE;
+                    return S_OK;
+                }
+#endif
                 /* try to set the global setting to check its syntax */
                 VBoxGlobalSettings gs (false /* non-null */);
@@ -831 +851 @@
                 if (sKey == "GUI/LanguageID")
                     QApplication::postEvent (&mGlobal, new VBoxChangeGUILanguageEvent (sVal));
-            #ifdef VBOX_GUI_WITH_SYSTRAY
+#ifdef VBOX_GUI_WITH_SYSTRAY
+                if (sKey == VBoxDefs::GUI_TrayIconWinID)
+                {
+                    if (sVal.isEmpty())
+                    {
+                        mIsTrayIconOwner = false;
+                        QApplication::postEvent (&mGlobal, new VBoxCanShowTrayIconEvent (true));
+                    }
+                    else if (sVal == QString ("%1")
+                             .arg ((qulonglong) vboxGlobal().mainWindow()->winId()))
+                    {
+                        mIsTrayIconOwner = true;
+                        QApplication::postEvent (&mGlobal, new VBoxCanShowTrayIconEvent (true));
+                    }
+                    else
+                        QApplication::postEvent (&mGlobal, new VBoxCanShowTrayIconEvent (false));
+                }
                 if (sKey == "GUI/TrayIcon/Enabled")
-                    QApplication::postEvent (&mGlobal, new VBoxChangeGUITrayIconEvent ((sVal.toLower() == "true") ? true : false));
-            #endif
+                    QApplication::postEvent (&mGlobal, new VBoxChangeTrayIconEvent ((sVal.toLower() == "true") ? true : false));
+#endif
 
                 mMutex.lock();
@@ -920 +956 @@
     bool mIsRegDlgOwner;
     bool mIsUpdDlgOwner;
+#ifdef VBOX_GUI_WITH_SYSTRAY
+    bool mIsTrayIconOwner;
+#endif
 
 #if defined (Q_OS_WIN32)
@@ -1189 +1228 @@
     , mSelectorWnd (NULL), mConsoleWnd (NULL)
     , mMainWindow (NULL)
+#ifdef VBOX_GUI_WITH_SYSTRAY
+    , mIsTrayIcon (false)
+#endif
 #ifdef VBOX_WITH_REGISTRATION
     , mRegDlg (NULL)
@@ -1357 +1399 @@
     return *mConsoleWnd;
 }
+
+#ifdef VBOX_GUI_WITH_SYSTRAY
+
+/**
+ *  Returns true if the current instance is responsible of showing/handling
+ *  the tray icon.
+ */
+bool VBoxGlobal::isTrayIcon() const
+{
+    return mIsTrayIcon;
+}
+
+/**
+ *  Tries to install the tray icon using the current instance (singleton).
+ *  Returns true on success, false on failure.
+ */
+bool VBoxGlobal::trayIconInstall()
+{
+    if (false == QSystemTrayIcon::isSystemTrayAvailable())
+        return false;
+
+    AssertMsg (vboxGlobal().mainWindow(),
+               ("Main window must not be null for systray!"));
+
+    mVBox.SetExtraData (VBoxDefs::GUI_TrayIconWinID,
+                        QString ("%1").arg ((qulonglong) vboxGlobal().mainWindow()->winId()));
+
+    /* The first process which can grab this "mutex" will win ->
+     * It will be the tray icon menu then. */
+    if (mVBox.isOk())
+    {
+        mIsTrayIcon = true;
+        emit trayIconChanged (*(new VBoxChangeTrayIconEvent (vboxGlobal().settings().trayIconEnabled())));
+    }
+
+    return mIsTrayIcon;
+}
+
+#endif
 
 /**
@@ -5048 +5129 @@
         }
 #ifdef VBOX_GUI_WITH_SYSTRAY
-        case VBoxDefs::ChangeGUITrayIconEventType:
-        {
-            emit systrayIconChanged (*(VBoxChangeGUITrayIconEvent *) e);
+        case VBoxDefs::CanShowTrayIconEventType:
+        {
+            emit trayIconCanShow (*(VBoxCanShowTrayIconEvent *) e);
             return true;
         }
+        case VBoxDefs::ChangeTrayIconEventType:
+        {
+            emit trayIconChanged (*(VBoxChangeTrayIconEvent *) e);
+            return true;
+        }
 #endif
-
         default:
             break;

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxSelectorWnd.cpp

@@ -675 +675 @@
              this, SLOT (snapshotChanged (const VBoxSnapshotEvent &)));
 #ifdef VBOX_GUI_WITH_SYSTRAY
-    connect (&vboxGlobal(), SIGNAL (systrayIconChanged (const VBoxChangeGUITrayIconEvent &)),
-             this, SLOT (systrayIconChanged (const VBoxChangeGUITrayIconEvent &)));
+    connect (&vboxGlobal(), SIGNAL (trayIconCanShow (const VBoxCanShowTrayIconEvent &)),
+             this, SLOT (trayIconCanShow (const VBoxCanShowTrayIconEvent &)));
+    connect (&vboxGlobal(), SIGNAL (trayIconChanged (const VBoxChangeTrayIconEvent &)),
+             this, SLOT (trayIconChanged (const VBoxChangeTrayIconEvent &)));
 #endif
 
     /* bring the VM list to the focus */
     mVMListView->setFocus();
-
-#ifdef VBOX_GUI_WITH_SYSTRAY
-    mTrayIcon->trayIconShow (settings.trayIconEnabled());
-#endif
 }
 
@@ -1085 +1083 @@
 
 #ifdef VBOX_GUI_WITH_SYSTRAY
-    mTrayIcon->refresh();
+    if (vboxGlobal().isTrayIcon())
+        mTrayIcon->refresh();
 #endif
 }
@@ -1319 +1318 @@
 
 #ifdef VBOX_GUI_WITH_SYSTRAY
-    mTrayIcon->retranslateUi();
-    mTrayIcon->refresh();
+    if (vboxGlobal().isTrayIcon())
+    {
+        mTrayIcon->retranslateUi();
+        mTrayIcon->refresh();
+    }
 #endif
 }
@@ -1613 +1615 @@
 #ifdef VBOX_GUI_WITH_SYSTRAY
 
-void VBoxSelectorWnd::systrayIconChanged (const VBoxChangeGUITrayIconEvent &aEvent)
+void VBoxSelectorWnd::trayIconCanShow (const VBoxCanShowTrayIconEvent &aEvent)
+{
+    emit trayIconChanged (VBoxChangeTrayIconEvent (vboxGlobal().settings().trayIconEnabled()));
+}
+
+void VBoxSelectorWnd::trayIconChanged (const VBoxChangeTrayIconEvent &aEvent)
 {
     mTrayIcon->trayIconShow (aEvent.mEnabled);
@@ -1672 +1679 @@
     connect (mShowSelectorAction, SIGNAL (triggered()), mParent, SLOT (showWindow()));
     connect (mHideSystrayMenuAction, SIGNAL (triggered()), this, SLOT (trayIconShow()));
-
-    VBoxGlobalSettings settings = vboxGlobal().settings();
-    trayIconShow (settings.trayIconEnabled());
 }
 
 VBoxTrayIcon::~VBoxTrayIcon ()
 {
-    hide();
+    /* Erase dialog handle in config file. */
+    if (vboxGlobal().isTrayIcon())
+    {
+        vboxGlobal().virtualBox().SetExtraData (VBoxDefs::GUI_TrayIconWinID,
+                                                QString::null);
+        hide();
+    }
 }
 
@@ -1715 +1725 @@
 void VBoxTrayIcon::showSubMenu ()
 {
+    if (!mActive)
+        return;
+
     VBoxVMItem* pItem = NULL;
     QMenu *pMenu = NULL;
     QVariant vID;
-
-    if (!mActive)
-        return;
 
     if ((pMenu = qobject_cast<QMenu*>(sender())))
@@ -1834 +1844 @@
 void VBoxTrayIcon::hideSubMenu ()
 {
+    if (!mActive)
+        return;
+
     VBoxVMItem* pItem = NULL;
     QVariant vID;
-
-    if (!mActive)
-        return;
 
     if (QMenu *pMenu = qobject_cast<QMenu*>(sender()))
@@ -1928 +1938 @@
 void VBoxTrayIcon::trayIconShow (bool aShow)
 {
-    if (false == QSystemTrayIcon::isSystemTrayAvailable())
-        return;
-
-    mActive = aShow;    
+    mActive = aShow;
     if (mActive)
     {

trunk/src/VBox/Frontends/VirtualBox4/src/main.cpp

@@ -374 +374 @@
                 vboxGlobal().startEnumeratingMedia();
                 vboxGlobal().setMainWindow (&vboxGlobal().selectorWnd());
+#ifdef VBOX_GUI_WITH_SYSTRAY
+                if (   vboxGlobal().trayIconInstall()
+                    && vboxGlobal().isTrayIcon())
+                {
+                    /* Nothing to do here yet. */
+                }
+#endif
                 vboxGlobal().selectorWnd().show();
 #ifdef VBOX_WITH_REGISTRATION_REQUEST