Changeset 105558 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 1, 2024 10:08:22 AM (6 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10736. Using the new IMedium::resizeAndCloneTo API. Clone VD wizard in GUI has not been resizing cloned virtual media.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• notificationcenter/UINotificationObjects.cpp (modified) (2 diffs)
• notificationcenter/UINotificationObjects.h (modified) (2 diffs)
• wizards/clonevd/UIWizardCloneVD.cpp (modified) (1 diff)
• wizards/newvd/UIWizardNewVD.cpp (modified) (5 diffs)
• wizards/newvd/UIWizardNewVD.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.cpp

@@ -1940 +1940 @@
 UINotificationProgressMediumCopy::UINotificationProgressMediumCopy(const CMedium &comSource,
                                                                    const CMedium &comTarget,
-                                                                   const QVector<KMediumVariant> &variants)
+                                                                   const QVector<KMediumVariant> &variants,
+                                                                   qulonglong uMediumSize)
     : m_comSource(comSource)
     , m_comTarget(comTarget)
     , m_variants(variants)
+    , m_uMediumSize(uMediumSize)
 {
     connect(this, &UINotificationProgress::sigProgressFinished,
@@ -1980 +1982 @@
 
     /* Initialize progress-wrapper: */
-    CProgress comProgress = m_comSource.CloneTo(m_comTarget, m_variants, CMedium());
+    CProgress comProgress = m_comSource.ResizeAndCloneTo(m_comTarget, m_uMediumSize, m_variants, CMedium());
     /* Store COM result: */
     comResult = m_comSource;

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.h

@@ -822 +822 @@
 
     /** Constructs medium copy notification-progress.
-      * @param  comSource  Brings the medium being copied.
-      * @param  comTarget  Brings the medium being the target.
-      * @param  variants   Brings the target medium options. */
+      * @param  comSource    Brings the medium being copied.
+      * @param  comTarget    Brings the medium being the target.
+      * @param  variants     Brings the target medium options.
+      * @param  uMediumSize  Brings the target medium size.
+      */
     UINotificationProgressMediumCopy(const CMedium &comSource,
                                      const CMedium &comTarget,
-                                     const QVector<KMediumVariant> &variants);
+                                     const QVector<KMediumVariant> &variants,
+                                     qulonglong uMediumSize);
 
 protected:
@@ -855 +858 @@
     /** Holds the target medium options. */
     QVector<KMediumVariant>  m_variants;
+    /** Holds the target medium size. */
+    qulonglong m_uMediumSize;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVD.cpp

@@ -100 +100 @@
     UINotificationProgressMediumCopy *pNotification = new UINotificationProgressMediumCopy(m_comSourceVirtualDisk,
                                                                                            comVirtualDisk,
-                                                                                           variants);
+                                                                                           variants,
+                                                                                           m_uMediumSize);
     connect(pNotification, &UINotificationProgressMediumCopy::sigMediumCopied,
             gpMediumEnumerator, &UIMediumEnumerator::sltHandleMediumCreated);

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.cpp

@@ -182 +182 @@
     /* Create new virtual disk image: */
     CMedium comVirtualDisk = comVBox.CreateMedium(m_comMediumFormat.GetName(),
-                                                  m_strMediumPath, KAccessMode_ReadWrite, KDeviceType_HardDisk);
+                                                  m_strMediumPath, KAccessMode_ReadWrite, m_enmDeviceType);
     if (!comVBox.isOk())
     {
@@ -198 +198 @@
     }
 
-    UINotificationProgressMediumCreate *pNotification = new UINotificationProgressMediumCreate(comVirtualDisk,
-                                                                                               m_uMediumSize,
-                                                                                               variants);
-    connect(pNotification, &UINotificationProgressMediumCreate::sigMediumCreated,
-            gpMediumEnumerator, &UIMediumEnumerator::sltHandleMediumCreated);
+    if (!isClonning())
+    {
+        UINotificationProgressMediumCreate *pNotification = new UINotificationProgressMediumCreate(comVirtualDisk,
+                                                                                                   m_uMediumSize,
+                                                                                                   variants);
+        connect(pNotification, &UINotificationProgressMediumCreate::sigMediumCreated,
+                gpMediumEnumerator, &UIMediumEnumerator::sltHandleMediumCreated);
+        gpNotificationCenter->append(pNotification);
+    }
+    else
+    {
+        /* Copy medium: */
+        UINotificationProgressMediumCopy *pNotification = new UINotificationProgressMediumCopy(m_comSourceVirtualDisk,
+                                                                                               comVirtualDisk,
+                                                                                               variants,
+                                                                                               m_uMediumSize);
+        connect(pNotification, &UINotificationProgressMediumCopy::sigMediumCopied,
+                gpMediumEnumerator, &UIMediumEnumerator::sltHandleMediumCreated);
+        gpNotificationCenter->append(pNotification);
+    }
 
     m_uMediumId = comVirtualDisk.GetId();
-
-    gpNotificationCenter->append(pNotification);
-
     /* Positive: */
     return true;
@@ -253 +265 @@
 {
     UINativeWizard::sltRetranslateUI();
-    setWindowTitle(tr("Create Virtual Hard Disk"));
+    if (!isClonning())
+        setWindowTitle(tr("Create Virtual Hard Disk"));
+    else
+        setWindowTitle(tr("Copy Virtual Disk"));
 }
 
@@ -277 +292 @@
 qulonglong UIWizardNewVD::diskMinimumSize() const
 {
-    if (m_comSourceVirtualDisk.isNull())
+    if (!isClonning())
         return _4M;
     return m_comSourceVirtualDisk.GetLogicalSize();
@@ -286 +301 @@
     return m_enmDeviceType;
 }
+
+bool UIWizardNewVD::isClonning() const
+{
+    return !m_comSourceVirtualDisk.isNull();
+}

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.h

@@ -102 +102 @@
     void setMediumVariantPageVisibility();
     qulonglong diskMinimumSize() const;
+    bool isClonning() const;
 
     qulonglong m_uMediumVariant;