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

RxID enhancement 

* Add right click pop-up menu
    - PASSBAND - check box ON/OFF
  * Color code ON illumination for
    PASSBAND ON/OFF
pull/4/head
David Freese 2016-03-05 10:27:36 -06:00
rodzic f7662dfa82
commit b1d12b8442
6 zmienionych plików z 281 dodań i 198 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -1954,23 +1954,13 @@ spot_selection_color();
progdefaults.changed = true;
}
Fl_Button *btnRxIDColor=(Fl_Button *)0;
Fl_Button *btnRevColor=(Fl_Button *)0;
static void cb_btnRxIDColor(Fl_Button*, void*) {
progdefaults.RxIDColor = fl_show_colormap(progdefaults.RxIDColor);
rxidcolor->color(progdefaults.RxIDColor);
rxidcolor->redraw();
rxid_selection_color();
progdefaults.changed = true;
}
Fl_Button *btnTxIDColor=(Fl_Button *)0;
static void cb_btnTxIDColor(Fl_Button*, void*) {
progdefaults.TxIDColor = fl_show_colormap(progdefaults.TxIDColor);
txidcolor->color(progdefaults.TxIDColor);
txidcolor->redraw();
txid_selection_color();
static void cb_btnRevColor(Fl_Button*, void*) {
progdefaults.RevColor = fl_show_colormap(progdefaults.RevColor);
revcolor->color(progdefaults.RevColor);
revcolor->redraw();
rev_selection_color();
progdefaults.changed = true;
}
@ -1984,6 +1974,16 @@ tune_selection_color();
progdefaults.changed = true;
}
Fl_Button *btnRxIDColor=(Fl_Button *)0;
static void cb_btnRxIDColor(Fl_Button*, void*) {
progdefaults.RxIDColor = fl_show_colormap(progdefaults.RxIDColor);
rxidcolor->color(progdefaults.RxIDColor);
rxidcolor->redraw();
rxid_selection_color();
progdefaults.changed = true;
}
Fl_Button *btnLkColor=(Fl_Button *)0;
static void cb_btnLkColor(Fl_Button*, void*) {
@ -1994,36 +1994,6 @@ xmtlock_selection_color();
progdefaults.changed = true;
}
Fl_Button *btnRevColor=(Fl_Button *)0;
static void cb_btnRevColor(Fl_Button*, void*) {
progdefaults.RevColor = fl_show_colormap(progdefaults.RevColor);
revcolor->color(progdefaults.RevColor);
revcolor->redraw();
rev_selection_color();
progdefaults.changed = true;
}
Fl_Button *btnXmtColor=(Fl_Button *)0;
static void cb_btnXmtColor(Fl_Button*, void*) {
progdefaults.XmtColor = fl_show_colormap(progdefaults.XmtColor);
xmtcolor->color(progdefaults.XmtColor);
xmtcolor->redraw();
xmtrcv_selection_color();
progdefaults.changed = true;
}
Fl_Button *btnAfcColor=(Fl_Button *)0;
static void cb_btnAfcColor(Fl_Button*, void*) {
progdefaults.AfcColor = fl_show_colormap(progdefaults.AfcColor);
afccolor->color(progdefaults.AfcColor);
afccolor->redraw();
afc_selection_color();
progdefaults.changed = true;
}
Fl_Button *btnSql1Color=(Fl_Button *)0;
static void cb_btnSql1Color(Fl_Button*, void*) {
@ -2034,6 +2004,36 @@ sql_selection_color();
progdefaults.changed = true;
}
Fl_Button *btnXmtColor=(Fl_Button *)0;
static void cb_btnXmtColor(Fl_Button*, void*) {
progdefaults.XmtColor = fl_show_colormap(progdefaults.XmtColor);
xmtcolor->color(progdefaults.XmtColor);
xmtcolor->redraw();
xmtrcv_selection_color();
progdefaults.changed = true;
}
Fl_Button *btnRxIDwideColor=(Fl_Button *)0;
static void cb_btnRxIDwideColor(Fl_Button*, void*) {
progdefaults.RxIDwideColor = fl_show_colormap(progdefaults.RxIDwideColor);
rxidcolorwide->color(progdefaults.RxIDwideColor);
rxidcolorwide->redraw();
rxid_selection_color();
progdefaults.changed = true;
}
Fl_Button *btnAfcColor=(Fl_Button *)0;
static void cb_btnAfcColor(Fl_Button*, void*) {
progdefaults.AfcColor = fl_show_colormap(progdefaults.AfcColor);
afccolor->color(progdefaults.AfcColor);
afccolor->redraw();
afc_selection_color();
progdefaults.changed = true;
}
Fl_Button *btnSql2Color=(Fl_Button *)0;
static void cb_btnSql2Color(Fl_Button*, void*) {
@ -2044,26 +2044,38 @@ sql_selection_color();
progdefaults.changed = true;
}
Fl_Button *btnTxIDColor=(Fl_Button *)0;
static void cb_btnTxIDColor(Fl_Button*, void*) {
progdefaults.TxIDColor = fl_show_colormap(progdefaults.TxIDColor);
txidcolor->color(progdefaults.TxIDColor);
txidcolor->redraw();
txid_selection_color();
progdefaults.changed = true;
}
Fl_Box *spotcolor=(Fl_Box *)0;
Fl_Box *rxidcolor=(Fl_Box *)0;
Fl_Box *txidcolor=(Fl_Box *)0;
Fl_Box *revcolor=(Fl_Box *)0;
Fl_Box *tunecolor=(Fl_Box *)0;
Fl_Box *rxidcolor=(Fl_Box *)0;
Fl_Box *lockcolor=(Fl_Box *)0;
Fl_Box *revcolor=(Fl_Box *)0;
Fl_Box *sql1color=(Fl_Box *)0;
Fl_Box *rxidcolorwide=(Fl_Box *)0;
Fl_Box *xmtcolor=(Fl_Box *)0;
Fl_Box *afccolor=(Fl_Box *)0;
Fl_Box *sql1color=(Fl_Box *)0;
Fl_Box *sql2color=(Fl_Box *)0;
Fl_Box *txidcolor=(Fl_Box *)0;
Fl_Button *btnLowSignal=(Fl_Button *)0;
static void cb_btnLowSignal(Fl_Button*, void*) {
@ -4596,6 +4608,7 @@ Fl_Check_Button *chkRSidWideSearch=(Fl_Check_Button *)0;
static void cb_chkRSidWideSearch(Fl_Check_Button* o, void*) {
progdefaults.rsidWideSearch=o->value();
rxid_selection_color();
progdefaults.changed = true;
}
@ -6020,6 +6033,7 @@ Fl_Double_Window* ConfigureDialog() {
tabsUI->selection_color(FL_LIGHT1);
{ tabBrowser = new Fl_Group(0, 50, 600, 330, _("Browser"));
tabBrowser->tooltip(_("User Interface - Browser"));
tabBrowser->hide();
{ Fl_Group* o = new Fl_Group(30, 65, 540, 300);
o->box(FL_ENGRAVED_FRAME);
{ Fl_Spinner2* o = cntChannels = new Fl_Spinner2(46, 75, 50, 24, _("Channels, first channel starts at waterfall lower limit"));
@ -6846,7 +6860,6 @@ ab and newline are automatically included."));
} // Fl_Group* tabWF_UI
{ tabColorsFonts = new Fl_Group(0, 50, 600, 330, _("Clrs/Fnts"));
tabColorsFonts->tooltip(_("User Interface - Colors / Fonts"));
tabColorsFonts->hide();
{ tabsColors = new Fl_Tabs(0, 55, 600, 325);
{ Fl_Group* o = new Fl_Group(0, 80, 600, 300, _("Rx/Tx"));
o->hide();
@ -7108,86 +7121,93 @@ ab and newline are automatically included."));
o->end();
} // Fl_Group* o
{ Fl_Group* o = new Fl_Group(0, 80, 600, 300, _("Buttons"));
o->hide();
{ btnSpotColor = new Fl_Button(159, 121, 70, 21, _("Spot"));
{ btnSpotColor = new Fl_Button(139, 121, 85, 21, _("Spot"));
btnSpotColor->callback((Fl_Callback*)cb_btnSpotColor);
} // Fl_Button* btnSpotColor
{ btnRxIDColor = new Fl_Button(159, 157, 70, 21, _("RxID"));
btnRxIDColor->callback((Fl_Callback*)cb_btnRxIDColor);
} // Fl_Button* btnRxIDColor
{ btnTxIDColor = new Fl_Button(159, 193, 70, 20, _("TxID"));
btnTxIDColor->callback((Fl_Callback*)cb_btnTxIDColor);
} // Fl_Button* btnTxIDColor
{ btnTuneColor = new Fl_Button(159, 229, 70, 21, _("Tune"));
btnTuneColor->callback((Fl_Callback*)cb_btnTuneColor);
} // Fl_Button* btnTuneColor
{ btnLkColor = new Fl_Button(274, 121, 70, 21, _("Lk"));
btnLkColor->callback((Fl_Callback*)cb_btnLkColor);
} // Fl_Button* btnLkColor
{ btnRevColor = new Fl_Button(274, 157, 70, 21, _("Rev"));
{ btnRevColor = new Fl_Button(139, 157, 85, 21, _("Rev"));
btnRevColor->callback((Fl_Callback*)cb_btnRevColor);
} // Fl_Button* btnRevColor
{ btnXmtColor = new Fl_Button(274, 193, 70, 20, _("T/R"));
btnXmtColor->callback((Fl_Callback*)cb_btnXmtColor);
} // Fl_Button* btnXmtColor
{ btnAfcColor = new Fl_Button(390, 121, 70, 21, _("AFC"));
btnAfcColor->callback((Fl_Callback*)cb_btnAfcColor);
} // Fl_Button* btnAfcColor
{ btnSql1Color = new Fl_Button(390, 157, 70, 21, _("SQL-1"));
{ btnTuneColor = new Fl_Button(139, 194, 85, 21, _("Tune"));
btnTuneColor->callback((Fl_Callback*)cb_btnTuneColor);
} // Fl_Button* btnTuneColor
{ btnRxIDColor = new Fl_Button(139, 229, 85, 21, _("RxID nar"));
btnRxIDColor->callback((Fl_Callback*)cb_btnRxIDColor);
} // Fl_Button* btnRxIDColor
{ btnLkColor = new Fl_Button(274, 121, 85, 21, _("Lk"));
btnLkColor->callback((Fl_Callback*)cb_btnLkColor);
} // Fl_Button* btnLkColor
{ btnSql1Color = new Fl_Button(275, 157, 85, 21, _("SQL-1"));
btnSql1Color->callback((Fl_Callback*)cb_btnSql1Color);
} // Fl_Button* btnSql1Color
{ btnSql2Color = new Fl_Button(390, 193, 70, 20, _("SQL-2"));
{ btnXmtColor = new Fl_Button(274, 194, 85, 20, _("T/R"));
btnXmtColor->callback((Fl_Callback*)cb_btnXmtColor);
} // Fl_Button* btnXmtColor
{ btnRxIDwideColor = new Fl_Button(274, 229, 85, 21, _("RxID wide"));
btnRxIDwideColor->callback((Fl_Callback*)cb_btnRxIDwideColor);
} // Fl_Button* btnRxIDwideColor
{ btnAfcColor = new Fl_Button(410, 121, 85, 21, _("AFC"));
btnAfcColor->callback((Fl_Callback*)cb_btnAfcColor);
} // Fl_Button* btnAfcColor
{ btnSql2Color = new Fl_Button(410, 157, 85, 20, _("SQL-2"));
btnSql2Color->callback((Fl_Callback*)cb_btnSql2Color);
} // Fl_Button* btnSql2Color
{ Fl_Box* o = spotcolor = new Fl_Box(135, 122, 18, 19);
{ btnTxIDColor = new Fl_Button(409, 229, 85, 20, _("TxID"));
btnTxIDColor->callback((Fl_Callback*)cb_btnTxIDColor);
} // Fl_Button* btnTxIDColor
{ Fl_Box* o = spotcolor = new Fl_Box(115, 122, 18, 19);
spotcolor->box(FL_THIN_DOWN_BOX);
spotcolor->color((Fl_Color)3);
o->color(progdefaults.SpotColor);
} // Fl_Box* spotcolor
{ Fl_Box* o = rxidcolor = new Fl_Box(135, 158, 18, 19);
rxidcolor->box(FL_THIN_DOWN_BOX);
o->color(progdefaults.RxIDColor);
} // Fl_Box* rxidcolor
{ Fl_Box* o = txidcolor = new Fl_Box(135, 194, 18, 18);
txidcolor->box(FL_THIN_DOWN_BOX);
o->color(progdefaults.TxIDColor);
} // Fl_Box* txidcolor
{ Fl_Box* o = tunecolor = new Fl_Box(135, 230, 18, 19);
{ Fl_Box* o = revcolor = new Fl_Box(115, 158, 18, 19);
revcolor->box(FL_THIN_DOWN_BOX);
o->color(progdefaults.RevColor);
} // Fl_Box* revcolor
{ Fl_Box* o = tunecolor = new Fl_Box(115, 195, 18, 19);
tunecolor->box(FL_THIN_DOWN_BOX);
o->color(progdefaults.TuneColor);
} // Fl_Box* tunecolor
{ Fl_Box* o = rxidcolor = new Fl_Box(115, 230, 18, 19);
rxidcolor->box(FL_THIN_DOWN_BOX);
o->color(progdefaults.RxIDColor);
} // Fl_Box* rxidcolor
{ Fl_Box* o = lockcolor = new Fl_Box(250, 122, 18, 19);
lockcolor->box(FL_THIN_DOWN_BOX);
lockcolor->color((Fl_Color)3);
o->color(progdefaults.LkColor);
} // Fl_Box* lockcolor
{ Fl_Box* o = revcolor = new Fl_Box(250, 158, 18, 19);
revcolor->box(FL_THIN_DOWN_BOX);
o->color(progdefaults.RevColor);
} // Fl_Box* revcolor
{ Fl_Box* o = xmtcolor = new Fl_Box(250, 194, 18, 18);
{ Fl_Box* o = sql1color = new Fl_Box(250, 158, 18, 19);
sql1color->box(FL_THIN_DOWN_BOX);
o->color(progdefaults.Sql1Color);
} // Fl_Box* sql1color
{ Fl_Box* o = rxidcolorwide = new Fl_Box(250, 230, 18, 19);
rxidcolorwide->box(FL_THIN_DOWN_BOX);
o->color(progdefaults.RxIDwideColor);
} // Fl_Box* rxidcolorwide
{ Fl_Box* o = xmtcolor = new Fl_Box(250, 195, 18, 18);
xmtcolor->box(FL_THIN_DOWN_BOX);
o->color(progdefaults.XmtColor);
} // Fl_Box* xmtcolor
{ Fl_Box* o = afccolor = new Fl_Box(365, 122, 18, 19);
{ Fl_Box* o = afccolor = new Fl_Box(385, 122, 18, 19);
afccolor->box(FL_THIN_DOWN_BOX);
afccolor->color((Fl_Color)3);
o->color(progdefaults.AfcColor);
} // Fl_Box* afccolor
{ Fl_Box* o = sql1color = new Fl_Box(365, 158, 18, 19);
sql1color->box(FL_THIN_DOWN_BOX);
o->color(progdefaults.Sql1Color);
} // Fl_Box* sql1color
{ Fl_Box* o = sql2color = new Fl_Box(365, 194, 18, 18);
{ Fl_Box* o = sql2color = new Fl_Box(385, 158, 18, 18);
sql2color->box(FL_THIN_DOWN_BOX);
o->color(progdefaults.Sql2Color);
} // Fl_Box* sql2color
{ Fl_Box* o = new Fl_Box(248, 229, 220, 20, _("Lighted button enabled colors"));
{ Fl_Box* o = txidcolor = new Fl_Box(385, 230, 18, 18);
txidcolor->box(FL_THIN_DOWN_BOX);
o->color(progdefaults.TxIDColor);
} // Fl_Box* txidcolor
{ Fl_Box* o = new Fl_Box(200, 275, 220, 20, _("Lighted button enabled colors"));
o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE));
} // Fl_Box* o
o->end();
} // Fl_Group* o
{ Fl_Group* o = new Fl_Group(0, 80, 600, 300, _("SigLvl"));
o->hide();
{ btnLowSignal = new Fl_Button(210, 142, 70, 21, _("Low"));
btnLowSignal->callback((Fl_Callback*)cb_btnLowSignal);
} // Fl_Button* btnLowSignal

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

@ -474,7 +474,7 @@ progdefaults.changed = true;}
} {
Fl_Group tabBrowser {
label Browser
tooltip {User Interface - Browser} xywh {0 50 600 330}
tooltip {User Interface - Browser} xywh {0 50 600 330} hide
} {
Fl_Group {} {open
xywh {30 65 540 300} box ENGRAVED_FRAME
@ -1463,7 +1463,7 @@ WF_UI();}
}
Fl_Group tabColorsFonts {
label {Clrs/Fnts} open
tooltip {User Interface - Colors / Fonts} xywh {0 50 600 330} hide
tooltip {User Interface - Colors / Fonts} xywh {0 50 600 330}
} {
Fl_Tabs tabsColors {open
xywh {0 55 600 325}
@ -2305,7 +2305,7 @@ progdefaults.changed = true;}
}
Fl_Group {} {
label Buttons open
xywh {0 80 600 300} hide
xywh {0 80 600 300}
} {
Fl_Button btnSpotColor {
label Spot
@ -2314,43 +2314,7 @@ spotcolor->color(progdefaults.SpotColor);
spotcolor->redraw();
spot_selection_color();
progdefaults.changed = true;}
xywh {159 121 70 21}
}
Fl_Button btnRxIDColor {
label RxID
callback {progdefaults.RxIDColor = fl_show_colormap(progdefaults.RxIDColor);
rxidcolor->color(progdefaults.RxIDColor);
rxidcolor->redraw();
rxid_selection_color();
progdefaults.changed = true;}
xywh {159 157 70 21}
}
Fl_Button btnTxIDColor {
label TxID
callback {progdefaults.TxIDColor = fl_show_colormap(progdefaults.TxIDColor);
txidcolor->color(progdefaults.TxIDColor);
txidcolor->redraw();
txid_selection_color();
progdefaults.changed = true;}
xywh {159 193 70 20}
}
Fl_Button btnTuneColor {
label Tune
callback {progdefaults.TuneColor = fl_show_colormap(progdefaults.TuneColor);
tunecolor->color(progdefaults.TuneColor);
tunecolor->redraw();
tune_selection_color();
progdefaults.changed = true;}
xywh {159 229 70 21}
}
Fl_Button btnLkColor {
label Lk
callback {progdefaults.LkColor = fl_show_colormap(progdefaults.LkColor);
lockcolor->color(progdefaults.LkColor);
lockcolor->redraw();
xmtlock_selection_color();
progdefaults.changed = true;}
xywh {274 121 70 21}
xywh {139 121 85 21}
}
Fl_Button btnRevColor {
label Rev
@ -2359,25 +2323,34 @@ revcolor->color(progdefaults.RevColor);
revcolor->redraw();
rev_selection_color();
progdefaults.changed = true;}
xywh {274 157 70 21}
xywh {139 157 85 21}
}
Fl_Button btnXmtColor {
label {T/R}
callback {progdefaults.XmtColor = fl_show_colormap(progdefaults.XmtColor);
xmtcolor->color(progdefaults.XmtColor);
xmtcolor->redraw();
xmtrcv_selection_color();
Fl_Button btnTuneColor {
label Tune
callback {progdefaults.TuneColor = fl_show_colormap(progdefaults.TuneColor);
tunecolor->color(progdefaults.TuneColor);
tunecolor->redraw();
tune_selection_color();
progdefaults.changed = true;}
xywh {274 193 70 20}
xywh {139 194 85 21}
}
Fl_Button btnAfcColor {
label AFC
callback {progdefaults.AfcColor = fl_show_colormap(progdefaults.AfcColor);
afccolor->color(progdefaults.AfcColor);
afccolor->redraw();
afc_selection_color();
Fl_Button btnRxIDColor {
label {RxID nar}
callback {progdefaults.RxIDColor = fl_show_colormap(progdefaults.RxIDColor);
rxidcolor->color(progdefaults.RxIDColor);
rxidcolor->redraw();
rxid_selection_color();
progdefaults.changed = true;}
xywh {390 121 70 21}
xywh {139 229 85 21}
}
Fl_Button btnLkColor {
label Lk
callback {progdefaults.LkColor = fl_show_colormap(progdefaults.LkColor);
lockcolor->color(progdefaults.LkColor);
lockcolor->redraw();
xmtlock_selection_color();
progdefaults.changed = true;}
xywh {274 121 85 21}
}
Fl_Button btnSql1Color {
label {SQL-1}
@ -2386,7 +2359,34 @@ sql1color->color(progdefaults.Sql1Color);
sql1color->redraw();
sql_selection_color();
progdefaults.changed = true;}
xywh {390 157 70 21}
xywh {275 157 85 21}
}
Fl_Button btnXmtColor {
label {T/R}
callback {progdefaults.XmtColor = fl_show_colormap(progdefaults.XmtColor);
xmtcolor->color(progdefaults.XmtColor);
xmtcolor->redraw();
xmtrcv_selection_color();
progdefaults.changed = true;}
xywh {274 194 85 20}
}
Fl_Button btnRxIDwideColor {
label {RxID wide}
callback {progdefaults.RxIDwideColor = fl_show_colormap(progdefaults.RxIDwideColor);
rxidcolorwide->color(progdefaults.RxIDwideColor);
rxidcolorwide->redraw();
rxid_selection_color();
progdefaults.changed = true;}
xywh {274 229 85 21}
}
Fl_Button btnAfcColor {
label AFC
callback {progdefaults.AfcColor = fl_show_colormap(progdefaults.AfcColor);
afccolor->color(progdefaults.AfcColor);
afccolor->redraw();
afc_selection_color();
progdefaults.changed = true;}
xywh {410 121 85 21}
}
Fl_Button btnSql2Color {
label {SQL-2}
@ -2395,56 +2395,69 @@ sql2color->color(progdefaults.Sql2Color);
sql2color->redraw();
sql_selection_color();
progdefaults.changed = true;}
xywh {390 193 70 20}
xywh {410 157 85 20}
}
Fl_Button btnTxIDColor {
label TxID
callback {progdefaults.TxIDColor = fl_show_colormap(progdefaults.TxIDColor);
txidcolor->color(progdefaults.TxIDColor);
txidcolor->redraw();
txid_selection_color();
progdefaults.changed = true;}
xywh {409 229 85 20}
}
Fl_Box spotcolor {
xywh {135 122 18 19} box THIN_DOWN_BOX color 3
xywh {115 122 18 19} box THIN_DOWN_BOX color 3
code0 {o->color(progdefaults.SpotColor);}
}
Fl_Box rxidcolor {
xywh {135 158 18 19} box THIN_DOWN_BOX
code0 {o->color(progdefaults.RxIDColor);}
}
Fl_Box txidcolor {
xywh {135 194 18 18} box THIN_DOWN_BOX
code0 {o->color(progdefaults.TxIDColor);}
Fl_Box revcolor {
xywh {115 158 18 19} box THIN_DOWN_BOX
code0 {o->color(progdefaults.RevColor);}
}
Fl_Box tunecolor {
xywh {135 230 18 19} box THIN_DOWN_BOX
xywh {115 195 18 19} box THIN_DOWN_BOX
code0 {o->color(progdefaults.TuneColor);}
}
Fl_Box rxidcolor {
xywh {115 230 18 19} box THIN_DOWN_BOX
code0 {o->color(progdefaults.RxIDColor);}
}
Fl_Box lockcolor {
xywh {250 122 18 19} box THIN_DOWN_BOX color 3
code0 {o->color(progdefaults.LkColor);}
}
Fl_Box revcolor {
Fl_Box sql1color {
xywh {250 158 18 19} box THIN_DOWN_BOX
code0 {o->color(progdefaults.RevColor);}
code0 {o->color(progdefaults.Sql1Color);}
}
Fl_Box rxidcolorwide {
xywh {250 230 18 19} box THIN_DOWN_BOX
code0 {o->color(progdefaults.RxIDwideColor);}
}
Fl_Box xmtcolor {
xywh {250 194 18 18} box THIN_DOWN_BOX
xywh {250 195 18 18} box THIN_DOWN_BOX
code0 {o->color(progdefaults.XmtColor);}
}
Fl_Box afccolor {
xywh {365 122 18 19} box THIN_DOWN_BOX color 3
xywh {385 122 18 19} box THIN_DOWN_BOX color 3
code0 {o->color(progdefaults.AfcColor);}
}
Fl_Box sql1color {
xywh {365 158 18 19} box THIN_DOWN_BOX
code0 {o->color(progdefaults.Sql1Color);}
}
Fl_Box sql2color {
xywh {365 194 18 18} box THIN_DOWN_BOX
xywh {385 158 18 18} box THIN_DOWN_BOX
code0 {o->color(progdefaults.Sql2Color);}
}
Fl_Box txidcolor {
xywh {385 230 18 18} box THIN_DOWN_BOX
code0 {o->color(progdefaults.TxIDColor);}
}
Fl_Box {} {
label {Lighted button enabled colors}
xywh {248 229 220 20} align 21
xywh {200 275 220 20} align 21
}
}
Fl_Group {} {
label SigLvl open
xywh {0 80 600 300}
xywh {0 80 600 300} hide
} {
Fl_Button btnLowSignal {
label Low
@ -5716,6 +5729,7 @@ progdefaults.changed = true;}
Fl_Check_Button chkRSidWideSearch {
label {Searches passband}
callback {progdefaults.rsidWideSearch=o->value();
rxid_selection_color();
progdefaults.changed = true;}
tooltip {ON - search over entire waterfall
OFF - limit search to +/- 200 Hz} xywh {40 143 203 20} down_box DOWN_BOX

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

@ -237,7 +237,8 @@ Fl_Menu_Bar *mnu;
Fl_Box *tx_timer = (Fl_Box *)0;
Fl_Light_Button *btnAutoSpot = (Fl_Light_Button *)0;
Fl_Light_Button *btnTune = (Fl_Light_Button *)0;
Fl_Light_Button *btnRSID = (Fl_Light_Button *)0;
Fl_Box *rsid_status = (Fl_Box *)0;
Fl_Button *btnRSID = (Fl_Light_Button *)0;
Fl_Light_Button *btnTxRSID = (Fl_Light_Button *)0;
static Fl_Button *btnMacroTimer = (Fl_Button *)0;
@ -2574,10 +2575,41 @@ void cbTune(Fl_Widget *w, void *) {
restoreFocus(10);
}
void cb_quick_rsid (Fl_Widget *w, void *)
{
progdefaults.rsidWideSearch = !progdefaults.rsidWideSearch;
if (progdefaults.rsidWideSearch) chkRSidWideSearch->set();
else chkRSidWideSearch->clear();
}
static Fl_Menu_Item quick_change_rsid[] = {
{ "Passband", 0, cb_quick_rsid, 0, FL_MENU_TOGGLE },
{0,0,0,0,0,0,0,0,0}
};
void cbRSID(Fl_Widget *w, void *)
{
progdefaults.rsid = btnRSID->value();
progdefaults.changed = true;
switch (Fl::event_button()) {
case FL_LEFT_MOUSE:
progdefaults.rsid = !progdefaults.rsid;
progdefaults.changed = true;
break;
case FL_RIGHT_MOUSE:
{
Fl_Button *b = (Fl_Button *)w;
if (progdefaults.rsidWideSearch) quick_change_rsid[0].set();
else quick_change_rsid[0].clear();
const Fl_Menu_Item *m = quick_change_rsid->popup(b->x(), b->y() + b->h());
if (m && m->callback()) m->do_callback(0);
break;
}
default:
break;
}
Fl_Color clr = progdefaults.rsidWideSearch ? progdefaults.RxIDwideColor : progdefaults.RxIDColor;
rsid_status->color( progdefaults.rsid ? clr : FL_BACKGROUND_COLOR );
rsid_status->redraw();
restoreFocus(11);
}
@ -2595,7 +2627,7 @@ void cbAutoSpot(Fl_Widget* w, void*)
void toggleRSID()
{
btnRSID->value(0);
progdefaults.rsid = !progdefaults.rsid;
cbRSID(NULL, NULL);
}
@ -5609,8 +5641,14 @@ void create_fl_digi_main_primary() {
btnAutoSpot->callback(cbAutoSpot, 0);
btnAutoSpot->deactivate();
btnRSID = new Fl_Light_Button(progStatus.mainW - 200, 0, 50, Hmenu, "RxID");
btnRSID->selection_color(progdefaults.RxIDColor);
Fl_Group *rs_grp = new Fl_Group(progStatus.mainW - 200, 0, 15, Hmenu, "");
rs_grp->box(FL_UP_BOX);
rsid_status = new Fl_Box(progStatus.mainW - 200 + 4, 6, 7, Hmenu-12);
rsid_status->box(FL_THIN_DOWN_BOX);
rsid_status->color(FL_BACKGROUND_COLOR);
rs_grp->end();
btnRSID = new Fl_Button(progStatus.mainW - 185, 0, 35, Hmenu, "RxID");
btnRSID->tooltip("Receive RSID");
btnRSID->callback(cbRSID, 0);
@ -7513,8 +7551,15 @@ void create_fl_digi_main_WF_only() {
btnAutoSpot->callback(cbAutoSpot, 0);
btnAutoSpot->deactivate();
btnRSID = new Fl_Light_Button(progStatus.mainW - 150 - pad, 0, 50, Hmenu, "RxID");
btnRSID->selection_color(progdefaults.RxIDColor);
Fl_Group *rs_grp = new Fl_Group(progStatus.mainW - 150, 0, 15, Hmenu, "");
rs_grp->box(FL_UP_BOX);
rsid_status = new Fl_Box(progStatus.mainW - 150 + 4, 6, 7, Hmenu-12);
rsid_status->box(FL_THIN_DOWN_BOX);
rsid_status->color(FL_BACKGROUND_COLOR);
rs_grp->end();
btnRSID = new Fl_Button(progStatus.mainW - 135 - pad, 0, 35, Hmenu, "RxID");
btnRSID->tooltip("Receive RSID");
btnRSID->callback(cbRSID, 0);
@ -8770,9 +8815,7 @@ void afc_selection_color()
void rxid_selection_color()
{
if (!btnRSID) return;
btnRSID->selection_color(progdefaults.RxIDColor);
btnRSID->redraw();
cbRSID(NULL, NULL);
}
void txid_selection_color()

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

@ -207,25 +207,27 @@ extern Fl_Button *btnMacroBtnFont;
extern Fl_Button *btnTabColor;
extern Fl_Button *btnTabDefaultColor;
extern Fl_Button *btnSpotColor;
extern Fl_Button *btnRxIDColor;
extern Fl_Button *btnTxIDColor;
extern Fl_Button *btnTuneColor;
extern Fl_Button *btnLkColor;
extern Fl_Button *btnRevColor;
extern Fl_Button *btnXmtColor;
extern Fl_Button *btnAfcColor;
extern Fl_Button *btnTuneColor;
extern Fl_Button *btnRxIDColor;
extern Fl_Button *btnLkColor;
extern Fl_Button *btnSql1Color;
extern Fl_Button *btnXmtColor;
extern Fl_Button *btnRxIDwideColor;
extern Fl_Button *btnAfcColor;
extern Fl_Button *btnSql2Color;
extern Fl_Button *btnTxIDColor;
extern Fl_Box *spotcolor;
extern Fl_Box *rxidcolor;
extern Fl_Box *txidcolor;
extern Fl_Box *tunecolor;
extern Fl_Box *lockcolor;
extern Fl_Box *revcolor;
extern Fl_Box *tunecolor;
extern Fl_Box *rxidcolor;
extern Fl_Box *lockcolor;
extern Fl_Box *sql1color;
extern Fl_Box *rxidcolorwide;
extern Fl_Box *xmtcolor;
extern Fl_Box *afccolor;
extern Fl_Box *sql1color;
extern Fl_Box *sql2color;
extern Fl_Box *txidcolor;
extern Fl_Button *btnLowSignal;
extern Fl_Box *lowcolor;
extern Fl_Button *btnHighSignal;

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

@ -1608,6 +1608,9 @@
ELEM_(Fl_Color, RxIDColor, "RXIDCOLOR", \
"UI RxID select color", \
FL_GREEN) \
ELEM_(Fl_Color, RxIDwideColor, "RXIDWIDECOLOR", \
"UI RxID WIDE search select color", \
FL_DARK_RED) \
ELEM_(Fl_Color, TxIDColor, "TXIDCOLOR", \
"UI TxID select color", \
FL_GREEN) \

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

@ -271,7 +271,8 @@ extern Fl_Value_Slider2 *mvsquelch;
extern Fl_Light_Button *btnAFC;
extern Fl_Light_Button *btnSQL;
extern Fl_Light_Button *btnPSQL;
extern Fl_Light_Button *btnRSID;
extern Fl_Box *rsid_status;
extern Fl_Button *btnRSID;
extern Fl_Light_Button *btnTxRSID;
extern Fl_Light_Button *btnTune;
extern Fl_Light_Button *btnAutoSpot;