From cdf3eb537b4ab3bd212eac2ec9650dc0176fb931 Mon Sep 17 00:00:00 2001 From: Le Tan Date: Sun, 21 Jan 2018 15:32:27 +0800 Subject: [PATCH] add base URL in setHtml() to enable it access local files --- src/dialog/vtipsdialog.cpp | 3 ++- src/dialog/vupdater.cpp | 5 +++-- src/resources/themes/v_moonlight/v_moonlight.css | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/dialog/vtipsdialog.cpp b/src/dialog/vtipsdialog.cpp index cc1adbe5..9e19bbd2 100644 --- a/src/dialog/vtipsdialog.cpp +++ b/src/dialog/vtipsdialog.cpp @@ -60,7 +60,8 @@ void VTipsDialog::readFile(const QString &p_tipFile) g_config->getMarkdownExtensions(), toc); html = VUtils::generateSimpleHtmlTemplate(html); - m_viewer->setHtml(html); + // Add a base URL to enable it to access local style files. + m_viewer->setHtml(html, QUrl("qrc:/resources")); } void VTipsDialog::showEvent(QShowEvent *p_event) diff --git a/src/dialog/vupdater.cpp b/src/dialog/vupdater.cpp index f0301628..bd4871ba 100644 --- a/src/dialog/vupdater.cpp +++ b/src/dialog/vupdater.cpp @@ -37,7 +37,8 @@ void VUpdater::setupUI() m_descriptionWV = VUtils::getWebEngineView(); m_descriptionWV->setContextMenuPolicy(Qt::NoContextMenu); - m_descriptionWV->setHtml(VUtils::generateSimpleHtmlTemplate(VNote::s_sloganTemplate)); + m_descriptionWV->setHtml(VUtils::generateSimpleHtmlTemplate(VNote::s_sloganTemplate), + QUrl("qrc:/resources")); m_btnBox = new QDialogButtonBox(QDialogButtonBox::Ok); m_btnBox->button(QDialogButtonBox::Ok)->setProperty("SpecialBtn", true); @@ -180,6 +181,6 @@ void VUpdater::parseResult(const QByteArray &p_data) g_config->getMarkdownExtensions(), toc); html = VUtils::generateSimpleHtmlTemplate(html); - m_descriptionWV->setHtml(html); + m_descriptionWV->setHtml(html, QUrl("qrc:/resources")); m_proBar->hide(); } diff --git a/src/resources/themes/v_moonlight/v_moonlight.css b/src/resources/themes/v_moonlight/v_moonlight.css index 2df47929..6147f7b4 100644 --- a/src/resources/themes/v_moonlight/v_moonlight.css +++ b/src/resources/themes/v_moonlight/v_moonlight.css @@ -172,7 +172,7 @@ table tr th :last-child, table tr td :last-child { div.mermaid-diagram { overflow-y: hidden; - background: #7D879B; + background: #B0BEC5; color: #6C6C6C; } @@ -182,7 +182,7 @@ pre.mermaid-diagram { div.flowchart-diagram { overflow-y: hidden; - background: #7D879B; + background: #B0BEC5; color: #6C6C6C; }