Changeset 14509 in vbox for trunk/src/VBox

Timestamp:

Nov 24, 2008 10:49:09 AM (16 years ago)

Author:

vboxsync

Message:

Fe/Qt4: Global callback for tray icon code.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

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

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

@@ -118 +118 @@
 #endif
         ChangeGUILanguageEventType,
+#if defined (VBOX_GUI_WITH_SYSTRAY)
+        ChangeGUITrayIconEventType,
+#endif
         AddVDMUrlsEventType
     };

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

@@ -390 +390 @@
 };
 
+#ifdef VBOX_GUI_WITH_SYSTRAY
+class VBoxChangeGUITrayIconEvent : public QEvent
+{
+public:
+    VBoxChangeGUITrayIconEvent (bool aEnabled)
+        : QEvent ((QEvent::Type) VBoxDefs::ChangeGUITrayIconEventType)
+        , mEnabled (aEnabled)
+        {}
+
+    const bool mEnabled;
+};
+#endif
+
 class Process : public QProcess
 {
@@ -915 +928 @@
 
     /* signals emitted when the VirtualBox callback is called by the server
-     * (not that currently these signals are emitted only when the application
+     * (note that currently these signals are emitted only when the application
      * is the in the VM selector mode) */
 
@@ -923 +936 @@
     void sessionStateChanged (const VBoxSessionStateChangeEvent &e);
     void snapshotChanged (const VBoxSnapshotEvent &e);
+    void systrayIconChanged (const VBoxChangeGUITrayIconEvent& e);
 
     void canShowRegDlg (bool aCanShow);

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

@@ -132 +132 @@
     void sessionStateChanged (const VBoxSessionStateChangeEvent &e);
     void snapshotChanged (const VBoxSnapshotEvent &e);
+#ifdef VBOX_GUI_WITH_SYSTRAY
+    void systrayIconChanged (const VBoxChangeGUITrayIconEvent &e);
+#endif
 
 private:

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

@@ -831 +831 @@
                 if (sKey == "GUI/LanguageID")
                     QApplication::postEvent (&mGlobal, new VBoxChangeGUILanguageEvent (sVal));
+            #ifdef VBOX_GUI_WITH_SYSTRAY
+                if (sKey == "GUI/TrayIcon/Enabled")
+                    QApplication::postEvent (&mGlobal, new VBoxChangeGUITrayIconEvent ((sVal.toLower() == "true") ? true : false));
+            #endif
 
                 mMutex.lock();
@@ -5031 +5035 @@
         {
             loadLanguage (static_cast<VBoxChangeGUILanguageEvent*> (e)->mLangId);
+            return true;
+        }
+        case VBoxDefs::ChangeGUITrayIconEventType:
+        {
+            emit systrayIconChanged (*(VBoxChangeGUITrayIconEvent *) e);
             return true;
         }

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

@@ -674 +674 @@
     connect (&vboxGlobal(), SIGNAL (snapshotChanged (const VBoxSnapshotEvent &)),
              this, SLOT (snapshotChanged (const VBoxSnapshotEvent &)));
+#ifdef VBOX_GUI_WITH_SYSTRAY
+    connect (&vboxGlobal(), SIGNAL (systrayIconChanged (const VBoxChangeGUITrayIconEvent &)),
+             this, SLOT (systrayIconChanged (const VBoxChangeGUITrayIconEvent &)));
+#endif
 
     /* bring the VM list to the focus */
@@ -739 +743 @@
 
     delete dlg;
-
-    /* Reload settings. */
-    settings = vboxGlobal().settings();
-
-    /* Update GUI settings. */
-#ifdef VBOX_GUI_WITH_SYSTRAY    
-    mTrayIcon->trayIconShow (settings.trayIconEnabled());
-#endif
 }
 
@@ -1617 +1613 @@
 #ifdef VBOX_GUI_WITH_SYSTRAY
 
+void VBoxSelectorWnd::systrayIconChanged (const VBoxChangeGUITrayIconEvent &aEvent)
+{
+    mTrayIcon->trayIconShow (aEvent.mEnabled);
+}
+
 VBoxTrayIcon::VBoxTrayIcon (VBoxSelectorWnd* aParent, VBoxVMModel* aVMModel)
 {
@@ -1937 +1938 @@
     }
     setVisible (mActive);
-
-    VBoxGlobalSettings settings = vboxGlobal().settings();
-    settings.setTrayIconEnabled (mActive);
-
-    CVirtualBox vbox = vboxGlobal().virtualBox();
-    settings.save (vbox);
 }