kopia lustrzana https://github.com/jamescoxon/dl-fldigi
rodzic
5ca7182bb2
commit
68f88eed65
|
@ -5581,8 +5581,8 @@ Fl_Double_Window* ConfigureDialog() {
|
|||
o->value(progdefaults.myXchg.c_str());
|
||||
inpSend1->labelsize(FL_NORMAL_SIZE);
|
||||
} // Fl_Input2* inpSend1
|
||||
{ Fl_Check_Button* o = btn599 = new Fl_Check_Button(360, 90, 130, 20, _("RST always 599"));
|
||||
btn599->tooltip(_("Force RST in/out to 599"));
|
||||
{ Fl_Check_Button* o = btn599 = new Fl_Check_Button(360, 90, 130, 20, _("RST always 599/59"));
|
||||
btn599->tooltip(_("Force RST in/out to 599/59"));
|
||||
btn599->down_box(FL_DOWN_BOX);
|
||||
btn599->callback((Fl_Callback*)cb_btn599);
|
||||
o->value(progdefaults.fixed599);
|
||||
|
@ -5889,14 +5889,14 @@ Fl_Double_Window* ConfigureDialog() {
|
|||
btndate_time_force->callback((Fl_Callback*)cb_btndate_time_force);
|
||||
o->value(progdefaults.force_date_time);
|
||||
} // Fl_Check_Button* btndate_time_force
|
||||
{ Fl_Check_Button* o = btnRSTindefault = new Fl_Check_Button(322, 131, 186, 20, _("Default RST in to 599"));
|
||||
btnRSTindefault->tooltip(_("Clear log controls sets RST in to 599"));
|
||||
{ Fl_Check_Button* o = btnRSTindefault = new Fl_Check_Button(322, 131, 186, 20, _("Default RST in to 599/59"));
|
||||
btnRSTindefault->tooltip(_("Clear log controls sets RST in to 599/59"));
|
||||
btnRSTindefault->down_box(FL_DOWN_BOX);
|
||||
btnRSTindefault->callback((Fl_Callback*)cb_btnRSTindefault);
|
||||
o->value(progdefaults.RSTin_default);
|
||||
} // Fl_Check_Button* btnRSTindefault
|
||||
{ Fl_Check_Button* o = btnRSTdefault = new Fl_Check_Button(322, 157, 184, 20, _("Default RST out to 599"));
|
||||
btnRSTdefault->tooltip(_("Clear log controls sets RST out to 599"));
|
||||
{ Fl_Check_Button* o = btnRSTdefault = new Fl_Check_Button(322, 157, 184, 20, _("Default RST out to 599/59"));
|
||||
btnRSTdefault->tooltip(_("Clear log controls sets RST out to 599/59"));
|
||||
btnRSTdefault->down_box(FL_DOWN_BOX);
|
||||
btnRSTdefault->callback((Fl_Callback*)cb_btnRSTdefault);
|
||||
o->value(progdefaults.RSTdefault);
|
||||
|
|
|
@ -641,10 +641,10 @@ progdefaults.changed = true;}
|
|||
class Fl_Input2
|
||||
}
|
||||
Fl_Check_Button btn599 {
|
||||
label {RST always 599}
|
||||
label {RST always 599/59}
|
||||
callback {progdefaults.fixed599 = o->value();
|
||||
progdefaults.changed = true;}
|
||||
tooltip {Force RST in/out to 599} xywh {360 90 130 20} down_box DOWN_BOX
|
||||
tooltip {Force RST in/out to 599/59} xywh {360 90 130 20} down_box DOWN_BOX
|
||||
code0 {o->value(progdefaults.fixed599);}
|
||||
}
|
||||
Fl_Check_Button btnCutNbrs {
|
||||
|
@ -960,17 +960,17 @@ progdefaults.changed = true;}
|
|||
code0 {o->value(progdefaults.force_date_time);}
|
||||
}
|
||||
Fl_Check_Button btnRSTindefault {
|
||||
label {Default RST in to 599}
|
||||
label {Default RST in to 599/59}
|
||||
callback {progdefaults.RSTin_default = o->value();
|
||||
progdefaults.changed = true;}
|
||||
tooltip {Clear log controls sets RST in to 599} xywh {322 131 186 20} down_box DOWN_BOX
|
||||
tooltip {Clear log controls sets RST in to 599/59} xywh {322 131 186 20} down_box DOWN_BOX
|
||||
code0 {o->value(progdefaults.RSTin_default);}
|
||||
}
|
||||
Fl_Check_Button btnRSTdefault {
|
||||
label {Default RST out to 599}
|
||||
label {Default RST out to 599/59}
|
||||
callback {progdefaults.RSTdefault = o->value();
|
||||
progdefaults.changed = true;}
|
||||
tooltip {Clear log controls sets RST out to 599} xywh {322 157 184 20} down_box DOWN_BOX
|
||||
tooltip {Clear log controls sets RST out to 599/59} xywh {322 157 184 20} down_box DOWN_BOX
|
||||
code0 {o->value(progdefaults.RSTdefault);}
|
||||
}
|
||||
Fl_Input txt_cty_dat_pathname {
|
||||
|
|
|
@ -2370,14 +2370,15 @@ if (bWF_only) return;
|
|||
inpNotes };
|
||||
for (size_t i = 0; i < sizeof(in)/sizeof(*in); i++)
|
||||
in[i]->value("");
|
||||
string defrst = (active_modem->get_mode() == MODE_SSB) ? "59" : "599";
|
||||
if (progdefaults.fixed599 && progStatus.contest) {
|
||||
inpRstIn1->value("599"); inpRstIn2->value("599");
|
||||
inpRstOut1->value("599"); inpRstOut2->value("599");
|
||||
inpRstIn1->value(defrst.c_str()); inpRstIn2->value(defrst.c_str());
|
||||
inpRstOut1->value(defrst.c_str()); inpRstOut2->value(defrst.c_str());
|
||||
} else {
|
||||
if (progdefaults.RSTdefault)
|
||||
inpRstOut1->value("599");
|
||||
inpRstOut1->value(defrst.c_str());
|
||||
if (progdefaults.RSTin_default)
|
||||
inpRstIn1->value("599");
|
||||
inpRstIn1->value(defrst.c_str());
|
||||
}
|
||||
updateOutSerNo();
|
||||
if (inpSearchString)
|
||||
|
|
|
@ -751,10 +751,10 @@
|
|||
"Convert callsign field to upper case", \
|
||||
true) \
|
||||
ELEM_(bool, RSTdefault, "RSTDEFAULT", \
|
||||
"Default outgoing RST to 599", \
|
||||
"Default outgoing RST to 599/59", \
|
||||
false) \
|
||||
ELEM_(bool, RSTin_default, "RSTINDEFAULT", \
|
||||
"Default incoming RST to 599", \
|
||||
"Default incoming RST to 599/59", \
|
||||
false) \
|
||||
ELEM_(bool, autoextract, "AUTOEXTRACT", \
|
||||
"Enable detection and extraction of \"wrapped\" text", \
|
||||
|
|
Ładowanie…
Reference in New Issue