Index: marble-0.85+svn1207808/src/lib/CurrentLocationWidget.cpp
===================================================================
---- marble-0.85+svn1207808.orig/src/lib/CurrentLocationWidget.cpp 2010-12-19 16:53:43.000000000 -0500
-+++ marble-0.85+svn1207808/src/lib/CurrentLocationWidget.cpp 2010-12-19 16:53:53.000000000 -0500
+--- marble-0.85+svn1207808.orig/src/lib/CurrentLocationWidget.cpp 2010-12-19 17:24:16.000000000 -0500
++++ marble-0.85+svn1207808/src/lib/CurrentLocationWidget.cpp 2010-12-19 17:24:21.000000000 -0500
@@ -31,6 +31,9 @@
// Ui
#include "ui_CurrentLocationWidget.h"
#include "CurrentLocationWidget.moc"
Index: marble-0.85+svn1207808/src/lib/CurrentLocationWidget.h
===================================================================
---- marble-0.85+svn1207808.orig/src/lib/CurrentLocationWidget.h 2010-12-19 16:53:43.000000000 -0500
-+++ marble-0.85+svn1207808/src/lib/CurrentLocationWidget.h 2010-12-19 16:53:53.000000000 -0500
+--- marble-0.85+svn1207808.orig/src/lib/CurrentLocationWidget.h 2010-12-19 17:24:16.000000000 -0500
++++ marble-0.85+svn1207808/src/lib/CurrentLocationWidget.h 2010-12-19 17:24:21.000000000 -0500
@@ -72,6 +72,9 @@
Q_PRIVATE_SLOT( d, void updateAutoZoomCheckBox( bool autoZoom ) )
}
Index: marble-0.85+svn1207808/src/lib/CurrentLocationWidget.ui
===================================================================
---- marble-0.85+svn1207808.orig/src/lib/CurrentLocationWidget.ui 2010-12-19 16:53:43.000000000 -0500
-+++ marble-0.85+svn1207808/src/lib/CurrentLocationWidget.ui 2010-12-19 16:53:53.000000000 -0500
+--- marble-0.85+svn1207808.orig/src/lib/CurrentLocationWidget.ui 2010-12-19 17:24:16.000000000 -0500
++++ marble-0.85+svn1207808/src/lib/CurrentLocationWidget.ui 2010-12-19 17:24:21.000000000 -0500
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<bool>false</bool>
Index: marble-0.85+svn1207808/src/lib/PositionTracking.cpp
===================================================================
---- marble-0.85+svn1207808.orig/src/lib/PositionTracking.cpp 2010-12-19 16:53:43.000000000 -0500
-+++ marble-0.85+svn1207808/src/lib/PositionTracking.cpp 2010-12-19 16:53:53.000000000 -0500
+--- marble-0.85+svn1207808.orig/src/lib/PositionTracking.cpp 2010-12-19 17:24:16.000000000 -0500
++++ marble-0.85+svn1207808/src/lib/PositionTracking.cpp 2010-12-19 17:24:21.000000000 -0500
@@ -16,14 +16,19 @@
#include "GeoDataPlacemark.h"
#include "GeoDataStyle.h"
GeoDataPlacemark *placemark = static_cast<GeoDataPlacemark*>(d->m_document->child(d->m_document->size()-1));
Index: marble-0.85+svn1207808/src/lib/PositionTracking.h
===================================================================
---- marble-0.85+svn1207808.orig/src/lib/PositionTracking.h 2010-12-19 16:53:43.000000000 -0500
-+++ marble-0.85+svn1207808/src/lib/PositionTracking.h 2010-12-19 16:53:53.000000000 -0500
+--- marble-0.85+svn1207808.orig/src/lib/PositionTracking.h 2010-12-19 17:24:16.000000000 -0500
++++ marble-0.85+svn1207808/src/lib/PositionTracking.h 2010-12-19 17:24:21.000000000 -0500
@@ -84,6 +84,11 @@
void setTrackVisible ( bool visible );
void clearTrack();
Index: marble-0.85+svn1207808/src/QtMainWindow.h
===================================================================
---- marble-0.85+svn1207808.orig/src/QtMainWindow.h 2010-12-19 16:53:43.000000000 -0500
-+++ marble-0.85+svn1207808/src/QtMainWindow.h 2010-12-19 16:53:53.000000000 -0500
+--- marble-0.85+svn1207808.orig/src/QtMainWindow.h 2010-12-19 17:24:16.000000000 -0500
++++ marble-0.85+svn1207808/src/QtMainWindow.h 2010-12-19 17:24:21.000000000 -0500
@@ -120,6 +120,7 @@
void showMapViewDialog();
void showLegendTab( bool enabled );
RoutingWidget *m_routingWidget;
};
+Index: marble-0.85+svn1207808/src/QtMainWindow.cpp
+===================================================================
+--- marble-0.85+svn1207808.orig/src/QtMainWindow.cpp 2010-12-19 17:24:16.000000000 -0500
++++ marble-0.85+svn1207808/src/QtMainWindow.cpp 2010-12-19 17:24:21.000000000 -0500
+@@ -41,6 +41,7 @@
+ #include <QtNetwork/QNetworkProxy>
+
+ #include "BookmarkInfoDialog.h"
++#include "CurrentLocationWidget.h"
+ //#include "EditBookmarkDialog.h"
+ #include "MapViewWidget.h"
+ #include "MarbleDirs.h"
+@@ -92,6 +93,7 @@
+ m_osmEditAction( 0 ),
+ m_mapViewDialog( 0 ),
+ m_routingDialog( 0 ),
++ m_trackingDialog( 0 ),
+ m_routingWidget( 0 )
+ {
+ setUpdatesEnabled( false );
+@@ -298,6 +300,9 @@
+ m_toggleRoutingTabAction = menuBar()->addAction( tr( "Routing" ) );
+ connect( m_toggleRoutingTabAction, SIGNAL( triggered( bool ) ),
+ this, SLOT( showRoutingDialog() ) );
++ m_showTrackingDialogAction = menuBar()->addAction( tr( "Tracking" ) );
++ connect( m_showTrackingDialogAction, SIGNAL( triggered()),
++ this, SLOT( showTrackingDialog()) );
+
+ m_controlView->marbleControl()->setNavigationTabShown( false );
+ m_controlView->marbleControl()->setLegendTabShown( false );
+@@ -1266,6 +1271,28 @@
+ m_routingDialog->activateWindow();
+ }
+
++void MainWindow::showTrackingDialog()
++{
++ if( !m_trackingDialog ) {
++ m_trackingDialog = new QDialog( this );
++ m_trackingDialog->setWindowTitle( tr( "Tracking - Marble" ) );
++ CurrentLocationWidget *trackingWidget = new CurrentLocationWidget( m_trackingDialog );
++ trackingWidget->setMarbleWidget( m_controlView->marbleWidget() );
++
++ QDialogButtonBox *buttonBox = new QDialogButtonBox( QDialogButtonBox::Ok, Qt::Vertical, m_trackingDialog );
++ connect(buttonBox, SIGNAL( accepted() ), m_trackingDialog, SLOT( accept() ) );
++
++ QHBoxLayout* layout = new QHBoxLayout;
++ layout->addWidget( trackingWidget );
++ layout->addWidget( buttonBox );
++ m_trackingDialog->setLayout( layout );
++ m_trackingDialog->resize( 640, 420 );
++ }
++
++ m_trackingDialog->show();
++ m_trackingDialog->raise();
++ m_trackingDialog->activateWindow();
++}
+
+ void MainWindow::updateMapEditButtonVisibility( const QString &mapTheme )
+ {