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

RxID color changes 

* link color selection change to RxID button
pull/4/head
David Freese 2016-06-11 13:56:25 -05:00
rodzic b657227002
commit 198f6452c0
2 zmienionych plików z 39 dodań i 17 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

@ -1995,6 +1995,10 @@ rxidcolor->color(progdefaults.RxIDColor);
rxidcolor->redraw();
rxid_selection_color();
progdefaults.changed = true;
Fl_Color clr = progdefaults.rsidWideSearch ? progdefaults.RxIDwideColor : progdefaults.RxIDColor;
btnRSID->selection_color(clr);
btnRSID->redraw();
}
Fl_Button *btnLkColor=(Fl_Button *)0;
@ -2035,6 +2039,10 @@ rxidcolorwide->color(progdefaults.RxIDwideColor);
rxidcolorwide->redraw();
rxid_selection_color();
progdefaults.changed = true;
Fl_Color clr = progdefaults.rsidWideSearch ? progdefaults.RxIDwideColor : progdefaults.RxIDColor;
btnRSID->selection_color(clr);
btnRSID->redraw();
}
Fl_Button *btnAfcColor=(Fl_Button *)0;
@ -2065,6 +2073,9 @@ txidcolor->color(progdefaults.TxIDColor);
txidcolor->redraw();
txid_selection_color();
progdefaults.changed = true;
btnTxRSID->selection_color(progdefaults.TxIDColor);
btnTxRSID->redraw();
}
Fl_Box *spotcolor=(Fl_Box *)0;
@ -6019,7 +6030,6 @@ Fl_Double_Window* ConfigureDialog() {
tabOperator->tooltip(_("Operator information"));
tabOperator->callback((Fl_Callback*)cb_tabOperator);
tabOperator->when(FL_WHEN_CHANGED);
tabOperator->hide();
{ Fl_Group* o = new Fl_Group(55, 35, 490, 170, _("Station"));
o->box(FL_ENGRAVED_FRAME);
o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE));
@ -6156,11 +6166,11 @@ Fl_Double_Window* ConfigureDialog() {
} // Fl_Group* tabOperator
{ tabUI = new Fl_Group(0, 25, 600, 365, _("UI"));
tabUI->tooltip(_("User Interface"));
tabUI->hide();
{ tabsUI = new Fl_Tabs(0, 25, 600, 365);
tabsUI->selection_color(FL_LIGHT1);
{ tabBrowser = new Fl_Group(0, 50, 600, 335, _("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"));
@ -6783,6 +6793,7 @@ ab and newline are automatically included."));
} // Fl_Group* tabLogServer
{ tabMBars = new Fl_Group(0, 50, 600, 335, _("Macros"));
tabMBars->tooltip(_("User Interface - Macros"));
tabMBars->hide();
{ Fl_Group* o = new Fl_Group(5, 240, 590, 35);
o->box(FL_ENGRAVED_FRAME);
{ Fl_Check_Button* o = btnMacroMouseWheel = new Fl_Check_Button(62, 248, 296, 20, _("Mouse wheel active on macro buttons"));
@ -7000,7 +7011,6 @@ ab and newline are automatically included."));
tabColorsFonts->hide();
{ tabsColors = new Fl_Tabs(0, 55, 600, 330);
{ Fl_Group* o = new Fl_Group(0, 80, 600, 305, _("Rx/Tx"));
o->hide();
{ Fl_ListBox* o = listbox_charset_status = new Fl_ListBox(96, 90, 165, 24, _("Rx/Tx Character set"));
listbox_charset_status->tooltip(_("Select Rx/Tx Character Set"));
listbox_charset_status->box(FL_BORDER_BOX);
@ -7346,6 +7356,7 @@ ab and newline are automatically included."));
o->end();
} // Fl_Group* o
{ Fl_Group* o = new Fl_Group(0, 80, 600, 305, _("SigLvl"));
o->hide();
{ btnLowSignal = new Fl_Button(210, 142, 70, 21, _("Low"));
btnLowSignal->callback((Fl_Callback*)cb_btnLowSignal);
} // Fl_Button* btnLowSignal

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

@ -359,15 +359,15 @@ static const char szBaudRates[] = "300|600|1200|2400|4800|9600|19200|38400|57600
static const char szProsigns[] = "~|%|&|+|=|{|}|<|>|[|]| ";} {}
Fl_Window {} {
label {Fldigi configuration} open
xywh {893 186 600 415} type Double color 45 selection_color 51 labelsize 18 align 80 non_modal visible
xywh {1065 26 600 415} type Double color 45 selection_color 51 labelsize 18 align 80 non_modal visible
} {
Fl_Tabs tabsConfigure {open
xywh {0 0 600 390} color 50 selection_color 50
} {
Fl_Group tabOperator {
label Operator
callback {progdefaults.changed = true;}
tooltip {Operator information} xywh {0 25 600 360} when 1 hide
callback {progdefaults.changed = true;} selected
tooltip {Operator information} xywh {0 25 600 360} when 1
} {
Fl_Group {} {
label Station open
@ -467,14 +467,14 @@ progdefaults.changed = true;}
}
Fl_Group tabUI {
label UI open
tooltip {User Interface} xywh {0 25 600 365}
tooltip {User Interface} xywh {0 25 600 365} hide
} {
Fl_Tabs tabsUI {open
xywh {0 25 600 365} selection_color 50
} {
Fl_Group tabBrowser {
label Browser
tooltip {User Interface - Browser} xywh {0 50 600 335} hide
tooltip {User Interface - Browser} xywh {0 50 600 335}
} {
Fl_Group {} {open
xywh {30 65 540 300} box ENGRAVED_FRAME
@ -1161,7 +1161,7 @@ progdefaults.changed = true;}
}
Fl_Group tabMBars {
label Macros open
tooltip {User Interface - Macros} xywh {0 50 600 335}
tooltip {User Interface - Macros} xywh {0 50 600 335} hide
} {
Fl_Group {} {open
xywh {5 240 590 35} box ENGRAVED_FRAME
@ -1205,7 +1205,7 @@ progdefaults.macro_height = 22;
cnt_macro_height->value(22);
set_macroLabels();
UI_select();
progdefaults.changed = true;} selected
progdefaults.changed = true;}
xywh {61 138 144 22} type Radio down_box ROUND_DOWN_BOX
}
Fl_Round_Button btn_scheme_2 {
@ -1481,7 +1481,7 @@ WF_UI();}
}
}
Fl_Group tabColorsFonts {
label {Clrs/Fnts}
label {Clrs/Fnts} open
tooltip {User Interface - Colors / Fonts} xywh {0 50 600 335} hide
} {
Fl_Tabs tabsColors {open
@ -1489,7 +1489,7 @@ WF_UI();}
} {
Fl_Group {} {
label {Rx/Tx}
xywh {0 80 600 305} hide
xywh {0 80 600 305}
} {
Fl_Group listbox_charset_status {
label {Rx/Tx Character set} open
@ -2323,7 +2323,7 @@ progdefaults.changed = true;}
}
}
Fl_Group {} {
label Buttons
label Buttons open
xywh {0 80 600 305} hide
} {
Fl_Button btnSpotColor {
@ -2359,7 +2359,11 @@ progdefaults.changed = true;}
rxidcolor->color(progdefaults.RxIDColor);
rxidcolor->redraw();
rxid_selection_color();
progdefaults.changed = true;}
progdefaults.changed = true;
Fl_Color clr = progdefaults.rsidWideSearch ? progdefaults.RxIDwideColor : progdefaults.RxIDColor;
btnRSID->selection_color(clr);
btnRSID->redraw();}
xywh {139 229 85 21}
}
Fl_Button btnLkColor {
@ -2395,7 +2399,11 @@ progdefaults.changed = true;}
rxidcolorwide->color(progdefaults.RxIDwideColor);
rxidcolorwide->redraw();
rxid_selection_color();
progdefaults.changed = true;}
progdefaults.changed = true;
Fl_Color clr = progdefaults.rsidWideSearch ? progdefaults.RxIDwideColor : progdefaults.RxIDColor;
btnRSID->selection_color(clr);
btnRSID->redraw();}
xywh {274 229 85 21}
}
Fl_Button btnAfcColor {
@ -2422,7 +2430,10 @@ progdefaults.changed = true;}
txidcolor->color(progdefaults.TxIDColor);
txidcolor->redraw();
txid_selection_color();
progdefaults.changed = true;}
progdefaults.changed = true;
btnTxRSID->selection_color(progdefaults.TxIDColor);
btnTxRSID->redraw();}
xywh {409 229 85 20}
}
Fl_Box spotcolor {
@ -2476,7 +2487,7 @@ progdefaults.changed = true;}
}
Fl_Group {} {
label SigLvl
xywh {0 80 600 305}
xywh {0 80 600 305} hide
} {
Fl_Button btnLowSignal {
label Low