[Marble-commits] KDE/kdeedu/marble/src

[Bernhard Beschow]

SVN commit 1165499 by beschow:

introduce MarbleWidget::reloadMap()

 M  +5 -0      lib/MarbleWidget.cpp  
 M  +5 -0      lib/MarbleWidget.h  
 M  +1 -2      lib/MarbleWidgetPopupMenu.cpp  
 M  +1 -6      marble_part.cpp  
 M  +0 -1      marble_part.h  


--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.cpp #1165498:1165499
@@ -1393,6 +1393,11 @@
     }
 }
 
+void MarbleWidget::reloadMap()
+{
+    d->m_model->reloadMap();
+}
+
 void MarbleWidget::updateAnimation( const GeoDataLookAt &lookAt )
 {
     setViewContext( Marble::Animation );
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.h #1165498:1165499
@@ -970,6 +970,11 @@
       */
     void flyTo( const GeoDataLookAt &lookAt, FlyToMode mode = Automatic );
 
+    /**
+     * @brief Re-download all visible tiles.
+     */
+    void reloadMap();
+
  Q_SIGNALS:
     /**
      * @brief Signal that the zoom has changed, and to what.
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidgetPopupMenu.cpp #1165498:1165499
@@ -16,7 +16,6 @@
 #include "AbstractDataPluginItem.h"
 #include "MarbleAboutDialog.h"
 #include "MarbleWidget.h"
-#include "MarbleMap.h"
 #include "MarbleModel.h"
 #include "GeoDataPlacemark.h"
 #include "PlacemarkInfoDialog.h"
@@ -72,7 +71,7 @@
                                    SLOT( slotAboutDialog() ) );
     connect( m_copyCoordinateAction,SIGNAL( triggered() ),
                          SLOT( slotCopyCoordinates() ) );
-    connect( reloadAction, SIGNAL(triggered()), m_widget->map(), SLOT(reload()));
+    connect( reloadAction, SIGNAL(triggered()), m_widget, SLOT(reloadMap()));
 }
 
 
--- trunk/KDE/kdeedu/marble/src/marble_part.cpp #1165498:1165499
@@ -798,7 +798,7 @@
     connect( m_controlSunAction, SIGNAL( triggered( bool ) ),
 	     this,               SLOT( controlSun() ) );
 
-    KStandardAction::redisplay( this, SLOT( reload() ), actionCollection() );
+    KStandardAction::redisplay( m_controlView->marbleWidget(), SLOT( reloadMap() ), actionCollection() );
 
     // Action: Show Time options
     m_controlTimeAction = new KAction( this );
@@ -1429,11 +1429,6 @@
     }
 }
 
-void MarblePart::reload()
-{
-    m_controlView->marbleWidget()->map()->reload();
-}
-
 void MarblePart::showPluginAboutDialog( const QString& nameId )
 {
     QList<RenderPlugin *> renderItemList = m_controlView->marbleWidget()->renderPlugins();
--- trunk/KDE/kdeedu/marble/src/marble_part.h #1165498:1165499
@@ -148,7 +148,6 @@
     void  retrievePluginState();
 
     void  updateSettings();
-    void reload();
 
     /**
      * Shows the about dialog for the plugin with the corresponding @p nameId.