Changeset 88721 in vbox for trunk/src/VBox

Timestamp:

Apr 27, 2021 8:05:03 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8161. Session information dialog refactoring.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• activity/vmactivity/UIVMActivityMonitor.cpp (modified) (2 diffs)
• activity/vmactivity/UIVMActivityMonitor.h (modified) (2 diffs)
• guestctrl/UIGuestProcessControlWidget.cpp (modified) (4 diffs)
• guestctrl/UIGuestProcessControlWidget.h (modified) (3 diffs)
• runtime/information/UIVMInformationDialog.cpp (modified) (4 diffs)
• runtime/information/UIVMInformationDialog.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.cpp

@@ -800 +800 @@
     connect(this, &UIVMActivityMonitor::customContextMenuRequested,
             this, &UIVMActivityMonitor::sltCreateContextMenu);
-}
-
-UIVMActivityMonitor::~UIVMActivityMonitor()
-{
-    if (!m_comSession.isNull())
-        m_comSession.UnlockMachine();
+    connect(&uiCommon(), &UICommon::sigAskToDetachCOM,
+            this, &UIVMActivityMonitor::sltClearCOMData);
 }
 
@@ -1072 +1068 @@
 }
 
+void UIVMActivityMonitor::sltClearCOMData()
+{
+    if (!m_comSession.isNull())
+        m_comSession.UnlockMachine();
+}
+
 void UIVMActivityMonitor::prepareMetrics()
 {

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.h

@@ -125 +125 @@
     UIVMActivityMonitor(EmbedTo enmEmbedding, QWidget *pParent, const CMachine &machine,
                          UIActionPool *pActionPool,bool fShowToolbar = false);
-    ~UIVMActivityMonitor();
     void setMachine(const CMachine &machine);
 
@@ -151 +150 @@
     void sltExportMetricsToFile();
     void sltCreateContextMenu(const QPoint &point);
+    void sltClearCOMData();
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestProcessControlWidget.cpp

@@ -313 +313 @@
 }
 
-UIGuestProcessControlWidget::~UIGuestProcessControlWidget()
-{
-    saveSettings();
-    cleanupListener();
-}
-
 void UIGuestProcessControlWidget::retranslateUi()
 {
@@ -393 +387 @@
                 this, &UIGuestProcessControlWidget::sltGuestSessionUnregistered);
     }
+
+    connect(&uiCommon(), &UICommon::sigAskToCommitData,
+            this, &UIGuestProcessControlWidget::sltSaveSettings);
+    connect(&uiCommon(), &UICommon::sigAskToDetachCOM,
+            this, &UIGuestProcessControlWidget::sltCleanupListener);
 }
 
@@ -514 +513 @@
 }
 
-void UIGuestProcessControlWidget::cleanupListener()
-{
-    /* Unregister everything: */
-    m_pQtListener->getWrapped()->unregisterSources();
-
-    /* Make sure VBoxSVC is available: */
-    if (!uiCommon().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 UIGuestProcessControlWidget::sltGuestSessionRegistered(CGuestSession guestSession)
 {
@@ -576 +557 @@
 }
 
-void UIGuestProcessControlWidget::saveSettings()
+void UIGuestProcessControlWidget::sltSaveSettings()
 {
     if (!m_pSplitter)
         return;
     gEDataManager->setGuestControlProcessControlSplitterHints(m_pSplitter->sizes());
+}
+
+void UIGuestProcessControlWidget::sltCleanupListener()
+{
+    /* Unregister everything: */
+    m_pQtListener->getWrapped()->unregisterSources();
+
+    /* Make sure VBoxSVC is available: */
+    if (!uiCommon().isVBoxSVCAvailable())
+        return;
+
+    /* Get CProgress event source: */
+    CEventSource comEventSource = m_comGuest.GetEventSource();
+    //AssertWrapperOk(comEventSource);
+
+    /* Unregister event listener for CProgress event source: */
+    comEventSource.UnregisterListener(m_comEventListener);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestProcessControlWidget.h

@@ -55 +55 @@
     UIGuestProcessControlWidget(EmbedTo enmEmbedding, const CGuest &comGuest, QWidget *pParent,
                                 QString strMachineName = QString(), bool fShowToolbar = false);
-    ~UIGuestProcessControlWidget();
     /** When true we delete the corresponding tree item as soon as the guest session/process is unregistered. */
     static const bool           m_fDeleteAfterUnregister;
@@ -71 +70 @@
     void sltCloseSessionOrProcess();
     void sltShowProperties();
+    void sltSaveSettings();
+    void sltCleanupListener();
 
 private:
@@ -80 +81 @@
     void initGuestSessionTree();
     void updateTreeWidget();
-    void cleanupListener();
     void addGuestSession(CGuestSession guestSession);
-    void saveSettings();
     void loadSettings();
 

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

@@ -94 +94 @@
 UIVMInformationDialog::~UIVMInformationDialog()
 {
-    /* Cleanup: */
-    cleanup();
-
     /* Deinitialize instance: */
     s_pInstance = 0;
@@ -137 +134 @@
 }
 
+void UIVMInformationDialog::sltSaveSettings()
+{
+    /* Save window geometry: */
+    {
+        const QRect geo = currentGeometry();
+        LogRel2(("GUI: UIVMInformationDialog: Saving geometry as: Origin=%dx%d, Size=%dx%d\n",
+                 geo.x(), geo.y(), geo.width(), geo.height()));
+        gEDataManager->setSessionInformationDialogGeometry(geo, isCurrentlyMaximized());
+    }
+}
+
 void UIVMInformationDialog::prepare()
 {
@@ -143 +151 @@
     /* Load settings: */
     loadSettings();
+    connect(&uiCommon(), &UICommon::sigAskToCommitData,
+            this, &UIVMInformationDialog::sltSaveSettings);
 }
 
@@ -282 +292 @@
     }
 }
-
-void UIVMInformationDialog::saveSettings()
-{
-    /* Save window geometry: */
-    {
-        const QRect geo = currentGeometry();
-        LogRel2(("GUI: UIVMInformationDialog: Saving geometry as: Origin=%dx%d, Size=%dx%d\n",
-                 geo.x(), geo.y(), geo.width(), geo.height()));
-        gEDataManager->setSessionInformationDialogGeometry(geo, isCurrentlyMaximized());
-    }
-}
-
-void UIVMInformationDialog::cleanup()
-{
-    /* Save settings: */
-    saveSettings();
-}

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

@@ -74 +74 @@
     /** Handles tab-widget page change. */
     void sltHandlePageChanged(int iIndex);
+    void sltSaveSettings();
 
 private:
@@ -91 +92 @@
     /** Loads settings. */
     void loadSettings();
-
-    /** Saves settings. */
-    void saveSettings();
-    /** Cleanups all. */
-    void cleanup();
 
     /** @name General variables.
@@ -117 +113 @@
 
 #endif /* !FEQT_INCLUDED_SRC_runtime_information_UIVMInformationDialog_h */
-