Changeset 83011 in vbox for trunk

Timestamp:

Feb 6, 2020 6:07:29 PM (5 years ago)

Author:

vboxsync

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

136029

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Actions validation for cloud VM groups and items; Everything is restricted for now.

Location:

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

Files:

• UIVirtualBoxManager.cpp (modified) (12 diffs)
• UIVirtualBoxManager.h (modified) (1 diff)

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

@@ -1709 +1709 @@
 
     /* Enable/disable group actions: */
+    actionPool()->action(UIActionIndexST_M_Group_S_New)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_S_New, items));
+    actionPool()->action(UIActionIndexST_M_Group_S_Add)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_S_Add, items));
     actionPool()->action(UIActionIndexST_M_Group_S_Rename)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_S_Rename, items));
     actionPool()->action(UIActionIndexST_M_Group_S_Remove)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_S_Remove, items));
@@ -1721 +1723 @@
 
     /* Enable/disable machine actions: */
+    actionPool()->action(UIActionIndexST_M_Machine_S_New)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_New, items));
+    actionPool()->action(UIActionIndexST_M_Machine_S_Add)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_Add, items));
     actionPool()->action(UIActionIndexST_M_Machine_S_Settings)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_Settings, items));
     actionPool()->action(UIActionIndexST_M_Machine_S_Clone)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_Clone, items));
@@ -1862 +1866 @@
     switch (iActionIndex)
     {
+        case UIActionIndexST_M_Group_S_New:
+        case UIActionIndexST_M_Group_S_Add:
+        case UIActionIndexST_M_Group_S_Sort:
+        {
+            return !isGroupSavingInProgress() &&
+                   isSingleGroupSelected() &&
+                   isItemsLocal(items);
+        }
         case UIActionIndexST_M_Group_S_Rename:
         case UIActionIndexST_M_Group_S_Remove:
         {
             return !isGroupSavingInProgress() &&
+                   isSingleGroupSelected() &&
+                   isItemsLocal(items) &&
                    isItemsPoweredOff(items);
         }
-        case UIActionIndexST_M_Group_S_Sort:
+        case UIActionIndexST_M_Machine_S_New:
+        case UIActionIndexST_M_Machine_S_Add:
         {
             return !isGroupSavingInProgress() &&
-                   isSingleGroupSelected();
+                   isItemsLocal(items);
         }
         case UIActionIndexST_M_Machine_S_Settings:
@@ -1878 +1893 @@
                    !isGroupSavingInProgress() &&
                    items.size() == 1 &&
+                   pItem->toLocal() &&
                    pItem->configurationAccessLevel() != ConfigurationAccessLevel_Null &&
                    (m_pWidget->currentMachineTool() != UIToolType_Snapshots ||
@@ -1887 +1903 @@
             return !isGroupSavingInProgress() &&
                    items.size() == 1 &&
+                   pItem->toLocal() &&
                    pItem->isItemEditable();
         }
@@ -1892 +1909 @@
         {
             return !actionPool()->action(iActionIndex)->property("opened").toBool() &&
-                   items.size() == 1;
+                   items.size() == 1 &&
+                   pItem->toLocal();
         }
         case UIActionIndexST_M_Machine_S_Remove:
         {
             return !isGroupSavingInProgress() &&
-                   isAtLeastOneItemRemovable(items);
+                   isAtLeastOneItemRemovable(items) &&
+                   isItemsLocal(items);
         }
         case UIActionIndexST_M_Machine_S_AddGroup:
@@ -1903 +1922 @@
             return !isGroupSavingInProgress() &&
                    !isAllItemsOfOneGroupSelected() &&
+                   isItemsLocal(items) &&
                    isItemsPoweredOff(items);
         }
@@ -1930 +1950 @@
         case UIActionIndexST_M_Machine_S_ShowLogDialog:
         {
-            return isAtLeastOneItemAccessible(items);
+            return isItemsLocal(items) &&
+                   isAtLeastOneItemAccessible(items);
         }
         case UIActionIndexST_M_Group_T_Pause:
         case UIActionIndexST_M_Machine_T_Pause:
         {
-            return isAtLeastOneItemStarted(items);
+            return isItemsLocal(items) &&
+                   isAtLeastOneItemStarted(items);
         }
         case UIActionIndexST_M_Group_S_Reset:
         case UIActionIndexST_M_Machine_S_Reset:
         {
-            return isAtLeastOneItemRunning(items);
+            return isItemsLocal(items) &&
+                   isAtLeastOneItemRunning(items);
         }
         case UIActionIndexST_M_Group_S_Refresh:
         case UIActionIndexST_M_Machine_S_Refresh:
         {
-            return isAtLeastOneItemInaccessible(items);
+            return isItemsLocal(items) &&
+                   isAtLeastOneItemInaccessible(items);
         }
         case UIActionIndexST_M_Group_S_ShowInFileManager:
         case UIActionIndexST_M_Machine_S_ShowInFileManager:
         {
-            return isAtLeastOneItemAccessible(items);
+            return isItemsLocal(items) &&
+                   isAtLeastOneItemAccessible(items);
         }
         case UIActionIndexST_M_Machine_S_SortParent:
         {
-            return !isGroupSavingInProgress();
+            return !isGroupSavingInProgress() &&
+                   isItemsLocal(items);
         }
         case UIActionIndexST_M_Group_S_CreateShortcut:
@@ -1964 +1990 @@
         case UIActionIndexST_M_Machine_M_Close:
         {
-            return isAtLeastOneItemStarted(items);
+            return isItemsLocal(items) &&
+                   isAtLeastOneItemStarted(items);
         }
         case UIActionIndexST_M_Group_M_Close_S_Detach:
         case UIActionIndexST_M_Machine_M_Close_S_Detach:
         {
-            return isActionEnabled(UIActionIndexST_M_Machine_M_Close, items);
+            return isItemsLocal(items) &&
+                   isActionEnabled(UIActionIndexST_M_Machine_M_Close, items);
         }
         case UIActionIndexST_M_Group_M_Close_S_SaveState:
         case UIActionIndexST_M_Machine_M_Close_S_SaveState:
         {
-            return isActionEnabled(UIActionIndexST_M_Machine_M_Close, items);
+            return isItemsLocal(items) &&
+                   isActionEnabled(UIActionIndexST_M_Machine_M_Close, items);
         }
         case UIActionIndexST_M_Group_M_Close_S_Shutdown:
         case UIActionIndexST_M_Machine_M_Close_S_Shutdown:
         {
-            return isActionEnabled(UIActionIndexST_M_Machine_M_Close, items) &&
+            return isItemsLocal(items) &&
+                   isActionEnabled(UIActionIndexST_M_Machine_M_Close, items) &&
                    isAtLeastOneItemAbleToShutdown(items);
         }
@@ -1985 +2015 @@
         case UIActionIndexST_M_Machine_M_Close_S_PowerOff:
         {
-            return isActionEnabled(UIActionIndexST_M_Machine_M_Close, items);
+            return isItemsLocal(items) &&
+                   isActionEnabled(UIActionIndexST_M_Machine_M_Close, items);
         }
         default:
@@ -1993 +2024 @@
     /* Unknown actions are disabled: */
     return false;
+}
+
+/* static */
+bool UIVirtualBoxManager::isItemsLocal(const QList<UIVirtualMachineItem*> &items)
+{
+    foreach (UIVirtualMachineItem *pItem, items)
+        if (!pItem->toLocal())
+            return false;
+    return true;
 }
 
@@ -2043 +2083 @@
     {
         if (   pItem->accessible()
+            && pItem->toLocal()
 #ifdef VBOX_WS_MAC
             /* On Mac OS X this are real alias files, which don't work with the old legacy xml files. */
-            && pItem->toLocal()
             && pItem->toLocal()->settingsFile().endsWith(".vbox", Qt::CaseInsensitive)
 #endif

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

@@ -313 +313 @@
         bool isActionEnabled(int iActionIndex, const QList<UIVirtualMachineItem*> &items);
 
+        /** Returns whether all passed @a items are local. */
+        static bool isItemsLocal(const QList<UIVirtualMachineItem*> &items);
         /** Returns whether all passed @a items are powered off. */
         static bool isItemsPoweredOff(const QList<UIVirtualMachineItem*> &items);