Changeset 54150 in vbox for trunk/src/VBox/Frontends

Timestamp:

Feb 11, 2015 4:51:55 PM (10 years ago)

Author:

vboxsync

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

98183

Message:

FE/Qt: 6366: Pass VBoxSVCAvailabilityChange event through GUI. No handlers so far.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMainEventListener.cpp (modified) (2 diffs)
• globals/UIMainEventListener.h (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (4 diffs)
• globals/VBoxGlobal.h (modified) (4 diffs)
• selector/UIVirtualBoxEventHandler.cpp (modified) (3 diffs)
• selector/UIVirtualBoxEventHandler.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.cpp

@@ -49 +49 @@
 #include "CCanShowWindowEvent.h"
 #include "CShowWindowEvent.h"
+#include "CVBoxSVCAvailabilityChangedEvent.h"
 #include "CGuestMonitorChangedEvent.h"
 
@@ -266 +267 @@
             break;
         }
+        case KVBoxEventType_OnVBoxSVCAvailabilityChanged:
+        {
+            CVBoxSVCAvailabilityChangedEvent es(pEvent);
+            emit sigVBoxSVCAvailabilityChange(es.GetAvailable());
+            break;
+        }
         case KVBoxEventType_OnGuestMonitorChanged:
         {

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.h

@@ -81 +81 @@
     void sigShowWindow(LONG64 &winId); /* use Qt::DirectConnection */
     void sigCPUExecutionCapChange();
+    void sigVBoxSVCAvailabilityChange(bool fAvailable);
     void sigGuestMonitorChange(KGuestMonitorChangedEventType changeType, ulong uScreenId, QRect screenGeo);
 };

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -73 +73 @@
 # include "UIModalWindowManager.h"
 # include "UIIconPool.h"
+# include "UIVirtualBoxEventHandler.h"
 
 # ifdef Q_WS_X11
@@ -220 +221 @@
 VBoxGlobal::VBoxGlobal()
     : mValid (false)
+    , m_fVBoxSVCAvailable(true)
     , mSelectorWnd (NULL)
     , m_fSeparateProcess(false)
@@ -3883 +3885 @@
     m_strHomeFolder = virtualBox().GetHomeFolder();
 
+    /* Watch for the VBoxSVC availability changes: */
+    connect(gVBoxEvents, SIGNAL(sigVBoxSVCAvailabilityChange(bool)),
+            this, SLOT(sltHandleVBoxSVCAvailabilityChange(bool)));
+
     /* create default non-null global settings */
     gset = VBoxGlobalSettings (false);
@@ -4297 +4303 @@
 }
 
+void VBoxGlobal::sltHandleVBoxSVCAvailabilityChange(bool fAvailable)
+{
+    /* Make sure the VBoxSVC availability changed: */
+    if (m_fVBoxSVCAvailable == fAvailable)
+        return;
+
+    /* Cache the new VBoxSVC availability value: */
+    m_fVBoxSVCAvailable = fAvailable;
+
+    /* Notify listeners about the VBoxSVC availability change: */
+    emit sigVBoxSVCAvailabilityChange();
+}
+
 #ifdef VBOX_WITH_DEBUGGER_GUI
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -112 +112 @@
     QString homeFolder() const { return m_strHomeFolder; }
 
+    /** Returns the VBoxSVC availability value. */
+    bool isVBoxSVCAvailable() const { return m_fVBoxSVCAvailable; }
+
     VBoxGlobalSettings &settings() { return gset; }
     bool setSettings (VBoxGlobalSettings &gs);
@@ -396 +399 @@
 signals:
 
+    /** Notifies listeners about the VBoxSVC availability change. */
+    void sigVBoxSVCAvailabilityChange();
+
     /* Notifiers: Medium-processing stuff: */
     void sigMediumCreated(const QString &strMediumID);
@@ -417 +423 @@
     void prepare();
     void cleanup();
+
+    /** Handles the VBoxSVC availability change. */
+    void sltHandleVBoxSVCAvailabilityChange(bool fAvailable);
 
 protected:
@@ -444 +453 @@
     /** Holds the symbolic VirtualBox home-folder representation. */
     QString m_strHomeFolder;
+
+    /** Holds the VBoxSVC availability value. */
+    bool m_fVBoxSVCAvailable;
 
     VBoxGlobalSettings gset;

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.cpp

@@ -60 +60 @@
     m_mainEventListener = CEventListener(pListener);
 
+    /* Get VirtualBoxClient: */
+    const CVirtualBoxClient vboxClient = vboxGlobal().virtualBoxClient();
+    AssertWrapperOk(vboxClient);
+    /* Get event-source: */
+    CEventSource eventSourceVirtualBoxClient = vboxClient.GetEventSource();
+    AssertWrapperOk(eventSourceVirtualBoxClient);
+    /* Register listener for expected event-types: */
+    QVector<KVBoxEventType> vboxClientEvents;
+    vboxClientEvents
+        << KVBoxEventType_OnVBoxSVCAvailabilityChanged;
+    eventSourceVirtualBoxClient.RegisterListener(m_mainEventListener, vboxClientEvents, TRUE);
+    AssertWrapperOk(eventSourceVirtualBoxClient);
+
     /* Get VirtualBox: */
     const CVirtualBox vbox = vboxGlobal().virtualBox();
     AssertWrapperOk(vbox);
     /* Get event-source: */
-    CEventSource eventSource = vbox.GetEventSource();
-    AssertWrapperOk(eventSource);
+    CEventSource eventSourceVirtualBox = vbox.GetEventSource();
+    AssertWrapperOk(eventSourceVirtualBox);
     /* Register listener for expected event-types: */
-    QVector<KVBoxEventType> events;
-    events
+    QVector<KVBoxEventType> vboxEvents;
+    vboxEvents
         << KVBoxEventType_OnMachineStateChanged
         << KVBoxEventType_OnMachineDataChanged
@@ -76 +89 @@
         << KVBoxEventType_OnSnapshotDeleted
         << KVBoxEventType_OnSnapshotChanged;
-    eventSource.RegisterListener(m_mainEventListener, events, TRUE);
-    AssertWrapperOk(eventSource);
+    eventSourceVirtualBox.RegisterListener(m_mainEventListener, vboxEvents, TRUE);
+    AssertWrapperOk(eventSourceVirtualBox);
 
     /* Prepare connections: */
+    connect(pListener->getWrapped(), SIGNAL(sigVBoxSVCAvailabilityChange(bool)),
+            this, SIGNAL(sigVBoxSVCAvailabilityChange(bool)),
+            Qt::QueuedConnection);
     connect(pListener->getWrapped(), SIGNAL(sigMachineStateChange(QString, KMachineState)),
             this, SIGNAL(sigMachineStateChange(QString, KMachineState)),
@@ -109 +125 @@
     AssertWrapperOk(vbox);
     /* Get event-source: */
-    CEventSource eventSource = vbox.GetEventSource();
-    AssertWrapperOk(eventSource);
+    CEventSource eventSourceVirtualBox = vbox.GetEventSource();
+    AssertWrapperOk(eventSourceVirtualBox);
     /* Unregister listener: */
-    eventSource.UnregisterListener(m_mainEventListener);
+    eventSourceVirtualBox.UnregisterListener(m_mainEventListener);
+
+    /* Get VirtualBoxClient: */
+    const CVirtualBoxClient vboxClient = vboxGlobal().virtualBoxClient();
+    AssertWrapperOk(vboxClient);
+    /* Get event-source: */
+    CEventSource eventSourceVirtualBoxClient = vboxClient.GetEventSource();
+    AssertWrapperOk(eventSourceVirtualBoxClient);
+    /* Unregister listener: */
+    eventSourceVirtualBoxClient.UnregisterListener(m_mainEventListener);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.h

@@ -29 +29 @@
 signals:
 
+    /** Notifies listeners about the VBoxSVC become @a fAvailable. */
+    void sigVBoxSVCAvailabilityChange(bool fAvailable);
     /** Notifies listeners about @a state change event for the machine with @a strId. */
     void sigMachineStateChange(QString strId, KMachineState state);