From c2dab0af365b96b09fb6fdd5f48412381bc54ecf Mon Sep 17 00:00:00 2001
From: Stelios Bounanos <vcs@enotty.net>
Date: Mon, 3 Mar 2008 09:35:52 +0000
Subject: [PATCH] Upstream version 2.10S

---
 configure.ac               |  2 +-
 src/dialogs/confdialog.cxx | 24 +++++++++++++-----------
 src/dialogs/confdialog.fl  |  8 +++++---
 src/misc/configuration.cxx |  1 +
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index d563ad4b..3668c2e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl major and minor must be integers; patch may
 dnl contain other characters or be empty
 m4_define(FLDIGI_MAJOR, [2])
 m4_define(FLDIGI_MINOR, [10])
-m4_define(FLDIGI_PATCH, [R])
+m4_define(FLDIGI_PATCH, [S])
 
 AC_INIT([fldigi], FLDIGI_MAJOR.FLDIGI_MINOR[FLDIGI_PATCH], [w1hkj AT w1hkj DOT com])
 
diff --git a/src/dialogs/confdialog.cxx b/src/dialogs/confdialog.cxx
index 948a96d4..2c6bfc9e 100644
--- a/src/dialogs/confdialog.cxx
+++ b/src/dialogs/confdialog.cxx
@@ -977,14 +977,16 @@ progdefaults.changed = true;
 
 Fl_Counter *cntOlivia_smargin=(Fl_Counter *)0;
 
-static void cb_cntOlivia_smargin(Fl_Counter*, void*) {
-  progdefaults.changed = true;
+static void cb_cntOlivia_smargin(Fl_Counter* o, void*) {
+  progdefaults.oliviasmargin = (int)(o->value());
+progdefaults.changed = true;
 }
 
 Fl_Counter *cntOlivia_sinteg=(Fl_Counter *)0;
 
-static void cb_cntOlivia_sinteg(Fl_Counter*, void*) {
-  progdefaults.changed = true;
+static void cb_cntOlivia_sinteg(Fl_Counter* o, void*) {
+  progdefaults.oliviasinteg = (int)(o->value());
+progdefaults.changed = true;
 }
 
 Fl_Group *tabPSK=(Fl_Group *)0;
@@ -2052,14 +2054,13 @@ fect after a restart.");
           { Fl_Group* o = tabOlivia = new Fl_Group(0, 50, 400, 170, "Olivia");
             o->color((Fl_Color)51);
             o->selection_color((Fl_Color)51);
-            o->hide();
-            { Fl_Choice* o = mnuOlivia_Tones = new Fl_Choice(90, 72, 85, 20, "Tones");
+            { Fl_Choice* o = mnuOlivia_Tones = new Fl_Choice(105, 72, 70, 22, "Tones");
               o->down_box(FL_BORDER_BOX);
               o->callback((Fl_Callback*)cb_mnuOlivia_Tones);
               o->add(szOliviaTones);
               o->value(2);
             }
-            { Fl_Choice* o = mnuOlivia_Bandwidth = new Fl_Choice(270, 72, 85, 20, "Bandwidth");
+            { Fl_Choice* o = mnuOlivia_Bandwidth = new Fl_Choice(270, 72, 85, 22, "Bandwidth");
               o->down_box(FL_BORDER_BOX);
               o->callback((Fl_Callback*)cb_mnuOlivia_Bandwidth);
               o->add(szOliviaBandwidth);
@@ -2068,27 +2069,28 @@ fect after a restart.");
             { Fl_Button* o = btnRestartOlivia = new Fl_Button(300, 172, 79, 28, "Restart");
               o->callback((Fl_Callback*)cb_btnRestartOlivia);
             }
-            { Fl_Counter* o = cntOlivia_smargin = new Fl_Counter(90, 105, 85, 20, "RX sync tune margin");
+            { Fl_Counter* o = cntOlivia_smargin = new Fl_Counter(90, 105, 85, 22, "RX sync tune margin");
               o->type(1);
               o->minimum(2);
               o->maximum(128);
               o->step(1);
-              o->value(2);
+              o->value(8);
               o->callback((Fl_Callback*)cb_cntOlivia_smargin);
               o->align(FL_ALIGN_RIGHT);
             }
-            { Fl_Counter* o = cntOlivia_sinteg = new Fl_Counter(90, 135, 85, 20, "RX sync integration period");
+            { Fl_Counter* o = cntOlivia_sinteg = new Fl_Counter(90, 135, 85, 22, "RX sync integration period");
               o->type(1);
               o->minimum(2);
               o->maximum(128);
               o->step(1);
-              o->value(2);
+              o->value(4);
               o->callback((Fl_Callback*)cb_cntOlivia_sinteg);
               o->align(FL_ALIGN_RIGHT);
             }
             o->end();
           }
           { Fl_Group* o = tabPSK = new Fl_Group(0, 50, 400, 170, "Psk");
+            o->hide();
             { Fl_Counter* o = cntSearchRange = new Fl_Counter(11, 60, 80, 21, "Acq Srch Range");
               o->type(1);
               o->minimum(10);
diff --git a/src/dialogs/confdialog.fl b/src/dialogs/confdialog.fl
index 63020e46..55096790 100644
--- a/src/dialogs/confdialog.fl
+++ b/src/dialogs/confdialog.fl
@@ -1118,7 +1118,7 @@ progdefaults.changed = true;}
             }
           }
           Fl_Group tabOlivia {
-            label Olivia open selected
+            label Olivia open
             xywh {0 50 400 170} color 51 selection_color 51
           } {
             Fl_Choice mnuOlivia_Tones {
@@ -1144,12 +1144,14 @@ progdefaults.changed = true;}
             }
             Fl_Counter cntOlivia_smargin {
               label {RX sync tune margin}
-              callback {progdefaults.changed = true;}
+              callback {progdefaults.oliviasmargin = (int)(o->value());
+progdefaults.changed = true;} selected
               xywh {90 105 85 22} type Simple align 8 minimum 2 maximum 128 step 1 value 8
             }
             Fl_Counter cntOlivia_sinteg {
               label {RX sync integration period}
-              callback {progdefaults.changed = true;}
+              callback {progdefaults.oliviasinteg = (int)(o->value());
+progdefaults.changed = true;}
               xywh {90 135 85 22} type Simple align 8 minimum 2 maximum 128 step 1 value 4
             }
           }
diff --git a/src/misc/configuration.cxx b/src/misc/configuration.cxx
index 745583a3..5b41cfa2 100644
--- a/src/misc/configuration.cxx
+++ b/src/misc/configuration.cxx
@@ -557,6 +557,7 @@ bool configuration::readDefaultsXML()
 						break;
 					case ACQSN :
 						ACQsn = atof(xml->getNodeData());
+						break;
 					case CWSWEETSPOT :
 						CWsweetspot = atof(xml->getNodeData());
 						break;