tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

change ctrl-tab to esc-spc

Browse Source
This commit is contained in:
dockes 2006-11-04 14:49:46 +00:00
parent 1ab0a31c41
commit 1440af3ade
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/qtgui/ssearch_w.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint
static char rcsid[] = "@(#$Id: ssearch_w.cpp,v 1.9 2006-10-30 12:59:44 dockes Exp $ (C) 2006 J.F.Dockes";
static char rcsid[] = "@(#$Id: ssearch_w.cpp,v 1.10 2006-11-04 14:49:46 dockes Exp $ (C) 2006 J.F.Dockes";
#endif
/*
* This program is free software; you can redistribute it and/or modify
@ -46,6 +46,9 @@ void SSearch::init()
connect(clearqPB, SIGNAL(clicked()),
queryText->lineEdit(), SLOT(clear()));
connect(searchPB, SIGNAL(clicked()), this, SLOT(startSimpleSearch()));
queryText->lineEdit()->installEventFilter(this);
m_escape = false;
}
void SSearch::searchTextChanged( const QString & text )
@ -201,18 +204,28 @@ void SSearch::completion()
}
}
// Handle CTRL-TAB to mean completion
bool SSearch::event( QEvent *evt )
bool SSearch::eventFilter(QObject *target, QEvent *event)
{
if ( evt->type() == QEvent::KeyPress ) {
QKeyEvent *ke = (QKeyEvent *)evt;
if ( ke->key() == Key_Tab && (ke->state() & Qt::ControlButton)) {
// special tab handling here
completion();
if (event->type() == QEvent::KeyPress) {
QKeyEvent *ke = (QKeyEvent *)event;
LOGDEB1(("SSearch::eventFilter: keyPress escape %d key %d\n",
m_escape, ke->key()));
if (ke->key() == Key_Escape) {
LOGDEB(("Escape\n"));
m_escape = true;
return true;
} else if (m_escape && ke->key() == Key_Space) {
LOGDEB(("Escape space\n"));
ke->accept();
return TRUE;
completion();
m_escape = false;
return true;
} else {
m_escape = false;
}
}
return QWidget::event( evt );
return QWidget::eventFilter(target, event);
}

6
src/qtgui/ssearch_w.h
View File

@ -1,4 +1,4 @@
/* @(#$Id: ssearch_w.h,v 1.1 2006-09-04 15:13:02 dockes Exp $ (C) 2006 J.F.Dockes */
/* @(#$Id: ssearch_w.h,v 1.2 2006-11-04 14:49:46 dockes Exp $ (C) 2006 J.F.Dockes */
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -36,7 +36,7 @@ public:
virtual void init();
virtual void setAnyTermMode();
virtual void completion();
virtual bool event( QEvent * evt );
virtual bool eventFilter(QObject *target, QEvent *event);
public slots:
virtual void searchTextChanged( const QString & text );
@ -45,6 +45,8 @@ public slots:
signals:
void startSearch(Rcl::AdvSearchData);
void clearSearch();
private:
bool m_escape;
};