Commit 1d2031c2 authored by Robin Eschbach's avatar Robin Eschbach
Browse files

[FIX #734] wrong image paths resulting in long load times

parent 89539b94
......@@ -250,6 +250,7 @@ std::vector< WModuleMetaInformation::Screenshot > WModuleMetaInformation::getScr
{
continue;
}
s.m_filename = m_localPath / s.m_filename;
// optional
s.m_description = ( *i ).getValue< std::string >( "description", "" );
......
......@@ -8,7 +8,7 @@ interface that allows the user to edit one-dimensional transfer functions.</p>
Function</i></b> property. The following image shows the property after the user has
already done some editing.</p>
<img src="editorWidget.png">
<img src="help/editorWidget.png">
<p>
The dark areas in the background are two different representation of the
histogram of the dataset. One is a linear and one is a logarithmic version of
......
......@@ -8,7 +8,7 @@ interface that allows the user to create and edit two-dimensional transfer funct
Function</i></b> property. The following image shows the property after the user has
already done some editing.</p>
<img src="editorWidget.png" width="100%" />
<img src="help/editorWidget.png" width="100%" />
<p>
The background shows a representation of a 2D histogram with a logarithmic bin count.
The histogram is generated based on the two connected data sets.
......
......@@ -862,7 +862,7 @@ void WMainWindow::openOpenWalnutHelpDialog()
QWebEngineView *view = new QWebEngineView( this );
#endif
QString location( QString( "file://" ) + WPathHelper::getDocPath().string().c_str() + "/openwalnut-qt/" );
QString location( QString( "file:///" ) + WPathHelper::getDocPath().string().c_str() + "/openwalnut-qt/" );
view->setHtml( content.c_str(), QUrl( location ) );
view->show();
layout->addWidget( view );
......
......@@ -130,11 +130,11 @@ std::string htmlify( WModuleMetaInformation::ConstSPtr meta )
if( !( *iter ).m_email.empty() )
{
ss << "<a href='mailto:" << ( *iter ).m_email << "'>" << "<img width='24px' src='" << iconPath << "/email.png' />" << "</a>";
ss << "<a href='mailto:" << ( *iter ).m_email << "'>" << "<img width='24px' src='file:///" << iconPath << "/email.png' />" << "</a>";
}
if( !( *iter ).m_url.empty() )
{
ss << "<a href='" << ( *iter ).m_url << "'>" << "<img width='24px' src='" << iconPath << "website.png' />" << "</a>";
ss << "<a href='" << ( *iter ).m_url << "'>" << "<img width='24px' src='file:///" << iconPath << "website.png' />" << "</a>";
}
ss << "&nbsp;";
......@@ -187,7 +187,7 @@ std::string htmlify( WModuleMetaInformation::ConstSPtr meta )
ss << " <tr>"
<< " <td width='1%' style='padding:10px; background:#ddd;'>";
ss << " <img src='" << ( *iter ).m_filename.string() << "' width=200px>";
ss << " <img src='file:///" << ( *iter ).m_filename.string() << "' width=200px>";
ss << " </td>"
<< " <td style='padding:10px; background:#e7e7e7;'>";
......@@ -289,7 +289,9 @@ void WQtModuleMetaInfo::resetContent()
{
// we use the module resource path as search URL
std::string moduleLocation( m_module->getLocalPath().string() );
QString locationURL( QString( "file://" ) + QString::fromStdString( moduleLocation ) + "/" );
QString locationURL( QString( "file:///" ) + QString::fromStdString( moduleLocation ) + "/" );
locationURL.replace( "\\", "/" );
// set content
std::string processedContent = htmlify( m_module->getMetaInformation() );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment