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

pressing CR in advsearch would run query twice because of start autodefault

Browse Source
This commit is contained in:
dockes 2007-08-31 09:04:23 +00:00
parent e0c8caff9d
commit 5dd23899d3
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qtgui/advsearch_w.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: advsearch_w.cpp,v 1.17 2007-02-19 16:10:00 dockes Exp $ (C) 2005 J.F.Dockes"; static char rcsid[] = "@(#$Id: advsearch_w.cpp,v 1.18 2007-08-31 09:04:23 dockes Exp $ (C) 2005 J.F.Dockes";
#endif #endif
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -68,7 +68,7 @@ void AdvSearch::init()
{ {
// signals and slots connections // signals and slots connections
connect(delFiltypPB, SIGNAL(clicked()), this, SLOT(delFiltypPB_clicked())); connect(delFiltypPB, SIGNAL(clicked()), this, SLOT(delFiltypPB_clicked()));
connect(searchPB, SIGNAL(clicked()), this, SLOT(searchPB_clicked())); connect(searchPB, SIGNAL(clicked()), this, SLOT(runSearch()));
connect(restrictFtCB, SIGNAL(toggled(bool)), connect(restrictFtCB, SIGNAL(toggled(bool)),
this, SLOT(restrictFtCB_toggled(bool))); this, SLOT(restrictFtCB_toggled(bool)));
connect(restrictCtCB, SIGNAL(toggled(bool)), connect(restrictCtCB, SIGNAL(toggled(bool)),
@ -77,8 +77,6 @@ void AdvSearch::init()
connect(browsePB, SIGNAL(clicked()), this, SLOT(browsePB_clicked())); connect(browsePB, SIGNAL(clicked()), this, SLOT(browsePB_clicked()));
connect(addFiltypPB, SIGNAL(clicked()), this, SLOT(addFiltypPB_clicked())); connect(addFiltypPB, SIGNAL(clicked()), this, SLOT(addFiltypPB_clicked()));
connect(subtreeCMB->lineEdit(), SIGNAL(returnPressed()),
this, SLOT(searchPB_clicked()));
connect(delAFiltypPB, SIGNAL(clicked()), connect(delAFiltypPB, SIGNAL(clicked()),
this, SLOT(delAFiltypPB_clicked())); this, SLOT(delAFiltypPB_clicked()));
connect(addAFiltypPB, SIGNAL(clicked()), connect(addAFiltypPB, SIGNAL(clicked()),
@ -188,8 +186,6 @@ void AdvSearch::addClause(int tp)
{ {
SearchClauseW *w = new SearchClauseW(clauseFRM); SearchClauseW *w = new SearchClauseW(clauseFRM);
m_clauseWins.push_back(w); m_clauseWins.push_back(w);
connect(w->wordsLE, SIGNAL(returnPressed()),
this, SLOT(searchPB_clicked()));
((QVBoxLayout *)(clauseFRM->layout()))->addWidget(w); ((QVBoxLayout *)(clauseFRM->layout()))->addWidget(w);
w->show(); w->show();
w->tpChange(tp); w->tpChange(tp);
@ -354,7 +350,7 @@ void AdvSearch::saveFileTypes()
} }
using namespace Rcl; using namespace Rcl;
void AdvSearch::searchPB_clicked() void AdvSearch::runSearch()
{ {
RefCntr<SearchData> sdata(new SearchData(conjunctCMB->currentItem() == 0 ? RefCntr<SearchData> sdata(new SearchData(conjunctCMB->currentItem() == 0 ?
SCLT_AND : SCLT_OR)); SCLT_AND : SCLT_OR));

4
src/qtgui/advsearch_w.h
View File

@ -1,6 +1,6 @@
#ifndef _ADVSEARCH_W_H_INCLUDED_ #ifndef _ADVSEARCH_W_H_INCLUDED_
#define _ADVSEARCH_W_H_INCLUDED_ #define _ADVSEARCH_W_H_INCLUDED_
/* @(#$Id: advsearch_w.h,v 1.12 2007-02-19 16:10:00 dockes Exp $ (C) 2005 J.F.Dockes */ /* @(#$Id: advsearch_w.h,v 1.13 2007-08-31 09:04:23 dockes Exp $ (C) 2005 J.F.Dockes */
/* /*
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -67,7 +67,7 @@ public slots:
virtual void addAFiltypPB_clicked(); virtual void addAFiltypPB_clicked();
virtual void restrictFtCB_toggled(bool); virtual void restrictFtCB_toggled(bool);
virtual void restrictCtCB_toggled(bool); virtual void restrictCtCB_toggled(bool);
virtual void searchPB_clicked(); virtual void runSearch();
virtual void browsePB_clicked(); virtual void browsePB_clicked();
virtual void saveFileTypes(); virtual void saveFileTypes();
virtual void delClause(); virtual void delClause();