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

Timestamp:

Feb 26, 2021 1:36:31 PM (4 years ago)

Author:

vboxsync

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

142960

Message:

FE/Qt: bugref:9950. Removing the wizard field virtualDiskId field.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm

Files:

• UIWizardNewVM.cpp (modified) (3 diffs)
• UIWizardNewVMPageBasic4.cpp (modified) (2 diffs)
• UIWizardNewVMPageBasic4.h (modified) (3 diffs)
• UIWizardNewVMPageExpert.cpp (modified) (1 diff)
• UIWizardNewVMPageExpert.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -138 +138 @@
          * but in that special case VM was not registered yet, so UIExtraDataManager is unaware of it: */
         if (!isUnattendedEnabled() &&
-            (field("virtualDiskId").toString().isNull() || !field("virtualDisk").value<CMedium>().isNull()))
+            (!field("virtualDisk").value<CMedium>().isNull()))
             m_machine.SetExtraData(GUI_FirstRun, "yes");
     }
@@ -386 +386 @@
     {
         CMachine machine = session.GetMachine();
-
-        QUuid uId = field("virtualDiskId").toUuid();
-        /* Boot virtual hard drive: */
-        if (!uId.isNull())
+        CMedium vmedium = virtualDisk();
+        if (!vmedium.isNull())
         {
             KStorageBus enmHDDBus = comGuestType.GetRecommendedHDStorageBus();
@@ -395 +393 @@
             if (!comHDDController.isNull())
             {
-                UIMedium vmedium = uiCommon().medium(uId);
-                CMedium medium = vmedium.medium();              /// @todo r=dj can this be cached somewhere?
-                machine.AttachDevice(comHDDController.GetName(), 0, 0, KDeviceType_HardDisk, medium);
+                machine.AttachDevice(comHDDController.GetName(), 0, 0, KDeviceType_HardDisk, vmedium);
                 if (!machine.isOk())
                     msgCenter().cannotAttachDevice(machine, UIMediumDeviceType_HardDisk, field("virtualDiskLocation").toString(),

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic4.cpp

@@ -54 +54 @@
 
     /* Fetch filed values: */
-    if (m_pDiskSkip->isChecked())
-    {
-        m_uVirtualDiskId = QUuid();
-    }
-    else if (m_pDiskPresent->isChecked())
-    {
-        m_uVirtualDiskId = m_pDiskSelector->id();
-    }
+    // if (m_pDiskSkip->isChecked())
+    // {
+    //     m_uVirtualDiskId = QUuid();
+    // }
+    // else if (m_pDiskPresent->isChecked())
+    // {
+    //     m_uVirtualDiskId = m_pDiskSelector->id();
+    // }
 }
 
@@ -181 +181 @@
     qRegisterMetaType<CMedium>();
     registerField("virtualDisk", this, "virtualDisk");
-    registerField("virtualDiskId", this, "virtualDiskId");
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic4.h

@@ -58 +58 @@
 
 
-    /** @name Property getters/setters
-     * @{ */
-       QUuid virtualDiskId() const { return m_uVirtualDiskId; }
-       void setVirtualDiskId(const QUuid &uVirtualDiskId) { m_uVirtualDiskId = uVirtualDiskId; }
-    /** @} */
 
     QWidget *createDiskWidgets();
@@ -76 +71 @@
      * @{ */
        CMedium m_virtualDisk;
-       QUuid   m_uVirtualDiskId;
     /** @} */
 
@@ -95 +89 @@
     Q_OBJECT;
     Q_PROPERTY(CMedium virtualDisk READ virtualDisk WRITE setVirtualDisk);
-    Q_PROPERTY(QUuid virtualDiskId READ virtualDiskId WRITE setVirtualDiskId);
 
 public:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp

@@ -76 +76 @@
     registerField("baseMemory", this, "baseMemory");
     registerField("virtualDisk", this, "virtualDisk");
-    registerField("virtualDiskId", this, "virtualDiskId");
     registerField("guestOSFamiyId", this, "guestOSFamiyId");
     registerField("ISOFilePath", this, "ISOFilePath");

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.h

@@ -48 +48 @@
     Q_PROPERTY(QString machineFilePath READ machineFilePath WRITE setMachineFilePath);
     Q_PROPERTY(CMedium virtualDisk READ virtualDisk WRITE setVirtualDisk);
-    Q_PROPERTY(QUuid virtualDiskId READ virtualDiskId WRITE setVirtualDiskId);
     Q_PROPERTY(int baseMemory READ baseMemory);
     Q_PROPERTY(QString guestOSFamiyId READ guestOSFamiyId);