Changeset 90758 in vbox

Timestamp:

Aug 20, 2021 11:28:08 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: VirtualBox Manager / Details pane: Extend UIMachineAttributeSetter with separate stuff for async machine moving.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMachineAttributeSetter.cpp (modified) (3 diffs)
• globals/UIMachineAttributeSetter.h (modified) (2 diffs)
• manager/details/UIDetailsElement.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMachineAttributeSetter.cpp

@@ -24 +24 @@
 #include "UIMachineAttributeSetter.h"
 #include "UIMessageCenter.h"
+#include "UINotificationCenter.h"
 
 /* COM includes: */
@@ -102 +103 @@
                 break;
             }
-            case MachineAttribute_Location:
-            {
-                /* Do not save machine settings: */
-                fSaveSettings = false;
-                /* Prepare machine move progress: */
-                CProgress comProgress = comMachine.MoveTo(guiAttribute.toString(), "basic");
-                if (!comMachine.isOk())
-                {
-                    msgCenter().cannotMoveMachine(comMachine);
-                    fErrorHappened = true;
-                    break;
-                }
-                /* Show machine move progress: */
-                msgCenter().showModalProgressDialog(comProgress, comMachine.GetName(), ":/progress_dnd_hg_90px.png");
-                if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-                {
-                    msgCenter().cannotMoveMachine(comProgress, comMachine.GetName());
-                    fErrorHappened = true;
-                    break;
-                }
-                break;
-            }
             case MachineAttribute_OSType:
             {
@@ -321 +300 @@
         comSession.UnlockMachine();
 }
+
+void UIMachineAttributeSetter::setMachineLocation(const QUuid &uMachineId,
+                                                  const QString &strLocation)
+{
+    /* Move machine: */
+    UINotificationProgressMachineMove *pNotification = new UINotificationProgressMachineMove(uMachineId,
+                                                                                             strLocation,
+                                                                                             "basic");
+    gpNotificationCenter->append(pNotification);
+}

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMachineAttributeSetter.h

@@ -32 +32 @@
     MachineAttribute_Name,
     MachineAttribute_OSType,
-    MachineAttribute_Location,
     MachineAttribute_BaseMemory,
     MachineAttribute_BootOrder,
@@ -73 +72 @@
                                                   const MachineAttribute &enmType,
                                                   const QVariant &guiAttribute);
+
+    /** Assigns @a comMachine @a strLocation. */
+    SHARED_LIBRARY_STUFF void setMachineLocation(const QUuid &uMachineId,
+                                                 const QString &strLocation);
 }
 using namespace UIMachineAttributeSetter /* if header included */;

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp

@@ -908 +908 @@
             if (fChooseName)
                 setMachineAttribute(machine(), MachineAttribute_Name, QVariant::fromValue(pEditor->name()));
-            else if (fChoosePath)
-                setMachineAttribute(machine(), MachineAttribute_Location, QVariant::fromValue(pEditor->path()));
             else if (fChooseType)
                 setMachineAttribute(machine(), MachineAttribute_OSType, QVariant::fromValue(pEditor->typeId()));
+            else if (fChoosePath)
+                setMachineLocation(machine().GetId(), pEditor->path());
         }