Changeset 102422 in vbox

Timestamp:

Dec 1, 2023 2:17:26 PM (16 months ago)

Author:

vboxsync

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

160565

Message:

FE/Qt: bugref:10513: VBox Manager / Tools pane: Make sure machine item info is fetched only if machine is Ok, i.e. accessible; Otherwise fetch last access error only.

Location:

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

Files:

• UIVirtualBoxManagerWidget.cpp (modified) (4 diffs)
• UIVirtualBoxManagerWidget.h (modified) (2 diffs)

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

@@ -370 +370 @@
     }
 
-    /* Recache current item info if machine or group item selected: */
-    if (isMachineItemSelected() || isGroupItemSelected())
-        recacheCurrentItemInformation();
+    /* Recache current machine item information: */
+    recacheCurrentMachineItemInformation();
 }
 
@@ -454 +453 @@
         updateToolsMenuGlobal();
 
-    /* Recache current item info if machine or group item selected: */
-    if (isMachineItemSelected() || isGroupItemSelected())
-        recacheCurrentItemInformation();
+    /* Recache current machine item information: */
+    recacheCurrentMachineItemInformation();
 
     /* Calculate selection type: */
@@ -1167 +1165 @@
 }
 
-void UIVirtualBoxManagerWidget::recacheCurrentItemInformation(bool fDontRaiseErrorPane /* = false */)
-{
+void UIVirtualBoxManagerWidget::recacheCurrentMachineItemInformation(bool fDontRaiseErrorPane /* = false */)
+{
+    /* Sanity check, this method is for machine or group of machine items: */
+    if (!isMachineItemSelected() && !isGroupItemSelected())
+        return;
+
     /* Get current item: */
     UIVirtualMachineItem *pItem = currentItem();
@@ -1179 +1181 @@
         if (m_pPaneToolsMachine->currentTool() == UIToolType_Error)
             sltHandleToolsPaneIndexChange();
-    }
-    else
-    {
-        /* If we were not asked separately: */
-        if (!fDontRaiseErrorPane)
-        {
-            /* Make sure Error pane raised: */
+
+        /* Propagate current items to the Tools pane: */
+        m_pPaneToolsMachine->setItems(currentItems());
+    }
+    /* Otherwise if we were not asked separately to calm down: */
+    else if (!fDontRaiseErrorPane)
+    {
+        /* Make sure Error pane raised: */
+        if (m_pPaneToolsMachine->currentTool() != UIToolType_Error)
             m_pPaneToolsMachine->openTool(UIToolType_Error);
 
-            /* Propagate last access error to update the Error-pane (if machine selected but inaccessible): */
-            if (pItem)
-                m_pPaneToolsMachine->setErrorDetails(pItem->accessError());
-        }
-    }
-
-    /* Propagate current items to update the Details-pane: */
-    m_pPaneToolsMachine->setItems(currentItems());
-}
+        /* Propagate last access error to the Error-pane: */
+        if (pItem)
+            m_pPaneToolsMachine->setErrorDetails(pItem->accessError());
+    }
+}

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

@@ -303 +303 @@
 
         /** Handles signal about Chooser-pane selection invalidated. */
-        void sltHandleChooserPaneSelectionInvalidated() { recacheCurrentItemInformation(true /* fDontRaiseErrorPane */); }
+        void sltHandleChooserPaneSelectionInvalidated() { recacheCurrentMachineItemInformation(true /* fDontRaiseErrorPane */); }
 
         /** Handles sliding animation complete signal.
@@ -358 +358 @@
         void updateToolsMenuMachine(UIVirtualMachineItem *pItem);
 
-        /** Recaches current item information.
+        /** Recaches current machine item information.
           * @param  fDontRaiseErrorPane  Brings whether we should not raise error-pane. */
-        void recacheCurrentItemInformation(bool fDontRaiseErrorPane = false);
+        void recacheCurrentMachineItemInformation(bool fDontRaiseErrorPane = false);
     /** @} */