Changeset 14629 in vbox

Timestamp:

Nov 26, 2008 10:33:11 AM (16 years ago)

Author:

vboxsync

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

39932

Message:

Fe/Qt4: Systray: Various fixes.

Location:

trunk/src/VBox/Frontends/VirtualBox4/src

Files:

• VBoxGlobal.cpp (modified) (1 diff)
• VBoxSelectorWnd.cpp (modified) (1 diff)
• main.cpp (modified) (2 diffs)

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

@@ -941 +941 @@
     void postEvent (QEvent *e)
     {
-        // currently, we don't post events if we are in the VM execution
-        // console mode, to save some CPU ticks (so far, there was no need
-        // to handle VirtualBox callback events in the execution console mode)
-
+#ifndef VBOX_GUI_WITH_SYSTRAY
+        // If not using a systray menu, we don't post events if we are in the VM
+        // execution console mode, to save some CPU ticks (so far, there was no
+        // need to handle VirtualBox callback events in the execution console
+        // mode
         if (!mGlobal.isVMConsoleProcess())
+#endif
             QApplication::postEvent (&mGlobal, e);
     }

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

@@ -1681 +1681 @@
 {
     /* Erase dialog handle in config file. */
-    if (vboxGlobal().isTrayIcon())
+    if (mActive)
     {
         vboxGlobal().virtualBox().SetExtraData (VBoxDefs::GUI_TrayIconWinID,

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

@@ -364 +364 @@
                 /* Keep selector window in memory (hidden) because we need it for
                  * the systray menu. */
+                vboxGlobal().startEnumeratingMedia();
                 vboxGlobal().selectorWnd();
+                vboxGlobal().setMainWindow (&vboxGlobal().consoleWnd());
                 if (   vboxGlobal().trayIconInstall()
                     && vboxGlobal().isTrayIcon())
@@ -370 +372 @@
                     /* Nothing to do here yet. */
                 }
-#endif
+#else
                 vboxGlobal().setMainWindow (&vboxGlobal().consoleWnd());
+#endif
                 if (vboxGlobal().startMachine (vboxGlobal().managedVMUuid()))
                     rc = a.exec();