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

change hghlight text size limit to configurable value

Browse Source
This commit is contained in:
dockes 2007-09-08 17:25:49 +00:00
parent 3a817b8adb
commit e6c0825568
5 changed files with 74 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qtgui/guiutils.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: guiutils.cpp,v 1.34 2007-07-12 10:13:37 dockes Exp $ (C) 2005 Jean-Francois Dockes"; static char rcsid[] = "@(#$Id: guiutils.cpp,v 1.35 2007-09-08 17:25:49 dockes Exp $ (C) 2005 Jean-Francois 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
@ -185,6 +185,7 @@ void rwSettings(bool writing)
SETTING_RW(prefs.ssearchAutoPhrase, SETTING_RW(prefs.ssearchAutoPhrase,
"/Recoll/prefs/ssearchAutoPhrase", Bool, false); "/Recoll/prefs/ssearchAutoPhrase", Bool, false);
SETTING_RW(prefs.respagesize, "/Recoll/prefs/reslist/pagelen", Num, 8); SETTING_RW(prefs.respagesize, "/Recoll/prefs/reslist/pagelen", Num, 8);
SETTING_RW(prefs.maxhltextmbs, "/Recoll/prefs/preview/maxhltextmbs", Num, 3);
SETTING_RW(prefs.reslistfontfamily, "/Recoll/prefs/reslist/fontFamily", , SETTING_RW(prefs.reslistfontfamily, "/Recoll/prefs/reslist/fontFamily", ,
""); "");
SETTING_RW(prefs.reslistfontsize, "/Recoll/prefs/reslist/fontSize", Num, SETTING_RW(prefs.reslistfontsize, "/Recoll/prefs/reslist/fontSize", Num,

3
src/qtgui/guiutils.h
View File

@ -17,7 +17,7 @@
#ifndef _GUIUTILS_H_INCLUDED_ #ifndef _GUIUTILS_H_INCLUDED_
#define _GUIUTILS_H_INCLUDED_ #define _GUIUTILS_H_INCLUDED_
/* /*
* @(#$Id: guiutils.h,v 1.24 2007-08-01 10:04:53 dockes Exp $ (C) 2005 Jean-Francois Dockes * @(#$Id: guiutils.h,v 1.25 2007-09-08 17:25:49 dockes Exp $ (C) 2005 Jean-Francois Dockes
* jean-francois.dockes@wanadoo.fr * jean-francois.dockes@wanadoo.fr
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -63,6 +63,7 @@ class PrefsPack {
public: public:
bool autoSearchOnWS; bool autoSearchOnWS;
int respagesize; int respagesize;
int maxhltextmbs;
QString reslistfontfamily; QString reslistfontfamily;
int reslistfontsize; int reslistfontsize;
// Result list format string // Result list format string

35
src/qtgui/preview_w.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: preview_w.cpp,v 1.26 2007-07-20 14:43:21 dockes Exp $ (C) 2005 J.F.Dockes"; static char rcsid[] = "@(#$Id: preview_w.cpp,v 1.27 2007-09-08 17:25:49 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
@ -705,9 +705,15 @@ bool Preview::loadFileInCurrentTab(string fn, size_t sz, const Rcl::Doc &idoc,
// Create preview text: highlight search terms (if not too big): // Create preview text: highlight search terms (if not too big):
QString richTxt; QString richTxt;
bool highlightTerms = fdoc.text.length() < 2000 * 1024;
// We don't do the highlighting for very big texts: too long. We
// should at least do special char escaping, in case a '&' or '<'
// somehow slipped through previous processing.
bool highlightTerms = fdoc.text.length() < (unsigned long)prefs.maxhltextmbs * 1024 * 1024;
int beaconPos = -1;
if (highlightTerms) { if (highlightTerms) {
progress.setLabelText(tr("Creating preview text")); progress.setLabelText(tr("Creating preview text"));
qApp->processEvents();
ToRichThread rthr(fdoc.text, m_hData, richTxt); ToRichThread rthr(fdoc.text, m_hData, richTxt);
rthr.start(); rthr.start();
@ -740,16 +746,20 @@ bool Preview::loadFileInCurrentTab(string fn, size_t sz, const Rcl::Doc &idoc,
richTxt += "<b>Cancelled !</b>"; richTxt += "<b>Cancelled !</b>";
} }
} }
beaconPos = richTxt.find(QString::fromUtf8(firstTermBeacon));
} else { } else {
// Note that in the case were we don't call plaintorich, the
// text will no be identified as richtxt/html (no <html> or
// <qt> etc. at the beginning), and there is no need to escape
// special characters
richTxt = QString::fromUtf8(fdoc.text.c_str(), fdoc.text.length()); richTxt = QString::fromUtf8(fdoc.text.c_str(), fdoc.text.length());
} }
int pos = richTxt.find(QString::fromUtf8(firstTermBeacon)); m_haveAnchors = (beaconPos != -1);
m_haveAnchors = (pos != -1);
LOGDEB(("LoadFileInCurrentTab: rich: cancel %d txtln %d, hasAnchors %d " LOGDEB(("LoadFileInCurrentTab: rich: cancel %d txtln %d, hasAnchors %d "
"(pos %d)\n", "(beaconPos %d)\n",
CancelCheck::instance().cancelState(), richTxt.length(), CancelCheck::instance().cancelState(), richTxt.length(),
m_haveAnchors, pos)); m_haveAnchors, beaconPos));
// Load into editor // Load into editor
// Do it in several chunks // Do it in several chunks
@ -796,20 +806,28 @@ bool Preview::loadFileInCurrentTab(string fn, size_t sz, const Rcl::Doc &idoc,
progress.close(); progress.close();
if (searchTextLine->text().length() != 0) { if (searchTextLine->text().length() != 0) {
// If there is a current search string, perform the search
m_canBeep = true; m_canBeep = true;
doSearch(searchTextLine->text(), true, false); doSearch(searchTextLine->text(), true, false);
} else { } else {
// Position to the first query term
if (m_haveAnchors) { if (m_haveAnchors) {
QString aname = QString::fromUtf8(termAnchorName(1).c_str()); QString aname = QString::fromUtf8(termAnchorName(1).c_str());
LOGDEB2(("Call scrolltoanchor(%s)\n", (const char *)aname.utf8())); LOGDEB2(("Call scrolltoanchor(%s)\n", (const char *)aname.utf8()));
editor->scrollToAnchor(aname); editor->scrollToAnchor(aname);
// The q3textedit version of find is slow to the point of being
// unusable (plus it does not always work)
#if (QT_VERSION < 0x040000) #if (QT_VERSION < 0x040000)
// The q3textedit version of te::find() is slow to the point of
// being unusable (plus it does not always work). So we
// don't position to the first term automatically, the
// user can still use the search function in the preview
// window to do it
#ifdef QT_SCROLL_TO_ANCHOR_BUG #ifdef QT_SCROLL_TO_ANCHOR_BUG
bool ocanbeep = m_canBeep; bool ocanbeep = m_canBeep;
m_canBeep = false; m_canBeep = false;
QString empty; QString empty;
// Calling doSearch() with an empty string will look for
// the first occurrence of a search term`
// doSearch(_text, next, reverse, wordOnly) // doSearch(_text, next, reverse, wordOnly)
doSearch(empty, true, false, false); doSearch(empty, true, false, false);
m_canBeep = ocanbeep; m_canBeep = ocanbeep;
@ -817,6 +835,7 @@ bool Preview::loadFileInCurrentTab(string fn, size_t sz, const Rcl::Doc &idoc,
#endif // (QT_VERSION < 0x040000) #endif // (QT_VERSION < 0x040000)
} }
} }
// Enter document in document history // Enter document in document history
g_dynconf->enterDoc(fn, doc.ipath); g_dynconf->enterDoc(fn, doc.ipath);

40
src/qtgui/uiprefs.ui
View File

@ -193,6 +193,46 @@
</widget> </widget>
</hbox> </hbox>
</widget> </widget>
<widget class="QLayoutWidget">
<property name="name">
<cstring>layoutHL</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel">
<property name="name">
<cstring>textLabelHL</cstring>
</property>
<property name="toolTip" stdset="0">
<string>Texts over this size will not be highlighted in preview (too slow).</string>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>5</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Maximum text size highlighted for preview (megabytes)</string>
</property>
</widget>
<widget class="QSpinBox">
<property name="name">
<cstring>maxHLTSB</cstring>
</property>
<property name="minValue">
<number>1</number>
</property>
<property name="value">
<number>3</number>
</property>
</widget>
</hbox>
</widget>
<widget class="QLayoutWidget"> <widget class="QLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout36</cstring> <cstring>layout36</cstring>

4
src/qtgui/uiprefs_w.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: uiprefs_w.cpp,v 1.21 2007-08-01 10:04:53 dockes Exp $ (C) 2005 J.F.Dockes"; static char rcsid[] = "@(#$Id: uiprefs_w.cpp,v 1.22 2007-09-08 17:25:49 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
@ -96,6 +96,7 @@ void UIPrefsDialog::setFromPrefs()
{ {
// Entries per result page spinbox // Entries per result page spinbox
pageLenSB->setValue(prefs.respagesize); pageLenSB->setValue(prefs.respagesize);
maxHLTSB->setValue(prefs.maxhltextmbs);
autoSearchCB->setChecked(prefs.autoSearchOnWS); autoSearchCB->setChecked(prefs.autoSearchOnWS);
syntlenSB->setValue(prefs.syntAbsLen); syntlenSB->setValue(prefs.syntAbsLen);
syntctxSB->setValue(prefs.syntAbsCtx); syntctxSB->setValue(prefs.syntAbsCtx);
@ -168,6 +169,7 @@ void UIPrefsDialog::accept()
{ {
prefs.autoSearchOnWS = autoSearchCB->isChecked(); prefs.autoSearchOnWS = autoSearchCB->isChecked();
prefs.respagesize = pageLenSB->value(); prefs.respagesize = pageLenSB->value();
prefs.maxhltextmbs = maxHLTSB->value();
prefs.reslistfontfamily = reslistFontFamily; prefs.reslistfontfamily = reslistFontFamily;
prefs.reslistfontsize = reslistFontSize; prefs.reslistfontsize = reslistFontSize;