Changeset 106556 in vbox for trunk/src

Timestamp:

Oct 21, 2024 11:20:06 AM (6 weeks ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10513: Runtime UI / Machine-logic: At VM startup (if selected bridged adapter wasn't found) we should open Network settings dialog the modal way to pause startup for a moment while another adapter being chosen.

Location:

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

Files:

• UIMachineLogic.cpp (modified) (6 diffs)
• UIMachineLogic.h (modified) (3 diffs)
• UISession.cpp (modified) (1 diff)

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

@@ -31 +31 @@
 #include <QDateTime>
 #include <QDir>
+#include <QEventLoop>
 #include <QFileInfo>
 #include <QImageWriter>
@@ -314 +315 @@
     foreach(UIMachineWindow *pMachineWindow, machineWindows())
         pMachineWindow->sendMachineViewSizeHint();
+}
+
+void UIMachineLogic::openNetworkSettingsDialogTheModalWay()
+{
+    /* Open VM settings : Network page: */
+    openSettingsDialog("#network", QString(), true /* app modal */);
+    /* Create event loop to listen to VM settings dialog destroy signal: */
+    QEventLoop loop;
+    connect(m_settings.value(UIAdvancedSettingsDialog::Type_Machine),
+            &QObject::destroyed, &loop, &QEventLoop::quit);
+    /* Execute loop finally: */
+    loop.exec();
 }
 
@@ -2908 +2921 @@
 
 void UIMachineLogic::openPreferencesDialog(const QString &strCategory /* = QString() */,
-                                           const QString &strControl /* = QString() */)
+                                           const QString &strControl /* = QString() */,
+                                           bool fAppModal /* = false */)
 {
     /* Do not process if window(s) missed! */
@@ -2920 +2934 @@
                                                                                                strCategory,
                                                                                                strControl);
+        if (fAppModal)
+            m_settings.value(UIAdvancedSettingsDialog::Type_Machine)->setWindowModality(Qt::ApplicationModal);
         connect(m_settings.value(UIAdvancedSettingsDialog::Type_Global), &UIAdvancedSettingsDialog::sigClose,
                 this, &UIMachineLogic::sltClosePreferencesDialog);
@@ -2935 +2951 @@
 
 void UIMachineLogic::openSettingsDialog(const QString &strCategory /* = QString() */,
-                                        const QString &strControl /* = QString()*/)
+                                        const QString &strControl /* = QString()*/,
+                                        bool fAppModal /* = false */)
 {
     /* Do not process if window(s) missed! */
@@ -2949 +2966 @@
                                                                                                  strCategory,
                                                                                                  strControl);
+        if (fAppModal)
+            m_settings.value(UIAdvancedSettingsDialog::Type_Machine)->setWindowModality(Qt::ApplicationModal);
         connect(m_settings.value(UIAdvancedSettingsDialog::Type_Machine), &UIAdvancedSettingsDialog::sigClose,
                 this, &UIMachineLogic::sltCloseSettingsDialog);

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

@@ -108 +108 @@
     virtual void sendMachineWindowsSizeHints();
 
-    /* Wrapper to open Machine settings / Network page: */
-    void openNetworkSettingsDialog() { sltOpenSettingsDialogNetwork(); }
+    /** Opens Machine settings / Network page the modal way. */
+    void openNetworkSettingsDialogTheModalWay();
 
 #ifdef VBOX_WS_MAC
@@ -359 +359 @@
       * @param  fAppModal    Brings whether dialog should be app modal. */
     void openPreferencesDialog(const QString &strCategory = QString(),
-                               const QString &strControl = QString());
+                               const QString &strControl = QString(),
+                               bool fAppModal = false);
 
     /** Opens VM settings dialog.
@@ -366 +367 @@
       * @param  fAppModal    Brings whether dialog should be app modal. */
     void openSettingsDialog(const QString &strCategory = QString(),
-                            const QString &strControl = QString());
+                            const QString &strControl = QString(),
+                            bool fAppModal = false);
 
     /* Helpers: */

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

@@ -2801 +2801 @@
         {
             if (msgCenter().warnAboutNetworkInterfaceNotFound(machineName(), failedInterfaceNames.join(", ")))
-                machineLogic()->openNetworkSettingsDialog();
+                machineLogic()->openNetworkSettingsDialogTheModalWay();
             else
             {