t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix to loading of online help system.

Browse Source
This commit is contained in:
Collin Kidder
2018-05-17 20:41:42 -04:00
parent f345642b03
commit 31618e87d1
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
helpwindow.cpp
+6 -16
View File
@@ -10,7 +10,7 @@ HelpWindow::HelpWindow(QWidget *parent) :
{ {
ui->setupUi(this); ui->setupUi(this);
m_helpEngine = new QHelpEngineCore("SavvyCAN.qhc", this); m_helpEngine = new QHelpEngineCore(QApplication::applicationDirPath() +"/SavvyCAN.qhc", this);
if (!m_helpEngine->setupData()) { if (!m_helpEngine->setupData()) {
delete m_helpEngine; delete m_helpEngine;
m_helpEngine = 0; m_helpEngine = 0;
@@ -66,8 +66,10 @@ HelpWindow* HelpWindow::getRef()
void HelpWindow::showHelp(QString help) void HelpWindow::showHelp(QString help)
{ {
if (m_helpEngine) { if (m_helpEngine) {
qDebug() << "Searching for " << help; QString url = "qthelp://org.sphinx.savvycan.181/doc/" + help;
QByteArray helpData = m_helpEngine->fileData(QUrl("qthelp://org.sphinx.savvycan.181/doc/" + help)); qDebug() << "Searching for " << url;
QByteArray helpData = m_helpEngine->fileData(QUrl(url));
qDebug() << "Help file size: " << helpData.length();
ui->textHelp->setText(helpData); ui->textHelp->setText(helpData);
} }
else else
@@ -78,17 +80,5 @@ void HelpWindow::showHelp(QString help)
readSettings(); readSettings();
self->show(); self->show();
} }
/*
QVariant HelpBrowser::loadResource(int type, const QUrl &name)
{
QByteArray ba;
if (type < 4 && m_helpEngine) {
QUrl url(name);
if (name.isRelative())
url = source().resolved(url);
ba = m_helpEngine->fileData(url);
}
return ba;
}
*/