office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-24 18:35:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Applications/16.12'

Browse source
This commit is contained in:
Albert Astals Cid 2017-02-01 00:50:29 +01:00
parent 021cc986a8 96d8953878
commit 91f092cdf4
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/document.h
View file

@ -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)
};
/**

9
ui/searchlineedit.cpp
View file

@ -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 );
}