VirtualBox

Ignore:
Timestamp:
Apr 24, 2015 8:16:17 AM (10 years ago)
Author:
vboxsync
Message:

FE/Qt: 7791: Add user-friendly way of starting VMs with separate UI.

Location:
trunk/src/VBox/Frontends/VirtualBox/src/selector
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp

    r52730 r55417  
    549549
    550550
    551 class UIActionStateCommonStartOrShow : public UIActionPolymorphic
     551class UIActionStateCommonStartOrShow : public UIActionPolymorphicMenu
    552552{
    553553    Q_OBJECT;
    … …  
    556556
    557557    UIActionStateCommonStartOrShow(UIActionPool *pParent)
    558         : UIActionPolymorphic(pParent,
    559                         ":/vm_start_32px.png", ":/vm_start_16px.png",
    560                         ":/vm_start_disabled_32px.png", ":/vm_start_disabled_16px.png") {}
     558        : UIActionPolymorphicMenu(pParent,
     559                                  ":/vm_start_32px.png", ":/vm_start_16px.png",
     560                                  ":/vm_start_disabled_32px.png", ":/vm_start_disabled_16px.png") {}
    561561
    562562protected:
    … …  
    573573            case 0:
    574574            {
     575                showMenu();
    575576                setName(QApplication::translate("UIActionPool", "S&tart"));
    576577                setStatusTip(QApplication::translate("UIActionPool", "Start the selected virtual machines"));
    … …  
    581582            case 1:
    582583            {
     584                hideMenu();
    583585                setName(QApplication::translate("UIActionPool", "S&how"));
    584586                setStatusTip(QApplication::translate("UIActionPool", "Switch to the windows of the selected virtual machines"));
    … …  
    590592                break;
    591593        }
     594    }
     595};
     596
     597class UIActionSimpleStartDefault : public UIActionSimple
     598{
     599    Q_OBJECT;
     600
     601public:
     602
     603    UIActionSimpleStartDefault(UIActionPool *pParent)
     604        : UIActionSimple(pParent,
     605                         ":/vm_start_32px.png", ":/vm_start_16px.png",
     606                         ":/vm_start_disabled_32px.png", ":/vm_start_disabled_16px.png") {}
     607
     608protected:
     609
     610    QString shortcutExtraDataID() const
     611    {
     612        return QString("StartVMDefault");
     613    }
     614
     615    void retranslateUi()
     616    {
     617        setName(QApplication::translate("UIActionPool", "&Default Start"));
     618        setStatusTip(QApplication::translate("UIActionPool", "Start the selected virtual machines"));
     619    }
     620};
     621
     622class UIActionSimpleStartSeparate : public UIActionSimple
     623{
     624    Q_OBJECT;
     625
     626public:
     627
     628    UIActionSimpleStartSeparate(UIActionPool *pParent)
     629        : UIActionSimple(pParent,
     630                         ":/vm_start_32px.png", ":/vm_start_16px.png",
     631                         ":/vm_start_disabled_32px.png", ":/vm_start_disabled_16px.png") {}
     632
     633protected:
     634
     635    QString shortcutExtraDataID() const
     636    {
     637        return QString("StartVMSeparate");
     638    }
     639
     640    void retranslateUi()
     641    {
     642        setName(QApplication::translate("UIActionPool", "S&eparate Start"));
     643        setStatusTip(QApplication::translate("UIActionPool", "Start the selected virtual machines with detachable GUI"));
    592644    }
    593645};
    … …  
    9501002    m_pool[UIActionIndexST_M_Group_S_Rename] = new UIActionSimpleGroupRename(this);
    9511003    m_pool[UIActionIndexST_M_Group_S_Remove] = new UIActionSimpleGroupRemove(this);
    952     m_pool[UIActionIndexST_M_Group_P_StartOrShow] = new UIActionStateCommonStartOrShow(this);
     1004    m_pool[UIActionIndexST_M_Group_M_StartOrShow] = new UIActionStateCommonStartOrShow(this);
     1005    m_pool[UIActionIndexST_M_Group_M_StartOrShow_S_StartDefault] = new UIActionSimpleStartDefault(this);
     1006    m_pool[UIActionIndexST_M_Group_M_StartOrShow_S_StartSeparate] = new UIActionSimpleStartSeparate(this);
    9531007    m_pool[UIActionIndexST_M_Group_T_Pause] = new UIActionToggleCommonPauseAndResume(this);
    9541008    m_pool[UIActionIndexST_M_Group_S_Reset] = new UIActionSimpleCommonReset(this);
    … …  
    9721026    m_pool[UIActionIndexST_M_Machine_S_Remove] = new UIActionSimpleMachineRemove(this);
    9731027    m_pool[UIActionIndexST_M_Machine_S_AddGroup] = new UIActionSimpleMachineAddGroup(this);
    974     m_pool[UIActionIndexST_M_Machine_P_StartOrShow] = new UIActionStateCommonStartOrShow(this);
     1028    m_pool[UIActionIndexST_M_Machine_M_StartOrShow] = new UIActionStateCommonStartOrShow(this);
     1029    m_pool[UIActionIndexST_M_Machine_M_StartOrShow_S_StartDefault] = new UIActionSimpleStartDefault(this);
     1030    m_pool[UIActionIndexST_M_Machine_M_StartOrShow_S_StartSeparate] = new UIActionSimpleStartSeparate(this);
    9751031    m_pool[UIActionIndexST_M_Machine_T_Pause] = new UIActionToggleCommonPauseAndResume(this);
    9761032    m_pool[UIActionIndexST_M_Machine_S_Reset] = new UIActionSimpleCommonReset(this);

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.h

    r55401 r55417  
    4747    UIActionIndexST_M_Group_S_Rename,
    4848    UIActionIndexST_M_Group_S_Remove,
    49     UIActionIndexST_M_Group_P_StartOrShow,
     49    UIActionIndexST_M_Group_M_StartOrShow,
     50    UIActionIndexST_M_Group_M_StartOrShow_S_StartDefault,
     51    UIActionIndexST_M_Group_M_StartOrShow_S_StartSeparate,
    5052    UIActionIndexST_M_Group_T_Pause,
    5153    UIActionIndexST_M_Group_S_Reset,
    … …  
    6971    UIActionIndexST_M_Machine_S_Remove,
    7072    UIActionIndexST_M_Machine_S_AddGroup,
    71     UIActionIndexST_M_Machine_P_StartOrShow,
     73    UIActionIndexST_M_Machine_M_StartOrShow,
     74    UIActionIndexST_M_Machine_M_StartOrShow_S_StartDefault,
     75    UIActionIndexST_M_Machine_M_StartOrShow_S_StartSeparate,
    7276    UIActionIndexST_M_Machine_T_Pause,
    7377    UIActionIndexST_M_Machine_S_Reset,

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

    r55359 r55417  
    2626# include <QResizeEvent>
    2727# include <QStackedWidget>
     28# include <QToolButton>
    2829# include <QTimer>
    2930
    … …  
    458459    {
    459460        /* Check if current item could be started/showed: */
    460         if (!isActionEnabled(UIActionIndexST_M_Group_P_StartOrShow, QList<UIVMItem*>() << pItem))
     461        if (!isActionEnabled(UIActionIndexST_M_Group_M_StartOrShow, QList<UIVMItem*>() << pItem))
    461462            continue;
    462463
    … …  
    466467                                            VBoxGlobal::LaunchMode_Headless :
    467468                                            VBoxGlobal::LaunchMode_Default);
     469    }
     470}
     471
     472void UISelectorWindow::sltPerformDefaultStart()
     473{
     474    /* Get selected items: */
     475    QList<UIVMItem*> items = currentItems();
     476    AssertMsgReturnVoid(!items.isEmpty(), ("At least one item should be selected!\n"));
     477
     478    /* For every selected item: */
     479    foreach (UIVMItem *pItem, items)
     480    {
     481        /* Check if current item could be started/showed: */
     482        if (!isActionEnabled(UIActionIndexST_M_Group_M_StartOrShow, QList<UIVMItem*>() << pItem))
     483            continue;
     484
     485        /* Launch/show current VM: */
     486        CMachine machine = pItem->machine();
     487        vboxGlobal().launchMachine(machine, qApp->keyboardModifiers() == Qt::ShiftModifier ?
     488                                            VBoxGlobal::LaunchMode_Headless :
     489                                            VBoxGlobal::LaunchMode_Default);
     490    }
     491}
     492
     493void UISelectorWindow::sltPerformSeparateStart()
     494{
     495    /* Get selected items: */
     496    QList<UIVMItem*> items = currentItems();
     497    AssertMsgReturnVoid(!items.isEmpty(), ("At least one item should be selected!\n"));
     498
     499    /* For every selected item: */
     500    foreach (UIVMItem *pItem, items)
     501    {
     502        /* Check if current item could be started/showed: */
     503        if (!isActionEnabled(UIActionIndexST_M_Group_M_StartOrShow, QList<UIVMItem*>() << pItem))
     504            continue;
     505
     506        /* Launch/show current VM: */
     507        CMachine machine = pItem->machine();
     508        vboxGlobal().launchMachine(machine, qApp->keyboardModifiers() == Qt::ShiftModifier ?
     509                                            VBoxGlobal::LaunchMode_Headless :
     510                                            VBoxGlobal::LaunchMode_Separate);
    468511    }
    469512}
    … …  
    11071150    menuBar()->addMenu(actionPool()->action(UIActionIndexST_M_File)->menu());
    11081151
     1152    /* Prepare 'Group' / 'Start or Show' menu: */
     1153    prepareMenuGroupStartOrShow(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow)->menu());
     1154
     1155    /* Prepare 'Machine' / 'Start or Show' menu: */
     1156    prepareMenuMachineStartOrShow(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow)->menu());
     1157
    11091158    /* Prepare 'Group' / 'Close' menu: */
    11101159    prepareMenuGroupClose(actionPool()->action(UIActionIndexST_M_Group_M_Close)->menu());
    … …  
    11771226    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Remove));
    11781227    pMenu->addSeparator();
    1179     pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_P_StartOrShow));
     1228    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow));
    11801229    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_T_Pause));
    11811230    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Reset));
    … …  
    11961245                   << actionPool()->action(UIActionIndexST_M_Group_S_Rename)
    11971246                   << actionPool()->action(UIActionIndexST_M_Group_S_Remove)
    1198                    << actionPool()->action(UIActionIndexST_M_Group_P_StartOrShow)
     1247                   << actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow)
    11991248                   << actionPool()->action(UIActionIndexST_M_Group_T_Pause)
    12001249                   << actionPool()->action(UIActionIndexST_M_Group_S_Reset)
    … …  
    12211270    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_AddGroup));
    12221271    pMenu->addSeparator();
    1223     pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_P_StartOrShow));
     1272    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow));
    12241273    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_T_Pause));
    12251274    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Reset));
    … …  
    12421291                     << actionPool()->action(UIActionIndexST_M_Machine_S_Remove)
    12431292                     << actionPool()->action(UIActionIndexST_M_Machine_S_AddGroup)
    1244                      << actionPool()->action(UIActionIndexST_M_Machine_P_StartOrShow)
     1293                     << actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow)
    12451294                     << actionPool()->action(UIActionIndexST_M_Machine_T_Pause)
    12461295                     << actionPool()->action(UIActionIndexST_M_Machine_S_Reset)
    … …  
    12531302}
    12541303
     1304void UISelectorWindow::prepareMenuGroupStartOrShow(QMenu *pMenu)
     1305{
     1306    /* Do not touch if filled already: */
     1307    if (!pMenu->isEmpty())
     1308        return;
     1309
     1310    /* Populate 'Group' / 'Start or Show' menu: */
     1311    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartDefault));
     1312    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartSeparate));
     1313
     1314    /* Remember action list: */
     1315    m_groupActions << actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartDefault)
     1316                   << actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartSeparate);
     1317}
     1318
     1319void UISelectorWindow::prepareMenuMachineStartOrShow(QMenu *pMenu)
     1320{
     1321    /* Do not touch if filled already: */
     1322    if (!pMenu->isEmpty())
     1323        return;
     1324
     1325    /* Populate 'Machine' / 'Start or Show' menu: */
     1326    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartDefault));
     1327    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartSeparate));
     1328
     1329    /* Remember action list: */
     1330    m_machineActions << actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartDefault)
     1331                     << actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartSeparate);
     1332}
     1333
    12551334void UISelectorWindow::prepareMenuGroupClose(QMenu *pMenu)
    12561335{
    … …  
    13151394    mVMToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_New));
    13161395    mVMToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Settings));
    1317     mVMToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_P_StartOrShow));
    13181396    mVMToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Discard));
     1397    mVMToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow));
    13191398
    13201399    /* Prepare graphics VM list: */
    … …  
    13851464    /* 'Group' menu connections: */
    13861465    connect(actionPool()->action(UIActionIndexST_M_Group_S_Add), SIGNAL(triggered()), this, SLOT(sltShowAddMachineDialog()));
    1387     connect(actionPool()->action(UIActionIndexST_M_Group_P_StartOrShow), SIGNAL(triggered()), this, SLOT(sltPerformStartOrShowAction()));
     1466    connect(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow), SIGNAL(triggered()), this, SLOT(sltPerformStartOrShowAction()));
    13881467    connect(actionPool()->action(UIActionIndexST_M_Group_T_Pause), SIGNAL(toggled(bool)), this, SLOT(sltPerformPauseResumeAction(bool)));
    13891468    connect(actionPool()->action(UIActionIndexST_M_Group_S_Reset), SIGNAL(triggered()), this, SLOT(sltPerformResetAction()));
    … …  
    13971476    connect(actionPool()->action(UIActionIndexST_M_Machine_S_Settings), SIGNAL(triggered()), this, SLOT(sltShowMachineSettingsDialog()));
    13981477    connect(actionPool()->action(UIActionIndexST_M_Machine_S_Clone), SIGNAL(triggered()), this, SLOT(sltShowCloneMachineWizard()));
    1399     connect(actionPool()->action(UIActionIndexST_M_Machine_P_StartOrShow), SIGNAL(triggered()), this, SLOT(sltPerformStartOrShowAction()));
     1478    connect(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow), SIGNAL(triggered()), this, SLOT(sltPerformStartOrShowAction()));
    14001479    connect(actionPool()->action(UIActionIndexST_M_Machine_T_Pause), SIGNAL(toggled(bool)), this, SLOT(sltPerformPauseResumeAction(bool)));
    14011480    connect(actionPool()->action(UIActionIndexST_M_Machine_S_Reset), SIGNAL(triggered()), this, SLOT(sltPerformResetAction()));
    … …  
    14041483    connect(actionPool()->action(UIActionIndexST_M_Machine_S_ShowInFileManager), SIGNAL(triggered()), this, SLOT(sltShowMachineInFileManager()));
    14051484    connect(actionPool()->action(UIActionIndexST_M_Machine_S_CreateShortcut), SIGNAL(triggered()), this, SLOT(sltPerformCreateShortcutAction()));
     1485
     1486    /* 'Group/Start or Show' menu connections: */
     1487    connect(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartDefault), SIGNAL(triggered()), this, SLOT(sltPerformDefaultStart()));
     1488    connect(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartSeparate), SIGNAL(triggered()), this, SLOT(sltPerformSeparateStart()));
     1489
     1490    /* 'Machine/Start or Show' menu connections: */
     1491    connect(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartDefault), SIGNAL(triggered()), this, SLOT(sltPerformDefaultStart()));
     1492    connect(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartSeparate), SIGNAL(triggered()), this, SLOT(sltPerformSeparateStart()));
    14061493
    14071494    /* 'Group/Close' menu connections: */
    … …  
    15591646    actionPool()->action(UIActionIndexST_M_Group_S_Rename)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_S_Rename, items));
    15601647    actionPool()->action(UIActionIndexST_M_Group_S_Remove)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_S_Remove, items));
    1561     actionPool()->action(UIActionIndexST_M_Group_P_StartOrShow)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_P_StartOrShow, items));
    15621648    actionPool()->action(UIActionIndexST_M_Group_T_Pause)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_T_Pause, items));
    15631649    actionPool()->action(UIActionIndexST_M_Group_S_Reset)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_S_Reset, items));
    … …  
    15741660    actionPool()->action(UIActionIndexST_M_Machine_S_Remove)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_Remove, items));
    15751661    actionPool()->action(UIActionIndexST_M_Machine_S_AddGroup)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_AddGroup, items));
    1576     actionPool()->action(UIActionIndexST_M_Machine_P_StartOrShow)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_P_StartOrShow, items));
    15771662    actionPool()->action(UIActionIndexST_M_Machine_T_Pause)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_T_Pause, items));
    15781663    actionPool()->action(UIActionIndexST_M_Machine_S_Reset)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_Reset, items));
    … …  
    15841669    actionPool()->action(UIActionIndexST_M_Machine_S_SortParent)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_SortParent, items));
    15851670
     1671    /* Enable/disable group-start-or-show actions: */
     1672    actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_M_StartOrShow, items));
     1673    actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartDefault)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_M_StartOrShow_S_StartDefault, items));
     1674    actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartSeparate)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_M_StartOrShow_S_StartSeparate, items));
     1675
     1676    /* Enable/disable machine-start-or-show actions: */
     1677    actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_StartOrShow, items));
     1678    actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartDefault)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_StartOrShow_S_StartDefault, items));
     1679    actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartSeparate)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_StartOrShow_S_StartSeparate, items));
     1680
    15861681    /* Enable/disable group-close actions: */
    15871682    actionPool()->action(UIActionIndexST_M_Group_M_Close)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_M_Close, items));
    … …  
    15991694    if (pItem && pItem->accessible())
    16001695    {
    1601         actionPool()->action(UIActionIndexST_M_Group_P_StartOrShow)->toActionPolymorphic()->setState(UIVMItem::isItemPoweredOff(pItem) ? 0 : 1);
    1602         actionPool()->action(UIActionIndexST_M_Machine_P_StartOrShow)->toActionPolymorphic()->setState(UIVMItem::isItemPoweredOff(pItem) ? 0 : 1);
     1696        actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow)->toActionPolymorphicMenu()->setState(UIVMItem::isItemPoweredOff(pItem) ? 0 : 1);
     1697        actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow)->toActionPolymorphicMenu()->setState(UIVMItem::isItemPoweredOff(pItem) ? 0 : 1);
     1698        QToolButton *pButton = qobject_cast<QToolButton*>(mVMToolBar->widgetForAction(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow)));
     1699        if (pButton)
     1700            pButton->setPopupMode(UIVMItem::isItemPoweredOff(pItem) ? QToolButton::MenuButtonPopup : QToolButton::DelayedPopup);
    16031701    }
    16041702    else
    16051703    {
    1606         actionPool()->action(UIActionIndexST_M_Group_P_StartOrShow)->toActionPolymorphic()->setState(0);
    1607         actionPool()->action(UIActionIndexST_M_Machine_P_StartOrShow)->toActionPolymorphic()->setState(0);
     1704        actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow)->toActionPolymorphicMenu()->setState(0);
     1705        actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow)->toActionPolymorphicMenu()->setState(0);
     1706        QToolButton *pButton = qobject_cast<QToolButton*>(mVMToolBar->widgetForAction(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow)));
     1707        if (pButton)
     1708            pButton->setPopupMode(UIVMItem::isItemPoweredOff(pItem) ? QToolButton::MenuButtonPopup : QToolButton::DelayedPopup);
    16081709    }
    16091710
    … …  
    16741775                   isItemsPoweredOff(items);
    16751776        }
    1676         case UIActionIndexST_M_Group_P_StartOrShow:
    1677         case UIActionIndexST_M_Machine_P_StartOrShow:
     1777        case UIActionIndexST_M_Group_M_StartOrShow:
     1778        case UIActionIndexST_M_Group_M_StartOrShow_S_StartDefault:
     1779        case UIActionIndexST_M_Group_M_StartOrShow_S_StartSeparate:
     1780        case UIActionIndexST_M_Machine_M_StartOrShow:
     1781        case UIActionIndexST_M_Machine_M_StartOrShow_S_StartDefault:
     1782        case UIActionIndexST_M_Machine_M_StartOrShow_S_StartSeparate:
    16781783        {
    16791784            return !m_pChooser->isGroupSavingInProgress() &&

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h

    r55401 r55417  
    8888    void sltShowCloneMachineWizard();
    8989    void sltPerformStartOrShowAction();
     90    void sltPerformDefaultStart();
     91    void sltPerformSeparateStart();
    9092    void sltPerformDiscardAction();
    9193    void sltPerformPauseResumeAction(bool fPause);
    … …  
    126128    void prepareMenuGroup(QMenu *pMenu);
    127129    void prepareMenuMachine(QMenu *pMenu);
     130    void prepareMenuGroupStartOrShow(QMenu *pMenu);
     131    void prepareMenuMachineStartOrShow(QMenu *pMenu);
    128132    void prepareMenuGroupClose(QMenu *pMenu);
    129133    void prepareMenuMachineClose(QMenu *pMenu);

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.cpp

    r55145 r55417  
    11501150            Qt::QueuedConnection);
    11511151    connect(m_pStartButton, SIGNAL(sigButtonClicked()),
    1152             actionPool()->action(UIActionIndexST_M_Machine_P_StartOrShow), SLOT(trigger()),
     1152            actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow), SLOT(trigger()),
    11531153            Qt::QueuedConnection);
    11541154    connect(m_pPauseButton, SIGNAL(sigButtonClicked()),

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

    r55359 r55417  
    543543void UIGChooserModel::activateMachineItem()
    544544{
    545     actionPool()->action(UIActionIndexST_M_Machine_P_StartOrShow)->activate(QAction::Trigger);
     545    actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow)->activate(QAction::Trigger);
    546546}
    547547
    … …  
    11861186    m_pContextMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Remove));
    11871187    m_pContextMenuGroup->addSeparator();
    1188     m_pContextMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_P_StartOrShow));
     1188    m_pContextMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow));
    11891189    m_pContextMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_T_Pause));
    11901190    m_pContextMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Reset));
    … …  
    12071207    m_pContextMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_AddGroup));
    12081208    m_pContextMenuMachine->addSeparator();
    1209     m_pContextMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_P_StartOrShow));
     1209    m_pContextMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow));
    12101210    m_pContextMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_T_Pause));
    12111211    m_pContextMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Reset));
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