Changeset 14706 in vbox for trunk/src/VBox

Timestamp:

Nov 27, 2008 2:25:54 PM (16 years ago)

Author:

vboxsync

Message:

Fe/Qt4: Systray: Added reference count for main windows.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxDefs.h (modified) (1 diff)
• include/VBoxGlobal.h (modified) (1 diff)
• src/VBoxDefs.cpp (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (4 diffs)
• src/VBoxSelectorWnd.cpp (modified) (2 diffs)

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

@@ -155 +155 @@
 #ifdef VBOX_GUI_WITH_SYSTRAY
     static const char* GUI_TrayIconWinID;
+    static const char* GUI_MainWindowCount;
 #endif
 };

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

@@ -812 +812 @@
     }
 
-    /* Returns the number of current running machines. */
-    int machinesAlive() const;
+    /* Returns the number of current running Fe/Qt4 main windows. */
+    int mainWindowCount();
 
     /* various helpers */

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

@@ -46 +46 @@
 const char* VBoxDefs::GUI_InfoDlgState = "GUI/InfoDlgState";
 #ifdef VBOX_GUI_WITH_SYSTRAY
-const char* VBoxDefs::GUI_TrayIconWinID = "GUI/TrayIconWinID";
+const char* VBoxDefs::GUI_TrayIconWinID = "GUI/TrayIcon/WinID";
+const char* VBoxDefs::GUI_MainWindowCount = "GUI/MainWindowCount";
 #endif

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

@@ -1440 +1440 @@
         bActive = vboxGlobal().settings().trayIconEnabled();
 
-    QString strTrayWinID = virtualBox().GetExtraData (VBoxDefs::GUI_TrayIconWinID);
+    /* Is there already a tray icon or is tray icon not active? */
+    QString strTrayWinID = mVBox.GetExtraData (VBoxDefs::GUI_TrayIconWinID);
     if (   (bActive == false)
         || (QSystemTrayIcon::isSystemTrayAvailable() == false)
@@ -3183 +3184 @@
 
 /**
- *  Returns the number of current running VMs.
- *
- *  @return Number of running VMs.
- */
-int VBoxGlobal::machinesAlive () const
-{
-    int machinesAlive = 0;
-    CVirtualBox vbox = vboxGlobal().virtualBox();
-    CMachineVector vec = vbox.GetMachines2();
-    for (CMachineVector::ConstIterator m = vec.begin();
-        m != vec.end(); ++ m)
-    {
-        switch ((*m).GetState())
-        {
-            case MachineState_Running:
-            case MachineState_Paused:
-            {
-                machinesAlive++;
-                break;
-            }
-        }
-    }
-
-    return machinesAlive;
+ *  Returns the number of current running Fe/Qt4 main windows.
+ *
+ *  @return Number of running main windows.
+ */
+int VBoxGlobal::mainWindowCount ()
+{
+    return mVBox.GetExtraData (VBoxDefs::GUI_MainWindowCount).toInt();
 }
 
@@ -5281 +5265 @@
         return;
     }
+
+#ifdef VBOX_GUI_WITH_SYSTRAY
+    /* Increase open Fe/Qt4 windows reference count. */
+    int c = mVBox.GetExtraData (VBoxDefs::GUI_MainWindowCount).toInt() + 1;
+    AssertMsg ((c>=0) || (mVBox.isOk()),
+        ("Something went wrong with the window reference count!"));
+    mVBox.SetExtraData (VBoxDefs::GUI_MainWindowCount, QString ("%1").arg (c));
+#endif
 
     /* Initialize guest OS Type list */
@@ -5594 +5586 @@
         delete mSelectorWnd;
 
+#ifdef VBOX_GUI_WITH_SYSTRAY
+    /* Decrease open Fe/Qt4 windows reference count. */
+    int c = mVBox.GetExtraData (VBoxDefs::GUI_MainWindowCount).toInt() - 1;
+    AssertMsg ((c>=0) || (mVBox.isOk()),
+        ("Something went wrong with the window reference count!"));
+    if (c < 0)
+        c = 0;   /* Clean up the mess. */
+    mVBox.SetExtraData (VBoxDefs::GUI_MainWindowCount, (c > 0) ? QString ("%1").arg (c) : NULL);
+#endif
+
     /* ensure CGuestOSType objects are no longer used */
     mFamilyIDs.clear();

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

@@ -1205 +1205 @@
     {
         hide();
-        if (vboxGlobal().machinesAlive() == 0)
+        if (vboxGlobal().mainWindowCount() == 0)
         {
             emit closing();
@@ -1571 +1571 @@
         /* Check if there are some machines alive - else quit, since
          * we're not needed as a systray menu anymore. */
-        if (vboxGlobal().machinesAlive() == 0)
+        if (vboxGlobal().mainWindowCount() == 0)
         {
             fileExit();