VirtualBox

Changeset 73738 in vbox for trunk


Ignore:
Timestamp:
Aug 17, 2018 3:09:50 PM (7 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
124419
Message:

FE/Qt: VirtualBox Manager UI: Integrating Network Manager toolbar into Main application toolbar.

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

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp

    r73735 r73738  
    193193*********************************************************************************************************************************/
    194194
    195 UIHostNetworkManagerWidget::UIHostNetworkManagerWidget(EmbedTo enmEmbedding, UIActionPool *pActionPool, QWidget *pParent /* = 0 */)
     195UIHostNetworkManagerWidget::UIHostNetworkManagerWidget(EmbedTo enmEmbedding, UIActionPool *pActionPool,
     196                                                       bool fShowToolbar /* = true */, QWidget *pParent /* = 0 */)
    196197    : QIWithRetranslateUI<QWidget>(pParent)
    197198    , m_enmEmbedding(enmEmbedding)
    198199    , m_pActionPool(pActionPool)
     200    , m_fShowToolbar(fShowToolbar)
    199201    , m_pToolBar(0)
    200202    , m_pTreeWidget(0)
    … …  
    725727
    726728        /* Prepare toolbar: */
    727         prepareToolBar();
     729        if (m_fShowToolbar)
     730            prepareToolBar();
    728731        /* Prepare tree-widget: */
    729732        prepareTreeWidget();
    … …  
    10121015{
    10131016    /* Create widget: */
    1014     UIHostNetworkManagerWidget *pWidget = new UIHostNetworkManagerWidget(EmbedTo_Dialog, m_pActionPool, this);
     1017    UIHostNetworkManagerWidget *pWidget = new UIHostNetworkManagerWidget(EmbedTo_Dialog, m_pActionPool, true, this);
    10151018    AssertPtrReturnVoid(pWidget);
    10161019    {

  • trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.h

    r73735 r73738  
    5353public:
    5454
    55     /** Constructs Host Network Manager widget. */
    56     UIHostNetworkManagerWidget(EmbedTo enmEmbedding, UIActionPool *pActionPool, QWidget *pParent = 0);
     55    /** Constructs Host Network Manager widget.
     56      * @param  enmEmbedding  Brings the type of widget embedding.
     57      * @param  pActionPool   Brings the action-pool reference.
     58      * @param  fShowToolbar  Brings whether we should create/show toolbar. */
     59    UIHostNetworkManagerWidget(EmbedTo enmEmbedding, UIActionPool *pActionPool,
     60                               bool fShowToolbar = true, QWidget *pParent = 0);
    5761
    5862    /** Returns the menu. */
    … …  
    159163        /** Holds the action-pool reference. */
    160164        UIActionPool *m_pActionPool;
     165        /** Holds whether we should create/show toolbar. */
     166        const bool    m_fShowToolbar;
    161167    /** @} */
    162168

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

    r73735 r73738  
    131131            {
    132132                /* Create Host Network Manager: */
    133                 m_pPaneNetwork = new UIHostNetworkManagerWidget(EmbedTo_Stack, m_pActionPool);
     133                m_pPaneNetwork = new UIHostNetworkManagerWidget(EmbedTo_Stack, m_pActionPool, false /* show toolbar */);
    134134                AssertPtrReturnVoid(m_pPaneNetwork);
    135135                {

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

    r73735 r73738  
    115115    , m_pLogViewerMenuAction(0)
    116116    , m_pVirtualMediaManagerMenuAction(0)
     117    , m_pHostNetworkManagerMenuAction(0)
    117118    , m_pManagerVirtualMedia(0)
    118119    , m_pManagerHostNetwork(0)
    … …  
    12421243    m_pVirtualMediaManagerMenuAction = menuBar()->addMenu(actionPool()->action(UIActionIndexST_M_Medium)->menu());
    12431244
     1245    /* Prepare 'Network' menu: */
     1246    prepareMenuNetwork(actionPool()->action(UIActionIndexST_M_Network)->menu());
     1247    m_pHostNetworkManagerMenuAction = menuBar()->addMenu(actionPool()->action(UIActionIndexST_M_Network)->menu());
     1248
    12441249#ifdef VBOX_WS_MAC
    12451250    /* Prepare 'Window' menu: */
    … …  
    16861691}
    16871692
     1693void UIVirtualBoxManager::prepareMenuNetwork(QMenu *pMenu)
     1694{
     1695    /* We are doing it inside the UIActionPoolSelector. */
     1696    Q_UNUSED(pMenu);
     1697
     1698    /* Do not touch if filled already: */
     1699    if (!m_hostNetworkManagerActions.isEmpty())
     1700        return;
     1701
     1702    /* Remember action list: */
     1703    m_hostNetworkManagerActions << actionPool()->action(UIActionIndexST_M_Network_S_Create)
     1704                                << actionPool()->action(UIActionIndexST_M_Network_S_Remove)
     1705                                << actionPool()->action(UIActionIndexST_M_Network_T_Details)
     1706                                << actionPool()->action(UIActionIndexST_M_Network_S_Refresh);
     1707}
     1708
    16881709void UIVirtualBoxManager::prepareStatusBar()
    16891710{
    … …  
    19882009    m_pVirtualMediaManagerMenuAction->setVisible(fMediumMenuShown);
    19892010
     2011    /* Determine whether HostNetworkManager actions should be visible: */
     2012    const bool fNetworkMenuShown = fGlobalMenuShown && m_pWidget->currentGlobalTool() == ToolTypeGlobal_HostNetwork;
     2013    m_pHostNetworkManagerMenuAction->setVisible(fNetworkMenuShown);
     2014
    19902015    /* Hide action shortcuts: */
    19912016    if (!fMachineMenuShown)
    … …  
    20072032    foreach (UIAction *pAction, m_virtualMediaManagerActions)
    20082033        pAction->setVisible(fMediumMenuShown);
     2034    foreach (UIAction *pAction, m_hostNetworkManagerActions)
     2035        pAction->setVisible(fNetworkMenuShown);
    20092036
    20102037    /* Show action shortcuts: */

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

    r73721 r73738  
    254254        /** Prepares @a pMenu Medium. */
    255255        void prepareMenuMedium(QMenu *pMenu);
     256        /** Prepares @a pMenu Network. */
     257        void prepareMenuNetwork(QMenu *pMenu);
    256258        /** Prepares status-bar. */
    257259        void prepareStatusBar();
    … …  
    369371    QAction          *m_pVirtualMediaManagerMenuAction;
    370372
     373    /** Holds the list of Host Network Manager menu actions. */
     374    QList<UIAction*>  m_hostNetworkManagerActions;
     375    /** Holds the Host Network Manager menu parent action. */
     376    QAction          *m_pHostNetworkManagerMenuAction;
     377
    371378    /** Holds the Virtual Media Manager window instance. */
    372379    QIManagerDialog *m_pManagerVirtualMedia;

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

    r73721 r73738  
    431431        m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Medium_S_Refresh));
    432432
     433        /* Add 'Network' actions block: */
     434        m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Network_S_Create));
     435        m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Network_S_Remove));
     436        m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Network_T_Details));
     437//        m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Network_S_Refresh));
     438
    433439#ifdef VBOX_WS_MAC
    434440        // WORKAROUND:
Note: See TracChangeset for help on using the changeset viewer.

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