Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 76978) +++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 76979) @@ -828,4 +828,5 @@ src/medium/UIMediumEnumerator.h \ src/medium/UIMediumItem.h \ + src/medium/UIMediumSearchWidget.h \ src/medium/UIMediumSelector.h \ src/medium/viso/UIVisoBrowserBase.h \ @@ -972,5 +973,4 @@ src/logviewer/UIVMLogViewerTextEdit.cpp \ src/medium/UIMediumEnumerator.cpp \ - src/medium/UIMediumSelector.cpp \ src/medium/viso/UIVisoContentBrowser.cpp \ src/medium/viso/UIVisoHostBrowser.cpp \ @@ -1293,4 +1293,5 @@ src/medium/UIMediumEnumerator.cpp \ src/medium/UIMediumItem.cpp \ + src/medium/UIMediumSearchWidget.cpp \ src/medium/UIMediumSelector.cpp \ src/medium/viso/UIVisoBrowserBase.cpp \ Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSearchWidget.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSearchWidget.cpp (revision 76979) +++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSearchWidget.cpp (revision 76979) @@ -0,0 +1,121 @@ +/* $Id$ */ +/** @file + * VBox Qt GUI - UIMediumSearchWidget class implementation. + */ + +/* + * Copyright (C) 2006-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 + +/* GUI includes: */ +#include "QIComboBox.h" +#include "QIDialogButtonBox.h" +#include "QIToolButton.h" +#include "UIFDCreationDialog.h" +#include "UIIconPool.h" +#include "UIMediumSearchWidget.h" +#include "UIToolBar.h" + +#ifdef VBOX_WS_MAC +# include "UIWindowMenuManager.h" +#endif /* VBOX_WS_MAC */ + +UIMediumSearchWidget::UIMediumSearchWidget(QWidget *pParent) + :QIWithRetranslateUI(pParent) + , m_pSearchComboxBox(0) + , m_pSearchTermLineEdit(0) + , m_pShowNextMatchButton(0) + , m_pShowPreviousMatchButton(0) +{ + prepareWidgets(); +} + +void UIMediumSearchWidget::prepareWidgets() +{ + QHBoxLayout *pLayout = new QHBoxLayout; + setLayout(pLayout); + pLayout->setContentsMargins(0, 0, 0, 0); + pLayout->setSpacing(0); + + m_pSearchComboxBox = new QIComboBox; + if (m_pSearchComboxBox) + { + m_pSearchComboxBox->setEditable(false); + m_pSearchComboxBox->insertItem(SearchByName, "Search By Name"); + m_pSearchComboxBox->insertItem(SearchByUUID, "Search By UUID"); + pLayout->addWidget(m_pSearchComboxBox); + + connect(m_pSearchComboxBox, static_cast(&QIComboBox::currentIndexChanged), + this, &UIMediumSearchWidget::sigPerformSearch); + + } + + m_pSearchTermLineEdit = new QLineEdit; + if (m_pSearchTermLineEdit) + { + m_pSearchTermLineEdit->setClearButtonEnabled(true); + pLayout->addWidget(m_pSearchTermLineEdit); + connect(m_pSearchTermLineEdit, &QLineEdit::textChanged, + this, &UIMediumSearchWidget::sigPerformSearch); + } + + m_pShowPreviousMatchButton = new QIToolButton; + if (m_pShowPreviousMatchButton) + { + m_pShowPreviousMatchButton->setIcon(UIIconPool::iconSet(":/log_viewer_search_backward_16px.png", ":/log_viewer_search_backward_disabled_16px.png")); + connect(m_pShowPreviousMatchButton, &QIToolButton::clicked, this, &UIMediumSearchWidget::sigShowPreviousMatchingItem); + pLayout->addWidget(m_pShowPreviousMatchButton); + } + m_pShowNextMatchButton = new QIToolButton; + if (m_pShowNextMatchButton) + { + m_pShowNextMatchButton->setIcon(UIIconPool::iconSet(":/log_viewer_search_forward_16px.png", ":/log_viewer_search_forward_disabled_16px.png")); + connect(m_pShowNextMatchButton, &QIToolButton::clicked, this, &UIMediumSearchWidget:: sigShowNextMatchingItem); + pLayout->addWidget(m_pShowNextMatchButton); + } + + retranslateUi(); +} + +UIMediumSearchWidget::SearchType UIMediumSearchWidget::searchType() const +{ + if (!m_pSearchComboxBox || m_pSearchComboxBox->currentIndex() >= static_cast(SearchByMax)) + return SearchByMax; + return static_cast(m_pSearchComboxBox->currentIndex()); +} + +QString UIMediumSearchWidget::searchTerm() const +{ + if (!m_pSearchTermLineEdit) + return QString(); + return m_pSearchTermLineEdit->text(); +} + +void UIMediumSearchWidget::retranslateUi() +{ + if (m_pSearchComboxBox) + { + m_pSearchComboxBox->setItemText(SearchByName, UIMediumSearchWidget::tr("Search By Name")); + m_pSearchComboxBox->setItemText(SearchByUUID, UIMediumSearchWidget::tr("Search By UUID")); + m_pSearchComboxBox->setToolTip(UIMediumSearchWidget::tr("Select the search type")); + } + if (m_pSearchTermLineEdit) + m_pSearchTermLineEdit->setToolTip("Enter the search term and press Return"); + if (m_pShowPreviousMatchButton) + m_pShowPreviousMatchButton->setToolTip("Show the previous item matching the search term"); + if (m_pShowNextMatchButton) + m_pShowNextMatchButton->setToolTip("Show the next item matching the search term"); +} Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSearchWidget.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSearchWidget.h (revision 76979) +++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSearchWidget.h (revision 76979) @@ -0,0 +1,74 @@ +/* $Id$ */ +/** @file + * VBox Qt GUI - UIMediumSearchWidget class declaration. + */ + +/* + * Copyright (C) 2006-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_UIMediumSearchWidget_h +#define FEQT_INCLUDED_SRC_medium_UIMediumSearchWidget_h +#ifndef RT_WITHOUT_PRAGMA_ONCE +# pragma once +#endif + +/* GUI includes: */ +#include "QIWithRetranslateUI.h" + +/* Forward declarations: */ +class QAction; +class QLineEdit; +class QIComboBox; +class QIDialogButtonBox; +class QIToolButton; + +/** QWidget extension providing a simple way to enter a earch term and search type for medium searching + * in virtual media manager, medium selection dialog, etc. */ +class SHARED_LIBRARY_STUFF UIMediumSearchWidget : public QIWithRetranslateUI +{ + Q_OBJECT; + +signals: + + void sigPerformSearch(); + void sigShowNextMatchingItem(); + void sigShowPreviousMatchingItem(); + +public: + + enum SearchType + { + SearchByName, + SearchByUUID, + SearchByMax + }; + +public: + + UIMediumSearchWidget(QWidget *pParent = 0); + SearchType searchType() const; + QString searchTerm() const; + +protected: + + void retranslateUi() /* override */; + +private: + + void prepareWidgets(); + QIComboBox *m_pSearchComboxBox; + QLineEdit *m_pSearchTermLineEdit; + QIToolButton *m_pShowNextMatchButton; + QIToolButton *m_pShowPreviousMatchButton; +}; + +#endif /* !FEQT_INCLUDED_SRC_medium_UIMediumSearchWidget_h */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp (revision 76978) +++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp (revision 76979) @@ -24,8 +24,6 @@ /* GUI includes: */ -#include "QIComboBox.h" #include "QIDialogButtonBox.h" #include "QIFileDialog.h" -#include "QILineEdit.h" #include "QIMessageBox.h" #include "QITabWidget.h" @@ -35,4 +33,5 @@ #include "UIExtraDataManager.h" #include "UIFDCreationDialog.h" +#include "UIMediumSearchWidget.h" #include "UIMediumSelector.h" #include "UIMessageCenter.h" @@ -54,142 +53,4 @@ #endif /* VBOX_WS_MAC */ -/********************************************************************************************************************************* -* UIMediumSearchWidget definition. * -*********************************************************************************************************************************/ -/** QWidget extension providing a simple way to enter a earch term and search type for medium searching - * in virtual media manager, medium selection dialog, etc. */ -class UIMediumSearchWidget : public QIWithRetranslateUI -{ - Q_OBJECT; - -public: - - enum SearchType - { - SearchByName, - SearchByUUID, - SearchByMax - }; - -signals: - - void sigPerformSearch(); - void sigShowNextMatchingItem(); - void sigShowPreviousMatchingItem(); - -public: - - UIMediumSearchWidget(QWidget *pParent = 0); - SearchType searchType() const; - QString searchTerm() const; - -protected: - - void retranslateUi() /* override */; - -private: - - void prepareWidgets(); - QIComboBox *m_pSearchComboxBox; - QLineEdit *m_pSearchTermLineEdit; - QIToolButton *m_pShowNextMatchButton; - QIToolButton *m_pShowPreviousMatchButton; -}; - - -/********************************************************************************************************************************* -* UIMediumSearchWidget implementation. * -*********************************************************************************************************************************/ - -UIMediumSearchWidget::UIMediumSearchWidget(QWidget *pParent) - :QIWithRetranslateUI(pParent) - , m_pSearchComboxBox(0) - , m_pSearchTermLineEdit(0) - , m_pShowNextMatchButton(0) - , m_pShowPreviousMatchButton(0) -{ - prepareWidgets(); -} - -void UIMediumSearchWidget::prepareWidgets() -{ - QHBoxLayout *pLayout = new QHBoxLayout; - setLayout(pLayout); - pLayout->setContentsMargins(0, 0, 0, 0); - pLayout->setSpacing(0); - - m_pSearchComboxBox = new QIComboBox; - if (m_pSearchComboxBox) - { - m_pSearchComboxBox->setEditable(false); - m_pSearchComboxBox->insertItem(SearchByName, "Search By Name"); - m_pSearchComboxBox->insertItem(SearchByUUID, "Search By UUID"); - pLayout->addWidget(m_pSearchComboxBox); - - connect(m_pSearchComboxBox, static_cast(&QIComboBox::currentIndexChanged), - this, &UIMediumSearchWidget::sigPerformSearch); - - } - - m_pSearchTermLineEdit = new QLineEdit; - if (m_pSearchTermLineEdit) - { - m_pSearchTermLineEdit->setClearButtonEnabled(true); - pLayout->addWidget(m_pSearchTermLineEdit); - connect(m_pSearchTermLineEdit, &QILineEdit::textChanged, - this, &UIMediumSearchWidget::sigPerformSearch); - } - - m_pShowPreviousMatchButton = new QIToolButton; - if (m_pShowPreviousMatchButton) - { - m_pShowPreviousMatchButton->setIcon(UIIconPool::iconSet(":/log_viewer_search_backward_16px.png", ":/log_viewer_search_backward_disabled_16px.png")); - connect(m_pShowPreviousMatchButton, &QIToolButton::clicked, this, &UIMediumSearchWidget::sigShowPreviousMatchingItem); - pLayout->addWidget(m_pShowPreviousMatchButton); - } - m_pShowNextMatchButton = new QIToolButton; - if (m_pShowNextMatchButton) - { - m_pShowNextMatchButton->setIcon(UIIconPool::iconSet(":/log_viewer_search_forward_16px.png", ":/log_viewer_search_forward_disabled_16px.png")); - connect(m_pShowNextMatchButton, &QIToolButton::clicked, this, &UIMediumSearchWidget:: sigShowNextMatchingItem); - pLayout->addWidget(m_pShowNextMatchButton); - } - - retranslateUi(); -} - -UIMediumSearchWidget::SearchType UIMediumSearchWidget::searchType() const -{ - if (!m_pSearchComboxBox || m_pSearchComboxBox->currentIndex() >= static_cast(SearchByMax)) - return SearchByMax; - return static_cast(m_pSearchComboxBox->currentIndex()); -} - -QString UIMediumSearchWidget::searchTerm() const -{ - if (!m_pSearchTermLineEdit) - return QString(); - return m_pSearchTermLineEdit->text(); -} - -void UIMediumSearchWidget::retranslateUi() -{ - if (m_pSearchComboxBox) - { - m_pSearchComboxBox->setItemText(SearchByName, UIMediumSelector::tr("Search By Name")); - m_pSearchComboxBox->setItemText(SearchByUUID, UIMediumSelector::tr("Search By UUID")); - m_pSearchComboxBox->setToolTip(UIMediumSelector::tr("Select the search type")); - } - if (m_pSearchTermLineEdit) - m_pSearchTermLineEdit->setToolTip("Enter the search term and press Return"); - if (m_pShowPreviousMatchButton) - m_pShowPreviousMatchButton->setToolTip("Show the previous item matching the search term"); - if (m_pShowNextMatchButton) - m_pShowNextMatchButton->setToolTip("Show the next item matching the search term"); -} - -/********************************************************************************************************************************* -* UIMediumSelector implementation. * -*********************************************************************************************************************************/ UIMediumSelector::UIMediumSelector(UIMediumDeviceType enmMediumType, const QString &machineName /* = QString() */, @@ -903,7 +764,3 @@ m_pTreeWidget->scrollTo(itemIndex); - //m_pTreeWidget->setCurrentIndex(itemIndex); -} - - -#include "UIMediumSelector.moc" +} Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.h (revision 76978) +++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.h (revision 76979) @@ -27,5 +27,5 @@ #include "UIMedium.h" #include "UIMediumDefs.h" -#include "UIMediumDetailsWidget.h" + /* Forward declarations: */