Changeset 107284 in vbox

Timestamp:

Dec 11, 2024 11:06:49 AM (5 weeks ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10814: VBox Manager: More cleanup for VBox Manager widget.

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

@@ -399 +399 @@
 }
 
-void UIVirtualBoxManagerWidget::sltHandleStateChange(const QUuid &uId)
+void UIVirtualBoxManagerWidget::sltHandleMachineStateChange(const QUuid &uId)
 {
     // WORKAROUND:
@@ -503 +503 @@
     recacheCurrentMachineItemInformation();
 
-    /* Calculate new selection type: */
+    /* Calculate new selection type and item accessibility status: */
     const SelectionType enmSelectedItemType = selectionType();
-    /* Calculate new item accessibility status: */
     const bool fCurrentItemIsOk = isItemAccessible();
 
@@ -557 +556 @@
 {
     /* Not for global items: */
-    if (!isGlobalItemSelected())
-    {
-        /* Acquire current item: */
-        UIVirtualMachineItem *pItem = currentItem();
-        const bool fCurrentItemIsOk = isItemAccessible(pItem);
-
-        /* If current item is Ok: */
-        if (fCurrentItemIsOk)
+    if (isGlobalItemSelected())
+        return;
+
+    /* Acquire current item: */
+    UIVirtualMachineItem *pItem = currentItem();
+    const bool fCurrentItemIsOk = isItemAccessible(pItem);
+
+    /* If current item is Ok: */
+    if (fCurrentItemIsOk)
+    {
+        /* If Error-pane is chosen currently => switch to tool currently chosen in Tools-menu: */
+        if (m_pPaneToolsMachine->currentTool() == UIToolType_Error)
+            switchMachineToolTo(m_pMenuToolsMachine->toolsType());
+
+        /* If we still have same item selected: */
+        if (pItem && pItem->id() == uId)
         {
-            /* If Error-pane is chosen currently => switch to tool currently chosen in Tools-menu: */
-            if (m_pPaneToolsMachine->currentTool() == UIToolType_Error)
-                switchMachineToolTo(m_pMenuToolsMachine->toolsType());
-
-            /* If we still have same item selected: */
-            if (pItem && pItem->id() == uId)
-            {
-                /* Propagate current items to update the Details-pane: */
-                m_pPaneToolsMachine->setItems(currentItems());
-            }
+            /* Propagate current items to update the Details-pane: */
+            m_pPaneToolsMachine->setItems(currentItems());
         }
-        else
+    }
+    else
+    {
+        /* Make sure Error pane raised: */
+        if (m_pPaneToolsMachine->currentTool() != UIToolType_Error)
+            m_pPaneToolsMachine->openTool(UIToolType_Error);
+
+        /* If we still have same item selected: */
+        if (pItem && pItem->id() == uId)
         {
-            /* Make sure Error pane raised: */
-            if (m_pPaneToolsMachine->currentTool() != UIToolType_Error)
-                m_pPaneToolsMachine->openTool(UIToolType_Error);
-
-            /* If we still have same item selected: */
-            if (pItem && pItem->id() == uId)
-            {
-                /* Propagate current items to update the Details-pane (in any case): */
-                m_pPaneToolsMachine->setItems(currentItems());
-                /* Propagate last access error to update the Error-pane (if machine selected but inaccessible): */
-                m_pPaneToolsMachine->setErrorDetails(pItem->accessError());
-            }
+            /* Propagate current items to update the Details-pane (in any case): */
+            m_pPaneToolsMachine->setItems(currentItems());
+            /* Propagate last access error to update the Error-pane (if machine selected but inaccessible): */
+            m_pPaneToolsMachine->setErrorDetails(pItem->accessError());
         }
-
-        /* Pass the signal further: */
-        emit sigCloudMachineStateChange(uId);
-    }
+    }
+
+    /* Pass the signal further: */
+    emit sigCloudMachineStateChange(uId);
 }
 
@@ -828 +827 @@
     /* Global VBox event handlers: */
     connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineStateChange,
-            this, &UIVirtualBoxManagerWidget::sltHandleStateChange);
+            this, &UIVirtualBoxManagerWidget::sltHandleMachineStateChange);
 
     /* Global VBox extra-data event handlers: */

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

@@ -281 +281 @@
       * @{ */
         /** Handles CVirtualBox event about state change for machine with @a uId. */
-        void sltHandleStateChange(const QUuid &uId);
+        void sltHandleMachineStateChange(const QUuid &uId);
     /** @} */
 
@@ -364 +364 @@
     /** @} */
 
-    /** @name Common stuff.
+    /** @name Tools stuff.
       * @{ */
         /** Recaches current machine item information.
           * @param  fDontRaiseErrorPane  Brings whether we should not raise error-pane. */
         void recacheCurrentMachineItemInformation(bool fDontRaiseErrorPane = false);
-    /** @} */
-
-    /** @name Tools stuff.
-      * @{ */
+
         /** Updates Global tools menu. */
         void updateToolsMenuGlobal();