diff --git a/webenginepart/src/ui/searchbar.h b/webenginepart/src/ui/searchbar.h --- a/webenginepart/src/ui/searchbar.h +++ b/webenginepart/src/ui/searchbar.h @@ -26,6 +26,7 @@ #define SEARCHBAR_P_H #include +#include #include "ui_searchbar.h" @@ -63,6 +64,7 @@ private: Ui::SearchBar m_ui; QPointer m_focusWidget; + QMenu *m_optionsMenu; }; #endif // SEARCHBAR_P_H diff --git a/webenginepart/src/ui/searchbar.cpp b/webenginepart/src/ui/searchbar.cpp --- a/webenginepart/src/ui/searchbar.cpp +++ b/webenginepart/src/ui/searchbar.cpp @@ -44,9 +44,13 @@ // Initialize the user interface... m_ui.setupUi(this); - m_ui.optionsButton->addAction(m_ui.actionMatchCase); - m_ui.optionsButton->addAction(m_ui.actionHighlightMatch); - m_ui.optionsButton->addAction(m_ui.actionSearchAutomatically); + m_optionsMenu = new QMenu(); + m_optionsMenu->addAction(m_ui.actionMatchCase); + m_optionsMenu->addAction(m_ui.actionHighlightMatch); + m_optionsMenu->addAction(m_ui.actionSearchAutomatically); + m_ui.optionsButton->setMenu(m_optionsMenu); + m_ui.searchComboBox->lineEdit()->setPlaceholderText(i18n("Find...")); + m_ui.searchComboBox->lineEdit()->setClearButtonEnabled(true); setFocusProxy(m_ui.searchComboBox); diff --git a/webenginepart/src/ui/searchbar.ui b/webenginepart/src/ui/searchbar.ui --- a/webenginepart/src/ui/searchbar.ui +++ b/webenginepart/src/ui/searchbar.ui @@ -30,21 +30,11 @@ - - - - &Find: - - - searchComboBox - - - - - 0 + + 10 0 @@ -89,15 +79,15 @@ - + Find the previous match for the current search phrase &Options - - QToolButton::InstantPopup + +