autosearch: reduce timer to 200 mS and fix log messages

This commit is contained in:
Jean-Francois Dockes 2012-11-23 13:51:14 +01:00
parent 4e9cbde3f3
commit 3a0e2744d6

View file

@ -72,14 +72,14 @@ void SSearch::init()
void SSearch::timerDone() void SSearch::timerDone()
{ {
QString qs = queryText->currentText(); QString qs = queryText->currentText();
LOGINFO(("TIMER DONE. qstring [%s]\n", qs2utf8s(qs).c_str())); LOGDEB0(("SSearch::timerDone: qs [%s]\n", qs2utf8s(qs).c_str()));
searchTextChanged(qs); searchTextChanged(qs);
} }
void SSearch::searchTextChanged(const QString& text) void SSearch::searchTextChanged(const QString& text)
{ {
QString qs = queryText->currentText(); QString qs = queryText->currentText();
LOGINFO(("SEARCHTEXTCHANGED. ks %d text [%s]\n", LOGDEB0(("SSearch::searchTextChanged. ks %d qs [%s]\n",
m_keystroke, qs2utf8s(text).c_str())); m_keystroke, qs2utf8s(text).c_str()));
if (text.isEmpty()) { if (text.isEmpty()) {
searchPB->setEnabled(false); searchPB->setEnabled(false);
@ -95,7 +95,7 @@ void SSearch::searchTextChanged(const QString& text)
if (prefs.autoSearchOnWS && !m_disableAutosearch && if (prefs.autoSearchOnWS && !m_disableAutosearch &&
!m_keystroke && m_tstartqs == qs) { !m_keystroke && m_tstartqs == qs) {
m_disableAutosearch = true; m_disableAutosearch = true;
LOGINFO(("Autosearch: current: [%s]\n", qs2utf8s(qs).c_str())); LOGDEB0(("SSearch::searchTextChanged: autosearch\n"));
string s; string s;
int cs = partialWord(s); int cs = partialWord(s);
if (cs < 0) { if (cs < 0) {
@ -154,7 +154,7 @@ void SSearch::searchTypeChanged(int typ)
void SSearch::startSimpleSearch() void SSearch::startSimpleSearch()
{ {
QString qs = queryText->currentText(); QString qs = queryText->currentText();
LOGINFO(("startSimpleSearch qs [%s]\n", qs2utf8s(qs).c_str())); LOGDEB(("SSearch::startSimpleSearch(): qs [%s]\n", qs2utf8s(qs).c_str()));
if (qs.length() == 0) if (qs.length() == 0)
return; return;
@ -192,7 +192,7 @@ void SSearch::startSimpleSearch()
bool SSearch::startSimpleSearch(const string& u8, int maxexp) bool SSearch::startSimpleSearch(const string& u8, int maxexp)
{ {
LOGINFO(("SSearch::startSimpleSearch(%s)\n", u8.c_str())); LOGDEB(("SSearch::startSimpleSearch(%s)\n", u8.c_str()));
string stemlang = prefs.stemlang(); string stemlang = prefs.stemlang();
SSearchType tp = (SSearchType)searchTypCMB->currentIndex(); SSearchType tp = (SSearchType)searchTypCMB->currentIndex();
@ -376,7 +376,7 @@ void SSearch::completion()
return; return;
} }
if (lst.size() >= maxdpy) { if (lst.size() >= maxdpy) {
LOGINFO(("TRUNCATING COMPLETION\n")); LOGDEB0(("SSearch::completion(): truncating list\n"));
lst = lst.mid(0, maxdpy); lst = lst.mid(0, maxdpy);
lst.append("[...]"); lst.append("[...]");
} }
@ -620,8 +620,9 @@ bool SSearch::eventFilter(QObject *target, QEvent *event)
if (prefs.autoSearchOnWS) { if (prefs.autoSearchOnWS) {
m_disableAutosearch = false; m_disableAutosearch = false;
QString qs = queryText->currentText(); QString qs = queryText->currentText();
LOGINFO(("STARTING TIMER, qs [%s]\n", qs2utf8s(qs).c_str())); LOGDEB0(("SSearch::eventFilter: start timer, qs [%s]\n",
m_stroketimeout->start(500); qs2utf8s(qs).c_str()));
m_stroketimeout->start(200);
} }
} }
return false; return false;