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

pgup/down in result list

Browse Source
This commit is contained in:
dockes
2005-12-13 12:43:00 +00:00
parent 0122545ece
commit 52fa7836b7
17 changed files with 157 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/qtgui/main.cpp
+14 -22
View File
@@ -1,5 +1,5 @@
#ifndef lint
static char rcsid[] = "@(#$Id: main.cpp,v 1.21 2005-12-05 14:57:54 dockes Exp $ (C) 2005 J.F.Dockes";
static char rcsid[] = "@(#$Id: main.cpp,v 1.22 2005-12-13 12:42:59 dockes Exp $ (C) 2005 J.F.Dockes";
#endif
#include <unistd.h>
@@ -38,6 +38,8 @@ bool showicons;
string iconsdir;
RclDHistory *history;
static string dbdir;
void getQueryStemming(bool &dostem, std::string &stemlang)
{
string param;
@@ -51,20 +53,14 @@ void getQueryStemming(bool &dostem, std::string &stemlang)
bool maybeOpenDb(string &reason)
{
if (!rcldb)
if (!rcldb) {
reason = "Internal error: db not created";
return false;
}
if (!rcldb->isopen() && !rcldb->open(dbdir, Rcl::Db::DbRO)) {
reason = "Could not open database in " +
dbdir + " wait for indexing to complete?";
return false;
if (!rcldb->isopen()) {
string dbdir;
if (rclconfig->getConfParam(string("dbdir"), dbdir) == 0) {
reason = "No db directory in configuration";
return false;
}
dbdir = path_tildexpand(dbdir);
if (!rcldb->open(dbdir, Rcl::Db::DbRO)) {
reason = "Could not open database in " +
dbdir + " wait for indexing to complete?";
return false;
}
}
return true;
}
@@ -134,7 +130,6 @@ int main( int argc, char ** argv )
exit(1);
}
string dbdir;
if (rclconfig->getConfParam(string("dbdir"), dbdir) == 0) {
// Note: this will have to be replaced by a call to a
// configuration buildin dialog for initial configuration
@@ -143,10 +138,10 @@ int main( int argc, char ** argv )
"No db directory in configuration"));
exit(1);
}
dbdir = path_tildexpand(dbdir);
// Translations for Recoll
string translatdir = string(recollsharedir);
path_cat(translatdir, "translations");
string translatdir = path_cat(recollsharedir, "translations");
QTranslator translator( 0 );
// QTextCodec::locale() returns $LANG
translator.load( QString("recoll_") + QTextCodec::locale(),
@@ -157,8 +152,7 @@ int main( int argc, char ** argv )
rclconfig->getConfParam("showicons", &showicons);
rclconfig->getConfParam("iconsdir", iconsdir);
if (iconsdir.empty()) {
iconsdir = string(recollsharedir);
path_cat(iconsdir, "images");
iconsdir = path_cat(recollsharedir, "images");
} else {
iconsdir = path_tildexpand(iconsdir);
}
@@ -170,11 +164,9 @@ int main( int argc, char ** argv )
exit(1);
}
string historyfile = rclconfig->getConfDir();
path_cat(historyfile, "history");
string historyfile = path_cat(rclconfig->getConfDir(), "history");
history = new RclDHistory(historyfile);
dbdir = path_tildexpand(dbdir);
rcldb = new Rcl::Db;
src/qtgui/recollmain.ui
+2
View File
@@ -398,6 +398,8 @@
<slot>reslistTE_delayedclick()</slot>
<slot>startSimpleSearch()</slot>
<slot>startAdvSearch( Rcl::AdvSearchData sdata )</slot>
<slot>resPageUpOrBack()</slot>
<slot>resPageDownOrNext()</slot>
<slot>resultPageBack()</slot>
<slot>showResultPage()</slot>
<slot>previewClosed( Preview * w )</slot>
src/qtgui/recollmain.ui.h
+52 -11
View File
@@ -66,7 +66,12 @@ void RecollMain::init()
sortform = 0;
docsource = 0;
sortwidth = 0;
// We manage pgup/down, but let ie the arrows for the editor to process
reslistTE->installEventFilter(this);
reslistTE->viewport()->installEventFilter(this);
// reslistTE->viewport()->setFocusPolicy(QWidget::NoFocus);
}
// We also want to get rid of the advanced search form and previews
@@ -78,7 +83,8 @@ bool RecollMain::close(bool)
return false;
}
#if 0
//#define SHOWEVENTS
#if defined(SHOWEVENTS)
static const char *eventTypeToStr(int tp)
{
switch (tp) {
@@ -167,12 +173,20 @@ static const char *eventTypeToStr(int tp)
// ^Q thing is necessary (we have an action for this)?
bool RecollMain::eventFilter( QObject * target, QEvent * event )
{
// LOGDEB(("RecollMain::eventFilter target %p, event %s\n", target,
// eventTypeToStr(int(event->type()))));
#if defined(SHOWEVENTS)
LOGDEB(("RecollMain::eventFilter target %p, event %s\n", target,
eventTypeToStr(int(event->type()))));
#endif
if (event->type() == QEvent::KeyPress) {
QKeyEvent *keyEvent = (QKeyEvent *)event;
if (keyEvent->key() == Key_Q && (keyEvent->state() & ControlButton)) {
recollNeedsExit = 1;
} else if (keyEvent->key() == Key_Prior) {
resPageUpOrBack();
return true;
} else if (keyEvent->key() == Key_Next) {
resPageDownOrNext();
return true;
}
} else if (target == reslistTE->viewport()) {
// We don't want btdown+drag+btup to be a click ! So monitor
@@ -413,6 +427,28 @@ void RecollMain::startAdvSearch(Rcl::AdvSearchData sdata)
showResultPage();
}
// Page Up/Down: we don't try to check if current paragraph is last or
// first. We just page up/down and check if viewport moved. If it did,
// fair enough, else we go to next/previous result page.
void RecollMain::resPageUpOrBack()
{
int vpos = reslistTE->contentsY();
reslistTE->moveCursor(QTextEdit::MovePgUp, false);
if (vpos == reslistTE->contentsY())
resultPageBack();
}
void RecollMain::resPageDownOrNext()
{
int vpos = reslistTE->contentsY();
reslistTE->moveCursor(QTextEdit::MovePgDown, false);
LOGDEB(("RecollMain::resPageDownOrNext: vpos before %d, after %d\n",
vpos, reslistTE->contentsY()));
if (vpos == reslistTE->contentsY())
showResultPage();
}
// Show previous page of results. We just set the current number back
// 2 pages and show next page.
void RecollMain::resultPageBack()
{
if (reslist_winfirst <= 0)
@@ -457,9 +493,15 @@ void RecollMain::showResultPage()
int last = MIN(resCnt-reslist_winfirst, respagesize);
string alltext;
// Insert results if any in result list window
// Insert results if any in result list window. We have to send
// the text to the widgets, because we need the paragraph number
// each time we add a result paragraph (its diffult and
// error-prone to compute the paragraph numbers in parallel. We
// would like to disable updates while we're doing this, but
// couldn't find a way to make it work, the widget seems to become
// confused if appended while updates are disabled
// reslistTE->setUpdatesEnabled(false);
for (int i = 0; i < last; i++) {
string sh;
doc.erase();
@@ -477,13 +519,11 @@ void RecollMain::showResultPage()
QString line = "<p><font size=+1><b>";
line += docsource->title().c_str();
line += "</b></font><br>";
//alltext.append(line.utf8());
reslistTE->append(line);
line = tr("<b>Displaying results starting at index"
" %1 (maximum set size %2)</b></p>\n")
.arg(reslist_winfirst+1)
.arg(resCnt);
//alltext.append(line.utf8());
reslistTE->append(line);
}
@@ -544,7 +584,6 @@ void RecollMain::showResultPage()
"<i>" + doc.url + +"</i><br></p>\n";
QString str = QString::fromUtf8(result.c_str(), result.length());
//alltext.append(str.utf8());
reslistTE->append(str);
pageParaToReldocnums[reslistTE->paragraphs()-1] = i;
@@ -559,14 +598,16 @@ void RecollMain::showResultPage()
} else {
// Restore first in win parameter that we shouln't have incremented
reslistTE->append(tr("<p>"
/*"<img align=\"left\" source=\"myimage\">"*/
"<b>No results found</b>"
"<br>"));
/*"<img align=\"left\" source=\"myimage\">"*/
"<b>No results found</b>"
"<br>"));
reslist_winfirst -= respagesize;
if (reslist_winfirst < 0)
reslist_winfirst = -1;
}
//reslistTE->setUpdatesEnabled(true);reslistTE->sync();reslistTE->repaint();
#if 0
{
FILE *fp = fopen("/tmp/reslistdebug", "w");