Changeset 84084 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 29, 2020 2:15:52 PM (5 years ago)

Author:

vboxsync

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

137666

Message:

FE/Qt: bugref:9729: VirtualBox Manager: Make sure main toolbar is updated when switching between chooser item types and accessible/inaccessible items.

Location:

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

Files:

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

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

@@ -50 +50 @@
     , m_pSlidingAnimation(0)
     , m_pPaneTools(0)
-    , m_fSingleGroupSelected(false)
+    , m_enmSelectionType(SelectionType_Invalid)
+    , m_fSelectedMachineItemAccessible(false)
 {
     prepare();
@@ -257 +258 @@
     }
 
-    /* If that was machine or group item selected: */
+    /* Recache current item info if machine or group item selected: */
     if (isMachineItemSelected() || isGroupItemSelected())
-    {
-        /* Recache current item info: */
         recacheCurrentItemInformation();
 
-        /* Update toolbar if we are switching beween single group item and rest of possible items: */
-        if (m_fSingleGroupSelected != isSingleGroupSelected())
-            updateToolbar();
-    }
-
-    /* Remember whether single group item was selected: */
-    m_fSingleGroupSelected = isSingleGroupSelected();
+    /* Calculate selection type: */
+    const SelectionType enmSelectedItemType = isSingleGroupSelected()
+                                            ? SelectionType_SingleGroupItem
+                                            : isGlobalItemSelected()
+                                            ? SelectionType_FirstIsGlobalItem
+                                            : isMachineItemSelected()
+                                            ? SelectionType_FirstIsMachineItem
+                                            : SelectionType_Invalid;
+    /* Acquire current item: */
+    UIVirtualMachineItem *pItem = currentItem();
+    const bool fCurrentItemIsOk = pItem && pItem->accessible();
+
+    /* Update toolbar if selection type or item accessibility got changed: */
+    if (   m_enmSelectionType != enmSelectedItemType
+        || m_fSelectedMachineItemAccessible != fCurrentItemIsOk)
+        updateToolbar();
+
+    /* Remember the last selection type: */
+    m_enmSelectionType = enmSelectedItemType;
+    /* Remember whether the last selected item was accessible: */
+    m_fSelectedMachineItemAccessible = fCurrentItemIsOk;
 }
 

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

@@ -46 +46 @@
 {
     Q_OBJECT;
+
+    /** Possible selection types. */
+    enum SelectionType
+    {
+        SelectionType_Invalid,
+        SelectionType_SingleGroupItem,
+        SelectionType_FirstIsGlobalItem,
+        SelectionType_FirstIsMachineItem
+    };
 
 signals:
@@ -226 +235 @@
     UITools            *m_pPaneTools;
 
-    /** Holds whether last time single group item was selected exclusively. */
-    bool  m_fSingleGroupSelected;
+    /** Holds the last selection type. */
+    SelectionType  m_enmSelectionType;
+    /** Holds whether the last selected item was accessible. */
+    bool           m_fSelectedMachineItemAccessible;
 };