Index: trunk/BNC/src/PPP/pppWidgets.cpp
===================================================================
--- trunk/BNC/src/PPP/pppWidgets.cpp	(revision 5954)
+++ trunk/BNC/src/PPP/pppWidgets.cpp	(revision 5955)
@@ -71,11 +71,11 @@
   _addStaButton = new QPushButton("Add Station");                                        _widgets << _addStaButton;
   _delStaButton = new QPushButton("Delete Station");                                     _widgets << _delStaButton;
-  _plotCoordinates        = new QLineEdit;    _plotCoordinates       ->setObjectName("PPP/plotCoordinates");        _widgets << _plotCoordinates;
-  _mapWinButton           = new QPushButton;  _mapWinButton          ->setObjectName("PPP/mapWinButton");           _widgets << _mapWinButton;
-  _gmRadioButton          = new QRadioButton; _gmRadioButton         ->setObjectName("PPP/gmRadioButton");          _widgets << _gmRadioButton;
-  _osmRadioButton         = new QRadioButton; _osmRadioButton        ->setObjectName("PPP/osmRadioButton");         _widgets << _osmRadioButton;
-  _mapWinDotSizeLineEdit  = new QLineEdit;    _mapWinDotSizeLineEdit ->setObjectName("PPP/mapWinDotSizeLineEdit");  _widgets << _mapWinDotSizeLineEdit;
-  _mapWinDotColorComboBox = new QComboBox;    _mapWinDotColorComboBox->setObjectName("PPP/mapWinDotColorComboBox"); _widgets << _mapWinDotColorComboBox;
-  _mapSpeedSlider         = new QSlider;      _mapSpeedSlider        ->setObjectName("PPP/mapSpeedSlider");         _widgets << _mapSpeedSlider;
+  _plotCoordinates  = new QLineEdit;    _plotCoordinates ->setObjectName("PPP/plotCoordinates");  _widgets << _plotCoordinates;
+  _mapWinButton     = new QPushButton;  _mapWinButton    ->setObjectName("PPP/mapWinButton");     _widgets << _mapWinButton;
+  _useGoogleMap     = new QRadioButton; _useGoogleMap    ->setObjectName("PPP/useGoogleMap");     _widgets << _useGoogleMap;
+  _useOpenStreetMap = new QRadioButton; _useOpenStreetMap->setObjectName("PPP/useOpenStreetMap"); _widgets << _useOpenStreetMap;
+  _mapWinDotSize    = new QLineEdit;    _mapWinDotSize   ->setObjectName("PPP/mapWinDotSize");    _widgets << _mapWinDotSize;
+  _mapWinDotColor   = new QComboBox;    _mapWinDotColor  ->setObjectName("PPP/mapWinDotColor");   _widgets << _mapWinDotColor;
+  _mapSpeedSlider   = new QSlider;      _mapSpeedSlider  ->setObjectName("PPP/mapSpeedSlider");   _widgets << _mapSpeedSlider;
 
   _dataSource->setEditable(false);
@@ -113,6 +113,6 @@
   _mapWinButton->setText("Open Map");
 
-  _mapWinDotColorComboBox->setEditable(false);
-  _mapWinDotColorComboBox->addItems(QString("red,yellow").split(","));
+  _mapWinDotColor->setEditable(false);
+  _mapWinDotColor->addItems(QString("red,yellow").split(","));
 
   _mapSpeedSlider->setOrientation(Qt::Horizontal);
@@ -124,8 +124,8 @@
 
   _mapWinButton->setWhatsThis(tr("<p>You make like to track your rover position using Google Maps or Open Street Map as a background map. Track plots can be produced with BNC in 'Realtime-PPP', 'Realtime-SPP' and 'Post-Processing' mode.</p><p>The 'Open Map' button opens a windows showing a map according to specified options.</p><p>When in 'Post-Processing' mode you should not forget to specify a proxy under the 'Network' tab if that is operated in front of BNC."));
-  _gmRadioButton->setWhatsThis(tr("<p>Specify Google Maps as the background for your rover positions."));
-  _osmRadioButton->setWhatsThis(tr("<p>Specify Open Street Map as the background for your rover positions."));
-  _mapWinDotSizeLineEdit->setWhatsThis(tr("<p>Specify the size of dots showing the rover positions.</p><p>A dot size of '3' may be appropriate. The maximum possible dot size is '10'. An empty option field or a size of '0' would mean that you don't want BNC to show the rover's track on the map.</p>"));
-  _mapWinDotColorComboBox->setWhatsThis(tr("<p>Specify the color of dots showing the rover track.</p>"));
+  _useGoogleMap->setWhatsThis(tr("<p>Specify Google Maps as the background for your rover positions."));
+  _useOpenStreetMap->setWhatsThis(tr("<p>Specify Open Street Map as the background for your rover positions."));
+  _mapWinDotSize->setWhatsThis(tr("<p>Specify the size of dots showing the rover positions.</p><p>A dot size of '3' may be appropriate. The maximum possible dot size is '10'. An empty option field or a size of '0' would mean that you don't want BNC to show the rover's track on the map.</p>"));
+  _mapWinDotColor->setWhatsThis(tr("<p>Specify the color of dots showing the rover track.</p>"));
   _mapSpeedSlider->setWhatsThis(tr("<p>With BNC in PPP post-processing mode you can specify the speed of computations as appropriate for visualization. Note that you can adjust 'Speed' on-the-fly while BNC is already processing your observations."));
 
@@ -197,12 +197,12 @@
   // Plots and Maps
   // --------------
-  _plotCoordinates      ->setText(settings.value(_plotCoordinates->objectName()).toString());
-  _gmRadioButton        ->setChecked(!settings.value(_gmRadioButton->objectName()).toBool());
-  _osmRadioButton       ->setChecked(settings.value(_osmRadioButton->objectName()).toBool());
-  _mapWinDotSizeLineEdit->setText(settings.value(_mapWinDotSizeLineEdit->objectName()).toString());
-
-  ii = _mapWinDotColorComboBox->findText(settings.value(_mapWinDotColorComboBox->objectName()).toString());
-  if (ii != -1) {
-    _mapWinDotColorComboBox->setCurrentIndex(ii);
+  _plotCoordinates ->setText(settings.value(_plotCoordinates->objectName()).toString());
+  _useGoogleMap    ->setChecked(!settings.value(_useGoogleMap->objectName()).toBool());
+  _useOpenStreetMap->setChecked(settings.value(_useOpenStreetMap->objectName()).toBool());
+  _mapWinDotSize   ->setText(settings.value(_mapWinDotSize->objectName()).toString());
+
+  ii = _mapWinDotColor->findText(settings.value(_mapWinDotColor->objectName()).toString());
+  if (ii != -1) {
+    _mapWinDotColor->setCurrentIndex(ii);
   }
 
@@ -249,10 +249,10 @@
   settings.setValue(_staTable->objectName(), staList);
 
-  settings.setValue(_plotCoordinates       ->objectName(), _plotCoordinates       ->text());
-  settings.setValue(_gmRadioButton         ->objectName(), _gmRadioButton         ->isChecked());
-  settings.setValue(_osmRadioButton        ->objectName(), _osmRadioButton        ->isChecked());
-  settings.setValue(_mapWinDotSizeLineEdit ->objectName(), _mapWinDotSizeLineEdit ->text());
-  settings.setValue(_mapWinDotColorComboBox->objectName(), _mapWinDotColorComboBox->currentText());
-  settings.setValue(_mapSpeedSlider        ->objectName(), _mapSpeedSlider        ->value());
+  settings.setValue(_plotCoordinates ->objectName(), _plotCoordinates ->text());
+  settings.setValue(_useGoogleMap    ->objectName(), _useGoogleMap    ->isChecked());
+  settings.setValue(_useOpenStreetMap->objectName(), _useOpenStreetMap->isChecked());
+  settings.setValue(_mapWinDotSize   ->objectName(), _mapWinDotSize   ->text());
+  settings.setValue(_mapWinDotColor  ->objectName(), _mapWinDotColor  ->currentText());
+  settings.setValue(_mapSpeedSlider  ->objectName(), _mapSpeedSlider  ->value());
 }
 
Index: trunk/BNC/src/PPP/pppWidgets.h
===================================================================
--- trunk/BNC/src/PPP/pppWidgets.h	(revision 5954)
+++ trunk/BNC/src/PPP/pppWidgets.h	(revision 5955)
@@ -59,8 +59,8 @@
   QLineEdit*     _plotCoordinates;
   QPushButton*   _mapWinButton;
-  QRadioButton*  _gmRadioButton;
-  QRadioButton*  _osmRadioButton;
-  QLineEdit*     _mapWinDotSizeLineEdit;
-  QComboBox*     _mapWinDotColorComboBox;
+  QRadioButton*  _useGoogleMap;
+  QRadioButton*  _useOpenStreetMap;
+  QLineEdit*     _mapWinDotSize;
+  QComboBox*     _mapWinDotColor;
   QSlider*       _mapSpeedSlider;
 
Index: trunk/BNC/src/bncwindow.cpp
===================================================================
--- trunk/BNC/src/bncwindow.cpp	(revision 5954)
+++ trunk/BNC/src/bncwindow.cpp	(revision 5955)
@@ -904,17 +904,17 @@
 
   pppLayout4Hlp2->addWidget(new QLabel("Google"));
-  pppLayout4Hlp2->addWidget(_pppWidgets._gmRadioButton);
+  pppLayout4Hlp2->addWidget(_pppWidgets._useGoogleMap);
 
   pppLayout4Hlp2->addWidget(new QLabel("OSM"));
-  pppLayout4Hlp2->addWidget(_pppWidgets._osmRadioButton);
+  pppLayout4Hlp2->addWidget(_pppWidgets._useOpenStreetMap);
 
   pppLayout4Hlp2->addSpacing(3*ww);
 
-  _pppWidgets._mapWinDotSizeLineEdit->setMaximumWidth(5*ww);
-  pppLayout4Hlp2->addWidget(_pppWidgets._mapWinDotSizeLineEdit);
+  _pppWidgets._mapWinDotSize->setMaximumWidth(5*ww);
+  pppLayout4Hlp2->addWidget(_pppWidgets._mapWinDotSize);
 
   pppLayout4Hlp2->addSpacing(3*ww);
 
-  pppLayout4Hlp2->addWidget(_pppWidgets._mapWinDotColorComboBox);
+  pppLayout4Hlp2->addWidget(_pppWidgets._mapWinDotColor);
 
   pppLayout4Hlp2->addSpacing(3*ww);
@@ -2428,8 +2428,8 @@
   saveOptions();
   enableWidget(false, _pppWidgets._mapWinButton);
-  enableWidget(false, _pppWidgets._gmRadioButton);
-  enableWidget(false, _pppWidgets._osmRadioButton);
-  enableWidget(false, _pppWidgets._mapWinDotSizeLineEdit);
-  enableWidget(false, _pppWidgets._mapWinDotColorComboBox);
+  enableWidget(false, _pppWidgets._useGoogleMap);
+  enableWidget(false, _pppWidgets._useOpenStreetMap);
+  enableWidget(false, _pppWidgets._mapWinDotSize);
+  enableWidget(false, _pppWidgets._mapWinDotColor);
 
   if (!_mapWin) {
@@ -2451,8 +2451,8 @@
 #ifdef QT_WEBKIT
   enableWidget(true, _pppWidgets._mapWinButton);
-  enableWidget(true, _pppWidgets._gmRadioButton);
-  enableWidget(true, _pppWidgets._osmRadioButton);
-  enableWidget(true, _pppWidgets._mapWinDotSizeLineEdit);
-  enableWidget(true, _pppWidgets._mapWinDotColorComboBox);
+  enableWidget(true, _pppWidgets._useGoogleMap);
+  enableWidget(true, _pppWidgets._useOpenStreetMap);
+  enableWidget(true, _pppWidgets._mapWinDotSize);
+  enableWidget(true, _pppWidgets._mapWinDotColor);
   if (_mapWin) {
     QListIterator<bncGetThread*> it(_threads);
