[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [marble] src/plugins/declarative: Don't show search results and
From:       Dennis_Nienhüser <earthwings () gentoo ! org>
Date:       2011-11-30 22:15:01
Message-ID: 20111130221501.9BD71A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 6d284468187ae6c309cc36394c06659127ec1b4c by Dennis Nienhüser.
Committed on 30/11/2011 at 23:14.
Pushed by nienhueser into branch 'master'.

Don't show search results and current position on other planets.

M  +4    -1    src/plugins/declarative/Search.cpp
M  +2    -1    src/plugins/declarative/Tracking.cpp

http://commits.kde.org/marble/6d284468187ae6c309cc36394c06659127ec1b4c

diff --git a/src/plugins/declarative/Search.cpp b/src/plugins/declarative/Search.cpp
index 8f1057f..f525ef0 100644
--- a/src/plugins/declarative/Search.cpp
+++ b/src/plugins/declarative/Search.cpp
@@ -32,6 +32,8 @@ void Search::setMarbleWidget( Marble::MarbleWidget* widget )
     m_marbleWidget = widget;
     connect( m_marbleWidget, SIGNAL( visibleLatLonAltBoxChanged( GeoDataLatLonAltBox \
) ),  this, SLOT( updatePlacemarks() ) );
+    connect( m_marbleWidget, SIGNAL( themeChanged( QString ) ),
+             this, SLOT( updatePlacemarks() ) );
 }
 
 QDeclarativeComponent* Search::placemarkDelegate()
@@ -106,12 +108,13 @@ void Search::updateSearchModel( QAbstractItemModel *model )
 void Search::updatePlacemarks()
 {
     if ( m_marbleWidget ) {
+        bool const onEarth = m_marbleWidget->model()->planetId() == "earth";
         QMap<int, QDeclarativeItem*>::const_iterator iter = \
m_placemarks.constBegin();  while ( iter != m_placemarks.constEnd() ) {
             qreal x(0), y(0);
             QVariant position = m_searchResult->data( m_searchResult->index( \
                iter.key() ), MarblePlacemarkModel::CoordinateRole );
             GeoDataCoordinates const coordinates = \
                qVariantValue<GeoDataCoordinates>( position );
-            bool const visible = m_marbleWidget->screenCoordinates( \
coordinates.longitude( GeoDataCoordinates::Degree ), coordinates.latitude( \
GeoDataCoordinates::Degree ), x, y ); +            bool const visible = onEarth && \
m_marbleWidget->screenCoordinates( coordinates.longitude( GeoDataCoordinates::Degree \
), coordinates.latitude( GeoDataCoordinates::Degree ), x, y );  QDeclarativeItem* \
item = iter.value();  if ( item ) {
                 item->setVisible( visible );
diff --git a/src/plugins/declarative/Tracking.cpp \
b/src/plugins/declarative/Tracking.cpp index 9e2e50f..1ee727c 100644
--- a/src/plugins/declarative/Tracking.cpp
+++ b/src/plugins/declarative/Tracking.cpp
@@ -106,6 +106,7 @@ void Tracking::setMarbleWidget( MarbleWidget* widget )
         }
 
         m_marbleWidget = widget;
+        connect( m_marbleWidget, SIGNAL( themeChanged( QString ) ), this, SLOT( \
updatePositionMarker() ) );  }
 }
 
@@ -126,7 +127,7 @@ void Tracking::updatePositionMarker()
 {
     if ( m_marbleWidget && m_positionMarker ) {
         Coordinate* position = 0;
-        bool visible = true;
+        bool visible = m_marbleWidget->model()->planetId() == "earth";
         if ( m_positionSource && m_positionSource->hasPosition() ) {
             position = m_positionSource->position();
         } else if ( hasLastKnownPosition() ) {


[prev in list] [next in list] [prev in thread] [next in thread]