Changeset 90327 in vbox for trunk/src

Timestamp:

Jul 26, 2021 9:54:34 AM (4 years ago)

Author:

vboxsync

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

145890

Message:

FE/Qt: bugref:10067: Notification signature for final New Virtual Disk wizard progress which should now go to center instead of modal dialog.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -55 +55 @@
 
 /*********************************************************************************************************************************
+*   Class UINotificationProgressMediumCreate implementation.                                                                     *
+*********************************************************************************************************************************/
+
+UINotificationProgressMediumCreate::UINotificationProgressMediumCreate(const CMedium &comTarget,
+                                                                       qulonglong uSize,
+                                                                       const QVector<KMediumVariant> &variants)
+    : m_comTarget(comTarget)
+    , m_uSize(uSize)
+    , m_variants(variants)
+{
+    connect(this, &UINotificationProgress::sigProgressFinished,
+            this, &UINotificationProgressMediumCreate::sltHandleProgressFinished);
+}
+
+QString UINotificationProgressMediumCreate::name() const
+{
+    return UINotificationProgress::tr("Creating medium ...");
+}
+
+QString UINotificationProgressMediumCreate::details() const
+{
+    return UINotificationProgress::tr("<b>Location:</b> %1<br><b>Size:</b> %2")
+                                     .arg(m_comTarget.GetLocation()).arg(m_uSize);
+}
+
+CProgress UINotificationProgressMediumCreate::createProgress(COMResult &comResult)
+{
+    /* Initialize progress-wrapper: */
+    CProgress comProgress = m_comTarget.CreateBaseStorage(m_uSize, m_variants);
+    /* Store COM result: */
+    comResult = m_comTarget;
+    /* Return progress-wrapper: */
+    return comProgress;
+}
+
+void UINotificationProgressMediumCreate::sltHandleProgressFinished()
+{
+    if (m_comTarget.isNotNull() && !m_comTarget.GetId().isNull())
+        emit sigMediumCreated(m_comTarget);
+}
+
+
+/*********************************************************************************************************************************
 *   Class UINotificationProgressMediumCopy implementation.                                                                       *
 *********************************************************************************************************************************/

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

@@ -67 +67 @@
 };
 
+/** UINotificationProgress extension for medium create functionality. */
+class SHARED_LIBRARY_STUFF UINotificationProgressMediumCreate : public UINotificationProgress
+{
+    Q_OBJECT;
+
+signals:
+
+    /** Notifies listeners about @a comMedium was created. */
+    void sigMediumCreated(const CMedium &comMedium);
+
+public:
+
+    /** Constructs medium create notification-progress.
+      * @param  comTarget  Brings the medium being the target.
+      * @param  uSize      Brings the target medium size.
+      * @param  variants   Brings the target medium options. */
+    UINotificationProgressMediumCreate(const CMedium &comTarget,
+                                       qulonglong uSize,
+                                       const QVector<KMediumVariant> &variants);
+
+protected:
+
+    /** Returns object name. */
+    virtual QString name() const /* override final */;
+    /** Returns object details. */
+    virtual QString details() const /* override final */;
+    /** Creates and returns started progress-wrapper. */
+    virtual CProgress createProgress(COMResult &comResult) /* override final */;
+
+private slots:
+
+    /** Handles signal about progress being finished. */
+    void sltHandleProgressFinished();
+
+private:
+
+    /** Holds the medium being the target. */
+    CMedium                  m_comTarget;
+    /** Holds the target medium size. */
+    qulonglong               m_uSize;
+    /** Holds the target medium options. */
+    QVector<KMediumVariant>  m_variants;
+};
+
 /** UINotificationProgress extension for medium copy functionality. */
 class SHARED_LIBRARY_STUFF UINotificationProgressMediumCopy : public UINotificationProgress
@@ -79 +123 @@
 public:
 
-    /** Constructs medium move notification-progress.
+    /** Constructs medium copy notification-progress.
       * @param  comSource  Brings the medium being copied.
       * @param  comTarget  Brings the medium being the target.

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

@@ -19 +19 @@
 #include <QVariant>
 #include <QPushButton>
+
 /* GUI includes: */
 #include "UICommon.h"
+#include "UIMedium.h"
+#include "UIMessageCenter.h"
+#include "UINotificationCenter.h"
 #include "UIWizardNewVD.h"
 #include "UIWizardNewVDPageFileType.h"
@@ -26 +30 @@
 #include "UIWizardNewVDPageSizeLocation.h"
 #include "UIWizardNewVDPageExpert.h"
-#include "UIMessageCenter.h"
-#include "UIMedium.h"
 
 /* COM includes: */
@@ -54 +56 @@
 {
     /* Gather attributes: */
-    CMediumFormat mediumFormat = field("mediumFormat").value<CMediumFormat>();
-    qulonglong uVariant = field("mediumVariant").toULongLong();
-    QString strMediumPath = field("mediumPath").toString();
-    qulonglong uSize = field("mediumSize").toULongLong();
+    const CMediumFormat comMediumFormat = field("mediumFormat").value<CMediumFormat>();
+    const qulonglong uVariant = field("mediumVariant").toULongLong();
+    const QString strMediumPath = field("mediumPath").toString();
+    const qulonglong uSize = field("mediumSize").toULongLong();
     /* Check attributes: */
     AssertReturn(!strMediumPath.isNull(), false);
@@ -63 +65 @@
 
     /* Get VBox object: */
-    CVirtualBox vbox = uiCommon().virtualBox();
+    CVirtualBox comVBox = uiCommon().virtualBox();
 
-    /* Create new virtual hard-disk: */
-    CMedium virtualDisk = vbox.CreateMedium(mediumFormat.GetName(), strMediumPath, KAccessMode_ReadWrite, KDeviceType_HardDisk);
-    if (!vbox.isOk())
+    /* Create new virtual disk image: */
+    CMedium comVirtualDisk = comVBox.CreateMedium(comMediumFormat.GetName(), strMediumPath, KAccessMode_ReadWrite, KDeviceType_HardDisk);
+    if (!comVBox.isOk())
     {
-        msgCenter().cannotCreateHardDiskStorage(vbox, strMediumPath, this);
+        msgCenter().cannotCreateMediumStorage(comVBox, strMediumPath, this);
         return false;
     }
 
     /* Compose medium-variant: */
-    QVector<KMediumVariant> variants(sizeof(qulonglong)*8);
+    QVector<KMediumVariant> variants(sizeof(qulonglong) * 8);
     for (int i = 0; i < variants.size(); ++i)
     {
         qulonglong temp = uVariant;
-        temp &= UINT64_C(1)<<i;
+        temp &= Q_UINT64_C(1) << i;
         variants[i] = (KMediumVariant)temp;
     }
 
-    /* Create base storage for the new virtual-disk: */
-    CProgress progress = virtualDisk.CreateBaseStorage(uSize, variants);
-    if (!virtualDisk.isOk())
-    {
-        msgCenter().cannotCreateHardDiskStorage(virtualDisk, strMediumPath, this);
-        return false;
-    }
+    /* Copy medium: */
+    UINotificationProgressMediumCreate *pNotification = new UINotificationProgressMediumCreate(comVirtualDisk,
+                                                                                               uSize,
+                                                                                               variants);
+    connect(pNotification, &UINotificationProgressMediumCreate::sigMediumCreated,
+            &uiCommon(), &UICommon::sltHandleMediumCreated);
+    notificationCenter().append(pNotification);
 
-    /* Show creation progress: */
-    msgCenter().showModalProgressDialog(progress, windowTitle(), ":/progress_media_create_90px.png", this);
-    if (progress.GetCanceled())
-        return false;
-    if (!progress.isOk() || progress.GetResultCode() != 0)
-    {
-        msgCenter().cannotCreateHardDiskStorage(progress, strMediumPath, this);
-        return false;
-    }
-
-    /* Remember created virtual-disk: */
-    m_virtualDisk = virtualDisk;
-
-    /* Inform UICommon about it: */
-    uiCommon().createMedium(UIMedium(m_virtualDisk, UIMediumDeviceType_HardDisk, KMediumState_Created));
-
+    /* Positive: */
     return true;
 }

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

@@ -59 +59 @@
     void prepare();
 
-    /* Returns virtual-disk: */
-    CMedium virtualDisk() const { return m_virtualDisk; }
-
 protected:
 
@@ -77 +74 @@
 
     /* Variables: */
-    QString m_strDefaultName;
-    QString m_strDefaultPath;
-    qulonglong m_uDefaultSize;
-    CMedium m_virtualDisk;
+    QString     m_strDefaultName;
+    QString     m_strDefaultPath;
+    qulonglong  m_uDefaultSize;
 };