From bastianholst at gmx.de Thu Apr 1 14:41:38 2010 From: bastianholst at gmx.de (Bastian Holst) Date: Thu, 1 Apr 2010 14:41:38 +0200 (CEST) Subject: [Marble-commits] KDE/kdeedu/marble/src Message-ID: <20100401124138.5DDF0AC888@svn.kde.org> SVN commit 1109978 by bholst: Removing unneeded command line option handling code in Marble M +2 -12 kdemain.cpp --- trunk/KDE/kdeedu/marble/src/kdemain.cpp #1109977:1109978 @@ -240,22 +240,12 @@ KApplication app; KGlobal::locale()->insertCatalog( "marble_qt" ); - QString marbleDataPath; - int dataPathIndex = 0; - - for ( int i = 1; i < argc - 1; ++i ) { - if ( strcmp( argv[ i ], "--marbleDataPath" ) == 0 ) { - dataPathIndex = i + 1; - marbleDataPath = argv[ dataPathIndex ]; - } - } - if ( args->isSet( "debug-info" ) ) { MarbleDebug::enable = true; } else { MarbleDebug::enable = false; } - + MainWindow *window = new MainWindow(); window->setAttribute( Qt::WA_DeleteOnClose, true ); window->show(); @@ -294,7 +284,7 @@ for ( int i = 0; i < args->count(); ++i ) { // FIXME: Use openUrl( args->url(i) ) instead? - if ( QFile::exists( args->arg( i ) ) && i != dataPathIndex ) + if ( QFile::exists( args->arg( i ) ) ) window->marbleControl()->addPlacemarkFile( args->arg( i ) ); } From earthwings at gentoo.org Fri Apr 2 17:08:39 2010 From: earthwings at gentoo.org (=?utf-8?q?Dennis=20Nienh=C3=BCser?=) Date: Fri, 2 Apr 2010 17:08:39 +0200 (CEST) Subject: [Marble-commits] KDE/kdeedu/marble Message-ID: <20100402150839.B28BEAC888@svn.kde.org> SVN commit 1110245 by nienhueser: Add openrouteservice data origin and license notice. Change
tags to
, add ending tag (to have xmllint validate it). M +19 -13 data/credits_data.html M +38 -32 src/lib/MarbleAboutDialog.cpp --- trunk/KDE/kdeedu/marble/data/credits_data.html #1110244:1110245 @@ -11,23 +11,23 @@

Maps

- Blue Marble Next Generation (500 m / pixel)
+ Blue Marble Next Generation (500 m / pixel)
NASA Goddard Space Flight Center Earth Observatory http://earthobservatory.nasa.gov/Newsroom/BlueMarble/

- Earth's City Lights
+ Earth's City Lights
Data courtesy Marc Imhoff of NASA GSFC and Christopher Elvidge of NOAA NGDC. Image by Craig Mayhew and Robert Simmon, NASA GSFC.

- Shuttle Radar Topography Mission (SRTM30, 1 km / pixel )
+ Shuttle Radar Topography Mission (SRTM30, 1 km / pixel )
NASA Jet Propulsion Laboratory http://www2.jpl.nasa.gov/srtm/

- Micro World Data Bank in Polygons ("MWDB-POLY / MWDBII")
+ Micro World Data Bank in Polygons ("MWDB-POLY / MWDBII")
CIA ; Global Associates, Ltd.; Fred Pospeschil and Antonio Rivera

- Temperature and Precipitation Maps (July and December)
+ Temperature and Precipitation Maps (July and December)
A combination of two datasets: