Index: /trunk/BNC/bncmain.cpp
===================================================================
--- /trunk/BNC/bncmain.cpp	(revision 1502)
+++ /trunk/BNC/bncmain.cpp	(revision 1503)
@@ -109,9 +109,12 @@
   }
 
+  QString printHelp;
+  printHelp = "Usage: bnc --conf <confFileName>\n" 
+              "           --file <inputFileName>\n"
+              "           --format <RTIGS | RTCM_2 | RTCM_3>\n"
+              "           --date YYYY-MM-DD  --time HH:MM:SS";
+
   if (confFile && confFileName.isEmpty() ) {
-      cout << "Usage: bnc --conf <confFileName>\n"
-              "           --file <inputFileName>\n"
-              "           --format <RTIGS | RTCM_2 | RTCM_3>\n" 
-              "           --date YYYY-MM-DD  --time HH:MM:SS" << endl;
+      cout << printHelp.toAscii().data() << endl;
       exit(0);
   }
@@ -130,19 +133,48 @@
   QSettings settings;
   if (settings.allKeys().size() == 0) {
-    settings.setValue("casterHost", "www.euref-ip.net");
-    settings.setValue("casterHostList", QStringList());
-    settings.setValue("casterPort", 2101);
-    settings.setValue("rnxIntr",    "15 min");
-    settings.setValue("ephIntr",    "1 day");
-    settings.setValue("corrIntr",   "1 day");
-    settings.setValue("rnxSkel",    "SKL");
-    settings.setValue("waitTime",   "5");
-    settings.setValue("makePause",  0);
-    settings.setValue("obsRate",    "");
-    settings.setValue("adviseFail", "15");
-    settings.setValue("adviseReco", "5");
-    settings.setValue("perfIntr",   "");
-    settings.setValue("corrTime",   "5");
-    settings.setValue("miscMount",  "");
+  settings.setValue("adviseFail",       "15");
+  settings.setValue("adviseReco",       "5");
+  settings.setValue("adviseScript",     "");
+  settings.setValue("autoStart",        "0");
+  settings.setValue("binSampl",         "0");
+  settings.setValue("casterHost",       "www.euref-ip.net");
+  settings.setValue("casterPort",       "2101");
+  settings.setValue("corrIntr",         "1 day");
+  settings.setValue("corrPath",         "");
+  settings.setValue("corrPort",         "");
+  settings.setValue("corrTime",         "5");
+  settings.setValue("ephIntr",          "1 day");
+  settings.setValue("ephPath",          "");
+  settings.setValue("ephV3",            "0");
+  settings.setValue("logFile",          "");
+  settings.setValue("makePause",        "0");
+  settings.setValue("miscMount",        "");  
+  settings.setValue("obsRate",          "");
+  settings.setValue("onTheFlyInterval", "1 day");
+  settings.setValue("outEphPort",       "");
+  settings.setValue("outFile",          "");
+  settings.setValue("outPort",          "");
+  settings.setValue("outUPort",         "");
+  settings.setValue("perfIntr",         "");
+  settings.setValue("proxyHost",        "");
+  settings.setValue("proxyPort",        "");
+  settings.setValue("rnxAppend",        "0");
+  settings.setValue("rnxIntr",          "15 min");
+  settings.setValue("rnxPath",          "");
+  settings.setValue("rnxSampl",         "0");
+  settings.setValue("rnxScript",        "");
+  settings.setValue("rnxSkel",          "SKL");
+  settings.setValue("rnxV3",            "0");
+  settings.setValue("scanRTCM",         "0");
+  settings.setValue("serialAutoNMEA",   "0");
+  settings.setValue("serialBaudRate",   "9600");
+  settings.setValue("serialDataBits",   "8");
+  settings.setValue("serialMountPoint", "");
+  settings.setValue("serialParity",     "NONE");
+  settings.setValue("serialPortName",   "");
+  settings.setValue("serialStopBits",   "1");
+  settings.setValue("startTab",         "0");
+  settings.setValue("waitTime",         "5");
+
   }
 
@@ -217,8 +249,5 @@
       if ( fileName.isEmpty() || format.isEmpty() || 
            dateString.isEmpty() || timeString.isEmpty() ) {
-        cout << "Usage: bnc --conf <confFileName>\n"
-                "           --file <inputFileName>\n"
-                "           --format <RTIGS | RTCM_2 | RTCM_3>\n" 
-                "           --date YYYY-MM-DD  --time HH:MM:SS" << endl;
+      cout << printHelp.toAscii().data() << endl;
         exit(0);
       }
Index: /trunk/BNC/bncwindow.cpp
===================================================================
--- /trunk/BNC/bncwindow.cpp	(revision 1502)
+++ /trunk/BNC/bncwindow.cpp	(revision 1503)
@@ -859,7 +859,7 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncWindow::slotResetOptions() {
-  int iRet = QMessageBox::question(this, "Reset", "Remove all configuration"
-                                   " options from configuration"
-                                   " file/register on disk?",
+  int iRet = QMessageBox::question(this, "Reset", "Remove all options from"
+                                   " configuration file/register"
+                                   " saved on disk?",
                                    QMessageBox::Yes, QMessageBox::No,
                                    QMessageBox::NoButton);
@@ -874,46 +874,45 @@
 void bncWindow::slotSaveOptions() {
   QSettings settings;
+  settings.setValue("adviseFail",  _adviseFailSpinBox->value());
+  settings.setValue("adviseReco",  _adviseRecoSpinBox->value());
+  settings.setValue("adviseScript",_adviseScriptLineEdit->text());
+  settings.setValue("autoStart",   _autoStartCheckBox->checkState());
+  settings.setValue("binSampl",    _binSamplSpinBox->value());
+  settings.setValue("corrIntr",    _corrIntrComboBox->currentText());
+  settings.setValue("corrPath",    _corrPathLineEdit->text());
+  settings.setValue("corrPort",    _corrPortLineEdit->text());
+  settings.setValue("corrTime",    _corrTimeSpinBox->value());
+  settings.setValue("ephIntr",     _ephIntrComboBox->currentText());
+  settings.setValue("ephPath",     _ephPathLineEdit->text());
+  settings.setValue("ephV3",       _ephV3CheckBox->checkState());
+  settings.setValue("logFile",     _logFileLineEdit->text());
+  settings.setValue("makePause",   _makePauseCheckBox->checkState());
+  settings.setValue("miscMount",   _miscMountLineEdit->text());
+  settings.setValue("obsRate",     _obsRateComboBox->currentText());
+  settings.setValue("onTheFlyInterval", _onTheFlyComboBox->currentText());
+  settings.setValue("outEphPort",  _outEphPortLineEdit->text());
+  settings.setValue("outFile",     _outFileLineEdit->text());
+  settings.setValue("outPort",     _outPortLineEdit->text());
+  settings.setValue("outUPort",    _outUPortLineEdit->text());
+  settings.setValue("perfIntr",    _perfIntrComboBox->currentText());
   settings.setValue("proxyHost",   _proxyHostLineEdit->text());
   settings.setValue("proxyPort",   _proxyPortLineEdit->text());
+  settings.setValue("rnxAppend",   _rnxAppendCheckBox->checkState());
+  settings.setValue("rnxIntr",     _rnxIntrComboBox->currentText());
+  settings.setValue("rnxPath",     _rnxPathLineEdit->text());
+  settings.setValue("rnxSampl",    _rnxSamplSpinBox->value());
+  settings.setValue("rnxScript",   _rnxScrpLineEdit->text());
+  settings.setValue("rnxSkel",     _rnxSkelLineEdit->text());
+  settings.setValue("rnxV3",       _rnxV3CheckBox->checkState());
+  settings.setValue("scanRTCM",    _scanRTCMCheckBox->checkState());
+  settings.setValue("serialAutoNMEA",  _serialAutoNMEACheckBox->checkState());
+  settings.setValue("serialBaudRate",  _serialBaudRateComboBox->currentText());
+  settings.setValue("serialDataBits",  _serialDataBitsComboBox->currentText());
+  settings.setValue("serialMountPoint",_serialMountPointLineEdit->text());
+  settings.setValue("serialParity",    _serialParityComboBox->currentText());
+  settings.setValue("serialPortName",  _serialPortNameLineEdit->text());
+  settings.setValue("serialStopBits",  _serialStopBitsComboBox->currentText());
+  settings.setValue("startTab",    aogroup->currentIndex());
   settings.setValue("waitTime",    _waitTimeSpinBox->value());
-  settings.setValue("obsRate",     _obsRateComboBox->currentText());
-  settings.setValue("adviseFail",  _adviseFailSpinBox->value());
-  settings.setValue("adviseReco",  _adviseRecoSpinBox->value());
-  settings.setValue("makePause",   _makePauseCheckBox->checkState());
-  settings.setValue("outFile",     _outFileLineEdit->text());
-  settings.setValue("perfIntr",    _perfIntrComboBox->currentText());
-  settings.setValue("outPort",     _outPortLineEdit->text());
-  settings.setValue("outUPort",    _outUPortLineEdit->text());
-  settings.setValue("outEphPort",  _outEphPortLineEdit->text());
-  settings.setValue("corrPort",    _corrPortLineEdit->text());
-  settings.setValue("corrTime",    _corrTimeSpinBox->value());
-  settings.setValue("rnxPath",     _rnxPathLineEdit->text());
-  settings.setValue("ephPath",     _ephPathLineEdit->text());
-  settings.setValue("corrPath",    _corrPathLineEdit->text());
-  settings.setValue("rnxScript",   _rnxScrpLineEdit->text());
-  settings.setValue("rnxIntr",     _rnxIntrComboBox->currentText());
-  settings.setValue("onTheFlyInterval", _onTheFlyComboBox->currentText());
-  settings.setValue("ephIntr",     _ephIntrComboBox->currentText());
-  settings.setValue("corrIntr",    _corrIntrComboBox->currentText());
-  settings.setValue("rnxSampl",    _rnxSamplSpinBox->value());
-  settings.setValue("binSampl",    _binSamplSpinBox->value());
-  settings.setValue("rnxSkel",     _rnxSkelLineEdit->text());
-  settings.setValue("rnxAppend",   _rnxAppendCheckBox->checkState());
-  settings.setValue("autoStart",   _autoStartCheckBox->checkState());
-  settings.setValue("rnxV3",       _rnxV3CheckBox->checkState());
-  settings.setValue("ephV3",       _ephV3CheckBox->checkState());
-  settings.setValue("logFile",     _logFileLineEdit->text());
-  settings.setValue("adviseScript",_adviseScriptLineEdit->text());
-  settings.setValue("miscMount",   _miscMountLineEdit->text());
-  settings.setValue("scanRTCM",    _scanRTCMCheckBox->checkState());
-  settings.setValue("serialPortName",  _serialPortNameLineEdit->text());
-  settings.setValue("serialMountPoint",_serialMountPointLineEdit->text());
-  settings.setValue("serialBaudRate",  _serialBaudRateComboBox->currentText());
-  settings.setValue("serialParity",    _serialParityComboBox->currentText());
-  settings.setValue("serialDataBits",  _serialDataBitsComboBox->currentText());
-  settings.setValue("serialStopBits",  _serialStopBitsComboBox->currentText());
-  settings.setValue("serialAutoNMEA",  _serialAutoNMEACheckBox->checkState());
-  settings.setValue("startTab",    aogroup->currentIndex());
-  
   QStringList mountPoints;