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

Timestamp:

Jul 23, 2021 11:26:26 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: First notification signature for notification-center, which means new files for future signatures; This one is about medium move progress which should now go to center instead of modal dialog.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/medium/UIMediumItem.cpp (modified) (3 diffs)
• src/medium/UIMediumItem.h (modified) (1 diff)
• src/notificationcenter/UINotificationCenter.h (modified) (1 diff)
• src/notificationcenter/UINotificationObjects.cpp (added)
• src/notificationcenter/UINotificationObjects.h (added)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -846 +846 @@
         src/notificationcenter/UINotificationObject.h \
         src/notificationcenter/UINotificationObjectItem.h \
+        src/notificationcenter/UINotificationObjects.h \
         src/notificationcenter/UINotificationProgressTask.h \
         src/settings/UISettingsDialog.h \
@@ -1396 +1397 @@
         src/notificationcenter/UINotificationObject.cpp \
         src/notificationcenter/UINotificationObjectItem.cpp \
+        src/notificationcenter/UINotificationObjects.cpp \
         src/notificationcenter/UINotificationProgressTask.cpp \
         src/objects/UIRichTextString.cpp \

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

@@ -28 +28 @@
 #include "UIMediumItem.h"
 #include "UIMessageCenter.h"
+#include "UINotificationCenter.h"
 
 /* COM includes: */
@@ -78 +79 @@
         return false;
 
-    /* Try to assign new medium location: */
-    if (   comMedium.isOk()
-        && strFileName != location())
-    {
-        /* Prepare move storage progress: */
-        CProgress comProgress = comMedium.MoveTo(strFileName);
-
-        /* Show error message if necessary: */
-        if (!comMedium.isOk())
-        {
-            msgCenter().cannotMoveMediumStorage(comMedium, location(),
-                                                strFileName, treeWidget());
-            /* Negative if failed: */
-            return false;
-        }
-        else
-        {
-            /* Show move storage progress: */
-            msgCenter().showModalProgressDialog(comProgress, tr("Moving medium ..."),
-                                                ":/progress_media_move_90px.png", treeWidget());
-
-            /* Show error message if necessary: */
-            if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-            {
-                msgCenter().cannotMoveMediumStorage(comProgress, location(),
-                                                    strFileName, treeWidget());
-                /* Negative if failed: */
-                return false;
-            }
-        }
-    }
-
-    /* Recache item: */
-    refreshAll();
+    /* Assign new medium location: */
+    UINotificationProgressMediumMove *pNotification = new UINotificationProgressMediumMove(comMedium,
+                                                                                           location(),
+                                                                                           strFileName);
+    connect(pNotification, &UINotificationProgressMediumMove::sigProgressFinished,
+            this, &UIMediumItem::sltHandleMoveProgressFinished);
+    notificationCenter().append(pNotification);
 
     /* Positive: */
@@ -262 +236 @@
 }
 
+void UIMediumItem::sltHandleMoveProgressFinished()
+{
+    /* Recache item: */
+    refreshAll();
+}
+
 void UIMediumItem::refresh()
 {

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

@@ -119 +119 @@
     /** Returns default text. */
     virtual QString defaultText() const /* override */;
+
+protected slots:
+
+    /** Handles medium move progress result. */
+    void sltHandleMoveProgressFinished();
 
 private:

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

@@ -28 +28 @@
 /* GUI includes: */
 #include "UILibraryDefs.h"
+#include "UINotificationObjects.h"
 
 /* Forward declarations: */