Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 76946) +++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 76947) @@ -805,4 +805,5 @@ src/globals/UICustomFileSystemModel.h \ src/globals/UIDesktopWidgetWatchdog.h \ + src/globals/UIDialogPanel.h \ src/globals/UIMainEventListener.h \ src/globals/UIMessageCenter.h \ @@ -832,5 +833,4 @@ src/medium/viso/UIVisoContentBrowser.h \ src/medium/viso/UIVisoCreator.h \ - src/medium/viso/UIVisoCreatorPanel.h \ src/medium/viso/UIVisoConfigurationPanel.h \ src/medium/viso/UIVisoCreatorOptionsPanel.h \ @@ -1266,4 +1266,5 @@ src/globals/UIDefs.cpp \ src/globals/UIDesktopWidgetWatchdog.cpp \ + src/globals/UIDialogPanel.cpp \ src/globals/UIErrorString.cpp \ src/globals/UIIconPool.cpp \ @@ -1298,5 +1299,4 @@ src/medium/viso/UIVisoContentBrowser.cpp \ src/medium/viso/UIVisoCreator.cpp \ - src/medium/viso/UIVisoCreatorPanel.cpp \ src/medium/viso/UIVisoConfigurationPanel.cpp \ src/medium/viso/UIVisoCreatorOptionsPanel.cpp \ Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDialogPanel.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDialogPanel.cpp (revision 76947) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDialogPanel.cpp (revision 76947) @@ -0,0 +1,129 @@ +/* $Id$ */ +/** @file + * VBox Qt GUI - UIVMLogViewer class implementation. + */ + +/* + * Copyright (C) 2010-2019 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + */ + +/* Qt includes: */ +#include +#include +#include +#include +#include +#include + +/* GUI includes: */ +#include "QIToolButton.h" +#include "UIIconPool.h" +#include "UIDialogPanel.h" +#ifdef VBOX_WS_MAC +# include "VBoxUtils-darwin.h" +#endif + + +UIDialogPanel::UIDialogPanel(QWidget *pParent) + : QIWithRetranslateUI(pParent) + , m_pMainLayout(0) + , m_pCloseButton(0) +{ + prepare(); +} + +void UIDialogPanel::setCloseButtonShortCut(QKeySequence shortCut) +{ + if (!m_pCloseButton) + return; + m_pCloseButton->setShortcut(shortCut); +} + +QHBoxLayout* UIDialogPanel::mainLayout() +{ + return m_pMainLayout; +} + +void UIDialogPanel::prepare() +{ + prepareWidgets(); + prepareConnections(); + retranslateUi(); +} + +void UIDialogPanel::prepareWidgets() +{ + m_pMainLayout = new QHBoxLayout(this); + if (m_pMainLayout) + { +#ifdef VBOX_WS_MAC + m_pMainLayout->setContentsMargins(5 /* since there is always a button */, 0, 10 /* standard */, 0); + m_pMainLayout->setSpacing(10); +#else + m_pMainLayout->setContentsMargins(qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 2, 0, + qApp->style()->pixelMetric(QStyle::PM_LayoutRightMargin) / 2, + qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin) / 2); + m_pMainLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing)); +#endif + } + m_pCloseButton = new QIToolButton; + if (m_pCloseButton) + { + m_pCloseButton->setIcon(UIIconPool::iconSet(":/close_16px.png")); + m_pMainLayout->addWidget(m_pCloseButton, 0, Qt::AlignLeft); + } +} + +void UIDialogPanel::prepareConnections() +{ + if (m_pCloseButton) + connect(m_pCloseButton, &QIToolButton::clicked, this, &UIDialogPanel::hide); +} + +void UIDialogPanel::retranslateUi() +{ + if (m_pCloseButton) + m_pCloseButton->setToolTip(QApplication::translate("UIVisoCreator", "Close the pane")); +} + +bool UIDialogPanel::eventFilter(QObject *pObject, QEvent *pEvent) +{ + Q_UNUSED(pObject); + Q_UNUSED(pEvent); + /* Dont consume this event. Pass it back to Qt's event system: */ + return false; +} + +void UIDialogPanel::showEvent(QShowEvent *pEvent) +{ + QWidget::showEvent(pEvent); +} + +void UIDialogPanel::hideEvent(QHideEvent *pEvent) +{ + /* Get focused widget: */ + QWidget *pFocus = QApplication::focusWidget(); + /* If focus-widget is valid and child-widget of search-panel, + * focus next child-widget in line: */ + if (pFocus && pFocus->parent() == this) + focusNextPrevChild(true); + emit sigHidePanel(this); + + QWidget::hideEvent(pEvent); +} + +void UIDialogPanel::addVerticalSeparator() +{ + QFrame *pSeparator = new QFrame(); + pSeparator->setFrameShape(QFrame::VLine); + pSeparator->setFrameShadow(QFrame::Sunken); + mainLayout()->addWidget(pSeparator); +} Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDialogPanel.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDialogPanel.h (revision 76947) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDialogPanel.h (revision 76947) @@ -0,0 +1,79 @@ +/* $Id$ */ +/** @file + * VBox Qt GUI - UIVMLogViewer class declaration. + */ + +/* + * Copyright (C) 2010-2019 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + */ + +#ifndef FEQT_INCLUDED_SRC_globals_UIDialogPanel_h +#define FEQT_INCLUDED_SRC_globals_UIDialogPanel_h +#ifndef RT_WITHOUT_PRAGMA_ONCE +# pragma once +#endif + +/* Qt includes: */ +#include +#include +/* GUI includes: */ +#include "QIWithRetranslateUI.h" + +/* Forward declarations: */ +class QHBoxLayout; +class QPlainTextEdit; +class QTextDocument; +class QIToolButton; + + +/** QWidget extension acting as the base class for UIVMLogViewerXXXPanel widgets. */ +class UIDialogPanel : public QIWithRetranslateUI +{ + Q_OBJECT; + +public: + + UIDialogPanel(QWidget *pParent); + void setCloseButtonShortCut(QKeySequence shortCut); + virtual QString panelName() const = 0; + +signals: + + void sigHidePanel(UIDialogPanel *pPanel); + +protected: + + virtual void prepare(); + virtual void prepareWidgets(); + virtual void prepareConnections(); + + /* Access functions for children classes. */ + QHBoxLayout* mainLayout(); + + /** Handles the translation event. */ + void retranslateUi() /* override */; + + /** Handles Qt @a pEvent, used for keyboard processing. */ + bool eventFilter(QObject *pObject, QEvent *pEvent); + /** Handles the Qt show @a pEvent. */ + void showEvent(QShowEvent *pEvent); + /** Handles the Qt hide @a pEvent. */ + void hideEvent(QHideEvent *pEvent); + void addVerticalSeparator(); + +private: + + /** Holds the reference to VM Log-Viewer this panel belongs to. */ + QHBoxLayout *m_pMainLayout; + QIToolButton *m_pCloseButton; +}; + +#endif /* !FEQT_INCLUDED_SRC_globals_UIDialogPanel_h */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoConfigurationPanel.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoConfigurationPanel.cpp (revision 76946) +++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoConfigurationPanel.cpp (revision 76947) @@ -35,5 +35,5 @@ UIVisoConfigurationPanel::UIVisoConfigurationPanel(QWidget *pParent /* =0 */) - : UIVisoCreatorPanel(pParent) + : UIDialogPanel(pParent) , m_pVisoNameLabel(0) , m_pCustomOptionsLabel(0) @@ -137,5 +137,5 @@ } /* Call to base-class: */ - return UIVisoCreatorPanel::eventFilter(pObject, pEvent); + return UIDialogPanel::eventFilter(pObject, pEvent); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoConfigurationPanel.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoConfigurationPanel.h (revision 76946) +++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoConfigurationPanel.h (revision 76947) @@ -23,5 +23,5 @@ /* GUI includes: */ -#include "UIVisoCreatorPanel.h" +#include "UIDialogPanel.h" /* Forward declarations: */ @@ -35,5 +35,5 @@ class UIVisoCreator; -class UIVisoConfigurationPanel : public UIVisoCreatorPanel +class UIVisoConfigurationPanel : public UIDialogPanel { Q_OBJECT; Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp (revision 76946) +++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp (revision 76947) @@ -113,7 +113,7 @@ if (!pSenderAction) return; - UIVisoCreatorPanel* pPanel = 0; + UIDialogPanel* pPanel = 0; /* Look for the sender() within the m_panelActionMap's values: */ - for (QMap::const_iterator iterator = m_panelActionMap.begin(); + for (QMap::const_iterator iterator = m_panelActionMap.begin(); iterator != m_panelActionMap.end(); ++iterator) { @@ -153,5 +153,5 @@ } -void UIVisoCreator::sltHandleHidePanel(UIVisoCreatorPanel *pPanel) +void UIVisoCreator::sltHandleHidePanel(UIDialogPanel *pPanel) { hidePanel(pPanel); @@ -312,9 +312,9 @@ -void UIVisoCreator::hidePanel(UIVisoCreatorPanel* panel) +void UIVisoCreator::hidePanel(UIDialogPanel* panel) { if (panel && panel->isVisible()) panel->setVisible(false); - QMap::iterator iterator = m_panelActionMap.find(panel); + QMap::iterator iterator = m_panelActionMap.find(panel); if (iterator != m_panelActionMap.end()) { @@ -326,9 +326,9 @@ } -void UIVisoCreator::showPanel(UIVisoCreatorPanel* panel) +void UIVisoCreator::showPanel(UIDialogPanel* panel) { if (panel && panel->isHidden()) panel->setVisible(true); - QMap::iterator iterator = m_panelActionMap.find(panel); + QMap::iterator iterator = m_panelActionMap.find(panel); if (iterator != m_panelActionMap.end()) { Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.h (revision 76946) +++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.h (revision 76947) @@ -41,9 +41,9 @@ class QIDialogButtonBox; class UIActionPool; +class UIDialogPanel; class UIToolBar; class UIVisoHostBrowser; class UIVisoContentBrowser; class UIVisoCreatorOptionsPanel; -class UIVisoCreatorPanel; class UIVisoConfigurationPanel; @@ -76,5 +76,5 @@ void sltHandleCustomVisoOptionsChanged(const QStringList &customVisoOptions); void sltHandleShowHiddenObjectsChange(bool fShow); - void sltHandleHidePanel(UIVisoCreatorPanel *pPanel); + void sltHandleHidePanel(UIDialogPanel *pPanel); private: @@ -101,6 +101,6 @@ void setTableRootIndex(QModelIndex index = QModelIndex() ); void setTreeCurrentIndex(QModelIndex index = QModelIndex() ); - void hidePanel(UIVisoCreatorPanel *panel); - void showPanel(UIVisoCreatorPanel *panel); + void hidePanel(UIDialogPanel *panel); + void showPanel(UIDialogPanel *panel); /** Makes sure escape key is assigned to only a single widget. This is done by checking several things in the following order: @@ -127,6 +127,6 @@ UIVisoCreatorOptionsPanel *m_pCreatorOptionsPanel; UIVisoConfigurationPanel *m_pConfigurationPanel; - QMap m_panelActionMap; - QList m_visiblePanelsList; + QMap m_panelActionMap; + QList m_visiblePanelsList; }; Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreatorOptionsPanel.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreatorOptionsPanel.cpp (revision 76946) +++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreatorOptionsPanel.cpp (revision 76947) @@ -32,5 +32,5 @@ UIVisoCreatorOptionsPanel::UIVisoCreatorOptionsPanel(QWidget *pParent /* =0 */) - : UIVisoCreatorPanel(pParent) + : UIDialogPanel(pParent) , m_pShowHiddenObjectsCheckBox(0) , m_pShowHiddenObjectsLabel(0) Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreatorOptionsPanel.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreatorOptionsPanel.h (revision 76946) +++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreatorOptionsPanel.h (revision 76947) @@ -27,8 +27,8 @@ /* GUI includes: */ -#include "UIVisoCreatorPanel.h" +#include "UIDialogPanel.h" #include "QIWithRetranslateUI.h" -class UIVisoCreatorOptionsPanel : public UIVisoCreatorPanel +class UIVisoCreatorOptionsPanel : public UIDialogPanel { Q_OBJECT; Index: unk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreatorPanel.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreatorPanel.cpp (revision 76946) +++ (revision ) @@ -1,129 +1,0 @@ -/* $Id$ */ -/** @file - * VBox Qt GUI - UIVMLogViewer class implementation. - */ - -/* - * Copyright (C) 2010-2019 Oracle Corporation - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - */ - -/* Qt includes: */ -#include -#include -#include -#include -#include -#include - -/* GUI includes: */ -#include "QIToolButton.h" -#include "UIIconPool.h" -#include "UIVisoCreatorPanel.h" -#ifdef VBOX_WS_MAC -# include "VBoxUtils-darwin.h" -#endif - - -UIVisoCreatorPanel::UIVisoCreatorPanel(QWidget *pParent) - : QIWithRetranslateUI(pParent) - , m_pMainLayout(0) - , m_pCloseButton(0) -{ - prepare(); -} - -void UIVisoCreatorPanel::setCloseButtonShortCut(QKeySequence shortCut) -{ - if (!m_pCloseButton) - return; - m_pCloseButton->setShortcut(shortCut); -} - -QHBoxLayout* UIVisoCreatorPanel::mainLayout() -{ - return m_pMainLayout; -} - -void UIVisoCreatorPanel::prepare() -{ - prepareWidgets(); - prepareConnections(); - retranslateUi(); -} - -void UIVisoCreatorPanel::prepareWidgets() -{ - m_pMainLayout = new QHBoxLayout(this); - if (m_pMainLayout) - { -#ifdef VBOX_WS_MAC - m_pMainLayout->setContentsMargins(5 /* since there is always a button */, 0, 10 /* standard */, 0); - m_pMainLayout->setSpacing(10); -#else - m_pMainLayout->setContentsMargins(qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 2, 0, - qApp->style()->pixelMetric(QStyle::PM_LayoutRightMargin) / 2, - qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin) / 2); - m_pMainLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing)); -#endif - } - m_pCloseButton = new QIToolButton; - if (m_pCloseButton) - { - m_pCloseButton->setIcon(UIIconPool::iconSet(":/close_16px.png")); - m_pMainLayout->addWidget(m_pCloseButton, 0, Qt::AlignLeft); - } -} - -void UIVisoCreatorPanel::prepareConnections() -{ - if (m_pCloseButton) - connect(m_pCloseButton, &QIToolButton::clicked, this, &UIVisoCreatorPanel::hide); -} - -void UIVisoCreatorPanel::retranslateUi() -{ - if (m_pCloseButton) - m_pCloseButton->setToolTip(QApplication::translate("UIVisoCreator", "Close the pane")); -} - -bool UIVisoCreatorPanel::eventFilter(QObject *pObject, QEvent *pEvent) -{ - Q_UNUSED(pObject); - Q_UNUSED(pEvent); - /* Dont consume this event. Pass it back to Qt's event system: */ - return false; -} - -void UIVisoCreatorPanel::showEvent(QShowEvent *pEvent) -{ - QWidget::showEvent(pEvent); -} - -void UIVisoCreatorPanel::hideEvent(QHideEvent *pEvent) -{ - /* Get focused widget: */ - QWidget *pFocus = QApplication::focusWidget(); - /* If focus-widget is valid and child-widget of search-panel, - * focus next child-widget in line: */ - if (pFocus && pFocus->parent() == this) - focusNextPrevChild(true); - emit sigHidePanel(this); - - QWidget::hideEvent(pEvent); -} - -void UIVisoCreatorPanel::addVerticalSeparator() -{ - QFrame *pSeparator = new QFrame(); - pSeparator->setFrameShape(QFrame::VLine); - pSeparator->setFrameShadow(QFrame::Sunken); - mainLayout()->addWidget(pSeparator); -} Index: unk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreatorPanel.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreatorPanel.h (revision 76946) +++ (revision ) @@ -1,79 +1,0 @@ -/* $Id$ */ -/** @file - * VBox Qt GUI - UIVMLogViewer class declaration. - */ - -/* - * Copyright (C) 2010-2019 Oracle Corporation - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - */ - -#ifndef FEQT_INCLUDED_SRC_medium_viso_UIVisoCreatorPanel_h -#define FEQT_INCLUDED_SRC_medium_viso_UIVisoCreatorPanel_h -#ifndef RT_WITHOUT_PRAGMA_ONCE -# pragma once -#endif - -/* Qt includes: */ -#include -#include -/* GUI includes: */ -#include "QIWithRetranslateUI.h" - -/* Forward declarations: */ -class QHBoxLayout; -class QPlainTextEdit; -class QTextDocument; -class QIToolButton; - - -/** QWidget extension acting as the base class for UIVMLogViewerXXXPanel widgets. */ -class UIVisoCreatorPanel : public QIWithRetranslateUI -{ - Q_OBJECT; - -public: - - UIVisoCreatorPanel(QWidget *pParent); - void setCloseButtonShortCut(QKeySequence shortCut); - virtual QString panelName() const = 0; - -signals: - - void sigHidePanel(UIVisoCreatorPanel *pPanel); - -protected: - - virtual void prepare(); - virtual void prepareWidgets(); - virtual void prepareConnections(); - - /* Access functions for children classes. */ - QHBoxLayout* mainLayout(); - - /** Handles the translation event. */ - void retranslateUi() /* override */; - - /** Handles Qt @a pEvent, used for keyboard processing. */ - bool eventFilter(QObject *pObject, QEvent *pEvent); - /** Handles the Qt show @a pEvent. */ - void showEvent(QShowEvent *pEvent); - /** Handles the Qt hide @a pEvent. */ - void hideEvent(QHideEvent *pEvent); - void addVerticalSeparator(); - -private: - - /** Holds the reference to VM Log-Viewer this panel belongs to. */ - QHBoxLayout *m_pMainLayout; - QIToolButton *m_pCloseButton; -}; - -#endif /* !FEQT_INCLUDED_SRC_medium_viso_UIVisoCreatorPanel_h */