VirtualBox

Changeset 67075 in vbox for trunk


Ignore:
Timestamp:
May 25, 2017 8:44:38 AM (7 years ago)
Author:
vboxsync
Message:

FE/Qt: Selector UI: Tools pane: Fixing missed toolbars on macOS when the Virtual Media manager and Host Network manager embedded into stack.

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

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.h

    r67017 r67075  
    2828class UIToolBar;
    2929#endif
     30
     31
     32/** Widget embedding type. */
     33enum EmbedTo
     34{
     35    EmbedTo_Dialog,
     36    EmbedTo_Stack
     37};
    3038
    3139
  • trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp

    r67047 r67075  
    190190*********************************************************************************************************************************/
    191191
    192 UIHostNetworkManagerWidget::UIHostNetworkManagerWidget(QWidget *pParent /* = 0 */)
     192UIHostNetworkManagerWidget::UIHostNetworkManagerWidget(EmbedTo enmEmbedding, QWidget *pParent /* = 0 */)
    193193    : QIWithRetranslateUI<QWidget>(pParent)
     194    , m_enmEmbedding(enmEmbedding)
    194195    , m_pToolBar(0)
    195196    , m_pMenu(0)
     
    826827        if (m_pActionCommit)
    827828            m_pToolBar->addAction(m_pActionCommit);
    828 #ifndef VBOX_WS_MAC
     829#ifdef VBOX_WS_MAC
     830        /* Check whether we are embedded into a stack: */
     831        if (m_enmEmbedding == EmbedTo_Stack)
     832        {
     833            /* Add into layout: */
     834            layout()->addWidget(m_pToolBar);
     835        }
     836#else
    829837        /* Add into layout: */
    830838        layout()->addWidget(m_pToolBar);
     
    10401048{
    10411049    /* Create widget: */
    1042     UIHostNetworkManagerWidget *pWidget = new UIHostNetworkManagerWidget(this);
     1050    UIHostNetworkManagerWidget *pWidget = new UIHostNetworkManagerWidget(EmbedTo_Dialog, this);
    10431051    AssertPtrReturnVoid(pWidget);
    10441052    {
  • trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.h

    r67021 r67075  
    4646
    4747    /** Constructs Host Network Manager widget. */
    48     UIHostNetworkManagerWidget(QWidget *pParent = 0);
     48    UIHostNetworkManagerWidget(EmbedTo enmEmbedding, QWidget *pParent = 0);
    4949
    5050    /** Returns the menu. */
     
    135135    /** @} */
    136136
     137    /** @name General variables.
     138      * @{ */
     139        /** Holds the widget embedding type. */
     140        const EmbedTo m_enmEmbedding;
     141    /** @} */
     142
    137143    /** @name Toolbar and menu variables.
    138144      * @{ */
  • trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

    r67046 r67075  
    658658*********************************************************************************************************************************/
    659659
    660 UIMediumManagerWidget::UIMediumManagerWidget(QWidget *pParent /* = 0 */)
     660UIMediumManagerWidget::UIMediumManagerWidget(EmbedTo enmEmbedding, QWidget *pParent /* = 0 */)
    661661    : QIWithRetranslateUI<QWidget>(pParent)
     662    , m_enmEmbedding(enmEmbedding)
    662663    , m_fPreventChangeCurrentItem(false)
    663664    , m_pTabWidget(0)
     
    12451246        if (m_pActionRefresh)
    12461247            m_pToolBar->addAction(m_pActionRefresh);
    1247 #ifndef VBOX_WS_MAC
     1248#ifdef VBOX_WS_MAC
     1249        /* Check whether we are embedded into a stack: */
     1250        if (m_enmEmbedding == EmbedTo_Stack)
     1251        {
     1252            /* Add into layout: */
     1253            layout()->addWidget(m_pToolBar);
     1254        }
     1255#else
    12481256        /* Add into layout: */
    12491257        layout()->addWidget(m_pToolBar);
     
    22972305{
    22982306    /* Create widget: */
    2299     UIMediumManagerWidget *pWidget = new UIMediumManagerWidget(this);
     2307    UIMediumManagerWidget *pWidget = new UIMediumManagerWidget(EmbedTo_Dialog, this);
    23002308    AssertPtrReturnVoid(pWidget);
    23012309    {
  • trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h

    r67046 r67075  
    6262
    6363    /** Constructs Virtual Medium Manager widget. */
    64     UIMediumManagerWidget(QWidget *pParent = 0);
     64    UIMediumManagerWidget(EmbedTo enmEmbedding, QWidget *pParent = 0);
    6565
    6666    /** Returns the menu. */
     
    251251    /** @name General variables.
    252252      * @{ */
     253        /** Holds the widget embedding type. */
     254        const EmbedTo m_enmEmbedding;
     255
    253256        /** Holds whether Virtual Medium Manager should preserve current item change. */
    254257        bool m_fPreventChangeCurrentItem;
  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPane.cpp

    r67068 r67075  
    291291                break;
    292292            case ToolsType_VirtualMediaManager:
    293                 m_pStackedWidget->addWidget(new UIMediumManagerWidget);
     293                m_pStackedWidget->addWidget(new UIMediumManagerWidget(EmbedTo_Stack));
    294294                break;
    295295            case ToolsType_HostNetworkManager:
    296                 m_pStackedWidget->addWidget(new UIHostNetworkManagerWidget);
     296                m_pStackedWidget->addWidget(new UIHostNetworkManagerWidget(EmbedTo_Stack));
    297297                break;
    298298            default:
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