Changeset 90423 in vbox for trunk

Timestamp:

Jul 30, 2021 10:46:13 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: Notification signature for medium resize progress which should now go to center instead of modal dialogs.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• medium/UIMediumManager.cpp (modified) (4 diffs)
• medium/UIMediumManager.h (modified) (1 diff)
• notificationcenter/UINotificationObjects.cpp (modified) (1 diff)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

@@ -38 +38 @@
 #include "UIMediumManager.h"
 #include "UIMediumSearchWidget.h"
+#include "UINotificationCenter.h"
 #include "UIWizardCloneVD.h"
 #include "UIMessageCenter.h"
@@ -275 +276 @@
         pMediumItem->changeMediumType(oldData.m_options.m_enmMediumType, newData.m_options.m_enmMediumType);
 
-    /* Try to assign new medium location: */
-    if (   comMedium.isOk()
-        && newData.m_options.m_strLocation != oldData.m_options.m_strLocation)
-    {
-        /* Prepare move storage progress: */
-        CProgress comProgress = comMedium.MoveTo(newData.m_options.m_strLocation);
-
-        /* Show error message if necessary: */
-        if (!comMedium.isOk())
-            msgCenter().cannotMoveMediumStorage(comMedium,
-                                                oldData.m_options.m_strLocation,
-                                                newData.m_options.m_strLocation,
-                                                this);
-        else
-        {
-            /* Show move storage progress: */
-            msgCenter().showModalProgressDialog(comProgress, UIMediumManager::tr("Moving medium ..."),
-                                                ":/progress_media_move_90px.png", this);
-
-            /* Show error message if necessary: */
-            if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-                msgCenter().cannotMoveMediumStorage(comProgress,
-                                                    oldData.m_options.m_strLocation,
-                                                    newData.m_options.m_strLocation,
-                                                    this);
-        }
-    }
-
-    /* Try to assign new medium size: */
-    if (   comMedium.isOk()
-        && newData.m_options.m_uLogicalSize != oldData.m_options.m_uLogicalSize)
-    {
-        /* Prepare resize storage progress: */
-        CProgress comProgress = comMedium.Resize(newData.m_options.m_uLogicalSize);
-
-        /* Show error message if necessary: */
-        if (!comMedium.isOk())
-            msgCenter().cannotResizeHardDiskStorage(comMedium,
-                                                    oldData.m_options.m_strLocation,
-                                                    uiCommon().formatSize(oldData.m_options.m_uLogicalSize),
-                                                    uiCommon().formatSize(newData.m_options.m_uLogicalSize),
-                                                    this);
-        else
-        {
-            /* Show resize storage progress: */
-            msgCenter().showModalProgressDialog(comProgress, UIMediumManager::tr("Resizing medium ..."),
-                                                ":/progress_media_resize_90px.png", this);
-
-            /* Show error message if necessary: */
-            if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-                msgCenter().cannotResizeHardDiskStorage(comProgress,
-                                                        oldData.m_options.m_strLocation,
-                                                        uiCommon().formatSize(oldData.m_options.m_uLogicalSize),
-                                                        uiCommon().formatSize(newData.m_options.m_uLogicalSize),
-                                                        this);
-        }
-    }
-
     /* Try to assign new medium description: */
     if (   comMedium.isOk()
@@ -344 +287 @@
                                                       oldData.m_options.m_strLocation,
                                                       this);
+    }
+
+    /* Try to assign new medium location: */
+    if (   comMedium.isOk()
+        && newData.m_options.m_strLocation != oldData.m_options.m_strLocation)
+    {
+        /* Assign new medium location: */
+        UINotificationProgressMediumMove *pNotification = new UINotificationProgressMediumMove(comMedium,
+                                                                                               newData.m_options.m_strLocation);
+        connect(pNotification, &UINotificationProgressMediumMove::sigProgressFinished,
+                this, &UIMediumManagerWidget::sltHandleMoveProgressFinished);
+        notificationCenter().append(pNotification);
+    }
+
+    /* Try to assign new medium size: */
+    if (   comMedium.isOk()
+        && newData.m_options.m_uLogicalSize != oldData.m_options.m_uLogicalSize)
+    {
+        /* Assign new medium size: */
+        UINotificationProgressMediumResize *pNotification = new UINotificationProgressMediumResize(comMedium,
+                                                                                                   newData.m_options.m_uLogicalSize);
+        connect(pNotification, &UINotificationProgressMediumResize::sigProgressFinished,
+                this, &UIMediumManagerWidget::sltHandleResizeProgressFinished);
+        notificationCenter().append(pNotification);
     }
 
@@ -581 +548 @@
     /* Restart full medium-enumeration: */
     uiCommon().enumerateMedia();
+}
+
+void UIMediumManagerWidget::sltHandleMoveProgressFinished()
+{
+    /* Get current medium-item: */
+    UIMediumItem *pMediumItem = currentMediumItem();
+    AssertMsgReturnVoid(pMediumItem, ("Current item must not be null"));
+    AssertReturnVoid(!pMediumItem->id().isNull());
+
+    /* Recache current item: */
+    pMediumItem->refreshAll();
+
+    /* Push the current item data into details-widget: */
+    sltHandleCurrentTabChanged();
+}
+
+void UIMediumManagerWidget::sltHandleResizeProgressFinished()
+{
+    /* Get current medium-item: */
+    UIMediumItem *pMediumItem = currentMediumItem();
+    AssertMsgReturnVoid(pMediumItem, ("Current item must not be null"));
+    AssertReturnVoid(!pMediumItem->id().isNull());
+
+    /* Recache current item: */
+    pMediumItem->refreshAll();
+
+    /* Push the current item data into details-widget: */
+    sltHandleCurrentTabChanged();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h

@@ -185 +185 @@
         /** Handles command to refresh medium. */
         void sltRefreshAll();
+    /** @} */
+
+    /** @name Menu/action handler stuff.
+      * @{ */
+        /** Handles medium move progress finished signal. */
+        void sltHandleMoveProgressFinished();
+        /** Handles medium resize progress finished signal. */
+        void sltHandleResizeProgressFinished();
     /** @} */
 

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

@@ -183 +183 @@
 
 /*********************************************************************************************************************************
+*   Class UINotificationProgressMediumResize implementation.                                                                     *
+*********************************************************************************************************************************/
+
+UINotificationProgressMediumResize::UINotificationProgressMediumResize(const CMedium &comMedium,
+                                                                       qulonglong uSize)
+    : m_comMedium(comMedium)
+    , m_uTo(uSize)
+{
+}
+
+QString UINotificationProgressMediumResize::name() const
+{
+    return UINotificationProgress::tr("Resizing medium ...");
+}
+
+QString UINotificationProgressMediumResize::details() const
+{
+    return UINotificationProgress::tr("<b>From:</b> %1<br><b>To:</b> %2")
+                                      .arg(uiCommon().formatSize(m_uFrom),
+                                           uiCommon().formatSize(m_uTo));
+}
+
+CProgress UINotificationProgressMediumResize::createProgress(COMResult &comResult)
+{
+    /* Acquire size: */
+    m_uFrom = m_comMedium.GetLogicalSize();
+    if (!m_comMedium.isOk())
+    {
+        /* Store COM result: */
+        comResult = m_comMedium;
+        /* Return progress-wrapper: */
+        return CProgress();
+    }
+
+    /* Initialize progress-wrapper: */
+    CProgress comProgress = m_comMedium.Resize(m_uTo);
+    /* Store COM result: */
+    comResult = m_comMedium;
+    /* Return progress-wrapper: */
+    return comProgress;
+}
+
+
+/*********************************************************************************************************************************
 *   Class UINotificationProgressMediumDeletingStorage implementation.                                                            *
 *********************************************************************************************************************************/

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

@@ -164 +164 @@
     /** Holds the desired location. */
     QString  m_strTo;
+};
+
+/** UINotificationProgress extension for medium resize functionality. */
+class SHARED_LIBRARY_STUFF UINotificationProgressMediumResize : public UINotificationProgress
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs medium resize notification-progress.
+      * @param  comMedium  Brings the medium being resized.
+      * @param  uSize      Brings the desired size. */
+    UINotificationProgressMediumResize(const CMedium &comMedium,
+                                       qulonglong uSize);
+
+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:
+
+    /** Holds the medium being resized. */
+    CMedium     m_comMedium;
+    /** Holds the initial size. */
+    qulonglong  m_uFrom;
+    /** Holds the desired size. */
+    qulonglong  m_uTo;
 };