Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp (revision 92477) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp (revision 92478) @@ -3162,4 +3162,5 @@ m_menuUpdateHandlers[UIActionIndex_M_Activity].ptf = &UIActionPool::updateMenuVMActivityMonitor; m_menuUpdateHandlers[UIActionIndex_M_FileManager].ptf = &UIActionPool::updateMenuFileManager; + m_menuUpdateHandlers[UIActionIndex_M_VISOCreator].ptf = &UIActionPool::updateMenuVISOCreator; /* Invalidate all known menus: */ @@ -3539,5 +3540,5 @@ pMenu->clear(); - /* 'Export' action: */ + /* 'Export' and 'Switch to VM Activity Overview" actions: */ pMenu->addAction(action(UIActionIndex_M_Activity_S_Export)); pMenu->addAction(action(UIActionIndex_M_Activity_S_ToVMActivityOverview)); @@ -3553,4 +3554,19 @@ /* Mark menu as valid: */ m_invalidations.remove(UIActionIndex_M_FileManager); +} + +void UIActionPool::updateMenuVISOCreator() +{ + /* Get corresponding menu: */ + UIMenu *pMenu = action(UIActionIndex_M_VISOCreator)->menu(); + AssertPtrReturnVoid(pMenu); + /* Clear contents: */ + pMenu->clear(); + + pMenu->addAction(action(UIActionIndex_M_VISOCreator_ToggleConfigPanel)); + pMenu->addAction(action(UIActionIndex_M_VISOCreator_ToggleOptionsPanel)); + + /* Mark menu as valid: */ + m_invalidations.remove(UIActionIndex_M_Activity); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h (revision 92477) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h (revision 92478) @@ -613,4 +613,6 @@ /** Updates 'File Manager' @a pMenu. */ void updateMenuFileManagerWrapper(UIMenu *pMenu); + /** Updates 'VISO Creator' pMenu. */ + void updateMenuVISOCreator(); /** Holds the map of actions. */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.cpp (revision 92477) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.cpp (revision 92478) @@ -3530,4 +3530,7 @@ /* 'File Manager' menu: */ updateMenuFileManager(); + + /* 'VISO Creator' menu: */ + updateMenuVISOCreator(); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.cpp (revision 92477) +++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.cpp (revision 92478) @@ -216,5 +216,6 @@ case UIToolType_VISOCreator: { - m_pPaneVISOCreator = new UIVisoCreatorWidget(m_pActionPool, 0 /* Parent */, QString() /* Machine Name */); + m_pPaneVISOCreator = new UIVisoCreatorWidget(m_pActionPool, 0 /* Parent */, + false /* don't show toolbar*/, QString() /* Machine Name */); AssertPtrReturnVoid(m_pPaneVISOCreator); #ifndef VBOX_WS_MAC Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp (revision 92477) +++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp (revision 92478) @@ -966,4 +966,14 @@ break; } + case UIToolType_VISOCreator: + { + m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_VISOCreator_ToggleConfigPanel)); + m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_VISOCreator_ToggleOptionsPanel)); + m_pToolBar->addSeparator(); + m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Settings)); + m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Discard)); + m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow)); + break; + } case UIToolType_Error: { Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp (revision 92477) +++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp (revision 92478) @@ -47,5 +47,6 @@ *********************************************************************************************************************************/ -UIVisoCreatorWidget::UIVisoCreatorWidget(UIActionPool *pActionPool, QWidget *pParent, const QString& strMachineName /* = QString() */) +UIVisoCreatorWidget::UIVisoCreatorWidget(UIActionPool *pActionPool, QWidget *pParent, + bool fShowToolBar,const QString& strMachineName /* = QString() */) : QIWithRetranslateUI(pParent) , m_pActionConfiguration(0) @@ -66,4 +67,5 @@ , m_pConfigurationPanel(0) , m_pActionPool(pActionPool) + , m_fShowToolBar(fShowToolBar) { m_visoOptions.m_strVisoName = !strMachineName.isEmpty() ? strMachineName : "ad-hoc"; @@ -234,13 +236,16 @@ if (m_pActionPool && m_pActionPool->action(UIActionIndex_M_VISOCreator)) m_pMainMenu = m_pActionPool->action(UIActionIndex_M_VISOCreator)->menu(); - - m_pToolBar = new QIToolBar(parentWidget()); - if (m_pToolBar) - { - /* Configure toolbar: */ - const int iIconMetric = (int)(QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize)); - m_pToolBar->setIconSize(QSize(iIconMetric, iIconMetric)); - m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); - m_pMainLayout->addWidget(m_pToolBar, 0, 0, 1, 5); + int iLayoutRow = 0; + if (m_fShowToolBar) + { + m_pToolBar = new QIToolBar(parentWidget()); + if (m_pToolBar) + { + /* Configure toolbar: */ + const int iIconMetric = (int)(QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize)); + m_pToolBar->setIconSize(QSize(iIconMetric, iIconMetric)); + m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); + m_pMainLayout->addWidget(m_pToolBar, iLayoutRow++, 0, 1, 5); + } } @@ -248,8 +253,6 @@ if (m_pHostBrowser) { - m_pMainLayout->addWidget(m_pHostBrowser, 1, 0, 1, 2); - m_pHostBrowser->setAlignment(Qt::AlignLeft); - - m_pMainLayout->setColumnStretch(m_pMainLayout->indexOf(m_pHostBrowser), 2); + m_pMainLayout->addWidget(m_pHostBrowser, iLayoutRow, 0, 1, 4); + //m_pMainLayout->setColumnStretch(m_pMainLayout->indexOf(m_pHostBrowser), 2); } @@ -257,6 +260,6 @@ if (m_pVerticalToolBar) { - m_pMainLayout->addWidget(m_pVerticalToolBar, 1, 2, 1, 1); - m_pMainLayout->setColumnStretch(m_pMainLayout->indexOf(m_pVerticalToolBar), 1); + m_pMainLayout->addWidget(m_pVerticalToolBar, iLayoutRow, 4, 1, 1); + //m_pMainLayout->setColumnStretch(m_pMainLayout->indexOf(m_pVerticalToolBar), 1); } @@ -264,13 +267,13 @@ if (m_pVISOContentBrowser) { - m_pMainLayout->addWidget(m_pVISOContentBrowser, 1, 3, 1, 2); + m_pMainLayout->addWidget(m_pVISOContentBrowser, iLayoutRow, 5, 1, 4); m_pVISOContentBrowser->setVisoName(m_visoOptions.m_strVisoName); - m_pMainLayout->setColumnStretch(m_pMainLayout->indexOf(m_pVISOContentBrowser), 2); - } - + //m_pMainLayout->setColumnStretch(m_pMainLayout->indexOf(m_pVISOContentBrowser), 2); + } + ++iLayoutRow; m_pConfigurationPanel = new UIVisoConfigurationPanel(this); if (m_pConfigurationPanel) { - m_pMainLayout->addWidget(m_pConfigurationPanel, 2, 0, 1, 5); + m_pMainLayout->addWidget(m_pConfigurationPanel, iLayoutRow++, 0, 1, 9); m_pConfigurationPanel->hide(); m_pConfigurationPanel->setVisoName(m_visoOptions.m_strVisoName); @@ -282,5 +285,5 @@ { m_pCreatorOptionsPanel->setShowHiddenbjects(m_browserOptions.m_fShowHiddenObjects); - m_pMainLayout->addWidget(m_pCreatorOptionsPanel, 3, 0, 1, 5); + m_pMainLayout->addWidget(m_pCreatorOptionsPanel, iLayoutRow++, 0, 1, 9); m_pCreatorOptionsPanel->hide(); } @@ -561,5 +564,5 @@ - m_pVisoCreatorWidget = new UIVisoCreatorWidget(m_pActionPool, this, m_strMachineName); + m_pVisoCreatorWidget = new UIVisoCreatorWidget(m_pActionPool, this, true /* show toolbar */, m_strMachineName); if (m_pVisoCreatorWidget) { Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.h (revision 92477) +++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.h (revision 92478) @@ -52,5 +52,6 @@ public: - UIVisoCreatorWidget(UIActionPool *pActionPool, QWidget *pParent, const QString& strMachineName = QString()); + UIVisoCreatorWidget(UIActionPool *pActionPool, QWidget *pParent, + bool fShowToolBar, const QString& strMachineName = QString()); /** Returns the content of the .viso file. Each element of the list corresponds to a line in the .viso file. */ QStringList entryList() const; @@ -165,4 +166,5 @@ QList m_visiblePanelsList; QPointer m_pActionPool; + bool m_fShowToolBar; };