Changeset 88785 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 29, 2021 2:02:38 PM (4 years ago)

Author:

vboxsync

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

144115

Message:

FE/Qt: bugref:8161. Closing soft keyboard dialog from UIMachineLogic::sltHandleCommitData

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• runtime/UIMachineLogic.cpp (modified) (3 diffs)
• runtime/UIMachineLogic.h (modified) (1 diff)
• softkeyboard/UISoftKeyboard.cpp (modified) (2 diffs)
• softkeyboard/UISoftKeyboard.h (modified) (1 diff)

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

@@ -1627 +1627 @@
 
     /* Create the soft keyboard only once: */
+    if (!m_pSoftKeyboardDialog)
+    {
+        QWidget *pCenterWidget = windowManager().realParentWindow(activeMachineWindow());
+        m_pSoftKeyboardDialog = new UISoftKeyboard(0, uisession(), pCenterWidget, machine().GetName());
+        connect(m_pSoftKeyboardDialog, &UISoftKeyboard::sigClose, this, &UIMachineLogic::sltCloseSoftKeyboard);
+    }
+
     if (m_pSoftKeyboardDialog)
     {
@@ -1633 +1640 @@
         m_pSoftKeyboardDialog->setWindowState(m_pSoftKeyboardDialog->windowState() & ~Qt::WindowMinimized);
         m_pSoftKeyboardDialog->activateWindow();
-        return;
-    }
-    QWidget *pCenterWidget = windowManager().realParentWindow(activeMachineWindow());
-    m_pSoftKeyboardDialog = new UISoftKeyboard(0, uisession(), pCenterWidget, machine().GetName());
-    if (m_pSoftKeyboardDialog)
-    {
-        connect(m_pSoftKeyboardDialog, &QMainWindow::destroyed, this, &UIMachineLogic::sltSoftKeyboardClosed);
-        m_pSoftKeyboardDialog->show();
-    }
-}
-
-void UIMachineLogic::sltSoftKeyboardClosed()
-{
+    }
+}
+
+void UIMachineLogic::sltCloseSoftKeyboard()
+{
+    delete m_pSoftKeyboardDialog;
     m_pSoftKeyboardDialog = 0;
 }
@@ -2810 +2810 @@
     sltCloseFileManagerDialog();
     sltCloseVMInformationDialog();
+    sltCloseSoftKeyboard();
 }
 

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

@@ -268 +268 @@
     void sltShowKeyboardSettings();
     void sltShowSoftKeyboard();
-    void sltSoftKeyboardClosed();
+    void sltCloseSoftKeyboard();
     void sltToggleMouseIntegration(bool fEnabled);
     void sltTypeCAD();

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp

@@ -3849 +3849 @@
 {
     setWindowTitle(QString("%1 - %2").arg(m_strMachineName).arg(tr("Soft Keyboard")));
-    setAttribute(Qt::WA_DeleteOnClose);
     prepareObjects();
     prepareConnections();
@@ -3888 +3887 @@
     {
         QString strJoinedString = strNameList.join("<br/>");
-        if (msgCenter().questionBinary(this, MessageType_Warning,
+        if (!msgCenter().questionBinary(this, MessageType_Warning,
                                        tr("<p>Following layouts are edited/copied but not saved:</p>%1"
                                           "<p>Closing this dialog will cause loosing the changes. Proceed?</p>").arg(strJoinedString),
                                        0 /* auto-confirm id */,
                                        "Ok", "Cancel"))
-            QMainWindowWithRestorableGeometryAndRetranslateUi::closeEvent(event);
-        else
+        {
             event->ignore();
-        return;
-    }
-    QMainWindowWithRestorableGeometryAndRetranslateUi::closeEvent(event);
+            return;
+        }
+    }
+    emit sigClose();
+    event->ignore();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.h

@@ -57 +57 @@
 
     void sigHelpRequested(const QString &strHelpKeyword);
+    void sigClose();
 
 public: