Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp (revision 39600) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp (revision 39601) @@ -419,5 +419,5 @@ { /* Check if current item could be removed: */ - if (!isActionEnabled(UIActionIndexSelector_Simple_Machine_RemoveDialog, items[i])) + if (!isActionEnabled(UIActionIndexSelector_Simple_Machine_RemoveDialog, items[i], items)) continue; @@ -468,5 +468,5 @@ { /* Check if current item could be started/showed: */ - if (!isActionEnabled(UIActionIndexSelector_State_Machine_StartOrShow, items[i])) + if (!isActionEnabled(UIActionIndexSelector_State_Machine_StartOrShow, items[i], items)) continue; @@ -521,5 +521,5 @@ /* Check if current item could be paused/resumed: */ - if (!isActionEnabled(UIActionIndexSelector_Toggle_Machine_PauseAndResume, pItem)) + if (!isActionEnabled(UIActionIndexSelector_Toggle_Machine_PauseAndResume, pItem, items)) continue; @@ -580,5 +580,5 @@ /* Check if current item could be reseted: */ - if (!isActionEnabled(UIActionIndexSelector_Simple_Machine_Reset, pItem)) + if (!isActionEnabled(UIActionIndexSelector_Simple_Machine_Reset, pItem, items)) continue; @@ -618,5 +618,5 @@ /* Check if current item could be shutdowned: */ - if (!isActionEnabled(UIActionIndexSelector_Simple_Machine_Close_ACPIShutdown, pItem)) + if (!isActionEnabled(UIActionIndexSelector_Simple_Machine_Close_ACPIShutdown, pItem, items)) continue; @@ -656,5 +656,5 @@ /* Check if current item could be powered off: */ - if (!isActionEnabled(UIActionIndexSelector_Simple_Machine_Close_PowerOff, pItem)) + if (!isActionEnabled(UIActionIndexSelector_Simple_Machine_Close_PowerOff, pItem, items)) continue; @@ -690,5 +690,5 @@ /* Check if current item could be refreshed: */ - if (!isActionEnabled(UIActionIndexSelector_Simple_Machine_Refresh, pItem)) + if (!isActionEnabled(UIActionIndexSelector_Simple_Machine_Refresh, pItem, items)) continue; @@ -711,5 +711,5 @@ /* Check if log could be show for the current item: */ - if (!isActionEnabled(UIActionIndexSelector_Simple_Machine_LogDialog, pItem)) + if (!isActionEnabled(UIActionIndexSelector_Simple_Machine_LogDialog, pItem, items)) continue; @@ -732,5 +732,5 @@ /* Check if that item could be shown in file-browser: */ - if (!isActionEnabled(UIActionIndexSelector_Simple_Machine_ShowInFileManager, pItem)) + if (!isActionEnabled(UIActionIndexSelector_Simple_Machine_ShowInFileManager, pItem, items)) continue; @@ -753,5 +753,5 @@ /* Check if shortcuts could be created for this item: */ - if (!isActionEnabled(UIActionIndexSelector_Simple_Machine_CreateShortcut, pItem)) + if (!isActionEnabled(UIActionIndexSelector_Simple_Machine_CreateShortcut, pItem, items)) continue; @@ -781,7 +781,9 @@ /* Get current item: */ UIVMItem *pItem = m_pVMListView->currentItem(); + /* Get selected items: */ + QList items = m_pVMListView->currentItems(); AssertMsgReturnVoid(pItem, ("Current item should be selected!\n")); - m_pMachineCloseMenuAction->setEnabled(isActionEnabled(UIActionIndexSelector_Menu_Machine_Close, pItem)); + m_pMachineCloseMenuAction->setEnabled(isActionEnabled(UIActionIndexSelector_Menu_Machine_Close, pItem, items)); } @@ -790,7 +792,9 @@ /* Get current item: */ UIVMItem *pItem = m_pVMListView->currentItem(); + /* Get selected items: */ + QList items = m_pVMListView->currentItems(); AssertMsgReturnVoid(pItem, ("Current item should be selected!\n")); - m_pACPIShutdownAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_Close_ACPIShutdown, pItem)); + m_pACPIShutdownAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_Close_ACPIShutdown, pItem, items)); } @@ -849,18 +853,18 @@ /* Enable/disable actions: */ - m_pSettingsDialogAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_SettingsDialog, pItem)); - m_pCloneWizardAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_CloneWizard, pItem)); - m_pRemoveDialogAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_RemoveDialog, pItem)); - m_pStartOrShowAction->setEnabled(isActionEnabled(UIActionIndexSelector_State_Machine_StartOrShow, pItem)); - m_pDiscardAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_Discard, pItem)); - m_pPauseAndResumeAction->setEnabled(isActionEnabled(UIActionIndexSelector_Toggle_Machine_PauseAndResume, pItem)); - m_pResetAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_Reset, pItem)); - m_pACPIShutdownAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_Close_ACPIShutdown, pItem)); - m_pPowerOffAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_Close_PowerOff, pItem)); - m_pRefreshAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_Refresh, pItem)); - m_pLogDialogAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_LogDialog, pItem)); - m_pShowInFileManagerAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_ShowInFileManager, pItem)); - m_pCreateShortcutAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_CreateShortcut, pItem)); - m_pSortAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_Sort, pItem)); + m_pSettingsDialogAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_SettingsDialog, pItem, items)); + m_pCloneWizardAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_CloneWizard, pItem, items)); + m_pRemoveDialogAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_RemoveDialog, pItem, items)); + m_pStartOrShowAction->setEnabled(isActionEnabled(UIActionIndexSelector_State_Machine_StartOrShow, pItem, items)); + m_pDiscardAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_Discard, pItem, items)); + m_pPauseAndResumeAction->setEnabled(isActionEnabled(UIActionIndexSelector_Toggle_Machine_PauseAndResume, pItem, items)); + m_pResetAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_Reset, pItem, items)); + m_pACPIShutdownAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_Close_ACPIShutdown, pItem, items)); + m_pPowerOffAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_Close_PowerOff, pItem, items)); + m_pRefreshAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_Refresh, pItem, items)); + m_pLogDialogAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_LogDialog, pItem, items)); + m_pShowInFileManagerAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_ShowInFileManager, pItem, items)); + m_pCreateShortcutAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_CreateShortcut, pItem, items)); + m_pSortAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_Sort, pItem, items)); /* If currently selected VM item is accessible: */ @@ -1800,5 +1804,5 @@ } -bool UISelectorWindow::isActionEnabled(int iActionIndex, UIVMItem *pItem) +bool UISelectorWindow::isActionEnabled(int iActionIndex, UIVMItem *pItem, const QList &items) { switch (iActionIndex) @@ -1806,8 +1810,9 @@ case UIActionIndexSelector_Simple_Machine_SettingsDialog: { - /* Check that item is present and accessible + /* Check that there is only one item, its accessible * and machine is not in 'stuck' or 'saved' state. * Modifying VM settings in 'saved' state will be available later. */ - return pItem && pItem->accessible() && + return items.size() == 1 && + pItem && pItem->accessible() && pItem->machineState() != KMachineState_Stuck && pItem->machineState() != KMachineState_Saved; @@ -1815,7 +1820,8 @@ case UIActionIndexSelector_Simple_Machine_CloneWizard: { - /* Check that item is present and accessible + /* Check that there is only one item, its accessible * and session state is unlocked. */ - return pItem && pItem->accessible() && + return items.size() == 1 && + pItem && pItem->accessible() && pItem->sessionState() == KSessionState_Unlocked; } @@ -1847,7 +1853,8 @@ case UIActionIndexSelector_Simple_Machine_Discard: { - /* Check that item present and accessible + /* Check that there is only one item, its accessible * and machine is in 'saved' state and session state is unlocked. */ - return pItem && pItem->accessible() && + return items.size() == 1 && + pItem && pItem->accessible() && pItem->machineState() == KMachineState_Saved && pItem->sessionState() == KSessionState_Unlocked; @@ -1884,5 +1891,5 @@ { /* Check that 'Machine/Close' menu is enabled: */ - if (!isActionEnabled(UIActionIndexSelector_Menu_Machine_Close, pItem)) + if (!isActionEnabled(UIActionIndexSelector_Menu_Machine_Close, pItem, items)) return false; @@ -1906,5 +1913,5 @@ { /* The same as 'Machine/Close' menu is enabled: */ - return isActionEnabled(UIActionIndexSelector_Menu_Machine_Close, pItem); + return isActionEnabled(UIActionIndexSelector_Menu_Machine_Close, pItem, items); } case UIActionIndexSelector_Simple_Machine_Refresh: Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h (revision 39600) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h (revision 39601) @@ -158,5 +158,5 @@ /* Static helping stuff: */ - static bool isActionEnabled(int iActionIndex, UIVMItem *pItem); + static bool isActionEnabled(int iActionIndex, UIVMItem *pItem, const QList &items); /* Central splitter window: */