diff --git a/src/ui/findbar/khtmlfindbar.cpp b/src/ui/findbar/khtmlfindbar.cpp --- a/src/ui/findbar/khtmlfindbar.cpp +++ b/src/ui/findbar/khtmlfindbar.cpp @@ -46,19 +46,22 @@ // Fill options menu m_incMenu = new QMenu(this); m_options->setMenu(m_incMenu); - m_caseSensitive = m_incMenu->addAction(i18n("C&ase sensitive")); + m_caseSensitive = m_incMenu->addAction(QIcon::fromTheme("format-text-superscript"), i18n("C&ase sensitive")); m_caseSensitive->setCheckable(true); m_wholeWordsOnly = m_incMenu->addAction(i18n("&Whole words only")); m_wholeWordsOnly->setCheckable(true); - m_fromCursor = m_incMenu->addAction(i18n("From c&ursor")); + m_fromCursor = m_incMenu->addAction(QIcon::fromTheme("cursor-arrow"), i18n("From c&ursor")); m_fromCursor->setCheckable(true); - m_selectedText = m_incMenu->addAction(i18n("&Selected text")); + m_selectedText = m_incMenu->addAction(QIcon::fromTheme("region"), i18n("&Selected text")); m_selectedText->setCheckable(true); - m_regExp = m_incMenu->addAction(i18n("Regular e&xpression")); + m_regExp = m_incMenu->addAction(QIcon::fromTheme("code-context"), i18n("Regular e&xpression")); m_regExp->setCheckable(true); - m_findLinksOnly = m_incMenu->addAction(i18n("Find &links only")); + m_findLinksOnly = m_incMenu->addAction(QIcon::fromTheme("link"), i18n("Find &links only")); m_findLinksOnly->setCheckable(true); + m_find->lineEdit()->setPlaceholderText(i18n("Find…")); + m_find->lineEdit()->setClearButtonEnabled(true); + m_atEnd = false; m_find->setDuplicatesEnabled(false); diff --git a/src/ui/findbar/khtmlfindbar_base.ui b/src/ui/findbar/khtmlfindbar_base.ui --- a/src/ui/findbar/khtmlfindbar_base.ui +++ b/src/ui/findbar/khtmlfindbar_base.ui @@ -31,22 +31,6 @@ 2 - - - - - 0 - 0 - - - - F&ind: - - - m_find - - - @@ -63,7 +47,7 @@ - 180 + 16777215 16777215 @@ -90,66 +74,21 @@ - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 14 - 26 - - - - - - + Opt&ions false - - QToolButton::InstantPopup - - - Qt::ToolButtonTextOnly + + - - - - Qt::Horizontal - - - - 16 - 17 - - - - - - - - Qt::Horizontal - - - - 16 - 17 - - - -