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

Timestamp:

Apr 27, 2021 7:48:59 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8161. Several changes to handle COM cleanup and extra data saving from UIMachineLogic. not complete.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• guestctrl/UIGuestProcessControlWidget.cpp (modified) (4 diffs)
• guestctrl/UIGuestProcessControlWidget.h (modified) (3 diffs)
• runtime/UIMachineLogic.cpp (modified) (4 diffs)
• runtime/UIMachineLogic.h (modified) (3 diffs)
• runtime/information/UIVMInformationDialog.cpp (modified) (6 diffs)
• runtime/information/UIVMInformationDialog.h (modified) (4 diffs)

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

@@ -313 +313 @@
 }
 
+UIGuestProcessControlWidget::~UIGuestProcessControlWidget()
+{
+    saveSettings();
+    cleanupListener();
+}
+
 void UIGuestProcessControlWidget::retranslateUi()
 {
@@ -387 +393 @@
                 this, &UIGuestProcessControlWidget::sltGuestSessionUnregistered);
     }
-
-    connect(&uiCommon(), &UICommon::sigAskToCommitData,
-            this, &UIGuestProcessControlWidget::sltSaveSettings);
-    connect(&uiCommon(), &UICommon::sigAskToDetachCOM,
-            this, &UIGuestProcessControlWidget::sltCleanupListener);
 }
 
@@ -557 +558 @@
 }
 
-void UIGuestProcessControlWidget::sltSaveSettings()
+void UIGuestProcessControlWidget::saveSettings()
 {
     if (!m_pSplitter)
@@ -564 +565 @@
 }
 
-void UIGuestProcessControlWidget::sltCleanupListener()
+void UIGuestProcessControlWidget::cleanupListener()
 {
     /* Unregister everything: */

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;
@@ -70 +71 @@
     void sltCloseSessionOrProcess();
     void sltShowProperties();
-    void sltSaveSettings();
-    void sltCleanupListener();
 
 private:
@@ -83 +82 @@
     void addGuestSession(CGuestSession guestSession);
     void loadSettings();
+    void cleanupListener();
+    void saveSettings();
 
     CGuest                    m_comGuest;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -866 +866 @@
     , m_pProcessControlDialog(0)
     , m_pSoftKeyboardDialog(0)
+    , m_pVMInformationDialog(0)
 {
 }
@@ -1822 +1823 @@
         return;
 
-    /* Invoke VM information dialog: */
-    UIVMInformationDialog::invoke(activeMachineWindow());
+    if (m_pVMInformationDialog)
+        return;
+
+    m_pVMInformationDialog = new UIVMInformationDialog(activeMachineWindow());
+
+    if (m_pVMInformationDialog)
+    {
+        m_pVMInformationDialog->show();
+        m_pVMInformationDialog->raise();
+        m_pVMInformationDialog->setWindowState(m_pVMInformationDialog->windowState() & ~Qt::WindowMinimized);
+        m_pVMInformationDialog->activateWindow();
+        connect(m_pVMInformationDialog, &UIVMInformationDialog::sigClose,
+                this, &UIMachineLogic::sltCloseVMInformationDialog);
+    }
+}
+
+void UIMachineLogic::sltCloseVMInformationDialog()
+{
+    delete m_pVMInformationDialog;
+    m_pVMInformationDialog = 0;
 }
 
@@ -1853 +1872 @@
 void UIMachineLogic::sltCloseFileManagerDialog()
 {
-    QIManagerDialog* pDialog = qobject_cast<QIManagerDialog*>(sender());
-    if (m_pFileManagerDialog != pDialog || !pDialog)
-        return;
-
+    if (!m_pFileManagerDialog)
+        return;
+
+    QIManagerDialog* pDialog = m_pFileManagerDialog;
     /* Set the m_pFileManagerDialog to NULL before closing the dialog. or we will have redundant deletes*/
     m_pFileManagerDialog = 0;
@@ -2789 +2808 @@
     cleanupDebugger();
 #endif
+    sltCloseFileManagerDialog();
+    sltCloseVMInformationDialog();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -41 +41 @@
 class UIDockIconPreview;
 class UISoftKeyboard;
+class UIVMInformationDialog;
 class CSession;
 class CMachine;
@@ -280 +281 @@
     void sltTakeSnapshot();
     void sltShowInformationDialog();
+    void sltCloseVMInformationDialog();
     void sltShowFileManagerDialog();
     void sltCloseFileManagerDialog();
@@ -443 +445 @@
 
     /** Holds the log viewer dialog instance. */
-    QIManagerDialog *m_pLogViewerDialog;
-    QIManagerDialog *m_pFileManagerDialog;
-    QIManagerDialog *m_pProcessControlDialog;
-    UISoftKeyboard  *m_pSoftKeyboardDialog;
-
+    QIManagerDialog       *m_pLogViewerDialog;
+    QIManagerDialog       *m_pFileManagerDialog;
+    QIManagerDialog       *m_pProcessControlDialog;
+    UISoftKeyboard        *m_pSoftKeyboardDialog;
+    UIVMInformationDialog *m_pVMInformationDialog;
     /* Friend classes: */
     friend class UIMachineWindow;

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

@@ -58 +58 @@
 
 
-/* static */
-UIVMInformationDialog *UIVMInformationDialog::s_pInstance = 0;
-
-void UIVMInformationDialog::invoke(UIMachineWindow *pMachineWindow)
-{
-    /* Make sure dialog instance exists: */
-    if (!s_pInstance)
-    {
-        /* Create new dialog instance if it doesn't exists yet: */
-        new UIVMInformationDialog(pMachineWindow);
-    }
-
-    /* Show dialog: */
-    s_pInstance->show();
-    /* Raise it: */
-    s_pInstance->raise();
-    /* De-miniaturize if necessary: */
-    s_pInstance->setWindowState(s_pInstance->windowState() & ~Qt::WindowMinimized);
-    /* And activate finally: */
-    s_pInstance->activateWindow();
-}
 
 UIVMInformationDialog::UIVMInformationDialog(UIMachineWindow *pMachineWindow)
@@ -85 +64 @@
     , m_pMachineWindow(pMachineWindow)
 {
-    /* Initialize instance: */
-    s_pInstance = this;
-
     /* Prepare: */
     prepare();
@@ -94 +70 @@
 UIVMInformationDialog::~UIVMInformationDialog()
 {
-    /* Deinitialize instance: */
-    s_pInstance = 0;
+    saveSettings();
 }
 
@@ -134 +109 @@
 }
 
-void UIVMInformationDialog::sltSaveSettings()
+void UIVMInformationDialog::saveSettings()
 {
     /* Save window geometry: */
@@ -151 +126 @@
     /* Load settings: */
     loadSettings();
-    connect(&uiCommon(), &UICommon::sigAskToCommitData,
-            this, &UIVMInformationDialog::sltSaveSettings);
 }
 
 void UIVMInformationDialog::prepareThis()
 {
-    /* Delete dialog on close: */
-    setAttribute(Qt::WA_DeleteOnClose);
-    /* Delete dialog on machine-window destruction: */
-    connect(m_pMachineWindow, &UIMachineWindow::destroyed, this, &UIVMInformationDialog::suicide);
-
 #ifdef VBOX_WS_MAC
     /* No window-icon on Mac OS X, because it acts as proxy icon which isn't necessary here. */
@@ -274 +242 @@
         m_pButtonBox->button(QDialogButtonBox::Help)->setShortcut(QKeySequence::HelpContents);
         uiCommon().setHelpKeyword(m_pButtonBox->button(QDialogButtonBox::Help), "vm-session-information");
-        connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UIVMInformationDialog::close);
+        connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UIVMInformationDialog::sigClose);
         connect(m_pButtonBox->button(QDialogButtonBox::Help), &QPushButton::pressed,
                 &(msgCenter()), &UIMessageCenter::sltHandleHelpRequest);

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

@@ -49 +49 @@
     Q_OBJECT;
 
+signals:
+
+    void sigClose();
+
 public:
-
-    /** Shows (and creates if necessary)
-      * information-dialog for passed @a pMachineWindow. */
-    static void invoke(UIMachineWindow *pMachineWindow);
-
-protected:
 
     /** Constructs information dialog for passed @a pMachineWindow. */
@@ -65 +63 @@
     virtual bool shouldBeMaximized() const /* override */;
 
+protected:
+
     /** Handles translation event. */
     void retranslateUi();
@@ -70 +70 @@
 private slots:
 
-    /** Destroys dialog immediately. */
-    void suicide() { delete this; }
     /** Handles tab-widget page change. */
     void sltHandlePageChanged(int iIndex);
-    void sltSaveSettings();
 
 private:
@@ -92 +89 @@
     /** Loads settings. */
     void loadSettings();
-
-    /** @name General variables.
-     * @{ */
-    /** Holds the dialog instance. */
-    static UIVMInformationDialog *s_pInstance;
-    /** @} */
+    void saveSettings();
 
     /** @name Widget variables.