Changeset 74559 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 1, 2018 4:46:39 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager: Few fixes for Machine/Group actions availability validation.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp (modified) (4 diffs)

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

@@ -473 +473 @@
     /* Get selected items: */
     QList<UIVirtualMachineItem*> items = currentItems();
-    AssertMsgReturnVoid(!items.isEmpty(), ("At least one item should be selected!\n"));
 
     /* Populate the list of VM names: */
@@ -1988 +1987 @@
     /* Determine whether Machine or Group menu should be shown at all: */
     const bool fGlobalMenuShown = m_pWidget->isGlobalItemSelected();
-    const bool fMachineOrGroupMenuShown = m_pWidget->isMachineItemSelected() || m_pWidget->isGroupItemSelected();
     const bool fMachineMenuShown = !isSingleGroupSelected();
-    m_pMachineMenuAction->setVisible(fMachineOrGroupMenuShown && fMachineMenuShown);
-    m_pGroupMenuAction->setVisible(fMachineOrGroupMenuShown && !fMachineMenuShown);
+    m_pMachineMenuAction->setVisible(fMachineMenuShown);
+    m_pGroupMenuAction->setVisible(!fMachineMenuShown);
 
     /* Determine whether Media actions should be visible: */
@@ -2004 +2002 @@
 
     /* Determine whether Snapshots actions should be visible: */
-    const bool fSnapshotMenuShown = fMachineOrGroupMenuShown && m_pWidget->currentMachineTool() == ToolTypeMachine_Snapshots;
+    const bool fSnapshotMenuShown = m_pWidget->currentMachineTool() == ToolTypeMachine_Snapshots;
     m_pSnapshotMenuAction->setVisible(fSnapshotMenuShown);
 
     /* Determine whether Logs actions should be visible: */
-    const bool fLogViewerMenuShown = fMachineOrGroupMenuShown && m_pWidget->currentMachineTool() == ToolTypeMachine_Logs;
+    const bool fLogViewerMenuShown = m_pWidget->currentMachineTool() == ToolTypeMachine_Logs;
     const bool fLogViewerActionsShown = fLogViewerMenuShown || !m_pWidget->isToolOpened(ToolTypeMachine_Logs);
     m_pLogViewerMenuAction->setVisible(fLogViewerMenuShown);
@@ -2021 +2019 @@
 
     /* Update actions visibility: */
-    foreach (UIAction *pAction, m_machineActions)
-        pAction->setVisible(fMachineOrGroupMenuShown);
-    foreach (UIAction *pAction, m_groupActions)
-        pAction->setVisible(fMachineOrGroupMenuShown);
+    foreach (UIAction *pAction, m_virtualMediaManagerActions)
+        pAction->setVisible(fMediumActionsShown);
+    foreach (UIAction *pAction, m_hostNetworkManagerActions)
+        pAction->setVisible(fNetworkActionsShown);
     foreach (UIAction *pAction, m_snapshotActions)
         pAction->setVisible(fSnapshotMenuShown);
     foreach (UIAction *pAction, m_logViewerActions)
         pAction->setVisible(fLogViewerActionsShown);
-    foreach (UIAction *pAction, m_virtualMediaManagerActions)
-        pAction->setVisible(fMediumActionsShown);
-    foreach (UIAction *pAction, m_hostNetworkManagerActions)
-        pAction->setVisible(fNetworkActionsShown);
 
     /* Show action shortcuts: */