Commit e70011f8 authored by Torsten Rahn's avatar Torsten Rahn
Browse files

- Small fix to the legend browser - enables airport


svn path=/trunk/KDE/kdeedu/marble/; revision=717726
parent 284e569e
a:link
{
color: #004faf;
......
......@@ -182,6 +182,14 @@
Magnetic Pole
</td>
</tr>
<tr>
<td align="left" valign="top" width="24">
<img src="./bitmaps/airport.png">
</td>
<td align="left" valign="top">
Airport
</td>
</tr>
<tr>
<td align="left" valign="top" width="24">
<img src="./bitmaps/shipwreck.png">
......
......@@ -39,11 +39,14 @@ MarbleLegendBrowser::MarbleLegendBrowser( QWidget *parent )
: QTextBrowser( parent ),
d( new MarbleLegendBrowserPrivate )
{
// Disable changing layout due to the ScrollBarPolicy:
setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn );
readHtml( QUrl::fromLocalFile( MarbleDirs::path( "legend.html" ) ) );
setHtml( d->m_html );
QTextFrameFormat format = document()->rootFrame()->frameFormat();
format.setMargin(6);
document()->rootFrame()->setFrameFormat( format );
viewport()->update();
setTextInteractionFlags( Qt::LinksAccessibleByMouse | Qt::LinksAccessibleByKeyboard );
......
......@@ -349,7 +349,9 @@ void MarbleModel::paintGlobe( ClipPainter* painter,
// Paint the PlaceMark layer
#ifndef KML_GSOC
if ( viewParams->m_showPlaceMarks && d->m_placemarkmodel->rowCount() > 0 ) {
if ( viewParams->m_showPlaceMarks && ( viewParams->m_showCities ||
viewParams->m_showTerrain || viewParams->m_showOtherPlaces )
&& d->m_placemarkmodel->rowCount() > 0 ) {
d->m_placeMarkLayout->paintPlaceFolder( painter,
viewParams->m_canvasImage->width(),
viewParams->m_canvasImage->height(),
......
......@@ -36,6 +36,7 @@ ViewParams::ViewParams( )
m_showCities = true;
m_showTerrain = true;
m_showOtherPlaces = true;
m_showGps = false;
......
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