VirtualBox

Ignore:
Timestamp:
Oct 24, 2022 1:46:47 PM (2 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:9866: Renaming Close submenu to Stop; This name is more suitable for cloud VM handling case.

Location:
trunk/src/VBox/Frontends/VirtualBox/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp

    r97277 r97278  
    16531653
    16541654
    1655 /** Menu action extension, used as 'Close' menu class. */
    1656 class UIActionMenuManagerClose : public UIActionMenu
    1657 {
    1658     Q_OBJECT;
    1659 
    1660 public:
    1661 
    1662     /** Constructs action passing @a pParent to the base-class. */
    1663     UIActionMenuManagerClose(UIActionPool *pParent)
     1655/** Menu action extension, used as 'Stop' menu class. */
     1656class UIActionMenuManagerStop : public UIActionMenu
     1657{
     1658    Q_OBJECT;
     1659
     1660public:
     1661
     1662    /** Constructs action passing @a pParent to the base-class. */
     1663    UIActionMenuManagerStop(UIActionPool *pParent)
    16641664        : UIActionMenu(pParent, ":/exit_16px.png")
    16651665    {}
    … …  
    16701670    virtual void retranslateUi() RT_OVERRIDE
    16711671    {
    1672         setName(QApplication::translate("UIActionPool", "&Close"));
     1672        setName(QApplication::translate("UIActionPool", "&Stop"));
    16731673    }
    16741674};
    16751675
    16761676/** Simple action extension, used as 'Perform Save' action class. */
    1677 class UIActionSimpleManagerClosePerformSave : public UIActionSimple
    1678 {
    1679     Q_OBJECT;
    1680 
    1681 public:
    1682 
    1683     /** Constructs action passing @a pParent to the base-class. */
    1684     UIActionSimpleManagerClosePerformSave(UIActionPool *pParent)
     1677class UIActionSimpleManagerStopPerformSave : public UIActionSimple
     1678{
     1679    Q_OBJECT;
     1680
     1681public:
     1682
     1683    /** Constructs action passing @a pParent to the base-class. */
     1684    UIActionSimpleManagerStopPerformSave(UIActionPool *pParent)
    16851685        : UIActionSimple(pParent, ":/vm_save_state_16px.png", ":/vm_save_state_disabled_16px.png")
    16861686    {}
    … …  
    17031703
    17041704/** Simple action extension, used as 'Perform Terminate' action class. */
    1705 class UIActionSimpleManagerClosePerformTerminate : public UIActionSimple
    1706 {
    1707     Q_OBJECT;
    1708 
    1709 public:
    1710 
    1711     /** Constructs action passing @a pParent to the base-class. */
    1712     UIActionSimpleManagerClosePerformTerminate(UIActionPool *pParent)
     1705class UIActionSimpleManagerStopPerformTerminate : public UIActionSimple
     1706{
     1707    Q_OBJECT;
     1708
     1709public:
     1710
     1711    /** Constructs action passing @a pParent to the base-class. */
     1712    UIActionSimpleManagerStopPerformTerminate(UIActionPool *pParent)
    17131713        : UIActionSimple(pParent, ":/vm_discard_16px.png", ":/vm_discard_disabled_16px.png")
    17141714    {}
    … …  
    17331733
    17341734/** Simple action extension, used as 'Perform Shutdown' action class. */
    1735 class UIActionSimpleManagerClosePerformShutdown : public UIActionSimple
    1736 {
    1737     Q_OBJECT;
    1738 
    1739 public:
    1740 
    1741     /** Constructs action passing @a pParent to the base-class. */
    1742     UIActionSimpleManagerClosePerformShutdown(UIActionPool *pParent)
     1735class UIActionSimpleManagerStopPerformShutdown : public UIActionSimple
     1736{
     1737    Q_OBJECT;
     1738
     1739public:
     1740
     1741    /** Constructs action passing @a pParent to the base-class. */
     1742    UIActionSimpleManagerStopPerformShutdown(UIActionPool *pParent)
    17431743        : UIActionSimple(pParent, ":/vm_shutdown_16px.png", ":/vm_shutdown_disabled_16px.png")
    17441744    {}
    … …  
    17611761
    17621762/** Simple action extension, used as 'Perform PowerOff' action class. */
    1763 class UIActionSimpleManagerClosePerformPowerOff : public UIActionSimple
    1764 {
    1765     Q_OBJECT;
    1766 
    1767 public:
    1768 
    1769     /** Constructs action passing @a pParent to the base-class. */
    1770     UIActionSimpleManagerClosePerformPowerOff(UIActionPool *pParent)
     1763class UIActionSimpleManagerStopPerformPowerOff : public UIActionSimple
     1764{
     1765    Q_OBJECT;
     1766
     1767public:
     1768
     1769    /** Constructs action passing @a pParent to the base-class. */
     1770    UIActionSimpleManagerStopPerformPowerOff(UIActionPool *pParent)
    17711771        : UIActionSimple(pParent, ":/vm_poweroff_16px.png", ":/vm_poweroff_disabled_16px.png")
    17721772    {}
    … …  
    36503650    m_pool[UIActionIndexMN_M_Group_M_Console_S_DeleteConnection] = new UIActionSimpleManagerConsolePerformDeleteConnection(this);
    36513651    m_pool[UIActionIndexMN_M_Group_M_Console_S_ConfigureApplications] = new UIActionSimpleManagerConsolePerformConfigureApplications(this);
    3652     m_pool[UIActionIndexMN_M_Group_M_Close] = new UIActionMenuManagerClose(this);
    3653     m_pool[UIActionIndexMN_M_Group_M_Close_S_SaveState] = new UIActionSimpleManagerClosePerformSave(this);
    3654     m_pool[UIActionIndexMN_M_Group_M_Close_S_Terminate] = new UIActionSimpleManagerClosePerformTerminate(this);
    3655     m_pool[UIActionIndexMN_M_Group_M_Close_S_Shutdown] = new UIActionSimpleManagerClosePerformShutdown(this);
    3656     m_pool[UIActionIndexMN_M_Group_M_Close_S_PowerOff] = new UIActionSimpleManagerClosePerformPowerOff(this);
     3652    m_pool[UIActionIndexMN_M_Group_M_Stop] = new UIActionMenuManagerStop(this);
     3653    m_pool[UIActionIndexMN_M_Group_M_Stop_S_SaveState] = new UIActionSimpleManagerStopPerformSave(this);
     3654    m_pool[UIActionIndexMN_M_Group_M_Stop_S_Terminate] = new UIActionSimpleManagerStopPerformTerminate(this);
     3655    m_pool[UIActionIndexMN_M_Group_M_Stop_S_Shutdown] = new UIActionSimpleManagerStopPerformShutdown(this);
     3656    m_pool[UIActionIndexMN_M_Group_M_Stop_S_PowerOff] = new UIActionSimpleManagerStopPerformPowerOff(this);
    36573657    m_pool[UIActionIndexMN_M_Group_M_Tools] = new UIActionMenuManagerToolsMachine(this);
    36583658    m_pool[UIActionIndexMN_M_Group_M_Tools_T_Details] = new UIActionToggleManagerToolsMachineShowDetails(this);
    … …  
    36973697    m_pool[UIActionIndexMN_M_Machine_M_Console_S_ConfigureApplications] = new UIActionSimpleManagerConsolePerformConfigureApplications(this);
    36983698    m_pool[UIActionIndexMN_M_Machine_M_Console_S_ShowLog] = new UIActionSimpleManagerConsolePerformShowLog(this);
    3699     m_pool[UIActionIndexMN_M_Machine_M_Close] = new UIActionMenuManagerClose(this);
    3700     m_pool[UIActionIndexMN_M_Machine_M_Close_S_SaveState] = new UIActionSimpleManagerClosePerformSave(this);
    3701     m_pool[UIActionIndexMN_M_Machine_M_Close_S_Terminate] = new UIActionSimpleManagerClosePerformTerminate(this);
    3702     m_pool[UIActionIndexMN_M_Machine_M_Close_S_Shutdown] = new UIActionSimpleManagerClosePerformShutdown(this);
    3703     m_pool[UIActionIndexMN_M_Machine_M_Close_S_PowerOff] = new UIActionSimpleManagerClosePerformPowerOff(this);
     3699    m_pool[UIActionIndexMN_M_Machine_M_Stop] = new UIActionMenuManagerStop(this);
     3700    m_pool[UIActionIndexMN_M_Machine_M_Stop_S_SaveState] = new UIActionSimpleManagerStopPerformSave(this);
     3701    m_pool[UIActionIndexMN_M_Machine_M_Stop_S_Terminate] = new UIActionSimpleManagerStopPerformTerminate(this);
     3702    m_pool[UIActionIndexMN_M_Machine_M_Stop_S_Shutdown] = new UIActionSimpleManagerStopPerformShutdown(this);
     3703    m_pool[UIActionIndexMN_M_Machine_M_Stop_S_PowerOff] = new UIActionSimpleManagerStopPerformPowerOff(this);
    37043704    m_pool[UIActionIndexMN_M_Machine_M_Tools] = new UIActionMenuManagerToolsMachine(this);
    37053705    m_pool[UIActionIndexMN_M_Machine_M_Tools_T_Details] = new UIActionToggleManagerToolsMachineShowDetails(this);
    … …  
    38133813    m_menuUpdateHandlers[UIActionIndexMN_M_Group_M_Console].ptfm =       &UIActionPoolManager::updateMenuGroupConsole;
    38143814    m_menuUpdateHandlers[UIActionIndexMN_M_Machine_M_Console].ptfm =     &UIActionPoolManager::updateMenuMachineConsole;
    3815     m_menuUpdateHandlers[UIActionIndexMN_M_Group_M_Close].ptfm =         &UIActionPoolManager::updateMenuGroupClose;
    3816     m_menuUpdateHandlers[UIActionIndexMN_M_Machine_M_Close].ptfm =       &UIActionPoolManager::updateMenuMachineClose;
     3815    m_menuUpdateHandlers[UIActionIndexMN_M_Group_M_Stop].ptfm =          &UIActionPoolManager::updateMenuGroupClose;
     3816    m_menuUpdateHandlers[UIActionIndexMN_M_Machine_M_Stop].ptfm =        &UIActionPoolManager::updateMenuMachineClose;
    38173817    m_menuUpdateHandlers[UIActionIndexMN_M_Group_M_Tools].ptfm =         &UIActionPoolManager::updateMenuGroupTools;
    38183818    m_menuUpdateHandlers[UIActionIndexMN_M_Machine_M_Tools].ptfm =       &UIActionPoolManager::updateMenuMachineTools;
    … …  
    39723972                    << action(UIActionIndexMN_M_Group_M_Console_S_DeleteConnection)
    39733973                    << action(UIActionIndexMN_M_Group_M_Console_S_ConfigureApplications)
    3974                     << action(UIActionIndexMN_M_Group_M_Close_S_SaveState)
    3975                     << action(UIActionIndexMN_M_Group_M_Close_S_Terminate)
    3976                     << action(UIActionIndexMN_M_Group_M_Close_S_Shutdown)
    3977                     << action(UIActionIndexMN_M_Group_M_Close_S_PowerOff)
     3974                    << action(UIActionIndexMN_M_Group_M_Stop_S_SaveState)
     3975                    << action(UIActionIndexMN_M_Group_M_Stop_S_Terminate)
     3976                    << action(UIActionIndexMN_M_Group_M_Stop_S_Shutdown)
     3977                    << action(UIActionIndexMN_M_Group_M_Stop_S_PowerOff)
    39783978                    << action(UIActionIndexMN_M_Group_M_Tools_T_Details)
    39793979                    << action(UIActionIndexMN_M_Group_M_Tools_T_Snapshots)
    … …  
    40144014                    << action(UIActionIndexMN_M_Machine_M_Console_S_ConfigureApplications)
    40154015                    << action(UIActionIndexMN_M_Machine_M_Console_S_ShowLog)
    4016                     << action(UIActionIndexMN_M_Machine_M_Close_S_SaveState)
    4017                     << action(UIActionIndexMN_M_Machine_M_Close_S_Terminate)
    4018                     << action(UIActionIndexMN_M_Machine_M_Close_S_Shutdown)
    4019                     << action(UIActionIndexMN_M_Machine_M_Close_S_PowerOff)
     4016                    << action(UIActionIndexMN_M_Machine_M_Stop_S_SaveState)
     4017                    << action(UIActionIndexMN_M_Machine_M_Stop_S_Terminate)
     4018                    << action(UIActionIndexMN_M_Machine_M_Stop_S_Shutdown)
     4019                    << action(UIActionIndexMN_M_Machine_M_Stop_S_PowerOff)
    40204020                    << action(UIActionIndexMN_M_Machine_M_Tools_T_Details)
    40214021                    << action(UIActionIndexMN_M_Machine_M_Tools_T_Snapshots)
    … …  
    42824282{
    42834283    /* Get corresponding menu: */
    4284     UIMenu *pMenu = action(UIActionIndexMN_M_Group_M_Close)->menu();
     4284    UIMenu *pMenu = action(UIActionIndexMN_M_Group_M_Stop)->menu();
    42854285    AssertPtrReturnVoid(pMenu);
    42864286    /* Clear contents: */
    … …  
    42924292    // the menu-bar, you have to leave there at least something.
    42934293    // Remaining stuff will be appended from UIVirtualBoxManager.
    4294     pMenu->addAction(action(UIActionIndexMN_M_Group_M_Close_S_PowerOff));
     4294    pMenu->addAction(action(UIActionIndexMN_M_Group_M_Stop_S_PowerOff));
    42954295#endif
    42964296
    … …  
    43014301{
    43024302    /* Get corresponding menu: */
    4303     UIMenu *pMenu = action(UIActionIndexMN_M_Machine_M_Close)->menu();
     4303    UIMenu *pMenu = action(UIActionIndexMN_M_Machine_M_Stop)->menu();
    43044304    AssertPtrReturnVoid(pMenu);
    43054305    /* Clear contents: */
    … …  
    43114311    // the menu-bar, you have to leave there at least something.
    43124312    // Remaining stuff will be appended from UIVirtualBoxManager.
    4313     pMenu->addAction(action(UIActionIndexMN_M_Machine_M_Close_S_PowerOff));
     4313    pMenu->addAction(action(UIActionIndexMN_M_Machine_M_Stop_S_PowerOff));
    43144314#endif
    43154315

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.h

    r97277 r97278  
    8484    UIActionIndexMN_M_Group_M_Console_S_DeleteConnection,
    8585    UIActionIndexMN_M_Group_M_Console_S_ConfigureApplications,
    86     UIActionIndexMN_M_Group_M_Close,
    87     UIActionIndexMN_M_Group_M_Close_S_SaveState,
    88     UIActionIndexMN_M_Group_M_Close_S_Terminate,
    89     UIActionIndexMN_M_Group_M_Close_S_Shutdown,
    90     UIActionIndexMN_M_Group_M_Close_S_PowerOff,
     86    UIActionIndexMN_M_Group_M_Stop,
     87    UIActionIndexMN_M_Group_M_Stop_S_SaveState,
     88    UIActionIndexMN_M_Group_M_Stop_S_Terminate,
     89    UIActionIndexMN_M_Group_M_Stop_S_Shutdown,
     90    UIActionIndexMN_M_Group_M_Stop_S_PowerOff,
    9191    UIActionIndexMN_M_Group_M_Tools,
    9292    UIActionIndexMN_M_Group_M_Tools_T_Details,
    … …  
    130130    UIActionIndexMN_M_Machine_M_Console_S_ConfigureApplications,
    131131    UIActionIndexMN_M_Machine_M_Console_S_ShowLog,
    132     UIActionIndexMN_M_Machine_M_Close,
    133     UIActionIndexMN_M_Machine_M_Close_S_SaveState,
    134     UIActionIndexMN_M_Machine_M_Close_S_Terminate,
    135     UIActionIndexMN_M_Machine_M_Close_S_Shutdown,
    136     UIActionIndexMN_M_Machine_M_Close_S_PowerOff,
     132    UIActionIndexMN_M_Machine_M_Stop,
     133    UIActionIndexMN_M_Machine_M_Stop_S_SaveState,
     134    UIActionIndexMN_M_Machine_M_Stop_S_Terminate,
     135    UIActionIndexMN_M_Machine_M_Stop_S_Shutdown,
     136    UIActionIndexMN_M_Machine_M_Stop_S_PowerOff,
    137137    UIActionIndexMN_M_Machine_M_Tools,
    138138    UIActionIndexMN_M_Machine_M_Tools_T_Details,

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

    r97277 r97278  
    17071707
    17081708        /* Check if current item could be saved: */
    1709         if (!isActionEnabled(UIActionIndexMN_M_Machine_M_Close_S_SaveState, QList<UIVirtualMachineItem*>() << pItem))
     1709        if (!isActionEnabled(UIActionIndexMN_M_Machine_M_Stop_S_SaveState, QList<UIVirtualMachineItem*>() << pItem))
    17101710            continue;
    17111711
    … …  
    17271727    foreach (UIVirtualMachineItem *pItem, items)
    17281728    {
    1729         if (isActionEnabled(UIActionIndexMN_M_Group_M_Close_S_Terminate, QList<UIVirtualMachineItem*>() << pItem))
     1729        if (isActionEnabled(UIActionIndexMN_M_Group_M_Stop_S_Terminate, QList<UIVirtualMachineItem*>() << pItem))
    17301730        {
    17311731            machinesToTerminate << pItem->name();
    … …  
    17641764    foreach (UIVirtualMachineItem *pItem, items)
    17651765    {
    1766         if (isActionEnabled(UIActionIndexMN_M_Machine_M_Close_S_Shutdown, QList<UIVirtualMachineItem*>() << pItem))
     1766        if (isActionEnabled(UIActionIndexMN_M_Machine_M_Stop_S_Shutdown, QList<UIVirtualMachineItem*>() << pItem))
    17671767        {
    17681768            machineNames << pItem->name();
    … …  
    18221822    foreach (UIVirtualMachineItem *pItem, items)
    18231823    {
    1824         if (isActionEnabled(UIActionIndexMN_M_Machine_M_Close_S_PowerOff, QList<UIVirtualMachineItem*>() << pItem))
     1824        if (isActionEnabled(UIActionIndexMN_M_Machine_M_Stop_S_PowerOff, QList<UIVirtualMachineItem*>() << pItem))
    18251825        {
    18261826            machineNames << pItem->name();
    … …  
    21142114    m_menuUpdateHandlers[UIActionIndexMN_M_Group_M_MoveToGroup] = &UIVirtualBoxManager::updateMenuGroupMoveToGroup;
    21152115    m_menuUpdateHandlers[UIActionIndexMN_M_Group_M_Console] = &UIVirtualBoxManager::updateMenuGroupConsole;
    2116     m_menuUpdateHandlers[UIActionIndexMN_M_Group_M_Close] = &UIVirtualBoxManager::updateMenuGroupClose;
     2116    m_menuUpdateHandlers[UIActionIndexMN_M_Group_M_Stop] = &UIVirtualBoxManager::updateMenuGroupClose;
    21172117    m_menuUpdateHandlers[UIActionIndexMN_M_Machine_M_MoveToGroup] = &UIVirtualBoxManager::updateMenuMachineMoveToGroup;
    21182118    m_menuUpdateHandlers[UIActionIndexMN_M_Machine_M_Console] = &UIVirtualBoxManager::updateMenuMachineConsole;
    2119     m_menuUpdateHandlers[UIActionIndexMN_M_Machine_M_Close] = &UIVirtualBoxManager::updateMenuMachineClose;
     2119    m_menuUpdateHandlers[UIActionIndexMN_M_Machine_M_Stop] = &UIVirtualBoxManager::updateMenuMachineClose;
    21202120
    21212121    /* Build menu-bar: */
    … …  
    23342334            this, &UIVirtualBoxManager::sltPerformShowLog);
    23352335
    2336     /* 'Group/Close' menu connections: */
    2337     connect(actionPool()->action(UIActionIndexMN_M_Group_M_Close_S_SaveState), &UIAction::triggered,
     2336    /* 'Group/Stop' menu connections: */
     2337    connect(actionPool()->action(UIActionIndexMN_M_Group_M_Stop_S_SaveState), &UIAction::triggered,
    23382338            this, &UIVirtualBoxManager::sltPerformSaveMachineState);
    2339     connect(actionPool()->action(UIActionIndexMN_M_Group_M_Close_S_Terminate), &UIAction::triggered,
     2339    connect(actionPool()->action(UIActionIndexMN_M_Group_M_Stop_S_Terminate), &UIAction::triggered,
    23402340            this, &UIVirtualBoxManager::sltPerformTerminateMachine);
    2341     connect(actionPool()->action(UIActionIndexMN_M_Group_M_Close_S_Shutdown), &UIAction::triggered,
     2341    connect(actionPool()->action(UIActionIndexMN_M_Group_M_Stop_S_Shutdown), &UIAction::triggered,
    23422342            this, &UIVirtualBoxManager::sltPerformShutdownMachine);
    2343     connect(actionPool()->action(UIActionIndexMN_M_Group_M_Close_S_PowerOff), &UIAction::triggered,
     2343    connect(actionPool()->action(UIActionIndexMN_M_Group_M_Stop_S_PowerOff), &UIAction::triggered,
    23442344            this, &UIVirtualBoxManager::sltPerformPowerOffMachine);
    23452345
    2346     /* 'Machine/Close' menu connections: */
    2347     connect(actionPool()->action(UIActionIndexMN_M_Machine_M_Close_S_SaveState), &UIAction::triggered,
     2346    /* 'Machine/Stop' menu connections: */
     2347    connect(actionPool()->action(UIActionIndexMN_M_Machine_M_Stop_S_SaveState), &UIAction::triggered,
    23482348            this, &UIVirtualBoxManager::sltPerformSaveMachineState);
    2349     connect(actionPool()->action(UIActionIndexMN_M_Machine_M_Close_S_Terminate), &UIAction::triggered,
     2349    connect(actionPool()->action(UIActionIndexMN_M_Machine_M_Stop_S_Terminate), &UIAction::triggered,
    23502350            this, &UIVirtualBoxManager::sltPerformTerminateMachine);
    2351     connect(actionPool()->action(UIActionIndexMN_M_Machine_M_Close_S_Shutdown), &UIAction::triggered,
     2351    connect(actionPool()->action(UIActionIndexMN_M_Machine_M_Stop_S_Shutdown), &UIAction::triggered,
    23522352            this, &UIVirtualBoxManager::sltPerformShutdownMachine);
    2353     connect(actionPool()->action(UIActionIndexMN_M_Machine_M_Close_S_PowerOff), &UIAction::triggered,
     2353    connect(actionPool()->action(UIActionIndexMN_M_Machine_M_Stop_S_PowerOff), &UIAction::triggered,
    23542354            this, &UIVirtualBoxManager::sltPerformPowerOffMachine);
    23552355
    … …  
    27902790        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow));
    27912791        pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_Console)->menu());
    2792         pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_Close)->menu());
     2792        pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_Stop)->menu());
    27932793        pMenu->addSeparator();
    27942794        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Refresh));
    … …  
    28122812        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Reset));
    28132813        // pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Detach));
    2814         pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_Close)->menu());
     2814        pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_Stop)->menu());
    28152815        pMenu->addSeparator();
    28162816        pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_Tools)->menu());
    … …  
    28472847        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow));
    28482848        pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_Console)->menu());
    2849         pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_Close)->menu());
     2849        pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_Stop)->menu());
    28502850        pMenu->addSeparator();
    28512851        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Refresh));
    … …  
    28722872        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Reset));
    28732873        // pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Detach));
    2874         pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_Close)->menu());
     2874        pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_Stop)->menu());
    28752875        pMenu->addSeparator();
    28762876        pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_Tools)->menu());
    … …  
    29262926    if (pItem->itemType() == UIVirtualMachineItemType_Local)
    29272927    {
    2928         pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_Close_S_SaveState));
    2929         pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_Close_S_Shutdown));
    2930         pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_Close_S_PowerOff));
     2928        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_Stop_S_SaveState));
     2929        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_Stop_S_Shutdown));
     2930        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_Stop_S_PowerOff));
    29312931    }
    29322932    else
    29332933    {
    2934         pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_Close_S_Terminate));
    2935         pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_Close_S_Shutdown));
    2936         pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_Close_S_PowerOff));
    2937     }
    2938 
    2939     /* Configure 'Group' / 'Close' menu: */
    2940     actionPool()->action(UIActionIndexMN_M_Group_M_Close_S_Shutdown)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_Close_S_Shutdown, items));
     2934        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_Stop_S_Terminate));
     2935        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_Stop_S_Shutdown));
     2936        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_Stop_S_PowerOff));
     2937    }
     2938
     2939    /* Configure 'Group' / 'Stop' menu: */
     2940    actionPool()->action(UIActionIndexMN_M_Group_M_Stop_S_Shutdown)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_Stop_S_Shutdown, items));
    29412941}
    29422942
    … …  
    30713071    if (pItem->itemType() == UIVirtualMachineItemType_Local)
    30723072    {
    3073         pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_Close_S_SaveState));
    3074         pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_Close_S_Shutdown));
    3075         pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_Close_S_PowerOff));
     3073        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_Stop_S_SaveState));
     3074        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_Stop_S_Shutdown));
     3075        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_Stop_S_PowerOff));
    30763076    }
    30773077    else
    30783078    {
    3079         pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_Close_S_Terminate));
    3080         pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_Close_S_Shutdown));
    3081         pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_Close_S_PowerOff));
    3082     }
    3083 
    3084     /* Configure 'Machine' / 'Close' menu: */
    3085     actionPool()->action(UIActionIndexMN_M_Machine_M_Close_S_Shutdown)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Close_S_Shutdown, items));
     3079        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_Stop_S_Terminate));
     3080        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_Stop_S_Shutdown));
     3081        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_Stop_S_PowerOff));
     3082    }
     3083
     3084    /* Configure 'Machine' / 'Stop' menu: */
     3085    actionPool()->action(UIActionIndexMN_M_Machine_M_Stop_S_Shutdown)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Stop_S_Shutdown, items));
    30863086}
    30873087
    … …  
    32253225    actionPool()->action(UIActionIndexMN_M_Machine_M_Console_S_ShowLog)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Console_S_ShowLog, items));
    32263226
    3227     /* Enable/disable group-close actions: */
    3228     actionPool()->action(UIActionIndexMN_M_Group_M_Close)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_Close, items));
    3229     actionPool()->action(UIActionIndexMN_M_Group_M_Close_S_SaveState)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_Close_S_SaveState, items));
    3230     actionPool()->action(UIActionIndexMN_M_Group_M_Close_S_Terminate)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_Close_S_Terminate, items));
    3231     actionPool()->action(UIActionIndexMN_M_Group_M_Close_S_Shutdown)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_Close_S_Shutdown, items));
    3232     actionPool()->action(UIActionIndexMN_M_Group_M_Close_S_PowerOff)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_Close_S_PowerOff, items));
    3233 
    3234     /* Enable/disable machine-close actions: */
    3235     actionPool()->action(UIActionIndexMN_M_Machine_M_Close)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Close, items));
    3236     actionPool()->action(UIActionIndexMN_M_Machine_M_Close_S_SaveState)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Close_S_SaveState, items));
    3237     actionPool()->action(UIActionIndexMN_M_Machine_M_Close_S_Terminate)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Close_S_Terminate, items));
    3238     actionPool()->action(UIActionIndexMN_M_Machine_M_Close_S_Shutdown)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Close_S_Shutdown, items));
    3239     actionPool()->action(UIActionIndexMN_M_Machine_M_Close_S_PowerOff)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Close_S_PowerOff, items));
     3227    /* Enable/disable group-stop actions: */
     3228    actionPool()->action(UIActionIndexMN_M_Group_M_Stop)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_Stop, items));
     3229    actionPool()->action(UIActionIndexMN_M_Group_M_Stop_S_SaveState)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_Stop_S_SaveState, items));
     3230    actionPool()->action(UIActionIndexMN_M_Group_M_Stop_S_Terminate)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_Stop_S_Terminate, items));
     3231    actionPool()->action(UIActionIndexMN_M_Group_M_Stop_S_Shutdown)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_Stop_S_Shutdown, items));
     3232    actionPool()->action(UIActionIndexMN_M_Group_M_Stop_S_PowerOff)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_Stop_S_PowerOff, items));
     3233
     3234    /* Enable/disable machine-stop actions: */
     3235    actionPool()->action(UIActionIndexMN_M_Machine_M_Stop)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Stop, items));
     3236    actionPool()->action(UIActionIndexMN_M_Machine_M_Stop_S_SaveState)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Stop_S_SaveState, items));
     3237    actionPool()->action(UIActionIndexMN_M_Machine_M_Stop_S_Terminate)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Stop_S_Terminate, items));
     3238    actionPool()->action(UIActionIndexMN_M_Machine_M_Stop_S_Shutdown)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Stop_S_Shutdown, items));
     3239    actionPool()->action(UIActionIndexMN_M_Machine_M_Stop_S_PowerOff)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Stop_S_PowerOff, items));
    32403240
    32413241    /* Get current item: */
    … …  
    35043504            return isAtLeastOneItemStarted(items);
    35053505        }
    3506         case UIActionIndexMN_M_Group_M_Close:
    3507         case UIActionIndexMN_M_Machine_M_Close:
     3506        case UIActionIndexMN_M_Group_M_Stop:
     3507        case UIActionIndexMN_M_Machine_M_Stop:
    35083508        {
    35093509            return    (isItemsLocal(items) && isAtLeastOneItemStarted(items))
    35103510                   || (isItemsCloud(items) && isAtLeastOneItemDiscardable(items));
    35113511        }
    3512         case UIActionIndexMN_M_Group_M_Close_S_SaveState:
    3513         case UIActionIndexMN_M_Machine_M_Close_S_SaveState:
    3514         {
    3515             return    isActionEnabled(UIActionIndexMN_M_Machine_M_Close, items)
     3512        case UIActionIndexMN_M_Group_M_Stop_S_SaveState:
     3513        case UIActionIndexMN_M_Machine_M_Stop_S_SaveState:
     3514        {
     3515            return    isActionEnabled(UIActionIndexMN_M_Machine_M_Stop, items)
    35163516                   && isItemsLocal(items);
    35173517        }
    3518         case UIActionIndexMN_M_Group_M_Close_S_Terminate:
    3519         case UIActionIndexMN_M_Machine_M_Close_S_Terminate:
    3520         {
    3521             return    isActionEnabled(UIActionIndexMN_M_Machine_M_Close, items)
     3518        case UIActionIndexMN_M_Group_M_Stop_S_Terminate:
     3519        case UIActionIndexMN_M_Machine_M_Stop_S_Terminate:
     3520        {
     3521            return    isActionEnabled(UIActionIndexMN_M_Machine_M_Stop, items)
    35223522                   && isAtLeastOneItemDiscardable(items);
    35233523        }
    3524         case UIActionIndexMN_M_Group_M_Close_S_Shutdown:
    3525         case UIActionIndexMN_M_Machine_M_Close_S_Shutdown:
    3526         {
    3527             return    isActionEnabled(UIActionIndexMN_M_Machine_M_Close, items)
     3524        case UIActionIndexMN_M_Group_M_Stop_S_Shutdown:
     3525        case UIActionIndexMN_M_Machine_M_Stop_S_Shutdown:
     3526        {
     3527            return    isActionEnabled(UIActionIndexMN_M_Machine_M_Stop, items)
    35283528                   && isAtLeastOneItemAbleToShutdown(items);
    35293529        }
    3530         case UIActionIndexMN_M_Group_M_Close_S_PowerOff:
    3531         case UIActionIndexMN_M_Machine_M_Close_S_PowerOff:
    3532         {
    3533             return    isActionEnabled(UIActionIndexMN_M_Machine_M_Close, items)
     3530        case UIActionIndexMN_M_Group_M_Stop_S_PowerOff:
     3531        case UIActionIndexMN_M_Machine_M_Stop_S_PowerOff:
     3532        {
     3533            return    isActionEnabled(UIActionIndexMN_M_Machine_M_Stop, items)
    35343534                   && isAtLeastOneItemStarted(items);
    35353535        }

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

    r96808 r97278  
    931931                        else if (   isSingleCloudProviderGroupSelected()
    932932                                 || isSingleCloudProfileGroupSelected())
    933                             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_Close_S_Terminate));
     933                            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_Stop_S_Terminate));
    934934                        m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow));
    935935                    }
    … …  
    943943                            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Discard));
    944944                        else if (isCloudMachineItemSelected())
    945                             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_Close_S_Terminate));
     945                            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_Stop_S_Terminate));
    946946                        m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow));
    947947                    }

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

    r97277 r97278  
    15001500        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Reset));
    15011501        // pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Detach));
    1502         pMenuGroup->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_Close)->menu());
     1502        pMenuGroup->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_Stop)->menu());
    15031503        pMenuGroup->addSeparator();
    15041504        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Discard));
    … …  
    15281528        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Reset));
    15291529        // pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Detach));
    1530         pMenuMachine->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_Close)->menu());
     1530        pMenuMachine->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_Stop)->menu());
    15311531        pMenuMachine->addSeparator();
    15321532        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Discard));
    … …  
    15501550        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow));
    15511551        pMenuGroup->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_Console)->menu());
    1552         pMenuGroup->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_Close)->menu());
     1552        pMenuGroup->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_Stop)->menu());
    15531553        pMenuGroup->addSeparator();
    15541554        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Refresh));
    … …  
    15671567        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow));
    15681568        pMenuMachine->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_Console)->menu());
    1569         pMenuMachine->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_Close)->menu());
     1569        pMenuMachine->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_Stop)->menu());
    15701570        pMenuMachine->addSeparator();
    15711571        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Refresh));
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette