Changeset 83268 in vbox

Timestamp:

Mar 11, 2020 8:31:25 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Implement refresh for inaccessible cloud VMs; Make sure cloud VM which became accessible again show details-pane if error-pane was previously reflected.

Location:

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

Files:

• UIVirtualBoxManager.cpp (modified) (1 diff)
• UIVirtualBoxManagerWidget.cpp (modified) (1 diff)
• chooser/UIChooserModel.cpp (modified) (2 diffs)

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

@@ -1991 +1991 @@
         case UIActionIndexST_M_Machine_S_Refresh:
         {
-            return isItemsLocal(items) &&
-                   isAtLeastOneItemInaccessible(items);
+            return isAtLeastOneItemInaccessible(items);
         }
         case UIActionIndexST_M_Group_S_ShowInFileManager:

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

@@ -292 +292 @@
     if (fCurrentItemIsOk)
     {
+        /* If Error-pane is chosen currently => open tool currently chosen in Tools-pane: */
+        if (m_pPaneToolsMachine->currentTool() == UIToolType_Error)
+            sltHandleToolsPaneIndexChange();
+
         /* If we still have same item selected: */
         if (pItem && pItem->id() == strId)

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

@@ -45 +45 @@
 #include "UITask.h"
 #include "UIVirtualBoxManagerWidget.h"
-#include "UIVirtualMachineItem.h"
+#include "UIVirtualMachineItemCloud.h"
 #include "UIWizardNewCloudVM.h"
 #include "UIWizardNewVM.h"
@@ -1019 +1019 @@
     foreach (UIChooserItemMachine *pItem, inaccessibleMachineItemList)
     {
-        /* Recache: */
-        pItem->recache();
-        /* Become accessible? */
-        if (pItem->accessible())
-        {
-            /* Machine name: */
-            const QString strMachineName = ((UIChooserItem*)pItem)->name();
-            /* We should reload this machine: */
-            sltReloadMachine(pItem->id());
-            /* Select first of reloaded items: */
-            if (!pSelectedItem)
-                pSelectedItem = root()->searchForItem(strMachineName,
-                                                      UIChooserItemSearchFlag_Machine |
-                                                      UIChooserItemSearchFlag_ExactName);
+        switch (pItem->node()->toMachineNode()->cache()->itemType())
+        {
+            case UIVirtualMachineItem::ItemType_Local:
+            {
+                /* Recache: */
+                pItem->recache();
+
+                /* Become accessible? */
+                if (pItem->accessible())
+                {
+                    /* Machine name: */
+                    const QString strMachineName = ((UIChooserItem*)pItem)->name();
+                    /* We should reload this machine: */
+                    sltReloadMachine(pItem->id());
+                    /* Select first of reloaded items: */
+                    if (!pSelectedItem)
+                        pSelectedItem = root()->searchForItem(strMachineName,
+                                                              UIChooserItemSearchFlag_Machine |
+                                                              UIChooserItemSearchFlag_ExactName);
+                }
+
+                break;
+            }
+            case UIVirtualMachineItem::ItemType_CloudReal:
+            {
+                /* Much more simple than for local items, we are not reloading them, just refreshing: */
+                pItem->node()->toMachineNode()->cache()->toCloud()->updateInfoAsync(false /* delayed */);
+
+                break;
+            }
+            default:
+                break;
         }
     }