Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 51936) +++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 51937) @@ -387,4 +387,5 @@ src/widgets/UISpacerWidgets.h \ src/widgets/UISpecialControls.h \ + src/widgets/UIToolBar.h \ src/widgets/VBoxFilePathSelectorWidget.h \ src/widgets/VBoxMediaComboBox.h \ Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp (revision 51936) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp (revision 51937) @@ -1214,5 +1214,6 @@ } /* Initial focus: */ - m_pViewOfChooser->setFocus(); + if (m_pViewOfChooser) + m_pViewOfChooser->setFocus(); } } @@ -1237,5 +1238,5 @@ /* Enable unified tool-bars on Mac OS X. Available on Qt >= 4.3: */ addToolBar(m_pToolBar); - m_pToolBar->setMacToolbar(); + m_pToolBar->enableMacToolbar(); #else /* !MAC_LEOPARD_STYLE */ /* Add tool-bar into main-layout: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp (revision 51936) +++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp (revision 51937) @@ -1152,5 +1152,5 @@ /* Enable unified tool-bars on Mac OS X. Available on Qt >= 4.3: */ addToolBar(m_pToolBar); - m_pToolBar->setMacToolbar(); + m_pToolBar->enableMacToolbar(); /* No spacing/margin on the Mac: */ pMainLayout->setContentsMargins(0, 0, 0, 0); Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp (revision 51936) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp (revision 51937) @@ -121,5 +121,5 @@ * We do this after setting the window pos/size, cause Qt sometimes * includes the toolbar height in the content height. */ - mVMToolBar->setMacToolbar(); + mVMToolBar->enableMacToolbar(); # endif /* MAC_LEOPARD_STYLE */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp (revision 51936) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp (revision 51937) @@ -375,5 +375,4 @@ /* ToolBar creation */ UIToolBar *toolBar = new UIToolBar (this); - toolBar->setUsesTextLabel (false); toolBar->setIconSize (QSize (22, 22)); toolBar->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed); Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp (revision 51936) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp (revision 51937) @@ -85,5 +85,5 @@ /* Create modern tool-bar selector: */ m_pSelector = new VBoxSettingsToolBarSelector(this); - static_cast(m_pSelector->widget())->setMacToolbar(); + static_cast(m_pSelector->widget())->enableMacToolbar(); addToolBar(qobject_cast(m_pSelector->widget())); /* No title in this mode, we change the title of the window: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/VBoxSettingsSelector.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/VBoxSettingsSelector.cpp (revision 51936) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/VBoxSettingsSelector.cpp (revision 51937) @@ -379,5 +379,5 @@ /* Init the toolbar */ mTbSelector = new UIToolBar (aParent); - mTbSelector->setUsesTextLabel (true); + mTbSelector->setUseTextLabels (true); mTbSelector->setIconSize (QSize (32, 32)); #ifdef Q_WS_MAC Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp (revision 51936) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp (revision 51937) @@ -102,5 +102,4 @@ /* Setup tool-bar: */ - m_pPackagesToolbar->setUsesTextLabel(false); m_pPackagesToolbar->setIconSize(QSize(16, 16)); m_pPackagesToolbar->setOrientation(Qt::Vertical); Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp (revision 51936) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp (revision 51937) @@ -451,5 +451,4 @@ /* Prepare NAT network toolbar: */ { - m_pToolbarNetworkNAT->setUsesTextLabel(false); m_pToolbarNetworkNAT->setIconSize(QSize(16, 16)); m_pToolbarNetworkNAT->setOrientation(Qt::Vertical); @@ -460,5 +459,4 @@ /* Prepare Host network toolbar: */ { - m_pToolbarNetworkHost->setUsesTextLabel(false); m_pToolbarNetworkHost->setIconSize(QSize(16, 16)); m_pToolbarNetworkHost->setOrientation(Qt::Vertical); Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp (revision 51936) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp (revision 51937) @@ -188,5 +188,4 @@ /* Prepare tool-bar: */ - m_pFoldersToolBar->setUsesTextLabel(false); m_pFoldersToolBar->setIconSize(QSize(16, 16)); m_pFoldersToolBar->setOrientation(Qt::Vertical); Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp (revision 51936) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp (revision 51937) @@ -176,5 +176,4 @@ /* Prepare tool-bar: */ - m_pFiltersToolBar->setUsesTextLabel(false); m_pFiltersToolBar->setIconSize(QSize(16, 16)); m_pFiltersToolBar->setOrientation(Qt::Vertical); Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp (revision 51936) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp (revision 51937) @@ -1,11 +1,9 @@ /* $Id$ */ /** @file - * - * VBox frontends: Qt GUI ("VirtualBox"): - * UIToolBar class implementation + * VBox Qt GUI - UIToolBar class implementation. */ /* - * Copyright (C) 2006-2013 Oracle Corporation + * Copyright (C) 2006-2014 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as @@ -18,5 +16,11 @@ */ -/* Local includes */ +/* Qt includes: */ +#include +#include +#include +#include + +/* GUI includes: */ #include "UIToolBar.h" #ifdef Q_WS_MAC @@ -24,39 +28,18 @@ #endif /* Q_WS_MAC */ -/* Qt includes: */ -#include -#include -/* Note: These styles are available on _all_ platforms: */ -#include -#include - -UIToolBar::UIToolBar(QWidget *pParent /* = 0*/) +UIToolBar::UIToolBar(QWidget *pParent /* = 0 */) : QToolBar(pParent) , m_pMainWindow(qobject_cast(pParent)) { - /* Configure tool-bar: */ - setFloatable(false); - setMovable(false); - - /* Remove that ugly frame panel around the toolbar. - * Doing that currently for Cleanlooks & Windows styles. */ - if (qobject_cast (QToolBar::style()) || - qobject_cast (QToolBar::style())) - setStyleSheet("QToolBar { border: 0px none black; }"); - - /* Configure layout: */ - if (layout()) - layout()->setContentsMargins(0, 0, 0, 0);; - - /* Configure context-menu policy: */ - setContextMenuPolicy(Qt::NoContextMenu); + /* Prepare: */ + prepare(); } -void UIToolBar::setUsesTextLabel(bool fEnable) +void UIToolBar::setUseTextLabels(bool fEnable) { - Qt::ToolButtonStyle tbs = Qt::ToolButtonTextUnderIcon; - if (!fEnable) - tbs = Qt::ToolButtonIconOnly; + /* Determine tool-button style on the basis of passed flag: */ + Qt::ToolButtonStyle tbs = fEnable ? Qt::ToolButtonTextUnderIcon : Qt::ToolButtonIconOnly; + /* Depending on parent, assign this style: */ if (m_pMainWindow) m_pMainWindow->setToolButtonStyle(tbs); @@ -66,6 +49,7 @@ #ifdef Q_WS_MAC -void UIToolBar::setMacToolbar() +void UIToolBar::enableMacToolbar() { + /* Depending on parent, enable unified title/tool-bar: */ if (m_pMainWindow) m_pMainWindow->setUnifiedTitleAndToolBarOnMac(true); @@ -92,2 +76,22 @@ #endif /* Q_WS_MAC */ +void UIToolBar::prepare() +{ + /* Configure tool-bar: */ + setFloatable(false); + setMovable(false); + + /* Remove that ugly frame panel around the toolbar. + * Doing that currently for Cleanlooks & Windows styles. */ + if (qobject_cast (QToolBar::style()) || + qobject_cast (QToolBar::style())) + setStyleSheet("QToolBar { border: 0px none black; }"); + + /* Configure tool-bar' layout: */ + if (layout()) + layout()->setContentsMargins(0, 0, 0, 0); + + /* Configure tool-bar' context-menu policy: */ + setContextMenuPolicy(Qt::NoContextMenu); +} + Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.h (revision 51936) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.h (revision 51937) @@ -1,10 +1,8 @@ /** @file - * - * VBox frontends: Qt GUI ("VirtualBox"): - * UIToolBar class declaration + * VBox Qt GUI - UIToolBar class declaration. */ /* - * Copyright (C) 2006-2013 Oracle Corporation + * Copyright (C) 2006-2014 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as @@ -26,19 +24,25 @@ class QMainWindow; -/* UI tool-bar prototype class: */ +/** QToolBar extension + * with few settings presets. */ class UIToolBar : public QToolBar { + Q_OBJECT; + public: - /* Constructor: */ + /** Constructor, passes @a pParent to the QToolBar constructor. */ UIToolBar(QWidget *pParent = 0); - /* API: Text-label stuff: */ - void setUsesTextLabel(bool fEnable); + /** Defines whether tool-bar should use text-labels. + * Default value if @a false. */ + void setUseTextLabels(bool fEnable); #ifdef Q_WS_MAC - /* API: Mac toolbar stuff: */ - void setMacToolbar(); + /** Mac OS X: Defines whether native tool-bar should be used. */ + void enableMacToolbar(); + /** Mac OS X: Defines whether native tool-bar button should be shown. */ void setShowToolBarButton(bool fShow); + /** Mac OS X: Updates native tool-bar layout. */ void updateLayout(); #endif /* Q_WS_MAC */ @@ -46,5 +50,8 @@ private: - /* Variables: */ + /** Prepare routine. */ + void prepare(); + + /** Holds the parent main-window isntance. */ QMainWindow *m_pMainWindow; };