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

Timestamp:

May 14, 2021 11:18:18 AM (4 years ago)

Author:

vboxsync

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

144380

Message:

FE/Qt: bugref:8161: Runtime UI / Machine-logic: Rework commit data request handling for Session Information and Soft Keyboard dialogs; They should be deleted synchronously when corresponding signal is coming, not later as in simple close case.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineLogic.cpp (modified) (3 diffs)
• UIMachineLogic.h (modified) (2 diffs)

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

@@ -1631 +1631 @@
         QWidget *pCenterWidget = windowManager().realParentWindow(activeMachineWindow());
         m_pSoftKeyboardDialog = new UISoftKeyboard(0, uisession(), pCenterWidget, machine().GetName());
-        connect(m_pSoftKeyboardDialog, &UISoftKeyboard::sigClose, this, &UIMachineLogic::sltCloseSoftKeyboard);
+        connect(m_pSoftKeyboardDialog, &UISoftKeyboard::sigClose, this, &UIMachineLogic::sltCloseSoftKeyboardDefault);
     }
 
@@ -1643 +1643 @@
 }
 
-void UIMachineLogic::sltCloseSoftKeyboard()
+void UIMachineLogic::sltCloseSoftKeyboard(bool fAsync /* = false */)
 {
     if (!m_pSoftKeyboardDialog)
         return;
-    m_pSoftKeyboardDialog->deleteLater();
+    if (fAsync)
+        m_pSoftKeyboardDialog->deleteLater();
+    else
+        delete m_pSoftKeyboardDialog;
     m_pSoftKeyboardDialog = 0;
 }
@@ -1834 +1837 @@
         m_pVMInformationDialog->setWindowState(m_pVMInformationDialog->windowState() & ~Qt::WindowMinimized);
         m_pVMInformationDialog->activateWindow();
-        connect(m_pVMInformationDialog, &UIVMInformationDialog::sigClose,
-                this, &UIMachineLogic::sltCloseVMInformationDialog);
-    }
-}
-
-void UIMachineLogic::sltCloseVMInformationDialog()
+        connect(m_pVMInformationDialog, &UIVMInformationDialog::sigClose, this, &UIMachineLogic::sltCloseVMInformationDialogDefault);
+    }
+}
+
+void UIMachineLogic::sltCloseVMInformationDialog(bool fAsync /* = false */)
 {
     if (!m_pVMInformationDialog)
         return;
-    m_pVMInformationDialog->deleteLater();
+    if (fAsync)
+        m_pVMInformationDialog->deleteLater();
+    else
+        delete m_pVMInformationDialog;
     m_pVMInformationDialog = 0;
 }

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

@@ -268 +268 @@
     void sltShowKeyboardSettings();
     void sltShowSoftKeyboard();
-    void sltCloseSoftKeyboard();
+    void sltCloseSoftKeyboard(bool fAsync = false);
+    void sltCloseSoftKeyboardDefault() { sltCloseSoftKeyboard(true); }
     void sltToggleMouseIntegration(bool fEnabled);
     void sltTypeCAD();
@@ -281 +282 @@
     void sltTakeSnapshot();
     void sltShowInformationDialog();
-    void sltCloseVMInformationDialog();
+    void sltCloseVMInformationDialog(bool fAsync = false);
+    void sltCloseVMInformationDialogDefault() { sltCloseVMInformationDialog(true); }
     void sltShowFileManagerDialog();
     void sltCloseFileManagerDialog();