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

Timestamp:

Apr 30, 2020 1:20:34 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: More clever check for whether item is removable; No remove for fake cloud VM item.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager

Files:

• UIVirtualBoxManager.cpp (modified) (1 diff)
• UIVirtualMachineItem.h (modified) (1 diff)
• UIVirtualMachineItemCloud.cpp (modified) (1 diff)
• UIVirtualMachineItemCloud.h (modified) (1 diff)
• UIVirtualMachineItemLocal.cpp (modified) (1 diff)
• UIVirtualMachineItemLocal.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -2240 +2240 @@
 {
     foreach (UIVirtualMachineItem *pItem, items)
-        if (!pItem->accessible() || pItem->isItemEditable())
+        if (pItem->isItemRemovable())
             return true;
     return false;

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItem.h

@@ -120 +120 @@
         /** Returns whether this item is editable. */
         virtual bool isItemEditable() const = 0;
+        /** Returns whether this item is removable. */
+        virtual bool isItemRemovable() const = 0;
         /** Returns whether this item is saved. */
         virtual bool isItemSaved() const = 0;

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItemCloud.cpp

@@ -175 +175 @@
 }
 
+bool UIVirtualMachineItemCloud::isItemRemovable() const
+{
+    return    accessible()
+           && itemType() == UIVirtualMachineItemType_CloudReal;
+}
+
 bool UIVirtualMachineItemCloud::isItemSaved() const
 {

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItemCloud.h

@@ -85 +85 @@
         /** Returns whether this item is editable. */
         virtual bool isItemEditable() const /* override */;
+        /** Returns whether this item is removable. */
+        virtual bool isItemRemovable() const /* override */;
         /** Returns whether this item is saved. */
         virtual bool isItemSaved() const /* override */;

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItemLocal.cpp

@@ -215 +215 @@
 }
 
+bool UIVirtualMachineItemLocal::isItemRemovable() const
+{
+    return    !accessible()
+           || sessionState() == KSessionState_Unlocked;
+}
+
 bool UIVirtualMachineItemLocal::isItemSaved() const
 {

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItemLocal.h

@@ -92 +92 @@
         /** Returns whether this item is editable. */
         virtual bool isItemEditable() const /* override */;
+        /** Returns whether this item is removable. */
+        virtual bool isItemRemovable() const /* override */;
         /** Returns whether this item is saved. */
         virtual bool isItemSaved() const /* override */;