Changeset 91736 in vbox

Timestamp:

Oct 14, 2021 5:35:29 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9974. Moving the boot medium mount location from the dialog back to UIMachineLogic

Location:

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

Files:

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

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

@@ -81 +81 @@
 {
     if (m_pCloseButton)
+    {
         m_pCloseButton->setText(tr("&Close"));
+        m_pCloseButton->setToolTip(tr("Closes this dialog without resetting the guest or mounting a medium"));
+    }
     if (m_pResetButton)
-        m_pResetButton->setText(tr("&Reset"));
+    {
+        m_pResetButton->setText(tr("&Reset VM"));
+        m_pResetButton->setToolTip(tr("Mounts the selected ISO if any and restarts the vm"));
+    }
 
     if (m_pLabel)
         m_pLabel->setText(tr("The virtual machine failed to boot. That might be caused by a missing operating system "
                              "or misconfigured boot order. Mounting an operation install DVD might solve this problem. "
-                             "Selecting an ISO file will attemt to mount it immediately to the guest machine."));
+                             "Selecting an ISO file will attempt to mount it after the dialog is closed."));
+
     if (m_pBootImageLabel)
         m_pBootImageLabel->setText(tr("Boot DVD:"));
@@ -204 +211 @@
 }
 
-bool UIBootFailureDialog::insertBootMedium(const QUuid &uMediumId)
-{
-    AssertReturn(!uMediumId.isNull(), false);
-
-    CVirtualBox comVBox = uiCommon().virtualBox();
-    const CGuestOSType &comOsType = comVBox.GetGuestOSType(m_comMachine.GetOSTypeId());
-    /* Get recommended controller bus & type: */
-    const KStorageBus enmRecommendedDvdBus = comOsType.GetRecommendedDVDStorageBus();
-    const KStorageControllerType enmRecommendedDvdType = comOsType.GetRecommendedDVDStorageController();
-
-    CMediumAttachment comAttachment;
-    /* Search for an attachment of required bus & type: */
-    foreach (const CMediumAttachment &comCurrentAttachment, m_comMachine.GetMediumAttachments())
-    {
-        /* Determine current attachment's controller: */
-        const CStorageController &comCurrentController = m_comMachine.GetStorageControllerByName(comCurrentAttachment.GetController());
-
-        if (   comCurrentController.GetBus() == enmRecommendedDvdBus
-            && comCurrentController.GetControllerType() == enmRecommendedDvdType
-            && comCurrentAttachment.GetType() == KDeviceType_DVD)
-        {
-            comAttachment = comCurrentAttachment;
-            break;
-        }
-    }
-    AssertMsgReturn(!comAttachment.isNull(), ("Storage Controller is NOT properly configured!\n"), false);
-
-    const UIMedium guiMedium = uiCommon().medium(uMediumId);
-    const CMedium comMedium = guiMedium.medium();
-
-    /* Mount medium to the predefined port/device: */
-    m_comMachine.MountMedium(comAttachment.GetController(), comAttachment.GetPort(), comAttachment.GetDevice(), comMedium, false /* force */);
-    bool fSuccess = m_comMachine.isOk();
-
-    QWidget *pParent = windowManager().realParentWindow(this);
-
-    /* Show error message if necessary: */
-    if (!fSuccess)
-        msgCenter().cannotRemountMedium(m_comMachine, guiMedium, true /* mount? */, false /* retry? */, pParent);
-    else
-    {
-        /* Save machine settings: */
-        m_comMachine.SaveSettings();
-        fSuccess = m_comMachine.isOk();
-
-        /* Show error message if necessary: */
-        if (!fSuccess)
-            msgCenter().cannotSaveMachineSettings(m_comMachine, pParent);
-    }
-    return fSuccess;
-}
-
 void UIBootFailureDialog::sltFileSelectorPathChanged(const QString &strPath)
 {
-    insertBootMedium(uiCommon().openMedium(UIMediumDeviceType_DVD, strPath));
+    Q_UNUSED(strPath);
+    bool fISOValid = checkISOImage();
+    if (m_pBootImageSelector)
+    {
+        m_pBootImageSelector->mark(!fISOValid, tr("The selected path is invalid."));
+    }
+    if (m_pResetButton)
+        m_pResetButton->setEnabled(fISOValid);
 }
 
@@ -269 +231 @@
     return icon.pixmap(iSize, iSize);
 }
+
+bool UIBootFailureDialog::checkISOImage() const
+{
+    AssertReturn(m_pBootImageSelector, true);
+    if (m_pBootImageSelector->path().isEmpty())
+        return true;
+    QFileInfo fileInfo(m_pBootImageSelector->path());
+    if (!fileInfo.exists() || !fileInfo.isReadable())
+        return false;
+    return true;
+}

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

@@ -74 +74 @@
 private:
 
-    bool insertBootMedium(const QUuid &uMediumId);
     QPixmap iconPixmap();
+    /* Checks if selected iso exists and readable. Returns false if not. Returns true if nothing is selected. */
+    bool checkISOImage() const;
 
     /** @name Event-handling stuff.

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

@@ -3269 +3269 @@
 
     int iResult = pBootFailureDialog->exec(false);
+    QString strISOPath = pBootFailureDialog->bootMediumPath();
 
     delete pBootFailureDialog;
+
+    QFileInfo bootMediumFileInfo(strISOPath);
+    if (bootMediumFileInfo.exists() && bootMediumFileInfo.isReadable())
+        mountBootMedium(uiCommon().openMedium(UIMediumDeviceType_DVD, strISOPath));
 
     if (iResult == static_cast<int>(UIBootFailureDialog::ReturnCode_Reset))
         sltReset(false);
+}
+
+bool UIMachineLogic::mountBootMedium(const QUuid &uMediumId)
+{
+    AssertReturn(!uMediumId.isNull(), false);
+
+    CVirtualBox comVBox = uiCommon().virtualBox();
+    CMachine &comMachine = machine();
+    const CGuestOSType &comOsType = comVBox.GetGuestOSType(comMachine.GetOSTypeId());
+    /* Get recommended controller bus & type: */
+    const KStorageBus enmRecommendedDvdBus = comOsType.GetRecommendedDVDStorageBus();
+    const KStorageControllerType enmRecommendedDvdType = comOsType.GetRecommendedDVDStorageController();
+
+    CMediumAttachment comAttachment;
+    /* Search for an attachment of required bus & type: */
+    foreach (const CMediumAttachment &comCurrentAttachment, comMachine.GetMediumAttachments())
+    {
+        /* Determine current attachment's controller: */
+        const CStorageController &comCurrentController = comMachine.GetStorageControllerByName(comCurrentAttachment.GetController());
+
+        if (   comCurrentController.GetBus() == enmRecommendedDvdBus
+            && comCurrentController.GetControllerType() == enmRecommendedDvdType
+            && comCurrentAttachment.GetType() == KDeviceType_DVD)
+        {
+            comAttachment = comCurrentAttachment;
+            break;
+        }
+    }
+    AssertMsgReturn(!comAttachment.isNull(), ("Storage Controller is NOT properly configured!\n"), false);
+
+    const UIMedium guiMedium = uiCommon().medium(uMediumId);
+    const CMedium comMedium = guiMedium.medium();
+
+    /* Mount medium to the predefined port/device: */
+    comMachine.MountMedium(comAttachment.GetController(), comAttachment.GetPort(), comAttachment.GetDevice(), comMedium, false /* force */);
+    bool fSuccess = comMachine.isOk();
+
+    QWidget *pParent = windowManager().realParentWindow(activeMachineWindow());
+
+    /* Show error message if necessary: */
+    if (!fSuccess)
+        msgCenter().cannotRemountMedium(comMachine, guiMedium, true /* mount? */, false /* retry? */, pParent);
+    else
+    {
+        /* Save machine settings: */
+        comMachine.SaveSettings();
+        fSuccess = comMachine.isOk();
+
+        /* Show error message if necessary: */
+        if (!fSuccess)
+            msgCenter().cannotSaveMachineSettings(comMachine, pParent);
+    }
+    return fSuccess;
 }
 

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

@@ -388 +388 @@
     /* Shows the boot failure dialog through which user can mount a boot DVD and reset the vm. */
     void showBootFailureDialog();
+    bool mountBootMedium(const QUuid &uMediumId);
 
     /* Private variables: */