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

esc quits preview + prev/next links

Browse Source
This commit is contained in:
dockes 2006-05-09 07:56:07 +00:00
parent 12e12c9681
commit 3e0de458c0
2 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qtgui/preview/preview.ui.h
View File

@ -95,7 +95,11 @@ bool Preview::eventFilter(QObject *target, QEvent *event)
if (keyEvent->key() == Key_Q && (keyEvent->state() & ControlButton)) { if (keyEvent->key() == Key_Q && (keyEvent->state() & ControlButton)) {
recollNeedsExit = 1; recollNeedsExit = 1;
return true; return true;
} else if (keyEvent->key() ==Key_W &&(keyEvent->state() & ControlButton)) { } else if (keyEvent->key() == Key_Escape) {
close();
return true;
} else if (keyEvent->key() == Key_W &&
(keyEvent->state() & ControlButton)) {
// LOGDEB(("Preview::eventFilter: got ^W\n")); // LOGDEB(("Preview::eventFilter: got ^W\n"));
closeCurrentTab(); closeCurrentTab();
return true; return true;

58
src/qtgui/rclreslist.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: rclreslist.cpp,v 1.16 2006-05-08 07:08:01 dockes Exp $ (C) 2005 J.F.Dockes"; static char rcsid[] = "@(#$Id: rclreslist.cpp,v 1.17 2006-05-09 07:56:07 dockes Exp $ (C) 2005 J.F.Dockes";
#endif #endif
#include <time.h> #include <time.h>
@ -186,18 +186,19 @@ void RclResList::showResultPage()
return; return;
} }
bool hasPrev = false;
if (m_winfirst < 0) { if (m_winfirst < 0) {
m_winfirst = 0; m_winfirst = 0;
emit prevPageAvailable(false);
} else { } else {
emit prevPageAvailable(true); hasPrev = true;
m_winfirst += prefs.respagesize; m_winfirst += prefs.respagesize;
} }
emit prevPageAvailable(hasPrev);
bool gotone = false; bool gotone = false;
clear(); clear();
int last = MIN(resCnt-m_winfirst, prefs.respagesize); int last = MIN(resCnt - m_winfirst, prefs.respagesize);
m_curDocs.clear(); m_curDocs.clear();
@ -353,7 +354,27 @@ void RclResList::showResultPage()
m_curDocs.push_back(doc); m_curDocs.push_back(doc);
} }
bool hasNext = false;
if (m_winfirst >= 0 && m_winfirst + prefs.respagesize < resCnt) {
hasNext = true;
}
if (gotone) { if (gotone) {
QString chunk = "<p align=\"center\">";
if (hasPrev || hasNext) {
if (hasPrev) {
chunk += "<a href=\"p-1\"><b>";
chunk += tr("Previous");
chunk += "</b></a>&nbsp;&nbsp;&nbsp;";
}
if (hasNext) {
chunk += "<a href=\"n-1\"><b>";
chunk += tr("Next");
chunk += "</b></a>";
}
chunk += "</p>\n";
append(chunk);
}
append("</body></qt>"); append("</body></qt>");
ensureCursorVisible(); ensureCursorVisible();
} else { } else {
@ -369,29 +390,10 @@ void RclResList::showResultPage()
m_winfirst -= prefs.respagesize; m_winfirst -= prefs.respagesize;
if (m_winfirst < 0) if (m_winfirst < 0)
m_winfirst = -1; m_winfirst = -1;
hasNext = false;
} }
//setUpdatesEnabled(true);sync();repaint(); emit nextPageAvailable(hasNext);
#if 0
{
FILE *fp = fopen("/tmp/reslistdebug", "w");
if (fp) {
const char *text = (const char *)text().utf8();
//const char *text = alltext.c_str();
fwrite(text, 1, strlen(text), fp);
fclose(fp);
}
}
#endif
if (m_winfirst < 0 ||
(m_winfirst >= 0 &&
m_winfirst + prefs.respagesize >= resCnt)) {
emit nextPageAvailable(false);
} else {
emit nextPageAvailable(true);
}
} }
// Single click in result list: color active paragraph // Single click in result list: color active paragraph
@ -433,6 +435,12 @@ void RclResList::linkWasClicked(const QString &s)
case 'E': case 'E':
emit docEditClicked(i); emit docEditClicked(i);
break; break;
case 'n':
showResultPage();
break;
case 'p':
resultPageBack();
break;
default: break;// ?? default: break;// ??
} }
} }