Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 96d89538 authored by Albert Astals Cid's avatar Albert Astals Cid

Fix Enter turning the thumbnail filter bar into a regular search bar

BUGS: 375755
parent be6b0b6f
......@@ -588,8 +588,8 @@ class OKULARCORE_EXPORT Document : public QObject
NextMatch, ///< Search next match
PreviousMatch, ///< Search previous match
AllDocument, ///< Search complete document
GoogleAll, ///< Search all words in google style
GoogleAny ///< Search any words in google style
GoogleAll, ///< Search complete document (all words in google style)
GoogleAny ///< Search complete document (any words in google style)
};
/**
......
......@@ -39,7 +39,6 @@ SearchLineEdit::SearchLineEdit( QWidget * parent, Okular::Document * document )
connect(m_inputDelayTimer, &QTimer::timeout, this, &SearchLineEdit::startSearch);
connect(this, &SearchLineEdit::textChanged, this, &SearchLineEdit::slotTextChanged);
connect(this, &SearchLineEdit::returnPressed, this, &SearchLineEdit::slotReturnPressed);
connect(document, &Okular::Document::searchFinished, this, &SearchLineEdit::searchFinished);
}
......@@ -65,8 +64,16 @@ void SearchLineEdit::setSearchType( Okular::Document::SearchType type )
if ( type == m_searchType )
return;
disconnect(this, &SearchLineEdit::returnPressed, this, &SearchLineEdit::slotReturnPressed);
m_searchType = type;
// Only connect Enter for next/prev searches, the rest of searches are document global so
// next/prev serach does not make sense for them
if (m_searchType == Okular::Document::NextMatch || m_searchType == Okular::Document::PreviousMatch) {
connect(this, &SearchLineEdit::returnPressed, this, &SearchLineEdit::slotReturnPressed);
}
if ( !m_changed )
m_changed = ( m_searchType != Okular::Document::NextMatch && m_searchType != Okular::Document::PreviousMatch );
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment