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

Timestamp:

May 7, 2020 11:24:05 AM (5 years ago)

Author:

vboxsync

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

137791

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Implementing possibility to remove cloud VM with all the internal stuff like instance and boot volume for good.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (2 diffs)
• globals/UIMessageCenter.h (modified) (1 diff)
• manager/chooser/UIChooserModel.cpp (modified) (4 diffs)

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

@@ -753 +753 @@
 }
 
-bool UIMessageCenter::confirmCloudMachineRemoval(const QList<CCloudMachine> &machines) const
+int UIMessageCenter::confirmCloudMachineRemoval(const QList<CCloudMachine> &machines) const
 {
     /* Enumerate the machines: */
@@ -766 +766 @@
     /* Prepare message text: */
     QString strText = tr("<p>You are about to remove following cloud virtual machines from the machine list:</p>"
-                         "<p>%1</p>")
+                         "<p>%1</p>"
+                         "<p>Would you like to delete the instances and boot volumes of these machines as well?</p>")
                          .arg(machineNames.join(", "));
 
     /* Prepare message itself: */
-    return questionBinary(0, MessageType_Question,
-                          strText,
-                          0 /* auto-confirm id */,
-                          tr("Remove"));
+    return message(0, MessageType_Question,
+                   strText, QString(),
+                   0 /* auto-confirm id */,
+                   AlertButton_Choice1,
+                   AlertButton_Choice2,
+                   AlertButton_Cancel | AlertButtonOption_Default | AlertButtonOption_Escape,
+                   tr("Delete everything"),
+                   tr("Remove only"));
 }
 

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

@@ -274 +274 @@
     bool confirmMachineItemRemoval(const QStringList &names) const;
     int confirmMachineRemoval(const QList<CMachine> &machines) const;
-    bool confirmCloudMachineRemoval(const QList<CCloudMachine> &machines) const;
+    int confirmCloudMachineRemoval(const QList<CCloudMachine> &machines) const;
     void cannotRemoveMachine(const CMachine &machine) const;
     void cannotRemoveMachine(const CMachine &machine, const CProgress &progress) const;

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -1652 +1652 @@
 {
     /* Confirm machine removal: */
-    int iResultCode = msgCenter().confirmMachineRemoval(machines);
+    const int iResultCode = msgCenter().confirmMachineRemoval(machines);
     if (iResultCode == AlertButton_Cancel)
         return;
@@ -1708 +1708 @@
 {
     /* Confirm machine removal: */
-    if (!msgCenter().confirmCloudMachineRemoval(machines))
+    const int iResultCode = msgCenter().confirmCloudMachineRemoval(machines);
+    if (iResultCode == AlertButton_Cancel)
         return;
 
@@ -1724 +1725 @@
             continue;
         }
+
+        CProgress comProgress;
+        /* Prepare remove progress: */
+        if (iResultCode == AlertButton_Choice1)
+            comProgress = comMachine.Remove();
         /* Prepare unregister progress: */
-        CProgress comProgress = comMachine.Unregister();
+        else if (iResultCode == AlertButton_Choice2)
+            comProgress = comMachine.Unregister();
         if (!comMachine.isOk())
         {
@@ -1731 +1738 @@
             continue;
         }
+
         /* And show unregister progress finally: */
         msgCenter().showModalProgressDialog(comProgress, comMachine.GetName(), ":/progress_delete_90px.png");