Changeset 71037 in vbox for trunk

Timestamp:

Feb 16, 2018 12:46:20 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699 Remove UIGuestSessionsEventHandler class

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (3 diffs)
• src/runtime/information/UIVMInformationDialog.cpp (modified) (1 diff)
• src/runtime/information/guestctrl/UIGuestSessionTreeItem.cpp (modified) (1 diff)
• src/runtime/information/guestctrl/UIGuestSessionsEventHandler.cpp (deleted)
• src/runtime/information/guestctrl/UIGuestSessionsEventHandler.h (deleted)
• src/runtime/information/guestctrl/UIInformationGuestSession.cpp (modified) (4 diffs)
• src/runtime/information/guestctrl/UIInformationGuestSession.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -378 +378 @@
         src/runtime/information/guestctrl/UIGuestControlConsole.h \
         src/runtime/information/guestctrl/UIGuestControlInterface.h \
-        src/runtime/information/guestctrl/UIGuestSessionsEventHandler.h \
         src/runtime/information/guestctrl/UIGuestSessionTreeItem.h \
         src/runtime/information/guestctrl/UIInformationGuestSession.h \
@@ -566 +565 @@
         src/runtime/UIIndicatorsPool.cpp \
         src/runtime/UIStatusBarEditorWindow.cpp \
-       src/runtime/information/guestctrl/UIGuestSessionsEventHandler.cpp \
         src/selector/UIActionPoolSelector.cpp \
         src/selector/UIDesktopPane.cpp \
@@ -710 +708 @@
         src/runtime/information/guestctrl/UIGuestControlInterface.cpp \
         src/runtime/information/guestctrl/UIInformationGuestSession.cpp \
-        src/runtime/information/guestctrl/UIGuestSessionsEventHandler.cpp \
         src/runtime/information/guestctrl/UIGuestSessionTreeItem.cpp \
         src/runtime/normal/UIKeyboardHandlerNormal.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp

@@ -243 +243 @@
         }
 
-        UIInformationGuestSession *pGuestSessionWidget =
-            new UIInformationGuestSession(this, m_pMachineWindow->console());
-        if (pGuestSessionWidget)
-        {
-            m_tabs.insert(2, pGuestSessionWidget);
-            m_pTabWidget->addTab(m_tabs.value(2), QString());
-        }
-
+        if(m_pMachineWindow->console().isOk())
+        {
+            UIInformationGuestSession *pGuestSessionWidget =
+                new UIInformationGuestSession(this, m_pMachineWindow->console().GetGuest());
+            if (pGuestSessionWidget)
+            {
+                m_tabs.insert(2, pGuestSessionWidget);
+                m_pTabWidget->addTab(m_tabs.value(2), QString());
+            }
+        }
         /* Set Runtime Information tab as default: */
         m_pTabWidget->setCurrentIndex(1);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIGuestSessionTreeItem.cpp

@@ -22 +22 @@
 /* GUI includes: */
 # include "UIGuestSessionTreeItem.h"
-# include "UIGuestSessionsEventHandler.h"
 # include "VBoxGlobal.h"
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIInformationGuestSession.cpp

@@ -27 +27 @@
 /* GUI includes: */
 # include "QITreeWidget.h"
+# include "UIExtraDataManager.h"
 # include "UIGuestControlConsole.h"
 # include "UIGuestControlInterface.h"
 # include "UIGuestSessionTreeItem.h"
-# include "UIGuestSessionsEventHandler.h"
 # include "UIInformationGuestSession.h"
+
 # include "VBoxGlobal.h"
 
 /* COM includes: */
 # include "CGuest.h"
+# include "CEventSource.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-UIInformationGuestSession::UIInformationGuestSession(QWidget *pParent, const CConsole &console)
+UIInformationGuestSession::UIInformationGuestSession(QWidget *pParent, const CGuest &comGuest)
     : QWidget(pParent)
-    , m_comConsole(console)
+    , m_comGuest(comGuest)
     , m_pMainLayout(0)
     , m_pSplitter(0)
-    , m_pGuestSessionsEventHandler(0)
     , m_pTreeWidget(0)
     , m_pConsole(0)
     , m_pControlInterface(0)
-{
+    , m_pQtListener(0)
+{
+    prepareListener();
     prepareObjects();
     prepareConnections();
-
-    // if(m_pControlInterface)
-    //     m_pControlInterface->unitTest();
 }
 
 void UIInformationGuestSession::prepareObjects()
 {
-    m_pGuestSessionsEventHandler = new UIGuestSessionsEventHandler(this, m_comConsole.GetGuest());
-    m_pControlInterface = new UIGuestControlInterface(this, m_comConsole.GetGuest());
+    m_pControlInterface = new UIGuestControlInterface(this, m_comGuest);
 
     /* Create layout: */
@@ -101 +100 @@
     if (!m_pTreeWidget)
         return;
-    if (!m_pGuestSessionsEventHandler)
-        return;
 
     m_pTreeWidget->clear();
     QVector<QITreeWidgetItem> treeItemVector;
-    m_pGuestSessionsEventHandler->populateGuestSessionsTree(m_pTreeWidget);
     update();
 }
@@ -116 +112 @@
     connect(m_pConsole, &UIGuestControlConsole::commandEntered,
             this, &UIInformationGuestSession::sltConsoleCommandEntered);
-    connect(m_pGuestSessionsEventHandler, &UIGuestSessionsEventHandler::sigGuestSessionsUpdated,
-            this, &UIInformationGuestSession::sltGuestSessionsUpdated);
+    if(m_pQtListener)
+    {
+        connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigGuestSessionRegistered,
+                this, &UIInformationGuestSession::sltGuestSessionRegistered, Qt::DirectConnection);
+        connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigGuestSessionUnregistered,
+                this, &UIInformationGuestSession::sltGuestSessionUnregistered, Qt::DirectConnection);
+    }
 }
 
@@ -140 +141 @@
     }
 }
+
+void UIInformationGuestSession::prepareListener()
+{
+    /* Create event listener instance: */
+    m_pQtListener.createObject();
+    m_pQtListener->init(new UIMainEventListener, this);
+    m_comEventListener = CEventListener(m_pQtListener);
+
+    /* Get CProgress event source: */
+    CEventSource comEventSource = m_comGuest.GetEventSource();
+    AssertWrapperOk(comEventSource);
+
+    /* Enumerate all the required event-types: */
+    QVector<KVBoxEventType> eventTypes;
+    eventTypes << KVBoxEventType_OnGuestSessionRegistered;
+
+
+    /* Register event listener for CProgress event source: */
+    comEventSource.RegisterListener(m_comEventListener, eventTypes,
+        gEDataManager->eventHandlingType() == EventHandlingType_Active ? TRUE : FALSE);
+    AssertWrapperOk(comEventSource);
+
+    /* If event listener registered as passive one: */
+    if (gEDataManager->eventHandlingType() == EventHandlingType_Passive)
+    {
+        /* Register event sources in their listeners as well: */
+        m_pQtListener->getWrapped()->registerSource(comEventSource, m_comEventListener);
+    }
+}
+
+void UIInformationGuestSession::cleanupListener()
+{
+    /* If event listener registered as passive one: */
+    if (gEDataManager->eventHandlingType() == EventHandlingType_Passive)
+    {
+        /* Unregister everything: */
+        m_pQtListener->getWrapped()->unregisterSources();
+    }
+
+    /* Make sure VBoxSVC is available: */
+    if (!vboxGlobal().isVBoxSVCAvailable())
+        return;
+
+    /* Get CProgress event source: */
+    CEventSource comEventSource = m_comGuest.GetEventSource();
+    AssertWrapperOk(comEventSource);
+
+    /* Unregister event listener for CProgress event source: */
+    comEventSource.UnregisterListener(m_comEventListener);
+}
+
+
+void UIInformationGuestSession::sltGuestSessionRegistered(CGuestSession guestSession)
+{
+    if (!guestSession.isOk())
+        return;
+    //printf("sltGuestSessionRegistered \n");
+    // addGuestSession(guestSession);
+    // emit sigGuestSessionUpdated();
+}
+
+void UIInformationGuestSession::sltGuestSessionUnregistered(CGuestSession guestSession)
+{
+    if (!guestSession.isOk())
+        return;
+    // removeGuestSession(guestSession);
+    // emit sigGuestSessionUpdated();
+}

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIInformationGuestSession.h

@@ -24 +24 @@
 /* COM includes: */
 #include "COMEnums.h"
-#include "CConsole.h"
+#include "CGuest.h"
+#include "CEventListener.h"
+
+/* GUI includes: */
+#include "UIMainEventListener.h"
 
 /* Forward declarations: */
@@ -33 +37 @@
 class UIGuestControlInterface;
 class UIGuestSessionsEventHandler;
+
+
 
 /** QWidget extension
@@ -44 +50 @@
 public:
 
-    UIInformationGuestSession(QWidget *pParent, const CConsole &console);
+    UIInformationGuestSession(QWidget *pParent, const CGuest &comGuest);
 
 private slots:
@@ -52 +58 @@
     void sltConsoleOutputReceived(const QString &strOutput);
 
+    void sltGuestSessionRegistered(CGuestSession guestSession);
+    void sltGuestSessionUnregistered(CGuestSession guestSession);
+
 private:
 
     void prepareObjects();
     void prepareConnections();
+    void prepareListener();
     void updateTreeWidget();
-
-    CConsole                 m_comConsole;
+    void cleanupListener();
+    CGuest                   m_comGuest;
     QVBoxLayout             *m_pMainLayout;
     QSplitter               *m_pSplitter;
-    UIGuestSessionsEventHandler *m_pGuestSessionsEventHandler;
     QITreeWidget            *m_pTreeWidget;
     UIGuestControlConsole   *m_pConsole;
     UIGuestControlInterface *m_pControlInterface;
+
+                /** Holds the Qt event listener instance. */
+    ComObjPtr<UIMainEventListenerImpl> m_pQtListener;
+    /** Holds the COM event listener instance. */
+    CEventListener m_comEventListener;
 };