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

[Dennis Nienhüser]

SVN commit 1081175 by nienhueser:

Make the reload map action available in the widget context menu so that it is easily accessible from applications embedding MarbleWidget.
BUG: 220842


 M  +7 -7      MarbleMap.h  
 M  +6 -0      MarbleWidgetPopupMenu.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/MarbleMap.h #1081174:1081175
@@ -276,13 +276,6 @@
     QPixmap mapScreenShot();
 
     /**
-     * @brief Reload the currently displayed map by reloading texture tiles
-     *        from the internet. In the future this should be extended to all
-     *        kinds of data which is used in the map.
-     */
-    void reload() const;
-
-    /**
      * @brief  Return the property value by name.
      * @return The property value (usually: visibility).
      */
@@ -805,6 +798,13 @@
     QFont defaultFont() const;
     void setDefaultFont( const QFont& font );
     
+    /**
+     * @brief Reload the currently displayed map by reloading texture tiles
+     *        from the internet. In the future this should be extended to all
+     *        kinds of data which is used in the map.
+     */
+    void reload() const;
+    
  Q_SIGNALS:
     /**
      * @brief Signal that the zoom has changed, and to what.
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidgetPopupMenu.cpp #1081174:1081175
@@ -16,6 +16,7 @@
 #include "AbstractDataPluginItem.h"
 #include "MarbleAboutDialog.h"
 #include "MarbleWidget.h"
+#include "MarbleMap.h"
 #include "MarbleModel.h"
 #include "GeoDataPlacemark.h"
 #include "PlacemarkInfoDialog.h"
@@ -67,6 +68,10 @@
     m_setHomePointAction  = new QAction( tr( "&Set Home Location" ), this);
     m_rmbMenu->addAction( m_setHomePointAction );
     m_rmbMenu->addSeparator();
+    
+    QAction *reloadAction  = new QAction( tr( "Rel&oad Map" ), this);
+    m_rmbMenu->addAction( reloadAction );
+    m_rmbMenu->addSeparator();    
 
     m_aboutDialogAction = new QAction( tr( "&About" ), this );
     m_rmbMenu->addAction( m_aboutDialogAction );
@@ -83,6 +88,7 @@
                                    SLOT( slotAboutDialog() ) );
     connect( m_copyCoordinateAction,SIGNAL( triggered() ),
                          SLOT( slotCopyCoordinates() ) );
+    connect( reloadAction, SIGNAL(triggered()), m_widget->map(), SLOT(reload()));
 }