diff --git a/documentation/documentationview.h b/documentation/documentationview.h --- a/documentation/documentationview.h +++ b/documentation/documentationview.h @@ -65,8 +65,9 @@ QAction* mForward; QAction* mBack; - QAction* mFind; QAction* mHomeAction; + QAction* mSeparatorBeforeFind; + QAction* mFind; QLineEdit* mIdentifiers; QList< KDevelop::IDocumentation::Ptr > mHistory; QList< KDevelop::IDocumentation::Ptr >::iterator mCurrent; diff --git a/documentation/documentationview.cpp b/documentation/documentationview.cpp --- a/documentation/documentationview.cpp +++ b/documentation/documentationview.cpp @@ -69,7 +69,8 @@ QList DocumentationView::contextMenuActions() const { - return {mBack, mForward, mFind, mHomeAction}; // TODO: also show providers + // TODO: also show providers + return {mBack, mForward, mHomeAction, mSeparatorBeforeFind, mFind}; } void DocumentationView::setupActions() @@ -85,14 +86,6 @@ connect(mForward, &QAction::triggered, this, &DocumentationView::browseForward); addAction(mForward); - mFind = new QAction(QIcon::fromTheme(QStringLiteral("edit-find")), i18n("Find"), this); - connect(mFind, &QAction::triggered, mFindDoc, &DocumentationFindWidget::startSearch); - addAction(mFind); - - QAction* separator = new QAction(this); - separator->setSeparator(true); - addAction(separator); - mHomeAction = new QAction(QIcon::fromTheme(QStringLiteral("go-home")), i18n("Home"), this); connect(mHomeAction, &QAction::triggered, this, &DocumentationView::showHome); addAction(mHomeAction); @@ -118,6 +111,15 @@ identifiersAction->setDefaultWidget(mIdentifiers); addAction(identifiersAction); + mSeparatorBeforeFind = new QAction(this); + mSeparatorBeforeFind->setSeparator(true); + addAction(mSeparatorBeforeFind); + + mFind = new QAction(QIcon::fromTheme(QStringLiteral("edit-find")), i18n("Find in Text..."), this); + mFind->setToolTip(i18n("Find in text of current documentation page.")); + connect(mFind, &QAction::triggered, mFindDoc, &DocumentationFindWidget::startSearch); + addAction(mFind); + auto closeFindBarShortcut = new QShortcut(QKeySequence(Qt::Key_Escape), this); closeFindBarShortcut->setContext(Qt::WidgetWithChildrenShortcut); connect(closeFindBarShortcut, &QShortcut::activated, mFindDoc, &QWidget::hide);