ham-ref/fldigi
1
0
Fork 0
mirror of https://git.code.sf.net/p/fldigi/fldigi synced 2026-08-13 17:47:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

color prefs

Browse source 
* move color definitions from configuration to a separate
    prefs file to allow independent color renderings.
  * specify all colors as a triad: red, green, blue 0 to 255
This commit is contained in:
dave-w1hkj 2024-05-28 22:11:36 -05:00
parent c012178f8f
commit 9bd273df32
17 changed files with 2319 additions and 2540 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Makefile.am
View file

@ -668,6 +668,7 @@ fldigi_SOURCES += \
ssb/ssb.cxx \
status/squelch_status.cxx \
status/status.cxx \
status/ui_colors.cxx \
synop-src/synop.cxx \
thor/thor.cxx \
thor/thorvaricode.cxx \
@ -904,6 +905,7 @@ EXTRA_fldigi_SOURCES += \
include/serial.h \
include/smeter.h \
include/squelch_status.h \
include/ui_colors.h \
include/vumeter.h \
include/socket.h \
include/soundconf.h \

11
src/dialogs/Viewer.cxx
View file

@ -31,6 +31,7 @@
#include "trx.h"
#include "main.h"
#include "configuration.h"
#include "ui_colors.h"
#include "confdialog.h"
#include "status.h"
#include "waterfall.h"
@ -329,14 +330,8 @@ Fl_Double_Window* createViewer(void)
sldrViewerSquelch->step(0.1);
sldrViewerSquelch->value(progStatus.VIEWER_psksquelch);
sldrViewerSquelch->callback((Fl_Callback*)cb_Squelch);
sldrViewerSquelch->color( fl_rgb_color(
progdefaults.bwsrSliderColor.R,
progdefaults.bwsrSliderColor.G,
progdefaults.bwsrSliderColor.B));
sldrViewerSquelch->selection_color( fl_rgb_color(
progdefaults.bwsrSldrSelColor.R,
progdefaults.bwsrSldrSelColor.G,
progdefaults.bwsrSldrSelColor.B));
sldrViewerSquelch->color( RGBCOLOR( bwsrSliderColor ) );
sldrViewerSquelch->selection_color( RGBCOLOR( bwsrSldrSelColor ) );
g->resizable(sldrViewerSquelch);
g->end();

1705
src/dialogs/confdialog.cxx
View file

File diff suppressed because it is too large Load diff

1813
src/dialogs/confdialog.fl
View file

File diff suppressed because it is too large Load diff

238
src/dialogs/fl_digi.cxx
View file

@ -120,6 +120,7 @@ extern Fl_Scroll *wefax_pic_rx_scroll;
#include "confdialog.h"
#include "configuration.h"
#include "status.h"
#include "ui_colors.h"
#include "macros.h"
#include "macroedit.h"
@ -2263,26 +2264,13 @@ void colorize_48macros(int i)
if (progdefaults.useGroupColors == true) {
int k = i / 4;
if (k == 0 || k == 3 || k == 6 || k == 9)
btnDockMacro[i]->color(fl_rgb_color(
progdefaults.btnGroup1.R,
progdefaults.btnGroup1.G,
progdefaults.btnGroup1.B));
btnDockMacro[i]->color( RGBCOLOR(btnGroup1) );
else if (k == 1 || k == 4 || k == 7 || k == 10)
btnDockMacro[i]->color(fl_rgb_color(
progdefaults.btnGroup2.R,
progdefaults.btnGroup2.G,
progdefaults.btnGroup2.B));
btnDockMacro[i]->color( RGBCOLOR(btnGroup2 ) );
else
btnDockMacro[i]->color(fl_rgb_color(
progdefaults.btnGroup3.R,
progdefaults.btnGroup3.G,
progdefaults.btnGroup3.B));
btnDockMacro[i]->labelcolor(
fl_rgb_color(
progdefaults.btnFkeyTextColor.R,
progdefaults.btnFkeyTextColor.G,
progdefaults.btnFkeyTextColor.B ));
btnDockMacro[i]->labelcolor(progdefaults.MacroBtnFontcolor);
btnDockMacro[i]->color( RGBCOLOR(btnGroup3) );
btnDockMacro[i]->labelcolor( RGBCOLOR(btnFkeyTextColor) );
btnDockMacro[i]->labelcolor(RGBCOLOR(MacroBtnFontcolor));
btnDockMacro[i]->labelfont(progdefaults.MacroBtnFontnbr);
btnDockMacro[i]->labelsize(progdefaults.MacroBtnFontsize);
} else {
@ -2298,27 +2286,14 @@ void colorize_macro(int i)
int j = i % NUMMACKEYS;
if (progdefaults.useGroupColors == true) {
if (j < 4) {
btnMacro[i]->color(fl_rgb_color(
progdefaults.btnGroup1.R,
progdefaults.btnGroup1.G,
progdefaults.btnGroup1.B));
btnMacro[i]->color( RGBCOLOR(btnGroup1 ) );
} else if (j < 8) {
btnMacro[i]->color(fl_rgb_color(
progdefaults.btnGroup2.R,
progdefaults.btnGroup2.G,
progdefaults.btnGroup2.B));
btnMacro[i]->color( RGBCOLOR(btnGroup2 ));
} else {
btnMacro[i]->color(fl_rgb_color(
progdefaults.btnGroup3.R,
progdefaults.btnGroup3.G,
progdefaults.btnGroup3.B));
btnMacro[i]->color( RGBCOLOR(btnGroup3 ));
}
btnMacro[i]->labelcolor(
fl_rgb_color(
progdefaults.btnFkeyTextColor.R,
progdefaults.btnFkeyTextColor.G,
progdefaults.btnFkeyTextColor.B ));
btnMacro[i]->labelcolor(progdefaults.MacroBtnFontcolor);
btnMacro[i]->labelcolor( RGBCOLOR(btnFkeyTextColor) );
btnMacro[i]->labelcolor(RGBCOLOR(MacroBtnFontcolor));
btnMacro[i]->labelfont(progdefaults.MacroBtnFontnbr);
btnMacro[i]->labelsize(progdefaults.MacroBtnFontsize);
} else {
@ -3058,7 +3033,7 @@ void cbRSID(Fl_Widget *w, void *)
break;
}
Fl_Color clr = progdefaults.rsidWideSearch ? progdefaults.RxIDwideColor : progdefaults.RxIDColor;
Fl_Color clr = progdefaults.rsidWideSearch ? RGBCOLOR(RxIDwideColor) : RGBCOLOR(RxIDColor);
btnRSID->selection_color(clr);
btnRSID->redraw();
restoreFocus(11);
@ -3353,8 +3328,8 @@ Fl_Input2* qso_fields[] = {
for (size_t i = 0; i < num_fields; i++) {
qso_fields[i]->textsize(progdefaults.LOGGINGtextsize);
qso_fields[i]->textfont(progdefaults.LOGGINGtextfont);
qso_fields[i]->textcolor(progdefaults.LOGGINGtextcolor);
qso_fields[i]->color(progdefaults.LOGGINGcolor);
qso_fields[i]->textcolor(RGBCOLOR(LOGGINGtextcolor));
qso_fields[i]->color(RGBCOLOR(LOGGINGcolor));
qso_fields[i]->labelfont(progdefaults.LOGGINGtextfont);
qso_fields[i]->redraw_label();
}
@ -3406,8 +3381,8 @@ Fl_Input2* log_fields[] = {
log_fields[i]->value("");
log_fields[i]->textsize(progdefaults.LOGGINGtextsize);
log_fields[i]->textfont(progdefaults.LOGGINGtextfont);
log_fields[i]->textcolor(progdefaults.LOGGINGtextcolor);
log_fields[i]->color(progdefaults.LOGGINGcolor);
log_fields[i]->textcolor(RGBCOLOR(LOGGINGtextcolor));
log_fields[i]->color(RGBCOLOR(LOGGINGcolor));
log_fields[i]->labelfont(progdefaults.LOGGINGtextfont);
log_fields[i]->show();
log_fields[i]->redraw_label();
@ -3484,8 +3459,8 @@ Fl_Input2* log_fields[] = {
log_fields[i]->value("");
log_fields[i]->textsize(progdefaults.LOGGINGtextsize);
log_fields[i]->textfont(progdefaults.LOGGINGtextfont);
log_fields[i]->textcolor(progdefaults.LOGGINGtextcolor);
log_fields[i]->color(progdefaults.LOGGINGcolor);
log_fields[i]->textcolor(RGBCOLOR(LOGGINGtextcolor));
log_fields[i]->color(RGBCOLOR(LOGGINGcolor));
log_fields[i]->labelfont(progdefaults.LOGGINGtextfont);
log_fields[i]->show();
log_fields[i]->redraw_label();
@ -3560,8 +3535,8 @@ if (bWF_only) return;
call_fields[i]->value("");
call_fields[i]->textsize(progdefaults.LOGGINGtextsize);
call_fields[i]->textfont(progdefaults.LOGGINGtextfont);
call_fields[i]->textcolor(progdefaults.LOGGINGtextcolor);
call_fields[i]->color(progdefaults.LOGGINGcolor);
call_fields[i]->textcolor(RGBCOLOR(LOGGINGtextcolor));
call_fields[i]->color(RGBCOLOR(LOGGINGcolor));
call_fields[i]->labelfont(progdefaults.LOGGINGtextfont);
call_fields[i]->show();
call_fields[i]->redraw_label();
@ -6879,7 +6854,7 @@ void setTabColors()
if (dlgConfig->visible()) dlgConfig->redraw();
if (dxcluster_viewer) {
cluster_tabs->selection_color(progdefaults.TabsColor);
cluster_tabs->selection_color(RGBCOLOR(TabsColor));
if (dxcluster_viewer->visible()) dxcluster_viewer->redraw();
}
}
@ -6997,8 +6972,8 @@ void widget_color_font(Fl_Widget *widget)
{
widget->labelsize(progdefaults.LOGGINGtextsize);
widget->labelfont(progdefaults.LOGGINGtextfont);
widget->labelcolor(progdefaults.LOGGINGtextcolor);
widget->color(progdefaults.LOGGINGcolor);
widget->labelcolor(RGBCOLOR(LOGGINGtextcolor));
widget->color(RGBCOLOR(LOGGINGcolor));
widget->redraw_label();
widget->redraw();
}
@ -7007,8 +6982,8 @@ void input_color_font(Fl_Input *input)
{
input->textsize(progdefaults.LOGGINGtextsize);
input->textfont(progdefaults.LOGGINGtextfont);
input->textcolor(progdefaults.LOGGINGtextcolor);
input->color(progdefaults.LOGGINGcolor);
input->textcolor(RGBCOLOR(LOGGINGtextcolor));
input->color(RGBCOLOR(LOGGINGcolor));
input->redraw();
}
@ -7016,18 +6991,18 @@ void counter_color_font(Fl_Counter2 * cntr)
{
cntr->textsize(progdefaults.LOGGINGtextsize);
cntr->textfont(progdefaults.LOGGINGtextfont);
cntr->textcolor(progdefaults.LOGGINGtextcolor);
cntr->textbkcolor(progdefaults.LOGGINGcolor);
cntr->textcolor(RGBCOLOR(LOGGINGtextcolor));
cntr->textbkcolor(RGBCOLOR(LOGGINGcolor));
cntr->redraw();
}
void combo_color_font(Fl_ComboBox *cbo)
{
cbo->color(progdefaults.LOGGINGcolor);
cbo->selection_color(progdefaults.LOGGINGcolor);
cbo->color(RGBCOLOR(LOGGINGcolor));
cbo->selection_color(RGBCOLOR(LOGGINGcolor));
cbo->textfont(progdefaults.LOGGINGtextfont);
cbo->textsize(progdefaults.LOGGINGtextsize);
cbo->textcolor(progdefaults.LOGGINGtextcolor);
cbo->textcolor(RGBCOLOR(LOGGINGtextcolor));
cbo->redraw();
cbo->redraw_label();
}
@ -7124,8 +7099,8 @@ inline void inp_font_pos(Fl_Input2* inp, int x, int y, int w, int h)
{
inp->textsize(progdefaults.LOGBOOKtextsize);
inp->textfont(progdefaults.LOGBOOKtextfont);
inp->textcolor(progdefaults.LOGBOOKtextcolor);
inp->color(progdefaults.LOGBOOKcolor);
inp->textcolor(RGBCOLOR(LOGBOOKtextcolor));
inp->color(RGBCOLOR(LOGBOOKcolor));
inp->labelfont(progdefaults.LOGBOOKtextfont);
int ls = progdefaults.LOGBOOKtextsize - 1;
ls = ls < 12 ? 12 : (ls > 14 ? 14 : ls);
@ -7139,8 +7114,8 @@ inline void date_font_pos(Fl_DateInput* inp, int x, int y, int w, int h)
{
inp->textsize(progdefaults.LOGBOOKtextsize);
inp->textfont(progdefaults.LOGBOOKtextfont);
inp->textcolor(progdefaults.LOGBOOKtextcolor);
inp->color(progdefaults.LOGBOOKcolor);
inp->textcolor(RGBCOLOR(LOGBOOKtextcolor));
inp->color(RGBCOLOR(LOGBOOKcolor));
inp->labelfont(progdefaults.LOGBOOKtextfont);
int ls = progdefaults.LOGBOOKtextsize - 1;
ls = ls < 10 ? 10 : (ls > 14 ? 14 : ls);
@ -7297,7 +7272,7 @@ void LOGBOOK_colors_font()
int tab_h = wh * 14 / progdefaults.LOGBOOKtextsize;
int tab_grp_h = 4 * wh + 4;
// Tabs->resize(2, ypos, dlg_width - 6 - inpSearchString->w(), tab_grp_h + tab_h);
Tabs->selection_color(progdefaults.TabsColor);
Tabs->selection_color(RGBCOLOR(TabsColor));
tab_font_pos(tab_log_qsl, 2, ypos + tab_h, Tabs->w(), tab_grp_h, 14);
tab_font_pos(tab_log_contest, 2, ypos + tab_h, Tabs->w(), tab_grp_h, 14);
@ -7343,14 +7318,14 @@ void LOGBOOK_colors_font()
txtLogFile->textsize(ls);
txtLogFile->textfont(progdefaults.LOGBOOKtextfont);
txtLogFile->textcolor(progdefaults.LOGBOOKtextcolor);
txtLogFile->color(progdefaults.LOGBOOKcolor);
txtLogFile->textcolor(RGBCOLOR(LOGBOOKtextcolor));
txtLogFile->color(RGBCOLOR(LOGBOOKcolor));
ypos += grpFileButtons->h() + 2;
wBrowser->font(progdefaults.LOGBOOKtextfont);
wBrowser->fontsize(progdefaults.LOGBOOKtextsize);
wBrowser->color(progdefaults.LOGBOOKcolor);
wBrowser->color(RGBCOLOR(LOGBOOKcolor));
wBrowser->selection_color(FL_SELECTION_COLOR);
int datewidth = wBrowser->columnWidth(0);
@ -7390,46 +7365,15 @@ void LOGBOOK_colors_font()
void set_smeter_colors()
{
Fl_Color clr = fl_rgb_color(
progdefaults.Smeter_bg_color.R,
progdefaults.Smeter_bg_color.G,
progdefaults.Smeter_bg_color.B);
smeter->set_background(clr);
clr = fl_rgb_color(
progdefaults.Smeter_meter_color.R,
progdefaults.Smeter_meter_color.G,
progdefaults.Smeter_meter_color.B);
smeter->set_metercolor(clr);
clr = fl_rgb_color(
progdefaults.Smeter_scale_color.R,
progdefaults.Smeter_scale_color.G,
progdefaults.Smeter_scale_color.B);
smeter->set_scalecolor(clr);
smeter->set_background(RGBCOLOR(Smeter_bg_color));
smeter->set_metercolor(RGBCOLOR(Smeter_meter_color));
smeter->set_scalecolor(RGBCOLOR(Smeter_scale_color));
smeter->redraw();
clr = fl_rgb_color(
progdefaults.PWRmeter_bg_color.R,
progdefaults.PWRmeter_bg_color.G,
progdefaults.PWRmeter_bg_color.B);
pwrmeter->set_background(clr);
clr = fl_rgb_color(
progdefaults.PWRmeter_meter_color.R,
progdefaults.PWRmeter_meter_color.G,
progdefaults.PWRmeter_meter_color.B);
pwrmeter->set_metercolor(clr);
clr = fl_rgb_color(
progdefaults.PWRmeter_scale_color.R,
progdefaults.PWRmeter_scale_color.G,
progdefaults.PWRmeter_scale_color.B);
pwrmeter->set_scalecolor(clr);
pwrmeter->set_background(RGBCOLOR(PWRmeter_bg_color));
pwrmeter->set_metercolor(RGBCOLOR(PWRmeter_meter_color));
pwrmeter->set_scalecolor(RGBCOLOR(PWRmeter_scale_color));
pwrmeter->select(progdefaults.PWRselect);
pwrmeter->redraw();
}
@ -8163,12 +8107,12 @@ void make_scopeviewer()
scopeview = new Fl_Double_Window(0,0,140,140, _("Scope"));
scopeview->xclass(PACKAGE_NAME);
digiscope = new Digiscope (0, 0, 140, 140);
digiscope->bk_color(progdefaults.digi_background);
digiscope->axis_color(progdefaults.digi_axis_color);
digiscope->user_color_1(progdefaults.digi_color_1);
digiscope->user_color_2(progdefaults.digi_color_2);
digiscope->user_color_3(progdefaults.digi_color_3);
digiscope->user_color_4(progdefaults.digi_color_4);
digiscope->bk_color(RGBCOLOR(digi_background));
digiscope->axis_color(RGBCOLOR(digi_axis_color));
digiscope->user_color_1(RGBCOLOR(digi_color_1));
digiscope->user_color_2(RGBCOLOR(digi_color_2));
digiscope->user_color_3(RGBCOLOR(digi_color_3));
digiscope->user_color_4(RGBCOLOR(digi_color_4));
scopeview->resizable(digiscope);
scopeview->size_range(SCOPEWIN_MIN_WIDTH, SCOPEWIN_MIN_HEIGHT);
scopeview->end();
@ -8217,7 +8161,7 @@ void create_fl_digi_main_WF_only() {
tx_timer->labelcolor(FL_BACKGROUND_COLOR);
btnAutoSpot = new Fl_Light_Button(W - 200 - pad, 0, 50, Hmenu, "Spot");
btnAutoSpot->selection_color(progdefaults.SpotColor);
btnAutoSpot->selection_color(RGBCOLOR(SpotColor));
btnAutoSpot->callback(cbAutoSpot, 0);
btnAutoSpot->deactivate();
@ -8227,12 +8171,12 @@ void create_fl_digi_main_WF_only() {
btnRSID->callback(cbRSID, 0);
btnTxRSID = new Fl_Light_Button(W - 100 - pad, 0, 50, Hmenu, "TxID");
btnTxRSID->selection_color(progdefaults.TxIDColor);
btnTxRSID->selection_color(RGBCOLOR(TxIDColor));
btnTxRSID->tooltip("Transmit RSID");
btnTxRSID->callback(cbTxRSID, 0);
btnTune = new Fl_Light_Button(W - 50 - pad, 0, 50, Hmenu, "TUNE");
btnTune->selection_color(progdefaults.TuneColor);
btnTune->selection_color(RGBCOLOR(TuneColor));
btnTune->callback(cbTune, 0);
mnuFrame->resizable(mnu);
@ -8358,7 +8302,7 @@ void create_fl_digi_main_WF_only() {
btnAFC = new Fl_Light_Button(
rightof(WARNstatus), Y,
bwAfcOnOff, Hstatus, "AFC");
btnAFC->selection_color(progdefaults.AfcColor);
btnAFC->selection_color(RGBCOLOR(AfcColor));
btnSQL = new Fl_Light_Button(
rightof(btnAFC), Y,
@ -8376,11 +8320,11 @@ void create_fl_digi_main_WF_only() {
btnAFC->tooltip(_("Automatic Frequency Control"));
btnSQL->callback(cbSQL, 0);
btnSQL->selection_color(progdefaults.Sql1Color);
btnSQL->selection_color(RGBCOLOR(Sql1Color));
btnSQL->value(1);
btnSQL->tooltip(_("Squelch"));
btnPSQL->selection_color(progdefaults.Sql1Color);
btnPSQL->selection_color(RGBCOLOR(Sql1Color));
btnPSQL->callback(cbPwrSQL, 0);
btnPSQL->value(progdefaults.kpsql_enabled);
btnPSQL->tooltip(_("Power Signal Monitor"));
@ -8494,17 +8438,17 @@ void callback_set_metric(double metric)
if (progdefaults.show_psm_btn && progStatus.kpsql_enabled) {
if ((metric >= progStatus.sldrPwrSquelchValue) || inhibit_tx_seconds)
btnPSQL->selection_color(progdefaults.Sql2Color);
btnPSQL->selection_color(RGBCOLOR(Sql2Color));
else
btnPSQL->selection_color(progdefaults.Sql1Color);
btnPSQL->selection_color(RGBCOLOR(Sql1Color));
btnPSQL->redraw_label();
} else if(progStatus.sqlonoff) {
if (metric < progStatus.sldrSquelchValue)
btnSQL->selection_color(progdefaults.Sql1Color);
btnSQL->selection_color(RGBCOLOR(Sql1Color));
else
btnSQL->selection_color(progdefaults.Sql2Color);
btnSQL->selection_color(RGBCOLOR(Sql2Color));
btnSQL->redraw_label();
}
}
@ -8595,21 +8539,21 @@ void set_scope_yaxis_2(double x2)
void set_scope_colors()
{
if (digiscope) {
digiscope->bk_color(progdefaults.digi_background);
digiscope->axis_color(progdefaults.digi_axis_color);
digiscope->user_color_1(progdefaults.digi_color_1);
digiscope->user_color_2(progdefaults.digi_color_2);
digiscope->user_color_3(progdefaults.digi_color_3);
digiscope->user_color_4(progdefaults.digi_color_4);
digiscope->bk_color(RGBCOLOR(digi_background));
digiscope->axis_color(RGBCOLOR(digi_axis_color));
digiscope->user_color_1(RGBCOLOR(digi_color_1));
digiscope->user_color_2(RGBCOLOR(digi_color_2));
digiscope->user_color_3(RGBCOLOR(digi_color_3));
digiscope->user_color_4(RGBCOLOR(digi_color_4));
digiscope->redraw();
}
wf->wfscope->bk_color(progdefaults.digi_background);
wf->wfscope->axis_color(progdefaults.digi_axis_color);
wf->wfscope->user_color_1(progdefaults.digi_color_1);
wf->wfscope->user_color_2(progdefaults.digi_color_2);
wf->wfscope->user_color_3(progdefaults.digi_color_3);
wf->wfscope->user_color_4(progdefaults.digi_color_4);
wf->wfscope->bk_color(RGBCOLOR(digi_background));
wf->wfscope->axis_color(RGBCOLOR(digi_axis_color));
wf->wfscope->user_color_1(RGBCOLOR(digi_color_1));
wf->wfscope->user_color_2(RGBCOLOR(digi_color_2));
wf->wfscope->user_color_3(RGBCOLOR(digi_color_3));
wf->wfscope->user_color_4(RGBCOLOR(digi_color_4));
wf->wfscope->redraw();
}
@ -9003,12 +8947,12 @@ void put_WARNstatus(double v)
{
double val = 20 * log10(v == 0 ? 1e-9 : v);
if (val < progdefaults.normal_signal_level)
WARNstatus->color(progdefaults.LowSignal);
WARNstatus->color(RGBCOLOR(LowSignal));
else if (val < progdefaults.high_signal_level )
WARNstatus->color(progdefaults.NormSignal);
WARNstatus->color(RGBCOLOR(NormSignal));
else if (val < progdefaults.over_signal_level)
WARNstatus->color(progdefaults.HighSignal);
else WARNstatus->color(progdefaults.OverSignal);
WARNstatus->color(RGBCOLOR(HighSignal));
else WARNstatus->color(RGBCOLOR(OverSignal));
WARNstatus->redraw();
}
@ -9621,7 +9565,7 @@ void * set_xmtrcv_button_false(void)
// To be called from the main thread.
void * set_xmtrcv_selection_color_transmitting(void)
{
wf->xmtrcv_selection_color(progdefaults.XmtColor);
wf->xmtrcv_selection_color(RGBCOLOR(XmtColor));
return (void *)0;
}
@ -9639,30 +9583,30 @@ void xmtrcv_selection_color(Fl_Color clr)
void xmtrcv_selection_color()
{
wf->xmtrcv_selection_color(progdefaults.XmtColor);
wf->xmtrcv_selection_color(RGBCOLOR(XmtColor));
}
void rev_selection_color()
{
wf->reverse_selection_color(progdefaults.RevColor);
wf->reverse_selection_color(RGBCOLOR(RevColor));
}
void xmtlock_selection_color()
{
wf->xmtlock_selection_color(progdefaults.LkColor);
wf->xmtlock_selection_color(RGBCOLOR(LkColor));
}
void sql_selection_color()
{
if (!btnSQL) return;
btnSQL->selection_color(progdefaults.Sql1Color);
btnSQL->selection_color(RGBCOLOR(Sql1Color));
btnSQL->redraw();
}
void afc_selection_color()
{
if (!btnAFC) return;
btnAFC->selection_color(progdefaults.AfcColor);
btnAFC->selection_color(RGBCOLOR(AfcColor));
btnAFC->redraw();
}
@ -9674,21 +9618,21 @@ void rxid_selection_color()
void txid_selection_color()
{
if (!btnTxRSID) return;
btnTxRSID->selection_color(progdefaults.TxIDColor);
btnTxRSID->selection_color(RGBCOLOR(TxIDColor));
btnTxRSID->redraw();
}
void tune_selection_color()
{
if (!btnTune) return;
btnTune->selection_color(progdefaults.TuneColor);
btnTune->selection_color(RGBCOLOR(TuneColor));
btnTune->redraw();
}
void spot_selection_color()
{
if (!btnAutoSpot) return;
btnAutoSpot->selection_color(progdefaults.SpotColor);
btnAutoSpot->selection_color(RGBCOLOR(SpotColor));
btnAutoSpot->redraw();
}
@ -9721,7 +9665,7 @@ void set_default_btn_color()
for (size_t i = 0; i < nbtns; i++) {
if (buttons[i] != NULL) {
buttons[i]->selection_color(progdefaults.default_btn_color);
buttons[i]->selection_color(RGBCOLOR(default_btn_color));
buttons[i]->redraw();
}
}
@ -10165,7 +10109,7 @@ void set_default_btn_color()
for (size_t i = 0; i < ncheck_btns; i++) {
if (check_buttons[i] != NULL) {
check_buttons[i]->color(progdefaults.default_check_btn_color);
check_buttons[i]->color( RGBCOLOR( default_check_btn_color ));
check_buttons[i]->redraw();
}
}
@ -10198,16 +10142,16 @@ void set_default_btn_color()
for (size_t i = 0; i < nround_btns; i++) {
if (round_buttons[i] != NULL) {
round_buttons[i]->selection_color(progdefaults.default_round_btn_color);
round_buttons[i]->selection_color( RGBCOLOR( default_round_btn_color ) );
round_buttons[i]->redraw();
}
}
trx_mode md = active_modem->get_mode();
if ((md > MODE_WEFAX_FIRST) && (md <= MODE_WEFAX_LAST)) {
wefax_round_rx_noise_removal->selection_color(progdefaults.default_btn_color);
wefax_round_rx_binary->selection_color(progdefaults.default_btn_color);
wefax_round_rx_non_stop->selection_color(progdefaults.default_btn_color);
wefax_round_rx_noise_removal->selection_color( RGBCOLOR( default_btn_color ) );
wefax_round_rx_binary->selection_color( RGBCOLOR( default_btn_color ) );
wefax_round_rx_non_stop->selection_color( RGBCOLOR( default_btn_color ) );
}
}

187
src/dialogs/fl_digi_main.cxx
View file

@ -97,7 +97,7 @@ void create_fl_digi_main_primary() {
tx_timer->labelfont(lfont);
btnAutoSpot = new Fl_Light_Button(W - 250, 0, 50, Hmenu, "Spot");
btnAutoSpot->selection_color(progdefaults.SpotColor);
btnAutoSpot->selection_color( RGBCOLOR( SpotColor ) );
btnAutoSpot->callback(cbAutoSpot, 0);
btnAutoSpot->deactivate();
btnAutoSpot->labelsize(FL_NORMAL_SIZE - 1);
@ -106,21 +106,21 @@ void create_fl_digi_main_primary() {
btnRSID = new Fl_Light_Button(W - 200, 0, 50, Hmenu, "RxID");
btnRSID->tooltip("Receive RSID");
btnRSID->selection_color(
progdefaults.rsidWideSearch ? progdefaults.RxIDwideColor : progdefaults.RxIDColor);
progdefaults.rsidWideSearch ? RGBCOLOR( RxIDwideColor ) : RGBCOLOR( RxIDColor ) );
btnRSID->value(progdefaults.rsid);
btnRSID->callback(cbRSID, 0);
btnRSID->labelsize(FL_NORMAL_SIZE - 1);
btnRSID->labelfont(lfont);
btnTxRSID = new Fl_Light_Button(W - 150, 0, 50, Hmenu, "TxID");
btnTxRSID->selection_color(progdefaults.TxIDColor);
btnTxRSID->selection_color( RGBCOLOR( TxIDColor ) );
btnTxRSID->tooltip("Transmit RSID");
btnTxRSID->callback(cbTxRSID, 0);
btnTxRSID->labelsize(FL_NORMAL_SIZE - 1);
btnTxRSID->labelfont(lfont);
btnTune = new Fl_Light_Button(W - 100, 0, 50, Hmenu, "TUNE");
btnTune->selection_color(progdefaults.TuneColor);
btnTune->selection_color( RGBCOLOR( TuneColor ) );
btnTune->callback(cbTune, 0);
btnTune->labelsize(FL_NORMAL_SIZE - 1);
btnTune->labelfont(lfont);
@ -186,13 +186,7 @@ void create_fl_digi_main_primary() {
qsoFreqDisp1->align(FL_ALIGN_CENTER);
qsoFreqDisp1->when(FL_WHEN_RELEASE);
qsoFreqDisp1->callback(qso_movFreq);
qsoFreqDisp1->SetCOLORS(
fl_rgb_color( progdefaults.FDforeground.R,
progdefaults.FDforeground.G,
progdefaults.FDforeground.B),
fl_rgb_color( progdefaults.FDbackground.R,
progdefaults.FDbackground.G,
progdefaults.FDbackground.B));
qsoFreqDisp1->SetCOLORS( RGBCOLOR( FDforeground ), RGBCOLOR( FDbackground ) );
qsoFreqDisp1->value(0);
qsoFreqDisp1->end();
@ -223,14 +217,7 @@ void create_fl_digi_main_primary() {
pwr_level->range(0, 100.0);
pwr_level->step(1);
pwr_level->callback( (Fl_Callback *) cb_set_pwr_level );
pwr_level->color( fl_rgb_color(
progdefaults.bwsrSliderColor.R,
progdefaults.bwsrSliderColor.G,
progdefaults.bwsrSliderColor.B));
pwr_level->selection_color( fl_rgb_color(
progdefaults.bwsrSldrSelColor.R,
progdefaults.bwsrSldrSelColor.G,
progdefaults.bwsrSldrSelColor.B));
pwr_level->color( RGBCOLOR( bwsrSliderColor ), RGBCOLOR( bwsrSldrSelColor ) );
pwr_level->tooltip(_("Adjust Power Level"));
set_pwr_level = new Fl_Button(
@ -1188,13 +1175,7 @@ Logging_frame->resizable(NFtabs);
qsoFreqDisp2->when(FL_WHEN_RELEASE);
qsoFreqDisp2->callback(qso_movFreq);
qsoFreqDisp2->font(progdefaults.FreqControlFontnbr);
qsoFreqDisp2->SetCOLORS(
fl_rgb_color( progdefaults.FDforeground.R,
progdefaults.FDforeground.G,
progdefaults.FDforeground.B),
fl_rgb_color( progdefaults.FDbackground.R,
progdefaults.FDbackground.G,
progdefaults.FDbackground.B));
qsoFreqDisp2->SetCOLORS( RGBCOLOR( FDforeground ), RGBCOLOR( FDbackground ) );
qsoFreqDisp2->value(0);
qso_opPICK2 = new Fl_Button(
@ -1323,13 +1304,7 @@ Logging_frame->resizable(NFtabs);
qsoFreqDisp3->when(FL_WHEN_RELEASE);
qsoFreqDisp3->callback(qso_movFreq);
qsoFreqDisp3->font(progdefaults.FreqControlFontnbr);
qsoFreqDisp3->SetCOLORS(
fl_rgb_color( progdefaults.FDforeground.R,
progdefaults.FDforeground.G,
progdefaults.FDforeground.B),
fl_rgb_color( progdefaults.FDbackground.R,
progdefaults.FDbackground.G,
progdefaults.FDbackground.B));
qsoFreqDisp3->SetCOLORS( RGBCOLOR( FDforeground ), RGBCOLOR( FDbackground ) );
qsoFreqDisp3->value(0);
qso_opPICK3 = new Fl_Button(
@ -2449,14 +2424,8 @@ Logging_frame->resizable(NFtabs);
mvsquelch->range(-3.0, 6.0);
mvsquelch->value(progStatus.VIEWER_psksquelch);
mvsquelch->step(0.1);
mvsquelch->color( fl_rgb_color(
progdefaults.bwsrSliderColor.R,
progdefaults.bwsrSliderColor.G,
progdefaults.bwsrSliderColor.B));
mvsquelch->selection_color( fl_rgb_color(
progdefaults.bwsrSldrSelColor.R,
progdefaults.bwsrSldrSelColor.G,
progdefaults.bwsrSldrSelColor.B));
mvsquelch->color( RGBCOLOR( bwsrSliderColor ) );
mvsquelch->selection_color( RGBCOLOR( bwsrSldrSelColor ) );
mvsquelch->callback( (Fl_Callback *)cb_mvsquelch);
mvsquelch->tooltip(_("Set Viewer Squelch"));
@ -2483,19 +2452,14 @@ Logging_frame->resizable(NFtabs);
ReceiveText = new FTextRX(
text_panel->x() + mvgroup->w(), text_panel->y(),
text_panel->w() - mvgroup->w(), rh, "" );
ReceiveText->color(
fl_rgb_color(
progdefaults.RxColor.R,
progdefaults.RxColor.G,
progdefaults.RxColor.B),
progdefaults.RxTxSelectcolor);
ReceiveText->color( RGBCOLOR( RxColor ), RGBCOLOR( RxTxSelectcolor ) );
ReceiveText->setFont(progdefaults.RxFontnbr);
ReceiveText->setFontSize(progdefaults.RxFontsize);
ReceiveText->setFontColor(progdefaults.RxFontcolor, FTextBase::RECV);
ReceiveText->setFontColor(progdefaults.XMITcolor, FTextBase::XMIT);
ReceiveText->setFontColor(progdefaults.CTRLcolor, FTextBase::CTRL);
ReceiveText->setFontColor(progdefaults.SKIPcolor, FTextBase::SKIP);
ReceiveText->setFontColor(progdefaults.ALTRcolor, FTextBase::ALTR);
ReceiveText->setFontColor( RGBCOLOR( RxFontcolor ), FTextBase::RECV );
ReceiveText->setFontColor( RGBCOLOR( XMITcolor ), FTextBase::XMIT );
ReceiveText->setFontColor( RGBCOLOR( CTRLcolor ), FTextBase::CTRL );
ReceiveText->setFontColor( RGBCOLOR( SKIPcolor ), FTextBase::SKIP );
ReceiveText->setFontColor( RGBCOLOR( ALTRcolor ), FTextBase::ALTR );
FHdisp = new Raster(
text_panel->x() + mvgroup->w(), text_panel->y(),
@ -2509,19 +2473,14 @@ Logging_frame->resizable(NFtabs);
TransmitText = new FTextTX(
text_panel->x() + mvgroup->w(), text_panel->y() + ReceiveText->h(),
text_panel->w() - mvgroup->w(), text_panel->h() - ReceiveText->h() );
TransmitText->color(
fl_rgb_color(
progdefaults.TxColor.R,
progdefaults.TxColor.G,
progdefaults.TxColor.B),
progdefaults.RxTxSelectcolor);
TransmitText->color( RGBCOLOR( TxColor ), RGBCOLOR( RxTxSelectcolor ) );
TransmitText->setFont(progdefaults.TxFontnbr);
TransmitText->setFontSize(progdefaults.TxFontsize);
TransmitText->setFontColor(progdefaults.TxFontcolor, FTextBase::RECV);
TransmitText->setFontColor(progdefaults.XMITcolor, FTextBase::XMIT);
TransmitText->setFontColor(progdefaults.CTRLcolor, FTextBase::CTRL);
TransmitText->setFontColor(progdefaults.SKIPcolor, FTextBase::SKIP);
TransmitText->setFontColor(progdefaults.ALTRcolor, FTextBase::ALTR);
TransmitText->setFontColor( RGBCOLOR( TxFontcolor ), FTextBase::RECV );
TransmitText->setFontColor( RGBCOLOR( XMITcolor ), FTextBase::XMIT );
TransmitText->setFontColor( RGBCOLOR( CTRLcolor ), FTextBase::CTRL );
TransmitText->setFontColor( RGBCOLOR( SKIPcolor ), FTextBase::SKIP );
TransmitText->setFontColor( RGBCOLOR( ALTRcolor ), FTextBase::ALTR );
TransmitText->align(FL_ALIGN_CLIP);
minbox = new Fl_Box(
@ -2558,39 +2517,29 @@ Logging_frame->resizable(NFtabs);
fsq_rx_text = new FTextRX(
0, Y,
fsq_left->w(), fsq_left->h() / 2);
fsq_rx_text->color(
fl_rgb_color(
progdefaults.RxColor.R,
progdefaults.RxColor.G,
progdefaults.RxColor.B),
progdefaults.RxTxSelectcolor);
fsq_rx_text->color( RGBCOLOR( RxColor ), RGBCOLOR( RxTxSelectcolor ) );
fsq_rx_text->setFont(progdefaults.RxFontnbr);
fsq_rx_text->setFontSize(progdefaults.RxFontsize);
fsq_rx_text->setFontColor(progdefaults.RxFontcolor, FTextBase::RECV);
fsq_rx_text->setFontColor(progdefaults.XMITcolor, FTextBase::XMIT);
fsq_rx_text->setFontColor(progdefaults.CTRLcolor, FTextBase::CTRL);
fsq_rx_text->setFontColor(progdefaults.SKIPcolor, FTextBase::SKIP);
fsq_rx_text->setFontColor(progdefaults.ALTRcolor, FTextBase::ALTR);
fsq_rx_text->setFontColor(progdefaults.fsq_xmt_color, FTextBase::FSQ_TX);
fsq_rx_text->setFontColor(progdefaults.fsq_directed_color, FTextBase::FSQ_DIR);
fsq_rx_text->setFontColor(progdefaults.fsq_undirected_color, FTextBase::FSQ_UND);
fsq_rx_text->setFontColor( RGBCOLOR( RxFontcolor ), FTextBase::RECV);
fsq_rx_text->setFontColor( RGBCOLOR( XMITcolor ), FTextBase::XMIT);
fsq_rx_text->setFontColor( RGBCOLOR( CTRLcolor ), FTextBase::CTRL);
fsq_rx_text->setFontColor( RGBCOLOR( SKIPcolor ), FTextBase::SKIP);
fsq_rx_text->setFontColor( RGBCOLOR( ALTRcolor ), FTextBase::ALTR);
fsq_rx_text->setFontColor( RGBCOLOR( fsq_xmt_color ), FTextBase::FSQ_TX);
fsq_rx_text->setFontColor( RGBCOLOR( fsq_directed_color ), FTextBase::FSQ_DIR);
fsq_rx_text->setFontColor( RGBCOLOR( fsq_undirected_color ), FTextBase::FSQ_UND);
fsq_tx_text = new FTextTX(
0, Y + fsq_rx_text->h(),
fsq_left->w(), fsq_left->h() - fsq_rx_text->h());
fsq_tx_text->color(
fl_rgb_color(
progdefaults.TxColor.R,
progdefaults.TxColor.G,
progdefaults.TxColor.B),
progdefaults.RxTxSelectcolor);
fsq_tx_text->color( RGBCOLOR( TxColor ), RGBCOLOR( RxTxSelectcolor ) );
fsq_tx_text->setFont(progdefaults.TxFontnbr);
fsq_tx_text->setFontSize(progdefaults.TxFontsize);
fsq_tx_text->setFontColor(progdefaults.TxFontcolor, FTextBase::RECV);
fsq_tx_text->setFontColor(progdefaults.XMITcolor, FTextBase::XMIT);
fsq_tx_text->setFontColor(progdefaults.CTRLcolor, FTextBase::CTRL);
fsq_tx_text->setFontColor(progdefaults.SKIPcolor, FTextBase::SKIP);
fsq_tx_text->setFontColor(progdefaults.ALTRcolor, FTextBase::ALTR);
fsq_tx_text->setFontColor( RGBCOLOR( TxFontcolor ), FTextBase::RECV);
fsq_tx_text->setFontColor( RGBCOLOR( XMITcolor ), FTextBase::XMIT);
fsq_tx_text->setFontColor( RGBCOLOR( CTRLcolor ), FTextBase::CTRL);
fsq_tx_text->setFontColor( RGBCOLOR( SKIPcolor ), FTextBase::SKIP);
fsq_tx_text->setFontColor( RGBCOLOR( ALTRcolor ), FTextBase::ALTR);
fsq_tx_text->align(FL_ALIGN_CLIP);
fsq_minbox = new Fl_Box(
@ -2743,36 +2692,26 @@ Logging_frame->resizable(NFtabs);
ifkp_rx_text = new FTextRX(
0, Y,
ifkp_left->w(), ifkp_group->h() / 2);
ifkp_rx_text->color(
fl_rgb_color(
progdefaults.RxColor.R,
progdefaults.RxColor.G,
progdefaults.RxColor.B),
progdefaults.RxTxSelectcolor);
ifkp_rx_text->color( RGBCOLOR( RxColor ), RGBCOLOR( RxTxSelectcolor ) );
ifkp_rx_text->setFont(progdefaults.RxFontnbr);
ifkp_rx_text->setFontSize(progdefaults.RxFontsize);
ifkp_rx_text->setFontColor(progdefaults.RxFontcolor, FTextBase::RECV);
ifkp_rx_text->setFontColor(progdefaults.XMITcolor, FTextBase::XMIT);
ifkp_rx_text->setFontColor(progdefaults.CTRLcolor, FTextBase::CTRL);
ifkp_rx_text->setFontColor(progdefaults.SKIPcolor, FTextBase::SKIP);
ifkp_rx_text->setFontColor(progdefaults.ALTRcolor, FTextBase::ALTR);
ifkp_rx_text->setFontColor( RGBCOLOR( RxFontcolor ), FTextBase::RECV);
ifkp_rx_text->setFontColor( RGBCOLOR( XMITcolor ), FTextBase::XMIT);
ifkp_rx_text->setFontColor( RGBCOLOR( CTRLcolor ), FTextBase::CTRL);
ifkp_rx_text->setFontColor( RGBCOLOR( SKIPcolor ), FTextBase::SKIP);
ifkp_rx_text->setFontColor( RGBCOLOR( ALTRcolor ), FTextBase::ALTR);
ifkp_tx_text = new FTextTX(
0, Y + ifkp_rx_text->h(),
ifkp_rx_text->w(), ifkp_group->h() - ifkp_rx_text->h());
ifkp_tx_text->color(
fl_rgb_color(
progdefaults.TxColor.R,
progdefaults.TxColor.G,
progdefaults.TxColor.B),
progdefaults.RxTxSelectcolor);
ifkp_tx_text->color( RGBCOLOR( TxColor ), RGBCOLOR( RxTxSelectcolor ));
ifkp_tx_text->setFont(progdefaults.TxFontnbr);
ifkp_tx_text->setFontSize(progdefaults.TxFontsize);
ifkp_tx_text->setFontColor(progdefaults.TxFontcolor, FTextBase::RECV);
ifkp_tx_text->setFontColor(progdefaults.XMITcolor, FTextBase::XMIT);
ifkp_tx_text->setFontColor(progdefaults.CTRLcolor, FTextBase::CTRL);
ifkp_tx_text->setFontColor(progdefaults.SKIPcolor, FTextBase::SKIP);
ifkp_tx_text->setFontColor(progdefaults.ALTRcolor, FTextBase::ALTR);
ifkp_tx_text->setFontColor( RGBCOLOR( TxFontcolor ), FTextBase::RECV);
ifkp_tx_text->setFontColor( RGBCOLOR( XMITcolor ), FTextBase::XMIT);
ifkp_tx_text->setFontColor( RGBCOLOR( CTRLcolor ), FTextBase::CTRL);
ifkp_tx_text->setFontColor( RGBCOLOR( SKIPcolor ), FTextBase::SKIP);
ifkp_tx_text->setFontColor( RGBCOLOR( ALTRcolor ), FTextBase::ALTR);
ifkp_tx_text->align(FL_ALIGN_CLIP);
ifkp_minbox = new Fl_Box(
@ -2895,12 +2834,12 @@ Logging_frame->resizable(NFtabs);
wf_group = new Fl_Group(0, Y, W, Hwfall);
wf = new waterfall(0, Y, Wwfall, Hwfall);
wf->wfscope->bk_color(progdefaults.digi_background);
wf->wfscope->axis_color(progdefaults.digi_axis_color);
wf->wfscope->user_color_1(progdefaults.digi_color_1);
wf->wfscope->user_color_2(progdefaults.digi_color_2);
wf->wfscope->user_color_3(progdefaults.digi_color_3);
wf->wfscope->user_color_4(progdefaults.digi_color_4);
wf->wfscope->bk_color( RGBCOLOR( digi_background ) );
wf->wfscope->axis_color( RGBCOLOR( digi_axis_color ) );
wf->wfscope->user_color_1( RGBCOLOR( digi_color_1 ) );
wf->wfscope->user_color_2( RGBCOLOR( digi_color_2 ) );
wf->wfscope->user_color_3( RGBCOLOR( digi_color_3 ) );
wf->wfscope->user_color_4( RGBCOLOR( digi_color_4 ) );
wf->end();
@ -3053,7 +2992,7 @@ Logging_frame->resizable(NFtabs);
rightof(btnSQL), Y,
bwSqlOnOff, Hstatus, "PSM");
btnSQL->selection_color(progdefaults.Sql1Color);
btnSQL->selection_color( RGBCOLOR( Sql1Color ) );
btnAFC->callback(cbAFC, 0);
btnAFC->value(1);
@ -3063,7 +3002,7 @@ Logging_frame->resizable(NFtabs);
btnSQL->value(1);
btnSQL->tooltip(_("Squelch"));
btnPSQL->selection_color(progdefaults.Sql1Color);
btnPSQL->selection_color( RGBCOLOR( Sql1Color ) );
btnPSQL->value(progdefaults.kpsql_enabled);
btnPSQL->callback(cbPwrSQL, 0);
btnPSQL->tooltip(_("Power Signal Monitor"));
@ -3171,12 +3110,12 @@ Logging_frame->resizable(NFtabs);
scopeview = new Fl_Double_Window(0,0,140,140, _("Scope"));
scopeview->xclass(PACKAGE_NAME);
digiscope = new Digiscope (0, 0, 140, 140);
digiscope->bk_color(progdefaults.digi_background);
digiscope->axis_color(progdefaults.digi_axis_color);
digiscope->user_color_1(progdefaults.digi_color_1);
digiscope->user_color_2(progdefaults.digi_color_2);
digiscope->user_color_3(progdefaults.digi_color_3);
digiscope->user_color_4(progdefaults.digi_color_4);
digiscope->bk_color( RGBCOLOR( digi_background ) );
digiscope->axis_color( RGBCOLOR( digi_axis_color ) );
digiscope->user_color_1( RGBCOLOR( digi_color_1 ) );
digiscope->user_color_2( RGBCOLOR( digi_color_2 ) );
digiscope->user_color_3( RGBCOLOR( digi_color_3 ) );
digiscope->user_color_4( RGBCOLOR( digi_color_4 ) );
scopeview->resizable(digiscope);
scopeview->size_range(SCOPEWIN_MIN_WIDTH, SCOPEWIN_MIN_HEIGHT);
scopeview->end();

67
src/dxcluster/dxcluster.cxx
View file

@ -41,6 +41,7 @@
#include "modem.h"
#include "trx.h"
#include "configuration.h"
#include "ui_colors.h"
#include "main.h"
#include "waterfall.h"
#include "macros.h"
@ -221,13 +222,13 @@ static void odd_even()
reports_header->redraw();
snprintf(odd, sizeof(odd), "@B%u@C%u@F%d@S%d@.",
progdefaults.DXC_odd_color,
FL_BLACK,
progdefaults.DXC_textfont,
progdefaults.DXC_textsize);
RGBCOLOR( DXC_odd_color ),
FL_BLACK,
progdefaults.DXC_textfont,
progdefaults.DXC_textsize);
snprintf(even, sizeof(even), "@B%u@C%u@F%d@S%d@.",
progdefaults.DXC_even_color,
RGBCOLOR( DXC_even_color ),
FL_BLACK,
progdefaults.DXC_textfont,
progdefaults.DXC_textsize);
@ -325,13 +326,13 @@ void parse_dxline(std::string buffer)
guard_lock dxcc_lock(&dxc_line_mutex);
snprintf(odd, sizeof(odd), "@B%u@C%u@F%d@S%d@.",
progdefaults.DXC_odd_color,
RGBCOLOR( DXC_odd_color ),
FL_BLACK,
progdefaults.DXC_textfont,
progdefaults.DXC_textsize);
snprintf(even, sizeof(even), "@B%u@C%u@F%d@S%d@.",
progdefaults.DXC_even_color,
RGBCOLOR( DXC_even_color ),
FL_BLACK,
progdefaults.DXC_textfont,
progdefaults.DXC_textsize);
@ -1103,46 +1104,30 @@ void DXcluster_init(void)
reports_header->add(hdr);
reports_header->has_scrollbar(0);
brws_tcpip_stream->color(fl_rgb_color(
progdefaults.DX_Color.R,
progdefaults.DX_Color.G,
progdefaults.DX_Color.B));
brws_tcpip_stream->color( RGBCOLOR( DX_Color ) );
brws_tcpip_stream->setFont(progdefaults.DXfontnbr);
brws_tcpip_stream->setFontSize(progdefaults.DXfontsize);
brws_tcpip_stream->setFontColor(progdefaults.DXfontcolor, FTextBase::RECV);
brws_tcpip_stream->setFontColor(progdefaults.DXalt_color, FTextBase::XMIT);
brws_tcpip_stream->setFontColor( RGBCOLOR( DXfontcolor ), FTextBase::RECV);
brws_tcpip_stream->setFontColor( RGBCOLOR( DXalt_color ), FTextBase::XMIT);
brws_tcpip_stream->setFontColor(
fl_contrast(progdefaults.DXfontcolor,
fl_rgb_color( progdefaults.DX_Color.R,
progdefaults.DX_Color.G,
progdefaults.DX_Color.B) ),
FTextBase::CTRL);
fl_contrast( RGBCOLOR( DXfontcolor ), RGBCOLOR( DX_Color) ), FTextBase::CTRL);
ed_telnet_cmds->color(fl_rgb_color(
progdefaults.DX_Color.R,
progdefaults.DX_Color.G,
progdefaults.DX_Color.B));
ed_telnet_cmds->color( RGBCOLOR( DX_Color ) );
ed_telnet_cmds->setFont(progdefaults.DXfontnbr);
ed_telnet_cmds->setFontSize(progdefaults.DXfontsize);
ed_telnet_cmds->setFontColor(progdefaults.DXfontcolor);
ed_telnet_cmds->setFontColor( RGBCOLOR( DXfontcolor ) );
brws_dxc_help->color(fl_rgb_color(
progdefaults.DX_Color.R,
progdefaults.DX_Color.G,
progdefaults.DX_Color.B));
brws_dxc_help->setFontColor(progdefaults.DXfontcolor, FTextBase::RECV);
brws_dxc_help->color( RGBCOLOR( DX_Color ) );
brws_dxc_help->setFontColor( RGBCOLOR( DXfontcolor ), FTextBase::RECV);
brws_dxc_help->setFont(progdefaults.DXfontnbr);
brws_dxc_help->setFontSize(progdefaults.DXfontsize);
brws_dxcluster_hosts->color(fl_rgb_color(
progdefaults.DX_Color.R,
progdefaults.DX_Color.G,
progdefaults.DX_Color.B));
brws_dxcluster_hosts->textcolor(progdefaults.DXfontcolor);
brws_dxcluster_hosts->color( RGBCOLOR( DX_Color ) );
brws_dxcluster_hosts->textcolor( RGBCOLOR( DXfontcolor ) );
brws_dxcluster_hosts->textfont(progdefaults.DXfontnbr);
brws_dxcluster_hosts->textsize(progdefaults.DXfontsize);
cluster_tabs->selection_color(progdefaults.TabsColor);
cluster_tabs->selection_color( RGBCOLOR( TabsColor ) );
if (progdefaults.dxc_auto_connect) {
DXcluster_connect(true);
@ -1215,11 +1200,8 @@ void dxcluster_hosts_save()
void dxcluster_hosts_load()
{
brws_dxcluster_hosts->color(fl_rgb_color(
progdefaults.DX_Color.R,
progdefaults.DX_Color.G,
progdefaults.DX_Color.B));
brws_dxcluster_hosts->textcolor(progdefaults.DXfontcolor);
brws_dxcluster_hosts->color( RGBCOLOR( DX_Color ) );
brws_dxcluster_hosts->textcolor( RGBCOLOR( DXfontcolor ));
brws_dxcluster_hosts->textfont(progdefaults.DXfontnbr);
brws_dxcluster_hosts->textsize(progdefaults.DXfontsize);
@ -1312,11 +1294,8 @@ void dxcluster_hosts_clear(Fl_Button*, void*)
void dxcluster_hosts_add(Fl_Button*, void*)
{
brws_dxcluster_hosts->color(fl_rgb_color(
progdefaults.DX_Color.R,
progdefaults.DX_Color.G,
progdefaults.DX_Color.B));
brws_dxcluster_hosts->textcolor(progdefaults.DXfontcolor);
brws_dxcluster_hosts->color( RGBCOLOR( DX_Color ) );
brws_dxcluster_hosts->textcolor( RGBCOLOR( DXfontcolor ) );
brws_dxcluster_hosts->textfont(progdefaults.DXfontnbr);
brws_dxcluster_hosts->textsize(progdefaults.DXfontsize);

19
src/fmt/fmt_dialog.cxx
View file

@ -25,6 +25,7 @@
#include <FL/Fl_Box.H>
#include "configuration.h"
#include "ui_colors.h"
#include "confdialog.h"
#include "gettext.h"
#include "fmt_dialog.h"
@ -243,11 +244,11 @@ Fl_Group* fmt_panel(int X, int Y, int W, int H) {
grp->w() - 4, grp->h() - 4- 2 * grp_height, "");
fmt_plot->reverse_x(progdefaults.FMT_reverse);
fmt_plot->bk_color (progdefaults.FMT_background);
fmt_plot->line_color_1 (progdefaults.FMT_unk_color);
fmt_plot->line_color_2 (progdefaults.FMT_ref_color);
fmt_plot->axis_color (progdefaults.FMT_axis_color);
fmt_plot->legend_color (progdefaults.FMT_legend_color);
fmt_plot->bk_color ( RGBCOLOR( FMT_background ) );
fmt_plot->line_color_1 ( RGBCOLOR( FMT_unk_color ) );
fmt_plot->line_color_2 ( RGBCOLOR( FMT_ref_color ) );
fmt_plot->axis_color ( RGBCOLOR( FMT_axis_color ) );
fmt_plot->legend_color ( RGBCOLOR( FMT_legend_color ) );
fmt_set_x_scale ();
fmt_set_y_scale ();
fmt_plot->show_1(false);
@ -261,14 +262,14 @@ Fl_Group* fmt_panel(int X, int Y, int W, int H) {
btn_unk_enable = new Fl_Light_Button(
ref_group->x() + 2, ref_group->y() + 2,
50, 20, "Unk'");
btn_unk_enable->selection_color(progdefaults.default_btn_color);
btn_unk_enable->selection_color( RGBCOLOR( default_btn_color ) );
btn_unk_enable->callback((Fl_Callback *)cb_btn_unk_enable);
unk_color = new Fl_Box(
btn_unk_enable->x() + btn_unk_enable->w() + 2, btn_unk_enable->y() + 4,
12, 12, "");
unk_color->box(FL_DOWN_BOX);
unk_color->color(progdefaults.FMT_unk_color);
unk_color->color( RGBCOLOR( FMT_unk_color ));
btn_unk_dn = new Fl_Button(
unk_color->x() + unk_color->w() + 2, btn_unk_enable->y(),
@ -358,14 +359,14 @@ Fl_Group* fmt_panel(int X, int Y, int W, int H) {
btn_ref_enable = new Fl_Light_Button(
unk_group->x() + 2, unk_group->y() + 2,
50, 20, "Ref'");
btn_ref_enable->selection_color(progdefaults.default_btn_color);
btn_ref_enable->selection_color( RGBCOLOR( default_btn_color ) );
btn_ref_enable->callback((Fl_Callback *)cb_btn_ref_enable);
ref_color = new Fl_Box(
btn_ref_enable->x() + btn_ref_enable->w() + 2, btn_ref_enable->y() + 4,
12, 12, "");
ref_color->box(FL_DOWN_BOX);
ref_color->color(progdefaults.FMT_ref_color);
ref_color->color( RGBCOLOR( FMT_ref_color ) );
btn_ref_dn = new Fl_Button(
unk_color->x() + unk_color->w() + 2, btn_ref_enable->y(),

19
src/fsq/fsq_monitor.cxx
View file

@ -29,6 +29,7 @@
#include "trx.h"
#include "main.h"
#include "configuration.h"
#include "ui_colors.h"
#include "confdialog.h"
#include "status.h"
#include "waterfall.h"
@ -73,28 +74,18 @@ Fl_Double_Window* create_fsqMonitor(void)
fsq_monitor = new FTextRX(
monitor_panel->x(), monitor_panel->y(),
monitor_panel->w(), 7*monitor_panel->h()/8);
fsq_monitor->color(
fl_rgb_color(
0.98*progdefaults.RxColor.R,
0.98*progdefaults.RxColor.G,
0.98*progdefaults.RxColor.B),
progdefaults.RxTxSelectcolor);
fsq_monitor->color( 0.98 * RGBCOLOR( RxColor ), RGBCOLOR( RxTxSelectcolor ) );
fsq_monitor->setFont(progdefaults.RxFontnbr);
fsq_monitor->setFontSize(progdefaults.RxFontsize);
fsq_monitor->setFontColor(progdefaults.RxFontcolor, FTextBase::RECV);
fsq_monitor->setFontColor( RGBCOLOR( RxFontcolor ), FTextBase::RECV);
fsq_que = new FTextRX(
fsq_monitor->x(), fsq_monitor->y() + fsq_monitor->h(),
fsq_monitor->w(), monitor_panel->h() - fsq_monitor->h());
fsq_que->color(
fl_rgb_color(
0.98*progdefaults.RxColor.R,
0.98*progdefaults.RxColor.G,
0.98*progdefaults.RxColor.B),
progdefaults.RxTxSelectcolor);
fsq_que->color( 0.98 * RGBCOLOR( RxColor ), RGBCOLOR( RxTxSelectcolor ) );
fsq_que->setFont(progdefaults.RxFontnbr);
fsq_que->setFontSize(progdefaults.RxFontsize);
fsq_que->setFontColor(progdefaults.RxFontcolor, FTextBase::RECV);
fsq_que->setFontColor(RGBCOLOR( RxFontcolor ), FTextBase::RECV);
Fl_Box *minbox = new Fl_Box(
monitor_panel->x(), monitor_panel->y() + 66,

274
src/include/configuration.h
View file

@ -48,6 +48,9 @@
#elif defined(__OpenBSD__)
# define DEFAULT_PTTDEV "/dev/tty00"
# define DEFAULT_CWFSKPORT "/dev/tty01"
# define DEFAULT_HAMRIGDEVICE "/dev/tty00"
#elif defined(__WOE32__)
# define DEFAULT_PTTDEV "COM1"
@ -71,18 +74,9 @@
#endif
#define CONFIG_LIST \
ELEM_(bool, confirmExit, "CONFIRMEXIT", \
ELEM_(bool, confirmExit, "CONFIRMEXIT", \
"Ensure user wants to leave flgidi", \
true) \
ELEM_(Fl_Color, background, "BACKGROUND", \
"background color", \
FL_BACKGROUND_COLOR) \
ELEM_(Fl_Color, background2, "BACKGROUND2", \
"background2 color", \
FL_BACKGROUND2_COLOR) \
ELEM_(Fl_Color, foreground, "FOREGROUND", \
"foreground color", \
FL_FOREGROUND_COLOR) \
ELEM_(bool, show_tx_timer, "SHOW_TX_TIMER", \
"Show tx timer on menu bar", \
true) \
@ -110,9 +104,6 @@
ELEM_(bool, rsid, "RECEIVERSID", \
"Enable Reed Soloman ID decoding", \
false) \
ELEM_(RGBI, rsidRGBI, "RSIDCOLORS", \
"Color of RsID detection markers (RGBI)", \
{255, 255, 255, 255}) \
ELEM_(bool, TransmitRSid, "TRANSMITRSID", \
"Send RSID at beginning and end of transmission", \
false) \
@ -399,25 +390,6 @@
ELEM_(double, ServerACQsn, "PSKSERVERACGSN", \
"Acquisition S/N (dB)", \
9.0) \
/* DIGI SCOPE */ \
ELEM_(Fl_Color, digi_background, "digi_background", \
"Color for digi_scope background", \
FL_BLACK) \
ELEM_(Fl_Color, digi_axis_color, "digi_axis_color", \
"Color for digi_scope axis", \
FL_WHITE) \
ELEM_(Fl_Color, digi_color_1, "digi_color_1", \
"Color for digi_scope color 1", \
FL_GREEN) \
ELEM_(Fl_Color, digi_color_2, "digi_color_2", \
"Color for digi_scope color 2", \
FL_YELLOW) \
ELEM_(Fl_Color, digi_color_3, "digi_color_3", \
"Color for digi_scope color 3", \
FL_CYAN) \
ELEM_(Fl_Color, digi_color_4, "digi_color_4", \
"Color for digi_scope color 4", \
FL_MAGENTA) \
/* RTTY */ \
ELEM_(int, kahn_demod, "KAHNDEMOD", \
"1 - use Kahn power demodulator\n" \
@ -944,15 +916,6 @@
ELEM_(std::string, fsq_audit_log, "FSQ_AUDIT_LOG", \
"FSQ audit log pathname", \
"fsq_audit_log.txt") \
ELEM_(Fl_Color, fsq_xmt_color, "FSQXMTCOLOR", \
"Color for FSQ xmt text", \
FL_RED) \
ELEM_(Fl_Color, fsq_directed_color, "FSQDIRECTEDCOLOR", \
"Color for FSQ directed text", \
FL_BLUE) \
ELEM_(Fl_Color, fsq_undirected_color, "FSQUNDIRECTEDCOLOR", \
"Color for FSQ undirected text", \
FL_DARK_GREEN) \
ELEM_(bool, add_fsq_msg_dt, "ADDFSQMSGDT", \
"Add date-time stamp to each # type received message", \
1) \
@ -1023,24 +986,6 @@
ELEM_(bool, UseWideTracks, "USEWIDETRACKS", \
"Draw bandwidth marker with 3x vertical lines", \
false) \
ELEM_(RGBI, cursorLineRGBI, "CLCOLORS", \
"Color of cursor lines (RGBI)", \
{255, 255, 0, 255}) \
ELEM_(RGBI, cursorCenterRGBI, "CCCOLORS", \
"Color of cursor center line (RGBI)", \
{255, 255, 255, 255}) \
ELEM_(RGBI, bwTrackRGBI, "BWTCOLORS", \
"Color of bandwidth marker (RGBI)", \
{255, 0, 0, 255}) \
ELEM_(RGBI, notchRGBI, "NOTCHCOLORS", \
"Color of notch marker (RGBI)", \
{255, 255, 255, 255}) \
ELEM_(RGBI, rttymarkRGBI, "RTTYMARKRGBI", \
"Color of RTTY MARK freq marker (RGBI)", \
{255, 120, 0, 255}) \
ELEM_(RGBI, monitorRGBI, "MONITORRGBI", \
"Color of audio filter bandwidth (RGBI)", \
{0, 255, 0, 255}) \
ELEM_(bool, UseWideMonitor, "USEWIDEMONITOR", \
"Draw bandwidth lines with 3x vertical lines", \
false) \
@ -1838,12 +1783,6 @@
ELEM_(bool, clear_fields, "CLEARFIELDS", \
"clear logging fields upon transfer of CALL from Rx panel", \
true) \
ELEM_(RGB, bwsrSliderColor, "BWSRSLIDERCOLOR", \
"Background color of signal browser detect level", \
{185, 211, 238}) \
ELEM_(RGB, bwsrSldrSelColor,"BWSRSLDRSELCOLOR", \
"Button highlight color, signal browser detect level", \
{54, 100, 139}) \
ELEM_(int, bwsrHiLight1, "BWSRHILIGHT1", \
"View Browser highlight color 1, default Dark Red", \
FL_RED) \
@ -1859,12 +1798,6 @@
ELEM_(int, bwsrSelect, "BWSRSELECT", \
"View Browser line select color", \
FL_BLUE) \
ELEM_(RGB, dup_color, "dupcolor", \
"Callsign background color when duplicate detected", \
{255, 110, 180}) \
ELEM_(RGB, possible_dup_color, "duppossiblecolor", \
"Callsign background color when possible duplicate detected", \
{255, 255, 150}) \
ELEM_(bool, EnableDupCheck, "ENABLEDUPCHECK", \
"Check for duplicates (contest)", \
true) \
@ -2013,18 +1946,6 @@
"Fields separated by : character\n" \
"Lines separated by | character", \
"w3nr.ddns.net:7300::|dx.n8noe.us:7373::|w0mw.dynip.com:23::|") \
ELEM_(RGB, DX_Color, "DX_COLOR", \
"RX text font color (RGB)", \
{ 0, 0, 130 }) \
ELEM_(Fl_Color, DXC_even_color, "DXC_EVEN_COLOR", \
"Even line background color in dxcluster dialog", \
7) \
ELEM_(Fl_Color, DXC_odd_color, "DXC_ODD_COLOR", \
"Odd line background color in dxcluster dialog", \
246) \
ELEM_(Fl_Color, DXC_textcolor, "DXC_TEXTCOLOR", \
"Text color in dxcluster dialog", \
FL_YELLOW) \
ELEM_(std::string, DXC_textname, "DXC_TEXTNAME", \
"DX cluster browser font name", \
"") \
@ -2034,12 +1955,6 @@
ELEM_(int, DXC_textsize, "DXC_TEXTSIZE", \
"DX cluster browsers font size", \
14) \
ELEM_(Fl_Color, DXfontcolor, "DXFONTCOLOR", \
"Text color in dxcluster stream", \
FL_YELLOW) \
ELEM_(Fl_Color, DXalt_color, "DXALT_COLOR", \
"Alternate text color in dxcluster stream", \
FL_DARK_RED) \
ELEM_(std::string, DXfontname, "DXFONTNAME", \
"DX cluster stream font name", \
"") \
@ -2156,49 +2071,10 @@
ELEM_(std::string, PaletteName, "PALETTENAME", \
"Waterfall color palette file name", \
"default.pal") \
ELEM_(RGB, cfgpal0, "PALETTE0", \
"Custom palette 0", \
{ 0,0,0 }) \
ELEM_(RGB, cfgpal1, "PALETTE1", \
"Custom palette 1", \
{ 0,0,136 }) \
ELEM_(RGB, cfgpal2, "PALETTE2", \
"Custom palette 2", \
{ 0,19,198 }) \
ELEM_(RGB, cfgpal3, "PALETTE3", \
"Custom palette 3", \
{ 0,32,239 }) \
ELEM_(RGB, cfgpal4, "PALETTE4", \
"Custom palette 4", \
{ 172,167,105 }) \
ELEM_(RGB, cfgpal5, "PALETTE5", \
"Custom palette 5", \
{ 194,198,49 }) \
ELEM_(RGB, cfgpal6, "PALETTE6", \
"Custom palette 6", \
{ 225,228,107 }) \
ELEM_(RGB, cfgpal7, "PALETTE7", \
"Custom palette 7", \
{ 255,255,0 }) \
ELEM_(RGB, cfgpal8, "PALETTE8", \
"Custom palette 8", \
{ 251,51,0 }) \
/* Palettes for macro button groups */ \
ELEM_(bool, useGroupColors, "USEGROUPCOLORS", \
"Use macro group colors", \
true) \
ELEM_(RGB, btnGroup1, "FKEYGROUP1", \
"Macro group 1 color", \
{ 80, 144, 144 }) \
ELEM_(RGB, btnGroup2, "FKEYGROUP2", \
"Macro group 2 color", \
{ 144, 80, 80 }) \
ELEM_(RGB, btnGroup3, "FKEYGROUP3", \
"Macro group 3 color", \
{ 80, 80, 144 }) \
ELEM_(RGB, btnFkeyTextColor, "FKEYTEXTCOLOR", \
"Macro button foreground ", \
{ 255, 255, 255 }) \
/* RX / TX / Waterfall text widgets */ \
ELEM_(std::string, charset_name, "CHARSET_NAME", \
"Default character set", \
@ -2221,9 +2097,6 @@
ELEM_(int, RxFontsize, "RXFONTSIZE", \
"RX text font size", \
16) \
ELEM_(Fl_Color, RxFontcolor, "RXFNTCOLOR", \
"RX text font color", \
FL_BLACK) \
ELEM_(std::string, MacroBtnFontName, "MACROBTNFONTNAME", \
"Macro Btn Font Name", \
"") \
@ -2233,12 +2106,6 @@
ELEM_(int, MacroBtnFontsize, "MACROBTNFONTSIZE", \
"Macro btn font size", \
12) \
ELEM_(Fl_Color, MacroBtnFontcolor, "MACROBTNFONTCOLOR", \
"Macro btn font color", \
FL_WHITE) \
ELEM_(Fl_Color, RxTxSelectcolor, "RXTXSELCOLOR", \
"RX/TX text select color", \
FL_MAGENTA) \
ELEM_(bool, TxFontWarn, "TXFONTWARN", \
"Enable TX font warnings", \
true) \
@ -2251,39 +2118,6 @@
ELEM_(int, TxFontsize, "TXFONTSIZE", \
"TX text font size", \
16) \
ELEM_(Fl_Color, TxFontcolor, "TXFNTCOLOR", \
"TX text font color", \
FL_BLACK) \
ELEM_(RGB, RxColor, "RXFONTCOLOR", \
"RX text font color (RGB)", \
{ 255, 242, 190 }) \
ELEM_(RGB, TxColor, "TXFONTCOLOR", \
"TX text font color (RGB)", \
{ 200, 235, 255 }) \
ELEM_(Fl_Color, XMITcolor, "XMITCOLOR", \
"Color for Transmit text style", \
FL_RED) \
ELEM_(Fl_Color, CTRLcolor, "CTRLCOLOR", \
"Color for Control text style", \
FL_DARK_GREEN) \
ELEM_(Fl_Color, SKIPcolor, "SKIPCOLOR", \
"Color for Skipped text style", \
FL_BLUE) \
ELEM_(Fl_Color, ALTRcolor, "ALTRCOLOR", \
"Color for Alternate text style", \
FL_DARK_MAGENTA) \
ELEM_(Fl_Color, LowSignal, "LOWSIGNAL", \
"Color for low signal level", \
FL_BLACK) \
ELEM_(Fl_Color, NormSignal, "NORMSIGNAL", \
"Color for normal signal level", \
FL_GREEN) \
ELEM_(Fl_Color, HighSignal, "HIGHSIGNAL", \
"Color for high signal level", \
FL_YELLOW) \
ELEM_(Fl_Color, OverSignal, "OVERSIGNAL", \
"Color for over driven signal", \
FL_RED) \
ELEM_(std::string, WaterfallFontName, "WATERFALLFONTNAME", \
"Waterfall font name", \
"") \
@ -2293,12 +2127,6 @@
ELEM_(int, WaterfallFontsize, "WATERFALLFONTSIZE", \
"Waterfall font size", \
12) \
ELEM_(Fl_Color, LOGGINGtextcolor, "LOGGINGTEXTCOLOR", \
"Text color in logging controls", \
FL_BLACK) \
ELEM_(Fl_Color, LOGGINGcolor, "LOGGINGCOLOR", \
"Background color in logging controls", \
FL_BACKGROUND2_COLOR) \
ELEM_(std::string, LOGGINGfontname, "LOGGINGTEXTNAME", \
"LOGGING text font name", \
"") \
@ -2308,12 +2136,6 @@
ELEM_(int, LOGGINGtextsize, "LOGGINGTEXTSIZE", \
"Logging Controls font size", \
12) \
ELEM_(Fl_Color, LOGBOOKtextcolor, "LOGBOOKTEXTCOLOR", \
"Text color in logbook dialog", \
FL_BLACK) \
ELEM_(Fl_Color, LOGBOOKcolor, "LOGBOOKCOLOR", \
"Background color in logbook dialog", \
FL_BACKGROUND2_COLOR) \
ELEM_(std::string, LOGBOOKtextname, "LOGBOOKTEXTNAME", \
"Logbook text font name", \
"") \
@ -2338,40 +2160,10 @@
ELEM_(bool, wf_audioscale, "WFAUDIOSCALE", \
"Always show audio frequencies on waterfall", \
true) \
/* Freq Display colors */ \
ELEM_(RGB, FDbackground, "FDBACKGROUND", \
"Frequency display background color", \
{ 255, 253, 222 }) \
ELEM_(RGB, FDforeground, "FDFOREGROUND", \
"Frequency display foreground color", \
{ 0, 0, 0 }) \
/* S-meter and Power-meter */ \
ELEM_(RGB, Smeter_bg_color, "SMETERBG", \
"S-meter background color", \
{ 255, 253, 222 }) \
ELEM_(RGB, Smeter_scale_color, "SMETERSCALECOLOR", \
"S-meter scale color", \
{ 0, 0, 0 }) \
ELEM_(RGB, Smeter_meter_color, "SMETERMETERCOLOR", \
"S-meter meter color", \
{ 0, 200, 0 }) \
ELEM_(RGB, PWRmeter_bg_color, "PWRMETERBGD", \
"Power meter background color", \
{ 255, 253, 222 }) \
ELEM_(RGB, PWRmeter_scale_color, "PWRMETERSCALECOLOR", \
"Power meter scale color", \
{ 0, 0, 0 }) \
ELEM_(RGB, PWRmeter_meter_color, "PWRMETERMETERCOLOR", \
"Power meter meter color", \
{ 200, 0, 0 }) \
ELEM_(int, PWRselect, "PWRSELECT", \
"Power meter type:\n" \
" 0: 25 W, 1: 50 W, 2: 100 W, 3: 200 W, 4: AUTO", \
4) \
/* Tab selection color */ \
ELEM_(Fl_Color, TabsColor, "TABSCOLOR", \
"UI tabs color", \
FL_BACKGROUND2_COLOR) \
/* Signal Viewer */ \
ELEM_(bool, VIEWERascend, "VIEWERASCEND", \
"Low frequency on bottom of viewer", \
@ -2410,49 +2202,6 @@
ELEM_(int, ViewerFontsize, "VIEWERFONTSIZE", \
"Signal Viewer font size", \
FL_NORMAL_SIZE) \
\
ELEM_(Fl_Color, Sql1Color, "SQL1COLOR", \
"UI SQL button select color 1", \
FL_YELLOW) \
ELEM_(Fl_Color, Sql2Color, "SQL2COLOR", \
"UI SQL button select color 2", \
FL_GREEN) \
ELEM_(Fl_Color, AfcColor, "AFCCOLOR", \
"UI AFC button select color", \
FL_GREEN) \
ELEM_(Fl_Color, LkColor, "LKCOLOR", \
"UI Lk xmt frequ select color", \
FL_GREEN) \
ELEM_(Fl_Color, RevColor, "REVCOLOR", \
"UI Rev select color", \
FL_GREEN) \
ELEM_(Fl_Color, XmtColor, "XMTCOLOR", \
"UI T/R select color", \
FL_RED) \
ELEM_(Fl_Color, SpotColor, "SPOTCOLOR", \
"UI Spot select color", \
FL_GREEN) \
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) \
ELEM_(Fl_Color, TuneColor, "TUNECOLOR", \
"UI Tune select color", \
FL_RED) \
ELEM_(Fl_Color, default_btn_color, "DEFAULTBTNCOLOR", \
"Default color of lighted buttons", \
FL_GREEN) \
ELEM_(Fl_Color, default_check_btn_color, "DEFAULTCHECKBTNCOLOR", \
"Default color of check buttons", \
FL_YELLOW) \
ELEM_(Fl_Color, default_round_btn_color, "DEFAULTROUNDBTNCOLOR", \
"Default color of round buttons", \
FL_GREEN) \
/* XMLRPC LOGBOOK server */ \
ELEM_(bool, xml_logbook, "XML_LOGBOOK", \
"Try to open remote xml logbook", \
@ -2893,21 +2642,6 @@
ELEM_(bool, FMT_dft_cull_on, "FMT_dft_cull_on", \
"Enable DFT culling", \
false) \
ELEM_(Fl_Color, FMT_background, "FMT_background", \
"Color for FMT plot background", \
FL_BACKGROUND2_COLOR) \
ELEM_(Fl_Color, FMT_unk_color, "FMT_unk_color", \
"Color for FMT unknown data plot", \
FL_DARK_BLUE) \
ELEM_(Fl_Color, FMT_ref_color, "FMT_ref_color", \
"Color for FMT reference data plot", \
FL_GREEN) \
ELEM_(Fl_Color, FMT_legend_color, "FMT_legend_color", \
"Color for FMT legends", \
FL_BLACK) \
ELEM_(Fl_Color, FMT_axis_color, "FMT_axis_color", \
"Color for FMT plot axis", \
FL_BLACK) \
ELEM_(bool, FMT_use_tabs, "fmt_use_tabs", \
"Use TAB delimiters in exported csv file", \
false) \

145
src/include/ui_colors.h Normal file
View file

@ -0,0 +1,145 @@
// ---------------------------------------------------------------------
// ui_colors.h
//
// Copyright (C) 2024
// Dave Freese; W1HKJ
//
// This file is part of fldigi.
//
// Fldigi is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 3 of the License; or
// (at your option) any later version.
//
// Fldigi is distributed in the hope that it will be useful;
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with fldigi. If not; see <http://www.gnu.org/licenses/>.
//----------------------------------------------------------------------
#ifndef UI_COLORS_H
#define UI_COLORS_H
#include <iostream>
#include <fstream>
#include <string>
#include <FL/Fl.H>
#define RGBCOLOR(var) fl_rgb_color( ui_colors.var.r, ui_colors.var.g, ui_colors.var.b )
struct TRIAD { uchar r; uchar g; uchar b; std::string var; };
struct UI_COLORS {
TRIAD background;
TRIAD background2;
TRIAD foreground;
TRIAD rsid;
TRIAD digi_background;
TRIAD digi_axis_color;
TRIAD digi_color_1;
TRIAD digi_color_2;
TRIAD digi_color_3;
TRIAD digi_color_4;
TRIAD cursorLine;
TRIAD cursorCenter;
TRIAD bwTrack;
TRIAD notch;
TRIAD rttymark;
TRIAD monitor;
TRIAD bwsrSliderColor;
TRIAD bwsrSldrSelColor;
TRIAD bwsrHiLight1;
TRIAD bwsrHiLight2;
TRIAD bwsrBackgnd1;
TRIAD bwsrBackgnd2;
TRIAD bwsrSelect;
TRIAD dup_color;
TRIAD possible_dup_color;
TRIAD DX_Color;
TRIAD DXC_even_color;
TRIAD DXC_odd_color;
TRIAD DXC_textcolor;
TRIAD DXfontcolor;
TRIAD DXalt_color;
TRIAD cfgpal0;
TRIAD cfgpal1;
TRIAD cfgpal2;
TRIAD cfgpal3;
TRIAD cfgpal4;
TRIAD cfgpal5;
TRIAD cfgpal6;
TRIAD cfgpal7;
TRIAD cfgpal8;
TRIAD RxFontcolor;
TRIAD MacroBtnFontcolor;
TRIAD RxTxSelectcolor;
TRIAD TxFontWarn;
TRIAD TxFontcolor;
TRIAD RxColor;
TRIAD TxColor;
TRIAD XMITcolor;
TRIAD CTRLcolor;
TRIAD SKIPcolor;
TRIAD ALTRcolor;
TRIAD LowSignal;
TRIAD NormSignal;
TRIAD HighSignal;
TRIAD OverSignal;
TRIAD LOGGINGtextcolor;
TRIAD LOGGINGcolor;
TRIAD LOGBOOKtextcolor;
TRIAD LOGBOOKcolor;
TRIAD FDbackground;
TRIAD FDforeground;
TRIAD Smeter_bg_color;
TRIAD Smeter_scale_color;
TRIAD Smeter_meter_color;
TRIAD PWRmeter_bg_color;
TRIAD PWRmeter_scale_color;
TRIAD PWRmeter_meter_color;
TRIAD TabsColor;
TRIAD Sql1Color;
TRIAD Sql2Color;
TRIAD AfcColor;
TRIAD LkColor;
TRIAD RevColor;
TRIAD XmtColor;
TRIAD SpotColor;
TRIAD RxIDColor;
TRIAD RxIDwideColor;
TRIAD TxIDColor;
TRIAD TuneColor;
TRIAD default_btn_color;
TRIAD default_check_btn_color;
TRIAD default_round_btn_color;
TRIAD FMT_background;
TRIAD FMT_unk_color;
TRIAD FMT_ref_color;
TRIAD FMT_legend_color;
TRIAD FMT_axis_color;
TRIAD btnGroup1;
TRIAD btnGroup2;
TRIAD btnGroup3;
TRIAD fsq_undirected_color;
TRIAD fsq_directed_color;
TRIAD fsq_xmt_color;
TRIAD btnFkeyTextColor;
TRIAD terminator;
char * rgbstr(TRIAD clr);
void load(std::string);
void save(std::string);
};
#endif
extern UI_COLORS ui_colors;

14
src/logbook/logsupport.cxx
View file

@ -54,6 +54,7 @@
#include "confdialog.h"
#include "fileselect.h"
#include "configuration.h"
#include "ui_colors.h"
#include "main.h"
#include "locator.h"
#include "icons.h"
@ -1339,15 +1340,10 @@ void show_dup(void *dup)
if (dup == (void *)1) cdup = 1;
if (dup == (void *)2) cdup = 2;
Fl_Color call_clr = progdefaults.LOGGINGcolor;
Fl_Color dup_clr = fl_rgb_color(
progdefaults.dup_color.R,
progdefaults.dup_color.G,
progdefaults.dup_color.B);
Fl_Color pdup_clr = fl_rgb_color(
progdefaults.possible_dup_color.R,
progdefaults.possible_dup_color.G,
progdefaults.possible_dup_color.B);
Fl_Color call_clr = RGBCOLOR( LOGGINGcolor );
Fl_Color dup_clr = RGBCOLOR( dup_color );
Fl_Color pdup_clr = RGBCOLOR( possible_dup_color );
inpCall1->color(cdup == 1 ? dup_clr : cdup == 2 ? pdup_clr : call_clr);
inpCall2->color(cdup == 1 ? dup_clr : cdup == 2 ? pdup_clr : call_clr);
inpCall3->color(cdup == 1 ? dup_clr : cdup == 2 ? pdup_clr : call_clr);

52
src/misc/configuration.cxx
View file

@ -29,6 +29,7 @@
#include <config.h>
#include "configuration.h"
#include "ui_colors.h"
#include "confdialog.h"
#include "xmlreader.h"
#include "soundconf.h"
@ -444,15 +445,15 @@ void configuration::saveDefaults()
{
ENSURE_THREAD(FLMAIN_TID);
memcpy(&cfgpal0, &palette[0], sizeof(cfgpal0));
memcpy(&cfgpal1, &palette[1], sizeof(cfgpal1));
memcpy(&cfgpal2, &palette[2], sizeof(cfgpal2));
memcpy(&cfgpal3, &palette[3], sizeof(cfgpal3));
memcpy(&cfgpal4, &palette[4], sizeof(cfgpal4));
memcpy(&cfgpal5, &palette[5], sizeof(cfgpal5));
memcpy(&cfgpal6, &palette[6], sizeof(cfgpal6));
memcpy(&cfgpal7, &palette[7], sizeof(cfgpal7));
memcpy(&cfgpal8, &palette[8], sizeof(cfgpal8));
// ui_colors.cfgpal0 = fl_rgb_color( palette[0].R, palette[0].G, palette[0].B);
// ui_colors.cfgpal1 = fl_rgb_color( palette[1].R, palette[1].G, palette[1].B);
// ui_colors.cfgpal2 = fl_rgb_color( palette[2].R, palette[2].G, palette[2].B);
// ui_colors.cfgpal3 = fl_rgb_color( palette[3].R, palette[3].G, palette[3].B);
// ui_colors.cfgpal4 = fl_rgb_color( palette[4].R, palette[4].G, palette[4].B);
// ui_colors.cfgpal5 = fl_rgb_color( palette[5].R, palette[5].G, palette[5].B);
// ui_colors.cfgpal6 = fl_rgb_color( palette[6].R, palette[6].G, palette[6].B);
// ui_colors.cfgpal7 = fl_rgb_color( palette[7].R, palette[7].G, palette[7].B);
// ui_colors.cfgpal8 = fl_rgb_color( palette[8].R, palette[8].G, palette[8].B);
RxFontName = Fl::get_font_name(RxFontnbr);
TxFontName = Fl::get_font_name(TxFontnbr);
@ -598,12 +599,9 @@ int configuration::setDefaults()
cntServerOffset->value(ServerOffset);
cntACQsn->value(ACQsn);
btnCursorBWcolor->color(
fl_rgb_color(cursorLineRGBI.R, cursorLineRGBI.G, cursorLineRGBI.B) );
btnCursorCenterLineColor->color(
fl_rgb_color(cursorCenterRGBI.R, cursorCenterRGBI.G, cursorCenterRGBI.B) );
btnBwTracksColor->color(
fl_rgb_color(bwTrackRGBI.R, bwTrackRGBI.G, bwTrackRGBI.B) );
btnCursorBWcolor->color( RGBCOLOR( cursorLine ) );
btnCursorCenterLineColor->color( RGBCOLOR( cursorCenter ) );
btnBwTracksColor->color( RGBCOLOR( bwTrack ) );
sldrCWxmtWPM->value(CWspeed);
cntCWdefWPM->value(defCWspeed);
@ -681,15 +679,15 @@ int configuration::setDefaults()
wf->setPrefilter(wfPreFilter);
btnWFaveraging->value(WFaveraging);
memcpy(&palette[0], &cfgpal0, sizeof(palette[0]));
memcpy(&palette[1], &cfgpal1, sizeof(palette[1]));
memcpy(&palette[2], &cfgpal2, sizeof(palette[2]));
memcpy(&palette[3], &cfgpal3, sizeof(palette[3]));
memcpy(&palette[4], &cfgpal4, sizeof(palette[4]));
memcpy(&palette[5], &cfgpal5, sizeof(palette[5]));
memcpy(&palette[6], &cfgpal6, sizeof(palette[6]));
memcpy(&palette[7], &cfgpal7, sizeof(palette[7]));
memcpy(&palette[8], &cfgpal8, sizeof(palette[8]));
Fl::get_color( RGBCOLOR( cfgpal0 ), palette[0].R, palette[0].G, palette[0].B);
Fl::get_color( RGBCOLOR( cfgpal1 ), palette[1].R, palette[1].G, palette[1].B);
Fl::get_color( RGBCOLOR( cfgpal2 ), palette[2].R, palette[2].G, palette[2].B);
Fl::get_color( RGBCOLOR( cfgpal3 ), palette[3].R, palette[3].G, palette[3].B);
Fl::get_color( RGBCOLOR( cfgpal4 ), palette[4].R, palette[4].G, palette[4].B);
Fl::get_color( RGBCOLOR( cfgpal5 ), palette[5].R, palette[5].G, palette[5].B);
Fl::get_color( RGBCOLOR( cfgpal6 ), palette[6].R, palette[6].G, palette[6].B);
Fl::get_color( RGBCOLOR( cfgpal7 ), palette[7].R, palette[7].G, palette[7].B);
Fl::get_color( RGBCOLOR( cfgpal8 ), palette[8].R, palette[8].G, palette[8].B);
wf->setcolors();
setColorButtons();
@ -719,9 +717,9 @@ int configuration::setDefaults()
uchar bg_r, bg_g, bg_b;
uchar bg2_r, bg2_g, bg2_b;
Fl::get_color(progdefaults.foreground, fg_r, fg_g, fg_b);
Fl::get_color(progdefaults.background, bg_r, bg_g, bg_b);
Fl::get_color(progdefaults.background2, bg2_r, bg2_g, bg2_b);
Fl::get_color(RGBCOLOR( foreground ), fg_r, fg_g, fg_b);
Fl::get_color(RGBCOLOR( background ), bg_r, bg_g, bg_b);
Fl::get_color(RGBCOLOR( background2 ), bg2_r, bg2_g, bg2_b);
Fl::background2(bg2_r, bg2_g, bg2_b);
Fl::background(bg_r, bg_g, bg_b);

7
src/status/status.cxx
View file

@ -81,6 +81,8 @@
#include "spectrum_viewer.h"
#include "ui_colors.h"
#define STATUS_FILENAME "status"
status progStatus = {
@ -763,6 +765,8 @@ if (!bWF_only) {
//----------------------------------------------------------------------
spref.set("vumeter_shown", vumeter_shown);
ui_colors.save("fldigi_UI_colors");
modeband.save_mode_state();
}
@ -1116,9 +1120,12 @@ void status::loadLastState()
//----------------------------------------------------------------------
modeband.load_mode_state();
load_udp_prefs();
load_cloud_prefs();
ui_colors.load("fldigi_UI_colors");
set_debug_mask(debug_mask);
}

187
src/status/ui_colors.cxx Normal file
View file

@ -0,0 +1,187 @@
//---------------------------------------------------------------------
// ui_colors.cxx
//
// Copyright (C) 2024
// Dave Freese; W1HKJ
//
// This file is part of fldigi.
//
// Fldigi is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 3 of the License; or
// (at your option) any later version.
//
// Fldigi is distributed in the hope that it will be useful;
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with fldigi. If not; see <http://www.gnu.org/licenses/>.
//----------------------------------------------------------------------
#include <config.h>
#include <iostream>
#include <fstream>
#include "ui_colors.h"
#include "main.h"
#include "waterfall.h"
UI_COLORS ui_colors = { // red, green, blue, var
{ 192, 192, 192, "background" },
{ 255, 255, 255, "background2" },
{ 0, 0, 0, "foreground" },
{ 255, 255, 255, "rsid" },
{ 0, 0, 0, "digi_background" },
{ 255, 255, 255, "digi_axis_color" },
{ 0, 255, 0, "digi_color_1" },
{ 255, 255, 0, "digi_color_2" },
{ 0, 255, 255, "digi_color_3" },
{ 255, 0, 255, "digi_color_4" },
{ 255, 255, 0, "cursorLine" },
{ 255, 255, 255, "cursorCenter" },
{ 255, 0, 0, "bwTrack" },
{ 255, 255, 255, "notch" },
{ 255, 120, 0, "rttymark" },
{ 0, 255, 0, "monitor" },
{ 185, 211, 238, "bwsrSliderColor" },
{ 54, 100, 139, "bwsrSldrSelColor" },
{ 255, 0, 0, "bwsrHiLight1" },
{ 0, 255, 0, "bwsrHiLight2" },
{ 255, 255, 255, "bwsrBackgnd1" },
{ 234, 234, 234, "bwsrBackgnd2" },
{ 0, 0, 255, "bwsrSelect" },
{ 255, 110, 180, "dup_color" },
{ 255, 255, 150, "possible_dup_color" },
{ 0, 0, 130, "DX_Color" },
{ 255, 255, 225, "DXC_even_color" },
{ 191, 218, 255, "DXC_odd_color" },
{ 255, 255, 0, "DXC_textcolor" },
{ 255, 255, 0, "DXfontcolor" },
{ 127, 0, 0, "DXalt_color" },
{ 0, 0, 0, "cfgpal0" },
{ 0, 0, 136, "cfgpal1" },
{ 0, 19, 198, "cfgpal2" },
{ 0, 32, 239, "cfgpal3" },
{ 172, 167, 105, "cfgpal4" },
{ 195, 198, 49, "cfgpal5" },
{ 225, 228, 107, "cfgpal6" },
{ 255, 255, 0, "cfgpal7" },
{ 251, 51, 0, "cfgpal8" },
{ 0, 0, 0, "RxFontcolor" },
{ 255, 255, 255, "MacroBtnFontcolor" },
{ 255, 0, 255, "RxTxSelectcolor" },
{ 255, 0, 0, "TxFontWarn" },
{ 0, 0, 0, "TxFontcolor" },
{ 255, 242, 190, "RxColor" },
{ 200, 235, 255, "TxColor" },
{ 255, 0, 0, "XMITcolor" },
{ 0, 145, 0, "CTRLcolor" },
{ 0, 0, 255, "SKIPcolor" },
{ 127, 0, 127, "ALTRcolor" },
{ 0, 0, 0, "LowSignal" },
{ 0, 255, 0, "NormSignal " },
{ 255, 255, 0, "HighSignal " },
{ 255, 0, 0, "OverSignal " },
{ 0, 0, 0, "LOGGINGtextcolor" },
{ 255, 255, 255, "LOGGINGcolor" },
{ 0, 0, 0, "LOGBOOKtextcolor" },
{ 255, 255, 255, "LOGBOOKcolor" },
{ 255, 253, 222, "FDbackground" },
{ 0, 0, 0, "FDforeground" },
{ 255, 253, 222, "Smeter_bg_color" },
{ 0, 0, 0, "Smeter_scale_color" },
{ 0, 200, 0, "Smeter_meter_color" },
{ 255, 253, 222, "PWRmeter_bg_color" },
{ 0, 0, 0, "PWRmeter_scale_color "},
{ 200, 0, 0, "PWRmeter_meter_color" },
{ 255, 255, 255, "TabsColor" },
{ 255, 255, 0, "Sql1Color" },
{ 0, 255, 0, "Sql2Color" },
{ 0, 255, 0, "AfcColor" },
{ 0, 255, 0, "LkColor" },
{ 0, 255, 0, "RevColor" },
{ 255, 0, 0, "XmtColor" },
{ 0, 255, 0, "SpotColor" },
{ 0, 255, 0, "RxIDColor" },
{ 127, 0, 0, "RxIDwideColor" },
{ 0, 255, 0, "TxIDColor" },
{ 255, 0, 0, "TuneColor" },
{ 0, 255, 0, "default_btn_color" },
{ 255, 255, 0, "default_check_btn_color" },
{ 0, 255, 0, "default_round_btn_color" },
{ 255, 255, 255, "FMT_background" },
{ 0, 0, 127, "FMT_unk_color" },
{ 0, 255, 0, "FMT_ref_color" },
{ 0, 0, 0, "FMT_legend_color" },
{ 0, 0, 0, "FMT_axis_color" },
{ 80, 144, 144, "btnGroup1" },
{ 144, 80, 80, "btnGroup2" },
{ 80, 80, 144, "btnGroup3" },
{ 0, 145, 0, "fsq_undirected_color" },
{ 0, 0, 255, "fsq_directed_color" },
{ 255, 0, 0, "fsq_xmt_color" },
{ 255, 255, 255, "btnFkeyTextColor" },
{ 0, 0, 0, "" }
};
void UI_COLORS::load(std::string fname)
{
TRIAD triad;
triad.var.reserve(100);
std::string filename = HomeDir;
filename.append("/").append(fname).append(".colors");
std::ifstream clrfile;
clrfile.open( filename.c_str());
std::string line;
char chline[100];
char chvar[50];
TRIAD *ptr;
clrfile.getline( chline, 100 );
if ( (line = chline).empty()) {
clrfile.close();
return;
}
while (!clrfile.eof()) {
clrfile.getline( chline, 100 );
line = chline;
if (!line.empty()) {
sscanf(line.c_str(), "%s (%hhu)(%hhu)(%hhu)", chvar, &triad.r, &triad.g, &triad.b);
ptr = &background;
while (!ptr->var.empty()) {
if (ptr->var == chvar) {
ptr->r = triad.r; ptr->g = triad.g, ptr->b = triad.b;
// std::cout << "FOUND: " << chvar << ", " << (uint)triad.r << ", " << (uint)triad.g << ", " << (uint)triad.b << std::endl;
break;
}
ptr++;
}
}
}
clrfile.close();
}
char * UI_COLORS::rgbstr(TRIAD clr)
{
static char sz[50];
snprintf(sz, sizeof(sz), "(%u)(%u)(%u)", clr.r, clr.g, clr.b);
return sz;
}
void UI_COLORS::save(std::string fname)
{
std::string filename = HomeDir;
filename.append("/").append(fname).append(".colors");
FILE *clrfile = fopen( filename.c_str(), "w");
TRIAD *ptr = &background;
fprintf(clrfile, "fldigi color definition file: <control> (red)(green)(blue)\n");
while (!ptr->var.empty()){
fprintf(clrfile, "%s %s\n", ptr->var.c_str(), rgbstr(*ptr));
ptr++;
}
fclose(clrfile);
}

92
src/waterfall/waterfall.cxx
View file

@ -61,6 +61,7 @@
#include "fldigi-config.h"
#include "configuration.h"
#include "ui_colors.h"
#include "status.h"
#include "squelch_status.h"
#include "Viewer.h"
@ -160,10 +161,8 @@ WFdisp::WFdisp (int x0, int y0, int w0, int h0, char *lbl) :
bandwidth = 32;
RGBmarker = RGBred;
RGBcursor = RGByellow;
RGBInotch.I = progdefaults.notchRGBI.I;
RGBInotch.R = progdefaults.notchRGBI.R;
RGBInotch.G = progdefaults.notchRGBI.G;
RGBInotch.B = progdefaults.notchRGBI.B;
RGBInotch.I = 255;
Fl::get_color( RGBCOLOR( notch ), RGBInotch.R, RGBInotch.G, RGBInotch.B );
mode = WATERFALL;
centercarrier = false;
overload = false;
@ -305,9 +304,8 @@ void WFdisp::make_fmt_marker ()
memset(markerimage + scale_width, 0, RGBwidth * (WFMARKER - 2));
Fl::get_color(progdefaults.FMT_unk_color, unk_trk_color.R, unk_trk_color.G, unk_trk_color.B);
Fl::get_color(progdefaults.FMT_ref_color, ref_trk_color.R, ref_trk_color.G, ref_trk_color.B);
Fl::get_color(RGBCOLOR( FMT_unk_color ), unk_trk_color.R, unk_trk_color.G, unk_trk_color.B);
Fl::get_color(RGBCOLOR( FMT_ref_color ), ref_trk_color.R, ref_trk_color.G, ref_trk_color.B);
int fmt_bw = progdefaults.FMT_filter;
@ -354,9 +352,7 @@ void WFdisp::makeMarker()
progdefaults.rtty_custom_shift));
marker_width = (int)(marker_width / 2.0 + 1);
RGBmarker.R = progdefaults.bwTrackRGBI.R;
RGBmarker.G = progdefaults.bwTrackRGBI.G;
RGBmarker.B = progdefaults.bwTrackRGBI.B;
Fl::get_color( RGBCOLOR( bwTrack ), RGBmarker.R, RGBmarker.G, RGBmarker.B );
makeMarker_(marker_width, &RGBmarker, carrierfreq, clrMin, clrM, clrMax);
@ -383,9 +379,7 @@ void WFdisp::makeMarker()
if (xp < bandwidth / 2.0 || xp > (progdefaults.HighFreqCutoff - bandwidth / 2.0))
return;
clrM = markerimage + scale_width + (int)(xp + 0.5);
RGBcursor.R = progdefaults.cursorLineRGBI.R;
RGBcursor.G = progdefaults.cursorLineRGBI.G;
RGBcursor.B = progdefaults.cursorLineRGBI.B;
Fl::get_color( RGBCOLOR( cursorLine ), RGBcursor.R, RGBcursor.G, RGBcursor.B );
int bw_lo = marker_width;
int bw_hi = marker_width;
@ -1089,18 +1083,21 @@ case Step: for (int row = 0; row < image_height; row++) { \
int trk_high = progdefaults.RxFilt_high;
RGBI *pos1 = fft_img + trk_low / step;
RGBI *pos2 = fft_img + trk_high / step;
RGBI clr;
clr.I = 255;
Fl::get_color( RGBCOLOR( monitor ), clr.R, clr.G, clr.B );
if (likely(pos1 >= fft_img && pos2 < fft_img + disp_width)) {
if (progdefaults.mon_wide_tracks) {
for (int y = 0; y < image_height; y ++) {
*(pos1 + 1) = *pos1 = progdefaults.monitorRGBI;
*(pos2 - 1) = *pos2 = progdefaults.monitorRGBI;
*(pos1 + 1) = *pos1 = clr; //progdefaults.monitorRGBI;
*(pos2 - 1) = *pos2 = clr; //progdefaults.monitorRGBI;
pos1 += disp_width;
pos2 += disp_width;
}
} else {
for (int y = 0; y < image_height; y ++) {
*pos1 = progdefaults.monitorRGBI;
*pos2 = progdefaults.monitorRGBI;
*pos1 = clr; //progdefaults.monitorRGBI;
*pos2 = clr; //progdefaults.monitorRGBI;
pos1 += disp_width;
pos2 += disp_width;
}
@ -1114,10 +1111,8 @@ case Step: for (int row = 0; row < image_height; row++) { \
( (carrierfreq - progdefaults.rsid_min_bw / 2) > 1) &&
( (carrierfreq + progdefaults.rsid_min_bw / 2) < (progdefaults.HighFreqCutoff - 1))) {
RGBI RGBIrsid;
RGBIrsid.I = progdefaults.rsidRGBI.I;
RGBIrsid.R = progdefaults.rsidRGBI.R;
RGBIrsid.G = progdefaults.rsidRGBI.G;
RGBIrsid.B = progdefaults.rsidRGBI.B;
RGBIrsid.I = 255;//progdefaults.rsidRGBI.I;
Fl::get_color( RGBCOLOR( rsid ), RGBIrsid.R, RGBIrsid.G, RGBIrsid.B );
RGBI *pos1 = fft_img + (carrierfreq - offset - progdefaults.rsid_min_bw / 2) / step;
RGBI *pos2 = fft_img + (carrierfreq - offset + progdefaults.rsid_min_bw / 2) / step;
int dash = 0;
@ -1141,8 +1136,8 @@ case Step: for (int row = 0; row < image_height; row++) { \
RGBI *pos2 = fft_img + (trk - offset + bw) / step;
RGBI unk_trk_color, ref_trk_color;
Fl::get_color(progdefaults.FMT_unk_color, unk_trk_color.R, unk_trk_color.G, unk_trk_color.B);
Fl::get_color(progdefaults.FMT_ref_color, ref_trk_color.R, ref_trk_color.G, ref_trk_color.B);
Fl::get_color(RGBCOLOR( FMT_unk_color ), unk_trk_color.R, unk_trk_color.G, unk_trk_color.B);
Fl::get_color(RGBCOLOR( FMT_ref_color ), ref_trk_color.R, ref_trk_color.G, ref_trk_color.B);
if (likely(pos1 >= fft_img && pos2 < fft_img + disp_width)) {
if (progdefaults.UseWideTracks) {
@ -1203,15 +1198,21 @@ case Step: for (int row = 0; row < image_height; row++) { \
if (mode == MODE_RTTY && progdefaults.useMARKfreq) {
if (active_modem->get_reverse()) {
rgbi1 = progdefaults.rttymarkRGBI;
rgbi2 = progdefaults.bwTrackRGBI;
// rgbi1 = progdefaults.rttymarkRGBI;
// rgbi2 = progdefaults.bwTrackRGBI;
Fl::get_color( RGBCOLOR( rttymark ), rgbi1.R, rgbi1.G, rgbi1.B ); rgbi1.I = 255;
Fl::get_color( RGBCOLOR( bwTrack ), rgbi1.R, rgbi2.G, rgbi2.B ); rgbi2.I = 255;
} else {
rgbi1 = progdefaults.bwTrackRGBI;
rgbi2 = progdefaults.rttymarkRGBI;
// rgbi1 = progdefaults.bwTrackRGBI;
// rgbi2 = progdefaults.rttymarkRGBI;
Fl::get_color( RGBCOLOR( bwTrack ), rgbi1.R, rgbi1.G, rgbi1.B ); rgbi1.I = 255;
Fl::get_color( RGBCOLOR( rttymark ), rgbi2.R, rgbi2.G, rgbi2.B ); rgbi2.I = 255;
}
} else {
rgbi1 = progdefaults.bwTrackRGBI;
rgbi2 = progdefaults.bwTrackRGBI;
// rgbi1 = progdefaults.bwTrackRGBI;
// rgbi2 = progdefaults.bwTrackRGBI;
Fl::get_color( RGBCOLOR( bwTrack ), rgbi1.R, rgbi1.G, rgbi1.B ); rgbi1.I = 255;
rgbi2 = rgbi1;
}
if (progdefaults.UseWideTracks) {
for (int y = 0; y < image_height; y ++) {
@ -1234,10 +1235,8 @@ case Step: for (int row = 0; row < image_height; row++) { \
// draw notch
if ((notch_frequency > 1) && (notch_frequency < progdefaults.HighFreqCutoff - 1)) {
RGBInotch.I = progdefaults.notchRGBI.I;
RGBInotch.R = progdefaults.notchRGBI.R;
RGBInotch.G = progdefaults.notchRGBI.G;
RGBInotch.B = progdefaults.notchRGBI.B;
RGBInotch.I = 255;
Fl::get_color( RGBCOLOR( notch ), RGBInotch.R, RGBInotch.G, RGBInotch.B );
RGBI *notch = fft_img + (notch_frequency - offset) / step;
int dash = 0;
for (int y = 0; y < image_height; y++) {
@ -1274,15 +1273,18 @@ void WFdisp::drawcolorWF() {
RGBI *pos0 = (fft_img + cursorpos);
RGBI *pos1 = (fft_img + cursorpos - bw_lo/step);
RGBI *pos2 = (fft_img + cursorpos + bw_hi/step);
RGBI clr;
clr.I = 255;
Fl::get_color( RGBCOLOR( cursorCenter ), clr.R, clr.G, clr.B );
if (pos1 >= fft_img && pos2 < fft_img + disp_width) {
for (int y = 0; y < image_height; y ++) {
if (progdefaults.UseCursorLines) {
*pos1 = *pos2 = progdefaults.cursorLineRGBI;
*pos1 = *pos2 = clr;
if (progdefaults.UseWideCursor)
*(pos1 + 1) = *(pos2 - 1) = *pos1;
}
if (progdefaults.UseCursorCenterLine) {
*pos0 = progdefaults.cursorCenterRGBI;
*pos0 = clr;
if (progdefaults.UseWideCenter)
*(pos0 - 1) = *(pos0 + 1) = *pos0;
}
@ -1664,7 +1666,7 @@ void xmtrcv_cb(Fl_Widget *w, void *vi)
} else {
if (progdefaults.show_psm_btn && progStatus.kpsql_enabled) {
psm_transmit_ended(PSM_ABORT);
xmtrcv_selection_color(progdefaults.XmtColor);
xmtrcv_selection_color(RGBCOLOR( XmtColor ));
}
if (btnTune->value()) {
@ -2014,12 +2016,12 @@ waterfall::waterfall(int x0, int y0, int w0, int h0, char *lbl) :
w() - 2 * BEZEL,
wf_dim - 2 * BEZEL);
wfscope = new Digiscope (x() + w(), y(), wf_dim, wf_dim);
wfscope->bk_color(progdefaults.digi_background);
wfscope->axis_color(progdefaults.digi_axis_color);
wfscope->user_color_1(progdefaults.digi_color_1);
wfscope->user_color_2(progdefaults.digi_color_2);
wfscope->user_color_3(progdefaults.digi_color_3);
wfscope->user_color_4(progdefaults.digi_color_4);
wfscope->bk_color(RGBCOLOR( digi_background ));
wfscope->axis_color(RGBCOLOR( digi_axis_color ));
wfscope->user_color_1(RGBCOLOR( digi_color_1 ));
wfscope->user_color_2(RGBCOLOR( digi_color_2 ));
wfscope->user_color_3(RGBCOLOR( digi_color_3 ));
wfscope->user_color_4(RGBCOLOR( digi_color_4 ));
rs1->resizable(wfdisp);
rs1->end();
wfscope->hide();
@ -2104,7 +2106,7 @@ waterfall::waterfall(int x0, int y0, int w0, int h0, char *lbl) :
xmtlock = new Fl_Light_Button(xpos, buttonrow, (int)(bwXmtLock*ratio), BTN_HEIGHT, "Lk");
xmtlock->callback(xmtlock_cb, 0);
xmtlock->value(0);
xmtlock->selection_color(progdefaults.LkColor);
xmtlock->selection_color(RGBCOLOR( LkColor ));
xmtlock->tooltip(_("Lock transmit frequency"));
/// We save this flag which is used by rtty decoding.
@ -2113,13 +2115,13 @@ waterfall::waterfall(int x0, int y0, int w0, int h0, char *lbl) :
btnRev->callback(btnRev_cb, 0);
reverse = progdefaults.rtty_reverse;
btnRev->value(reverse);
btnRev->selection_color(progdefaults.RevColor);
btnRev->selection_color(RGBCOLOR( RevColor ));
btnRev->tooltip(_("Reverse"));
xpos = w() - (int)(bwXmtRcv*ratio) - wSpace;
xmtrcv = new Fl_Light_Button(xpos, buttonrow, (int)(bwXmtRcv*ratio) - BEZEL, BTN_HEIGHT, "T/R");
xmtrcv->callback(xmtrcv_cb, 0);
xmtrcv->selection_color(progdefaults.XmtColor);
xmtrcv->selection_color(RGBCOLOR( XmtColor ));
xmtrcv->value(0);
xmtrcv->tooltip(_("Transmit/Receive"));
end();

27
src/wefax/wefax-pic.cxx
View file

@ -53,6 +53,7 @@
#include "debug.h"
#include "configuration.h"
#include "ui_colors.h"
#include "wefax.h"
#include "trx.h"
#include "fl_digi.h"
@ -765,12 +766,7 @@ Fl_Group *create_wefax_rx_viewer(int pos_x, int pos_y,int win_wid, int hei_win)
wefax_pic_rx_win = new Fl_Group(pos_x, pos_y, win_wid, hei_win);
wefax_pic_rx_win->color(
fl_rgb_color(
progdefaults.RxColor.R,
progdefaults.RxColor.G,
progdefaults.RxColor.B),
progdefaults.RxTxSelectcolor);
wefax_pic_rx_win->color( RGBCOLOR( RxColor ), RGBCOLOR( RxTxSelectcolor ));
wefax_pic_rx_win->align(FL_ALIGN_CLIP);
@ -796,7 +792,7 @@ Fl_Group *create_wefax_rx_viewer(int pos_x, int pos_y,int win_wid, int hei_win)
255,
255,
255),
progdefaults.RxTxSelectcolor);
RGBCOLOR( RxTxSelectcolor ));
wefax_pic_rx_scroll->box(FL_ENGRAVED_FRAME);
wefax_pic_rx_scroll->begin();
@ -866,7 +862,7 @@ Fl_Group *create_wefax_rx_viewer(int pos_x, int pos_y,int win_wid, int hei_win)
wefax_btn_rx_resume->y(),
50, H_BUTTON, _("Cont'"));
wefax_round_rx_non_stop->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
wefax_round_rx_non_stop->selection_color(progdefaults.default_btn_color);
wefax_round_rx_non_stop->selection_color(RGBCOLOR( default_btn_color ));
wefax_round_rx_non_stop->callback(wefax_cb_pic_rx_manual, 0);
wefax_round_rx_non_stop->tooltip(_("Continuous reception mode"));
@ -921,7 +917,7 @@ Fl_Group *create_wefax_rx_viewer(int pos_x, int pos_y,int win_wid, int hei_win)
wefax_rx_center->y(),
45, H_BUTTON,
"Auto");
wefax_autocenter->selection_color(progdefaults.default_btn_color);
wefax_autocenter->selection_color(RGBCOLOR( default_btn_color));
wefax_autocenter->callback(cb_wefax_autocenter, 0);
wefax_autocenter->tooltip(_("Enable automatic image centering"));
wefax_autocenter->value(progdefaults.wefax_autocenter);
@ -933,7 +929,7 @@ Fl_Group *create_wefax_rx_viewer(int pos_x, int pos_y,int win_wid, int hei_win)
wefax_round_rx_noise_removal->callback(wefax_cb_pic_rx_noise_removal, 0);
wefax_round_rx_noise_removal->tooltip(_("Removes noise when ticked"));
wefax_round_rx_noise_removal->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
wefax_round_rx_noise_removal->selection_color(progdefaults.default_btn_color);
wefax_round_rx_noise_removal->selection_color(RGBCOLOR( default_btn_color ) );
wefax_round_rx_binary = new Fl_Light_Button(
wefax_round_rx_noise_removal->x() + wefax_round_rx_noise_removal->w() + W_MARGIN,
@ -942,7 +938,7 @@ Fl_Group *create_wefax_rx_viewer(int pos_x, int pos_y,int win_wid, int hei_win)
wefax_round_rx_binary->callback(wefax_cb_pic_rx_binary, 0);
wefax_round_rx_binary->tooltip(_("Binary image when ticked"));
wefax_round_rx_binary->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
wefax_round_rx_binary->selection_color(progdefaults.default_btn_color);
wefax_round_rx_binary->selection_color(RGBCOLOR( default_btn_color ));
wefax_round_rx_binary->value(0);
wefax_spinner_rx_binary = new Fl_Spinner(
@ -1256,12 +1252,7 @@ void create_wefax_tx_viewer(int pos_x, int pos_y,int win_wid, int hei_win)
Fl_Double_Window * tmpWin = new Fl_Double_Window(win_wid, hei_win, _("Send image"));
wefax_pic_tx_win = tmpWin;
wefax_pic_tx_win->color(
fl_rgb_color(
progdefaults.TxColor.R,
progdefaults.TxColor.G,
progdefaults.TxColor.B),
progdefaults.RxTxSelectcolor);
wefax_pic_tx_win->color( RGBCOLOR( TxColor ), RGBCOLOR( RxTxSelectcolor ));
wefax_pic_tx_win->begin();
@ -1272,7 +1263,7 @@ void create_wefax_tx_viewer(int pos_x, int pos_y,int win_wid, int hei_win)
255,
255,
255),
progdefaults.RxTxSelectcolor);
RGBCOLOR( RxTxSelectcolor ));
wefax_pic_tx_scroll->box(FL_ENGRAVED_FRAME);
wefax_pic_tx_scroll->begin();