Changeset 107275 in vbox for trunk

Timestamp:

Dec 10, 2024 11:07:35 AM (5 months ago)

Author:

vboxsync

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

166296

Message:

FE/Qt: bugref:10814: VBox Manager: Small cleanup for VBox Manager widget code related to selected item handling.

Location:

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

Files:

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

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

@@ -112 +112 @@
 }
 
+bool UIVirtualBoxManagerWidget::isItemAccessible(UIVirtualMachineItem *pItem /* = 0 */) const
+{
+    if (!pItem)
+        pItem = currentItem();
+    return pItem && pItem->accessible();
+}
+
 bool UIVirtualBoxManagerWidget::isGroupItemSelected() const
 {
@@ -160 +167 @@
 {
     return m_pPaneChooser->isAllItemsOfOneGroupSelected();
+}
+
+UIVirtualBoxManagerWidget::SelectionType UIVirtualBoxManagerWidget::selectionType() const
+{
+    return   isSingleLocalGroupSelected()
+           ? SelectionType_SingleLocalGroupItem
+           : isSingleCloudProviderGroupSelected() || isSingleCloudProfileGroupSelected()
+           ? SelectionType_SingleCloudGroupItem
+           : isGlobalItemSelected()
+           ? SelectionType_FirstIsGlobalItem
+           : isLocalMachineItemSelected()
+           ? SelectionType_FirstIsLocalMachineItem
+           : isCloudMachineItemSelected()
+           ? SelectionType_FirstIsCloudMachineItem
+           : SelectionType_Invalid;
 }
 
@@ -476 +498 @@
     recacheCurrentMachineItemInformation();
 
-    /* Calculate selection type: */
-    const SelectionType enmSelectedItemType = isSingleLocalGroupSelected()
-                                            ? SelectionType_SingleLocalGroupItem
-                                            : isSingleCloudProviderGroupSelected() || isSingleCloudProfileGroupSelected()
-                                            ? SelectionType_SingleCloudGroupItem
-                                            : isGlobalItemSelected()
-                                            ? SelectionType_FirstIsGlobalItem
-                                            : isLocalMachineItemSelected()
-                                            ? SelectionType_FirstIsLocalMachineItem
-                                            : isCloudMachineItemSelected()
-                                            ? SelectionType_FirstIsCloudMachineItem
-                                            : SelectionType_Invalid;
-
-    /* Update toolbar if selection type or item accessibility got changed: */
-    const bool fCurrentItemIsOk = pItem && pItem->accessible();
+    /* Calculate new selection type: */
+    const SelectionType enmSelectedItemType = selectionType();
+    /* Calculate new item accessibility status: */
+    const bool fCurrentItemIsOk = isItemAccessible();
+
+    /* Update toolbar if selection type or item accessibility status got changed: */
     if (   m_enmSelectionType != enmSelectedItemType
         || m_fSelectedMachineItemAccessible != fCurrentItemIsOk)
         updateToolbar();
 
-    /* Remember the last selection type: */
+    /* Remember selection type and item accessibility status: */
     m_enmSelectionType = enmSelectedItemType;
-    /* Remember whether the last selected item was accessible: */
     m_fSelectedMachineItemAccessible = fCurrentItemIsOk;
 }
@@ -544 +556 @@
         /* Acquire current item: */
         UIVirtualMachineItem *pItem = currentItem();
-        const bool fCurrentItemIsOk = pItem && pItem->accessible();
+        const bool fCurrentItemIsOk = isItemAccessible(pItem);
 
         /* If current item is Ok: */
@@ -1139 +1151 @@
     /* Get current item: */
     UIVirtualMachineItem *pItem = currentItem();
-    const bool fCurrentItemIsOk = pItem && pItem->accessible();
+    const bool fCurrentItemIsOk = isItemAccessible(pItem);
 
     /* If current item is Ok: */
@@ -1185 +1197 @@
 {
     /* Get current item state: */
-    const bool fCurrentItemIsOk = pItem && pItem->accessible();
+    const bool fCurrentItemIsOk = isItemAccessible(pItem);
 
     /* Update machine tools restrictions: */

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

@@ -155 +155 @@
         QList<UIVirtualMachineItem*> currentItems() const;
 
+        /** Returns whether passed @a pItem accessible, by default it's the current one. */
+        bool isItemAccessible(UIVirtualMachineItem *pItem = 0) const;
+
         /** Returns whether group item is selected. */
         bool isGroupItemSelected() const;
@@ -176 +179 @@
         /** Returns whether all items of one group are selected. */
         bool isAllItemsOfOneGroupSelected() const;
+
+        /** Returns current selection type. */
+        SelectionType selectionType() const;
 
         /** Returns full name of currently selected group. */