switch logo image depending on map type

5 files changed, 12 insertions, 3 deletions

diff --git a/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp b/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp
index 87461430fc..669bc6486f 100644
--- a/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp
+++ b/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp
@@ -81,6 +81,7 @@ namespace
 QGeoTiledMapDataNokia::QGeoTiledMapDataNokia(QGeoMappingManagerEngineNokia *engine) :
     QGeoTiledMapData(engine),
     watermark(":/images/watermark.png"),
+    watermarkDark(":/images/watermark_dark.png"),
     m_logoPosition(engine->logoPosition())
 {
     m_networkManager = new QNetworkAccessManager(this);
@@ -252,16 +253,22 @@ void QGeoTiledMapDataNokia::paintProviderNotices(QPainter *painter, const QStyle
             );
         }
     }
+
+    const QPixmap & currentWatermark =
+               mapType() == QGraphicsGeoMap::SatelliteMapDay
+            || mapType() == QGraphicsGeoMap::SatelliteMapNight
+            || mapType() == QGraphicsGeoMap::TerrainMap ? watermark : watermarkDark;
+
     viewport.adjust(offset, offset, -offset, -offset);
 
     QRect watermarkViewRect(viewport), copyrightViewRect(viewport);
     watermarkViewRect.setHeight(watermarkViewRect.height() - lastCopyrightRect.height());
-    copyrightViewRect.adjust(0, watermark.height(), 0, 0);
+    copyrightViewRect.adjust(0, currentWatermark.height(), 0, 0);
 
-    QRect watermarkRect(watermark.rect()), copyrightRect(lastCopyrightRect);
+    QRect watermarkRect(currentWatermark.rect()), copyrightRect(lastCopyrightRect);
     AdjustLogo(watermarkViewRect, watermarkRect, m_logoPosition);
     AdjustLogo(copyrightViewRect, copyrightRect, m_logoPosition);
 
-    painter->drawPixmap(watermarkRect, watermark);
+    painter->drawPixmap(watermarkRect, currentWatermark);
     painter->drawPixmap(copyrightRect, lastCopyright);
 }
diff --git a/plugins/geoservices/nokia/qgeotiledmapdata_nokia.h b/plugins/geoservices/nokia/qgeotiledmapdata_nokia.h
index cb2ae1bb3f..9ea91d09de 100644
--- a/plugins/geoservices/nokia/qgeotiledmapdata_nokia.h
+++ b/plugins/geoservices/nokia/qgeotiledmapdata_nokia.h
@@ -86,6 +86,7 @@ private:
     Q_DISABLE_COPY(QGeoTiledMapDataNokia)
 
     QPixmap watermark;
+    QPixmap watermarkDark;
 
     QPixmap lastCopyright;
     QString lastCopyrightText;
diff --git a/plugins/geoservices/nokia/resource.qrc b/plugins/geoservices/nokia/resource.qrc
index e2626c327c..c4541beab3 100644
--- a/plugins/geoservices/nokia/resource.qrc
+++ b/plugins/geoservices/nokia/resource.qrc
@@ -1,5 +1,6 @@
 <RCC>
     <qresource prefix="/images">
         <file>watermark.png</file>
+        <file>watermark_dark.png</file>
     </qresource>
 </RCC>
diff --git a/plugins/geoservices/nokia/watermark.png b/plugins/geoservices/nokia/watermark.png
index 2cf094b76c..322cf750af 100644
--- a/plugins/geoservices/nokia/watermark.png
+++ b/plugins/geoservices/nokia/watermark.png
diff --git a/plugins/geoservices/nokia/watermark_dark.png b/plugins/geoservices/nokia/watermark_dark.png
new file mode 100644
index 0000000000..875497385c
--- /dev/null
+++ b/plugins/geoservices/nokia/watermark_dark.png