VirtualBox

Changeset 92478 in vbox


Ignore:
Timestamp:
Nov 17, 2021 1:47:45 PM (3 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:10141. More fixes for VISO creator machine tool.

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

Legend:

Unmodified
Added
Removed

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

    r92467 r92478  
    31623162    m_menuUpdateHandlers[UIActionIndex_M_Activity].ptf = &UIActionPool::updateMenuVMActivityMonitor;
    31633163    m_menuUpdateHandlers[UIActionIndex_M_FileManager].ptf = &UIActionPool::updateMenuFileManager;
     3164    m_menuUpdateHandlers[UIActionIndex_M_VISOCreator].ptf = &UIActionPool::updateMenuVISOCreator;
    31643165
    31653166    /* Invalidate all known menus: */
    … …  
    35393540    pMenu->clear();
    35403541
    3541     /* 'Export' action: */
     3542    /* 'Export' and 'Switch to VM Activity Overview" actions: */
    35423543    pMenu->addAction(action(UIActionIndex_M_Activity_S_Export));
    35433544    pMenu->addAction(action(UIActionIndex_M_Activity_S_ToVMActivityOverview));
    … …  
    35533554    /* Mark menu as valid: */
    35543555    m_invalidations.remove(UIActionIndex_M_FileManager);
     3556}
     3557
     3558void UIActionPool::updateMenuVISOCreator()
     3559{
     3560    /* Get corresponding menu: */
     3561    UIMenu *pMenu = action(UIActionIndex_M_VISOCreator)->menu();
     3562    AssertPtrReturnVoid(pMenu);
     3563    /* Clear contents: */
     3564    pMenu->clear();
     3565
     3566    pMenu->addAction(action(UIActionIndex_M_VISOCreator_ToggleConfigPanel));
     3567    pMenu->addAction(action(UIActionIndex_M_VISOCreator_ToggleOptionsPanel));
     3568
     3569    /* Mark menu as valid: */
     3570    m_invalidations.remove(UIActionIndex_M_Activity);
    35553571}
    35563572

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

    r92423 r92478  
    613613    /** Updates 'File Manager' @a pMenu. */
    614614    void updateMenuFileManagerWrapper(UIMenu *pMenu);
     615    /** Updates 'VISO Creator' pMenu. */
     616    void updateMenuVISOCreator();
    615617
    616618    /** Holds the map of actions. */

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

    r90083 r92478  
    35303530    /* 'File Manager' menu: */
    35313531    updateMenuFileManager();
     3532
     3533    /* 'VISO Creator' menu: */
     3534    updateMenuVISOCreator();
    35323535}
    35333536

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

    r92467 r92478  
    216216            case UIToolType_VISOCreator:
    217217            {
    218                 m_pPaneVISOCreator = new UIVisoCreatorWidget(m_pActionPool, 0 /* Parent */, QString() /* Machine Name */);
     218                m_pPaneVISOCreator = new UIVisoCreatorWidget(m_pActionPool, 0 /* Parent */,
     219                                                             false /* don't show toolbar*/, QString() /* Machine Name */);
    219220                AssertPtrReturnVoid(m_pPaneVISOCreator);
    220221#ifndef VBOX_WS_MAC

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

    r90299 r92478  
    966966                    break;
    967967                }
     968                case UIToolType_VISOCreator:
     969                {
     970                    m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_VISOCreator_ToggleConfigPanel));
     971                    m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_VISOCreator_ToggleOptionsPanel));
     972                    m_pToolBar->addSeparator();
     973                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Settings));
     974                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Discard));
     975                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow));
     976                    break;
     977                }
    968978                case UIToolType_Error:
    969979                {

  • trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp

    r92471 r92478  
    4747*********************************************************************************************************************************/
    4848
    49 UIVisoCreatorWidget::UIVisoCreatorWidget(UIActionPool *pActionPool, QWidget *pParent, const QString& strMachineName /* = QString() */)
     49UIVisoCreatorWidget::UIVisoCreatorWidget(UIActionPool *pActionPool, QWidget *pParent,
     50                                         bool fShowToolBar,const QString& strMachineName /* = QString() */)
    5051    : QIWithRetranslateUI<QWidget>(pParent)
    5152    , m_pActionConfiguration(0)
    … …  
    6667    , m_pConfigurationPanel(0)
    6768    , m_pActionPool(pActionPool)
     69    , m_fShowToolBar(fShowToolBar)
    6870{
    6971    m_visoOptions.m_strVisoName = !strMachineName.isEmpty() ? strMachineName : "ad-hoc";
    … …  
    234236    if (m_pActionPool && m_pActionPool->action(UIActionIndex_M_VISOCreator))
    235237        m_pMainMenu = m_pActionPool->action(UIActionIndex_M_VISOCreator)->menu();
    236 
    237     m_pToolBar = new QIToolBar(parentWidget());
    238     if (m_pToolBar)
    239     {
    240         /* Configure toolbar: */
    241         const int iIconMetric = (int)(QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize));
    242         m_pToolBar->setIconSize(QSize(iIconMetric, iIconMetric));
    243         m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
    244         m_pMainLayout->addWidget(m_pToolBar, 0, 0, 1, 5);
     238    int iLayoutRow = 0;
     239    if (m_fShowToolBar)
     240    {
     241        m_pToolBar = new QIToolBar(parentWidget());
     242        if (m_pToolBar)
     243        {
     244            /* Configure toolbar: */
     245            const int iIconMetric = (int)(QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize));
     246            m_pToolBar->setIconSize(QSize(iIconMetric, iIconMetric));
     247            m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
     248            m_pMainLayout->addWidget(m_pToolBar, iLayoutRow++, 0, 1, 5);
     249        }
    245250    }
    246251
    … …  
    248253    if (m_pHostBrowser)
    249254    {
    250         m_pMainLayout->addWidget(m_pHostBrowser, 1, 0, 1, 2);
    251         m_pHostBrowser->setAlignment(Qt::AlignLeft);
    252 
    253         m_pMainLayout->setColumnStretch(m_pMainLayout->indexOf(m_pHostBrowser), 2);
     255        m_pMainLayout->addWidget(m_pHostBrowser, iLayoutRow, 0, 1, 4);
     256        //m_pMainLayout->setColumnStretch(m_pMainLayout->indexOf(m_pHostBrowser), 2);
    254257    }
    255258
    … …  
    257260    if (m_pVerticalToolBar)
    258261    {
    259         m_pMainLayout->addWidget(m_pVerticalToolBar, 1, 2, 1, 1);
    260         m_pMainLayout->setColumnStretch(m_pMainLayout->indexOf(m_pVerticalToolBar), 1);
     262        m_pMainLayout->addWidget(m_pVerticalToolBar, iLayoutRow, 4, 1, 1);
     263        //m_pMainLayout->setColumnStretch(m_pMainLayout->indexOf(m_pVerticalToolBar), 1);
    261264    }
    262265
    … …  
    264267    if (m_pVISOContentBrowser)
    265268    {
    266         m_pMainLayout->addWidget(m_pVISOContentBrowser, 1, 3, 1, 2);
     269        m_pMainLayout->addWidget(m_pVISOContentBrowser, iLayoutRow, 5, 1, 4);
    267270        m_pVISOContentBrowser->setVisoName(m_visoOptions.m_strVisoName);
    268         m_pMainLayout->setColumnStretch(m_pMainLayout->indexOf(m_pVISOContentBrowser), 2);
    269     }
    270 
     271        //m_pMainLayout->setColumnStretch(m_pMainLayout->indexOf(m_pVISOContentBrowser), 2);
     272    }
     273    ++iLayoutRow;
    271274    m_pConfigurationPanel = new UIVisoConfigurationPanel(this);
    272275    if (m_pConfigurationPanel)
    273276    {
    274         m_pMainLayout->addWidget(m_pConfigurationPanel, 2, 0, 1, 5);
     277        m_pMainLayout->addWidget(m_pConfigurationPanel, iLayoutRow++, 0, 1, 9);
    275278        m_pConfigurationPanel->hide();
    276279        m_pConfigurationPanel->setVisoName(m_visoOptions.m_strVisoName);
    … …  
    282285    {
    283286        m_pCreatorOptionsPanel->setShowHiddenbjects(m_browserOptions.m_fShowHiddenObjects);
    284         m_pMainLayout->addWidget(m_pCreatorOptionsPanel, 3, 0, 1, 5);
     287        m_pMainLayout->addWidget(m_pCreatorOptionsPanel, iLayoutRow++, 0, 1, 9);
    285288        m_pCreatorOptionsPanel->hide();
    286289    }
    … …  
    561564
    562565
    563     m_pVisoCreatorWidget = new UIVisoCreatorWidget(m_pActionPool, this, m_strMachineName);
     566    m_pVisoCreatorWidget = new UIVisoCreatorWidget(m_pActionPool, this, true /* show toolbar */, m_strMachineName);
    564567    if (m_pVisoCreatorWidget)
    565568    {

  • trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.h

    r92471 r92478  
    5252public:
    5353
    54     UIVisoCreatorWidget(UIActionPool *pActionPool, QWidget *pParent, const QString& strMachineName = QString());
     54    UIVisoCreatorWidget(UIActionPool *pActionPool, QWidget *pParent,
     55                        bool fShowToolBar, const QString& strMachineName = QString());
    5556    /** Returns the content of the .viso file. Each element of the list corresponds to a line in the .viso file. */
    5657    QStringList       entryList() const;
    … …  
    165166    QList<UIDialogPanel*>          m_visiblePanelsList;
    166167    QPointer<UIActionPool> m_pActionPool;
     168    bool                   m_fShowToolBar;
    167169};
    168170
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