chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try and work around Qt Helps dodgy search results

Browse Source
This commit is contained in:
Mark Watkins 2018-06-08 15:43:03 +10:00
parent 8f5fdbc90d
commit 16e9883103
6 changed files with 66 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sleepyhead/daily.cpp
View File

@ -1276,15 +1276,13 @@ QString Daily::getSleepTime(Day * day)
QVariant MyTextBrowser::loadResource(int type, const QUrl &url) QVariant MyTextBrowser::loadResource(int type, const QUrl &url)
{ {
if (type == QTextDocument::ImageResource if (type == QTextDocument::ImageResource && url.scheme().compare(QLatin1String("data"), Qt::CaseInsensitive) == 0) {
&& url.scheme().compare(QLatin1String("data"), Qt::CaseInsensitive) == 0) static QRegularExpression re("^image/[^;]+;base64,.+={0,2}$");
{ QRegularExpressionMatch match = re.match(url.path());
static QRegularExpression re("^image/[^;]+;base64,.+={0,2}$"); if (match.hasMatch())
QRegularExpressionMatch match = re.match(url.path()); return QVariant();
if (match.hasMatch()) }
return QVariant(); return QTextBrowser::loadResource(type, url);
}
return QTextBrowser::loadResource(type, url);
} }

65
sleepyhead/help.cpp
View File

@ -41,7 +41,13 @@ Help::Help(QWidget *parent) :
tabWidget->addTab(helpEngine->contentWidget(), tr("Contents")); tabWidget->addTab(helpEngine->contentWidget(), tr("Contents"));
tabWidget->addTab(helpEngine->indexWidget(), tr("Index")); tabWidget->addTab(helpEngine->indexWidget(), tr("Index"));
tabWidget->addTab(helpEngine->searchEngine()->resultWidget(), tr("Search"));
resultWidget = new MyTextBrowser(this);
resultWidget->setOpenLinks(false);
tabWidget->addTab(resultWidget, tr("Search"));
resultWidget->setStyleSheet("a:link, a:visited { color: inherit; text-decoration: none; font-weight: normal;}"
"a:hover { background-color: inherit; color: #ff8888; text-decoration:underline; font-weight: normal; }");
helpBrowser = new HelpBrowser(helpEngine); helpBrowser = new HelpBrowser(helpEngine);
@ -60,13 +66,15 @@ Help::Help(QWidget *parent) :
QTimer::singleShot(50,this, SLOT(startup())); QTimer::singleShot(50,this, SLOT(startup()));
connect(helpEngine->contentWidget(), SIGNAL(linkActivated(QUrl)), helpBrowser, SLOT(setSource(QUrl)));
connect(helpEngine->indexWidget(), SIGNAL(linkActivated(QUrl, QString)), helpBrowser, SLOT(setSource(QUrl)));
connect(helpBrowser, SIGNAL(forwardAvailable(bool)), this, SLOT(forwardAvailable(bool))); connect(helpBrowser, SIGNAL(forwardAvailable(bool)), this, SLOT(forwardAvailable(bool)));
connect(helpBrowser, SIGNAL(backwardAvailable(bool)), this, SLOT(backwardAvailable(bool))); connect(helpBrowser, SIGNAL(backwardAvailable(bool)), this, SLOT(backwardAvailable(bool)));
connect(helpEngine->contentWidget(), SIGNAL(linkActivated(QUrl)), helpBrowser, SLOT(setSource(QUrl)));
connect(helpEngine->indexWidget(), SIGNAL(linkActivated(QUrl, QString)), helpBrowser, SLOT(setSource(QUrl)));
connect(helpEngine->searchEngine(), SIGNAL(searchingFinished(int)), this, SLOT(on_searchComplete(int))); connect(helpEngine->searchEngine(), SIGNAL(searchingFinished(int)), this, SLOT(on_searchComplete(int)));
connect(helpEngine->searchEngine(), SIGNAL(indexingFinished()), this, SLOT(indexingFinished())); connect(helpEngine->searchEngine(), SIGNAL(indexingFinished()), this, SLOT(indexingFinished()));
connect(helpEngine->searchEngine()->resultWidget(), SIGNAL(requestShowLink(QUrl)), this, SLOT(requestShowLink(QUrl)));
connect(resultWidget, SIGNAL(anchorClicked(QUrl)), this, SLOT(requestShowLink(QUrl)));
ui->forwardButton->setEnabled(false); ui->forwardButton->setEnabled(false);
ui->backButton->setEnabled(false); ui->backButton->setEnabled(false);
@ -80,7 +88,7 @@ Help::Help(QWidget *parent) :
Help::~Help() Help::~Help()
{ {
disconnect(helpEngine->searchEngine()->resultWidget(), SIGNAL(requestShowLink(QUrl)), this, SLOT(requestShowLink(QUrl))); disconnect(resultWidget, SIGNAL(anchorClicked(QUrl)), this, SLOT(requestShowLink(QUrl)));
disconnect(helpEngine->searchEngine(), SIGNAL(indexingFinished()), this, SLOT(indexingFinished())); disconnect(helpEngine->searchEngine(), SIGNAL(indexingFinished()), this, SLOT(indexingFinished()));
disconnect(helpEngine->searchEngine(), SIGNAL(searchingFinished(int)), this, SLOT(on_searchComplete(int))); disconnect(helpEngine->searchEngine(), SIGNAL(searchingFinished(int)), this, SLOT(on_searchComplete(int)));
@ -111,8 +119,7 @@ QVariant HelpBrowser::loadResource(int type, const QUrl &name)
QByteArray bytes = helpEngine->fileData(urlstr); QByteArray bytes = helpEngine->fileData(urlstr);
if (bytes.size()>0) return QVariant(bytes); if (bytes.size()>0) return QVariant(bytes);
if (type == QTextDocument::ImageResource if (type == QTextDocument::ImageResource && name.scheme().compare(QLatin1String(""), Qt::CaseInsensitive) == 0) {
&& name.scheme().compare(QLatin1String("data"), Qt::CaseInsensitive) == 0) {
static QRegularExpression re("^image/[^;]+;base64,.+={0,2}$"); static QRegularExpression re("^image/[^;]+;base64,.+={0,2}$");
QRegularExpressionMatch match = re.match(name.path()); QRegularExpressionMatch match = re.match(name.path());
if (match.hasMatch()) if (match.hasMatch())
@ -136,7 +143,7 @@ void Help::on_homeButton_clicked()
QByteArray index = helpEngine->fileData(QUrl("qthelp://jedimark.net.sleepyhead.1.1/doc/help_en/index.html")); QByteArray index = helpEngine->fileData(QUrl("qthelp://jedimark.net.sleepyhead.1.1/doc/help_en/index.html"));
helpBrowser->setHtml(index); helpBrowser->setHtml(index);
} }
void Help::on_searchComplete(int) void Help::on_searchComplete(int count)
{ {
if (!searchReady) { if (!searchReady) {
QString html = "<h1>Please wait a bit.. Indexing still in progress</h1>"; QString html = "<h1>Please wait a bit.. Indexing still in progress</h1>";
@ -144,23 +151,39 @@ void Help::on_searchComplete(int)
return; return;
} }
tabWidget->setCurrentWidget(helpEngine->searchEngine()->resultWidget());
return;
/*
QHelpSearchEngine * search = helpEngine->searchEngine(); QHelpSearchEngine * search = helpEngine->searchEngine();
QVector<QHelpSearchResult> results = search->searchResults(0, count); QVector<QHelpSearchResult> results = search->searchResults(0, count);
QString html = "<h1>Search results: "; // ui->searchBar->blockSignals(true);
ui->searchBar->setText(QString());
// ui->searchBar->blockSignals(false);
if (results.size() == 0) html += "none"; QString html = "<html><head><style type=\"text/css\">"
html+="</h1><br/>"; "a:link, a:visited { color: inherit; text-decoration: none; font-weight: normal;}"
"a:hover { background-color: inherit; color: #ff8888; text-decoration: underline; font-weight: bold; }"
"</style></head><body>";
QString queryString;
#if QT_VERSION < QT_VERSION_CHECK(5,9,0)
QList<QHelpSearchQuery> results = search->query();
if (results.size()>0) {
queryString=results[0].wordList.at(0);
}
#else
queryString = search->searchInput();
#endif
QString a = (results.size() == 0) ? tr("No") : QString("%1").arg(results.size());
html+="<font size=+1><b>"+ tr("%1 result(s) for \"%2\"").arg(a).arg(queryString)+"</b></font>";
if (results.size()>0) html += " [<font size=-1><a href='clear'>"+tr("clear")+"</a></font>]";
for (QHelpSearchResult & result : results) { for (QHelpSearchResult & result : results) {
html += QString("<p><a href=\"%1\"><b>Title: %2</b></a><br/>%3<br/>").arg(result.url().toString()).arg(result.title()).arg(result.snippet()); QString title = result.url().toString().section("/",-1);
html += QString("<p><a href=\"%1\"><b>%2:</b> %3</a></p>").arg(result.url().toString()).arg(title).arg(result.snippet());
} }
helpBrowser->setText(html); html += "</body></html>";
ui->searchBar->setText(QString()); */ resultWidget->setText(html);
tabWidget->setCurrentWidget(resultWidget);
} }
void Help::on_searchBar_returnPressed() void Help::on_searchBar_returnPressed()
@ -169,7 +192,7 @@ void Help::on_searchBar_returnPressed()
QString str=ui->searchBar->text(); QString str=ui->searchBar->text();
#if QT_VERSION < QT_VERSION_CHECK(5,10,0) #if QT_VERSION < QT_VERSION_CHECK(5,9,0)
QList<QHelpSearchQuery> query; QList<QHelpSearchQuery> query;
query.push_back(QHelpSearchQuery(QHelpSearchQuery::FUZZY, QStringList(str))); query.push_back(QHelpSearchQuery(QHelpSearchQuery::FUZZY, QStringList(str)));
search->search(query); search->search(query);
@ -194,5 +217,9 @@ void Help::backwardAvailable(bool b)
void Help::requestShowLink(const QUrl & link) void Help::requestShowLink(const QUrl & link)
{ {
helpBrowser->setSource(link); if (link.toString() == "clear") {
resultWidget->clear();
} else {
helpBrowser->setSource(link);
}
} }

2
sleepyhead/help.h
View File

@ -14,6 +14,7 @@
#include <QTextBrowser> #include <QTextBrowser>
#include <QTabWidget> #include <QTabWidget>
#include <QWidget> #include <QWidget>
#include "mytextbrowser.h"
namespace Ui { namespace Ui {
class Help; class Help;
@ -59,6 +60,7 @@ private:
QHelpEngine *helpEngine; QHelpEngine *helpEngine;
QTabWidget * tabWidget; QTabWidget * tabWidget;
HelpBrowser * helpBrowser; HelpBrowser * helpBrowser;
MyTextBrowser * resultWidget;
bool searchReady; bool searchReady;
}; };

12
sleepyhead/help/help_en.qhp
View File

@ -73,7 +73,17 @@
</keywords> </keywords>
<files> <files>
<file>default.css</file> <file>default.css</file>
<file>help_en/*.html</file> <file>help_en/daily.html</file>
<file>help_en/faq.html</file>
<file>help_en/gettingstarted.html</file>
<file>help_en/glossary.html</file>
<file>help_en/import.html</file>
<file>help_en/index.html</file>
<file>help_en/overview.html</file>
<file>help_en/oximetry.html</file>
<file>help_en/statistics.html</file>
<file>help_en/supported.html</file>
<file>help_en/tipsntricks.html</file>
<file>images/*.png</file> <file>images/*.png</file>
</files> </files>
</filterSection> </filterSection>

13
sleepyhead/help/help_en/doc.html
View File

@ -1,13 +0,0 @@
<html>
<body>
<a href="#chapter1"/>
<h1>Introduction to SleepyHead</h1>
SleepyHead is software designed for exploring data produced by your CPAP/APAP/BiLevel/etc Ventilator.
<a href="#chapter2"/>
<h1>Importing CPAP data</h1>
Click import. Cross your fingers.
<a href="#chapter3"/>
<h1>Exploring Daily View</h1>
The mouse does stuff
</body>
<html>

1
sleepyhead/sleepyhead.pro
View File

@ -339,7 +339,6 @@ DISTFILES += \
help/default.css \ help/default.css \
help/help_en.qhp \ help/help_en.qhp \
help/help_en/daily.html \ help/help_en/daily.html \
help/help_en/doc.html \
help/help_en/glossary.html \ help/help_en/glossary.html \
help/help_en/import.html \ help/help_en/import.html \
help/help_en/index.html \ help/help_en/index.html \