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

GUI: snippets: dont recreate the window each time, allow displaying data for multiple documents. restable: update snippets when changing current row

Browse Source
This commit is contained in:
Jean-Francois Dockes 2019-07-03 13:46:38 +02:00
parent 6b058e9758
commit d812fb8079
5 changed files with 99 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/qtgui/rclm_wins.cpp
View File

@ -31,6 +31,7 @@
#include "specialindex.h"
#include "rclmain_w.h"
#include "webcache.h"
#include "restable.h"
using namespace std;
@ -453,16 +454,23 @@ void RclMain::newDupsW(const Rcl::Doc, const vector<Rcl::Doc> dups)
void RclMain::showSnippets(Rcl::Doc doc)
{
if (m_snippets) {
deleteZ(m_snippets);
if (!m_snippets) {
m_snippets = new SnippetsW(doc, m_source);
connect(m_snippets, SIGNAL(startNativeViewer(Rcl::Doc, int, QString)),
this, SLOT(startNativeViewer(Rcl::Doc, int, QString)));
connect(new QShortcut(quitKeySeq, m_snippets), SIGNAL (activated()),
this, SLOT (fileExit()));
connect(new QShortcut(closeKeySeq, m_snippets), SIGNAL (activated()),
m_snippets, SLOT (close()));
if (restable) {
connect(
restable,
SIGNAL(detailDocChanged(Rcl::Doc, std::shared_ptr<DocSequence>)),
m_snippets,
SLOT(onSetDoc(Rcl::Doc, std::shared_ptr<DocSequence>)));
}
} else {
m_snippets->onSetDoc(doc, m_source);
}
m_snippets = new SnippetsW(doc, m_source);
connect(m_snippets, SIGNAL(startNativeViewer(Rcl::Doc, int, QString)),
this, SLOT(startNativeViewer(Rcl::Doc, int, QString)));
connect(new QShortcut(quitKeySeq, m_snippets), SIGNAL (activated()),
this, SLOT (fileExit()));
connect(new QShortcut(closeKeySeq, m_snippets), SIGNAL (activated()),
m_snippets, SLOT (close()));
m_snippets->show();
}

1
src/qtgui/restable.cpp
View File

@ -666,6 +666,7 @@ void ResTable::onTableView_currentChanged(const QModelIndex& index)
m_detaildoc = doc;
m_pager->displayDoc(theconfig, index.row(), m_detaildoc,
m_model->m_hdata);
emit(detailDocChanged(doc, m_model->getDocSource()));
} else {
m_detaildocnum = -1;
}

3
src/qtgui/restable.h
View File

@ -167,7 +167,8 @@ signals:
void docExpand(Rcl::Doc);
void showSubDocs(Rcl::Doc);
void showSnippets(Rcl::Doc);
void detailDocChanged(Rcl::Doc, std::shared_ptr<DocSequence>);
friend class ResTablePager;
friend class ResTableDetailArea;
private:

148
src/qtgui/snippets_w.cpp
View File

@ -65,23 +65,18 @@ using namespace std;
class PlainToRichQtSnippets : public PlainToRich {
public:
virtual string startMatch(unsigned int)
{
return string("<span class='rclmatch' style='")
+ qs2utf8s(prefs.qtermstyle) + string("'>");
virtual string startMatch(unsigned int) {
return string("<span class='rclmatch' style='")
+ qs2utf8s(prefs.qtermstyle) + string("'>");
}
virtual string endMatch()
{
return string("</span>");
virtual string endMatch() {
return string("</span>");
}
};
static PlainToRichQtSnippets g_hiliter;
void SnippetsW::init()
{
if (!m_source)
return;
QPushButton *searchButton = new QPushButton(tr("Search"));
searchButton->setAutoDefault(false);
buttonBox->addButton(searchButton, QDialogButtonBox::ActionRole);
@ -94,16 +89,16 @@ void SnippetsW::init()
new QShortcut(QKeySequence::FindNext, this, SLOT(slotEditFindNext()));
new QShortcut(QKeySequence(Qt::Key_F3), this, SLOT(slotEditFindNext()));
new QShortcut(QKeySequence::FindPrevious, this,
SLOT(slotEditFindPrevious()));
SLOT(slotEditFindPrevious()));
new QShortcut(QKeySequence(Qt::SHIFT + Qt::Key_F3),
this, SLOT(slotEditFindPrevious()));
this, SLOT(slotEditFindPrevious()));
QPushButton *closeButton = buttonBox->button(QDialogButtonBox::Close);
if (closeButton)
connect(closeButton, SIGNAL(clicked()), this, SLOT(close()));
connect(closeButton, SIGNAL(clicked()), this, SLOT(close()));
connect(searchButton, SIGNAL(clicked()), this, SLOT(slotEditFind()));
connect(searchLE, SIGNAL(textChanged(const QString&)),
this, SLOT(slotSearchTextChanged(const QString&)));
this, SLOT(slotSearchTextChanged(const QString&)));
connect(nextPB, SIGNAL(clicked()), this, SLOT(slotEditFindNext()));
connect(prevPB, SIGNAL(clicked()), this, SLOT(slotEditFindPrevious()));
@ -113,43 +108,50 @@ void SnippetsW::init()
verticalLayout->insertWidget(0, browserw);
browser->setUrl(QUrl(QString::fromUtf8("about:blank")));
connect(browser, SIGNAL(linkClicked(const QUrl &)),
this, SLOT(onLinkClicked(const QUrl &)));
this, SLOT(onLinkClicked(const QUrl &)));
browser->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
browser->page()->currentFrame()->setScrollBarPolicy(Qt::Horizontal,
Qt::ScrollBarAlwaysOff);
Qt::ScrollBarAlwaysOff);
QWEBSETTINGS *ws = browser->page()->settings();
if (prefs.reslistfontfamily != "") {
ws->setFontFamily(QWEBSETTINGS::StandardFont, prefs.reslistfontfamily);
ws->setFontSize(QWEBSETTINGS::DefaultFontSize, prefs.reslistfontsize);
ws->setFontFamily(QWEBSETTINGS::StandardFont, prefs.reslistfontfamily);
ws->setFontSize(QWEBSETTINGS::DefaultFontSize, prefs.reslistfontsize);
}
if (!prefs.snipCssFile.isEmpty())
ws->setUserStyleSheetUrl(QUrl::fromLocalFile(prefs.snipCssFile));
ws->setUserStyleSheetUrl(QUrl::fromLocalFile(prefs.snipCssFile));
#elif defined(USING_WEBENGINE)
browserw = new QWebEngineView(this);
verticalLayout->insertWidget(0, browserw);
browser->setPage(new SnipWebPage(this));
QWEBSETTINGS *ws = browser->page()->settings();
if (prefs.reslistfontfamily != "") {
ws->setFontFamily(QWEBSETTINGS::StandardFont, prefs.reslistfontfamily);
ws->setFontSize(QWEBSETTINGS::DefaultFontSize, prefs.reslistfontsize);
ws->setFontFamily(QWEBSETTINGS::StandardFont, prefs.reslistfontfamily);
ws->setFontSize(QWEBSETTINGS::DefaultFontSize, prefs.reslistfontsize);
}
// Stylesheet TBD
#else
browserw = new QTextBrowser(this);
verticalLayout->insertWidget(0, browserw);
connect(browser, SIGNAL(anchorClicked(const QUrl &)),
this, SLOT(onLinkClicked(const QUrl &)));
this, SLOT(onLinkClicked(const QUrl &)));
browser->setReadOnly(true);
browser->setUndoRedoEnabled(false);
browser->setOpenLinks(false);
browser->setTabChangesFocus(true);
if (prefs.reslistfontfamily.length()) {
QFont nfont(prefs.reslistfontfamily, prefs.reslistfontsize);
browser->setFont(nfont);
QFont nfont(prefs.reslistfontfamily, prefs.reslistfontsize);
browser->setFont(nfont);
} else {
browser->setFont(QFont());
browser->setFont(QFont());
}
#endif
}
void SnippetsW::onSetDoc(Rcl::Doc doc, std::shared_ptr<DocSequence> source)
{
m_doc = doc;
if (!source)
return;
// Make title out of file name if none yet
string titleOrFilename;
@ -157,7 +159,7 @@ void SnippetsW::init()
m_doc.getmeta(Rcl::Doc::keytt, &titleOrFilename);
m_doc.getmeta(Rcl::Doc::keyfn, &utf8fn);
if (titleOrFilename.empty()) {
titleOrFilename = utf8fn;
titleOrFilename = utf8fn;
}
QString title("Recoll - Snippets");
if (!titleOrFilename.empty()) {
@ -166,17 +168,17 @@ void SnippetsW::init()
setWindowTitle(title);
vector<Rcl::Snippet> vpabs;
m_source->getAbstract(m_doc, vpabs,
source->getAbstract(m_doc, vpabs,
prefs.snipwMaxLength, prefs.snipwSortByPage);
HighlightData hdata;
m_source->getTerms(hdata);
source->getTerms(hdata);
ostringstream oss;
oss <<
"<html><head>"
"<meta http-equiv=\"content-type\" "
"content=\"text/html; charset=utf-8\">";
"<html><head>"
"<meta http-equiv=\"content-type\" "
"content=\"text/html; charset=utf-8\">";
oss << "<style type=\"text/css\">\nbody,table,select,input {\n";
oss << "color: " + qs2utf8s(prefs.fontcolor) + ";\n";
@ -184,38 +186,38 @@ void SnippetsW::init()
oss << qs2utf8s(prefs.reslistheadertext);
oss <<
"</head>"
"<body>"
"<table class=\"snippets\">"
;
"</head>"
"<body>"
"<table class=\"snippets\">"
;
g_hiliter.set_inputhtml(false);
bool nomatch = true;
for (const auto& snippet : vpabs) {
if (snippet.page == -1) {
oss << "<tr><td colspan=\"2\">" <<
snippet.snippet << "</td></tr>" << endl;
continue;
}
list<string> lr;
if (!g_hiliter.plaintorich(snippet.snippet, lr, hdata)) {
LOGDEB1("No match for [" << snippet.snippet << "]\n");
continue;
}
nomatch = false;
oss << "<tr><td>";
if (snippet.page > 0) {
oss << "<a href=\"http://h/P" << snippet.page << "T" <<
if (snippet.page == -1) {
oss << "<tr><td colspan=\"2\">" <<
snippet.snippet << "</td></tr>" << endl;
continue;
}
list<string> lr;
if (!g_hiliter.plaintorich(snippet.snippet, lr, hdata)) {
LOGDEB1("No match for [" << snippet.snippet << "]\n");
continue;
}
nomatch = false;
oss << "<tr><td>";
if (snippet.page > 0) {
oss << "<a href=\"http://h/P" << snippet.page << "T" <<
snippet.term << "\">"
<< "P.&nbsp;" << snippet.page << "</a>";
}
oss << "</td><td>" << lr.front().c_str() << "</td></tr>" << endl;
<< "P.&nbsp;" << snippet.page << "</a>";
}
oss << "</td><td>" << lr.front().c_str() << "</td></tr>" << endl;
}
oss << "</table>" << endl;
if (nomatch) {
oss.str("<html><head></head><body>\n");
oss << qs2utf8s(tr("<p>Sorry, no exact match was found within limits. "
oss.str("<html><head></head><body>\n");
oss << qs2utf8s(tr("<p>Sorry, no exact match was found within limits. "
"Probably the document is very big and the snippets "
"generator got lost in a maze...</p>"));
}
@ -239,7 +241,7 @@ void SnippetsW::slotEditFind()
void SnippetsW::slotEditFindNext()
{
if (!searchFM->isVisible())
slotEditFind();
slotEditFind();
#if defined(USING_WEBKIT) || defined(USING_WEBENGINE)
browser->findText(searchLE->text());
@ -252,7 +254,7 @@ void SnippetsW::slotEditFindNext()
void SnippetsW::slotEditFindPrevious()
{
if (!searchFM->isVisible())
slotEditFind();
slotEditFind();
#if defined(USING_WEBKIT) || defined(USING_WEBENGINE)
browser->findText(searchLE->text(), QWEBPAGE::FindBackward);
@ -281,23 +283,23 @@ void SnippetsW::onLinkClicked(const QUrl &url)
LOGDEB("Snippets::onLinkClicked: [" << ascurl << "]\n");
if (ascurl.size() > 3) {
int what = ascurl[0];
switch (what) {
case 'P':
{
string::size_type numpos = ascurl.find_first_of("0123456789");
if (numpos == string::npos)
return;
int page = atoi(ascurl.c_str() + numpos);
string::size_type termpos = ascurl.find_first_of("T");
string term;
if (termpos != string::npos)
term = ascurl.substr(termpos+1);
emit startNativeViewer(m_doc, page,
QString::fromUtf8(term.c_str()));
return;
}
}
int what = ascurl[0];
switch (what) {
case 'P':
{
string::size_type numpos = ascurl.find_first_of("0123456789");
if (numpos == string::npos)
return;
int page = atoi(ascurl.c_str() + numpos);
string::size_type termpos = ascurl.find_first_of("T");
string term;
if (termpos != string::npos)
term = ascurl.substr(termpos+1);
emit startNativeViewer(m_doc, page,
QString::fromUtf8(term.c_str()));
return;
}
}
}
LOGERR("Snippets::onLinkClicked: bad link [" << ascurl << "]\n");
}

5
src/qtgui/snippets_w.h
View File

@ -35,13 +35,15 @@ class SnippetsW : public QWidget, public Ui::Snippets
public:
SnippetsW(Rcl::Doc doc, std::shared_ptr<DocSequence> source,
QWidget* parent = 0)
: QWidget(parent), m_doc(doc), m_source(source) {
: QWidget(parent) {
setupUi((QDialog*)this);
init();
onSetDoc(doc, source);
}
public slots:
virtual void onLinkClicked(const QUrl &);
virtual void onSetDoc(Rcl::Doc doc, std::shared_ptr<DocSequence> source);
protected slots:
virtual void slotEditFind();
@ -54,7 +56,6 @@ signals:
private:
void init();
Rcl::Doc m_doc;
std::shared_ptr<DocSequence> m_source;
};
#ifdef USING_WEBENGINE