[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [marble] /: Python bindings update.
From: Simon Edwards <simon () simonzone ! com>
Date: 2012-11-27 20:41:59
Message-ID: 20121127204159.DD829A6091 () git ! kde ! org
[Download RAW message or body]
Git commit 0a06f71501a5ce9ad0795f794f3d7b875e0eea23 by Simon Edwards.
Committed on 27/11/2012 at 21:00.
Pushed by sedwards into branch 'master'.
Python bindings update.
M +53 -52 docs/bindings/python/html/allclasses.html
M +145 -3 docs/bindings/python/html/marble/Marble.AbstractDataPlugin.html
M +94 -7 docs/bindings/python/html/marble/Marble.AbstractDataPluginItem.html
M +113 -4 docs/bindings/python/html/marble/Marble.AbstractDataPluginModel.html
M +23 -0 docs/bindings/python/html/marble/Marble.AbstractFloatItem.html
M +1 -1 docs/bindings/python/html/marble/Marble.AbstractMarbleGraphicsLayout.html
M +97 -55 docs/bindings/python/html/marble/Marble.AbstractProjection.html
C +55 -56 docs/bindings/python/html/marble/Marble.BillboardGraphicsItem.html \
[from: docs/bindings/python/html/marble/Marble.MapThemeManager.html - 061% \
similarity] M +1 -1 docs/bindings/python/html/marble/Marble.ClipPainter.html
M +18 -85 docs/bindings/python/html/marble/Marble.FrameGraphicsItem.html
M +1 -1 docs/bindings/python/html/marble/Marble.GeoDataAbstractView.html
M +1 -1 docs/bindings/python/html/marble/Marble.GeoDataColorStyle.html
M +1 -1 docs/bindings/python/html/marble/Marble.GeoDataContainer.html
M +3 -3 docs/bindings/python/html/marble/Marble.GeoDataCoordinates.html
M +80 -49 docs/bindings/python/html/marble/Marble.GeoDataFeature.html
M +1 -1 docs/bindings/python/html/marble/Marble.GeoDataGeometry.html
M +14 -0 docs/bindings/python/html/marble/Marble.GeoDataLatLonAltBox.html
M +15 -1 docs/bindings/python/html/marble/Marble.GeoDataLatLonBox.html
M +1 -1 docs/bindings/python/html/marble/Marble.GeoDataLineString.html
M +1 -1 docs/bindings/python/html/marble/Marble.GeoDataObject.html
M +0 -13 docs/bindings/python/html/marble/Marble.GeoDataPoint.html
M +1 -1 docs/bindings/python/html/marble/Marble.GeoDataPolygon.html
M +1 -1 docs/bindings/python/html/marble/Marble.GeoDataStyleSelector.html
M +1 -1 docs/bindings/python/html/marble/Marble.GeoDocument.html
M +49 -112 docs/bindings/python/html/marble/Marble.GeoGraphicsItem.html
M +9 -22 docs/bindings/python/html/marble/Marble.GeoGraphicsScene.html
M +1 -1 docs/bindings/python/html/marble/Marble.GeoNode.html
M +20 -15 docs/bindings/python/html/marble/Marble.LabelGraphicsItem.html
M +9 -23 docs/bindings/python/html/marble/Marble.LatLonEdit.html
M +14 -0 docs/bindings/python/html/marble/Marble.LayerInterface.html
M +27 -0 docs/bindings/python/html/marble/Marble.MapThemeManager.html
M +19 -1 docs/bindings/python/html/marble/Marble.MapViewWidget.html
M +8 -2 docs/bindings/python/html/marble/Marble.MarbleAbstractRunner.html
M +8 -2 docs/bindings/python/html/marble/Marble.MarbleControlBox.html
M +1 -2 docs/bindings/python/html/marble/Marble.MarbleGlobal.html
M +20 -141 docs/bindings/python/html/marble/Marble.MarbleGraphicsItem.html
M +26 -9 docs/bindings/python/html/marble/Marble.MarbleMap.html
M +10 -3 docs/bindings/python/html/marble/Marble.MarbleRunnerManager.html
M +32 -8 docs/bindings/python/html/marble/Marble.MarbleWidget.html
M +22 -2 docs/bindings/python/html/marble/Marble.NavigationWidget.html
M +24 -24 docs/bindings/python/html/marble/Marble.PluginAboutDialog.html
M +1 -1 docs/bindings/python/html/marble/Marble.PluginInterface.html
M +28 -2 docs/bindings/python/html/marble/Marble.PositionTracking.html
M +79 -1 docs/bindings/python/html/marble/Marble.RenderPlugin.html
M +1 -1 docs/bindings/python/html/marble/Marble.RenderPluginInterface.html
M +2 -2 docs/bindings/python/html/marble/Marble.RoutingModel.html
M +2 -25 docs/bindings/python/html/marble/Marble.ScreenGraphicsItem.html
M +1 -1 docs/bindings/python/html/marble/Marble.Serializable.html
M +1 -14 docs/bindings/python/html/marble/Marble.ViewportParams.html
M +3 -21 docs/bindings/python/html/marble/Marble.WidgetGraphicsItem.html
M +31 -18 docs/bindings/python/html/marble/Marble.html
M +12 -12 docs/bindings/python/html/marble/global.html
M +12 -12 docs/bindings/python/html/marble/index.html
M +9 -0 src/bindings/python/sip/AbstractDataPlugin.sip
M +7 -1 src/bindings/python/sip/AbstractDataPluginItem.sip
M +8 -0 src/bindings/python/sip/AbstractDataPluginModel.sip
M +2 -0 src/bindings/python/sip/AbstractFloatItem.sip
M +2 -4 src/bindings/python/sip/AbstractProjection.sip
C +8 -7 src/bindings/python/sip/BillboardGraphicsItem.sip [from: \
src/bindings/python/sip/LayerInterface.sip - 064% similarity] M +1 -1 \
src/bindings/python/sip/BookmarkManager.sip C +1 -16 \
src/bindings/python/sip/CylindricalProjection.sip [from: \
src/bindings/python/sip/LayerInterface.sip - 062% similarity] M +7 -8 \
src/bindings/python/sip/FrameGraphicsItem.sip M +3 -1 \
src/bindings/python/sip/GeoDataCoordinates.sip M +5 -3 \
src/bindings/python/sip/GeoDataFeature.sip M +1 -1 \
src/bindings/python/sip/GeoDataGeometry.sip M +1 -1 \
src/bindings/python/sip/GeoDataIconStyle.sip M +1 -0 \
src/bindings/python/sip/GeoDataLatLonAltBox.sip M +1 -0 \
src/bindings/python/sip/GeoDataLatLonBox.sip M +1 -1 \
src/bindings/python/sip/GeoDataMultiGeometry.sip M +0 -1 \
src/bindings/python/sip/GeoDataPoint.sip M +1 -1 \
src/bindings/python/sip/GeoDataTrack.sip M +10 -13 \
src/bindings/python/sip/GeoGraphicsItem.sip M +2 -2 \
src/bindings/python/sip/GeoGraphicsScene.sip M +3 -1 \
src/bindings/python/sip/LabelGraphicsItem.sip M +3 -9 \
src/bindings/python/sip/LatLonEdit.sip M +1 -0 \
src/bindings/python/sip/LayerInterface.sip M +1 -0 \
src/bindings/python/sip/MapThemeManager.sip M +1 -0 \
src/bindings/python/sip/MapViewWidget.sip M +1 -1 \
src/bindings/python/sip/MarbleAbstractRunner.sip M +2 -1 \
src/bindings/python/sip/MarbleControlBox.sip M +5 -0 \
src/bindings/python/sip/MarbleGlobal.sip M +7 -12 \
src/bindings/python/sip/MarbleGraphicsItem.sip M +2 -1 \
src/bindings/python/sip/MarbleMap.sip M +1 -0 \
src/bindings/python/sip/MarbleModel.sip M +2 -2 \
src/bindings/python/sip/MarbleRunnerManager.sip M +2 -1 \
src/bindings/python/sip/MarbleWidget.sip M +3 -2 \
src/bindings/python/sip/NavigationWidget.sip M +1 -1 \
src/bindings/python/sip/PluginAboutDialog.sip M +4 -1 \
src/bindings/python/sip/PositionTracking.sip M +5 -0 \
src/bindings/python/sip/RenderPlugin.sip M +1 -1 \
src/bindings/python/sip/RoutingModel.sip M +0 -2 \
src/bindings/python/sip/ScreenGraphicsItem.sip M +1 -0 \
src/bindings/python/sip/Serializable.sip M +0 -1 \
src/bindings/python/sip/ViewportParams.sip M +2 -1 \
src/bindings/python/sip/WidgetGraphicsItem.sip M +4 -1 \
src/bindings/python/sip/marblemod.sip
http://commits.kde.org/marble/0a06f71501a5ce9ad0795f794f3d7b875e0eea23
diff --git a/docs/bindings/python/html/allclasses.html \
b/docs/bindings/python/html/allclasses.html index cbc0d09..94ee52c 100644
--- a/docs/bindings/python/html/allclasses.html
+++ b/docs/bindings/python/html/allclasses.html
@@ -65,59 +65,60 @@
<tr><td><a href="marble/Marble.AlternativeRoutesModel.html">AlternativeRoutesModel (marble.Marble)</a></td><td><a \
name="letter_M"> M </a></td></tr> <tr><td><a \
href="marble/Marble.AutoNavigation.html">AutoNavigation (marble.Marble)</a></td><td><a \
href="marble/Marble.Maneuver.html">Maneuver (marble.Marble)</a></td></tr> \
<tr><td><a name="letter_B"> B </a></td><td><a \
href="marble/Marble.MapThemeManager.html">MapThemeManager (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.BookmarkManager.html">BookmarkManager (marble.Marble)</a></td><td><a \
href="marble/Marble.MapViewWidget.html">MapViewWidget (marble.Marble)</a></td></tr>
-<tr><td><a name="letter_C"> C </a></td><td><a \
href="marble/Marble.MapWizard.html">MapWizard (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.ClipPainter.html">ClipPainter (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleAboutDialog.html">MarbleAboutDialog (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.CurrentLocationWidget.html">CurrentLocationWidget (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleAbstractRunner.html">MarbleAbstractRunner (marble.Marble)</a></td></tr>
-<tr><td><a name="letter_D"> D </a></td><td><a \
href="marble/Marble.MarbleControlBox.html">MarbleControlBox (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.DialogConfigurationInterface.html">DialogConfigurationInterface (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleDirs.html">MarbleDirs (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.DownloadRegion.html">DownloadRegion (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleGlobal.html">MarbleGlobal (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.DownloadRegionDialog.html">DownloadRegionDialog (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleGraphicsGridLayout.html">MarbleGraphicsGridLayout (marble.Marble)</a></td></tr>
-<tr><td><a name="letter_E"> E </a></td><td><a \
href="marble/Marble.MarbleGraphicsItem.html">MarbleGraphicsItem (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.ElevationModel.html">ElevationModel (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleMap.html">MarbleMap (marble.Marble)</a></td></tr>
-<tr><td><a name="letter_F"> F </a></td><td><a \
href="marble/Marble.MarbleModel.html">MarbleModel (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.FileViewWidget.html">FileViewWidget (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleNavigator.html">MarbleNavigator (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.FrameGraphicsItem.html">FrameGraphicsItem (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleRunnerManager.html">MarbleRunnerManager (marble.Marble)</a></td></tr>
-<tr><td><a name="letter_G"> G </a></td><td><a \
href="marble/Marble.MarbleWidget.html">MarbleWidget (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataAbstractView.html">GeoDataAbstractView (marble.Marble)</a></td><td><a \
name="letter_N"> N </a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataAccuracy.html">GeoDataAccuracy (marble.Marble)</a></td><td><a \
href="marble/Marble.NavigationWidget.html">NavigationWidget (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataColorStyle.html">GeoDataColorStyle (marble.Marble)</a></td><td><a \
name="letter_P"> P </a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataContainer.html">GeoDataContainer (marble.Marble)</a></td><td><a \
href="marble/Marble.ParseRunnerPlugin.html">ParseRunnerPlugin (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataCoordinates.html">GeoDataCoordinates (marble.Marble)</a></td><td><a \
href="marble/Marble.Planet.html">Planet (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataDocument.html">GeoDataDocument (marble.Marble)</a></td><td><a \
href="marble/Marble.PluginAboutDialog.html">PluginAboutDialog (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataFeature.html">GeoDataFeature (marble.Marble)</a></td><td><a \
href="marble/Marble.PluginAuthor.html">PluginAuthor (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataFolder.html">GeoDataFolder (marble.Marble)</a></td><td><a \
href="marble/Marble.PluginInterface.html">PluginInterface (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataGeometry.html">GeoDataGeometry (marble.Marble)</a></td><td><a \
href="marble/Marble.PositionProviderPluginInterface.html">PositionProviderPluginInterface (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataHotSpot.html">GeoDataHotSpot (marble.Marble)</a></td><td><a \
href="marble/Marble.PositionTracking.html">PositionTracking (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataIconStyle.html">GeoDataIconStyle (marble.Marble)</a></td><td><a \
name="letter_Q"> Q </a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataInnerBoundary.html">GeoDataInnerBoundary (marble.Marble)</a></td><td><a \
href="marble/Marble.QtMarbleConfigDialog.html">QtMarbleConfigDialog (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.BillboardGraphicsItem.html">BillboardGraphicsItem (marble.Marble)</a></td><td><a \
href="marble/Marble.MapViewWidget.html">MapViewWidget (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.BookmarkManager.html">BookmarkManager (marble.Marble)</a></td><td><a \
href="marble/Marble.MapWizard.html">MapWizard (marble.Marble)</a></td></tr> \
+<tr><td><a name="letter_C"> C </a></td><td><a \
href="marble/Marble.MarbleAboutDialog.html">MarbleAboutDialog (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.ClipPainter.html">ClipPainter (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleAbstractRunner.html">MarbleAbstractRunner (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.CurrentLocationWidget.html">CurrentLocationWidget (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleControlBox.html">MarbleControlBox (marble.Marble)</a></td></tr>
+<tr><td><a name="letter_D"> D </a></td><td><a \
href="marble/Marble.MarbleDirs.html">MarbleDirs (marble.Marble)</a></td></tr> \
+<tr><td><a href="marble/Marble.DialogConfigurationInterface.html">DialogConfigurationInterface (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleGlobal.html">MarbleGlobal (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.DownloadRegion.html">DownloadRegion (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleGraphicsGridLayout.html">MarbleGraphicsGridLayout (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.DownloadRegionDialog.html">DownloadRegionDialog (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleGraphicsItem.html">MarbleGraphicsItem (marble.Marble)</a></td></tr>
+<tr><td><a name="letter_E"> E </a></td><td><a \
href="marble/Marble.MarbleMap.html">MarbleMap (marble.Marble)</a></td></tr> \
+<tr><td><a href="marble/Marble.ElevationModel.html">ElevationModel (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleModel.html">MarbleModel (marble.Marble)</a></td></tr> \
+<tr><td><a name="letter_F"> F </a></td><td><a \
href="marble/Marble.MarbleNavigator.html">MarbleNavigator (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.FileViewWidget.html">FileViewWidget (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleRunnerManager.html">MarbleRunnerManager (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.FrameGraphicsItem.html">FrameGraphicsItem (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleWidget.html">MarbleWidget (marble.Marble)</a></td></tr>
+<tr><td><a name="letter_G"> G </a></td><td><a \
name="letter_N"> N </a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataAbstractView.html">GeoDataAbstractView (marble.Marble)</a></td><td><a \
href="marble/Marble.NavigationWidget.html">NavigationWidget (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.GeoDataAccuracy.html">GeoDataAccuracy (marble.Marble)</a></td><td><a \
name="letter_P"> P </a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataColorStyle.html">GeoDataColorStyle (marble.Marble)</a></td><td><a \
href="marble/Marble.ParseRunnerPlugin.html">ParseRunnerPlugin (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.GeoDataContainer.html">GeoDataContainer (marble.Marble)</a></td><td><a \
href="marble/Marble.Planet.html">Planet (marble.Marble)</a></td></tr> \
+<tr><td><a href="marble/Marble.GeoDataCoordinates.html">GeoDataCoordinates (marble.Marble)</a></td><td><a \
href="marble/Marble.PluginAboutDialog.html">PluginAboutDialog (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.GeoDataDocument.html">GeoDataDocument (marble.Marble)</a></td><td><a \
href="marble/Marble.PluginAuthor.html">PluginAuthor (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.GeoDataFeature.html">GeoDataFeature (marble.Marble)</a></td><td><a \
href="marble/Marble.PluginInterface.html">PluginInterface (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.GeoDataFolder.html">GeoDataFolder (marble.Marble)</a></td><td><a \
href="marble/Marble.PositionProviderPluginInterface.html">PositionProviderPluginInterface (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.GeoDataGeometry.html">GeoDataGeometry (marble.Marble)</a></td><td><a \
href="marble/Marble.PositionTracking.html">PositionTracking (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.GeoDataHotSpot.html">GeoDataHotSpot (marble.Marble)</a></td><td><a \
name="letter_Q"> Q </a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataIconStyle.html">GeoDataIconStyle (marble.Marble)</a></td><td><a \
href="marble/Marble.QtMarbleConfigDialog.html">QtMarbleConfigDialog (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.GeoDataInnerBoundary.html">GeoDataInnerBoundary (marble.Marble)</a></td><td><a \
href="marble/Marble.Quaternion.html">Quaternion (marble.Marble)</a></td></tr> \
<tr><td><a href="marble/Marble.GeoDataLabelStyle.html">GeoDataLabelStyle (marble.Marble)</a></td><td><a \
href="marble/Marble.Quaternion.html">Quaternion (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataLatLonAltBox.html">GeoDataLatLonAltBox (marble.Marble)</a></td><td><a \
href="marble/Marble.Quaternion.html">Quaternion (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataLatLonBox.html">GeoDataLatLonBox (marble.Marble)</a></td><td><a \
name="letter_R"> R </a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataLinearRing.html">GeoDataLinearRing (marble.Marble)</a></td><td><a \
href="marble/Marble.RenderPlugin.html">RenderPlugin (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataLineString.html">GeoDataLineString (marble.Marble)</a></td><td><a \
href="marble/Marble.RenderPluginInterface.html">RenderPluginInterface (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataLineStyle.html">GeoDataLineStyle (marble.Marble)</a></td><td><a \
href="marble/Marble.ReverseGeocodingRunnerPlugin.html">ReverseGeocodingRunnerPlugin (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataLod.html">GeoDataLod (marble.Marble)</a></td><td><a \
href="marble/Marble.Route.html">Route (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataLookAt.html">GeoDataLookAt (marble.Marble)</a></td><td><a \
href="marble/Marble.RouteRequest.html">RouteRequest (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataMultiGeometry.html">GeoDataMultiGeometry (marble.Marble)</a></td><td><a \
href="marble/Marble.RouteSegment.html">RouteSegment (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataObject.html">GeoDataObject (marble.Marble)</a></td><td><a \
href="marble/Marble.RoutingModel.html">RoutingModel (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataOuterBoundary.html">GeoDataOuterBoundary (marble.Marble)</a></td><td><a \
href="marble/Marble.RoutingProfile.html">RoutingProfile (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataOverlay.html">GeoDataOverlay (marble.Marble)</a></td><td><a \
href="marble/Marble.RoutingRunnerPlugin.html">RoutingRunnerPlugin (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataPlacemark.html">GeoDataPlacemark (marble.Marble)</a></td><td><a \
name="letter_S"> S </a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataPoint.html">GeoDataPoint (marble.Marble)</a></td><td><a \
href="marble/Marble.ScreenGraphicsItem.html">ScreenGraphicsItem (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataPolygon.html">GeoDataPolygon (marble.Marble)</a></td><td><a \
href="marble/Marble.SearchRunnerPlugin.html">SearchRunnerPlugin (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataPolyStyle.html">GeoDataPolyStyle (marble.Marble)</a></td><td><a \
href="marble/Marble.Serializable.html">Serializable (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataRegion.html">GeoDataRegion (marble.Marble)</a></td><td><a \
href="marble/Marble.SunLocator.html">SunLocator (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataStyle.html">GeoDataStyle (marble.Marble)</a></td><td><a \
name="letter_T"> T </a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataStyleMap.html">GeoDataStyleMap (marble.Marble)</a></td><td><a \
href="marble/Marble.TileCoordsPyramid.html">TileCoordsPyramid (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataStyleSelector.html">GeoDataStyleSelector (marble.Marble)</a></td><td><a \
href="marble/Marble.TileCreator.html">TileCreator (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataTrack.html">GeoDataTrack (marble.Marble)</a></td><td><a \
href="marble/Marble.TileCreatorSource.html">TileCreatorSource (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataTreeModel.html">GeoDataTreeModel (marble.Marble)</a></td><td><a \
href="marble/Marble.TileLevelRangeWidget.html">TileLevelRangeWidget (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDocument.html">GeoDocument (marble.Marble)</a></td><td><a \
href="marble/Marble.TinyWebBrowser.html">TinyWebBrowser (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoGraphicsItem.html">GeoGraphicsItem (marble.Marble)</a></td><td><a \
name="letter_V"> V </a></td></tr>
-<tr><td><a href="marble/Marble.GeoGraphicsScene.html">GeoGraphicsScene (marble.Marble)</a></td><td><a \
href="marble/Marble.ViewportParams.html">ViewportParams (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoNode.html">GeoNode (marble.Marble)</a></td><td><a \
name="letter_W"> W </a></td></tr>
-<tr><td><a href="marble/Marble.GeoPainter.html">GeoPainter (marble.Marble)</a></td><td><a \
href="marble/Marble.WidgetGraphicsItem.html">WidgetGraphicsItem (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.GeoDataLatLonAltBox.html">GeoDataLatLonAltBox (marble.Marble)</a></td><td><a \
name="letter_R"> R </a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataLatLonBox.html">GeoDataLatLonBox (marble.Marble)</a></td><td><a \
href="marble/Marble.RenderPlugin.html">RenderPlugin (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.GeoDataLinearRing.html">GeoDataLinearRing (marble.Marble)</a></td><td><a \
href="marble/Marble.RenderPluginInterface.html">RenderPluginInterface (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.GeoDataLineString.html">GeoDataLineString (marble.Marble)</a></td><td><a \
href="marble/Marble.ReverseGeocodingRunnerPlugin.html">ReverseGeocodingRunnerPlugin (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.GeoDataLineStyle.html">GeoDataLineStyle (marble.Marble)</a></td><td><a \
href="marble/Marble.Route.html">Route (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataLod.html">GeoDataLod (marble.Marble)</a></td><td><a \
href="marble/Marble.RouteRequest.html">RouteRequest (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.GeoDataLookAt.html">GeoDataLookAt (marble.Marble)</a></td><td><a \
href="marble/Marble.RouteSegment.html">RouteSegment (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.GeoDataMultiGeometry.html">GeoDataMultiGeometry (marble.Marble)</a></td><td><a \
href="marble/Marble.RoutingModel.html">RoutingModel (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.GeoDataObject.html">GeoDataObject (marble.Marble)</a></td><td><a \
href="marble/Marble.RoutingProfile.html">RoutingProfile (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.GeoDataOuterBoundary.html">GeoDataOuterBoundary (marble.Marble)</a></td><td><a \
href="marble/Marble.RoutingRunnerPlugin.html">RoutingRunnerPlugin (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.GeoDataOverlay.html">GeoDataOverlay (marble.Marble)</a></td><td><a \
name="letter_S"> S </a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataPlacemark.html">GeoDataPlacemark (marble.Marble)</a></td><td><a \
href="marble/Marble.ScreenGraphicsItem.html">ScreenGraphicsItem (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.GeoDataPoint.html">GeoDataPoint (marble.Marble)</a></td><td><a \
href="marble/Marble.SearchRunnerPlugin.html">SearchRunnerPlugin (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.GeoDataPolygon.html">GeoDataPolygon (marble.Marble)</a></td><td><a \
href="marble/Marble.Serializable.html">Serializable (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.GeoDataPolyStyle.html">GeoDataPolyStyle (marble.Marble)</a></td><td><a \
href="marble/Marble.SunLocator.html">SunLocator (marble.Marble)</a></td></tr> \
+<tr><td><a href="marble/Marble.GeoDataRegion.html">GeoDataRegion (marble.Marble)</a></td><td><a \
name="letter_T"> T </a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataStyle.html">GeoDataStyle (marble.Marble)</a></td><td><a \
href="marble/Marble.TileCoordsPyramid.html">TileCoordsPyramid (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.GeoDataStyleMap.html">GeoDataStyleMap (marble.Marble)</a></td><td><a \
href="marble/Marble.TileCreator.html">TileCreator (marble.Marble)</a></td></tr> \
+<tr><td><a href="marble/Marble.GeoDataStyleSelector.html">GeoDataStyleSelector (marble.Marble)</a></td><td><a \
href="marble/Marble.TileCreatorSource.html">TileCreatorSource (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.GeoDataTrack.html">GeoDataTrack (marble.Marble)</a></td><td><a \
href="marble/Marble.TileLevelRangeWidget.html">TileLevelRangeWidget (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.GeoDataTreeModel.html">GeoDataTreeModel (marble.Marble)</a></td><td><a \
href="marble/Marble.TinyWebBrowser.html">TinyWebBrowser (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.GeoDocument.html">GeoDocument (marble.Marble)</a></td><td><a \
name="letter_V"> V </a></td></tr> +<tr><td><a \
href="marble/Marble.GeoGraphicsItem.html">GeoGraphicsItem (marble.Marble)</a></td><td><a \
href="marble/Marble.ViewportParams.html">ViewportParams (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.GeoGraphicsScene.html">GeoGraphicsScene (marble.Marble)</a></td><td><a \
name="letter_W"> W </a></td></tr> +<tr><td><a \
href="marble/Marble.GeoNode.html">GeoNode (marble.Marble)</a></td><td><a \
href="marble/Marble.WidgetGraphicsItem.html">WidgetGraphicsItem (marble.Marble)</a></td></tr>
+<tr><td><a href="marble/Marble.GeoPainter.html">GeoPainter (marble.Marble)</a></td><td></td></tr>
</table>
</div>
diff --git a/docs/bindings/python/html/marble/Marble.AbstractDataPlugin.html \
b/docs/bindings/python/html/marble/Marble.AbstractDataPlugin.html index \
caf6448..f01ea70 100644
--- a/docs/bindings/python/html/marble/Marble.AbstractDataPlugin.html
+++ b/docs/bindings/python/html/marble/Marble.AbstractDataPlugin.html
@@ -68,15 +68,23 @@ and setVisible (often false) in the constructor of a subclass.
</p>
<table border="0" cellpadding="0" cellspacing="0"><tr><td \
colspan="2"><br><h2>Signals</h2></td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#changedNumberOfItems">changedNumberOfItems</a> (long \
number)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#favoriteItemsOnlyChanged">favoriteItemsOnlyChanged</a> ()</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#favoritesModelChanged">favoritesModelChanged</a> ()</td></tr> <tr><td \
colspan="2"><br><h2>Methods</h2></td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#AbstractDataPlugin">__init__</a> (self, <a \
href="../marble/Marble.MarbleModel.html">Marble.MarbleModel</a> \
marbleModel)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">QStringList </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#backendTypes">backendTypes</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top">QObject </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#favoritesModel">favoritesModel</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#handleViewportChange">handleViewportChange</a> (self, <a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> \
viewport)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#isFavoriteItemsOnly">isFavoriteItemsOnly</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top">bool </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#isInitialized">isInitialized</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top"><a \
href="../marble/Marble.AbstractDataPluginModel.html">Marble.AbstractDataPluginModel</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#model">model</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">long </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#numberOfItems">numberOfItems</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#render">render</a> (self, <a \
href="../marble/Marble.GeoPainter.html">Marble.GeoPainter</a> painter, <a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> viewport, \
QString renderPos="NONE", <a \
href="../marble/Marble.GeoSceneLayer.html">Marble.GeoSceneLayer</a> \
layer=0)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">QString </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#renderPolicy">renderPolicy</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top">QStringList </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#renderPosition">renderPosition</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.RenderPlugin.html#RenderType">Marble.RenderPlugin.RenderType</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#renderType">renderType</a> \
(self)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setDelegate">setDelegate</a> (self, QDeclarativeComponent delegate, \
QGraphicsItem parent)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setFavoriteItemsOnly">setFavoriteItemsOnly</a> (self, bool \
favoriteOnly)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setModel">setModel</a> (self, <a \
href="../marble/Marble.AbstractDataPluginModel.html">Marble.AbstractDataPluginModel</a> \
model)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setNumberOfItems">setNumberOfItems</a> (self, long number)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">[<a \
href="../marble/Marble.AbstractDataPluginItem.html">Marble.AbstractDataPluginItem</a>] </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#whichItemAt">whichItemAt</a> (self, QPoint curpos)</td></tr> @@ -98,7 +106,31 \
@@ and setVisible (often false) in the constructor of a subclass. <td width="100%"> \
</td> </tr></table>
</div>
-<div class="memdoc"><dl compact><dt><b>Signal \
syntax:</b></dt><dd><code>QObject.connect(source, \
SIGNAL("changedNumberOfItems(quint32)"), \
target_slot)</code></dd></dl></div></div><hr><h2>Method Documentation</h2><a \
class="anchor" name="AbstractDataPlugin"></a> +<div class="memdoc"><dl \
compact><dt><b>Signal syntax:</b></dt><dd><code>QObject.connect(source, \
SIGNAL("changedNumberOfItems(quint32)"), target_slot)</code></dd></dl></div></div><a \
class="anchor" name="favoriteItemsOnlyChanged"></a> +<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> favoriteItemsOnlyChanged</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname">)</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"><dl compact><dt><b>Signal \
syntax:</b></dt><dd><code>QObject.connect(source, \
SIGNAL("favoriteItemsOnlyChanged()"), target_slot)</code></dd></dl></div></div><a \
class="anchor" name="favoritesModelChanged"></a> +<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> favoritesModelChanged</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname">)</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"><dl compact><dt><b>Signal \
syntax:</b></dt><dd><code>QObject.connect(source, SIGNAL("favoritesModelChanged()"), \
target_slot)</code></dd></dl></div></div><hr><h2>Method Documentation</h2><a \
class="anchor" name="AbstractDataPlugin"></a> <div class="memitem">
<div class="memproto">
<table class="memname"><tr>
@@ -120,7 +152,8 @@ and setVisible (often false) in the constructor of a subclass.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="backendTypes"></a>
+<div class="memdoc"><p>To do: FIXME Qt Quick segfaults if using the real class here \
instead of QObject +</p></div></div><a class="anchor" name="backendTypes"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
@@ -133,7 +166,65 @@ and setVisible (often false) in the constructor of a subclass.
</table>
</div>
<div class="memdoc"><p>Returns the name(s) of the backend that the plugin can render
-</p></div></div><a class="anchor" name="model"></a>
+</p></div></div><a class="anchor" name="favoritesModel"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">QObject favoritesModel</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"></div></div><a class="anchor" name="handleViewportChange"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> handleViewportChange</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> </td> +<td \
class="paramname"><em>viewport</em></td> +</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"></div></div><a class="anchor" name="isFavoriteItemsOnly"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">bool isFavoriteItemsOnly</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"></div></div><a class="anchor" name="isInitialized"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">bool isInitialized</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"></div></div><a class="anchor" name="model"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
@@ -247,6 +338,57 @@ This affects where in the menu tree the action() is placed.
</p>
<p>
@return: The type of render plugin this is.
+</p></div></div><a class="anchor" name="setDelegate"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> setDelegate</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">QDeclarativeComponent </td>
+<td class="paramname"><em>delegate</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">QGraphicsItem </td>
+<td class="paramname"><em>parent</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"></div></div><a class="anchor" name="setFavoriteItemsOnly"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> setFavoriteItemsOnly</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">bool </td>
+<td class="paramname"><em>favoriteOnly</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Convenience method to set the favorite item state on the \
current model </p></div></div><a class="anchor" name="setModel"></a>
<div class="memitem">
<div class="memproto">
diff --git a/docs/bindings/python/html/marble/Marble.AbstractDataPluginItem.html \
b/docs/bindings/python/html/marble/Marble.AbstractDataPluginItem.html index \
6104e65..aa031fa 100644
--- a/docs/bindings/python/html/marble/Marble.AbstractDataPluginItem.html
+++ b/docs/bindings/python/html/marble/Marble.AbstractDataPluginItem.html
@@ -57,6 +57,8 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<table border="0" cellpadding="0" cellspacing="0"><tr><td \
colspan="2"><br><h2>Signals</h2></td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#favoriteChanged">favoriteChanged</a> (QString id, bool \
favorite)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#idChanged">idChanged</a> ()</td></tr> +<tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#stickyChanged">stickyChanged</a> ()</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#updated">updated</a> \
()</td></tr> <tr><td colspan="2"><br><h2>Methods</h2></td></tr>
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#AbstractDataPluginItem">__init__</a> (self, QObject parent=0)</td></tr> @@ \
-67,15 +69,18 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br /> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">QString </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#id">id</a> (self)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#initialized">initialized</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#isFavorite">isFavorite</a> \
(self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#isGeoProjected">isGeoProjected</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top">bool </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#isSticky">isSticky</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">QString </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#itemType">itemType</a> (self)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#setAddedAngularResolution">setAddedAngularResolution</a> (self, \
float resolution)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setFavorite">setFavorite</a> (self, bool favorite)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setId">setId</a> (self, \
QString id)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setSettings">setSettings</a> (self, {QString:QVariant} settings)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setSticky">setSticky</a> \
(self, bool sticky)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setTarget">setTarget</a> (self, QString target)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setToolTip">setToolTip</a> \
(self, QString toolTip)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">QString </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#target">target</a> (self)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#toggleFavorite">toggleFavorite</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top">QString </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#toolTip">toolTip</a> \
(self)</td></tr> </table>
<hr><h2>Signal Documentation</h2><a class="anchor" name="favoriteChanged"></a>
<div class="memitem">
@@ -100,7 +105,31 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"><dl compact><dt><b>Signal \
syntax:</b></dt><dd><code>QObject.connect(source, SIGNAL("favoriteChanged(const \
QString&, bool)"), target_slot)</code></dd></dl></div></div><a class="anchor" \
name="updated"></a> +<div class="memdoc"><dl compact><dt><b>Signal \
syntax:</b></dt><dd><code>QObject.connect(source, SIGNAL("favoriteChanged(const \
QString&, bool)"), target_slot)</code></dd></dl></div></div><a class="anchor" \
name="idChanged"></a> +<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> idChanged</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname">)</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"><dl compact><dt><b>Signal \
syntax:</b></dt><dd><code>QObject.connect(source, SIGNAL("idChanged()"), \
target_slot)</code></dd></dl></div></div><a class="anchor" name="stickyChanged"></a> \
+<div class="memitem"> +<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> stickyChanged</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname">)</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"><dl compact><dt><b>Signal \
syntax:</b></dt><dd><code>QObject.connect(source, SIGNAL("stickyChanged()"), \
target_slot)</code></dd></dl></div></div><a class="anchor" name="updated"></a> <div \
class="memitem"> <div class="memproto">
<table class="memname"><tr>
@@ -237,11 +266,11 @@ time.
</tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="isGeoProjected"></a>
+<div class="memdoc"></div></div><a class="anchor" name="isSticky"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname">bool isGeoProjected</td>
+<td class="memname">bool isSticky</td>
<td>(</td>
<td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -353,7 +382,29 @@ time.
<div class="memdoc"><p>Set the settings of the item.
This is usually called automatically before painting. If you reimplement this it \
would be useful to check for changes before copying.
-</p></div></div><a class="anchor" name="setTarget"></a>
+</p></div></div><a class="anchor" name="setSticky"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> setSticky</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">bool </td>
+<td class="paramname"><em>sticky</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"></div></div><a class="anchor" name="setTarget"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
@@ -375,7 +426,30 @@ useful to check for changes before copying.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="target"></a>
+<div class="memdoc"></div></div><a class="anchor" name="setToolTip"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> setToolTip</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">QString </td>
+<td class="paramname"><em>toolTip</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Set the tool tip for the item.
+</p></div></div><a class="anchor" name="target"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
@@ -399,7 +473,20 @@ useful to check for changes before copying.
</tr>
</table>
</div>
-<div class="memdoc"></div></div>
+<div class="memdoc"></div></div><a class="anchor" name="toolTip"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">QString toolTip</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"><p>Returns the item's tool tip.
+</p></div></div>
</div>
</div>
</div>
diff --git a/docs/bindings/python/html/marble/Marble.AbstractDataPluginModel.html \
b/docs/bindings/python/html/marble/Marble.AbstractDataPluginModel.html index \
35e047b..c7db913 100644
--- a/docs/bindings/python/html/marble/Marble.AbstractDataPluginModel.html
+++ b/docs/bindings/python/html/marble/Marble.AbstractDataPluginModel.html
@@ -67,23 +67,28 @@ a subclass.
</p>
<table border="0" cellpadding="0" cellspacing="0"><tr><td \
colspan="2"><br><h2>Signals</h2></td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#favoriteItemsChanged">favoriteItemsChanged</a> (QStringList \
favoriteItems)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#favoriteItemsOnlyChanged">favoriteItemsOnlyChanged</a> ()</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#itemsUpdated">itemsUpdated</a> ()</td></tr> <tr><td \
colspan="2"><br><h2>Methods</h2></td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#addItemToList">addItemToList</a> (self, <a \
href="../marble/Marble.AbstractDataPluginItem.html">Marble.AbstractDataPluginItem</a> \
item)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#addItemsToList">addItemsToList</a> (self, [<a \
href="../marble/Marble.AbstractDataPluginItem.html">Marble.AbstractDataPluginItem</a>] \
items)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#clear">clear</a> (self)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#downloadDescriptionFile">downloadDescriptionFile</a> (self, QUrl \
url)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#downloadItemData">downloadItemData</a> (self, QUrl url, QString type, <a \
href="../marble/Marble.AbstractDataPluginItem.html">Marble.AbstractDataPluginItem</a> \
item)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">QStringList </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#favoriteItems">favoriteItems</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top">QObject </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#favoritesModel">favoritesModel</a> (self)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">bool </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#fileExists">fileExists</a> \
(self, QString fileName)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#fileExists">fileExists</a> (self, QString id, QString type)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.AbstractDataPluginItem.html">Marble.AbstractDataPluginItem</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#findItem">findItem</a> \
(self, QString id)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">QString </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#generateFilename">generateFilename</a> (self, QString id, QString \
type)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">QString </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#generateFilepath">generateFilepath</a> (self, QString id, QString \
type)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#getAdditionalItems">getAdditionalItems</a> (self, <a \
href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> box, \
<a href="../marble/Marble.MarbleModel.html">Marble.MarbleModel</a> model, int \
number=10)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#getItem">getItem</a> (self, QString id, <a \
href="../marble/Marble.MarbleModel.html">Marble.MarbleModel</a> model)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#isFavoriteItemsOnly">isFavoriteItemsOnly</a> (self)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">bool </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#itemExists">itemExists</a> \
(self, QString id)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">[<a href="../marble/Marble.AbstractDataPluginItem.html">Marble.AbstractDataPluginItem</a>] </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#items">items</a> (self, <a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> viewport, <a \
href="../marble/Marble.MarbleModel.html">Marble.MarbleModel</a> model, int \
number=10)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#parseFile">parseFile</a> (self, QByteArray file)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#registerItemProperties">registerItemProperties</a> (self, QMetaObject \
item)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setFavoriteItems">setFavoriteItems</a> (self, QStringList list)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setFavoriteItemsOnly">setFavoriteItemsOnly</a> (self, bool \
favoriteOnly)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setItemSettings">setItemSettings</a> (self, {QString:QVariant} \
itemSettings)</td></tr> @@ -106,7 +111,19 @@ a subclass.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"><dl compact><dt><b>Signal \
syntax:</b></dt><dd><code>QObject.connect(source, SIGNAL("favoriteItemsChanged(const \
QStringList&)"), target_slot)</code></dd></dl></div></div><a class="anchor" \
name="itemsUpdated"></a> +<div class="memdoc"><dl compact><dt><b>Signal \
syntax:</b></dt><dd><code>QObject.connect(source, SIGNAL("favoriteItemsChanged(const \
QStringList&)"), target_slot)</code></dd></dl></div></div><a class="anchor" \
name="favoriteItemsOnlyChanged"></a> +<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> favoriteItemsOnlyChanged</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname">)</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"><dl compact><dt><b>Signal \
syntax:</b></dt><dd><code>QObject.connect(source, \
SIGNAL("favoriteItemsOnlyChanged()"), target_slot)</code></dd></dl></div></div><a \
class="anchor" name="itemsUpdated"></a> <div class="memitem">
<div class="memproto">
<table class="memname"><tr>
@@ -140,8 +157,31 @@ a subclass.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"><p>Adds the <b>item</b> to the list of initialized items. It \
checks if a item with the same id is
-already in the list and ignores and deletes the item in this case.
+<div class="memdoc"><p>Convenience method to add one item to the list. See \
addItemsToList +</p></div></div><a class="anchor" name="addItemsToList"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> addItemsToList</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">[<a \
href="../marble/Marble.AbstractDataPluginItem.html">Marble.AbstractDataPluginItem</a>] </td>
+<td class="paramname"><em>items</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Adds the <b>items</b> to the list of initialized items. It \
checks if items with the same id are +already in the list and ignores and deletes \
them in this case. </p></div></div><a class="anchor" name="clear"></a>
<div class="memitem">
<div class="memproto">
@@ -229,6 +269,18 @@ ignores and deletes the item in this case.
</tr>
</table>
</div>
+<div class="memdoc"></div></div><a class="anchor" name="favoritesModel"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">QObject favoritesModel</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
<div class="memdoc"></div></div><a class="anchor" name="fileExists"></a>
<div class="memitem">
<div class="memproto">
@@ -401,6 +453,41 @@ ignores and deletes the item in this case.
<div class="memdoc"><dl compact><dt><b>Abstract method:</b></dt><dd>This method is \
abstract and can be overridden but not called directly.</dd></dl><p>Managing to get \
<b>number</b> additional items in <b>box.</b> This includes generating a url and \
downloading the corresponding file. This method has to be implemented in a subclass.
+</p></div></div><a class="anchor" name="getItem"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> getItem</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">QString </td>
+<td class="paramname"><em>id</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.MarbleModel.html">Marble.MarbleModel</a> </td> +<td \
class="paramname"><em>model</em></td> +</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Retrieve data for a specific item
+</p><dl compact><dt><b>Parameters:</b></dt><dd>
+<table border="0" cellspacing="2" cellpadding="0">
+<tr><td></td><td valign="top"><em>id</em> </td><td> Item id of the item to \
retrieve +</td></tr>
+</table></dl>
+<p>
</p></div></div><a class="anchor" name="isFavoriteItemsOnly"></a>
<div class="memitem">
<div class="memproto">
@@ -501,7 +588,29 @@ The maximum number of images can be specified with \
<b>number,</b> <div class="memdoc"><dl compact><dt><b>Abstract \
method:</b></dt><dd>This method is abstract and can be overridden but not called \
directly.</dd></dl><p>Parse the <b>file</b> and generate items. The items will be \
added to the list or the method starts additionally needed downloads.
This method has to be implemented in a subclass.
-</p></div></div><a class="anchor" name="setFavoriteItems"></a>
+</p></div></div><a class="anchor" name="registerItemProperties"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> registerItemProperties</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">QMetaObject </td>
+<td class="paramname"><em>item</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"></div></div><a class="anchor" name="setFavoriteItems"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
diff --git a/docs/bindings/python/html/marble/Marble.AbstractFloatItem.html \
b/docs/bindings/python/html/marble/Marble.AbstractFloatItem.html index \
c05764b..0e85b0f 100644
--- a/docs/bindings/python/html/marble/Marble.AbstractFloatItem.html
+++ b/docs/bindings/python/html/marble/Marble.AbstractFloatItem.html
@@ -58,6 +58,7 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
</p>
<table border="0" cellpadding="0" cellspacing="0"><tr><td \
colspan="2"><br><h2>Methods</h2></td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#AbstractFloatItem">__init__</a> (self, <a \
href="../marble/Marble.MarbleModel.html">Marble.MarbleModel</a> marbleModel, QPointF \
point=QPointF(10.0,10.0), QSizeF size=QSizeF(150.0,50.0))</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#changeViewport">changeViewport</a> (self, <a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> \
viewport)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">QMenu </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#contextMenu">contextMenu</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#contextMenuEvent">contextMenuEvent</a> (self, \
QWidget w, QContextMenuEvent e)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top">bool </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#eventFilter">eventFilter</a> (self, QObject object, QEvent \
e)</td></tr> @@ -110,6 +111,28 @@ Namespace: <a \
href="../marble/Marble.html">Marble</a><br /> <td width="100%"> </td>
</tr></table>
</div>
+<div class="memdoc"></div></div><a class="anchor" name="changeViewport"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> changeViewport</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> </td> +<td \
class="paramname"><em>viewport</em></td> +</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
<div class="memdoc"></div></div><a class="anchor" name="contextMenu"></a>
<div class="memitem">
<div class="memproto">
diff --git a/docs/bindings/python/html/marble/Marble.AbstractMarbleGraphicsLayout.html \
b/docs/bindings/python/html/marble/Marble.AbstractMarbleGraphicsLayout.html index \
47affa3..8c57d3c 100644
--- a/docs/bindings/python/html/marble/Marble.AbstractMarbleGraphicsLayout.html
+++ b/docs/bindings/python/html/marble/Marble.AbstractMarbleGraphicsLayout.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
-Subclasses: <a href="../marble/Marble.MarbleGraphicsGridLayout.html">Marble.MarbleGraphicsGridLayout</a><br \
/> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.AbstractProjection.html \
b/docs/bindings/python/html/marble/Marble.AbstractProjection.html index \
b5ef871..2800bea 100644
--- a/docs/bindings/python/html/marble/Marble.AbstractProjection.html
+++ b/docs/bindings/python/html/marble/Marble.AbstractProjection.html
@@ -61,8 +61,6 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#SurfaceType">SurfaceType</a> </td><td class="memItemRight" \
valign="bottom">{ Cylindrical, Pseudocylindrical, Hybrid, Conical, \
Pseudoconical, Azimuthal }</td></tr> <tr><td \
colspan="2"><br><h2>Methods</h2></td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#AbstractProjection">__init__</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#exceedsLatitudeRange">exceedsLatitudeRange</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> \
coords)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#exceedsLatitudeRange">exceedsLatitudeRange</a> (self, <a \
href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a> \
lineString)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#geoCoordinates">geoCoordinates</a> (self, int x, int y, <a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> viewport, float \
lon, float lat, <a href="../marble/Marble.GeoDataCoordinates.html#Unit">Marble.GeoDataCoordinates.Unit</a> \
unit=Marble.GeoDataCoordinates.Degree)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top">bool </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#isOrientedNormal">isOrientedNormal</a> (self)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#latLonAltBox">latLonAltBox</a> (self, QRect screenRect, <a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> \
viewport)</td></tr> @@ -100,51 +98,7 @@ Namespace: <a \
href="../marble/Marble.html">Marble</a><br /> </table>
</div>
<div class="memdoc"><p>Construct a new AbstractProjection.
-</p></div></div><a class="anchor" name="exceedsLatitudeRange"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname">bool exceedsLatitudeRange</td>
-<td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td>
-<td class="paramname"><em>coords</em></td>
-</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
-<td width="100%"> </td>
-</tr></table>
-</div>
-<div class="memdoc"></div></div><a class="anchor" name="exceedsLatitudeRange"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname">bool exceedsLatitudeRange</td>
-<td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a> </td>
-<td class="paramname"><em>lineString</em></td>
-</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
-<td width="100%"> </td>
-</tr></table>
-</div>
-<div class="memdoc"></div></div><a class="anchor" name="geoCoordinates"></a>
+</p></div></div><a class="anchor" name="geoCoordinates"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
@@ -449,8 +403,30 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"><dl compact><dt><b>Abstract method:</b></dt><dd>This method is \
abstract and can be overridden but not called directly.</dd></dl><p><dl \
class="deprecated" compact><dt><b>Deprecated:</b></dt><dd>
-use <dl class="see" compact><dt><b>See also:</b></dt><dd> \
screenCoordinates(qreal,qreal,const ViewportParams*,qreal&,qreal&) +<div \
class="memdoc"><dl compact><dt><b>Abstract method:</b></dt><dd>This method is \
abstract and can be overridden but not called directly.</dd></dl><p>Get the \
coordinates of screen points for geographical coordinates in the map. +</p>
+<p>
+</p><dl compact><dt><b>Parameters:</b></dt><dd>
+<table border="0" cellspacing="2" cellpadding="0">
+<tr><td></td><td valign="top"><em>coordinates</em> </td><td> the point on \
earth, including altitude, that we want the coordinates for. +
+<tr><td></td><td valign="top"><em>viewport</em> </td><td> the viewport \
parameters +
+<tr><td></td><td valign="top"><em>x</em> </td><td> the x coordinates of the \
pixels are returned through this parameter +
+<tr><td></td><td valign="top"><em>y</em> </td><td> the y coordinate of the \
pixel is returned through this parameter +
+<tr><td></td><td valign="top"><em>pointRepeatNum</em> </td><td> the amount of \
times that a single geographical +point gets represented on the map
+
+<tr><td></td><td valign="top"><em>globeHidesPoint</em> </td><td> whether the \
point gets hidden on the far side of the earth +</td></tr>
+</table></dl>
+<p> <dl class="return" compact><dt><b>Returns:</b></dt><dd> true if the geographical \
coordinates are visible on the screen +</dd></dl> false if the geographical \
coordinates are not visible on the screen +</p>
+<p>
+<dl class="see" compact><dt><b>See also:</b></dt><dd> ViewportParams
</dd></dl>
</p></div></div><a class="anchor" name="screenCoordinates"></a>
<div class="memitem">
@@ -498,8 +474,30 @@ use <dl class="see" compact><dt><b>See also:</b></dt><dd> \
screenCoordinates(qrea <td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"><dl compact><dt><b>Abstract method:</b></dt><dd>This method is \
abstract and can be overridden but not called directly.</dd></dl><p><dl \
class="deprecated" compact><dt><b>Deprecated:</b></dt><dd>
-use <dl class="see" compact><dt><b>See also:</b></dt><dd> \
screenCoordinates(qreal,qreal,const ViewportParams*,qreal&,qreal&) +<div \
class="memdoc"><dl compact><dt><b>Abstract method:</b></dt><dd>This method is \
abstract and can be overridden but not called directly.</dd></dl><p>Get the \
coordinates of screen points for geographical coordinates in the map. +</p>
+<p>
+</p><dl compact><dt><b>Parameters:</b></dt><dd>
+<table border="0" cellspacing="2" cellpadding="0">
+<tr><td></td><td valign="top"><em>coordinates</em> </td><td> the point on \
earth, including altitude, that we want the coordinates for. +
+<tr><td></td><td valign="top"><em>viewport</em> </td><td> the viewport \
parameters +
+<tr><td></td><td valign="top"><em>x</em> </td><td> the x coordinates of the \
pixels are returned through this parameter +
+<tr><td></td><td valign="top"><em>y</em> </td><td> the y coordinate of the \
pixel is returned through this parameter +
+<tr><td></td><td valign="top"><em>pointRepeatNum</em> </td><td> the amount of \
times that a single geographical +point gets represented on the map
+
+<tr><td></td><td valign="top"><em>globeHidesPoint</em> </td><td> whether the \
point gets hidden on the far side of the earth +</td></tr>
+</table></dl>
+<p> <dl class="return" compact><dt><b>Returns:</b></dt><dd> true if the geographical \
coordinates are visible on the screen +</dd></dl> false if the geographical \
coordinates are not visible on the screen +</p>
+<p>
+<dl class="see" compact><dt><b>See also:</b></dt><dd> ViewportParams
</dd></dl>
</p></div></div><a class="anchor" name="screenCoordinates"></a>
<div class="memitem">
@@ -535,8 +533,30 @@ use <dl class="see" compact><dt><b>See also:</b></dt><dd> \
screenCoordinates(qrea <td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"><p><dl class="deprecated" \
compact><dt><b>Deprecated:</b></dt><dd>
-use <dl class="see" compact><dt><b>See also:</b></dt><dd> \
screenCoordinates(qreal,qreal,const ViewportParams*,qreal&,qreal&) +<div \
class="memdoc"><p>Get the coordinates of screen points for geographical coordinates \
in the map. +</p>
+<p>
+</p><dl compact><dt><b>Parameters:</b></dt><dd>
+<table border="0" cellspacing="2" cellpadding="0">
+<tr><td></td><td valign="top"><em>coordinates</em> </td><td> the point on \
earth, including altitude, that we want the coordinates for. +
+<tr><td></td><td valign="top"><em>viewport</em> </td><td> the viewport \
parameters +
+<tr><td></td><td valign="top"><em>x</em> </td><td> the x coordinates of the \
pixels are returned through this parameter +
+<tr><td></td><td valign="top"><em>y</em> </td><td> the y coordinate of the \
pixel is returned through this parameter +
+<tr><td></td><td valign="top"><em>pointRepeatNum</em> </td><td> the amount of \
times that a single geographical +point gets represented on the map
+
+<tr><td></td><td valign="top"><em>globeHidesPoint</em> </td><td> whether the \
point gets hidden on the far side of the earth +</td></tr>
+</table></dl>
+<p> <dl class="return" compact><dt><b>Returns:</b></dt><dd> true if the geographical \
coordinates are visible on the screen +</dd></dl> false if the geographical \
coordinates are not visible on the screen +</p>
+<p>
+<dl class="see" compact><dt><b>See also:</b></dt><dd> ViewportParams
</dd></dl>
</p></div></div><a class="anchor" name="screenCoordinates"></a>
<div class="memitem">
@@ -596,8 +616,30 @@ use <dl class="see" compact><dt><b>See also:</b></dt><dd> \
screenCoordinates(qrea <td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"><dl compact><dt><b>Abstract method:</b></dt><dd>This method is \
abstract and can be overridden but not called directly.</dd></dl><p><dl \
class="deprecated" compact><dt><b>Deprecated:</b></dt><dd>
-use <dl class="see" compact><dt><b>See also:</b></dt><dd> \
screenCoordinates(qreal,qreal,const ViewportParams*,qreal&,qreal&) +<div \
class="memdoc"><dl compact><dt><b>Abstract method:</b></dt><dd>This method is \
abstract and can be overridden but not called directly.</dd></dl><p>Get the \
coordinates of screen points for geographical coordinates in the map. +</p>
+<p>
+</p><dl compact><dt><b>Parameters:</b></dt><dd>
+<table border="0" cellspacing="2" cellpadding="0">
+<tr><td></td><td valign="top"><em>coordinates</em> </td><td> the point on \
earth, including altitude, that we want the coordinates for. +
+<tr><td></td><td valign="top"><em>viewport</em> </td><td> the viewport \
parameters +
+<tr><td></td><td valign="top"><em>x</em> </td><td> the x coordinates of the \
pixels are returned through this parameter +
+<tr><td></td><td valign="top"><em>y</em> </td><td> the y coordinate of the \
pixel is returned through this parameter +
+<tr><td></td><td valign="top"><em>pointRepeatNum</em> </td><td> the amount of \
times that a single geographical +point gets represented on the map
+
+<tr><td></td><td valign="top"><em>globeHidesPoint</em> </td><td> whether the \
point gets hidden on the far side of the earth +</td></tr>
+</table></dl>
+<p> <dl class="return" compact><dt><b>Returns:</b></dt><dd> true if the geographical \
coordinates are visible on the screen +</dd></dl> false if the geographical \
coordinates are not visible on the screen +</p>
+<p>
+<dl class="see" compact><dt><b>See also:</b></dt><dd> ViewportParams
</dd></dl>
</p></div></div><a class="anchor" name="setMaxLat"></a>
<div class="memitem">
diff --git a/docs/bindings/python/html/marble/Marble.MapThemeManager.html \
b/docs/bindings/python/html/marble/Marble.BillboardGraphicsItem.html similarity index \
61% copy from docs/bindings/python/html/marble/Marble.MapThemeManager.html
copy to docs/bindings/python/html/marble/Marble.BillboardGraphicsItem.html
index 37024e8..78b94b2 100644
--- a/docs/bindings/python/html/marble/Marble.MapThemeManager.html
+++ b/docs/bindings/python/html/marble/Marble.BillboardGraphicsItem.html
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
- <title>Marble.MapThemeManager</title>
+ <title>Marble.BillboardGraphicsItem</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<link rel="stylesheet" type="text/css" href="../common/doxygen.css" />
@@ -45,82 +45,58 @@
<div id="main">
<div class="clearer"> </div>
-<h1>MapThemeManager Class Reference</h1>
+<h1>BillboardGraphicsItem Class Reference</h1>
<code>from PyKDE4.marble import *</code>
<p>
-Inherits: QObject<br />
+Inherits: <a href="../marble/Marble.MarbleGraphicsItem.html">Marble.MarbleGraphicsItem</a><br \
/>
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
-<p>The class that handles map themes that are locally available .
+<p>Base class for all 2D labels (a.k.a. billboards) in 3D space.
</p>
<p>
-This class which is able to check for maps that are locally available.
-After parsing the data it only stores the name, description and path
-into a QStandardItemModel.
+A BillboardGraphicsItem represents a point of interest on a planet with a geo \
location. +As a result, it may appear more than once on the map, depending on the \
projection and +the zoom level.
</p>
-<p>
-The MapThemeManager is not owned by the MarbleWidget/Map itself.
-Instead it is owned by the widget or application that contains
-MarbleWidget/Map ( usually: the ControlView convenience class )
-</p>
-<p>
-For convenience MarbleThemeManager provides a static helper class
-that loads the properties of a map theme into a GeoSceneDocument
-object.
-</p>
-<p>
-<dl class="see" compact><dt><b>See also:</b></dt><dd> GeoSceneDocument
-</dd></dl>
-</p>
-<table border="0" cellpadding="0" cellspacing="0"><tr><td \
colspan="2"><br><h2>Signals</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#themesChanged">themesChanged</a> ()</td></tr>
-<tr><td colspan="2"><br><h2>Methods</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#MapThemeManager">__init__</a> (self, QObject \
parent=0)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" \
valign="top">QStringList </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#mapThemeIds">mapThemeIds</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" \
valign="top">QStandardItemModel </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#mapThemeModel">mapThemeModel</a> (self)</td></tr> +<table \
border="0" cellpadding="0" cellspacing="0"><tr><td \
colspan="2"><br><h2>Methods</h2></td></tr> +<tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#BillboardGraphicsItem">__init__</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top">[QRectF] </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#boundingRects">boundingRects</a> (self)</td></tr> +<tr><td class="memItemLeft" \
nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#coordinate">coordinate</a> \
(self)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top">[QPointF] </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#positions">positions</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setCoordinate">setCoordinate</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> \
coordinates)</td></tr> </table>
-<hr><h2>Signal Documentation</h2><a class="anchor" name="themesChanged"></a>
+<hr><h2>Method Documentation</h2><a class="anchor" name="BillboardGraphicsItem"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> themesChanged</td>
+<td class="memname">__init__</td>
<td>(</td>
<td class="paramtype"> </td>
-<td class="paramname">)</td>
+<td class="paramname"><em>self</em> )</td>
<td width="100%"> </td>
</tr>
</table>
</div>
-<div class="memdoc"><p>This signal will be emitted, when the themes change.
-</p><dl compact><dt><b>Signal syntax:</b></dt><dd><code>QObject.connect(source, \
SIGNAL("themesChanged()"), target_slot)</code></dd></dl></div></div><hr><h2>Method \
Documentation</h2><a class="anchor" name="MapThemeManager"></a> +<div \
class="memdoc"></div></div><a class="anchor" name="boundingRects"></a> <div \
class="memitem"> <div class="memproto">
<table class="memname"><tr>
-<td class="memname">__init__</td>
+<td class="memname">[QRectF] boundingRects</td>
<td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">QObject </td>
-<td class="paramname"><em>parent=0</em></td>
-</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
<td width="100%"> </td>
-</tr></table>
+</tr>
+</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="mapThemeIds"></a>
+<div class="memdoc"><p>Returns the absolute screen bounding boxes of the item.
+</p></div></div><a class="anchor" name="coordinate"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname">QStringList mapThemeIds</td>
+<td class="memname"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> \
coordinate</td> <td>(</td>
<td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -128,12 +104,11 @@ object.
</tr>
</table>
</div>
-<div class="memdoc"><p>Returns a list of all locally available map theme IDs
-</p></div></div><a class="anchor" name="mapThemeModel"></a>
+<div class="memdoc"></div></div><a class="anchor" name="positions"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname">QStandardItemModel mapThemeModel</td>
+<td class="memname">[QPointF] positions</td>
<td>(</td>
<td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -141,12 +116,36 @@ object.
</tr>
</table>
</div>
-<div class="memdoc"><p>Provides a model of the locally existing themes.
+<div class="memdoc"><p>Returns the absolute screen positions of the item.
</p>
<p>
-This method provides a QStandardItemModel of all themes
-that are available via MarbleDirs.
-</p></div></div>
+All elements indicate the position of the topleft corner in screen coordinates and \
are +based on the viewport of the last paintEvent(). Note that the result list may \
contain +an unbound number of elements, including zero, depending on the item's \
visibility, +the projection and zoom level.
+</p></div></div><a class="anchor" name="setCoordinate"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> setCoordinate</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td>
+<td class="paramname"><em>coordinates</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"></div></div>
</div>
</div>
</div>
diff --git a/docs/bindings/python/html/marble/Marble.ClipPainter.html \
b/docs/bindings/python/html/marble/Marble.ClipPainter.html index 82c4042..5a2e3de \
100644
--- a/docs/bindings/python/html/marble/Marble.ClipPainter.html
+++ b/docs/bindings/python/html/marble/Marble.ClipPainter.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: QPainter<br />
-Subclasses: <a href="../marble/Marble.GeoPainter.html">Marble.GeoPainter</a><br />
+
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
<dl class="abstract" compact><dt><b>Abstract class:</b></dt>
diff --git a/docs/bindings/python/html/marble/Marble.FrameGraphicsItem.html \
b/docs/bindings/python/html/marble/Marble.FrameGraphicsItem.html index \
e024b14..4481c23 100644
--- a/docs/bindings/python/html/marble/Marble.FrameGraphicsItem.html
+++ b/docs/bindings/python/html/marble/Marble.FrameGraphicsItem.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: <a href="../marble/Marble.ScreenGraphicsItem.html">Marble.ScreenGraphicsItem</a> \
→ <a href="../marble/Marble.MarbleGraphicsItem.html">Marble.MarbleGraphicsItem</a><br \
/>
-Subclasses: <a href="../marble/Marble.LabelGraphicsItem.html">Marble.LabelGraphicsItem</a><br \
/> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
@@ -63,7 +63,6 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<tr><td class="memItemLeft" nowrap align="right" valign="top">QBrush </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#borderBrush">borderBrush</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top"><a \
href="http://www.riverbankcomputing.co.uk/static/Docs/PyQt4/html/qt.html">Qt::PenStyle</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#borderStyle">borderStyle</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top">float </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#borderWidth">borderWidth</a> \
(self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">QRectF </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#contentRect">contentRect</a> (self, QPointF position)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">QRectF </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#contentRect">contentRect</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top">QSizeF </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#contentSize">contentSize</a> (self)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.FrameGraphicsItem.html#FrameType">Marble.FrameGraphicsItem.FrameType</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#frame">frame</a> \
(self)</td></tr> @@ -73,10 +72,10 @@ Namespace: <a \
href="../marble/Marble.html">Marble</a><br /> <tr><td class="memItemLeft" nowrap \
align="right" valign="top">float </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#marginRight">marginRight</a> (self)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top">float </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#marginTop">marginTop</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#padding">padding</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#paint">paint</a> (self, <a \
href="../marble/Marble.GeoPainter.html">Marble.GeoPainter</a> painter, <a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> viewport, \
QString renderPos, <a \
href="../marble/Marble.GeoSceneLayer.html">Marble.GeoSceneLayer</a> \
layer=0)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#paintBackground">paintBackground</a> (self, <a \
href="../marble/Marble.GeoPainter.html">Marble.GeoPainter</a> \
painter)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#paintContent">paintContent</a> (self, <a \
href="../marble/Marble.GeoPainter.html">Marble.GeoPainter</a> painter, <a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> viewport, \
QString renderPos, <a \
href="../marble/Marble.GeoSceneLayer.html">Marble.GeoSceneLayer</a> \
layer=0)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">QRectF </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#paintedRect">paintedRect</a> (self, QPointF \
position=QPointF(0.0,0.0))</td></tr> +<tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#paint">paint</a> (self, QPainter painter)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#paintBackground">paintBackground</a> (self, QPainter painter)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#paintContent">paintContent</a> (self, QPainter painter)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top">QRectF </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#paintedRect">paintedRect</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setBackground">setBackground</a> (self, QBrush \
background)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setBorderBrush">setBorderBrush</a> (self, QBrush brush)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setBorderStyle">setBorderStyle</a> (self, <a \
href="http://www.riverbankcomputing.co.uk/static/Docs/PyQt4/html/qt.html">Qt::PenStyle</a> \
style)</td></tr> @@ -176,29 +175,8 @@ Namespace: <a \
href="../marble/Marble.html">Marble</a><br /> </tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="contentRect"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname">QRectF contentRect</td>
-<td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">QPointF </td>
-<td class="paramname"><em>position</em></td>
-</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
-<td width="100%"> </td>
-</tr></table>
-</div>
-<div class="memdoc"></div></div><a class="anchor" name="contentRect"></a>
+<div class="memdoc"><p>Returns the border width of the item.
+</p></div></div><a class="anchor" name="contentRect"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
@@ -326,26 +304,8 @@ The padding is the empty space inside the border.
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoPainter.html">Marble.GeoPainter</a> </td>
-<td class="paramname"><em>painter</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> </td>
-<td class="paramname"><em>viewport</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">QString </td>
-<td class="paramname"><em>renderPos</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoSceneLayer.html">Marble.GeoSceneLayer</a> </td>
-<td class="paramname"><em>layer=0</em></td>
+<td class="paramtype">QPainter </td>
+<td class="paramname"><em>painter</em></td>
</tr>
<tr>
<td></td>
@@ -367,7 +327,7 @@ The padding is the empty space inside the border.
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoPainter.html">Marble.GeoPainter</a> </td> +<td \
class="paramtype">QPainter </td> <td class="paramname"><em>painter</em></td>
</tr>
<tr>
@@ -390,26 +350,8 @@ The padding is the empty space inside the border.
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoPainter.html">Marble.GeoPainter</a> </td>
-<td class="paramname"><em>painter</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> </td>
-<td class="paramname"><em>viewport</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">QString </td>
-<td class="paramname"><em>renderPos</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoSceneLayer.html">Marble.GeoSceneLayer</a> </td>
-<td class="paramname"><em>layer=0</em></td>
+<td class="paramtype">QPainter </td>
+<td class="paramname"><em>painter</em></td>
</tr>
<tr>
<td></td>
@@ -426,21 +368,11 @@ The padding is the empty space inside the border.
<table class="memname"><tr>
<td class="memname">QRectF paintedRect</td>
<td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">QPointF </td>
-<td class="paramname"><em>position=QPointF(0.0,0.0)</em></td>
-</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
<td width="100%"> </td>
-</tr></table>
+</tr>
+</table>
</div>
<div class="memdoc"></div></div><a class="anchor" name="setBackground"></a>
<div class="memitem">
@@ -533,7 +465,8 @@ The padding is the empty space inside the border.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="setContentSize"></a>
+<div class="memdoc"><p>Set the border width of the item.
+</p></div></div><a class="anchor" name="setContentSize"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataAbstractView.html \
b/docs/bindings/python/html/marble/Marble.GeoDataAbstractView.html index \
5d524ee..7d78e88 100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataAbstractView.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDataAbstractView.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: <a href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a> \
→ <a \
href="../marble/Marble.GeoNode.html">Marble.GeoNode</a><br />
-Subclasses: <a href="../marble/Marble.GeoDataLookAt.html">Marble.GeoDataLookAt</a><br \
/> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataColorStyle.html \
b/docs/bindings/python/html/marble/Marble.GeoDataColorStyle.html index \
95feb62..f0737ba 100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataColorStyle.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDataColorStyle.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: <a href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a> \
→ <a \
href="../marble/Marble.GeoNode.html">Marble.GeoNode</a><br />
-Subclasses: <a href="../marble/Marble.GeoDataIconStyle.html">Marble.GeoDataIconStyle</a>, \
<a href="../marble/Marble.GeoDataLabelStyle.html">Marble.GeoDataLabelStyle</a>, <a \
href="../marble/Marble.GeoDataLineStyle.html">Marble.GeoDataLineStyle</a>, <a \
href="../marble/Marble.GeoDataPolyStyle.html">Marble.GeoDataPolyStyle</a><br /> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataContainer.html \
b/docs/bindings/python/html/marble/Marble.GeoDataContainer.html index \
232630f..c7580f4 100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataContainer.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDataContainer.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: <a href="../marble/Marble.GeoDataFeature.html">Marble.GeoDataFeature</a> \
→ <a href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a> \
→ <a \
href="../marble/Marble.GeoNode.html">Marble.GeoNode</a><br />
-Subclasses: <a href="../marble/Marble.GeoDataDocument.html">Marble.GeoDataDocument</a>, \
<a href="../marble/Marble.GeoDataFolder.html">Marble.GeoDataFolder</a><br /> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataCoordinates.html \
b/docs/bindings/python/html/marble/Marble.GeoDataCoordinates.html index \
741993a..c370b7b 100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataCoordinates.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDataCoordinates.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
-Subclasses: <a href="../marble/Marble.GeoDataPoint.html">Marble.GeoDataPoint</a><br \
/> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
@@ -67,7 +67,7 @@ GeoDataPoint and is simply derived from GeoDataCoordinates.
</p>
<table border="0" cellpadding="0" cellspacing="0"><tr><td \
colspan="2"><br><h2>Enumerations</h2></td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"><a class="el" \
href="#BearingType">BearingType</a> </td><td class="memItemRight" \
valign="bottom">{ InitialBearing, FinalBearing }</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#Notation">Notation</a> </td><td class="memItemRight" \
valign="bottom">{ Decimal, DMS }</td></tr> +<tr><td class="memItemLeft" \
nowrap align="right" valign="top"><a class="el" \
href="#Notation">Notation</a> </td><td class="memItemRight" \
valign="bottom">{ Decimal, DMS, DM }</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top"><a class="el" href="#Unit">Unit</a> </td><td \
class="memItemRight" valign="bottom">{ Radian, Degree }</td></tr> <tr><td \
colspan="2"><br><h2>Methods</h2></td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#GeoDataCoordinates">__init__</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> \
other)</td></tr> @@ -1132,7 +1132,7 @@ uses floating point numbers to specify parts \
of a degree. The Sexagesimal DMS notation uses integer based
Degrees-(Arc)Minutes-(Arc)Seconds to describe parts of a degree.
</p><dl compact><dt><b>Enumerator: </b></dt><dd>
-<table border="0" cellspacing="2" cellpadding="0"><tr><td \
valign="top"><em>Decimal</em> </td><td><tr><td \
valign="top"><em>DMS</em> </td><td></table> +<table border="0" cellspacing="2" \
cellpadding="0"><tr><td valign="top"><em>Decimal</em> </td><td><tr><td \
valign="top"><em>DMS</em> </td><td><tr><td \
valign="top"><em>DM</em> </td><td></table> </dl>
</div></div><p><a class="anchor" name="Unit"></a>
<div class="memitem">
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataFeature.html \
b/docs/bindings/python/html/marble/Marble.GeoDataFeature.html index 3d43922..1f06794 \
100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataFeature.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDataFeature.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: <a href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a> \
→ <a \
href="../marble/Marble.GeoNode.html">Marble.GeoNode</a><br />
-Subclasses: <a href="../marble/Marble.GeoDataContainer.html">Marble.GeoDataContainer</a>, \
<a href="../marble/Marble.GeoDataOverlay.html">Marble.GeoDataOverlay</a>, <a \
href="../marble/Marble.GeoDataPlacemark.html">Marble.GeoDataPlacemark</a><br /> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
@@ -85,7 +85,6 @@ but is always used as part of a derived class.
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#pack">pack</a> (self, \
QDataStream stream)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">QString </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#phoneNumber">phoneNumber</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top">long </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#popularity">popularity</a> \
(self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#popularityIndex">popularityIndex</a> (self)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataRegion.html">Marble.GeoDataRegion</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#region">region</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setAbstractView">setAbstractView</a> (self, <a \
href="../marble/Marble.GeoDataAbstractView.html">Marble.GeoDataAbstractView</a> \
abstractView)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setAddress">setAddress</a> (self, QString value)</td></tr> @@ -94,7 +93,6 @@ \
but is always used as part of a derived class. <tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#setName">setName</a> (self, QString value)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setPhoneNumber">setPhoneNumber</a> (self, QString value)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setPopularity">setPopularity</a> (self, long \
popularity)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setPopularityIndex">setPopularityIndex</a> (self, int index)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setRegion">setRegion</a> \
(self, <a href="../marble/Marble.GeoDataRegion.html">Marble.GeoDataRegion</a> \
region)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setRole">setRole</a> (self, QString role)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setStyle">setStyle</a> \
(self, <a href="../marble/Marble.GeoDataStyle.html">Marble.GeoDataStyle</a> \
style)</td></tr> @@ -102,6 +100,7 @@ but is always used as part of a derived class.
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setStyleUrl">setStyleUrl</a> (self, QString value)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setVisible">setVisible</a> \
(self, bool value)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setVisualCategory">setVisualCategory</a> (self, <a \
href="../marble/Marble.GeoDataFeature.html#GeoDataVisualCategory">Marble.GeoDataFeature.GeoDataVisualCategory</a> \
category)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setZoomLevel">setZoomLevel</a> (self, int index)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataStyle.html">Marble.GeoDataStyle</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#style">style</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataStyleMap.html">Marble.GeoDataStyleMap</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#styleMap">styleMap</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">QString </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#styleUrl">styleUrl</a> (self)</td></tr> @@ -109,11 +108,14 @@ but is always \
used as part of a derived class. <tr><td class="memItemLeft" nowrap align="right" \
valign="top">QSize </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#symbolSize">symbolSize</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#unpack">unpack</a> (self, QDataStream \
stream)</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataFeature.html#GeoDataVisualCategory">Marble.GeoDataFeature.GeoDataVisualCategory</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#visualCategory">visualCategory</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top">int </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#zoomLevel">zoomLevel</a> \
(self)</td></tr> <tr><td colspan="2"><br><h2>Static Methods</h2></td></tr>
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataFeature.html#GeoDataVisualCategory">Marble.GeoDataFeature.GeoDataVisualCategory</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#OsmVisualCategory">OsmVisualCategory</a> (QString keyValue)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">QFont </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#defaultFont">defaultFont</a> ()</td></tr> +<tr><td class="memItemLeft" nowrap \
align="right" valign="top">QColor </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#defaultLabelColor">defaultLabelColor</a> \
()</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#resetDefaultStyles">resetDefaultStyles</a> ()</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setDefaultFont">setDefaultFont</a> (QFont font)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setDefaultLabelColor">setDefaultLabelColor</a> (QColor color)</td></tr> \
</table> <hr><h2>Method Documentation</h2><a class="anchor" \
name="GeoDataFeature"></a> <div class="memitem">
@@ -376,23 +378,6 @@ space.
</table>
</div>
<div class="memdoc"><p>Return the popularity of the feature.
-</p></div></div><a class="anchor" name="popularityIndex"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname">int popularityIndex</td>
-<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
-<td width="100%"> </td>
-</tr>
-</table>
-</div>
-<div class="memdoc"><p>Return the popularity index of the placemark.
-</p>
-<p>
-The popularity index is a value which describes at which zoom
-level the placemark will be shown.
</p></div></div><a class="anchor" name="region"></a>
<div class="memitem">
<div class="memproto">
@@ -574,35 +559,6 @@ level the placemark will be shown.
</td></tr>
</table></dl>
<p>
-</p></div></div><a class="anchor" name="setPopularityIndex"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname"> setPopularityIndex</td>
-<td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">int </td>
-<td class="paramname"><em>index</em></td>
-</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
-<td width="100%"> </td>
-</tr></table>
-</div>
-<div class="memdoc"><p>Sets the popularity <b>index</b> of the placemark.
-</p><dl compact><dt><b>Parameters:</b></dt><dd>
-<table border="0" cellspacing="2" cellpadding="0">
-<tr><td></td><td valign="top"><em></em> </td><td> index the new index to be \
used.
-</td></tr>
-</table></dl>
-<p>
</p></div></div><a class="anchor" name="setRegion"></a>
<div class="memitem">
<div class="memproto">
@@ -795,6 +751,35 @@ or through some action of the program.
</td></tr>
</table></dl>
<p>
+</p></div></div><a class="anchor" name="setZoomLevel"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> setZoomLevel</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">int </td>
+<td class="paramname"><em>index</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Sets the popularity <b>index</b> of the placemark.
+</p><dl compact><dt><b>Parameters:</b></dt><dd>
+<table border="0" cellspacing="2" cellpadding="0">
+<tr><td></td><td valign="top"><em></em> </td><td> index the new index to be \
used. +</td></tr>
+</table></dl>
+<p>
</p></div></div><a class="anchor" name="style"></a>
<div class="memitem">
<div class="memproto">
@@ -903,6 +888,23 @@ same visual category
</table>
</div>
<div class="memdoc"><p>Return the symbol index of the placemark.
+</p></div></div><a class="anchor" name="zoomLevel"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">int zoomLevel</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"><p>Return the popularity index of the placemark.
+</p>
+<p>
+The popularity index is a value which describes at which zoom
+level the placemark will be shown.
</p></div></div><hr><h2>Static Method Documentation</h2><a class="anchor" \
name="OsmVisualCategory"></a> <div class="memitem">
<div class="memproto">
@@ -933,6 +935,18 @@ same visual category
</tr>
</table>
</div>
+<div class="memdoc"></div></div><a class="anchor" name="defaultLabelColor"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">QColor defaultLabelColor</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname">)</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
<div class="memdoc"></div></div><a class="anchor" name="resetDefaultStyles"></a>
<div class="memitem">
<div class="memproto">
@@ -963,6 +977,23 @@ same visual category
<td width="100%"> </td>
</tr></table>
</div>
+<div class="memdoc"></div></div><a class="anchor" name="setDefaultLabelColor"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> setDefaultLabelColor</td>
+<td>(</td>
+<td class="paramtype">QColor </td>
+<td class="paramname"><em>color</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
<div class="memdoc"></div></div><hr><h2>Enumeration Documentation</h2><a \
class="anchor" name="GeoDataVisualCategory"></a> <div class="memitem">
<div class="memproto">
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataGeometry.html \
b/docs/bindings/python/html/marble/Marble.GeoDataGeometry.html index e4b0a41..d0d40e4 \
100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataGeometry.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDataGeometry.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: <a href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a> \
→ <a \
href="../marble/Marble.GeoNode.html">Marble.GeoNode</a><br />
-Subclasses: <a href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a>, \
<a href="../marble/Marble.GeoDataMultiGeometry.html">Marble.GeoDataMultiGeometry</a>, \
<a href="../marble/Marble.GeoDataPoint.html">Marble.GeoDataPoint</a>, <a \
href="../marble/Marble.GeoDataPolygon.html">Marble.GeoDataPolygon</a>, <a \
href="../marble/Marble.GeoDataTrack.html">Marble.GeoDataTrack</a><br /> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataLatLonAltBox.html \
b/docs/bindings/python/html/marble/Marble.GeoDataLatLonAltBox.html index \
4ac47f3..cb632ba 100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataLatLonAltBox.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDataLatLonAltBox.html
@@ -74,6 +74,7 @@ the western one.
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#GeoDataLatLonAltBox">__init__</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> \
coordinates)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"><a href="../marble/Marble.html#AltitudeMode">Marble.AltitudeMode</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#altitudeMode">altitudeMode</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#center">center</a> \
(self)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#clear">clear</a> (self)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top">bool </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#contains">contains</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> \
a0)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#contains">contains</a> (self, <a \
href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> \
a0)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#intersects">intersects</a> (self, <a \
href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> \
a0)</td></tr> @@ -204,6 +205,19 @@ for measuring the altitude.
<div class="memdoc"><p>returns the center of this box
<dl class="return" compact><dt><b>Returns:</b></dt><dd> a coordinate, body-center of \
the box </dd></dl>
+</p></div></div><a class="anchor" name="clear"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> clear</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"><p>Resets the bounding box to its uninitialised state (and thus \
contains nothing). </p></div></div><a class="anchor" name="contains"></a>
<div class="memitem">
<div class="memproto">
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataLatLonBox.html \
b/docs/bindings/python/html/marble/Marble.GeoDataLatLonBox.html index \
b8ab2c4..ef6675c 100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataLatLonBox.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDataLatLonBox.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: <a href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a> \
→ <a \
href="../marble/Marble.GeoNode.html">Marble.GeoNode</a><br />
-Subclasses: <a href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a><br \
/> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
@@ -81,6 +81,7 @@ the western one.
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#GeoDataLatLonBox">__init__</a> (self, <a \
href="../marble/Marble.GeoDataLatLonBox.html">Marble.GeoDataLatLonBox</a> \
a0)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#boundaries">boundaries</a> (self, float north, float south, float east, float \
west, <a href="../marble/Marble.GeoDataCoordinates.html#Unit">Marble.GeoDataCoordinates.Unit</a> \
unit=Marble.GeoDataCoordinates.Radian)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#center">center</a> \
(self)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#clear">clear</a> (self)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top">bool </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#contains">contains</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> \
a0)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#contains">contains</a> (self, <a \
href="../marble/Marble.GeoDataLatLonBox.html">Marble.GeoDataLatLonBox</a> \
a0)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#containsPole">containsPole</a> (self, <a \
href="../marble/Marble.html#Pole">Marble.Pole</a> pole=Marble.AnyPole)</td></tr> @@ \
-252,6 +253,19 @@ the western one. <div class="memdoc"><p>returns the center of this \
box <dl class="return" compact><dt><b>Returns:</b></dt><dd> a coordinate, \
face-center of the box </dd></dl>
+</p></div></div><a class="anchor" name="clear"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> clear</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"><p>Resets the bounding box to its uninitialised state (and thus \
contains nothing). </p></div></div><a class="anchor" name="contains"></a>
<div class="memitem">
<div class="memproto">
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataLineString.html \
b/docs/bindings/python/html/marble/Marble.GeoDataLineString.html index \
fdf0d3b..8f0770b 100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataLineString.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDataLineString.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: <a href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> \
→ <a href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a> \
→ <a \
href="../marble/Marble.GeoNode.html">Marble.GeoNode</a><br />
-Subclasses: <a href="../marble/Marble.GeoDataLinearRing.html">Marble.GeoDataLinearRing</a><br \
/> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataObject.html \
b/docs/bindings/python/html/marble/Marble.GeoDataObject.html index b92c431..bc6d7d2 \
100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataObject.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDataObject.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: <a href="../marble/Marble.GeoNode.html">Marble.GeoNode</a>,<a \
href="../marble/Marble.Serializable.html">Marble.Serializable</a><br \
/>
-Subclasses: <a href="../marble/Marble.GeoDataAbstractView.html">Marble.GeoDataAbstractView</a>, \
<a href="../marble/Marble.GeoDataColorStyle.html">Marble.GeoDataColorStyle</a>, <a \
href="../marble/Marble.GeoDataFeature.html">Marble.GeoDataFeature</a>, <a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a>, <a \
href="../marble/Marble.GeoDataHotSpot.html">Marble.GeoDataHotSpot</a>, <a \
href="../marble/Marble.GeoDataLatLonBox.html">Marble.GeoDataLatLonBox</a>, <a \
href="../marble/Marble.GeoDataLod.html">Marble.GeoDataLod</a>, <a \
href="../marble/Marble.GeoDataRegion.html">Marble.GeoDataRegion</a>, <a \
href="../marble/Marble.GeoDataStyleSelector.html">Marble.GeoDataStyleSelector</a><br \
/> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataPoint.html \
b/docs/bindings/python/html/marble/Marble.GeoDataPoint.html index aefb279..9ef9bf6 \
100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataPoint.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDataPoint.html
@@ -76,7 +76,6 @@ amount of points e.g. for line strings, linear rings and polygons.
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#GeoDataPoint">__init__</a> \
(self, float _lon, float _lat, float alt=0, <a \
href="../marble/Marble.GeoDataCoordinates.html#Unit">Marble.GeoDataCoordinates.Unit</a> \
_unit=Marble.GeoDataPoint.Radian, int _detail=0)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#GeoDataPoint">__init__</a> \
(self, <a href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> \
other)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#detach">detach</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#latLonAltBox">latLonAltBox</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top">QString </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#nodeType">nodeType</a> (self)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#pack">pack</a> (self, \
QDataStream stream)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#unpack">unpack</a> (self, QDataStream stream)</td></tr> @@ -231,18 +230,6 @@ \
amount of points e.g. for line strings, linear rings and polygons. </tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="latLonAltBox"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname"><a \
href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> \
latLonAltBox</td>
-<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
-<td width="100%"> </td>
-</tr>
-</table>
-</div>
<div class="memdoc"></div></div><a class="anchor" name="nodeType"></a>
<div class="memitem">
<div class="memproto">
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataPolygon.html \
b/docs/bindings/python/html/marble/Marble.GeoDataPolygon.html index 7968264..b7a4d85 \
100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataPolygon.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDataPolygon.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: <a href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> \
→ <a href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a> \
→ <a \
href="../marble/Marble.GeoNode.html">Marble.GeoNode</a><br />
-Subclasses: <a href="../marble/Marble.GeoDataInnerBoundary.html">Marble.GeoDataInnerBoundary</a>, \
<a href="../marble/Marble.GeoDataOuterBoundary.html">Marble.GeoDataOuterBoundary</a><br \
/> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataStyleSelector.html \
b/docs/bindings/python/html/marble/Marble.GeoDataStyleSelector.html index \
5f1e257..8b7ac5b 100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataStyleSelector.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDataStyleSelector.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: <a href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a> \
→ <a \
href="../marble/Marble.GeoNode.html">Marble.GeoNode</a><br />
-Subclasses: <a href="../marble/Marble.GeoDataStyle.html">Marble.GeoDataStyle</a>, <a \
href="../marble/Marble.GeoDataStyleMap.html">Marble.GeoDataStyleMap</a><br /> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.GeoDocument.html \
b/docs/bindings/python/html/marble/Marble.GeoDocument.html index 674cb8f..c528b15 \
100644
--- a/docs/bindings/python/html/marble/Marble.GeoDocument.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDocument.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
-Subclasses: <a href="../marble/Marble.GeoDataDocument.html">Marble.GeoDataDocument</a><br \
/> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.GeoGraphicsItem.html \
b/docs/bindings/python/html/marble/Marble.GeoGraphicsItem.html index c36640e..b6f85c4 \
100644
--- a/docs/bindings/python/html/marble/Marble.GeoGraphicsItem.html
+++ b/docs/bindings/python/html/marble/Marble.GeoGraphicsItem.html
@@ -48,7 +48,7 @@
<h1>GeoGraphicsItem Class Reference</h1>
<code>from PyKDE4.marble import *</code>
<p>
-Inherits: <a href="../marble/Marble.MarbleGraphicsItem.html">Marble.MarbleGraphicsItem</a><br \
/> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
@@ -61,22 +61,19 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#coordinate">coordinate</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoGraphicsItem.html">Marble.GeoGraphicsItem.GeoGraphicsItemFlags</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#flags">flags</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#latLonAltBox">latLonAltBox</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#maxLodPixels">maxLodPixels</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#minLodPixels">minLodPixels</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top">int </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#minZoomLevel">minZoomLevel</a> \
(self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" \
valign="top">[QPointF] </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#positions">positions</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setCoordinate">setCoordinate</a> (self, float longitude, float latitude, float \
altitude=0)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#paint">paint</a> (self, <a \
href="../marble/Marble.GeoPainter.html">Marble.GeoPainter</a> painter, <a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> \
viewport)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setCoordinate">setCoordinate</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> \
point)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setFlag">setFlag</a> (self, <a \
href="../marble/Marble.GeoGraphicsItem.html#GeoGraphicsItemFlag">Marble.GeoGraphicsItem.GeoGraphicsItemFlag</a> \
flag, bool enabled=1)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setFlags">setFlags</a> (self, <a \
href="../marble/Marble.GeoGraphicsItem.html">Marble.GeoGraphicsItem.GeoGraphicsItemFlags</a> \
flags)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setLatLonAltBox">setLatLonAltBox</a> (self, <a \
href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> \
latLonAltBox)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setMaxLodPixels">setMaxLodPixels</a> (self, int \
pixels)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setMinLodPixels">setMinLodPixels</a> (self, int pixels)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setMinZoomLevel">setMinZoomLevel</a> (self, int zoomLevel)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setStyle">setStyle</a> \
(self, <a href="../marble/Marble.GeoDataStyle.html">Marble.GeoDataStyle</a> \
style)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setTarget">setTarget</a> \
(self, QString target)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setVisible">setVisible</a> (self, bool visible)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setZValue">setZValue</a> \
(self, float z)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"><a href="../marble/Marble.GeoDataStyle.html">Marble.GeoDataStyle</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#style">style</a> \
(self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">QString </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#target">target</a> \
(self)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#visible">visible</a> (self)</td></tr> +<tr><td class="memItemLeft" nowrap \
align="right" valign="top">float </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#zValue">zValue</a> (self)</td></tr> </table>
<hr><h2>Method Documentation</h2><a class="anchor" name="GeoGraphicsItem"></a>
<div class="memitem">
@@ -102,8 +99,7 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
</tr>
</table>
</div>
-<div class="memdoc"><p>Return the coordinate of the item as <b>longitude</b>
-and <b>latitude.</b>
+<div class="memdoc"><p>Return the coordinate of the item as a GeoDataCoordinates
</p></div></div><a class="anchor" name="flags"></a>
<div class="memitem">
<div class="memproto">
@@ -132,36 +128,6 @@ this item. <dl class="see" compact><dt><b>See also:</b></dt><dd> \
QFlags </table>
</div>
<div class="memdoc"><p>Returns the box that is used to determine if an item is \
active or inactive.
-</p></div></div><a class="anchor" name="maxLodPixels"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname">int maxLodPixels</td>
-<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
-<td width="100%"> </td>
-</tr>
-</table>
-</div>
-<div class="memdoc"><p>Returns the maximum number of pixels the GeoGraphicsItem has \
to be
-projected on for this item to be considered as active. -1 would mean no
-maximum number of pixels which is also the standard value.
-</p></div></div><a class="anchor" name="minLodPixels"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname">int minLodPixels</td>
-<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
-<td width="100%"> </td>
-</tr>
-</table>
-</div>
-<div class="memdoc"><p>Returns the minimum number of pixels the GeoGraphicsItem has \
to be projected on for this item
-to be considered as active. 0 would mean no minimum number of pixels which is also \
the
-standard value.
</p></div></div><a class="anchor" name="minZoomLevel"></a>
<div class="memitem">
<div class="memproto">
@@ -175,44 +141,25 @@ standard value.
</table>
</div>
<div class="memdoc"><p>Returns the minim zoom level on which item will be active.
-</p></div></div><a class="anchor" name="positions"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname">[QPointF] positions</td>
-<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
-<td width="100%"> </td>
-</tr>
-</table>
-</div>
-<div class="memdoc"><p>Returns all coordinates of the item in view coordinates \
according to the given projection.
-</p></div></div><a class="anchor" name="setCoordinate"></a>
+</p></div></div><a class="anchor" name="paint"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> setCoordinate</td>
+<td class="memname"> paint</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype">float </td>
-<td class="paramname"><em>longitude</em>, </td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoPainter.html">Marble.GeoPainter</a> </td> +<td \
class="paramname"><em>painter</em>, </td> </tr>
<tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype">float </td>
-<td class="paramname"><em>latitude</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">float </td>
-<td class="paramname"><em>altitude=0</em></td>
+<td class="paramtype"><a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> </td> +<td \
class="paramname"><em>viewport</em></td> </tr>
<tr>
<td></td>
@@ -222,7 +169,11 @@ standard value.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"><p>Set the coordinate of the item with an <b>GeoDataPoint.</b>
+<div class="memdoc"><dl compact><dt><b>Abstract method:</b></dt><dd>This method is \
abstract and can be overridden but not called directly.</dd></dl><p>Paints the item \
using the given GeoPainter. +</p>
+<p>
+Note that depending on the projection and zoom level, the item may be visible more \
than once. +GeoPainter will therefore automatically "repeat" primitives which have a \
geo position (GeoDataCoordinates). </p></div></div><a class="anchor" \
name="setCoordinate"></a> <div class="memitem">
<div class="memproto">
@@ -334,11 +285,11 @@ standard value.
</div>
<div class="memdoc"><p>Set the box used to determine if an item is active or \
inactive. If an empty box is passed the item will be shown in every case.
-</p></div></div><a class="anchor" name="setMaxLodPixels"></a>
+</p></div></div><a class="anchor" name="setMinZoomLevel"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> setMaxLodPixels</td>
+<td class="memname"> setMinZoomLevel</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
@@ -346,7 +297,7 @@ the item will be shown in every case.
<td class="memname"></td>
<td></td>
<td class="paramtype">int </td>
-<td class="paramname"><em>pixels</em></td>
+<td class="paramname"><em>zoomLevel</em></td>
</tr>
<tr>
<td></td>
@@ -356,21 +307,20 @@ the item will be shown in every case.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"><p>Sets the maximum number of pixels the GeoGraphicsItem has to \
be projected on for this item to
-be considered as active.
-</p></div></div><a class="anchor" name="setMinLodPixels"></a>
+<div class="memdoc"><p>Sets the minimum zoom level
+</p></div></div><a class="anchor" name="setStyle"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> setMinLodPixels</td>
+<td class="memname"> setStyle</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype">int </td>
-<td class="paramname"><em>pixels</em></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataStyle.html">Marble.GeoDataStyle</a> </td> +<td \
class="paramname"><em>style</em></td> </tr>
<tr>
<td></td>
@@ -380,21 +330,21 @@ be considered as active.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"><p>Sets the minimum number of pixels the GeoGraphicsItem has to \
be projected on for this item to
-be considered as active.
-</p></div></div><a class="anchor" name="setMinZoomLevel"></a>
+<div class="memdoc"><p>Set the box used to determine if an item is active or \
inactive. If an empty box is passed +the item will be shown in every case.
+</p></div></div><a class="anchor" name="setVisible"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> setMinZoomLevel</td>
+<td class="memname"> setVisible</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype">int </td>
-<td class="paramname"><em>zoomLevel</em></td>
+<td class="paramtype">bool </td>
+<td class="paramname"><em>visible</em></td>
</tr>
<tr>
<td></td>
@@ -404,20 +354,19 @@ be considered as active.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"><p>Sets the minimum zoom level
-</p></div></div><a class="anchor" name="setStyle"></a>
+<div class="memdoc"></div></div><a class="anchor" name="setZValue"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> setStyle</td>
+<td class="memname"> setZValue</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoDataStyle.html">Marble.GeoDataStyle</a> </td>
-<td class="paramname"><em>style</em></td>
+<td class="paramtype">float </td>
+<td class="paramname"><em>z</em></td>
</tr>
<tr>
<td></td>
@@ -427,36 +376,25 @@ be considered as active.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"><p>Set the box used to determine if an item is active or \
inactive. If an empty box is passed
-the item will be shown in every case.
-</p></div></div><a class="anchor" name="setTarget"></a>
+<div class="memdoc"><p>Set the z value of the item
+</p></div></div><a class="anchor" name="style"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> setTarget</td>
+<td class="memname"><a \
href="../marble/Marble.GeoDataStyle.html">Marble.GeoDataStyle</a> style</td> \
<td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">QString </td>
-<td class="paramname"><em>target</em></td>
-</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
<td width="100%"> </td>
-</tr></table>
+</tr>
+</table>
</div>
-<div class="memdoc"><p>Set the target of the item with <b>target.</b>
-</p></div></div><a class="anchor" name="style"></a>
+<div class="memdoc"><p>Returns the style of item.
+</p></div></div><a class="anchor" name="visible"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"><a \
href="../marble/Marble.GeoDataStyle.html">Marble.GeoDataStyle</a> style</td> +<td \
class="memname">bool visible</td> <td>(</td>
<td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -464,12 +402,11 @@ the item will be shown in every case.
</tr>
</table>
</div>
-<div class="memdoc"><p>Returns the style of item.
-</p></div></div><a class="anchor" name="target"></a>
+<div class="memdoc"></div></div><a class="anchor" name="zValue"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname">QString target</td>
+<td class="memname">float zValue</td>
<td>(</td>
<td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -477,7 +414,7 @@ the item will be shown in every case.
</tr>
</table>
</div>
-<div class="memdoc"><p>Get the target of the item. The target is the current planet \
string.s +<div class="memdoc"><p>Returns the z value of the item
</p></div></div><hr><h2>Enumeration Documentation</h2><a class="anchor" \
name="GeoGraphicsItemFlag"></a> <div class="memitem">
<div class="memproto">
diff --git a/docs/bindings/python/html/marble/Marble.GeoGraphicsScene.html \
b/docs/bindings/python/html/marble/Marble.GeoGraphicsScene.html index \
b9f026b..b27e8ee 100644
--- a/docs/bindings/python/html/marble/Marble.GeoGraphicsScene.html
+++ b/docs/bindings/python/html/marble/Marble.GeoGraphicsScene.html
@@ -55,12 +55,11 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<p>This is the home of all GeoGraphicsItems to be shown on the map.
</p>
-<table border="0" cellpadding="0" cellspacing="0"><tr><td \
colspan="2"><br><h2>Attributes</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#vars_tileZoomLevel">s_tileZoomLevel</a></td></tr><tr><td \
colspan="2"><br><h2>Methods</h2></td></tr> +<table border="0" cellpadding="0" \
cellspacing="0"><tr><td colspan="2"><br><h2>Methods</h2></td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#GeoGraphicsScene">__init__</a> (self, QObject parent=0)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#addItem">addItem</a> (self, \
<a href="../marble/Marble.GeoGraphicsItem.html">Marble.GeoGraphicsItem</a> \
item)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#clear">clear</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">[<a \
href="../marble/Marble.GeoGraphicsItem.html">Marble.GeoGraphicsItem</a>] </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#items">items</a> \
(self)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#eraseAll">eraseAll</a> (self)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top">[<a \
href="../marble/Marble.GeoGraphicsItem.html">Marble.GeoGraphicsItem</a>] </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#items">items</a> (self, <a \
href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> box, \
int maxZoomLevel)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#removeItem">removeItem</a> (self, <a \
href="../marble/Marble.GeoGraphicsItem.html">Marble.GeoGraphicsItem</a> \
item)</td></tr> </table>
@@ -131,11 +130,11 @@ Adds the item <b>item</b> to the GeoGraphicsScene
</div>
<div class="memdoc"><p>Remove all items from the GeoGraphicsScene
Removes all items from the GeoGraphicsScene
-</p></div></div><a class="anchor" name="items"></a>
+</p></div></div><a class="anchor" name="eraseAll"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname">[<a \
href="../marble/Marble.GeoGraphicsItem.html">Marble.GeoGraphicsItem</a>] items</td> \
+<td class="memname"> eraseAll</td> <td>(</td>
<td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -143,16 +142,12 @@ Removes all items from the GeoGraphicsScene
</tr>
</table>
</div>
-<div class="memdoc"><p>Get the list of items in the specified Box
+<div class="memdoc"><p>Get all items in the GeoGraphicsScene
+Returns all items in the GeoGraphicsScene.
+The items will be returned in no specific order.
</p>
<p>
-</p><dl compact><dt><b>Parameters:</b></dt><dd>
-<table border="0" cellspacing="2" cellpadding="0">
-<tr><td></td><td valign="top"><em>box</em> </td><td> The box around the items.
-
-<tr><td></td><td valign="top"><em>maxZoomLevel</em> </td><td> The max zoom \
level of tiling
-</td></tr> </table></dl>
-<p> <dl class="return" compact><dt><b>Returns:</b></dt><dd> The list of items in the \
specified box in no specific order. +<dl class="return" \
compact><dt><b>Returns:</b></dt><dd> The list of all GeoGraphicsItems </dd></dl>
</p></div></div><a class="anchor" name="items"></a>
<div class="memitem">
@@ -217,15 +212,7 @@ Removes all items from the GeoGraphicsScene
</div>
<div class="memdoc"><p>Remove an item from the GeoGraphicsScene
Removes the item <b>item</b> from the GeoGraphicsScene
-</p></div></div><hr><h2>Attribute Documentation</h2><a class="anchor" \
name="vars_tileZoomLevel"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname">
-<tr><td class="memname">int s_tileZoomLevel</td>
-</tr>
-</table>
-</div>
-<div class="memdoc"></div></div><p>
+</p></div></div>
</div>
</div>
</div>
diff --git a/docs/bindings/python/html/marble/Marble.GeoNode.html \
b/docs/bindings/python/html/marble/Marble.GeoNode.html index e930941..eb08388 100644
--- a/docs/bindings/python/html/marble/Marble.GeoNode.html
+++ b/docs/bindings/python/html/marble/Marble.GeoNode.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
-Subclasses: <a href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a><br \
/> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.LabelGraphicsItem.html \
b/docs/bindings/python/html/marble/Marble.LabelGraphicsItem.html index \
c787485..556ea1c 100644
--- a/docs/bindings/python/html/marble/Marble.LabelGraphicsItem.html
+++ b/docs/bindings/python/html/marble/Marble.LabelGraphicsItem.html
@@ -64,7 +64,8 @@ The item also provides frames.
<tr><td class="memItemLeft" nowrap align="right" valign="top">QIcon </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#icon">icon</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">QImage </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#image">image</a> (self)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top">QSizeF </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#minimumSize">minimumSize</a> \
(self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#paintContent">paintContent</a> (self, <a \
href="../marble/Marble.GeoPainter.html">Marble.GeoPainter</a> painter, <a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> viewport, \
QString renderPos, <a \
href="../marble/Marble.GeoSceneLayer.html">Marble.GeoSceneLayer</a> layer)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#paintContent">paintContent</a> (self, QPainter painter)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setContentSize">setContentSize</a> (self, QSizeF contentSize)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setIcon">setIcon</a> (self, \
QIcon icon, QSize size)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setImage">setImage</a> (self, QImage image, QSize size=QSize())</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setMinimumSize">setMinimumSize</a> (self, QSizeF size)</td></tr> @@ -174,26 \
+175,30 @@ The item also provides frames. </tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoPainter.html">Marble.GeoPainter</a> </td>
-<td class="paramname"><em>painter</em>, </td>
+<td class="paramtype">QPainter </td>
+<td class="paramname"><em>painter</em></td>
</tr>
<tr>
-<td class="memname"></td>
<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> </td>
-<td class="paramname"><em>viewport</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
+<td>)</td>
<td></td>
-<td class="paramtype">QString </td>
-<td class="paramname"><em>renderPos</em>, </td>
-</tr>
-<tr>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"></div></div><a class="anchor" name="setContentSize"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> setContentSize</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoSceneLayer.html">Marble.GeoSceneLayer</a> </td>
-<td class="paramname"><em>layer</em></td>
+<td class="paramtype">QSizeF </td>
+<td class="paramname"><em>contentSize</em></td>
</tr>
<tr>
<td></td>
diff --git a/docs/bindings/python/html/marble/Marble.LatLonEdit.html \
b/docs/bindings/python/html/marble/Marble.LatLonEdit.html index a32c20b..1f4b2c7 \
100644
--- a/docs/bindings/python/html/marble/Marble.LatLonEdit.html
+++ b/docs/bindings/python/html/marble/Marble.LatLonEdit.html
@@ -54,15 +54,13 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
-<table border="0" cellpadding="0" cellspacing="0"><tr><td \
colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#Notation">Notation</a> </td><td class="memItemRight" \
valign="bottom">{ Decimal, DMS, DM }</td></tr>
-<tr><td colspan="2"><br><h2>Signals</h2></td></tr>
+<table border="0" cellpadding="0" cellspacing="0"><tr><td \
colspan="2"><br><h2>Signals</h2></td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#valueChanged">valueChanged</a> (float value)</td></tr> <tr><td \
colspan="2"><br><h2>Methods</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#LatLonEdit">__init__</a> \
(self, QWidget parent=0, <a \
href="../marble/Marble.html#Dimension">Marble.Dimension</a> \
dimension=Marble.Longitude, <a \
href="../marble/Marble.LatLonEdit.html#Notation">Marble.LatLonEdit.Notation</a> \
notation=Marble.LatLonEdit.DMS)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.LatLonEdit.html#Notation">Marble.LatLonEdit.Notation</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#notation">notation</a> \
(self)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#LatLonEdit">__init__</a> (self, QWidget parent=0, <a \
href="../marble/Marble.html#Dimension">Marble.Dimension</a> \
dimension=Marble.Longitude, <a \
href="../marble/Marble.GeoDataCoordinates.html#Notation">Marble.GeoDataCoordinates.Notation</a> \
notation=Marble.GeoDataCoordinates.DMS)</td></tr> +<tr><td class="memItemLeft" nowrap \
align="right" valign="top"><a \
href="../marble/Marble.GeoDataCoordinates.html#Notation">Marble.GeoDataCoordinates.Notation</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#notation">notation</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setDimension">setDimension</a> (self, <a \
href="../marble/Marble.html#Dimension">Marble.Dimension</a> \
dimension)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setNotation">setNotation</a> (self, <a \
href="../marble/Marble.LatLonEdit.html#Notation">Marble.LatLonEdit.Notation</a> \
notation)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setNotation">setNotation</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html#Notation">Marble.GeoDataCoordinates.Notation</a> \
notation)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setValue">setValue</a> (self, float newvalue)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">float </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#value">value</a> \
(self)</td></tr> </table>
@@ -106,8 +104,8 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.LatLonEdit.html#Notation">Marble.LatLonEdit.Notation</a> </td>
-<td class="paramname"><em>notation=Marble.LatLonEdit.DMS</em></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html#Notation">Marble.GeoDataCoordinates.Notation</a> </td>
+<td class="paramname"><em>notation=Marble.GeoDataCoordinates.DMS</em></td>
</tr>
<tr>
<td></td>
@@ -121,7 +119,7 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"><a \
href="../marble/Marble.LatLonEdit.html#Notation">Marble.LatLonEdit.Notation</a> \
notation</td> +<td class="memname"><a \
href="../marble/Marble.GeoDataCoordinates.html#Notation">Marble.GeoDataCoordinates.Notation</a> \
notation</td> <td>(</td>
<td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -162,7 +160,7 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.LatLonEdit.html#Notation">Marble.LatLonEdit.Notation</a> </td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html#Notation">Marble.GeoDataCoordinates.Notation</a> </td>
<td class="paramname"><em>notation</em></td>
</tr>
<tr>
@@ -207,19 +205,7 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
</tr>
</table>
</div>
-<div class="memdoc"></div></div><hr><h2>Enumeration Documentation</h2><a \
class="anchor" name="Notation"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname">
-<tr><td class="memname">Notation</td>
-</tr>
-</table>
-</div>
-<div class="memdoc"><p>enum used to specify the notation / numerical system
-</p><dl compact><dt><b>Enumerator: </b></dt><dd>
-<table border="0" cellspacing="2" cellpadding="0"><tr><td \
valign="top"><em>Decimal</em> </td><td><tr><td \
valign="top"><em>DMS</em> </td><td></table>
-</dl>
-</div></div><p>
+<div class="memdoc"></div></div>
</div>
</div>
</div>
diff --git a/docs/bindings/python/html/marble/Marble.LayerInterface.html \
b/docs/bindings/python/html/marble/Marble.LayerInterface.html index 43e6120..81311e7 \
100644
--- a/docs/bindings/python/html/marble/Marble.LayerInterface.html
+++ b/docs/bindings/python/html/marble/Marble.LayerInterface.html
@@ -57,6 +57,7 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<table border="0" cellpadding="0" cellspacing="0"><tr><td \
colspan="2"><br><h2>Methods</h2></td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top">bool </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#render">render</a> (self, <a \
href="../marble/Marble.GeoPainter.html">Marble.GeoPainter</a> painter, <a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> viewport, \
QString renderPos, <a \
href="../marble/Marble.GeoSceneLayer.html">Marble.GeoSceneLayer</a> layer)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" \
valign="top">QStringList </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#renderPosition">renderPosition</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top">QString </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#runtimeTrace">runtimeTrace</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top">float </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#zValue">zValue</a> (self)</td></tr> </table>
<hr><h2>Method Documentation</h2><a class="anchor" name="render"></a>
@@ -141,6 +142,19 @@ Possible Values:
"ALWAYS_ON_TOP"
"FLOAT_ITEM"
"USER_TOOLS"
+</p></div></div><a class="anchor" name="runtimeTrace"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">QString runtimeTrace</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"><p>Returns a debug line for perfo/tracing issues
</p></div></div><a class="anchor" name="zValue"></a>
<div class="memitem">
<div class="memproto">
diff --git a/docs/bindings/python/html/marble/Marble.MapThemeManager.html \
b/docs/bindings/python/html/marble/Marble.MapThemeManager.html index 37024e8..21a3f7f \
100644
--- a/docs/bindings/python/html/marble/Marble.MapThemeManager.html
+++ b/docs/bindings/python/html/marble/Marble.MapThemeManager.html
@@ -80,6 +80,8 @@ object.
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#MapThemeManager">__init__</a> (self, QObject parent=0)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">QStringList </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#mapThemeIds">mapThemeIds</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top">QStandardItemModel </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#mapThemeModel">mapThemeModel</a> (self)</td></tr> +<tr><td \
colspan="2"><br><h2>Static Methods</h2></td></tr> +<tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#deleteMapTheme">deleteMapTheme</a> (QString mapThemeId)</td></tr> \
</table> <hr><h2>Signal Documentation</h2><a class="anchor" \
name="themesChanged"></a> <div class="memitem">
@@ -146,6 +148,31 @@ object.
<p>
This method provides a QStandardItemModel of all themes
that are available via MarbleDirs.
+</p></div></div><hr><h2>Static Method Documentation</h2><a class="anchor" \
name="deleteMapTheme"></a> +<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> deleteMapTheme</td>
+<td>(</td>
+<td class="paramtype">QString </td>
+<td class="paramname"><em>mapThemeId</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Deletes the map theme with the specified map theme ID.
+</p><dl compact><dt><b>Parameters:</b></dt><dd>
+<table border="0" cellspacing="2" cellpadding="0">
+<tr><td></td><td valign="top"><em>mapThemeId</em> </td><td> ID of the map theme \
to be deleted +</td></tr>
+</table></dl>
+<p> Deletion will only succeed for local map themes, that is, if the map
+theme's directory structure resides in the user's home directory.
</p></div></div>
</div>
</div>
diff --git a/docs/bindings/python/html/marble/Marble.MapViewWidget.html \
b/docs/bindings/python/html/marble/Marble.MapViewWidget.html index 9c3cdb1..ea1feaf \
100644
--- a/docs/bindings/python/html/marble/Marble.MapViewWidget.html
+++ b/docs/bindings/python/html/marble/Marble.MapViewWidget.html
@@ -55,6 +55,7 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<table border="0" cellpadding="0" cellspacing="0"><tr><td \
colspan="2"><br><h2>Signals</h2></td></tr> +<tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#celestialBodyChanged">celestialBodyChanged</a> (QString \
a0)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#mapThemeIdChanged">mapThemeIdChanged</a> (QString a0)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#projectionChanged">projectionChanged</a> (<a \
href="../marble/Marble.html#Projection">Marble.Projection</a> a0)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#showMapWizard">showMapWizard</a> ()</td></tr> @@ -65,7 +66,24 @@ Namespace: <a \
href="../marble/Marble.html">Marble</a><br /> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#setMarbleWidget">setMarbleWidget</a> (self, <a \
href="../marble/Marble.MarbleWidget.html">Marble.MarbleWidget</a> widget)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setProjection">setProjection</a> (self, <a \
href="../marble/Marble.html#Projection">Marble.Projection</a> projection)</td></tr> \
</table>
-<hr><h2>Signal Documentation</h2><a class="anchor" name="mapThemeIdChanged"></a>
+<hr><h2>Signal Documentation</h2><a class="anchor" name="celestialBodyChanged"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> celestialBodyChanged</td>
+<td>(</td>
+<td class="paramtype">QString </td>
+<td class="paramname"><em>a0</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><dl compact><dt><b>Signal \
syntax:</b></dt><dd><code>QObject.connect(source, SIGNAL("celestialBodyChanged(const \
QString&)"), target_slot)</code></dd></dl></div></div><a class="anchor" \
name="mapThemeIdChanged"></a> <div class="memitem">
<div class="memproto">
<table class="memname"><tr>
diff --git a/docs/bindings/python/html/marble/Marble.MarbleAbstractRunner.html \
b/docs/bindings/python/html/marble/Marble.MarbleAbstractRunner.html index \
12ee5aa..a2e964e 100644
--- a/docs/bindings/python/html/marble/Marble.MarbleAbstractRunner.html
+++ b/docs/bindings/python/html/marble/Marble.MarbleAbstractRunner.html
@@ -66,7 +66,7 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#parseFile">parseFile</a> \
(self, QString fileName, <a \
href="../marble/Marble.html#DocumentRole">Marble.DocumentRole</a> role)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#retrieveRoute">retrieveRoute</a> (self, <a \
href="../marble/Marble.RouteRequest.html">Marble.RouteRequest</a> request)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#reverseGeocoding">reverseGeocoding</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> \
coordinates)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#search">search</a> (self, \
QString searchTerm)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#search">search</a> (self, QString searchTerm, <a \
href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> \
preferred)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setModel">setModel</a> (self, <a \
href="../marble/Marble.MarbleModel.html">Marble.MarbleModel</a> model)</td></tr> \
</table> <hr><h2>Signal Documentation</h2><a class="anchor" \
name="parsingFinished"></a> @@ -291,7 +291,13 @@ plugin capabilities, otherwise \
MarbleRunnerManager will ignore the plugin <td class="memname"></td>
<td></td>
<td class="paramtype">QString </td>
-<td class="paramname"><em>searchTerm</em></td>
+<td class="paramname"><em>searchTerm</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> </td>
+<td class="paramname"><em>preferred</em></td>
</tr>
<tr>
<td></td>
diff --git a/docs/bindings/python/html/marble/Marble.MarbleControlBox.html \
b/docs/bindings/python/html/marble/Marble.MarbleControlBox.html index \
adc1002..afc3d90 100644
--- a/docs/bindings/python/html/marble/Marble.MarbleControlBox.html
+++ b/docs/bindings/python/html/marble/Marble.MarbleControlBox.html
@@ -93,7 +93,7 @@ Night view, and a Satellite view.
<tr><td colspan="2"><br><h2>Methods</h2></td></tr>
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#MarbleControlBox">__init__</a> (self, QWidget parent=0)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.CurrentLocationWidget.html">Marble.CurrentLocationWidget</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#currentLocationWidget">currentLocationWidget</a> \
(self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#search">search</a> (self, \
QString searchTerm)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#search">search</a> (self, QString searchTerm, <a \
href="../marble/Marble.html#SearchMode">Marble.SearchMode</a> searchMode)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#selectTheme">selectTheme</a> (self, QString a0)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setCurrentLocationTabShown">setCurrentLocationTabShown</a> (self, bool \
show)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setFileViewTabShown">setFileViewTabShown</a> (self, bool show)</td></tr> @@ \
-194,7 +194,13 @@ Night view, and a Satellite view. <td class="memname"></td>
<td></td>
<td class="paramtype">QString </td>
-<td class="paramname"><em>searchTerm</em></td>
+<td class="paramname"><em>searchTerm</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.html#SearchMode">Marble.SearchMode</a> </td> +<td \
class="paramname"><em>searchMode</em></td> </tr>
<tr>
<td></td>
diff --git a/docs/bindings/python/html/marble/Marble.MarbleGlobal.html \
b/docs/bindings/python/html/marble/Marble.MarbleGlobal.html index 4d3fc00..d6ad36b \
100644
--- a/docs/bindings/python/html/marble/Marble.MarbleGlobal.html
+++ b/docs/bindings/python/html/marble/Marble.MarbleGlobal.html
@@ -53,8 +53,7 @@
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
-<p>Describes possible flight mode (interpolation between source
-and target camera positions)
+<p>Search mode: Global (worldwide) versus area (local, regional) search
</p>
<table border="0" cellpadding="0" cellspacing="0"><tr><td \
colspan="2"><br><h2>Enumerations</h2></td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"><a class="el" href="#Profile">Profile</a> </td><td \
class="memItemRight" valign="bottom">{ Default, SmallScreen, \
HighResolution }</td></tr>
diff --git a/docs/bindings/python/html/marble/Marble.MarbleGraphicsItem.html \
b/docs/bindings/python/html/marble/Marble.MarbleGraphicsItem.html index \
92cf023..fa48250 100644
--- a/docs/bindings/python/html/marble/Marble.MarbleGraphicsItem.html
+++ b/docs/bindings/python/html/marble/Marble.MarbleGraphicsItem.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
-Subclasses: <a href="../marble/Marble.GeoGraphicsItem.html">Marble.GeoGraphicsItem</a>, \
<a href="../marble/Marble.ScreenGraphicsItem.html">Marble.ScreenGraphicsItem</a><br \
/> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
<dl class="abstract" compact><dt><b>Abstract class:</b></dt>
@@ -58,9 +58,7 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<table border="0" cellpadding="0" cellspacing="0"><tr><td \
colspan="2"><br><h2>Enumerations</h2></td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"><a class="el" \
href="#CacheMode">CacheMode</a> </td><td class="memItemRight" \
valign="bottom">{ NoCache, ItemCoordinateCache, \
DeviceCoordinateCache }</td></tr> <tr><td \
colspan="2"><br><h2>Methods</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#MarbleGraphicsItem">__init__</a> (self, <a \
href="../marble/Marble.MarbleGraphicsItem.html">Marble.MarbleGraphicsItem</a> \
parent=0)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#MarbleGraphicsItem">__init__</a> (self, <a \
href="../marble/Marble.MarbleGraphicsItem.html">Marble.MarbleGraphicsItem</a> \
other)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">[QRectF] </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#boundingRects">boundingRects</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top"><a \
href="../marble/Marble.MarbleGraphicsItem.html#CacheMode">Marble.MarbleGraphicsItem.CacheMode</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#cacheMode">cacheMode</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#contains">contains</a> (self, QPointF point)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">QRectF </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#containsRect">containsRect</a> (self, QPointF point)</td></tr> @@ -69,21 \
+67,18 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br /> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">bool </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#eventFilter">eventFilter</a> (self, QObject object, QEvent e)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#hide">hide</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.AbstractMarbleGraphicsLayout.html">Marble.AbstractMarbleGraphicsLayout</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#layout">layout</a> \
(self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#paint">paint</a> (self, <a \
href="../marble/Marble.GeoPainter.html">Marble.GeoPainter</a> painter, <a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> viewport, \
QString renderPos, <a \
href="../marble/Marble.GeoSceneLayer.html">Marble.GeoSceneLayer</a> \
layer=0)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#paintEvent">paintEvent</a> \
(self, <a href="../marble/Marble.GeoPainter.html">Marble.GeoPainter</a> painter, <a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> viewport, \
QString renderPos, <a \
href="../marble/Marble.GeoSceneLayer.html">Marble.GeoSceneLayer</a> \
layer=0)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#paint">paint</a> (self, QPainter painter)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top">bool </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#paintEvent">paintEvent</a> \
(self, QPainter painter, <a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> \
viewport)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setCacheMode">setCacheMode</a> (self, <a \
href="../marble/Marble.MarbleGraphicsItem.html#CacheMode">Marble.MarbleGraphicsItem.CacheMode</a> \
mode)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setContentSize">setContentSize</a> (self, QSizeF size)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setLayout">setLayout</a> \
(self, <a href="../marble/Marble.AbstractMarbleGraphicsLayout.html">Marble.AbstractMarbleGraphicsLayout</a> \
layout)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setProjection">setProjection</a> (self, <a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> \
viewport)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setSize">setSize</a> (self, QSizeF size)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setToolTip">setToolTip</a> \
(self, QString toolTip)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setVisible">setVisible</a> (self, bool visible)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setZValue">setZValue</a> \
(self, float z)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#show">show</a> (self)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top">QSizeF </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#size">size</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">QString </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#toolTip">toolTip</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#update">update</a> (self)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top">bool </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#visible">visible</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">float </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#zValue">zValue</a> \
(self)</td></tr> </table>
<hr><h2>Method Documentation</h2><a class="anchor" name="MarbleGraphicsItem"></a>
<div class="memitem">
@@ -97,28 +92,6 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<td class="memname"></td>
<td></td>
<td class="paramtype"><a \
href="../marble/Marble.MarbleGraphicsItem.html">Marble.MarbleGraphicsItem</a> </td>
-<td class="paramname"><em>parent=0</em></td>
-</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
-<td width="100%"> </td>
-</tr></table>
-</div>
-<div class="memdoc"></div></div><a class="anchor" name="MarbleGraphicsItem"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname">__init__</td>
-<td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.MarbleGraphicsItem.html">Marble.MarbleGraphicsItem</a> </td>
<td class="paramname"><em>other</em></td>
</tr>
<tr>
@@ -129,20 +102,7 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="boundingRects"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname">[QRectF] boundingRects</td>
-<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
-<td width="100%"> </td>
-</tr>
-</table>
-</div>
-<div class="memdoc"><p>Used to get the set of screen bounding rects
-</p></div></div><a class="anchor" name="cacheMode"></a>
+<div class="memdoc"></div></div><a class="anchor" name="cacheMode"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
@@ -293,26 +253,8 @@ This is identical to size() for default MarbleGraphicsItems.
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoPainter.html">Marble.GeoPainter</a> </td>
-<td class="paramname"><em>painter</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> </td>
-<td class="paramname"><em>viewport</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">QString </td>
-<td class="paramname"><em>renderPos</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoSceneLayer.html">Marble.GeoSceneLayer</a> </td>
-<td class="paramname"><em>layer=0</em></td>
+<td class="paramtype">QPainter </td>
+<td class="paramname"><em>painter</em></td>
</tr>
<tr>
<td></td>
@@ -335,26 +277,14 @@ This function will be called by paintEvent().
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoPainter.html">Marble.GeoPainter</a> </td> +<td \
class="paramtype">QPainter </td> <td class="paramname"><em>painter</em>, </td>
</tr>
<tr>
<td class="memname"></td>
<td></td>
<td class="paramtype"><a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> </td>
-<td class="paramname"><em>viewport</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">QString </td>
-<td class="paramname"><em>renderPos</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoSceneLayer.html">Marble.GeoSceneLayer</a> </td>
-<td class="paramname"><em>layer=0</em></td>
+<td class="paramname"><em>viewport</em></td>
</tr>
<tr>
<td></td>
@@ -436,19 +366,19 @@ It is not safe to call this function from a thread other than \
the gui thread. </div>
<div class="memdoc"><p>Set the layout of the graphics item. The layout will now \
handle positions of added child items. The MarbleGraphicsItem takes ownership of the \
layout.
-</p></div></div><a class="anchor" name="setSize"></a>
+</p></div></div><a class="anchor" name="setProjection"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> setSize</td>
+<td class="memname"> setProjection</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype">QSizeF </td>
-<td class="paramname"><em>size</em></td>
+<td class="paramtype"><a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> </td> +<td \
class="paramname"><em>viewport</em></td> </tr>
<tr>
<td></td>
@@ -458,20 +388,19 @@ items. The MarbleGraphicsItem takes ownership of the layout.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"><p>Set the size of the item
-</p></div></div><a class="anchor" name="setToolTip"></a>
+<div class="memdoc"></div></div><a class="anchor" name="setSize"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> setToolTip</td>
+<td class="memname"> setSize</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype">QString </td>
-<td class="paramname"><em>toolTip</em></td>
+<td class="paramtype">QSizeF </td>
+<td class="paramname"><em>size</em></td>
</tr>
<tr>
<td></td>
@@ -481,7 +410,7 @@ items. The MarbleGraphicsItem takes ownership of the layout.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"><p>Set the tool tip for this GraphicItem.
+<div class="memdoc"><p>Set the size of the item
</p></div></div><a class="anchor" name="setVisible"></a>
<div class="memitem">
<div class="memproto">
@@ -505,29 +434,6 @@ items. The MarbleGraphicsItem takes ownership of the layout.
</tr></table>
</div>
<div class="memdoc"><p>Makes the item visible or invisible, depending on \
<b>visible.</b>
-</p></div></div><a class="anchor" name="setZValue"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname"> setZValue</td>
-<td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">float </td>
-<td class="paramname"><em>z</em></td>
-</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
-<td width="100%"> </td>
-</tr></table>
-</div>
-<div class="memdoc"><p>Set the z value of the item
</p></div></div><a class="anchor" name="show"></a>
<div class="memitem">
<div class="memproto">
@@ -554,19 +460,6 @@ items. The MarbleGraphicsItem takes ownership of the layout.
</table>
</div>
<div class="memdoc"><p>Returns the size of the item
-</p></div></div><a class="anchor" name="toolTip"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname">QString toolTip</td>
-<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
-<td width="100%"> </td>
-</tr>
-</table>
-</div>
-<div class="memdoc"><p>Returns the items tool tip or, if no tool tip has been set, \
an empty string. </p></div></div><a class="anchor" name="update"></a>
<div class="memitem">
<div class="memproto">
@@ -579,9 +472,8 @@ items. The MarbleGraphicsItem takes ownership of the layout.
</tr>
</table>
</div>
-<div class="memdoc"><p>Schedules an painting update for the Item. As long it is not \
added to an GraphicsScene
-(which doesn't exist yet) it will be repainted at the next paint event instead of \
using
-the cache.
+<div class="memdoc"><p>Marks the item and all parent items as invalid. If caching is \
enabled, the next paintEvent() +will cause the cache to be recreated, such that the \
paintEvent()s after will be optimized. </p></div></div><a class="anchor" \
name="visible"></a> <div class="memitem">
<div class="memproto">
@@ -595,19 +487,6 @@ the cache.
</table>
</div>
<div class="memdoc"><p>Returns if the item is visible.
-</p></div></div><a class="anchor" name="zValue"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname">float zValue</td>
-<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
-<td width="100%"> </td>
-</tr>
-</table>
-</div>
-<div class="memdoc"><p>Returns the z value of the item
</p></div></div><hr><h2>Enumeration Documentation</h2><a class="anchor" \
name="CacheMode"></a> <div class="memitem">
<div class="memproto">
diff --git a/docs/bindings/python/html/marble/Marble.MarbleMap.html \
b/docs/bindings/python/html/marble/Marble.MarbleMap.html index fd7e514..842dd0b \
100644
--- a/docs/bindings/python/html/marble/Marble.MarbleMap.html
+++ b/docs/bindings/python/html/marble/Marble.MarbleMap.html
@@ -112,7 +112,7 @@ cities, mountain tops or the poles.
<tr><td class="memItemLeft" nowrap align="right" valign="top">[<a \
href="../marble/Marble.AbstractDataPlugin.html">Marble.AbstractDataPlugin</a>] </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#dataPlugins">dataPlugins</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top"><a \
href="../marble/Marble.html#AngleUnit">Marble.AngleUnit</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#defaultAngleUnit">defaultAngleUnit</a> (self)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">QFont </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#defaultFont">defaultFont</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#downloadRegion">downloadRegion</a> (self, QString sourceDir, \
QVector<Marble::TileCoordsPyramid> a1)</td></tr> +<tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#downloadRegion">downloadRegion</a> (self, \
QVector<Marble::TileCoordsPyramid> a0)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"><a \
href="../marble/Marble.AbstractFloatItem.html">Marble.AbstractFloatItem</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#floatItem">floatItem</a> \
(self, QString nameId)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">[<a href="../marble/Marble.AbstractFloatItem.html">Marble.AbstractFloatItem</a>] </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#floatItems">floatItems</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#geoCoordinates">geoCoordinates</a> (self, int x, int y, float lon, float lat, \
<a href="../marble/Marble.GeoDataCoordinates.html#Unit">Marble.GeoDataCoordinates.Unit</a> \
a4=Marble.GeoDataCoordinates.Degree)</td></tr> @@ -161,6 +161,7 @@ cities, mountain \
tops or the poles. <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setShowPlaces">setShowPlaces</a> (self, bool visible)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setShowRelief">setShowRelief</a> (self, bool visible)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setShowRivers">setShowRivers</a> (self, bool visible)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setShowRuntimeTrace">setShowRuntimeTrace</a> (self, bool visible)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setShowScaleBar">setShowScaleBar</a> (self, bool visible)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setShowSunInZenith">setShowSunInZenith</a> (self, bool visible)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setShowSunShading">setShowSunShading</a> (self, bool visible)</td></tr> @@ \
-641,14 +642,8 @@ the globe and before all other layers have been rendered. \
</tr><tr> <td class="memname"></td>
<td></td>
-<td class="paramtype">QString </td>
-<td class="paramname"><em>sourceDir</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
<td class="paramtype">QVector<Marble::TileCoordsPyramid> </td>
-<td class="paramname"><em>a1</em></td>
+<td class="paramname"><em>a0</em></td>
</tr>
<tr>
<td></td>
@@ -1915,7 +1910,29 @@ if needed.
</td></tr>
</table></dl>
<p>
-</p></div></div><a class="anchor" name="setShowScaleBar"></a>
+</p></div></div><a class="anchor" name="setShowRuntimeTrace"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> setShowRuntimeTrace</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">bool </td>
+<td class="paramname"><em>visible</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"></div></div><a class="anchor" name="setShowScaleBar"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
diff --git a/docs/bindings/python/html/marble/Marble.MarbleRunnerManager.html \
b/docs/bindings/python/html/marble/Marble.MarbleRunnerManager.html index \
15a00e9..006238e 100644
--- a/docs/bindings/python/html/marble/Marble.MarbleRunnerManager.html
+++ b/docs/bindings/python/html/marble/Marble.MarbleRunnerManager.html
@@ -65,7 +65,7 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#searchFinished">searchFinished</a> (QString searchTerm)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#searchResultChanged">searchResultChanged</a> (QAbstractItemModel \
model)</td></tr> <tr><td colspan="2"><br><h2>Methods</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#findPlacemarks">findPlacemarks</a> (self, QString searchTerm)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#findPlacemarks">findPlacemarks</a> (self, QString searchTerm, <a \
href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> \
preferred=Marble.GeoDataLatLonAltBox())</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"><a \
href="../marble/Marble.GeoDataDocument.html">Marble.GeoDataDocument</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#openFile">openFile</a> \
(self, QString fileName, <a \
href="../marble/Marble.html#DocumentRole">Marble.DocumentRole</a> \
role=Marble.UserDocument)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#parseFile">parseFile</a> (self, QString fileName, <a \
href="../marble/Marble.html#DocumentRole">Marble.DocumentRole</a> \
role=Marble.UserDocument)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#retrieveRoute">retrieveRoute</a> (self, <a \
href="../marble/Marble.RouteRequest.html">Marble.RouteRequest</a> request)</td></tr> \
@@ -243,7 +243,13 @@ To do: FIXME: this sounds like a duplication of \
QAbstractItemModel signals <td class="memname"></td>
<td></td>
<td class="paramtype">QString </td>
-<td class="paramname"><em>searchTerm</em></td>
+<td class="paramname"><em>searchTerm</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> </td>
+<td class="paramname"><em>preferred=Marble.GeoDataLatLonAltBox()</em></td>
</tr>
<tr>
<td></td>
@@ -421,7 +427,8 @@ returned using the <dl class="see" compact><dt><b>See \
also:</b></dt><dd> reverse <td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"><p>Set a pointer to the map instance to be passed to \
MarbleAbstractRunner instances +<div class="memdoc"><p>Set a pointer to the model \
instance to be passed to MarbleAbstractRunner instances +or to use model specific \
information like planet parameters </p></div></div>
</div>
</div>
diff --git a/docs/bindings/python/html/marble/Marble.MarbleWidget.html \
b/docs/bindings/python/html/marble/Marble.MarbleWidget.html index 5603812..925d95e \
100644
--- a/docs/bindings/python/html/marble/Marble.MarbleWidget.html
+++ b/docs/bindings/python/html/marble/Marble.MarbleWidget.html
@@ -134,7 +134,7 @@ article, you will get a mini-browser window with the article in a \
tab. <tr><td class="memItemLeft" nowrap align="right" \
valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#distanceFromRadius">distanceFromRadius</a> (self, float radius)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top">float </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#distanceFromZoom">distanceFromZoom</a> (self, float zoom)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">QString </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#distanceString">distanceString</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#downloadRegion">downloadRegion</a> (self, QString sourceDir, \
QVector<Marble::TileCoordsPyramid> a1)</td></tr> +<tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#downloadRegion">downloadRegion</a> (self, \
QVector<Marble::TileCoordsPyramid> a0)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"><a \
href="../marble/Marble.AbstractFloatItem.html">Marble.AbstractFloatItem</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#floatItem">floatItem</a> \
(self, QString nameId)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">[<a href="../marble/Marble.AbstractFloatItem.html">Marble.AbstractFloatItem</a>] </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#floatItems">floatItems</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#flyTo">flyTo</a> (self, <a \
href="../marble/Marble.GeoDataLookAt.html">Marble.GeoDataLookAt</a> lookAt, <a \
href="../marble/Marble.html#FlyToMode">Marble.FlyToMode</a> \
mode=Marble.Automatic)</td></tr> @@ -200,6 +200,7 @@ article, you will get a \
mini-browser window with the article in a tab. <tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#setShowPlaces">setShowPlaces</a> (self, bool visible)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setShowRelief">setShowRelief</a> (self, bool visible)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setShowRivers">setShowRivers</a> (self, bool visible)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setShowRuntimeTrace">setShowRuntimeTrace</a> (self, bool visible)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setShowScaleBar">setShowScaleBar</a> (self, bool visible)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setShowSunInZenith">setShowSunInZenith</a> (self, bool visible)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setShowSunShading">setShowSunShading</a> (self, bool visible)</td></tr> @@ \
-978,14 +979,8 @@ the globe and before all other layers has been rendered. </tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype">QString </td>
-<td class="paramname"><em>sourceDir</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
<td class="paramtype">QVector<Marble::TileCoordsPyramid> </td>
-<td class="paramname"><em>a1</em></td>
+<td class="paramname"><em>a0</em></td>
</tr>
<tr>
<td></td>
@@ -2681,6 +2676,35 @@ if needed.
</td></tr>
</table></dl>
<p>
+</p></div></div><a class="anchor" name="setShowRuntimeTrace"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> setShowRuntimeTrace</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">bool </td>
+<td class="paramname"><em>visible</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Set whether the runtime tracing for layers gets shown
+</p><dl compact><dt><b>Parameters:</b></dt><dd>
+<table border="0" cellspacing="2" cellpadding="0">
+<tr><td></td><td valign="top"><em>visible</em> </td><td> visibility of the \
runtime tracing +</td></tr>
+</table></dl>
+<p>
</p></div></div><a class="anchor" name="setShowScaleBar"></a>
<div class="memitem">
<div class="memproto">
diff --git a/docs/bindings/python/html/marble/Marble.NavigationWidget.html \
b/docs/bindings/python/html/marble/Marble.NavigationWidget.html index \
bb1e9ce..5d85d13 100644
--- a/docs/bindings/python/html/marble/Marble.NavigationWidget.html
+++ b/docs/bindings/python/html/marble/Marble.NavigationWidget.html
@@ -67,8 +67,9 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<tr><td colspan="2"><br><h2>Methods</h2></td></tr>
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#NavigationWidget">__init__</a> (self, QWidget parent=0, <a \
href="http://www.riverbankcomputing.co.uk/static/Docs/PyQt4/html/qt.html">Qt::WindowFlags</a> \
f=0)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#changeZoom">changeZoom</a> (self, int zoom)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#clearSearch">clearSearch</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#resizeEvent">resizeEvent</a> (self, QResizeEvent \
a0)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#search">search</a> (self, \
QString searchTerm)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#search">search</a> (self, QString searchTerm, <a \
href="../marble/Marble.html#SearchMode">Marble.SearchMode</a> searchMode)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#selectTheme">selectTheme</a> (self, QString a0)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setMarbleWidget">setMarbleWidget</a> (self, <a \
href="../marble/Marble.MarbleWidget.html">Marble.MarbleWidget</a> widget)</td></tr> \
</table> @@ -259,6 +260,19 @@ Namespace: <a \
href="../marble/Marble.html">Marble</a><br /> the widget itself, e.g. by using the \
scroll wheel. It sets the value of the slider, but nothing more. In particular it
doesn't emit the zoomChanged signal.
+</p></div></div><a class="anchor" name="clearSearch"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> clearSearch</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"><p>Clear all previous search results
</p></div></div><a class="anchor" name="resizeEvent"></a>
<div class="memitem">
<div class="memproto">
@@ -299,7 +313,13 @@ Zoom Down buttons.
<td class="memname"></td>
<td></td>
<td class="paramtype">QString </td>
-<td class="paramname"><em>searchTerm</em></td>
+<td class="paramname"><em>searchTerm</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.html#SearchMode">Marble.SearchMode</a> </td> +<td \
class="paramname"><em>searchMode</em></td> </tr>
<tr>
<td></td>
diff --git a/docs/bindings/python/html/marble/Marble.PluginAboutDialog.html \
b/docs/bindings/python/html/marble/Marble.PluginAboutDialog.html index \
d25f6bf..e78f82b 100644
--- a/docs/bindings/python/html/marble/Marble.PluginAboutDialog.html
+++ b/docs/bindings/python/html/marble/Marble.PluginAboutDialog.html
@@ -62,10 +62,10 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setAuthors">setAuthors</a> \
(self, [<a href="../marble/Marble.PluginAuthor.html">Marble.PluginAuthor</a>] \
authors)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setAuthorsText">setAuthorsText</a> (self, QString authors)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setDataText">setDataText</a> (self, QString data)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setIcon">setIcon</a> (self, \
QIcon icon)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setLicense">setLicense</a> (self, <a \
href="../marble/Marble.PluginAboutDialog.html#LicenseKey">Marble.PluginAboutDialog.LicenseKey</a> \
license)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setLicenseAgreementText">setLicenseAgreementText</a> (self, QString \
license)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setName">setName</a> (self, QString name)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setPixmap">setPixmap</a> \
(self, QPixmap pixmap)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setVersion">setVersion</a> (self, QString version)</td></tr> </table>
<hr><h2>Method Documentation</h2><a class="anchor" name="PluginAboutDialog"></a>
@@ -185,19 +185,19 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
</div>
<div class="memdoc"><p>Sets the text displayed in the "Data" tab of the dialog.
An null QString will result into no "Data" tab at all.
-</p></div></div><a class="anchor" name="setLicense"></a>
+</p></div></div><a class="anchor" name="setIcon"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> setLicense</td>
+<td class="memname"> setIcon</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.PluginAboutDialog.html#LicenseKey">Marble.PluginAboutDialog.LicenseKey</a> </td>
-<td class="paramname"><em>license</em></td>
+<td class="paramtype">QIcon </td>
+<td class="paramname"><em>icon</em></td>
</tr>
<tr>
<td></td>
@@ -207,19 +207,19 @@ An null QString will result into no "Data" tab at all.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"><p>Sets the license for the "License Agreement" tab of the \
dialog.
-</p></div></div><a class="anchor" name="setLicenseAgreementText"></a>
+<div class="memdoc"><p>Sets the icon to be displayed at the top of the dialog.
+</p></div></div><a class="anchor" name="setLicense"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> setLicenseAgreementText</td>
+<td class="memname"> setLicense</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype">QString </td>
+<td class="paramtype"><a \
href="../marble/Marble.PluginAboutDialog.html#LicenseKey">Marble.PluginAboutDialog.LicenseKey</a> </td>
<td class="paramname"><em>license</em></td>
</tr>
<tr>
@@ -230,17 +230,12 @@ An null QString will result into no "Data" tab at all.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"><p>Sets the text displayed in the "License Agreement" tab of the \
dialog.
-A null QString will result into the default LGPLv2 license agreement.
-If your plugin is not part of the official Marble distribution, please set it
-manually to the license agreement you prefer (even if it is LGPLv2).
-<dl class="warning" compact><dt><b>Warning:</b></dt><dd> You would want to use \
setLicense instead.
-</dd></dl>
-</p></div></div><a class="anchor" name="setName"></a>
+<div class="memdoc"><p>Sets the license for the "License Agreement" tab of the \
dialog. +</p></div></div><a class="anchor" name="setLicenseAgreementText"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> setName</td>
+<td class="memname"> setLicenseAgreementText</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
@@ -248,7 +243,7 @@ manually to the license agreement you prefer (even if it is \
LGPLv2). <td class="memname"></td>
<td></td>
<td class="paramtype">QString </td>
-<td class="paramname"><em>name</em></td>
+<td class="paramname"><em>license</em></td>
</tr>
<tr>
<td></td>
@@ -258,20 +253,25 @@ manually to the license agreement you prefer (even if it is \
LGPLv2). <td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"><p>Sets the name of the plugin.
-</p></div></div><a class="anchor" name="setPixmap"></a>
+<div class="memdoc"><p>Sets the text displayed in the "License Agreement" tab of the \
dialog. +A null QString will result into the default LGPLv2 license agreement.
+If your plugin is not part of the official Marble distribution, please set it
+manually to the license agreement you prefer (even if it is LGPLv2).
+<dl class="warning" compact><dt><b>Warning:</b></dt><dd> You would want to use \
setLicense instead. +</dd></dl>
+</p></div></div><a class="anchor" name="setName"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> setPixmap</td>
+<td class="memname"> setName</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype">QPixmap </td>
-<td class="paramname"><em>pixmap</em></td>
+<td class="paramtype">QString </td>
+<td class="paramname"><em>name</em></td>
</tr>
<tr>
<td></td>
@@ -281,7 +281,7 @@ manually to the license agreement you prefer (even if it is \
LGPLv2). <td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"><p>Sets the pixmap to be displayed at the top of the dialog.
+<div class="memdoc"><p>Sets the name of the plugin.
</p></div></div><a class="anchor" name="setVersion"></a>
<div class="memitem">
<div class="memproto">
diff --git a/docs/bindings/python/html/marble/Marble.PluginInterface.html \
b/docs/bindings/python/html/marble/Marble.PluginInterface.html index 8c38d79..614f001 \
100644
--- a/docs/bindings/python/html/marble/Marble.PluginInterface.html
+++ b/docs/bindings/python/html/marble/Marble.PluginInterface.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
-Subclasses: <a href="../marble/Marble.ParseRunnerPlugin.html">Marble.ParseRunnerPlugin</a>, \
<a href="../marble/Marble.PositionProviderPluginInterface.html">Marble.PositionProviderPluginInterface</a>, \
<a href="../marble/Marble.RenderPluginInterface.html">Marble.RenderPluginInterface</a>, \
<a href="../marble/Marble.ReverseGeocodingRunnerPlugin.html">Marble.ReverseGeocodingRunnerPlugin</a>, \
<a href="../marble/Marble.RoutingRunnerPlugin.html">Marble.RoutingRunnerPlugin</a>, \
<a href="../marble/Marble.SearchRunnerPlugin.html">Marble.SearchRunnerPlugin</a><br \
/> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
<dl class="abstract" compact><dt><b>Abstract class:</b></dt>
diff --git a/docs/bindings/python/html/marble/Marble.PositionTracking.html \
b/docs/bindings/python/html/marble/Marble.PositionTracking.html index \
13016a6..8a06ca6 100644
--- a/docs/bindings/python/html/marble/Marble.PositionTracking.html
+++ b/docs/bindings/python/html/marble/Marble.PositionTracking.html
@@ -67,11 +67,13 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<tr><td class="memItemLeft" nowrap align="right" valign="top">QString </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#error">error</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#isTrackEmpty">isTrackEmpty</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top">float </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#length">length</a> (self, float \
planetRadius)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#readSettings">readSettings</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#saveTrack">saveTrack</a> (self, QString \
fileName)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setTrackVisible">setTrackVisible</a> (self, bool visible)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">float </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#speed">speed</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">QDateTime </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#timestamp">timestamp</a> (self)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">bool </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#trackVisible">trackVisible</a> (self)</td></tr> +<tr><td class="memItemLeft" \
nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#writeSettings">writeSettings</a> \
(self)</td></tr> </table>
<hr><h2>Signal Documentation</h2><a class="anchor" name="gpsLocation"></a>
<div class="memitem">
@@ -242,7 +244,19 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
</td></tr> </table></dl>
<p> <dl class="return" compact><dt><b>Returns:</b></dt><dd> Length of all track \
segments on the unit sphere scaled by planetRadius </dd></dl>
-</p></div></div><a class="anchor" name="saveTrack"></a>
+</p></div></div><a class="anchor" name="readSettings"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> readSettings</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"></div></div><a class="anchor" name="saveTrack"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
@@ -327,7 +341,19 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
</table>
</div>
<div class="memdoc"><p>provides the visibility of the Position Tracking document
-</p></div></div>
+</p></div></div><a class="anchor" name="writeSettings"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> writeSettings</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"></div></div>
</div>
</div>
</div>
diff --git a/docs/bindings/python/html/marble/Marble.RenderPlugin.html \
b/docs/bindings/python/html/marble/Marble.RenderPlugin.html index 226f51c..44ae2e2 \
100644
--- a/docs/bindings/python/html/marble/Marble.RenderPlugin.html
+++ b/docs/bindings/python/html/marble/Marble.RenderPlugin.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: QObject,<a \
href="../marble/Marble.RenderPluginInterface.html">Marble.RenderPluginInterface</a> \
→ <a href="../marble/Marble.PluginInterface.html">Marble.PluginInterface</a><br \
/>
-Subclasses: <a href="../marble/Marble.AbstractDataPlugin.html">Marble.AbstractDataPlugin</a>, \
<a href="../marble/Marble.AbstractFloatItem.html">Marble.AbstractFloatItem</a><br /> \
+ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
<dl class="abstract" compact><dt><b>Abstract class:</b></dt>
@@ -79,9 +79,13 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.RenderPlugin.html#RenderType">Marble.RenderPlugin.RenderType</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#renderType">renderType</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#restoreDefaultSettings">restoreDefaultSettings</a> (self)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#retrieveItemState">retrieveItemState</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top">QString </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#runtimeTrace">runtimeTrace</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setEnabled">setEnabled</a> (self, bool \
enabled)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setSetting">setSetting</a> (self, QString key, QVariant value)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setSettings">setSettings</a> (self, {QString:QVariant} settings)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setVisible">setVisible</a> \
(self, bool visible)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top">QVariant </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#setting">setting</a> (self, QString key)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top">QStringList </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#settingKeys">settingKeys</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top">{QString:QVariant} </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#settings">settings</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">[QActionGroup] </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#toolbarActionGroups">toolbarActionGroups</a> (self)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#visible">visible</a> \
(self)</td></tr> @@ -389,6 +393,18 @@ This affects where in the menu tree the \
action() is placed. </tr>
</table>
</div>
+<div class="memdoc"></div></div><a class="anchor" name="runtimeTrace"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">QString runtimeTrace</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
<div class="memdoc"></div></div><a class="anchor" name="setEnabled"></a>
<div class="memitem">
<div class="memproto">
@@ -411,6 +427,34 @@ This affects where in the menu tree the action() is placed.
<td width="100%"> </td>
</tr></table>
</div>
+<div class="memdoc"></div></div><a class="anchor" name="setSetting"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">bool setSetting</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">QString </td>
+<td class="paramname"><em>key</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">QVariant </td>
+<td class="paramname"><em>value</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
<div class="memdoc"></div></div><a class="anchor" name="setSettings"></a>
<div class="memitem">
<div class="memproto">
@@ -456,6 +500,40 @@ This affects where in the menu tree the action() is placed.
<td width="100%"> </td>
</tr></table>
</div>
+<div class="memdoc"></div></div><a class="anchor" name="setting"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">QVariant setting</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">QString </td>
+<td class="paramname"><em>key</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"></div></div><a class="anchor" name="settingKeys"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">QStringList settingKeys</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
<div class="memdoc"></div></div><a class="anchor" name="settings"></a>
<div class="memitem">
<div class="memproto">
diff --git a/docs/bindings/python/html/marble/Marble.RenderPluginInterface.html \
b/docs/bindings/python/html/marble/Marble.RenderPluginInterface.html index \
a917d69..a9e088c 100644
--- a/docs/bindings/python/html/marble/Marble.RenderPluginInterface.html
+++ b/docs/bindings/python/html/marble/Marble.RenderPluginInterface.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: <a href="../marble/Marble.PluginInterface.html">Marble.PluginInterface</a><br \
/>
-Subclasses: <a href="../marble/Marble.RenderPlugin.html">Marble.RenderPlugin</a><br \
/> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
<dl class="abstract" compact><dt><b>Abstract class:</b></dt>
diff --git a/docs/bindings/python/html/marble/Marble.RoutingModel.html \
b/docs/bindings/python/html/marble/Marble.RoutingModel.html index cdca747..85440ef \
100644
--- a/docs/bindings/python/html/marble/Marble.RoutingModel.html
+++ b/docs/bindings/python/html/marble/Marble.RoutingModel.html
@@ -67,7 +67,7 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#deviatedFromRoute">deviatedFromRoute</a> (self)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#exportGpx">exportGpx</a> \
(self, QIODevice device)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">QVariant </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#headerData">headerData</a> (self, int section, <a \
href="http://www.riverbankcomputing.co.uk/static/Docs/PyQt4/html/qt.html">Qt::Orientation</a> \
orientation, int role=Qt.DisplayRole)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#rightNeighbor">rightNeighbor</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> \
position, <a href="../marble/Marble.RouteRequest.html">Marble.RouteRequest</a> \
route)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#rightNeighbor">rightNeighbor</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> \
position, RouteRequestconst route)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"><a \
href="../marble/Marble.Route.html">Marble.Route</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#route">route</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#rowCount">rowCount</a> (self, QModelIndex parent=QModelIndex())</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setCurrentRoute">setCurrentRoute</a> (self, <a \
href="../marble/Marble.GeoDataDocument.html">Marble.GeoDataDocument</a> \
document)</td></tr> @@ -282,7 +282,7 @@ Namespace: <a \
href="../marble/Marble.html">Marble</a><br /> <tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.RouteRequest.html">Marble.RouteRequest</a> </td> +<td \
class="paramtype">RouteRequestconst </td> <td \
class="paramname"><em>route</em></td> </tr>
<tr>
diff --git a/docs/bindings/python/html/marble/Marble.ScreenGraphicsItem.html \
b/docs/bindings/python/html/marble/Marble.ScreenGraphicsItem.html index \
2fd74ca..f7464f9 100644
--- a/docs/bindings/python/html/marble/Marble.ScreenGraphicsItem.html
+++ b/docs/bindings/python/html/marble/Marble.ScreenGraphicsItem.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: <a href="../marble/Marble.MarbleGraphicsItem.html">Marble.MarbleGraphicsItem</a><br \
/>
-Subclasses: <a href="../marble/Marble.FrameGraphicsItem.html">Marble.FrameGraphicsItem</a>, \
<a href="../marble/Marble.WidgetGraphicsItem.html">Marble.WidgetGraphicsItem</a><br \
/> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
@@ -59,7 +59,6 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<tr><td colspan="2"><br><h2>Methods</h2></td></tr>
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#ScreenGraphicsItem">__init__</a> (self, <a \
href="../marble/Marble.MarbleGraphicsItem.html">Marble.MarbleGraphicsItem</a> \
parent=0)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">[QPointF] </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#absolutePositions">absolutePositions</a> \
(self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#changeViewport">changeViewport</a> (self, <a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> \
viewport)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#eventFilter">eventFilter</a> (self, QObject a0, QEvent a1)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.ScreenGraphicsItem.html">Marble.ScreenGraphicsItem.GraphicsItemFlags</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#flags">flags</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">QPointF </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#position">position</a> (self)</td></tr> @@ -109,29 +108,7 @@ All coordinates \
are counted positive and depend on the current viewport. <p>
Positive x-coordinates are counted left-aligned from the left border of the map.
Positive y-coordinates are counted top-aligned from the top border of the map.
-</p></div></div><a class="anchor" name="changeViewport"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname"> changeViewport</td>
-<td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> </td>
-<td class="paramname"><em>viewport</em></td>
-</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
-<td width="100%"> </td>
-</tr></table>
-</div>
-<div class="memdoc"></div></div><a class="anchor" name="eventFilter"></a>
+</p></div></div><a class="anchor" name="eventFilter"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
diff --git a/docs/bindings/python/html/marble/Marble.Serializable.html \
b/docs/bindings/python/html/marble/Marble.Serializable.html index 4203d67..6c0f3cd \
100644
--- a/docs/bindings/python/html/marble/Marble.Serializable.html
+++ b/docs/bindings/python/html/marble/Marble.Serializable.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
-Subclasses: <a href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a><br \
/> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.ViewportParams.html \
b/docs/bindings/python/html/marble/Marble.ViewportParams.html index 24a0b56..6da00e7 \
100644
--- a/docs/bindings/python/html/marble/Marble.ViewportParams.html
+++ b/docs/bindings/python/html/marble/Marble.ViewportParams.html
@@ -65,7 +65,6 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#centerOn">centerOn</a> \
(self, float lon, float lat)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#focusPoint">focusPoint</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#geoCoordinates">geoCoordinates</a> (self, int x, int y, float lon, float lat, \
<a href="../marble/Marble.GeoDataCoordinates.html#Unit">Marble.GeoDataCoordinates.Unit</a> \
unit=Marble.GeoDataCoordinates.Degree)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#globeCoversViewport">globeCoversViewport</a> (self)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">int </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#height">height</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#latLonAltBox">latLonAltBox</a> (self, QRect screenRect)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">bool </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#mapCoversViewport">mapCoversViewport</a> (self)</td></tr> @@ -297,19 +296,7 @@ \
center point. </td></tr> </table></dl>
<p> <dl class="return" compact><dt><b>Returns:</b></dt><dd> true if the pixel (x, y) \
is within the globe </dd></dl> false if the pixel (x, y) is outside the globe, i.e. \
in space.
-</p></div></div><a class="anchor" name="globeCoversViewport"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname">bool globeCoversViewport</td>
-<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
-<td width="100%"> </td>
-</tr>
-</table>
-</div>
-<div class="memdoc"></div></div><a class="anchor" name="height"></a>
+</p></div></div><a class="anchor" name="height"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
diff --git a/docs/bindings/python/html/marble/Marble.WidgetGraphicsItem.html \
b/docs/bindings/python/html/marble/Marble.WidgetGraphicsItem.html index \
3f521d7..68a30eb 100644
--- a/docs/bindings/python/html/marble/Marble.WidgetGraphicsItem.html
+++ b/docs/bindings/python/html/marble/Marble.WidgetGraphicsItem.html
@@ -57,7 +57,7 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<table border="0" cellpadding="0" cellspacing="0"><tr><td \
colspan="2"><br><h2>Methods</h2></td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#WidgetGraphicsItem">__init__</a> (self, <a \
href="../marble/Marble.MarbleGraphicsItem.html">Marble.MarbleGraphicsItem</a> \
parent=0)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#eventFilter">eventFilter</a> (self, QObject a0, QEvent \
a1)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#paint">paint</a> (self, <a \
href="../marble/Marble.GeoPainter.html">Marble.GeoPainter</a> painter, <a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> viewport, \
QString renderPos, <a \
href="../marble/Marble.GeoSceneLayer.html">Marble.GeoSceneLayer</a> \
layer=0)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#paint">paint</a> (self, QPainter painter)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setWidget">setWidget</a> \
(self, QWidget widget)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">QWidget </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#widget">widget</a> (self)</td></tr> </table>
@@ -122,26 +122,8 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoPainter.html">Marble.GeoPainter</a> </td>
-<td class="paramname"><em>painter</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> </td>
-<td class="paramname"><em>viewport</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">QString </td>
-<td class="paramname"><em>renderPos</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoSceneLayer.html">Marble.GeoSceneLayer</a> </td>
-<td class="paramname"><em>layer=0</em></td>
+<td class="paramtype">QPainter </td>
+<td class="paramname"><em>painter</em></td>
</tr>
<tr>
<td></td>
diff --git a/docs/bindings/python/html/marble/Marble.html \
b/docs/bindings/python/html/marble/Marble.html index 2ee654a..929338c 100644
--- a/docs/bindings/python/html/marble/Marble.html
+++ b/docs/bindings/python/html/marble/Marble.html
@@ -56,17 +56,18 @@ last.
</p>
<h2>Class Index</h2>
<table width="95%" align="center" border="0" cellpadding="0" cellspacing="0">
-<tbody><tr><td><a name="letter_A"> A </a></td><td><a \
class="el" href="Marble.GeoDataLod.html">GeoDataLod</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleNavigator.html">MarbleNavigator</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" \
href="Marble.AbstractDataPlugin.html">AbstractDataPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataLookAt.html">GeoDataLookAt</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleRunnerManager.html">MarbleRunnerManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" \
href="Marble.AbstractDataPluginItem.html">AbstractDataPluginItem</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataMultiGeometry.html">GeoDataMultiGeometry</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleWidget.html">MarbleWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" \
href="Marble.AbstractDataPluginModel.html">AbstractDataPluginModel</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataObject.html">GeoDataObject</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_N"> N </a></td></tr>
-<tr><td><a class="el" \
href="Marble.AbstractFloatItem.html">AbstractFloatItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataOuterBoundary.html">GeoDataOuterBoundary</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.NavigationWidget.html">NavigationWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" \
href="Marble.AbstractMarbleGraphicsLayout.html">AbstractMarbleGraphicsLayout</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataOverlay.html">GeoDataOverlay</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_P"> P </a></td></tr>
-<tr><td><a class="el" \
href="Marble.AbstractProjection.html">AbstractProjection</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPlacemark.html">GeoDataPlacemark</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.ParseRunnerPlugin.html">ParseRunnerPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" \
href="Marble.AbstractWorkerThread.html">AbstractWorkerThread</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPoint.html">GeoDataPoint</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Planet.html">Planet</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" \
href="Marble.AlternativeRoutesModel.html">AlternativeRoutesModel</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPolygon.html">GeoDataPolygon</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginAboutDialog.html">PluginAboutDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.AutoNavigation.html">AutoNavigation</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPolyStyle.html">GeoDataPolyStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginAuthor.html">PluginAuthor</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a name="letter_B"> B </a></td><td><a class="el" \
href="Marble.GeoDataRegion.html">GeoDataRegion</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginInterface.html">PluginInterface</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tbody><tr><td><a \
name="letter_A"> A </a></td><td><a class="el" \
href="Marble.GeoDataLineStyle.html">GeoDataLineStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleModel.html">MarbleModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractDataPlugin.html">AbstractDataPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataLod.html">GeoDataLod</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleNavigator.html">MarbleNavigator</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractDataPluginItem.html">AbstractDataPluginItem</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataLookAt.html">GeoDataLookAt</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleRunnerManager.html">MarbleRunnerManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractDataPluginModel.html">AbstractDataPluginModel</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataMultiGeometry.html">GeoDataMultiGeometry</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleWidget.html">MarbleWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractFloatItem.html">AbstractFloatItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataObject.html">GeoDataObject</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_N"> N </a></td></tr> +<tr><td><a class="el" \
href="Marble.AbstractMarbleGraphicsLayout.html">AbstractMarbleGraphicsLayout</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataOuterBoundary.html">GeoDataOuterBoundary</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.NavigationWidget.html">NavigationWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractProjection.html">AbstractProjection</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataOverlay.html">GeoDataOverlay</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_P"> P </a></td></tr> +<tr><td><a class="el" \
href="Marble.AbstractWorkerThread.html">AbstractWorkerThread</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPlacemark.html">GeoDataPlacemark</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.ParseRunnerPlugin.html">ParseRunnerPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AlternativeRoutesModel.html">AlternativeRoutesModel</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPoint.html">GeoDataPoint</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Planet.html">Planet</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AutoNavigation.html">AutoNavigation</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPolygon.html">GeoDataPolygon</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginAboutDialog.html">PluginAboutDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a \
name="letter_B"> B </a></td><td><a class="el" \
href="Marble.GeoDataPolyStyle.html">GeoDataPolyStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginAuthor.html">PluginAuthor</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.BillboardGraphicsItem.html">BillboardGraphicsItem</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataRegion.html">GeoDataRegion</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginInterface.html">PluginInterface</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> <tr><td><a class="el" \
href="Marble.BookmarkManager.html">BookmarkManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataStyle.html">GeoDataStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PositionProviderPluginInterface.html">PositionProviderPluginInterface</a> (<a \
class="el" href="Marble.html">Marble</a>) </td></tr> <tr><td><a \
name="letter_C"> C </a></td><td><a class="el" \
href="Marble.GeoDataStyleMap.html">GeoDataStyleMap</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PositionTracking.html">PositionTracking</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> <tr><td><a class="el" \
href="Marble.ClipPainter.html">ClipPainter</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataStyleSelector.html">GeoDataStyleSelector</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_Q"> Q </a></td></tr> @@ -98,11 +99,10 @@ last.
<tr><td><a class="el" \
href="Marble.GeoDataLatLonBox.html">GeoDataLatLonBox</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleGraphicsGridLayout.html">MarbleGraphicsGridLayout</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.ViewportParams.html">ViewportParams</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> <tr><td><a class="el" \
href="Marble.GeoDataLinearRing.html">GeoDataLinearRing</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleGraphicsItem.html">MarbleGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_W"> W </a></td></tr> <tr><td><a class="el" \
href="Marble.GeoDataLineString.html">GeoDataLineString</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleMap.html">MarbleMap</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.WidgetGraphicsItem.html">WidgetGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" \
href="Marble.GeoDataLineStyle.html">GeoDataLineStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleModel.html">MarbleModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td></td></tr> </table>
<table border="0" cellpadding="0" cellspacing="0"><tr><td \
colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#obj228929324"><anonymous></a> </td><td class="memItemRight" \
valign="bottom">{ Q_X, Q_Y, Q_Z, Q_W }</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#obj228962508"><anonymous></a> </td><td class="memItemRight" \
valign="bottom">{ Q_X, Q_Y, Q_Z, Q_W }</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#obj258331792"><anonymous></a> </td><td class="memItemRight" \
valign="bottom">{ Q_X, Q_Y, Q_Z, Q_W }</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#obj258350416"><anonymous></a> </td><td class="memItemRight" \
valign="bottom">{ Q_X, Q_Y, Q_Z, Q_W }</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#AltitudeMode">AltitudeMode</a> </td><td class="memItemRight" \
valign="bottom">{ ClampToGround, RelativeToGround, Absolute }</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#AngleUnit">AngleUnit</a> </td><td class="memItemRight" \
valign="bottom">{ DMSDegree, DecimalDegree, UTM }</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#Dimension">Dimension</a> </td><td class="memItemRight" \
valign="bottom">{ Latitude, Longitude }</td></tr> @@ -110,7 +110,7 @@ last.
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#DownloadUsage">DownloadUsage</a> </td><td class="memItemRight" \
valign="bottom">{ DownloadBulk, DownloadBrowse }</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#DragLocation">DragLocation</a> </td><td class="memItemRight" \
valign="bottom">{ KeepAxisVertically, FollowMousePointer }</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#EnumFeatureId">EnumFeatureId</a> </td><td class="memItemRight" \
valign="bottom">{ InvalidFeatureId, GeoDataDocumentId, GeoDataFolderId, \
GeoDataPlacemarkId, GeoDataNetworkLinkId, GeoDataScreenOverlayId, \
GeoDataGroundOverlayId }</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#EnumGeometryId">EnumGeometryId</a> </td><td class="memItemRight" \
valign="bottom">{ InvalidGeometryId, GeoDataPointId, GeoDataLineStringId, \
GeoDataLinearRingId, GeoDataPolygonId, GeoDataMultiGeometryId, GeoDataModelId, \
GeoDataTrackId }</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"><a class="el" href="#EnumGeometryId">EnumGeometryId</a> </td><td \
class="memItemRight" valign="bottom">{ InvalidGeometryId, GeoDataPointId, \
GeoDataLineStringId, GeoDataLinearRingId, GeoDataPolygonId, GeoDataMultiGeometryId, \
GeoDataMultiTrackId, GeoDataModelId, GeoDataTrackId }</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#FlyToMode">FlyToMode</a> </td><td class="memItemRight" \
valign="bottom">{ Automatic, Instant, Linear, Jump }</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#GraphicsSystem">GraphicsSystem</a> </td><td class="memItemRight" \
valign="bottom">{ NativeGraphics, RasterGraphics, \
OpenGLGraphics }</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"><a class="el" \
href="#LabelLocalization">LabelLocalization</a> </td><td class="memItemRight" \
valign="bottom">{ CustomAndNative, Custom, Native }</td></tr> @@ -121,13 \
+121,14 @@ last. <tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
class="el" href="#PositionProviderStatus">PositionProviderStatus</a> </td><td \
class="memItemRight" valign="bottom">{ PositionProviderStatusError, \
PositionProviderStatusUnavailable, PositionProviderStatusAcquiring, \
PositionProviderStatusAvailable }</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"><a class="el" \
href="#Projection">Projection</a> </td><td class="memItemRight" \
valign="bottom">{ Spherical, Equirectangular, Mercator }</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#ProxyType">ProxyType</a> </td><td class="memItemRight" \
valign="bottom">{ HttpProxy, Socks5Proxy }</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#SearchMode">SearchMode</a> </td><td class="memItemRight" \
valign="bottom">{ GlobalSearch, AreaSearch }</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#TessellationFlag">TessellationFlag</a> </td><td class="memItemRight" \
valign="bottom">{ NoTessellation, Tessellate, RespectLatitudeCircle, \
FollowGround, RotationIndicatesFill, SkipLatLonNormalization }</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#ViewContext">ViewContext</a> </td><td class="memItemRight" \
valign="bottom">{ Still, Animation }</td></tr> <tr><td \
colspan="2"><br><h2>Functions</h2></td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top">bool </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#operator ==">operator ==</a> (<a \
href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> lhs, \
<a href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> \
rhs)</td></tr> <tr><td colspan="2"><br><h2>Attributes</h2></td></tr>
<tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#varlatLonAltBoxSamplingRate">latLonAltBoxSamplingRate</a></td></tr><tr><td \
class="memItemLeft" nowrap align="right" valign="top">int </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#vartessellationPrecision">tessellationPrecision</a></td></tr></table>
-<hr><h2>Enumeration Documentation</h2><a class="anchor" name="obj228929324"></a>
+<hr><h2>Enumeration Documentation</h2><a class="anchor" name="obj258331792"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
@@ -138,7 +139,7 @@ last.
<div class="memdoc"><dl compact><dt><b>Enumerator: </b></dt><dd>
<table border="0" cellspacing="2" cellpadding="0"><tr><td \
valign="top"><em>Q_X</em> </td><td><tr><td \
valign="top"><em>Q_Y</em> </td><td><tr><td \
valign="top"><em>Q_Z</em> </td><td><tr><td \
valign="top"><em>Q_W</em> </td><td></table> </dl>
-</div></div><p><a class="anchor" name="obj228962508"></a>
+</div></div><p><a class="anchor" name="obj258350416"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
@@ -239,7 +240,7 @@ last.
</table>
</div>
<div class="memdoc"><dl compact><dt><b>Enumerator: </b></dt><dd>
-<table border="0" cellspacing="2" cellpadding="0"><tr><td \
valign="top"><em>InvalidGeometryId</em> = -1</td><td><tr><td \
valign="top"><em>GeoDataPointId</em> = 1</td><td><tr><td \
valign="top"><em>GeoDataLineStringId</em> </td><td><tr><td \
valign="top"><em>GeoDataLinearRingId</em> </td><td><tr><td \
valign="top"><em>GeoDataPolygonId</em> </td><td><tr><td \
valign="top"><em>GeoDataMultiGeometryId</em> </td><td><tr><td \
valign="top"><em>GeoDataModelId</em> </td><td><tr><td \
valign="top"><em>GeoDataTrackId</em> </td><td></table> +<table border="0" \
cellspacing="2" cellpadding="0"><tr><td \
valign="top"><em>InvalidGeometryId</em> = -1</td><td><tr><td \
valign="top"><em>GeoDataPointId</em> = 1</td><td><tr><td \
valign="top"><em>GeoDataLineStringId</em> </td><td><tr><td \
valign="top"><em>GeoDataLinearRingId</em> </td><td><tr><td \
valign="top"><em>GeoDataPolygonId</em> </td><td><tr><td \
valign="top"><em>GeoDataMultiGeometryId</em> </td><td><tr><td \
valign="top"><em>GeoDataMultiTrackId</em> </td><td><tr><td \
valign="top"><em>GeoDataModelId</em> </td><td><tr><td \
valign="top"><em>GeoDataTrackId</em> </td><td></table> </dl>
</div></div><p><a class="anchor" name="FlyToMode"></a>
<div class="memitem">
@@ -360,6 +361,18 @@ and target camera positions)
</p><dl compact><dt><b>Enumerator: </b></dt><dd>
<table border="0" cellspacing="2" cellpadding="0"><tr><td \
valign="top"><em>HttpProxy</em> </td><td><tr><td \
valign="top"><em>Socks5Proxy</em> </td><td></table> </dl>
+</div></div><p><a class="anchor" name="SearchMode"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname">
+<tr><td class="memname">SearchMode</td>
+</tr>
+</table>
+</div>
+<div class="memdoc"><p>Search mode: Global (worldwide) versus area (local, regional) \
search +</p><dl compact><dt><b>Enumerator: </b></dt><dd>
+<table border="0" cellspacing="2" cellpadding="0"><tr><td \
valign="top"><em>GlobalSearch</em> </td><td><tr><td \
valign="top"><em>AreaSearch</em> </td><td></table> +</dl>
</div></div><p><a class="anchor" name="TessellationFlag"></a>
<div class="memitem">
<div class="memproto">
diff --git a/docs/bindings/python/html/marble/global.html \
b/docs/bindings/python/html/marble/global.html index 599b3af..afb1dba 100644
--- a/docs/bindings/python/html/marble/global.html
+++ b/docs/bindings/python/html/marble/global.html
@@ -52,17 +52,18 @@
<h2>Class Index</h2>
<table width="95%" align="center" border="0" cellpadding="0" cellspacing="0">
-<tbody><tr><td><a name="letter_A"> A </a></td><td><a \
class="el" href="Marble.GeoDataLod.html">GeoDataLod</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleNavigator.html">MarbleNavigator</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" \
href="Marble.AbstractDataPlugin.html">AbstractDataPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataLookAt.html">GeoDataLookAt</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleRunnerManager.html">MarbleRunnerManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" \
href="Marble.AbstractDataPluginItem.html">AbstractDataPluginItem</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataMultiGeometry.html">GeoDataMultiGeometry</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleWidget.html">MarbleWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" \
href="Marble.AbstractDataPluginModel.html">AbstractDataPluginModel</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataObject.html">GeoDataObject</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_N"> N </a></td></tr>
-<tr><td><a class="el" \
href="Marble.AbstractFloatItem.html">AbstractFloatItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataOuterBoundary.html">GeoDataOuterBoundary</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.NavigationWidget.html">NavigationWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" \
href="Marble.AbstractMarbleGraphicsLayout.html">AbstractMarbleGraphicsLayout</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataOverlay.html">GeoDataOverlay</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_P"> P </a></td></tr>
-<tr><td><a class="el" \
href="Marble.AbstractProjection.html">AbstractProjection</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPlacemark.html">GeoDataPlacemark</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.ParseRunnerPlugin.html">ParseRunnerPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" \
href="Marble.AbstractWorkerThread.html">AbstractWorkerThread</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPoint.html">GeoDataPoint</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Planet.html">Planet</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" \
href="Marble.AlternativeRoutesModel.html">AlternativeRoutesModel</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPolygon.html">GeoDataPolygon</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginAboutDialog.html">PluginAboutDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.AutoNavigation.html">AutoNavigation</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPolyStyle.html">GeoDataPolyStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginAuthor.html">PluginAuthor</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a name="letter_B"> B </a></td><td><a class="el" \
href="Marble.GeoDataRegion.html">GeoDataRegion</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginInterface.html">PluginInterface</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tbody><tr><td><a \
name="letter_A"> A </a></td><td><a class="el" \
href="Marble.GeoDataLineStyle.html">GeoDataLineStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleModel.html">MarbleModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractDataPlugin.html">AbstractDataPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataLod.html">GeoDataLod</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleNavigator.html">MarbleNavigator</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractDataPluginItem.html">AbstractDataPluginItem</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataLookAt.html">GeoDataLookAt</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleRunnerManager.html">MarbleRunnerManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractDataPluginModel.html">AbstractDataPluginModel</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataMultiGeometry.html">GeoDataMultiGeometry</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleWidget.html">MarbleWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractFloatItem.html">AbstractFloatItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataObject.html">GeoDataObject</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_N"> N </a></td></tr> +<tr><td><a class="el" \
href="Marble.AbstractMarbleGraphicsLayout.html">AbstractMarbleGraphicsLayout</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataOuterBoundary.html">GeoDataOuterBoundary</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.NavigationWidget.html">NavigationWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractProjection.html">AbstractProjection</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataOverlay.html">GeoDataOverlay</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_P"> P </a></td></tr> +<tr><td><a class="el" \
href="Marble.AbstractWorkerThread.html">AbstractWorkerThread</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPlacemark.html">GeoDataPlacemark</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.ParseRunnerPlugin.html">ParseRunnerPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AlternativeRoutesModel.html">AlternativeRoutesModel</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPoint.html">GeoDataPoint</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Planet.html">Planet</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AutoNavigation.html">AutoNavigation</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPolygon.html">GeoDataPolygon</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginAboutDialog.html">PluginAboutDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a \
name="letter_B"> B </a></td><td><a class="el" \
href="Marble.GeoDataPolyStyle.html">GeoDataPolyStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginAuthor.html">PluginAuthor</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.BillboardGraphicsItem.html">BillboardGraphicsItem</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataRegion.html">GeoDataRegion</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginInterface.html">PluginInterface</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> <tr><td><a class="el" \
href="Marble.BookmarkManager.html">BookmarkManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataStyle.html">GeoDataStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PositionProviderPluginInterface.html">PositionProviderPluginInterface</a> (<a \
class="el" href="Marble.html">Marble</a>) </td></tr> <tr><td><a \
name="letter_C"> C </a></td><td><a class="el" \
href="Marble.GeoDataStyleMap.html">GeoDataStyleMap</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PositionTracking.html">PositionTracking</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> <tr><td><a class="el" \
href="Marble.ClipPainter.html">ClipPainter</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataStyleSelector.html">GeoDataStyleSelector</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_Q"> Q </a></td></tr> @@ -94,7 +95,6 @@
<tr><td><a class="el" \
href="Marble.GeoDataLatLonBox.html">GeoDataLatLonBox</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleGraphicsGridLayout.html">MarbleGraphicsGridLayout</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.ViewportParams.html">ViewportParams</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> <tr><td><a class="el" \
href="Marble.GeoDataLinearRing.html">GeoDataLinearRing</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleGraphicsItem.html">MarbleGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_W"> W </a></td></tr> <tr><td><a class="el" \
href="Marble.GeoDataLineString.html">GeoDataLineString</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleMap.html">MarbleMap</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.WidgetGraphicsItem.html">WidgetGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" \
href="Marble.GeoDataLineStyle.html">GeoDataLineStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleModel.html">MarbleModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td></td></tr> </table>
<table border="0" cellpadding="0" cellspacing="0"></table>
diff --git a/docs/bindings/python/html/marble/index.html \
b/docs/bindings/python/html/marble/index.html index becd807..a7b6adf 100644
--- a/docs/bindings/python/html/marble/index.html
+++ b/docs/bindings/python/html/marble/index.html
@@ -118,17 +118,18 @@ online at <a \
href="http://techbase.kde.org/Projects/Marble/MarbleCPlusPlus">KDE </table>
<h2>Class Index</h2>
<table width="95%" align="center" border="0" cellpadding="0" cellspacing="0">
-<tbody><tr><td><a name="letter_A"> A </a></td><td><a \
class="el" href="Marble.GeoDataLod.html">GeoDataLod</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleNavigator.html">MarbleNavigator</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" \
href="Marble.AbstractDataPlugin.html">AbstractDataPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataLookAt.html">GeoDataLookAt</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleRunnerManager.html">MarbleRunnerManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" \
href="Marble.AbstractDataPluginItem.html">AbstractDataPluginItem</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataMultiGeometry.html">GeoDataMultiGeometry</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleWidget.html">MarbleWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" \
href="Marble.AbstractDataPluginModel.html">AbstractDataPluginModel</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataObject.html">GeoDataObject</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_N"> N </a></td></tr>
-<tr><td><a class="el" \
href="Marble.AbstractFloatItem.html">AbstractFloatItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataOuterBoundary.html">GeoDataOuterBoundary</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.NavigationWidget.html">NavigationWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" \
href="Marble.AbstractMarbleGraphicsLayout.html">AbstractMarbleGraphicsLayout</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataOverlay.html">GeoDataOverlay</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_P"> P </a></td></tr>
-<tr><td><a class="el" \
href="Marble.AbstractProjection.html">AbstractProjection</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPlacemark.html">GeoDataPlacemark</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.ParseRunnerPlugin.html">ParseRunnerPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" \
href="Marble.AbstractWorkerThread.html">AbstractWorkerThread</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPoint.html">GeoDataPoint</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Planet.html">Planet</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" \
href="Marble.AlternativeRoutesModel.html">AlternativeRoutesModel</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPolygon.html">GeoDataPolygon</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginAboutDialog.html">PluginAboutDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.AutoNavigation.html">AutoNavigation</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPolyStyle.html">GeoDataPolyStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginAuthor.html">PluginAuthor</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a name="letter_B"> B </a></td><td><a class="el" \
href="Marble.GeoDataRegion.html">GeoDataRegion</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginInterface.html">PluginInterface</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tbody><tr><td><a \
name="letter_A"> A </a></td><td><a class="el" \
href="Marble.GeoDataLineStyle.html">GeoDataLineStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleModel.html">MarbleModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractDataPlugin.html">AbstractDataPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataLod.html">GeoDataLod</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleNavigator.html">MarbleNavigator</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractDataPluginItem.html">AbstractDataPluginItem</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataLookAt.html">GeoDataLookAt</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleRunnerManager.html">MarbleRunnerManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractDataPluginModel.html">AbstractDataPluginModel</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataMultiGeometry.html">GeoDataMultiGeometry</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleWidget.html">MarbleWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractFloatItem.html">AbstractFloatItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataObject.html">GeoDataObject</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_N"> N </a></td></tr> +<tr><td><a class="el" \
href="Marble.AbstractMarbleGraphicsLayout.html">AbstractMarbleGraphicsLayout</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataOuterBoundary.html">GeoDataOuterBoundary</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.NavigationWidget.html">NavigationWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractProjection.html">AbstractProjection</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataOverlay.html">GeoDataOverlay</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_P"> P </a></td></tr> +<tr><td><a class="el" \
href="Marble.AbstractWorkerThread.html">AbstractWorkerThread</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPlacemark.html">GeoDataPlacemark</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.ParseRunnerPlugin.html">ParseRunnerPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AlternativeRoutesModel.html">AlternativeRoutesModel</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPoint.html">GeoDataPoint</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Planet.html">Planet</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AutoNavigation.html">AutoNavigation</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPolygon.html">GeoDataPolygon</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginAboutDialog.html">PluginAboutDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a \
name="letter_B"> B </a></td><td><a class="el" \
href="Marble.GeoDataPolyStyle.html">GeoDataPolyStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginAuthor.html">PluginAuthor</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.BillboardGraphicsItem.html">BillboardGraphicsItem</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataRegion.html">GeoDataRegion</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginInterface.html">PluginInterface</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> <tr><td><a class="el" \
href="Marble.BookmarkManager.html">BookmarkManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataStyle.html">GeoDataStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PositionProviderPluginInterface.html">PositionProviderPluginInterface</a> (<a \
class="el" href="Marble.html">Marble</a>) </td></tr> <tr><td><a \
name="letter_C"> C </a></td><td><a class="el" \
href="Marble.GeoDataStyleMap.html">GeoDataStyleMap</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PositionTracking.html">PositionTracking</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> <tr><td><a class="el" \
href="Marble.ClipPainter.html">ClipPainter</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataStyleSelector.html">GeoDataStyleSelector</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_Q"> Q </a></td></tr> @@ -160,7 +161,6 @@ online at \
<a href="http://techbase.kde.org/Projects/Marble/MarbleCPlusPlus">KDE <tr><td><a \
class="el" href="Marble.GeoDataLatLonBox.html">GeoDataLatLonBox</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleGraphicsGridLayout.html">MarbleGraphicsGridLayout</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.ViewportParams.html">ViewportParams</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> <tr><td><a class="el" \
href="Marble.GeoDataLinearRing.html">GeoDataLinearRing</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleGraphicsItem.html">MarbleGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_W"> W </a></td></tr> <tr><td><a class="el" \
href="Marble.GeoDataLineString.html">GeoDataLineString</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleMap.html">MarbleMap</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.WidgetGraphicsItem.html">WidgetGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" \
href="Marble.GeoDataLineStyle.html">GeoDataLineStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleModel.html">MarbleModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td></td></tr> </table>
</div>
diff --git a/src/bindings/python/sip/AbstractDataPlugin.sip \
b/src/bindings/python/sip/AbstractDataPlugin.sip index 8e84a8d..92d1044 100644
--- a/src/bindings/python/sip/AbstractDataPlugin.sip
+++ b/src/bindings/python/sip/AbstractDataPlugin.sip
@@ -44,6 +44,15 @@ public:
//ig PluginManager* pluginManager () const;
virtual Marble::RenderPlugin::RenderType renderType () const;
AbstractDataPlugin (const Marble::MarbleModel* \
marbleModel); + bool isInitialized () const;
+ void setDelegate (QDeclarativeComponent* delegate, \
QGraphicsItem* parent); + void setFavoriteItemsOnly (bool \
favoriteOnly); + bool isFavoriteItemsOnly () const;
+ QObject* favoritesModel ();
+ void handleViewportChange (Marble::ViewportParams* viewport);
+signals:
+ void favoriteItemsOnlyChanged ();
+ void favoritesModelChanged ();
};
// AbstractDataPlugin
diff --git a/src/bindings/python/sip/AbstractDataPluginItem.sip \
b/src/bindings/python/sip/AbstractDataPluginItem.sip index b08e25a..dc61a7a 100644
--- a/src/bindings/python/sip/AbstractDataPluginItem.sip
+++ b/src/bindings/python/sip/AbstractDataPluginItem.sip
@@ -191,7 +191,6 @@ public:
%End
virtual ~AbstractDataPluginItem ();
- virtual bool isGeoProjected ();
signals:
void updated ();
public:
@@ -203,6 +202,13 @@ signals:
void favoriteChanged (const QString& id, bool favorite);
public:
void toggleFavorite ();
+ QString toolTip () const;
+ void setToolTip (const QString& toolTip);
+ bool isSticky () const;
+ void setSticky (bool sticky);
+signals:
+ void idChanged ();
+ void stickyChanged ();
};
// AbstractDataPluginItem
diff --git a/src/bindings/python/sip/AbstractDataPluginModel.sip \
b/src/bindings/python/sip/AbstractDataPluginModel.sip index d25bedf..37aeda1 100644
--- a/src/bindings/python/sip/AbstractDataPluginModel.sip
+++ b/src/bindings/python/sip/AbstractDataPluginModel.sip
@@ -60,6 +60,14 @@ protected:
void clear ();
signals:
void favoriteItemsChanged (const QStringList& favoriteItems);
+public:
+ QObject* favoritesModel ();
+ void addItemsToList (const \
QList<Marble::AbstractDataPluginItem*>& items); +protected:
+ virtual void getItem (const QString& id, const Marble::MarbleModel* \
model); + void registerItemProperties (const QMetaObject& \
item); +signals:
+ void favoriteItemsOnlyChanged ();
};
// AbstractDataPluginModel
diff --git a/src/bindings/python/sip/AbstractFloatItem.sip \
b/src/bindings/python/sip/AbstractFloatItem.sip index 5f4302b..16d7f56 100644
--- a/src/bindings/python/sip/AbstractFloatItem.sip
+++ b/src/bindings/python/sip/AbstractFloatItem.sip
@@ -53,6 +53,8 @@ protected:
QMenu* contextMenu ();
public:
explicit AbstractFloatItem (const Marble::MarbleModel* \
marbleModel, const QPointF& point = QPointF(10.0,10.0), const QSizeF& size = \
QSizeF(150.0,50.0)); +protected:
+ virtual void changeViewport (Marble::ViewportParams* viewport);
};
// AbstractFloatItem
diff --git a/src/bindings/python/sip/AbstractProjection.sip \
b/src/bindings/python/sip/AbstractProjection.sip index 8833887..29ccbe8 100644
--- a/src/bindings/python/sip/AbstractProjection.sip
+++ b/src/bindings/python/sip/AbstractProjection.sip
@@ -59,8 +59,6 @@ public:
virtual Marble::AbstractProjection::SurfaceType surfaceType () const=0;
virtual Marble::AbstractProjection::PreservationType preservationType () const;
virtual bool isOrientedNormal () const;
- bool exceedsLatitudeRange (const Marble::GeoDataCoordinates& \
coords) const;
- bool exceedsLatitudeRange (const Marble::GeoDataLineString& \
lineString) const;
virtual bool mapCoversViewport (const Marble::ViewportParams* \
viewport) const=0;
virtual QPainterPath mapShape (const Marble::ViewportParams* viewport) \
const=0;
QRegion mapRegion (const Marble::ViewportParams* viewport) \
const; @@ -73,7 +71,7 @@ public:
//ig bool screenCoordinates (const Marble::GeoDataLineString& \
lineString, const Marble::ViewportParams* viewport, QVector<QPolygonF*>& polygons) \
const; virtual bool geoCoordinates (const int x, const int y, const \
Marble::ViewportParams* viewport, qreal& lon, qreal& lat, \
Marble::GeoDataCoordinates::Unit unit = \
Marble::GeoDataCoordinates::Degree) const=0;
virtual Marble::GeoDataLatLonAltBox latLonAltBox (const QRect& screenRect, \
const Marble::ViewportParams* viewport) const;
-//ig bool screenCoordinates (qreal lon, qreal lat, const \
Marble::ViewportParams* viewport, int& x, int& y) const;
-//ig bool screenCoordinates (const Marble::GeoDataCoordinates& \
geopoint, const Marble::ViewportParams* viewport, int& x, int& y, bool& \
globeHidesPoint) const; +protected:
+//ig AbstractProjection (AbstractProjectionPrivate& dd);
};
};
diff --git a/src/bindings/python/sip/LayerInterface.sip \
b/src/bindings/python/sip/BillboardGraphicsItem.sip similarity index 64%
copy from src/bindings/python/sip/LayerInterface.sip
copy to src/bindings/python/sip/BillboardGraphicsItem.sip
index e2bcf70..536f3f0 100644
--- a/src/bindings/python/sip/LayerInterface.sip
+++ b/src/bindings/python/sip/BillboardGraphicsItem.sip
@@ -1,4 +1,4 @@
-// Copyright 2010 Simon Edwards <simon@simonzone.com>
+// Copyright 2011 Simon Edwards <simon@simonzone.com>
// Generated by twine2
@@ -19,16 +19,17 @@
namespace Marble
{
-class LayerInterface
+class BillboardGraphicsItem : Marble::MarbleGraphicsItem
{
%TypeHeaderCode
-#include <LayerInterface.h>
+#include <BillboardGraphicsItem.h>
%End
public:
- virtual ~LayerInterface ();
- virtual QStringList renderPosition () const=0;
- virtual qreal zValue () const;
- virtual bool render (Marble::GeoPainter* painter, \
Marble::ViewportParams* viewport, const QString& renderPos, Marble::GeoSceneLayer* \
layer)=0; + BillboardGraphicsItem ();
+ Marble::GeoDataCoordinates coordinate () const;
+ void setCoordinate (const Marble::GeoDataCoordinates& \
coordinates); + QList<QPointF> positions () const;
+ QList<QRectF> boundingRects () const;
};
};
diff --git a/src/bindings/python/sip/BookmarkManager.sip \
b/src/bindings/python/sip/BookmarkManager.sip index 0f18097..07271af 100644
--- a/src/bindings/python/sip/BookmarkManager.sip
+++ b/src/bindings/python/sip/BookmarkManager.sip
@@ -40,10 +40,10 @@ public:
void updateBookmark (Marble::GeoDataPlacemark* bookmark);
void removeBookmark (Marble::GeoDataPlacemark* bookmark);
Marble::GeoDataDocument* document () const;
- bool showBookmarks ();
void addNewBookmarkFolder (Marble::GeoDataContainer* folder, \
const QString& name);
void renameBookmarkFolder (Marble::GeoDataFolder* folder, \
const QString& name);
void removeBookmarkFolder (Marble::GeoDataFolder* folder);
void setShowBookmarks (bool visible);
+ bool showBookmarks () const;
};
};
diff --git a/src/bindings/python/sip/LayerInterface.sip \
b/src/bindings/python/sip/CylindricalProjection.sip similarity index 62%
copy from src/bindings/python/sip/LayerInterface.sip
copy to src/bindings/python/sip/CylindricalProjection.sip
index e2bcf70..5e96560 100644
--- a/src/bindings/python/sip/LayerInterface.sip
+++ b/src/bindings/python/sip/CylindricalProjection.sip
@@ -1,4 +1,4 @@
-// Copyright 2010 Simon Edwards <simon@simonzone.com>
+// Copyright 2011 Simon Edwards <simon@simonzone.com>
// Generated by twine2
@@ -17,18 +17,3 @@
// Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-namespace Marble
-{
-class LayerInterface
-{
-%TypeHeaderCode
-#include <LayerInterface.h>
-%End
-
-public:
- virtual ~LayerInterface ();
- virtual QStringList renderPosition () const=0;
- virtual qreal zValue () const;
- virtual bool render (Marble::GeoPainter* painter, \
Marble::ViewportParams* viewport, const QString& renderPos, Marble::GeoSceneLayer* \
layer)=0;
-};
-};
diff --git a/src/bindings/python/sip/FrameGraphicsItem.sip \
b/src/bindings/python/sip/FrameGraphicsItem.sip index 1896e72..ddc9303 100644
--- a/src/bindings/python/sip/FrameGraphicsItem.sip
+++ b/src/bindings/python/sip/FrameGraphicsItem.sip
@@ -34,7 +34,6 @@ public:
};
explicit FrameGraphicsItem (Marble::MarbleGraphicsItem* parent = \
0); virtual ~FrameGraphicsItem ();
- Marble::FrameGraphicsItem::FrameType frame ();
void setFrame (Marble::FrameGraphicsItem::FrameType type);
qreal margin () const;
void setMargin (qreal margin);
@@ -50,23 +49,23 @@ public:
void setBorderWidth (qreal width);
qreal padding () const;
void setPadding (qreal width);
-//ig qreal border () const;
-//ig void setBorder (qreal width);
QBrush borderBrush () const;
void setBorderBrush (const QBrush& brush);
Qt::PenStyle borderStyle () const;
void setBorderStyle (Qt::PenStyle style);
QBrush background () const;
void setBackground (const QBrush& background);
- QRectF contentRect (const QPointF& position) const;
- QRectF paintedRect (const QPointF& position = QPointF(0.0,0.0)) \
const; + QRectF paintedRect () const;
QRectF contentRect () const;
QSizeF contentSize () const;
void setContentSize (const QSizeF& size);
protected:
virtual QPainterPath backgroundShape () const;
- virtual void paint (Marble::GeoPainter* painter, \
Marble::ViewportParams* viewport, const QString& renderPos, Marble::GeoSceneLayer* \
layer = 0);
- virtual void paintContent (Marble::GeoPainter* painter, \
Marble::ViewportParams* viewport, const QString& renderPos, Marble::GeoSceneLayer* \
layer = 0);
- virtual void paintBackground (Marble::GeoPainter* painter);
+public:
+ Marble::FrameGraphicsItem::FrameType frame () const;
+protected:
+ virtual void paint (QPainter* painter);
+ virtual void paintContent (QPainter* painter);
+ virtual void paintBackground (QPainter* painter);
};
};
diff --git a/src/bindings/python/sip/GeoDataCoordinates.sip \
b/src/bindings/python/sip/GeoDataCoordinates.sip index 72e4c0d..cadfa27 100644
--- a/src/bindings/python/sip/GeoDataCoordinates.sip
+++ b/src/bindings/python/sip/GeoDataCoordinates.sip
@@ -37,7 +37,8 @@ public:
enum Notation
{
Decimal,
- DMS
+ DMS,
+ DM
};
typedef QVector<Marble::GeoDataCoordinates> Vector;
@@ -83,6 +84,7 @@ public:
};
bool isValid () const;
qreal bearing (const Marble::GeoDataCoordinates& other, \
Marble::GeoDataCoordinates::Unit unit = Marble::GeoDataCoordinates::Radian, \
Marble::GeoDataCoordinates::BearingType type = \
Marble::GeoDataCoordinates::InitialBearing) const; +//ig void \
geoCoordinates (qreal& lon, qreal& lat, qreal& alt, Marble::GeoDataCoordinates::Unit \
unit = GeoDataCoordinates::Radian) const; };
// GeoDataCoordinates
diff --git a/src/bindings/python/sip/GeoDataFeature.sip \
b/src/bindings/python/sip/GeoDataFeature.sip index 2b7b677..e506c75 100644
--- a/src/bindings/python/sip/GeoDataFeature.sip
+++ b/src/bindings/python/sip/GeoDataFeature.sip
@@ -29,7 +29,7 @@ public:
GeoDataFeature (const QString& name);
GeoDataFeature (const Marble::GeoDataFeature& other);
bool operator == (const Marble::GeoDataFeature&) const;
- Marble::EnumFeatureId featureId () const;
+ Marble::EnumFeatureId featureId () const;
enum GeoDataVisualCategory
{
@@ -200,8 +200,6 @@ public:
Marble::GeoDataFeature::GeoDataVisualCategory visualCategory () const;
void setVisualCategory \
(Marble::GeoDataFeature::GeoDataVisualCategory category); //ig const QChar \
role () const;
- int popularityIndex () const;
- void setPopularityIndex (int index);
qint64 popularity () const;
void setPopularity (qint64 popularity);
Marble::GeoDataStyleMap* styleMap () const;
@@ -235,6 +233,10 @@ public:
static Marble::GeoDataFeature::GeoDataVisualCategory OsmVisualCategory (const \
QString& keyValue); bool isGloballyVisible () const;
const QImage symbol () const;
+ int zoomLevel () const;
+ void setZoomLevel (int index);
+ static QColor defaultLabelColor ();
+ static void setDefaultLabelColor (const QColor& color);
};
// GeoDataFeature
diff --git a/src/bindings/python/sip/GeoDataGeometry.sip \
b/src/bindings/python/sip/GeoDataGeometry.sip index 9cb1c8a..28dbe63 100644
--- a/src/bindings/python/sip/GeoDataGeometry.sip
+++ b/src/bindings/python/sip/GeoDataGeometry.sip
@@ -42,7 +42,7 @@ public:
private:
//ig GeoDataGeometry (GeoDataGeometryPrivate* priv);
public:
- virtual Marble::GeoDataLatLonAltBox latLonAltBox () const;
+ virtual Marble::GeoDataLatLonAltBox& latLonAltBox () const;
};
// GeoDataGeometry
diff --git a/src/bindings/python/sip/GeoDataIconStyle.sip \
b/src/bindings/python/sip/GeoDataIconStyle.sip index 32b26a6..b7b605c 100644
--- a/src/bindings/python/sip/GeoDataIconStyle.sip
+++ b/src/bindings/python/sip/GeoDataIconStyle.sip
@@ -28,7 +28,7 @@ class GeoDataIconStyle : Marble::GeoDataColorStyle
public:
GeoDataIconStyle ();
GeoDataIconStyle (const Marble::GeoDataIconStyle& \
other);
- QImage icon () const;
+ QImage icon () const;
void setIconPath (const QString& filename);
void setHotSpot (const QPointF& hotSpot, \
Marble::GeoDataHotSpot::Units xunits, Marble::GeoDataHotSpot::Units yunits); const \
QPointF& hotSpot () const;
diff --git a/src/bindings/python/sip/GeoDataLatLonAltBox.sip \
b/src/bindings/python/sip/GeoDataLatLonAltBox.sip index 6cb34d7..60b44ca 100644
--- a/src/bindings/python/sip/GeoDataLatLonAltBox.sip
+++ b/src/bindings/python/sip/GeoDataLatLonAltBox.sip
@@ -47,6 +47,7 @@ public:
virtual ~GeoDataLatLonAltBox ();
virtual const char* nodeType () const;
virtual Marble::GeoDataCoordinates center () const;
+ virtual void clear ();
};
// GeoDataLatLonAltBox
diff --git a/src/bindings/python/sip/GeoDataLatLonBox.sip \
b/src/bindings/python/sip/GeoDataLatLonBox.sip index 9b2f660..eeab93e 100644
--- a/src/bindings/python/sip/GeoDataLatLonBox.sip
+++ b/src/bindings/python/sip/GeoDataLatLonBox.sip
@@ -64,6 +64,7 @@ public:
Marble::GeoDataLatLonBox operator | (const Marble::GeoDataLatLonBox& other) \
const;
Marble::GeoDataLatLonBox& operator |= (const Marble::GeoDataLatLonBox& other);
void boundaries (qreal& north, qreal& south, qreal& east, \
qreal& west, Marble::GeoDataCoordinates::Unit unit = \
Marble::GeoDataCoordinates::Radian) const; + virtual void clear ();
};
// GeoDataLatLonBox
diff --git a/src/bindings/python/sip/GeoDataMultiGeometry.sip \
b/src/bindings/python/sip/GeoDataMultiGeometry.sip index 69a7991..825ef48 100644
--- a/src/bindings/python/sip/GeoDataMultiGeometry.sip
+++ b/src/bindings/python/sip/GeoDataMultiGeometry.sip
@@ -49,7 +49,7 @@ public:
virtual void pack (QDataStream& stream) const;
virtual void unpack (QDataStream& stream);
virtual ~GeoDataMultiGeometry ();
- virtual Marble::GeoDataLatLonAltBox latLonAltBox () const;
+ virtual Marble::GeoDataLatLonAltBox& latLonAltBox () const;
Marble::GeoDataGeometry* child (int);
int childPosition (Marble::GeoDataGeometry* child);
void append (Marble::GeoDataGeometry* other);
diff --git a/src/bindings/python/sip/GeoDataPoint.sip \
b/src/bindings/python/sip/GeoDataPoint.sip index 8c3af26..0f17a69 100644
--- a/src/bindings/python/sip/GeoDataPoint.sip
+++ b/src/bindings/python/sip/GeoDataPoint.sip
@@ -42,7 +42,6 @@ public:
GeoDataPoint (const Marble::GeoDataCoordinates& other);
~GeoDataPoint ();
virtual const char* nodeType () const;
- virtual Marble::GeoDataLatLonAltBox latLonAltBox () const;
};
// GeoDataPoint
diff --git a/src/bindings/python/sip/GeoDataTrack.sip \
b/src/bindings/python/sip/GeoDataTrack.sip index 61a4a51..e704343 100644
--- a/src/bindings/python/sip/GeoDataTrack.sip
+++ b/src/bindings/python/sip/GeoDataTrack.sip
@@ -49,7 +49,7 @@ public:
//ig void setExtendedData (const GeoDataExtendedData& \
extendedData); virtual const char* nodeType () const;
virtual Marble::EnumGeometryId geometryId () const;
- virtual Marble::GeoDataLatLonAltBox latLonAltBox () const;
+ virtual Marble::GeoDataLatLonAltBox& latLonAltBox () const;
virtual void pack (QDataStream& stream) const;
virtual void unpack (QDataStream& stream);
};
diff --git a/src/bindings/python/sip/GeoGraphicsItem.sip \
b/src/bindings/python/sip/GeoGraphicsItem.sip index c2cc735..5cc4b67 100644
--- a/src/bindings/python/sip/GeoGraphicsItem.sip
+++ b/src/bindings/python/sip/GeoGraphicsItem.sip
@@ -21,7 +21,7 @@
namespace Marble
{
-class GeoGraphicsItem : Marble::MarbleGraphicsItem
+class GeoGraphicsItem
{
%TypeHeaderCode
#include <GeoGraphicsItem.h>
@@ -29,12 +29,8 @@ class GeoGraphicsItem : Marble::MarbleGraphicsItem
public:
GeoGraphicsItem ();
-//ig GeoGraphicsItem (GeoGraphicsItemPrivate* d_ptr);
Marble::GeoDataCoordinates coordinate () const;
-//ig void coordinate (qreal& longitude /Out/, qreal& latitude \
/Out/, qreal& altitude /Out/) const;
- void setCoordinate (qreal longitude, qreal latitude, qreal \
altitude = 0);
void setCoordinate (const Marble::GeoDataCoordinates& point);
- void setTarget (const QString& target);
virtual ~GeoGraphicsItem ();
@@ -46,21 +42,22 @@ public:
ItemIsVisible
};
typedef QFlags<Marble::GeoGraphicsItem::GeoGraphicsItemFlag> \
GeoGraphicsItemFlags;
- QString target () const;
Marble::GeoGraphicsItem::GeoGraphicsItemFlags flags () const;
void setFlag (Marble::GeoGraphicsItem::GeoGraphicsItemFlag \
flag, bool enabled = 1);
void setFlags (Marble::GeoGraphicsItem::GeoGraphicsItemFlags \
flags);
- int minLodPixels () const;
- void setMinLodPixels (int pixels);
- int maxLodPixels () const;
- void setMaxLodPixels (int pixels);
Marble::GeoDataLatLonAltBox latLonAltBox () const;
void setLatLonAltBox (const Marble::GeoDataLatLonAltBox& \
latLonAltBox);
- QList<QPointF> positions () const;
int minZoomLevel () const;
void setMinZoomLevel (int zoomLevel);
- Marble::GeoDataStyle* style () const;
- void setStyle (Marble::GeoDataStyle* style);
+ const Marble::GeoDataStyle* style () const;
+ bool visible () const;
+ void setVisible (bool visible);
+ void setStyle (const Marble::GeoDataStyle* style);
+ qreal zValue () const;
+ void setZValue (qreal z);
+ virtual void paint (Marble::GeoPainter* painter, const \
Marble::ViewportParams* viewport)=0; +protected:
+//ig GeoGraphicsItemPrivate* p () const;
};
// GeoGraphicsItem
diff --git a/src/bindings/python/sip/GeoGraphicsScene.sip \
b/src/bindings/python/sip/GeoGraphicsScene.sip index 1d70080..420216d 100644
--- a/src/bindings/python/sip/GeoGraphicsScene.sip
+++ b/src/bindings/python/sip/GeoGraphicsScene.sip
@@ -30,9 +30,9 @@ public:
~GeoGraphicsScene ();
void removeItem (Marble::GeoGraphicsItem* item);
void clear ();
- QList<Marble::GeoGraphicsItem*> items () const;
QList<Marble::GeoGraphicsItem*> items (const Marble::GeoDataLatLonAltBox& box, \
int maxZoomLevel) const;
- static int s_tileZoomLevel;
+//ig static int s_tileZoomLevel;
void addItem (Marble::GeoGraphicsItem* item);
+ void eraseAll ();
};
};
diff --git a/src/bindings/python/sip/LabelGraphicsItem.sip \
b/src/bindings/python/sip/LabelGraphicsItem.sip index eef06e3..68509e4 100644
--- a/src/bindings/python/sip/LabelGraphicsItem.sip
+++ b/src/bindings/python/sip/LabelGraphicsItem.sip
@@ -41,7 +41,9 @@ private:
//force
LabelGraphicsItem (const Marble::LabelGraphicsItem& \
other); //end
+public:
+ void setContentSize (const QSizeF& contentSize);
protected:
- void paintContent (Marble::GeoPainter* painter, \
Marble::ViewportParams* viewport, const QString& renderPos, Marble::GeoSceneLayer* \
layer); + void paintContent (QPainter* painter);
};
};
diff --git a/src/bindings/python/sip/LatLonEdit.sip \
b/src/bindings/python/sip/LatLonEdit.sip index 65c369d..34a2fe1 100644
--- a/src/bindings/python/sip/LatLonEdit.sip
+++ b/src/bindings/python/sip/LatLonEdit.sip
@@ -26,7 +26,7 @@ class LatLonEdit : QWidget
public:
- explicit LatLonEdit (QWidget* parent /TransferThis/ = 0, \
Marble::Dimension dimension = Marble::Longitude, Marble::LatLonEdit::Notation \
notation = Marble::LatLonEdit::DMS); + explicit LatLonEdit \
(QWidget* parent /TransferThis/ = 0, Marble::Dimension dimension = Marble::Longitude, \
Marble::GeoDataCoordinates::Notation notation = Marble::GeoDataCoordinates::DMS); \
qreal value () const;
//FIXME implementation is missing.
@@ -38,14 +38,8 @@ signals:
void valueChanged (qreal value);
public:
~LatLonEdit ();
- enum Notation
- {
- Decimal,
- DMS,
- DM
- };
- Marble::LatLonEdit::Notation notation () const;
- void setNotation (Marble::LatLonEdit::Notation notation);
+ Marble::GeoDataCoordinates::Notation notation () const;
+ void setNotation (Marble::GeoDataCoordinates::Notation \
notation); };
// LatLonEdit
diff --git a/src/bindings/python/sip/LayerInterface.sip \
b/src/bindings/python/sip/LayerInterface.sip index e2bcf70..59f4680 100644
--- a/src/bindings/python/sip/LayerInterface.sip
+++ b/src/bindings/python/sip/LayerInterface.sip
@@ -30,5 +30,6 @@ public:
virtual QStringList renderPosition () const=0;
virtual qreal zValue () const;
virtual bool render (Marble::GeoPainter* painter, \
Marble::ViewportParams* viewport, const QString& renderPos, Marble::GeoSceneLayer* \
layer)=0; + virtual QString runtimeTrace () const;
};
};
diff --git a/src/bindings/python/sip/MapThemeManager.sip \
b/src/bindings/python/sip/MapThemeManager.sip index a9d0ae2..cabf20b 100644
--- a/src/bindings/python/sip/MapThemeManager.sip
+++ b/src/bindings/python/sip/MapThemeManager.sip
@@ -34,6 +34,7 @@ signals:
public:
QStringList mapThemeIds () const;
//ig GeoSceneDocument* loadMapTheme (const QString& mapThemeStringID) \
const; + static void deleteMapTheme (const QString& mapThemeId);
};
// MapThemeManager
diff --git a/src/bindings/python/sip/MapViewWidget.sip \
b/src/bindings/python/sip/MapViewWidget.sip index 9f96b3d..bbc0f35 100644
--- a/src/bindings/python/sip/MapViewWidget.sip
+++ b/src/bindings/python/sip/MapViewWidget.sip
@@ -38,5 +38,6 @@ public:
signals:
void mapThemeIdChanged (const QString&);
void projectionChanged (Marble::Projection);
+ void celestialBodyChanged (const QString&);
};
};
diff --git a/src/bindings/python/sip/MarbleAbstractRunner.sip \
b/src/bindings/python/sip/MarbleAbstractRunner.sip index 34ebf90..d6bf4a5 100644
--- a/src/bindings/python/sip/MarbleAbstractRunner.sip
+++ b/src/bindings/python/sip/MarbleAbstractRunner.sip
@@ -30,7 +30,6 @@ public:
void setModel (Marble::MarbleModel* model);
virtual Marble::GeoDataFeature::GeoDataVisualCategory category () const;
virtual void reverseGeocoding (const Marble::GeoDataCoordinates& \
coordinates);
- virtual void search (const QString& searchTerm);
signals:
//ig void searchFinished (QVector<Marble::GeoDataPlacemark*> \
result);
void reverseGeocodingFinished (const \
Marble::GeoDataCoordinates& coordinates, const Marble::GeoDataPlacemark& placemark); \
@@ -43,5 +42,6 @@ signals:
void parsingFinished (Marble::GeoDataDocument* document, \
const QString& error = QString()); public:
virtual void retrieveRoute (const Marble::RouteRequest* request);
+ virtual void search (const QString& searchTerm, const \
Marble::GeoDataLatLonAltBox& preferred); };
};
diff --git a/src/bindings/python/sip/MarbleControlBox.sip \
b/src/bindings/python/sip/MarbleControlBox.sip index ab04ecf..7be1aed 100644
--- a/src/bindings/python/sip/MarbleControlBox.sip
+++ b/src/bindings/python/sip/MarbleControlBox.sip
@@ -46,9 +46,10 @@ signals:
public:
Marble::CurrentLocationWidget* currentLocationWidget ();
void setMarbleWidget (Marble::MarbleWidget* widget);
- void search (const QString& searchTerm);
signals:
void searchFinished ();
+public:
+ void search (const QString& searchTerm, Marble::SearchMode \
searchMode); };
// MarbleControlBox
diff --git a/src/bindings/python/sip/MarbleGlobal.sip \
b/src/bindings/python/sip/MarbleGlobal.sip index 3c6bb07..5dd45b1 100644
--- a/src/bindings/python/sip/MarbleGlobal.sip
+++ b/src/bindings/python/sip/MarbleGlobal.sip
@@ -183,6 +183,11 @@ enum FlyToMode
Linear,
Jump
};
+enum SearchMode
+{
+ GlobalSearch,
+ AreaSearch
+};
};
// Marble
diff --git a/src/bindings/python/sip/MarbleGraphicsItem.sip \
b/src/bindings/python/sip/MarbleGraphicsItem.sip index d0d839e..5b3f4cb 100644
--- a/src/bindings/python/sip/MarbleGraphicsItem.sip
+++ b/src/bindings/python/sip/MarbleGraphicsItem.sip
@@ -36,7 +36,6 @@ public:
DeviceCoordinateCache
};
- MarbleGraphicsItem (Marble::MarbleGraphicsItem* parent = \
0); //ig MarbleGraphicsItem (MarbleGraphicsItemPrivate* \
d_ptr); QSizeF size () const;
Marble::MarbleGraphicsItem::CacheMode cacheMode () const;
@@ -44,27 +43,22 @@ public:
protected:
virtual bool eventFilter (QObject* object, QEvent* e);
+ void update ();
public:
virtual ~MarbleGraphicsItem ();
- bool paintEvent (Marble::GeoPainter* painter, \
Marble::ViewportParams* viewport, const QString& renderPos, Marble::GeoSceneLayer* \
layer = 0); bool contains (const QPointF& point) const;
QRectF containsRect (const QPointF& point) const;
- QList<QRectF> boundingRects () const;
Marble::AbstractMarbleGraphicsLayout* layout () const;
void setLayout (Marble::AbstractMarbleGraphicsLayout* \
layout);
- void update ();
bool visible () const;
void setVisible (bool visible);
void hide ();
void show ();
- QString toolTip () const;
- void setToolTip (const QString& toolTip);
void setSize (const QSizeF& size);
virtual QSizeF contentSize () const;
virtual void setContentSize (const QSizeF& size);
virtual QRectF contentRect () const;
- virtual void paint (Marble::GeoPainter* painter, \
Marble::ViewportParams* viewport, const QString& renderPos, Marble::GeoSceneLayer* \
layer = 0); private:
//force
MarbleGraphicsItem (const Marble::MarbleGraphicsItem& \
other); @@ -74,8 +68,8 @@ private:
// CTSCC for subclasses of 'MarbleGraphicsItem'
sipType = NULL;
- if (dynamic_cast<Marble::GeoGraphicsItem*>(sipCpp))
- sipType = sipType_Marble_GeoGraphicsItem;
+ if (dynamic_cast<Marble::BillboardGraphicsItem*>(sipCpp))
+ sipType = sipType_Marble_BillboardGraphicsItem;
else if (dynamic_cast<Marble::ScreenGraphicsItem*>(sipCpp))
{
sipType = sipType_Marble_ScreenGraphicsItem;
@@ -90,8 +84,9 @@ private:
}
%End
public:
- qreal zValue () const;
- void setZValue (qreal z);
+ bool paintEvent (QPainter* painter, const \
Marble::ViewportParams* viewport); + virtual void paint (QPainter* \
painter); + void setProjection (Marble::ViewportParams* \
viewport); };
// MarbleGraphicsItem
@@ -101,8 +96,8 @@ public:
%ModuleHeaderCode
//ctscc
+#include <BillboardGraphicsItem.h>
#include <FrameGraphicsItem.h>
-#include <GeoGraphicsItem.h>
#include <LabelGraphicsItem.h>
#include <MarbleGraphicsItem.h>
#include <ScreenGraphicsItem.h>
diff --git a/src/bindings/python/sip/MarbleMap.sip \
b/src/bindings/python/sip/MarbleMap.sip index 422a096..34aad1f 100644
--- a/src/bindings/python/sip/MarbleMap.sip
+++ b/src/bindings/python/sip/MarbleMap.sip
@@ -123,7 +123,6 @@ public:
void addLayer (Marble::LayerInterface* layer);
void removeLayer (Marble::LayerInterface* layer);
void setShowBackground (bool visible);
- void downloadRegion (const QString& sourceDir, const \
QVector<Marble::TileCoordsPyramid>&); signals:
void tileLevelChanged (int level);
void repaintNeeded (const QRegion& dirtyRegion = QRegion());
@@ -150,6 +149,8 @@ signals:
void radiusChanged (int radius);
public:
//ig const TextureLayer* textureLayer () const;
+ void setShowRuntimeTrace (bool visible);
+ void downloadRegion (const \
QVector<Marble::TileCoordsPyramid>&); };
// MarbleMap
diff --git a/src/bindings/python/sip/MarbleModel.sip \
b/src/bindings/python/sip/MarbleModel.sip index 8483743..8b2cbfc 100644
--- a/src/bindings/python/sip/MarbleModel.sip
+++ b/src/bindings/python/sip/MarbleModel.sip
@@ -90,6 +90,7 @@ signals:
void trackedPlacemarkChanged (const Marble::GeoDataPlacemark* \
placemark); public:
void setMapThemeId (const QString& mapThemeId);
+//ig PluginManager* pluginManager ();
};
// MarbleModel
diff --git a/src/bindings/python/sip/MarbleRunnerManager.sip \
b/src/bindings/python/sip/MarbleRunnerManager.sip index 4f4e9b3..24ce1f1 100644
--- a/src/bindings/python/sip/MarbleRunnerManager.sip
+++ b/src/bindings/python/sip/MarbleRunnerManager.sip
@@ -28,7 +28,7 @@ class MarbleRunnerManager : QObject /NoDefaultCtors/
public:
~MarbleRunnerManager ();
void setModel (Marble::MarbleModel* model);
- void findPlacemarks (const QString& searchTerm);
+ void findPlacemarks (const QString& searchTerm, const \
Marble::GeoDataLatLonAltBox& preferred = \
Marble::GeoDataLatLonAltBox());
void reverseGeocoding (const Marble::GeoDataCoordinates& \
coordinates); signals:
void searchResultChanged (QAbstractItemModel* model);
@@ -44,7 +44,7 @@ signals:
public:
void retrieveRoute (const Marble::RouteRequest* request);
// FIXME
-//ig QVector<Marble::GeoDataPlacemark*> searchPlacemarks (const QString& \
searchTerm); +//ig QVector<Marble::GeoDataPlacemark*> searchPlacemarks (const \
QString& searchTerm, const Marble::GeoDataLatLonAltBox& preferred = \
Marble::GeoDataLatLonAltBox());
QString searchReverseGeocoding (const \
Marble::GeoDataCoordinates& coordinates); //ig QVector<Marble::GeoDataDocument*> \
searchRoute (const Marble::RouteRequest* request);
void parseFile (const QString& fileName, Marble::DocumentRole \
role = Marble::UserDocument);
diff --git a/src/bindings/python/sip/MarbleWidget.sip \
b/src/bindings/python/sip/MarbleWidget.sip index 6ce79a1..0750ad4 100644
--- a/src/bindings/python/sip/MarbleWidget.sip
+++ b/src/bindings/python/sip/MarbleWidget.sip
@@ -155,7 +155,6 @@ signals:
public:
int tileZoomLevel () const;
QList<Marble::AbstractDataPluginItem*> whichItemAt (const QPoint& curpos) \
const;
- void downloadRegion (const QString& sourceDir, const \
QVector<Marble::TileCoordsPyramid>&); signals:
void tileLevelChanged (int level);
public:
@@ -187,6 +186,8 @@ public:
void resetFocusPoint ();
Marble::MapQuality mapQuality (Marble::ViewContext = Marble::Still) const;
//ig const TextureLayer* textureLayer () const;
+ void setShowRuntimeTrace (bool visible);
+ void downloadRegion (const \
QVector<Marble::TileCoordsPyramid>&); };
// MarbleWidget
diff --git a/src/bindings/python/sip/NavigationWidget.sip \
b/src/bindings/python/sip/NavigationWidget.sip index cdc4fd8..eab7a14 100644
--- a/src/bindings/python/sip/NavigationWidget.sip
+++ b/src/bindings/python/sip/NavigationWidget.sip
@@ -44,9 +44,10 @@ public:
protected:
void resizeEvent (QResizeEvent*);
//FIXME
-public:
- void search (const QString& searchTerm);
signals:
void searchFinished ();
+public:
+ void search (const QString& searchTerm, Marble::SearchMode \
searchMode); + void clearSearch ();
};
};
diff --git a/src/bindings/python/sip/PluginAboutDialog.sip \
b/src/bindings/python/sip/PluginAboutDialog.sip index 688a393..41aaf7c 100644
--- a/src/bindings/python/sip/PluginAboutDialog.sip
+++ b/src/bindings/python/sip/PluginAboutDialog.sip
@@ -34,12 +34,12 @@ public:
virtual ~PluginAboutDialog ();
void setName (const QString& name);
void setVersion (const QString& version);
- void setPixmap (const QPixmap& pixmap);
void setAboutText (const QString& about);
void setAuthorsText (const QString& authors);
void setDataText (const QString& data);
void setLicense (Marble::PluginAboutDialog::LicenseKey \
license);
void setLicenseAgreementText (const QString& license);
void setAuthors (const QList<Marble::PluginAuthor>& authors);
+ void setIcon (const QIcon& icon);
};
};
diff --git a/src/bindings/python/sip/PositionTracking.sip \
b/src/bindings/python/sip/PositionTracking.sip index ca7c227..f612f27 100644
--- a/src/bindings/python/sip/PositionTracking.sip
+++ b/src/bindings/python/sip/PositionTracking.sip
@@ -43,11 +43,14 @@ signals:
//ig void positionProviderPluginChanged \
(PositionProviderPlugin* activePlugin); public:
bool isTrackEmpty () const;
- bool saveTrack (QString& fileName);
explicit PositionTracking (Marble::GeoDataTreeModel* model);
QDateTime timestamp () const;
qreal length (qreal planetRadius) const;
signals:
void statusChanged (Marble::PositionProviderStatus status);
+public:
+ void readSettings ();
+ void writeSettings ();
+ bool saveTrack (const QString& fileName);
};
};
diff --git a/src/bindings/python/sip/RenderPlugin.sip \
b/src/bindings/python/sip/RenderPlugin.sip index a79891b..a9654ec 100644
--- a/src/bindings/python/sip/RenderPlugin.sip
+++ b/src/bindings/python/sip/RenderPlugin.sip
@@ -74,6 +74,11 @@ public:
virtual void setSettings (const QHash<QString,QVariant>& settings);
signals:
void visibilityChanged (bool visible, const QString& nameId);
+public:
+ virtual QString runtimeTrace () const;
+ QStringList settingKeys ();
+ bool setSetting (const QString& key, const QVariant& value);
+ QVariant setting (const QString& key);
};
// RenderPlugin
diff --git a/src/bindings/python/sip/RoutingModel.sip \
b/src/bindings/python/sip/RoutingModel.sip index 1da2865..c2d8ac5 100644
--- a/src/bindings/python/sip/RoutingModel.sip
+++ b/src/bindings/python/sip/RoutingModel.sip
@@ -49,6 +49,6 @@ signals:
void deviatedFromRoute (bool deviated);
void currentRouteChanged ();
public:
- int rightNeighbor (const Marble::GeoDataCoordinates& \
position, const Marble::RouteRequest* route) const; + int \
rightNeighbor (const Marble::GeoDataCoordinates& position, const Marble::RouteRequest \
* route) const; };
};
diff --git a/src/bindings/python/sip/ScreenGraphicsItem.sip \
b/src/bindings/python/sip/ScreenGraphicsItem.sip index 0397623..eace811 100644
--- a/src/bindings/python/sip/ScreenGraphicsItem.sip
+++ b/src/bindings/python/sip/ScreenGraphicsItem.sip
@@ -41,11 +41,9 @@ public:
virtual ~ScreenGraphicsItem ();
void setPosition (const QPointF& position);
QPointF positivePosition () const;
- virtual void changeViewport (Marble::ViewportParams* viewport);
Marble::ScreenGraphicsItem::GraphicsItemFlags flags () const;
void setFlags (Marble::ScreenGraphicsItem::GraphicsItemFlags \
flags); protected:
-//ig ScreenGraphicsItem (const QPointF& position, const \
QSizeF& size, ScreenGraphicsItemPrivate* d_ptr); virtual bool eventFilter \
(QObject*, QEvent*); public:
QList<QPointF> absolutePositions () const;
diff --git a/src/bindings/python/sip/Serializable.sip \
b/src/bindings/python/sip/Serializable.sip index 47976fb..233400d 100644
--- a/src/bindings/python/sip/Serializable.sip
+++ b/src/bindings/python/sip/Serializable.sip
@@ -52,6 +52,7 @@ enum EnumGeometryId
GeoDataLinearRingId,
GeoDataPolygonId,
GeoDataMultiGeometryId,
+ GeoDataMultiTrackId,
GeoDataModelId,
GeoDataTrackId
};
diff --git a/src/bindings/python/sip/ViewportParams.sip \
b/src/bindings/python/sip/ViewportParams.sip index a4bed25..a2d4b45 100644
--- a/src/bindings/python/sip/ViewportParams.sip
+++ b/src/bindings/python/sip/ViewportParams.sip
@@ -36,7 +36,6 @@ public:
bool resolves (const Marble::GeoDataCoordinates& coord1, \
const Marble::GeoDataCoordinates& coord2) const; int radius () \
const; void setRadius (int radius);
- bool globeCoversViewport () const;
Marble::Quaternion planetAxis () const;
int width () const;
int height () const;
diff --git a/src/bindings/python/sip/WidgetGraphicsItem.sip \
b/src/bindings/python/sip/WidgetGraphicsItem.sip index b4fb8e3..73180bf 100644
--- a/src/bindings/python/sip/WidgetGraphicsItem.sip
+++ b/src/bindings/python/sip/WidgetGraphicsItem.sip
@@ -30,8 +30,9 @@ public:
virtual ~WidgetGraphicsItem ();
void setWidget (QWidget* widget);
QWidget* widget () const;
- virtual void paint (Marble::GeoPainter* painter, \
Marble::ViewportParams* viewport, const QString& renderPos, Marble::GeoSceneLayer* \
layer = 0); protected:
virtual bool eventFilter (QObject*, QEvent*);
+public:
+ virtual void paint (QPainter* painter);
};
};
diff --git a/src/bindings/python/sip/marblemod.sip \
b/src/bindings/python/sip/marblemod.sip index 1571216..f447ae9 100644
--- a/src/bindings/python/sip/marblemod.sip
+++ b/src/bindings/python/sip/marblemod.sip
@@ -27,8 +27,10 @@
%Import QtGui/QtGuimod.sip
%Import QtWebKit/QtWebKitmod.sip
%Import QtXml/QtXmlmod.sip
+%Import QtDeclarative/QtDeclarativemod.sip
%Include AbstractLayerInterface.sip
+%Include GeoDataGroundOverlay.sip
%Include TileCreatorDialog.sip
%Include AbstractDataPlugin.sip
%Include AbstractDataPluginItem.sip
@@ -38,9 +40,11 @@
%Include AbstractProjection.sip
%Include AbstractWorkerThread.sip
%Include AutoNavigation.sip
+%Include BillboardGraphicsItem.sip
%Include BookmarkManager.sip
%Include ClipPainter.sip
%Include CurrentLocationWidget.sip
+%Include CylindricalProjection.sip
%Include DialogConfigurationInterface.sip
%Include DownloadRegion.sip
%Include DownloadRegionDialog.sip
@@ -56,7 +60,6 @@
%Include GeoDataFeature.sip
%Include GeoDataFolder.sip
%Include GeoDataGeometry.sip
-%Include GeoDataGroundOverlay.sip
%Include GeoDataHotSpot.sip
%Include GeoDataIconStyle.sip
%Include GeoDataLabelStyle.sip
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic