Change Olivia status fields

* Add 8/250 to quick change menu and Op Mode submenu
* Widen mode status field so that the BW/tones string
  will fit next to the modem name
* Add put_MODEstatus() with variable arguments
* Restore frequency offset status field

src/dialogs/fl_digi.cxx

@@ -270,6 +270,7 @@ void cb_init_mode(Fl_Widget *, void *arg);
 void cb_oliviaA(Fl_Widget *w, void *arg);
 void cb_oliviaB(Fl_Widget *w, void *arg);
 void cb_oliviaC(Fl_Widget *w, void *arg);
+void cb_oliviaD(Fl_Widget *w, void *arg);
 void cb_oliviaCustom(Fl_Widget *w, void *arg);
 
 void cb_rtty45(Fl_Widget *w, void *arg);
@@ -357,6 +358,7 @@ Fl_Menu_Item quick_change_throb[] = {
 };
 
 Fl_Menu_Item quick_change_olivia[] = {
+	{ "8/250", 0, cb_oliviaD, (void *)MODE_OLIVIA },
 	{ "8/500", 0, cb_oliviaA, (void *)MODE_OLIVIA },
 	{ "16/500", 0, cb_oliviaB, (void *)MODE_OLIVIA },
 	{ "32/1000", 0, cb_oliviaC, (void *)MODE_OLIVIA },
@@ -402,6 +404,14 @@ void cb_oliviaC(Fl_Widget *w, void *arg)
 	cb_init_mode(w, arg);
 }
 
+void cb_oliviaD(Fl_Widget *w, void *arg)
+{
+	progdefaults.oliviatones = 2;
+	progdefaults.oliviabw = 1;
+	set_olivia_tab_widgets();
+	cb_init_mode(w, arg);
+}
+
 void cb_oliviaCustom(Fl_Widget *w, void *arg)
 {
 	modem_config_tab = tabOlivia;
@@ -1591,6 +1601,7 @@ Fl_Menu_Item menu_[] = {
 {0,0,0,0,0,0,0,0,0},
 
 {"Olivia", 0, 0, 0, FL_SUBMENU, FL_NORMAL_LABEL, 0, 14, 0},
+{ "8/250", 0, cb_oliviaD, (void *)MODE_OLIVIA, 0, FL_NORMAL_LABEL, 0, 14, 0},
 { "8/500", 0, cb_oliviaA, (void *)MODE_OLIVIA, 0, FL_NORMAL_LABEL, 0, 14, 0},
 { "16/500", 0, cb_oliviaB, (void *)MODE_OLIVIA, 0, FL_NORMAL_LABEL, 0, 14, 0},
 { "32/1000", 0, cb_oliviaC, (void *)MODE_OLIVIA, FL_MENU_DIVIDER, FL_NORMAL_LABEL, 0, 14, 0},
@@ -2525,13 +2536,13 @@ void create_fl_digi_main() {
 
 		Fl_Pack *hpack = new Fl_Pack(0, Y, WNOM, Hstatus);
 			hpack->type(1);
-			MODEstatus = new Fl_Button(0,Hmenu+Hrcvtxt+Hxmttxt+Hwfall, Wmode, Hstatus, "");
+			MODEstatus = new Fl_Button(0,Hmenu+Hrcvtxt+Hxmttxt+Hwfall, Wmode+30, Hstatus, "");
 			MODEstatus->box(FL_DOWN_BOX);
 			MODEstatus->color(FL_BACKGROUND2_COLOR);
 			MODEstatus->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
 			MODEstatus->callback(status_cb, (void *)0);
 			MODEstatus->when(FL_WHEN_CHANGED);
-			MODEstatus->tooltip(_("Left clk - change mode\nRight clk - Modem Tab"));
+			MODEstatus->tooltip(_("Left click: change mode\nRight click: configure"));
 
 			Status1 = new Fl_Box(rightof(MODEstatus), Hmenu+Hrcvtxt+Hxmttxt+Hwfall, Ws2n, Hstatus, "");
 			Status1->box(FL_DOWN_BOX);
@@ -2879,15 +2890,22 @@ void clear_StatusMessages()
 	FL_AWAKE_D();
 }
 
-	
+void put_MODEstatus(const char* fmt, ...)
+{
+	static char s[32];
+	va_list args;
+	va_start(args, fmt);
+	vsnprintf(s, sizeof(s), fmt, args);
+
+	REQ(static_cast<void (Fl_Button::*)(const char *)>(&Fl_Button::label), MODEstatus, s);
+}
+
 void put_MODEstatus(trx_mode mode)
 {
-	FL_LOCK_D();
-	REQ(static_cast<void (Fl_Button::*)(const char *)>(&Fl_Button::label), MODEstatus, mode_info[mode].sname);
-	FL_UNLOCK_D();
-	FL_AWAKE_D();
+	put_MODEstatus("%s", mode_info[mode].sname);
 }
 
+
 void put_rx_data(int *data, int len)
 {
  	FHdisp->data(data, len);

src/include/fl_digi.h

@@ -156,6 +156,7 @@ enum status_timeout {
 };
 extern void put_status(const char *msg, double timeout = 0.0, status_timeout action = STATUS_CLEAR);
 extern void clear_StatusMessages();
+extern void put_MODEstatus(const char* fmt, ...) format__(printf, 1, 2);
 extern void put_MODEstatus(trx_mode mode);
 extern void put_Status1(const char *msg, double timeout = 0.0, status_timeout action = STATUS_CLEAR);
 extern void put_Status2(const char *msg, double timeout = 0.0, status_timeout action = STATUS_CLEAR);

src/olivia/olivia.cxx

@@ -226,7 +226,7 @@ int olivia::rx_process(const double *buf, int len)
 	unsigned char ch = 0;
 	double snr;
 	static char msg1[20];
-//	static char msg2[20];
+	static char msg2[20];
 //	static char msg3[60];
 
 	if (tones	!= progdefaults.oliviatones ||
@@ -270,8 +270,8 @@ int olivia::rx_process(const double *buf, int len)
 
 	snprintf(msg1, sizeof(msg1), "s/n %4.1f dB", s2n);
 	put_Status1(msg1);
-//	snprintf(msg2, sizeof(msg2), "Freq: %+4.1f", Rx->FrequencyOffset());
-//	put_Status2(msg2);
+	snprintf(msg2, sizeof(msg2), "f/o %+4.1f Hz", Rx->FrequencyOffset());
+	put_Status2(msg2);
 
 	while (Rx->GetChar(ch) > 0)
 		if ((c = unescape(ch)) != -1 && c > 7)
@@ -342,10 +342,7 @@ void olivia::restart()
 	fragmentsize = 1024;
 	set_bandwidth(Tx->Bandwidth);
 
-	put_MODEstatus(mode);
-	char szmsg[20];
-	snprintf(szmsg, sizeof(szmsg), "%d / %d", Tx->Tones, Tx->Bandwidth);
-	put_Status2(szmsg);
+	put_MODEstatus("%s %d/%d", get_mode_name(), Tx->Tones, Tx->Bandwidth);
 }
 
 void olivia::init()