mirror
/
dl-fldigi
kopia lustrzana https://github.com/jamescoxon/dl-fldigi
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

UI changes 

* Added check box / configuration item for presetting
    RST-in to 599 when clearing the log entries
pull/2/head
David Freese 2011-11-30 09:00:54 -06:00
rodzic 7beb7c1dc1
commit 2f2fe0ae43
5 zmienionych plików z 37 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

17
src/dialogs/confdialog.cxx
Wyświetl plik

@ -209,6 +209,13 @@ static void cb_btnRSTdefault(Fl_Check_Button* o, void*) {
progdefaults.changed = true;
}
Fl_Check_Button *btnRSTindefault=(Fl_Check_Button *)0;
static void cb_btnRSTindefault(Fl_Check_Button* o, void*) {
progdefaults.RSTin_default = o->value();
progdefaults.changed = true;
}
Fl_Check_Button *btnRXClicks=(Fl_Check_Button *)0;
static void cb_btnRXClicks(Fl_Check_Button* o, void*) {
@ -3264,6 +3271,12 @@ static const char szProsigns[] = "~|%|&|+|=|{|}|<|>|[|]| ";
btnRSTdefault->callback((Fl_Callback*)cb_btnRSTdefault);
o->value(progdefaults.RSTdefault);
} // Fl_Check_Button* btnRSTdefault
{ Fl_Check_Button* o = btnRSTindefault = new Fl_Check_Button(272, 228, 186, 20, _("Default RST in to 599"));
btnRSTindefault->tooltip(_("Clear log controls sets RST out to 599"));
btnRSTindefault->down_box(FL_DOWN_BOX);
btnRSTindefault->callback((Fl_Callback*)cb_btnRSTindefault);
o->value(progdefaults.RSTin_default);
} // Fl_Check_Button* btnRSTindefault
o->end();
} // Fl_Group* o
{ Fl_Group* o = new Fl_Group(2, 265, 496, 100, _("Text Capture"));
@ -4085,7 +4098,6 @@ an merging"));
tabsModems->selection_color((Fl_Color)FL_LIGHT1);
tabsModems->align(FL_ALIGN_TOP_RIGHT);
{ tabCW = new Fl_Group(0, 50, 504, 320, _("CW"));
tabCW->hide();
{ tabsCW = new Fl_Tabs(0, 50, 504, 320);
tabsCW->selection_color((Fl_Color)FL_LIGHT1);
{ Fl_Group* o = new Fl_Group(0, 75, 500, 295, _("General"));
@ -4971,6 +4983,7 @@ an merging"));
tabPSK->end();
} // Fl_Group* tabPSK
{ tabRTTY = new Fl_Group(0, 50, 500, 320, _("RTTY"));
tabRTTY->hide();
{ Fl_Group* o = new Fl_Group(5, 60, 490, 300);
o->box(FL_ENGRAVED_FRAME);
{ Fl_Choice* o = selShift = new Fl_Choice(15, 70, 100, 20, _("Carrier shift"));
@ -5253,7 +5266,6 @@ an merging"));
{ tabsRig = new Fl_Tabs(0, 25, 500, 345);
tabsRig->selection_color((Fl_Color)FL_LIGHT1);
{ Fl_Group* o = new Fl_Group(0, 50, 500, 320, _("Hardware PTT"));
o->hide();
{ grpHWPTT = new Fl_Group(5, 100, 490, 265, _("h/w ptt device-pin"));
grpHWPTT->box(FL_ENGRAVED_FRAME);
grpHWPTT->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
@ -5316,6 +5328,7 @@ an merging"));
} // Fl_Group* o
{ Fl_Group* o = new Fl_Group(0, 50, 500, 320, _("RigCAT"));
o->tooltip(_("Rig Control using xml spec file"));
o->hide();
{ chkUSERIGCAT = new Fl_Check_Button(195, 60, 110, 20, _("Use RigCAT"));
chkUSERIGCAT->tooltip(_("RigCAT used for rig control"));
chkUSERIGCAT->down_box(FL_DOWN_BOX);

17
src/dialogs/confdialog.fl
Wyświetl plik

@ -187,7 +187,7 @@ progdefaults.changed = true;}
}
}
Fl_Group tabUI {
label UI
label UI open
xywh {0 25 502 346} hide
} {
Fl_Tabs tabsUI {open
@ -306,6 +306,13 @@ progdefaults.changed = true;}
tooltip {Clear log controls sets RST out to 599} xywh {19 228 236 20} down_box DOWN_BOX
code0 {o->value(progdefaults.RSTdefault);}
}
Fl_Check_Button btnRSTindefault {
label {Default RST in to 599}
callback {progdefaults.RSTin_default = o->value();
progdefaults.changed = true;}
tooltip {Clear log controls sets RST out to 599} xywh {272 228 186 20} down_box DOWN_BOX
code0 {o->value(progdefaults.RSTin_default);}
}
}
Fl_Group {} {
label {Text Capture} open
@ -1248,7 +1255,7 @@ behaves inside the waterfall} xywh {15 196 150 22} down_box BORDER_BOX align 8
} {
Fl_Group tabCW {
label CW
xywh {0 50 504 320} hide
xywh {0 50 504 320}
} {
Fl_Tabs tabsCW {
xywh {0 50 504 320} selection_color 50
@ -2044,7 +2051,7 @@ progdefaults.changed = true;}
}
Fl_Group tabRTTY {
label RTTY open
xywh {0 50 500 320}
xywh {0 50 500 320} hide
} {
Fl_Group {} {open
xywh {5 60 490 300} box ENGRAVED_FRAME
@ -2291,7 +2298,7 @@ progdefaults.changed = true;}
} {
Fl_Group {} {
label {Hardware PTT} open
xywh {0 50 500 320} hide
xywh {0 50 500 320}
} {
Fl_Group grpHWPTT {
label {h/w ptt device-pin} open
@ -2397,7 +2404,7 @@ progdefaults.changed = true;}
}
Fl_Group {} {
label RigCAT open
tooltip {Rig Control using xml spec file} xywh {0 50 500 320}
tooltip {Rig Control using xml spec file} xywh {0 50 500 320} hide
} {
Fl_Check_Button chkUSERIGCAT {
label {Use RigCAT}

8
src/dialogs/fl_digi.cxx
Wyświetl plik

@ -1934,8 +1934,12 @@ if (bWF_only) return;
if (progdefaults.fixed599 && progStatus.contest) {
inpRstIn1->value("599"); inpRstIn2->value("599");
inpRstOut1->value("599"); inpRstOut2->value("599");
} else if (progdefaults.RSTdefault)
inpRstOut1->value("599");
} else {
if (progdefaults.RSTdefault)
inpRstOut1->value("599");
if (progdefaults.RSTin_default)
inpRstIn1->value("599");
}
inpCall1->color(FL_BACKGROUND2_COLOR);
inpCall2->color(FL_BACKGROUND2_COLOR);
inpCall3->color(FL_BACKGROUND2_COLOR);

1
src/include/confdialog.h
Wyświetl plik

@ -45,6 +45,7 @@ extern Fl_Check_Button *btnDateTimeSort;
extern Fl_Check_Button *btndate_time_force;
extern Fl_Input2 *inpMyPower;
extern Fl_Check_Button *btnRSTdefault;
extern Fl_Check_Button *btnRSTindefault;
extern Fl_Check_Button *btnRXClicks;
extern Fl_Check_Button *btnRXTooltips;
extern Fl_Input2 *inpNonword;

3
src/include/configuration.h
Wyświetl plik

@ -625,6 +625,9 @@
ELEM_(bool, RSTdefault, "RSTDEFAULT", \
"Default outgoing RST to 599", \
false) \
ELEM_(bool, RSTin_default, "RSTINDEFAULT", \
"Default incoming RST to 599", \
false) \
ELEM_(bool, autoextract, "AUTOEXTRACT", \
"Enable detection and extraction of \"wrapped\" text", \
true) \