Changeset 102543 in vbox

Timestamp:

Dec 8, 2023 2:13:43 PM (10 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10570. Always ignoring close event is not a good idea. Solves the problem for soft keyboard dialog.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• guestctrl/UIFileManagerGuestTable.cpp (modified) (1 diff)
• softkeyboard/UISoftKeyboard.cpp (modified) (5 diffs)
• softkeyboard/UISoftKeyboard.h (modified) (2 diffs)

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

@@ -1208 +1208 @@
     else if (enmMachineState != KMachineState_Paused)
         cleanAll();
+    else if (enmMachineState != KMachineState_Saving)
+        cleanAll();
     setStateAndEnableWidgets();
 }

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

@@ -3953 +3953 @@
     , m_pStatusBarWidget(0)
     , m_iGeometrySaveTimerId(-1)
+    , m_fApplicationAboutToQuit(false)
 {
     setWindowTitle(QString("%1 - %2").arg(m_strMachineName).arg(tr("Soft Keyboard")));
@@ -3969 +3970 @@
     retranslateUi();
     uiCommon().setHelpKeyword(this, "soft-keyb");
+    connect(qApp, &QGuiApplication::aboutToQuit, this, &UISoftKeyboard::sltApplicationAboutToQuit);
 }
 
@@ -3984 +3986 @@
     QStringList strNameList = m_pKeyboardWidget->unsavedLayoutsNameList();
     /* Show a warning dialog when there are not saved layouts: */
-    if (m_pKeyboardWidget && !strNameList.empty())
+    if (m_pKeyboardWidget && !strNameList.empty() && !m_fApplicationAboutToQuit)
     {
         QString strJoinedString = strNameList.join("<br/>");
@@ -3999 +4001 @@
     m_pMachine->releaseKeys();
     emit sigClose();
-    event->ignore();
 }
 
@@ -4386 +4387 @@
 {
     m_pMachine->releaseKeys();
+}
+
+void UISoftKeyboard::sltApplicationAboutToQuit()
+{
+    m_fApplicationAboutToQuit = true;
 }
 

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

@@ -113 +113 @@
     void sltSaveSettings();
     void sltReleaseKeys();
+    void sltApplicationAboutToQuit();
 
 private:
@@ -140 +141 @@
     UISoftKeyboardStatusBarWidget *m_pStatusBarWidget;
     int m_iGeometrySaveTimerId;
+    bool m_fApplicationAboutToQuit;
 };