From aee14af900b6aaf22ccc456e39ad0b56c5a36e88 Mon Sep 17 00:00:00 2001
From: Daniel Richman <main@danielrichman.co.uk>
Date: Fri, 2 Nov 2012 17:23:41 +0000
Subject: [PATCH] Multiple fixes. Closes #24; Closes #30

 - Fix #24: make 'Auto' a checkbox
 - Fix #30 via habitat-cpp-connector submodule: squid proxies
 - Remove 'Test' prepended to update message.
---
 habitat-cpp-connector      |  2 +-
 src/dialogs/confdialog.cxx | 25 ++++++++++++++-----------
 src/dialogs/confdialog.fl  | 16 +++++++++-------
 src/dl_fldigi/update.cxx   |  2 +-
 src/include/confdialog.h   |  2 +-
 5 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/habitat-cpp-connector b/habitat-cpp-connector
index 86ba7e2d..9a02072c 160000
--- a/habitat-cpp-connector
+++ b/habitat-cpp-connector
@@ -1 +1 @@
-Subproject commit 86ba7e2dccebad50850ae8864d3d56805542d09c
+Subproject commit 9a02072c8e1e8aee5b62503afcb27745279b8eb6
diff --git a/src/dialogs/confdialog.cxx b/src/dialogs/confdialog.cxx
index f422a219..237905d1 100644
--- a/src/dialogs/confdialog.cxx
+++ b/src/dialogs/confdialog.cxx
@@ -1891,14 +1891,7 @@ Fl_Value_Slider2 *sldrRTTYbandwidth=(Fl_Value_Slider2 *)0;
 static void cb_sldrRTTYbandwidth(Fl_Value_Slider2* o, void*) {
   progdefaults.RTTY_BW = o->value();
 progdefaults.RTTY_BW_AUTO = false;
-progdefaults.changed = true;
-}
-
-Fl_Button *RTTYbandwidthAuto=(Fl_Button *)0;
-
-static void cb_RTTYbandwidthAuto(Fl_Button*, void*) {
-  progdefaults.RTTY_BW_AUTO = true;
-resetRTTY();
+RTTYbandwidthAuto->value(false);
 progdefaults.changed = true;
 }
 
@@ -1910,6 +1903,14 @@ resetRTTY();
 progdefaults.changed = true;
 }
 
+Fl_Check_Button *RTTYbandwidthAuto=(Fl_Check_Button *)0;
+
+static void cb_RTTYbandwidthAuto(Fl_Check_Button* o, void*) {
+  progdefaults.RTTY_BW_AUTO = o->value();
+resetRTTY();
+progdefaults.changed = true;
+}
+
 Fl_Group *tabTHOR=(Fl_Group *)0;
 
 Fl_Input2 *txtTHORSecondary=(Fl_Input2 *)0;
@@ -6120,9 +6121,6 @@ an merging"));
                 o->value(progdefaults.RTTY_BW);
                 o->labelsize(FL_NORMAL_SIZE); o->textsize(FL_NORMAL_SIZE);
               } // Fl_Value_Slider2* sldrRTTYbandwidth
-              { RTTYbandwidthAuto = new Fl_Button(390, 325, 65, 20, _("Auto"));
-                RTTYbandwidthAuto->callback((Fl_Callback*)cb_RTTYbandwidthAuto);
-              } // Fl_Button* RTTYbandwidthAuto
               { Fl_Counter2* o = selCustomShift = new Fl_Counter2(36, 103, 100, 20, _("Custom shift"));
                 selCustomShift->tooltip(_("Input carrier shift"));
                 selCustomShift->box(FL_UP_BOX);
@@ -6142,6 +6140,11 @@ an merging"));
                 o->lstep(10.0);
                 o->labelsize(FL_NORMAL_SIZE);
               } // Fl_Counter2* selCustomShift
+              { Fl_Check_Button* o = RTTYbandwidthAuto = new Fl_Check_Button(395, 325, 70, 20, _("Auto"));
+                RTTYbandwidthAuto->down_box(FL_DOWN_BOX);
+                RTTYbandwidthAuto->callback((Fl_Callback*)cb_RTTYbandwidthAuto);
+                o->value(progdefaults.RTTY_BW_AUTO);
+              } // Fl_Check_Button* RTTYbandwidthAuto
               o->end();
             } // Fl_Group* o
             tabRTTY->end();
diff --git a/src/dialogs/confdialog.fl b/src/dialogs/confdialog.fl
index f3214832..e0813cd7 100644
--- a/src/dialogs/confdialog.fl
+++ b/src/dialogs/confdialog.fl
@@ -2460,19 +2460,13 @@ progdefaults.changed = true;}
                 label {Receive filter bandwidth}
                 callback {progdefaults.RTTY_BW = o->value();
 progdefaults.RTTY_BW_AUTO = false;
+RTTYbandwidthAuto->value(false);
 progdefaults.changed = true;}
                 tooltip {Adjust the DSP bandwidth} xywh {85 325 300 20} type Horizontal align 5 minimum 5 maximum 1000 step 1 value 25 textsize 14
                 code0 {o->value(progdefaults.RTTY_BW);}
                 code1 {o->labelsize(FL_NORMAL_SIZE); o->textsize(FL_NORMAL_SIZE);}
                 class Fl_Value_Slider2
               }
-              Fl_Button RTTYbandwidthAuto {
-                label Auto
-                callback {progdefaults.RTTY_BW_AUTO = true;
-resetRTTY();
-progdefaults.changed = true;}
-                xywh {390 325 65 20}
-              }
               Fl_Counter selCustomShift {
                 label {Custom shift}
                 callback {progdefaults.rtty_custom_shift = o->value();
@@ -2483,6 +2477,14 @@ progdefaults.changed = true;}
                 code1 {o->labelsize(FL_NORMAL_SIZE);}
                 class Fl_Counter2
               }
+              Fl_Check_Button RTTYbandwidthAuto {
+                label Auto
+                callback {progdefaults.RTTY_BW_AUTO = o->value();
+resetRTTY();
+progdefaults.changed = true;}
+                xywh {395 325 70 20} down_box DOWN_BOX
+                code0 {o->value(progdefaults.RTTY_BW_AUTO);}
+              }
             }
           }
           Fl_Group tabTHOR {
diff --git a/src/dl_fldigi/update.cxx b/src/dl_fldigi/update.cxx
index c7f9b8ef..c74f5093 100644
--- a/src/dl_fldigi/update.cxx
+++ b/src/dl_fldigi/update.cxx
@@ -127,7 +127,7 @@ void *UpdateThread::run()
 /* Called by main thread only, while holding lock */
 static void got_update(void *)
 {
-    int c = fl_choice2("Test %s", "Close", "Open in browser", NULL,
+    int c = fl_choice2("%s", "Close", "Open in browser", NULL,
                        update_text.c_str());
     if (c)
     {
diff --git a/src/include/confdialog.h b/src/include/confdialog.h
index 844cf25d..6810607a 100644
--- a/src/include/confdialog.h
+++ b/src/include/confdialog.h
@@ -255,8 +255,8 @@ extern Fl_Check_Button *chkPseudoFSK;
 extern Fl_Choice *mnuRTTYAFCSpeed;
 extern Fl_Check_Button *chkXagc;
 extern Fl_Value_Slider2 *sldrRTTYbandwidth;
-extern Fl_Button *RTTYbandwidthAuto;
 extern Fl_Counter2 *selCustomShift;
+extern Fl_Check_Button *RTTYbandwidthAuto;
 extern Fl_Group *tabTHOR;
 extern Fl_Input2 *txtTHORSecondary;
 extern Fl_Check_Button *valTHOR_FILTER;