Changeset 29942 in vbox

Timestamp:

Jun 1, 2010 12:07:18 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt: 4998: First Run Wizard regression should be fixed.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun

Files:

• UIFirstRunWzd.cpp (modified) (5 diffs)
• UIFirstRunWzd.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIFirstRunWzd.cpp

@@ -62 +62 @@
 }
 
-bool UIFirstRunWzd::isDefaultHardDiskAttached(const CMachine &machine)
-{
-    LONG iPort = 0;
-    LONG iDevice = 0;
+bool UIFirstRunWzd::isBootHardDiskAttached(const CMachine &machine)
+{
+    /* Result is 'false' initially: */
+    bool fIsBootHardDiskAttached = false;
+    /* Get 'vbox' global object: */
     CVirtualBox vbox = vboxGlobal().virtualBox();
-    CGuestOSType type = vbox.GetGuestOSType(machine.GetOSTypeId());
-    KStorageBus ctrDvdBus = type.GetRecommendedDvdStorageBus();
-    KStorageBus ctrHdBus = type.GetRecommendedHdStorageBus();
-    KStorageControllerType dvdStorageControllerType = type.GetRecommendedDvdStorageController();
-    KStorageControllerType hdStorageControllerType = type.GetRecommendedHdStorageController();
-    CMediumAttachment hda = ctrHdBus != ctrDvdBus || hdStorageControllerType != dvdStorageControllerType ?
-                            machine.GetMediumAttachment(VBoxVMSettingsHD::tr("Storage Controller 1"), iPort, iDevice) :
-                            machine.GetMediumAttachment(VBoxVMSettingsHD::tr("Storage Controller"), iPort, iDevice);
-    return !hda.isNull() && hda.GetType() == KDeviceType_HardDisk;
+    /* Determine machine 'OS type': */
+    const CGuestOSType &osType = vbox.GetGuestOSType(machine.GetOSTypeId());
+    /* Determine recommended controller's 'bus' & 'type': */
+    KStorageBus hdCtrBus = osType.GetRecommendedHdStorageBus();
+    KStorageControllerType hdCtrType = osType.GetRecommendedHdStorageController();
+    /* Enumerate attachments vector: */
+    const CMediumAttachmentVector &attachments = machine.GetMediumAttachments();
+    for (int i = 0; i < attachments.size(); ++i)
+    {
+        /* Get current attachment: */
+        const CMediumAttachment &attachment = attachments[i];
+        /* Determine attachment's controller: */
+        const CStorageController &controller = machine.GetStorageControllerByName(attachment.GetController());
+        /* If controller's 'bus' & 'type' are recommended and attachment's 'type' is 'hard disk': */
+        if (controller.GetBus() == hdCtrBus &&
+            controller.GetControllerType() == hdCtrType &&
+            attachment.GetType() == KDeviceType_HardDisk)
+        {
+            /* Set the result to 'true': */
+            fIsBootHardDiskAttached = true;
+            break;
+        }
+    }
+    /* Return result: */
+    return fIsBootHardDiskAttached;
 }
 
@@ -97 +114 @@
 
     /* Hide unnecessary text labels */
-    bool fIsDefaultHDAttached = UIFirstRunWzd::isDefaultHardDiskAttached(machine);
-    m_pPage1Text1Var1->setHidden(!fIsDefaultHDAttached);
-    m_pPage1Text1Var2->setHidden(fIsDefaultHDAttached);
+    bool fIsBootHDAttached = UIFirstRunWzd::isBootHardDiskAttached(machine);
+    m_pPage1Text1Var1->setHidden(!fIsBootHDAttached);
+    m_pPage1Text1Var2->setHidden(fIsBootHDAttached);
 }
 
@@ -160 +177 @@
 
     /* Hide unnecessary text labels */
-    bool fIsDefaultHDAttached = UIFirstRunWzd::isDefaultHardDiskAttached(machine);
-    m_pPage2Text1Var1->setHidden(!fIsDefaultHDAttached);
-    m_pPage2Text1Var2->setHidden(fIsDefaultHDAttached);
+    bool fIsBootHDAttached = UIFirstRunWzd::isBootHardDiskAttached(machine);
+    m_pPage2Text1Var1->setHidden(!fIsBootHDAttached);
+    m_pPage2Text1Var2->setHidden(fIsBootHDAttached);
 
     /* Assign media selector attributes */
@@ -237 +254 @@
 
     /* Hide unnecessary text labels */
-    bool fIsDefaultHDAttached = UIFirstRunWzd::isDefaultHardDiskAttached(machine);
-    m_pPage3Text1Var1->setHidden(!fIsDefaultHDAttached);
-    m_pPage3Text1Var2->setHidden(fIsDefaultHDAttached);
-    m_pPage3Text2Var1->setHidden(!fIsDefaultHDAttached);
-    m_pPage3Text2Var2->setHidden(fIsDefaultHDAttached);
+    bool fIsBootHDAttached = UIFirstRunWzd::isBootHardDiskAttached(machine);
+    m_pPage3Text1Var1->setHidden(!fIsBootHDAttached);
+    m_pPage3Text1Var2->setHidden(fIsBootHDAttached);
+    m_pPage3Text2Var1->setHidden(!fIsBootHDAttached);
+    m_pPage3Text2Var2->setHidden(fIsBootHDAttached);
 }
 
@@ -293 +310 @@
 bool UIFirstRunWzdPage3::insertDevice()
 {
-    /* Composing default controller name */
+    /* Get 'vbox' global object: */
+    CVirtualBox vbox = vboxGlobal().virtualBox();
+    /* Determine machine 'OS type': */
+    const CGuestOSType &osType = vbox.GetGuestOSType(m_Machine.GetOSTypeId());
+    /* Determine recommended controller's 'bus' & 'type': */
+    KStorageBus dvdCtrBus = osType.GetRecommendedDvdStorageBus();
+    KStorageControllerType dvdCtrType = osType.GetRecommendedDvdStorageController();
+    /* Declare null 'dvd' attachment: */
+    CMediumAttachment cda;
+    /* Enumerate attachments vector: */
+    const CMediumAttachmentVector &attachments = m_Machine.GetMediumAttachments();
+    for (int i = 0; i < attachments.size(); ++i)
+    {
+        /* Get current attachment: */
+        const CMediumAttachment &attachment = attachments[i];
+        /* Determine attachment's controller: */
+        const CStorageController &controller = m_Machine.GetStorageControllerByName(attachment.GetController());
+        /* If controller's 'bus' & 'type' are recommended and attachment's 'type' is 'dvd': */
+        if (controller.GetBus() == dvdCtrBus &&
+            controller.GetControllerType() == dvdCtrType &&
+            attachment.GetType() == KDeviceType_DVD)
+        {
+            /* Remember attachment: */
+            cda = attachment;
+            break;
+        }
+    }
+    AssertMsg(!cda.isNull(), ("Storage Controller is NOT properly configured!\n"));
+    /* Get chosen 'dvd' medium to mount: */
     QString mediumId = field("id").toString();
-    LONG iPort = 1;
-    LONG iDevice = 0;
-    QString strCtnName = VBoxVMSettingsHD::tr("Storage Controller");
-    CMediumAttachment cda = m_Machine.GetMediumAttachment(strCtnName, iPort, iDevice);
-    AssertMsg(!cda.isNull() && cda.GetType() == KDeviceType_DVD,
-              ("Storage Controller is NOT properly configured!\n"));
-    /* Mount medium to the predefined port/device */
-    m_Machine.MountMedium(strCtnName, iPort, iDevice, mediumId, false /* force */);
+    /* Mount medium to the predefined port/device: */
+    m_Machine.MountMedium(cda.GetController(), cda.GetPort(), cda.GetDevice(), mediumId, false /* force */);
     if (m_Machine.isOk())
         return true;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIFirstRunWzd.h

@@ -37 +37 @@
     UIFirstRunWzd(QWidget *pParent, const CMachine &machine);
 
-    static bool isDefaultHardDiskAttached(const CMachine &machine);
+    static bool isBootHardDiskAttached(const CMachine &machine);
 
 protected: