diff --git a/src/dialogs/colorsfonts.cxx b/src/dialogs/colorsfonts.cxx index 354baf63..5257cb03 100644 --- a/src/dialogs/colorsfonts.cxx +++ b/src/dialogs/colorsfonts.cxx @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0300 +// generated by Fast Light User Interface Designer (fluid) version 1.0110 #include "gettext.h" #include "colorsfonts.h" @@ -11,15 +11,15 @@ void selectColorsFonts() { if (!dlgColorFont) - make_colorsfonts(); - dlgColorFont->show(); + make_colorsfonts(); +dlgColorFont->show(); } static void choose_color(Fl_Color & c) { unsigned char r, g, b; - Fl::get_color(c, r, g, b); - if (fl_color_chooser("Font color", r, g, b)) - c = fl_rgb_color(r, g, b); +Fl::get_color(c, r, g, b); +if (fl_color_chooser("Font color", r, g, b)) + c = fl_rgb_color(r, g, b); } static void adjust_label(Fl_Widget* w) { @@ -28,127 +28,127 @@ static void adjust_label(Fl_Widget* w) { static void cbRxFontBrowser(Fl_Widget*, void*) { Fl_Font font = font_browser->fontNumber(); - int size = font_browser->fontSize(); - Fl_Color color = font_browser->fontColor(); - - RxText->textfont(font); - RxText->textsize(size); - RxText->textcolor(color); - RxText->redraw(); - - progdefaults.RxFontnbr = font; - progdefaults.RxFontsize = size; - progdefaults.RxFontcolor = color; - - ReceiveText->setFont(font); - ReceiveText->setFontSize(size); - ReceiveText->setFontColor(progdefaults.RxFontcolor, FTextBase::RECV); - - font_browser->hide(); - - progdefaults.changed = true; + int size = font_browser->fontSize(); + Fl_Color color = font_browser->fontColor(); + + RxText->textfont(font); + RxText->textsize(size); + RxText->textcolor(color); + RxText->redraw(); + + progdefaults.RxFontnbr = font; + progdefaults.RxFontsize = size; + progdefaults.RxFontcolor = color; + + ReceiveText->setFont(font); + ReceiveText->setFontSize(size); + ReceiveText->setFontColor(progdefaults.RxFontcolor, FTextBase::RECV); + + font_browser->hide(); + + progdefaults.changed = true; } static void cbTxFontBrowser(Fl_Widget*, void*) { Fl_Font font = font_browser->fontNumber(); - int size = font_browser->fontSize(); - Fl_Color color = font_browser->fontColor(); - - TxText->textfont(font); - TxText->textsize(size); - TxText->textcolor(color); - TxText->redraw(); - - progdefaults.TxFontnbr = font; - progdefaults.TxFontsize = size; - progdefaults.TxFontcolor = color; - - TransmitText->setFont(font); - TransmitText->setFontSize(size); - TransmitText->setFontColor(progdefaults.TxFontcolor, FTextBase::RECV); - - font_browser->hide(); - - progdefaults.changed = true; + int size = font_browser->fontSize(); + Fl_Color color = font_browser->fontColor(); + + TxText->textfont(font); + TxText->textsize(size); + TxText->textcolor(color); + TxText->redraw(); + + progdefaults.TxFontnbr = font; + progdefaults.TxFontsize = size; + progdefaults.TxFontcolor = color; + + TransmitText->setFont(font); + TransmitText->setFontSize(size); + TransmitText->setFontColor(progdefaults.TxFontcolor, FTextBase::RECV); + + font_browser->hide(); + + progdefaults.changed = true; } void cbWaterfallFontBrowser(Fl_Widget*, void*) { Fl_Font fnt = font_browser->fontNumber(); - int size = font_browser->fontSize(); - - progdefaults.WaterfallFontnbr = fnt; - progdefaults.WaterfallFontsize = size; - progdefaults.changed = true; - - font_browser->hide(); + int size = font_browser->fontSize(); + + progdefaults.WaterfallFontnbr = fnt; + progdefaults.WaterfallFontsize = size; + progdefaults.changed = true; + + font_browser->hide(); } void cbViewerFontBrowser(Fl_Widget*, void*) { progdefaults.ViewerFontnbr = font_browser->fontNumber(); - progdefaults.ViewerFontsize = font_browser->fontSize(); - initViewer(); - progdefaults.changed = true; - - font_browser->hide(); + progdefaults.ViewerFontsize = font_browser->fontSize(); + initViewer(); + progdefaults.changed = true; + + font_browser->hide(); } void cbFreqControlFontBrowser(Fl_Widget*, void*) { Fl_Font fnt = font_browser->fontNumber(); - progdefaults.FreqControlFontnbr = fnt; - progdefaults.changed = true; - - FDdisplay->labelfont(progdefaults.FreqControlFontnbr); - FDdisplay->redraw(); - qsoFreqDisp1->font(progdefaults.FreqControlFontnbr); - qsoFreqDisp2->font(progdefaults.FreqControlFontnbr); - qsoFreqDisp3->font(progdefaults.FreqControlFontnbr); - qsoFreqDisp1->redraw(); - qsoFreqDisp2->redraw(); - qsoFreqDisp3->redraw(); - - font_browser->hide(); + progdefaults.FreqControlFontnbr = fnt; + progdefaults.changed = true; + + FDdisplay->labelfont(progdefaults.FreqControlFontnbr); + FDdisplay->redraw(); + qsoFreqDisp1->font(progdefaults.FreqControlFontnbr); + qsoFreqDisp2->font(progdefaults.FreqControlFontnbr); + qsoFreqDisp3->font(progdefaults.FreqControlFontnbr); + qsoFreqDisp1->redraw(); + qsoFreqDisp2->redraw(); + qsoFreqDisp3->redraw(); + + font_browser->hide(); } static void cbLOGGINGFontBrowser(Fl_Widget*, void*) { Fl_Font font = font_browser->fontNumber(); - int size = font_browser->fontSize(); - Fl_Color color = font_browser->fontColor(); - - progdefaults.LOGGINGtextfont = font; - progdefaults.LOGGINGtextsize = size; - progdefaults.LOGGINGtextcolor = color; - - LOGGINGdisplay->textsize(size); - LOGGINGdisplay->textcolor(color); - LOGGINGdisplay->textfont(font); - LOGGINGdisplay->redraw(); - - LOGGING_colors_font(); - - font_browser->hide(); - - progdefaults.changed = true; + int size = font_browser->fontSize(); + Fl_Color color = font_browser->fontColor(); + + progdefaults.LOGGINGtextfont = font; + progdefaults.LOGGINGtextsize = size; + progdefaults.LOGGINGtextcolor = color; + + LOGGINGdisplay->textsize(size); + LOGGINGdisplay->textcolor(color); + LOGGINGdisplay->textfont(font); + LOGGINGdisplay->redraw(); + + LOGGING_colors_font(); + + font_browser->hide(); + + progdefaults.changed = true; } static void cbLOGBOOKFontBrowser(Fl_Widget*, void*) { Fl_Font font = font_browser->fontNumber(); - int size = font_browser->fontSize(); - Fl_Color color = font_browser->fontColor(); - - progdefaults.LOGBOOKtextfont = font; - progdefaults.LOGBOOKtextsize = size; - progdefaults.LOGBOOKtextcolor = color; - - LOGBOOKdisplay->textsize(size); - LOGBOOKdisplay->textcolor(color); - LOGBOOKdisplay->textfont(font); - LOGBOOKdisplay->redraw(); - - LOGBOOK_colors_font(); - - font_browser->hide(); - - progdefaults.changed = true; + int size = font_browser->fontSize(); + Fl_Color color = font_browser->fontColor(); + + progdefaults.LOGBOOKtextfont = font; + progdefaults.LOGBOOKtextsize = size; + progdefaults.LOGBOOKtextcolor = color; + + LOGBOOKdisplay->textsize(size); + LOGBOOKdisplay->textcolor(color); + LOGBOOKdisplay->textfont(font); + LOGBOOKdisplay->redraw(); + + LOGBOOK_colors_font(); + + font_browser->hide(); + + progdefaults.changed = true; } Fl_Double_Window *dlgColorFont=(Fl_Double_Window *)0; @@ -960,6 +960,8 @@ progdefaults.changed = true; Fl_Menu_Button *CHARSETstatus=(Fl_Menu_Button *)0; +Fl_Box *CHARSETlabel=(Fl_Box *)0; + Fl_Double_Window* make_colorsfonts() { font_browser = new Font_Browser; { dlgColorFont = new Fl_Double_Window(375, 220, _("Colors and Fonts")); @@ -1059,31 +1061,31 @@ Fl_Double_Window* make_colorsfonts() { { btnXMIT = new Fl_Button(5, 134, 40, 21, _("XMIT")); btnXMIT->tooltip(_("Sent chars in Rx/Tx pane")); btnXMIT->callback((Fl_Callback*)cb_btnXMIT); - btnXMIT->align(Fl_Align(FL_ALIGN_BOTTOM)); + btnXMIT->align(FL_ALIGN_BOTTOM); btnXMIT->color(progdefaults.XMITcolor); } // Fl_Button* btnXMIT { btnCTRL = new Fl_Button(48, 134, 40, 21, _("CTRL")); btnCTRL->tooltip(_("Control chars in Rx/Tx pane")); btnCTRL->callback((Fl_Callback*)cb_btnCTRL); - btnCTRL->align(Fl_Align(FL_ALIGN_BOTTOM)); + btnCTRL->align(FL_ALIGN_BOTTOM); btnCTRL->color(progdefaults.CTRLcolor); } // Fl_Button* btnCTRL { btnSKIP = new Fl_Button(92, 134, 40, 21, _("SKIP")); btnSKIP->tooltip(_("Skipped chars in Tx pane\n(Tx on/off in CW)")); btnSKIP->callback((Fl_Callback*)cb_btnSKIP); - btnSKIP->align(Fl_Align(FL_ALIGN_BOTTOM)); + btnSKIP->align(FL_ALIGN_BOTTOM); btnSKIP->color(progdefaults.SKIPcolor); } // Fl_Button* btnSKIP { btnALTR = new Fl_Button(135, 134, 40, 21, _("ALTR")); btnALTR->tooltip(_("Alternate character color in Rx panelr")); btnALTR->callback((Fl_Callback*)cb_btnALTR); - btnALTR->align(Fl_Align(FL_ALIGN_BOTTOM)); + btnALTR->align(FL_ALIGN_BOTTOM); btnALTR->color(progdefaults.ALTRcolor); } // Fl_Button* btnALTR { btnSEL = new Fl_Button(179, 134, 39, 21, _("SEL")); btnSEL->tooltip(_("Selection background color in Rx Tx panels")); btnSEL->callback((Fl_Callback*)cb_btnSEL); - btnSEL->align(Fl_Align(FL_ALIGN_BOTTOM)); + btnSEL->align(FL_ALIGN_BOTTOM); btnSEL->color(progdefaults.RxTxSelectcolor); } // Fl_Button* btnSEL { btnNoTextColor = new Fl_Button(226, 134, 70, 21, _("System")); @@ -1180,7 +1182,7 @@ Fl_Double_Window* make_colorsfonts() { o->color(progdefaults.Sql2Color); } // Fl_Box* sql2color { Fl_Box* o = new Fl_Box(140, 159, 220, 20, _("Lighted button enabled colors")); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); } // Fl_Box* o o->end(); } // Fl_Group* o @@ -1191,7 +1193,7 @@ Fl_Double_Window* make_colorsfonts() { } // Fl_Button* btnLowSignal { Fl_Box* o = lowcolor = new Fl_Box(81, 73, 21, 21); lowcolor->box(FL_DIAMOND_DOWN_BOX); - lowcolor->color(FL_FOREGROUND_COLOR); + lowcolor->color((Fl_Color)FL_FOREGROUND_COLOR); o->color(progdefaults.LowSignal); } // Fl_Box* lowcolor { btnHighSignal = new Fl_Button(102, 111, 70, 21, _("High")); @@ -1226,7 +1228,7 @@ Fl_Double_Window* make_colorsfonts() { o->hide(); { Fl_Group* o = new Fl_Group(1, 33, 372, 65, _("Logging Panel Controls")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Output* o = LOGGINGdisplay = new Fl_Output(19, 57, 98, 25); o->textfont(progdefaults.LOGGINGtextfont);o->textsize(progdefaults.LOGGINGtextsize);o->textcolor(progdefaults.LOGGINGtextcolor); o->color(progdefaults.LOGGINGcolor); @@ -1246,7 +1248,7 @@ Fl_Double_Window* make_colorsfonts() { } // Fl_Group* o { Fl_Group* o = new Fl_Group(3, 108, 370, 65, _("Logbook Dialog")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Output* o = LOGBOOKdisplay = new Fl_Output(19, 132, 98, 25); o->textfont(progdefaults.LOGGINGtextfont);o->textsize(progdefaults.LOGGINGtextsize);o->textcolor(progdefaults.LOGBOOKtextcolor); o->color(progdefaults.LOGBOOKcolor); @@ -1271,11 +1273,11 @@ Fl_Double_Window* make_colorsfonts() { { CHARSETstatus = new Fl_Menu_Button(3, 192, 120, 24, _("Char set")); CHARSETstatus->tooltip(_("Select Rx/Tx Character Set")); CHARSETstatus->color((Fl_Color)55); - CHARSETstatus->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); + CHARSETstatus->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); } // Fl_Menu_Button* CHARSETstatus - { Fl_Box* o = new Fl_Box(125, 192, 125, 25, _("Select Char Set")); - o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); - } // Fl_Box* o + { CHARSETlabel = new Fl_Box(125, 192, 125, 25, _("Select Char Set")); + CHARSETlabel->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); + } // Fl_Box* CHARSETlabel dlgColorFont->xclass(PACKAGE_TARNAME); dlgColorFont->end(); } // Fl_Double_Window* dlgColorFont diff --git a/src/dialogs/colorsfonts.fl b/src/dialogs/colorsfonts.fl index 680f0db4..640c0ec1 100644 --- a/src/dialogs/colorsfonts.fl +++ b/src/dialogs/colorsfonts.fl @@ -1,30 +1,28 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0300 +version 1.0110 i18n_type 1 i18n_include "gettext.h" i18n_function _ header_name {.h} code_name {.cxx} -decl {\#include } {private global +decl {\#include } {global } -decl {\#include "fl_digi.h"} {private global +decl {\#include "fl_digi.h"} {global } -decl {\#include "configuration.h"} {private global +decl {\#include "configuration.h"} {global } -decl {\#include "Viewer.h"} {private global +decl {\#include "Viewer.h"} {global } decl {\#include "font_browser.h"} {public global } -decl {\#include } {private local -} +decl {\#include } {} -decl {\#include } {private local -} +decl {\#include } {} Function {selectColorsFonts()} {open return_type void } { @@ -1075,12 +1073,12 @@ progdefaults.changed = true;} } } Fl_Menu_Button CHARSETstatus { - label {Char set} open + label {Char set} open selected tooltip {Select Rx/Tx Character Set} xywh {3 192 120 24} color 55 align 20 code0 {\#include "fl_digi.h"} } {} - Fl_Box {} { - label {Select Char Set} selected + Fl_Box CHARSETlabel { + label {Select Char Set} xywh {125 192 125 25} align 20 } } diff --git a/src/dialogs/confdialog.cxx b/src/dialogs/confdialog.cxx index b83fb379..4e59eaa8 100644 --- a/src/dialogs/confdialog.cxx +++ b/src/dialogs/confdialog.cxx @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0300 +// generated by Fast Light User Interface Designer (fluid) version 1.0110 #include "gettext.h" #include "confdialog.h" @@ -32,20 +32,20 @@ Mode_Browser* mode_browser; void set_qrzxml_buttons(Fl_Button* b) { Fl_Button* qrzbxml[] = { btnQRZXMLnotavailable, btnQRZcdrom, btnQRZsub, - btnHamcall, - btnCALLOOK, btnHamQTH}; - - for (size_t i = 0; i < sizeof(qrzbxml)/sizeof(*qrzbxml); i++) - qrzbxml[i]->value(b == qrzbxml[i]); + btnHamcall, + btnCALLOOK, btnHamQTH}; + +for (size_t i = 0; i < sizeof(qrzbxml)/sizeof(*qrzbxml); i++) + qrzbxml[i]->value(b == qrzbxml[i]); } void set_qrzweb_buttons(Fl_Button* b) { Fl_Button* qrzbweb[] = { btnQRZWEBnotavailable, btnQRZonline, - btnHAMCALLonline, - btnHamQTHonline }; - - for (size_t i = 0; i < sizeof(qrzbweb)/sizeof(*qrzbweb); i++) - qrzbweb[i]->value(b == qrzbweb[i]); + btnHAMCALLonline, + btnHamQTHonline }; + +for (size_t i = 0; i < sizeof(qrzbweb)/sizeof(*qrzbweb); i++) + qrzbweb[i]->value(b == qrzbweb[i]); } Fl_Tabs *tabsConfigure=(Fl_Tabs *)0; @@ -3530,85 +3530,85 @@ progdefaults.changed = false; Fl_Double_Window* ConfigureDialog() { Fl_Double_Window* w; static const char szShifts[] = "23|85|160|170|182|200|240|350|425|_850|Custom"; - static const char szBauds[] = "45|45.45|50|56|75|100|110|150|200|300"; - static const char szSelBits[] = "5 (baudot)|7 (ascii)|8 (ascii)"; - static const char szParity[] = "none|even|odd|zero|one"; - static const char szStopBits[] = "1|1.5|2"; - static const char szOliviaTones[] = "2|4|8|16|32|64|128|256"; - static const char szOliviaBandwidth[] = "125|250|500|1000|2000"; - static const char szContestiaTones[] = "2|4|8|16|32|64|128|256"; - static const char szContestiaBandwidth[] = "125|250|500|1000|2000"; - static const char szBaudRates[] = "300|600|1200|2400|4800|9600|19200|38400|57600|115200|230400|460800"; - static const char szProsigns[] = "~|%|&|+|=|{|}|<|>|[|]| "; +static const char szBauds[] = "45|45.45|50|56|75|100|110|150|200|300"; +static const char szSelBits[] = "5 (baudot)|7 (ascii)|8 (ascii)"; +static const char szParity[] = "none|even|odd|zero|one"; +static const char szStopBits[] = "1|1.5|2"; +static const char szOliviaTones[] = "2|4|8|16|32|64|128|256"; +static const char szOliviaBandwidth[] = "125|250|500|1000|2000"; +static const char szContestiaTones[] = "2|4|8|16|32|64|128|256"; +static const char szContestiaBandwidth[] = "125|250|500|1000|2000"; +static const char szBaudRates[] = "300|600|1200|2400|4800|9600|19200|38400|57600|115200|230400|460800"; +static const char szProsigns[] = "~|%|&|+|=|{|}|<|>|[|]| "; { Fl_Double_Window* o = new Fl_Double_Window(540, 400, _("Fldigi configuration")); w = o; - o->color(FL_DARK2); + o->color((Fl_Color)FL_DARK2); o->selection_color((Fl_Color)51); o->labelsize(18); - o->align(Fl_Align(FL_ALIGN_CLIP|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_CLIP|FL_ALIGN_INSIDE); { tabsConfigure = new Fl_Tabs(-5, 0, 596, 372); - tabsConfigure->color(FL_LIGHT1); - tabsConfigure->selection_color(FL_LIGHT1); + tabsConfigure->color((Fl_Color)FL_LIGHT1); + tabsConfigure->selection_color((Fl_Color)FL_LIGHT1); { tabOperator = new Fl_Group(0, 25, 540, 345, _("Operator")); tabOperator->tooltip(_("Operator information")); tabOperator->callback((Fl_Callback*)cb_tabOperator); tabOperator->when(FL_WHEN_CHANGED); { Fl_Group* o = new Fl_Group(27, 35, 490, 165, _("Station")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { inpMyCallsign = new Fl_Input2(132, 64, 110, 24, _("Callsign:")); inpMyCallsign->tooltip(_("Operators callsign")); inpMyCallsign->box(FL_DOWN_BOX); - inpMyCallsign->color(FL_BACKGROUND2_COLOR); - inpMyCallsign->selection_color(FL_SELECTION_COLOR); + inpMyCallsign->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpMyCallsign->selection_color((Fl_Color)FL_SELECTION_COLOR); inpMyCallsign->labeltype(FL_NORMAL_LABEL); inpMyCallsign->labelfont(0); inpMyCallsign->labelsize(14); - inpMyCallsign->labelcolor(FL_FOREGROUND_COLOR); + inpMyCallsign->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); inpMyCallsign->callback((Fl_Callback*)cb_inpMyCallsign); - inpMyCallsign->align(Fl_Align(FL_ALIGN_LEFT)); + inpMyCallsign->align(FL_ALIGN_LEFT); inpMyCallsign->when(FL_WHEN_RELEASE); inpMyCallsign->labelsize(FL_NORMAL_SIZE); } // Fl_Input2* inpMyCallsign { inpMyName = new Fl_Input2(312, 64, 140, 24, _("Name:")); inpMyName->tooltip(_("Operators name")); inpMyName->box(FL_DOWN_BOX); - inpMyName->color(FL_BACKGROUND2_COLOR); - inpMyName->selection_color(FL_SELECTION_COLOR); + inpMyName->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpMyName->selection_color((Fl_Color)FL_SELECTION_COLOR); inpMyName->labeltype(FL_NORMAL_LABEL); inpMyName->labelfont(0); inpMyName->labelsize(14); - inpMyName->labelcolor(FL_FOREGROUND_COLOR); + inpMyName->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); inpMyName->callback((Fl_Callback*)cb_inpMyName); - inpMyName->align(Fl_Align(FL_ALIGN_LEFT)); + inpMyName->align(FL_ALIGN_LEFT); inpMyName->when(FL_WHEN_RELEASE); inpMyName->labelsize(FL_NORMAL_SIZE); } // Fl_Input2* inpMyName { inpMyQth = new Fl_Input2(132, 98, 320, 24, _("QTH:")); inpMyQth->tooltip(_("Operators QTH")); inpMyQth->box(FL_DOWN_BOX); - inpMyQth->color(FL_BACKGROUND2_COLOR); - inpMyQth->selection_color(FL_SELECTION_COLOR); + inpMyQth->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpMyQth->selection_color((Fl_Color)FL_SELECTION_COLOR); inpMyQth->labeltype(FL_NORMAL_LABEL); inpMyQth->labelfont(0); inpMyQth->labelsize(14); - inpMyQth->labelcolor(FL_FOREGROUND_COLOR); + inpMyQth->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); inpMyQth->callback((Fl_Callback*)cb_inpMyQth); - inpMyQth->align(Fl_Align(FL_ALIGN_LEFT)); + inpMyQth->align(FL_ALIGN_LEFT); inpMyQth->when(FL_WHEN_RELEASE); inpMyQth->labelsize(FL_NORMAL_SIZE); } // Fl_Input2* inpMyQth { inpMyLocator = new Fl_Input2(132, 133, 85, 24, _("Locator:")); inpMyLocator->tooltip(_("Maidenhead locator as in EM64qv")); inpMyLocator->box(FL_DOWN_BOX); - inpMyLocator->color(FL_BACKGROUND2_COLOR); - inpMyLocator->selection_color(FL_SELECTION_COLOR); + inpMyLocator->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpMyLocator->selection_color((Fl_Color)FL_SELECTION_COLOR); inpMyLocator->labeltype(FL_NORMAL_LABEL); inpMyLocator->labelfont(0); inpMyLocator->labelsize(14); - inpMyLocator->labelcolor(FL_FOREGROUND_COLOR); + inpMyLocator->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); inpMyLocator->callback((Fl_Callback*)cb_inpMyLocator); - inpMyLocator->align(Fl_Align(FL_ALIGN_LEFT)); + inpMyLocator->align(FL_ALIGN_LEFT); inpMyLocator->when(FL_WHEN_RELEASE); inpMyLocator->labelsize(FL_NORMAL_SIZE); } // Fl_Input2* inpMyLocator @@ -3617,20 +3617,20 @@ Fl_Double_Window* ConfigureDialog() { { inpMyAntenna = new Fl_Input2(132, 167, 320, 24, _("Antenna:")); inpMyAntenna->tooltip(_("Short description of antenna")); inpMyAntenna->box(FL_DOWN_BOX); - inpMyAntenna->color(FL_BACKGROUND2_COLOR); - inpMyAntenna->selection_color(FL_SELECTION_COLOR); + inpMyAntenna->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpMyAntenna->selection_color((Fl_Color)FL_SELECTION_COLOR); inpMyAntenna->labeltype(FL_NORMAL_LABEL); inpMyAntenna->labelfont(0); inpMyAntenna->labelsize(14); - inpMyAntenna->labelcolor(FL_FOREGROUND_COLOR); + inpMyAntenna->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); inpMyAntenna->callback((Fl_Callback*)cb_inpMyAntenna); - inpMyAntenna->align(Fl_Align(FL_ALIGN_LEFT)); + inpMyAntenna->align(FL_ALIGN_LEFT); inpMyAntenna->when(FL_WHEN_RELEASE); inpMyAntenna->labelsize(FL_NORMAL_SIZE); } // Fl_Input2* inpMyAntenna { grpNoise = new Fl_Group(27, 203, 490, 165, _("Test Signal - Do NOT use with transmitter")); grpNoise->box(FL_ENGRAVED_FRAME); - grpNoise->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + grpNoise->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); grpNoise->hide(); { Fl_Check_Button* o = btnNoiseOn = new Fl_Check_Button(65, 241, 70, 15, _("Noise on")); btnNoiseOn->down_box(FL_DOWN_BOX); @@ -3640,18 +3640,18 @@ Fl_Double_Window* ConfigureDialog() { { Fl_Counter2* o = noiseDB = new Fl_Counter2(62, 279, 89, 21, _("dB")); noiseDB->type(1); noiseDB->box(FL_UP_BOX); - noiseDB->color(FL_BACKGROUND_COLOR); - noiseDB->selection_color(FL_INACTIVE_COLOR); + noiseDB->color((Fl_Color)FL_BACKGROUND_COLOR); + noiseDB->selection_color((Fl_Color)FL_INACTIVE_COLOR); noiseDB->labeltype(FL_NORMAL_LABEL); noiseDB->labelfont(0); noiseDB->labelsize(14); - noiseDB->labelcolor(FL_FOREGROUND_COLOR); + noiseDB->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); noiseDB->minimum(-18); noiseDB->maximum(60); noiseDB->step(1); noiseDB->value(20); noiseDB->callback((Fl_Callback*)cb_noiseDB); - noiseDB->align(Fl_Align(FL_ALIGN_LEFT)); + noiseDB->align(FL_ALIGN_LEFT); noiseDB->when(FL_WHEN_CHANGED); o->value(progdefaults.s2n); } // Fl_Counter2* noiseDB @@ -3662,23 +3662,23 @@ Fl_Double_Window* ConfigureDialog() { { tabUI = new Fl_Group(0, 25, 540, 346, _("UI")); tabUI->hide(); { tabsUI = new Fl_Tabs(0, 25, 540, 346); - tabsUI->selection_color(FL_LIGHT1); + tabsUI->selection_color((Fl_Color)FL_LIGHT1); { tabBrowser = new Fl_Group(0, 50, 540, 320, _("Browser")); { Fl_Group* o = new Fl_Group(24, 59, 496, 300); o->box(FL_ENGRAVED_FRAME); { Fl_Spinner2* o = cntChannels = new Fl_Spinner2(40, 69, 50, 24, _("Channels, first channel starts at waterfall lower limit")); cntChannels->tooltip(_("Change # of psk viewer channels")); cntChannels->box(FL_NO_BOX); - cntChannels->color(FL_BACKGROUND_COLOR); - cntChannels->selection_color(FL_BACKGROUND_COLOR); + cntChannels->color((Fl_Color)FL_BACKGROUND_COLOR); + cntChannels->selection_color((Fl_Color)FL_BACKGROUND_COLOR); cntChannels->labeltype(FL_NORMAL_LABEL); cntChannels->labelfont(0); cntChannels->labelsize(14); - cntChannels->labelcolor(FL_FOREGROUND_COLOR); + cntChannels->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntChannels->maximum(30); cntChannels->value(30); cntChannels->callback((Fl_Callback*)cb_cntChannels); - cntChannels->align(Fl_Align(FL_ALIGN_RIGHT)); + cntChannels->align(FL_ALIGN_RIGHT); cntChannels->when(FL_WHEN_RELEASE); o->minimum(5); o->maximum(30); o->step(1); o->value(progdefaults.VIEWERchannels); @@ -3687,15 +3687,15 @@ Fl_Double_Window* ConfigureDialog() { { Fl_Spinner2* o = cntTimeout = new Fl_Spinner2(40, 105, 50, 24, _("Inactivity timeout")); cntTimeout->tooltip(_("Clear channel text after\n# seconds of inactivity")); cntTimeout->box(FL_NO_BOX); - cntTimeout->color(FL_BACKGROUND_COLOR); - cntTimeout->selection_color(FL_BACKGROUND_COLOR); + cntTimeout->color((Fl_Color)FL_BACKGROUND_COLOR); + cntTimeout->selection_color((Fl_Color)FL_BACKGROUND_COLOR); cntTimeout->labeltype(FL_NORMAL_LABEL); cntTimeout->labelfont(0); cntTimeout->labelsize(14); - cntTimeout->labelcolor(FL_FOREGROUND_COLOR); + cntTimeout->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntTimeout->value(10); cntTimeout->callback((Fl_Callback*)cb_cntTimeout); - cntTimeout->align(Fl_Align(FL_ALIGN_RIGHT)); + cntTimeout->align(FL_ALIGN_RIGHT); cntTimeout->when(FL_WHEN_RELEASE); o->minimum(1); o->maximum(180); o->step(1); o->value(progdefaults.VIEWERtimeout); @@ -3705,7 +3705,7 @@ Fl_Double_Window* ConfigureDialog() { mnuViewerLabel->tooltip(_("Appearance of label on each channel")); mnuViewerLabel->down_box(FL_BORDER_BOX); mnuViewerLabel->callback((Fl_Callback*)cb_mnuViewerLabel); - mnuViewerLabel->align(Fl_Align(FL_ALIGN_RIGHT)); + mnuViewerLabel->align(FL_ALIGN_RIGHT); mnuViewerLabel->add(_("None")); mnuViewerLabel->add(_("Audio frequency")); mnuViewerLabel->add(_("Radio frequency")); mnuViewerLabel->add(_("Channel number")); mnuViewerLabel->value(progdefaults.VIEWERlabeltype); @@ -3742,7 +3742,7 @@ Fl_Double_Window* ConfigureDialog() { } // Fl_Check_Button* btnBrowserHistory { Fl_Group* o = new Fl_Group(42, 265, 219, 60, _("Detection Level Colors")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE); { bwsrSliderColor = new Fl_Button(65, 288, 80, 24, _("Backgnd")); bwsrSliderColor->tooltip(_("Background color of signal viewer squelch control")); bwsrSliderColor->callback((Fl_Callback*)cb_bwsrSliderColor); @@ -3763,20 +3763,20 @@ Fl_Double_Window* ConfigureDialog() { tabContest->hide(); { Fl_Group* o = new Fl_Group(25, 64, 490, 80, _("Exchanges")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { lblSend = new Fl_Box(57, 99, 55, 20, _("Send:")); } // Fl_Box* lblSend { Fl_Input2* o = inpSend1 = new Fl_Input2(115, 99, 140, 20, _("Exchange Out")); inpSend1->tooltip(_("free form exchange")); inpSend1->box(FL_DOWN_BOX); - inpSend1->color(FL_BACKGROUND2_COLOR); - inpSend1->selection_color(FL_SELECTION_COLOR); + inpSend1->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpSend1->selection_color((Fl_Color)FL_SELECTION_COLOR); inpSend1->labeltype(FL_NORMAL_LABEL); inpSend1->labelfont(0); inpSend1->labelsize(14); - inpSend1->labelcolor(FL_FOREGROUND_COLOR); + inpSend1->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); inpSend1->callback((Fl_Callback*)cb_inpSend1); - inpSend1->align(Fl_Align(FL_ALIGN_TOP)); + inpSend1->align(FL_ALIGN_TOP); inpSend1->when(FL_WHEN_RELEASE); o->value(progdefaults.myXchg.c_str()); inpSend1->labelsize(FL_NORMAL_SIZE); @@ -3797,7 +3797,7 @@ Fl_Double_Window* ConfigureDialog() { } // Fl_Group* o { Fl_Group* o = new Fl_Group(25, 154, 490, 65, _("Serial number")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { btnUseLeadingZeros = new Fl_Check_Button(46, 180, 154, 20, _("Use leading zeros")); btnUseLeadingZeros->tooltip(_("Insert leading zeros into Xmtd serial number")); btnUseLeadingZeros->down_box(FL_DOWN_BOX); @@ -3807,34 +3807,34 @@ Fl_Double_Window* ConfigureDialog() { { Fl_Value_Input2* o = nbrContestStart = new Fl_Value_Input2(241, 180, 45, 20, _("Start")); nbrContestStart->tooltip(_("Starting number")); nbrContestStart->box(FL_DOWN_BOX); - nbrContestStart->color(FL_BACKGROUND2_COLOR); - nbrContestStart->selection_color(FL_SELECTION_COLOR); + nbrContestStart->color((Fl_Color)FL_BACKGROUND2_COLOR); + nbrContestStart->selection_color((Fl_Color)FL_SELECTION_COLOR); nbrContestStart->labeltype(FL_NORMAL_LABEL); nbrContestStart->labelfont(0); nbrContestStart->labelsize(14); - nbrContestStart->labelcolor(FL_FOREGROUND_COLOR); + nbrContestStart->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); nbrContestStart->maximum(10000); nbrContestStart->step(1); nbrContestStart->callback((Fl_Callback*)cb_nbrContestStart); - nbrContestStart->align(Fl_Align(FL_ALIGN_TOP)); + nbrContestStart->align(FL_ALIGN_TOP); nbrContestStart->when(FL_WHEN_CHANGED); o->value(progdefaults.ContestStart); } // Fl_Value_Input2* nbrContestStart { nbrContestDigits = new Fl_Value_Input2(323, 179, 45, 20, _("Digits")); nbrContestDigits->tooltip(_("Number of digits in serial number")); nbrContestDigits->box(FL_DOWN_BOX); - nbrContestDigits->color(FL_BACKGROUND2_COLOR); - nbrContestDigits->selection_color(FL_SELECTION_COLOR); + nbrContestDigits->color((Fl_Color)FL_BACKGROUND2_COLOR); + nbrContestDigits->selection_color((Fl_Color)FL_SELECTION_COLOR); nbrContestDigits->labeltype(FL_NORMAL_LABEL); nbrContestDigits->labelfont(0); nbrContestDigits->labelsize(14); - nbrContestDigits->labelcolor(FL_FOREGROUND_COLOR); + nbrContestDigits->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); nbrContestDigits->minimum(1); nbrContestDigits->maximum(5); nbrContestDigits->step(1); nbrContestDigits->value(3); nbrContestDigits->callback((Fl_Callback*)cb_nbrContestDigits); - nbrContestDigits->align(Fl_Align(FL_ALIGN_TOP)); + nbrContestDigits->align(FL_ALIGN_TOP); nbrContestDigits->when(FL_WHEN_CHANGED); } // Fl_Value_Input2* nbrContestDigits { btnResetSerNbr = new Fl_Button(415, 180, 70, 20, _("Reset")); @@ -3845,7 +3845,7 @@ Fl_Double_Window* ConfigureDialog() { } // Fl_Group* o { Fl_Group* o = new Fl_Group(25, 229, 490, 130, _("Duplicate check, CALL plus")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Light_Button* o = btnDupCheckOn = new Fl_Light_Button(35, 259, 74, 20, _("On/Off")); btnDupCheckOn->tooltip(_("Check for duplicates")); btnDupCheckOn->selection_color((Fl_Color)2); @@ -3885,17 +3885,17 @@ Fl_Double_Window* ConfigureDialog() { { Fl_Value_Input2* o = nbrTimeSpan = new Fl_Value_Input2(305, 317, 53, 20, _("minutes")); nbrTimeSpan->tooltip(_("Enter time span in minutes")); nbrTimeSpan->box(FL_DOWN_BOX); - nbrTimeSpan->color(FL_BACKGROUND2_COLOR); - nbrTimeSpan->selection_color(FL_SELECTION_COLOR); + nbrTimeSpan->color((Fl_Color)FL_BACKGROUND2_COLOR); + nbrTimeSpan->selection_color((Fl_Color)FL_SELECTION_COLOR); nbrTimeSpan->labeltype(FL_NORMAL_LABEL); nbrTimeSpan->labelfont(0); nbrTimeSpan->labelsize(14); - nbrTimeSpan->labelcolor(FL_FOREGROUND_COLOR); + nbrTimeSpan->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); nbrTimeSpan->maximum(1440); nbrTimeSpan->step(1); nbrTimeSpan->value(120); nbrTimeSpan->callback((Fl_Callback*)cb_nbrTimeSpan); - nbrTimeSpan->align(Fl_Align(FL_ALIGN_RIGHT)); + nbrTimeSpan->align(FL_ALIGN_RIGHT); nbrTimeSpan->when(FL_WHEN_CHANGED); o->value(progdefaults.timespan); } // Fl_Value_Input2* nbrTimeSpan @@ -3903,8 +3903,8 @@ Fl_Double_Window* ConfigureDialog() { btnDupColor->tooltip(_("Left click to select dup color")); btnDupColor->box(FL_DOWN_BOX); btnDupColor->down_box(FL_DOWN_BOX); - btnDupColor->color(FL_BACKGROUND2_COLOR); - btnDupColor->selection_color(FL_BACKGROUND2_COLOR); + btnDupColor->color((Fl_Color)FL_BACKGROUND2_COLOR); + btnDupColor->selection_color((Fl_Color)FL_BACKGROUND2_COLOR); btnDupColor->callback((Fl_Callback*)cb_btnDupColor); o->color(fl_rgb_color(progdefaults.dup_color.R, progdefaults.dup_color.G, progdefaults.dup_color.B)); } // Fl_Button* btnDupColor @@ -3933,7 +3933,7 @@ Fl_Double_Window* ConfigureDialog() { mnuScheme->tooltip(_("Change application look and feel")); mnuScheme->down_box(FL_BORDER_BOX); mnuScheme->callback((Fl_Callback*)cb_mnuScheme); - mnuScheme->align(Fl_Align(FL_ALIGN_RIGHT)); + mnuScheme->align(FL_ALIGN_RIGHT); mnuScheme->add("base"); mnuScheme->add("gtk+"); mnuScheme->add("plastic"); @@ -3947,13 +3947,13 @@ Fl_Double_Window* ConfigureDialog() { mnuLang->tooltip(_("Changes take effect on next program startup")); mnuLang->down_box(FL_BORDER_BOX); mnuLang->callback((Fl_Callback*)cb_mnuLang); - mnuLang->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + mnuLang->align(FL_ALIGN_TOP_LEFT); } // Fl_Choice* mnuLang o->end(); } // Fl_Group* o { Fl_Group* o = new Fl_Group(21, 133, 496, 60); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Check_Button* o = btn_rx_lowercase = new Fl_Check_Button(56, 149, 389, 20, _("Print CW / RTTY / THROB / CONTESTIA in lowercase")); btn_rx_lowercase->down_box(FL_DOWN_BOX); btn_rx_lowercase->callback((Fl_Callback*)cb_btn_rx_lowercase); @@ -3963,7 +3963,7 @@ Fl_Double_Window* ConfigureDialog() { } // Fl_Group* o { Fl_Group* o = new Fl_Group(21, 195, 496, 114, _("Exit prompts")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Check_Button* o = btn_save_config_on_exit = new Fl_Check_Button(56, 261, 233, 20, _("Prompt to save Configuration")); btn_save_config_on_exit->down_box(FL_DOWN_BOX); btn_save_config_on_exit->callback((Fl_Callback*)cb_btn_save_config_on_exit); @@ -3984,7 +3984,7 @@ Fl_Double_Window* ConfigureDialog() { { Fl_Box* o = new Fl_Box(61, 215, 436, 40, _("Exit prompts active only when File/Exit menu item selected.\nNot active if wi\ ndow decoration close button pressed.")); o->box(FL_BORDER_BOX); - o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); } // Fl_Box* o { Fl_Check_Button* o = btn2_confirm_exit = new Fl_Check_Button(300, 283, 200, 20, _("Confirm exit")); btn2_confirm_exit->down_box(FL_DOWN_BOX); @@ -3995,7 +3995,7 @@ ndow decoration close button pressed.")); } // Fl_Group* o { Fl_Group* o = new Fl_Group(21, 311, 496, 56, _("Check for updates")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Check_Button* o = btn_check_for_updates = new Fl_Check_Button(56, 335, 324, 20, _("Check for updates when starting program")); btn_check_for_updates->down_box(FL_DOWN_BOX); btn_check_for_updates->callback((Fl_Callback*)cb_btn_check_for_updates); @@ -4009,7 +4009,7 @@ ndow decoration close button pressed.")); tabLogServer->hide(); { Fl_Group* o = new Fl_Group(25, 313, 496, 55, _("Client/Server Logbook")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Input* o = xmllogServerAddress = new Fl_Input(122, 334, 100, 24, _("Address:")); xmllogServerAddress->tooltip(_("Enter URL address of server")); xmllogServerAddress->callback((Fl_Callback*)cb_xmllogServerAddress); @@ -4027,7 +4027,7 @@ ndow decoration close button pressed.")); } // Fl_Group* o { Fl_Group* o = new Fl_Group(25, 57, 496, 180, _("QSO logging")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Check_Button* o = btnNagMe = new Fl_Check_Button(42, 79, 236, 20, _("Prompt to save log on exit")); btnNagMe->tooltip(_("Bug me about saving log entries")); btnNagMe->down_box(FL_DOWN_BOX); @@ -4079,14 +4079,14 @@ ndow decoration close button pressed.")); { Fl_Input2* o = txt_cty_dat_pathname = new Fl_Input2(162, 178, 346, 24, _("cty.dat pathname")); txt_cty_dat_pathname->tooltip(_("Enter full path-filename for cty.dat")); txt_cty_dat_pathname->box(FL_DOWN_BOX); - txt_cty_dat_pathname->color(FL_BACKGROUND2_COLOR); - txt_cty_dat_pathname->selection_color(FL_SELECTION_COLOR); + txt_cty_dat_pathname->color((Fl_Color)FL_BACKGROUND2_COLOR); + txt_cty_dat_pathname->selection_color((Fl_Color)FL_SELECTION_COLOR); txt_cty_dat_pathname->labeltype(FL_NORMAL_LABEL); txt_cty_dat_pathname->labelfont(0); txt_cty_dat_pathname->labelsize(14); - txt_cty_dat_pathname->labelcolor(FL_FOREGROUND_COLOR); + txt_cty_dat_pathname->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); txt_cty_dat_pathname->callback((Fl_Callback*)cb_txt_cty_dat_pathname); - txt_cty_dat_pathname->align(Fl_Align(FL_ALIGN_LEFT)); + txt_cty_dat_pathname->align(FL_ALIGN_LEFT); txt_cty_dat_pathname->when(FL_WHEN_CHANGED); o->value(progdefaults.cty_dat_pathname.c_str()); } // Fl_Input2* txt_cty_dat_pathname @@ -4105,14 +4105,14 @@ ndow decoration close button pressed.")); { Fl_Input2* o = inpMyPower = new Fl_Input2(458, 207, 50, 24, _("Transmit Power")); inpMyPower->tooltip(_("Tx power used for logbook entries")); inpMyPower->box(FL_DOWN_BOX); - inpMyPower->color(FL_BACKGROUND2_COLOR); - inpMyPower->selection_color(FL_SELECTION_COLOR); + inpMyPower->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpMyPower->selection_color((Fl_Color)FL_SELECTION_COLOR); inpMyPower->labeltype(FL_NORMAL_LABEL); inpMyPower->labelfont(0); inpMyPower->labelsize(14); - inpMyPower->labelcolor(FL_FOREGROUND_COLOR); + inpMyPower->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); inpMyPower->callback((Fl_Callback*)cb_inpMyPower); - inpMyPower->align(Fl_Align(FL_ALIGN_LEFT)); + inpMyPower->align(FL_ALIGN_LEFT); inpMyPower->when(FL_WHEN_RELEASE); o->value(progdefaults.mytxpower.c_str()); o->labelsize(FL_NORMAL_SIZE); @@ -4121,7 +4121,7 @@ ndow decoration close button pressed.")); } // Fl_Group* o { Fl_Group* o = new Fl_Group(25, 238, 496, 74, _("Rx Text Capture")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Check_Button* o = btnRXClicks = new Fl_Check_Button(48, 285, 191, 20, _("Double-click to capture")); btnRXClicks->tooltip(_("Enable if you cannot use the middle mouse button")); btnRXClicks->down_box(FL_DOWN_BOX); @@ -4138,15 +4138,15 @@ ndow decoration close button pressed.")); inpNonword->tooltip(_("RX text QSO data entry is bounded by the non-word characters\ndefined here. T\ ab and newline are automatically included.")); inpNonword->box(FL_DOWN_BOX); - inpNonword->color(FL_BACKGROUND2_COLOR); - inpNonword->selection_color(FL_SELECTION_COLOR); + inpNonword->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpNonword->selection_color((Fl_Color)FL_SELECTION_COLOR); inpNonword->labeltype(FL_NORMAL_LABEL); inpNonword->labelfont(0); inpNonword->labelsize(14); - inpNonword->labelcolor(FL_FOREGROUND_COLOR); + inpNonword->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); inpNonword->textfont(4); inpNonword->callback((Fl_Callback*)cb_inpNonword); - inpNonword->align(Fl_Align(FL_ALIGN_LEFT)); + inpNonword->align(FL_ALIGN_LEFT); inpNonword->when(FL_WHEN_RELEASE); o->value(progdefaults.nonwordchars.c_str()); o->labelsize(FL_NORMAL_SIZE); @@ -4169,7 +4169,7 @@ ab and newline are automatically included.")); } // Fl_Group* o { Fl_Group* o = new Fl_Group(18, 54, 496, 195, _("Number and position of macro bars")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { btn_oneA = new Fl_Round_Button(28, 84, 220, 20, _("One bar (above waterfall)")); btn_oneA->type(102); btn_oneA->down_box(FL_ROUND_DOWN_BOX); @@ -4242,7 +4242,7 @@ ab and newline are automatically included.")); o->box(FL_ENGRAVED_BOX); { Fl_Box* o = new Fl_Box(52, 78, 446, 25, _("Enable check box to show each respective operator control")); o->box(FL_FLAT_BOX); - o->align(Fl_Align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE); } // Fl_Box* o { Fl_Check_Button* o = btnWF_UIrev = new Fl_Check_Button(79, 111, 150, 20, _("Reverse")); btnWF_UIrev->down_box(FL_DOWN_BOX); @@ -4327,22 +4327,22 @@ ab and newline are automatically included.")); { tabWaterfall = new Fl_Group(-2, 25, 563, 347, _("Waterfall")); tabWaterfall->hide(); { tabsWaterfall = new Fl_Tabs(-2, 25, 563, 347); - tabsWaterfall->color(FL_LIGHT1); - tabsWaterfall->selection_color(FL_LIGHT1); + tabsWaterfall->color((Fl_Color)FL_LIGHT1); + tabsWaterfall->selection_color((Fl_Color)FL_LIGHT1); { Fl_Group* o = new Fl_Group(0, 48, 540, 320, _("Display")); { Fl_Group* o = new Fl_Group(24, 54, 496, 190, _("Colors and cursors")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { colorbox* o = WF_Palette = new colorbox(34, 90, 380, 24, _("aa")); WF_Palette->box(FL_DOWN_BOX); - WF_Palette->color(FL_FOREGROUND_COLOR); - WF_Palette->selection_color(FL_BACKGROUND_COLOR); + WF_Palette->color((Fl_Color)FL_FOREGROUND_COLOR); + WF_Palette->selection_color((Fl_Color)FL_BACKGROUND_COLOR); WF_Palette->labeltype(FL_NORMAL_LABEL); WF_Palette->labelfont(0); WF_Palette->labelsize(12); - WF_Palette->labelcolor(FL_FOREGROUND_COLOR); + WF_Palette->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); WF_Palette->callback((Fl_Callback*)cb_WF_Palette); - WF_Palette->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + WF_Palette->align(FL_ALIGN_TOP_LEFT); WF_Palette->when(FL_WHEN_RELEASE); o->label(progdefaults.PaletteName.c_str()); o->labelsize(FL_NORMAL_SIZE); @@ -4393,7 +4393,7 @@ ab and newline are automatically included.")); } // Fl_Button* btnSavePalette { Fl_Group* o = new Fl_Group(33, 144, 113, 96, _("Bandwidth")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Check_Button* o = btnUseCursorLines = new Fl_Check_Button(61, 164, 56, 20, _("ON")); btnUseCursorLines->tooltip(_("Show cursor with bandwidth lines")); btnUseCursorLines->down_box(FL_DOWN_BOX); @@ -4404,7 +4404,7 @@ ab and newline are automatically included.")); btnCursorBWcolor->tooltip(_("Change color")); btnCursorBWcolor->color((Fl_Color)3); btnCursorBWcolor->callback((Fl_Callback*)cb_btnCursorBWcolor); - btnCursorBWcolor->align(Fl_Align(FL_ALIGN_RIGHT)); + btnCursorBWcolor->align(FL_ALIGN_RIGHT); o->color(fl_rgb_color(progdefaults.cursorLineRGBI.R,progdefaults.cursorLineRGBI.G,progdefaults.cursorLineRGBI.B)); } // Fl_Button* btnCursorBWcolor { Fl_Check_Button* o = btnUseWideCursor = new Fl_Check_Button(61, 210, 62, 20, _("Wide")); @@ -4417,7 +4417,7 @@ ab and newline are automatically included.")); } // Fl_Group* o { Fl_Group* o = new Fl_Group(157, 144, 113, 96, _("Center line")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Check_Button* o = btnUseCursorCenterLine = new Fl_Check_Button(189, 164, 48, 20, _("ON")); btnUseCursorCenterLine->tooltip(_("Show cursor with center line")); btnUseCursorCenterLine->down_box(FL_DOWN_BOX); @@ -4426,9 +4426,9 @@ ab and newline are automatically included.")); } // Fl_Check_Button* btnUseCursorCenterLine { Fl_Button* o = btnCursorCenterLineColor = new Fl_Button(189, 187, 20, 20, _("Color")); btnCursorCenterLineColor->tooltip(_("Change color")); - btnCursorCenterLineColor->color(FL_BACKGROUND2_COLOR); + btnCursorCenterLineColor->color((Fl_Color)FL_BACKGROUND2_COLOR); btnCursorCenterLineColor->callback((Fl_Callback*)cb_btnCursorCenterLineColor); - btnCursorCenterLineColor->align(Fl_Align(FL_ALIGN_RIGHT)); + btnCursorCenterLineColor->align(FL_ALIGN_RIGHT); o->color(fl_rgb_color(progdefaults.cursorCenterRGBI.R,progdefaults.cursorCenterRGBI.G,progdefaults.cursorCenterRGBI.B)); } // Fl_Button* btnCursorCenterLineColor { Fl_Check_Button* o = btnUseWideCenter = new Fl_Check_Button(189, 212, 69, 20, _("Wide")); @@ -4441,7 +4441,7 @@ ab and newline are automatically included.")); } // Fl_Group* o { Fl_Group* o = new Fl_Group(280, 144, 113, 96, _("Signal tracks")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Check_Button* o = btnUseBWTracks = new Fl_Check_Button(308, 163, 56, 20, _("ON")); btnUseBWTracks->tooltip(_("Show bandwidth tracks on waterfall")); btnUseBWTracks->down_box(FL_DOWN_BOX); @@ -4452,7 +4452,7 @@ ab and newline are automatically included.")); btnBwTracksColor->tooltip(_("Change color")); btnBwTracksColor->color((Fl_Color)1); btnBwTracksColor->callback((Fl_Callback*)cb_btnBwTracksColor); - btnBwTracksColor->align(Fl_Align(FL_ALIGN_RIGHT)); + btnBwTracksColor->align(FL_ALIGN_RIGHT); o->color(fl_rgb_color(progdefaults.bwTrackRGBI.R,progdefaults.bwTrackRGBI.G,progdefaults.bwTrackRGBI.B)); } // Fl_Button* btnBwTracksColor { Fl_Check_Button* o = btnUseWideTracks = new Fl_Check_Button(308, 210, 74, 20, _("Wide")); @@ -4465,12 +4465,12 @@ ab and newline are automatically included.")); } // Fl_Group* o { Fl_Group* o = new Fl_Group(400, 144, 113, 96, _("Notch")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Button* o = btnNotchColor = new Fl_Button(428, 186, 20, 20, _("Color")); btnNotchColor->tooltip(_("Change color")); btnNotchColor->color((Fl_Color)1); btnNotchColor->callback((Fl_Callback*)cb_btnNotchColor); - btnNotchColor->align(Fl_Align(FL_ALIGN_RIGHT)); + btnNotchColor->align(FL_ALIGN_RIGHT); o->color(fl_rgb_color(progdefaults.notchRGBI.R,progdefaults.notchRGBI.G,progdefaults.notchRGBI.B)); } // Fl_Button* btnNotchColor o->end(); @@ -4479,7 +4479,7 @@ ab and newline are automatically included.")); } // Fl_Group* o { Fl_Group* o = new Fl_Group(24, 245, 496, 55, _("Frequency scale")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Check_Button* o = chkShowAudioScale = new Fl_Check_Button(34, 268, 241, 20, _("Always show audio frequencies")); chkShowAudioScale->tooltip(_("Audio or RF frequencies on waterfall scale")); chkShowAudioScale->down_box(FL_DOWN_BOX); @@ -4494,7 +4494,7 @@ ab and newline are automatically included.")); } // Fl_Group* o { Fl_Group* o = new Fl_Group(24, 301, 496, 65, _("Transmit signal")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Check_Button* o = btnViewXmtSignal = new Fl_Check_Button(34, 327, 208, 20, _("Monitor transmitted signal")); btnViewXmtSignal->tooltip(_("Show transmit signal on waterfall")); btnViewXmtSignal->down_box(FL_DOWN_BOX); @@ -4505,17 +4505,17 @@ ab and newline are automatically included.")); valTxMonitorLevel->tooltip(_("Set level for good viewing")); valTxMonitorLevel->type(1); valTxMonitorLevel->box(FL_DOWN_BOX); - valTxMonitorLevel->color(FL_BACKGROUND_COLOR); - valTxMonitorLevel->selection_color(FL_BACKGROUND_COLOR); + valTxMonitorLevel->color((Fl_Color)FL_BACKGROUND_COLOR); + valTxMonitorLevel->selection_color((Fl_Color)FL_BACKGROUND_COLOR); valTxMonitorLevel->labeltype(FL_NORMAL_LABEL); valTxMonitorLevel->labelfont(0); valTxMonitorLevel->labelsize(14); - valTxMonitorLevel->labelcolor(FL_FOREGROUND_COLOR); + valTxMonitorLevel->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); valTxMonitorLevel->step(0.05); valTxMonitorLevel->value(0.5); valTxMonitorLevel->textsize(14); valTxMonitorLevel->callback((Fl_Callback*)cb_valTxMonitorLevel); - valTxMonitorLevel->align(Fl_Align(FL_ALIGN_TOP)); + valTxMonitorLevel->align(FL_ALIGN_TOP); valTxMonitorLevel->when(FL_WHEN_CHANGED); o->value(progdefaults.TxMonitorLevel); o->labelsize(FL_NORMAL_SIZE); o->textsize(FL_NORMAL_SIZE); @@ -4532,18 +4532,18 @@ ab and newline are automatically included.")); cntLowFreqCutoff->tooltip(_("Low frequency limit in Hz")); cntLowFreqCutoff->type(1); cntLowFreqCutoff->box(FL_UP_BOX); - cntLowFreqCutoff->color(FL_BACKGROUND_COLOR); - cntLowFreqCutoff->selection_color(FL_INACTIVE_COLOR); + cntLowFreqCutoff->color((Fl_Color)FL_BACKGROUND_COLOR); + cntLowFreqCutoff->selection_color((Fl_Color)FL_INACTIVE_COLOR); cntLowFreqCutoff->labeltype(FL_NORMAL_LABEL); cntLowFreqCutoff->labelfont(0); cntLowFreqCutoff->labelsize(14); - cntLowFreqCutoff->labelcolor(FL_FOREGROUND_COLOR); + cntLowFreqCutoff->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntLowFreqCutoff->minimum(0); cntLowFreqCutoff->maximum(500); cntLowFreqCutoff->step(50); cntLowFreqCutoff->value(300); cntLowFreqCutoff->callback((Fl_Callback*)cb_cntLowFreqCutoff); - cntLowFreqCutoff->align(Fl_Align(FL_ALIGN_RIGHT)); + cntLowFreqCutoff->align(FL_ALIGN_RIGHT); cntLowFreqCutoff->when(FL_WHEN_CHANGED); o->value(progdefaults.LowFreqCutoff); o->labelsize(FL_NORMAL_SIZE); @@ -4553,18 +4553,18 @@ ab and newline are automatically included.")); an merging")); valLatency->type(1); valLatency->box(FL_UP_BOX); - valLatency->color(FL_BACKGROUND_COLOR); - valLatency->selection_color(FL_INACTIVE_COLOR); + valLatency->color((Fl_Color)FL_BACKGROUND_COLOR); + valLatency->selection_color((Fl_Color)FL_INACTIVE_COLOR); valLatency->labeltype(FL_NORMAL_LABEL); valLatency->labelfont(0); valLatency->labelsize(14); - valLatency->labelcolor(FL_FOREGROUND_COLOR); + valLatency->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); valLatency->minimum(1); valLatency->maximum(8); valLatency->step(1); valLatency->value(4); valLatency->callback((Fl_Callback*)cb_valLatency); - valLatency->align(Fl_Align(FL_ALIGN_RIGHT)); + valLatency->align(FL_ALIGN_RIGHT); valLatency->when(FL_WHEN_CHANGED); o->value(progdefaults.latency); o->labelsize(FL_NORMAL_SIZE); @@ -4579,7 +4579,7 @@ an merging")); mnuFFTPrefilter->tooltip(_("Select the type of FFT prefilter")); mnuFFTPrefilter->down_box(FL_BORDER_BOX); mnuFFTPrefilter->callback((Fl_Callback*)cb_mnuFFTPrefilter); - mnuFFTPrefilter->align(Fl_Align(FL_ALIGN_RIGHT)); + mnuFFTPrefilter->align(FL_ALIGN_RIGHT); mnuFFTPrefilter->add(_("Rectangular")); mnuFFTPrefilter->add("Blackman"); mnuFFTPrefilter->add("Hamming"); mnuFFTPrefilter->add("Hanning"); mnuFFTPrefilter->add(_("Triangular")); @@ -4589,18 +4589,18 @@ an merging")); cntrWfwidth->tooltip(_("High frequency limit in Hz")); cntrWfwidth->type(1); cntrWfwidth->box(FL_UP_BOX); - cntrWfwidth->color(FL_BACKGROUND_COLOR); - cntrWfwidth->selection_color(FL_INACTIVE_COLOR); + cntrWfwidth->color((Fl_Color)FL_BACKGROUND_COLOR); + cntrWfwidth->selection_color((Fl_Color)FL_INACTIVE_COLOR); cntrWfwidth->labeltype(FL_NORMAL_LABEL); cntrWfwidth->labelfont(0); cntrWfwidth->labelsize(14); - cntrWfwidth->labelcolor(FL_FOREGROUND_COLOR); + cntrWfwidth->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntrWfwidth->minimum(2000); cntrWfwidth->maximum(4000); cntrWfwidth->step(100); cntrWfwidth->value(3000); cntrWfwidth->callback((Fl_Callback*)cb_cntrWfwidth); - cntrWfwidth->align(Fl_Align(FL_ALIGN_RIGHT)); + cntrWfwidth->align(FL_ALIGN_RIGHT); cntrWfwidth->when(FL_WHEN_CHANGED); o->value(progdefaults.HighFreqCutoff); o->labelsize(FL_NORMAL_SIZE); @@ -4610,23 +4610,23 @@ an merging")); { Fl_Group* o = new Fl_Group(27, 221, 490, 80, _("Changes take effect on next program startup")); o->tooltip(_("Show me more or less waterfall")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE); { Fl_Counter2* o = cntrWfheight = new Fl_Counter2(72, 251, 95, 21, _("Waterfall height in pixels")); cntrWfheight->tooltip(_("CPU usage increases with waterfall height")); cntrWfheight->type(1); cntrWfheight->box(FL_UP_BOX); - cntrWfheight->color(FL_BACKGROUND_COLOR); - cntrWfheight->selection_color(FL_INACTIVE_COLOR); + cntrWfheight->color((Fl_Color)FL_BACKGROUND_COLOR); + cntrWfheight->selection_color((Fl_Color)FL_INACTIVE_COLOR); cntrWfheight->labeltype(FL_NORMAL_LABEL); cntrWfheight->labelfont(0); cntrWfheight->labelsize(14); - cntrWfheight->labelcolor(FL_FOREGROUND_COLOR); + cntrWfheight->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntrWfheight->minimum(100); cntrWfheight->maximum(160); cntrWfheight->step(5); cntrWfheight->value(120); cntrWfheight->callback((Fl_Callback*)cb_cntrWfheight); - cntrWfheight->align(Fl_Align(FL_ALIGN_RIGHT)); + cntrWfheight->align(FL_ALIGN_RIGHT); cntrWfheight->when(FL_WHEN_CHANGED); o->value(progdefaults.wfheight); o->labelsize(FL_NORMAL_SIZE); @@ -4660,14 +4660,14 @@ an merging")); { inpWaterfallClickText = new Fl_Input2(320, 147, 180, 50); inpWaterfallClickText->tooltip(_("The string is replaced with\nthe current modem and frequency")); inpWaterfallClickText->box(FL_DOWN_BOX); - inpWaterfallClickText->color(FL_BACKGROUND2_COLOR); - inpWaterfallClickText->selection_color(FL_SELECTION_COLOR); + inpWaterfallClickText->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpWaterfallClickText->selection_color((Fl_Color)FL_SELECTION_COLOR); inpWaterfallClickText->labeltype(FL_NORMAL_LABEL); inpWaterfallClickText->labelfont(0); inpWaterfallClickText->labelsize(14); - inpWaterfallClickText->labelcolor(FL_FOREGROUND_COLOR); + inpWaterfallClickText->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); inpWaterfallClickText->callback((Fl_Callback*)cb_inpWaterfallClickText); - inpWaterfallClickText->align(Fl_Align(FL_ALIGN_RIGHT)); + inpWaterfallClickText->align(FL_ALIGN_RIGHT); inpWaterfallClickText->when(FL_WHEN_RELEASE); } // Fl_Input2* inpWaterfallClickText o->end(); @@ -4676,7 +4676,7 @@ an merging")); mnuWaterfallWheelAction->tooltip(_("Select how the mouse wheel\nbehaves inside the waterfall")); mnuWaterfallWheelAction->down_box(FL_BORDER_BOX); mnuWaterfallWheelAction->callback((Fl_Callback*)cb_mnuWaterfallWheelAction); - mnuWaterfallWheelAction->align(Fl_Align(FL_ALIGN_RIGHT)); + mnuWaterfallWheelAction->align(FL_ALIGN_RIGHT); } // Fl_Choice* mnuWaterfallWheelAction o->end(); } // Fl_Group* o @@ -4687,47 +4687,47 @@ an merging")); { tabModems = new Fl_Group(-4, 25, 595, 347, _("Modems")); tabModems->hide(); { tabsModems = new Fl_Tabs(-4, 25, 595, 347); - tabsModems->selection_color(FL_LIGHT1); - tabsModems->align(Fl_Align(FL_ALIGN_TOP_RIGHT)); + tabsModems->selection_color((Fl_Color)FL_LIGHT1); + tabsModems->align(FL_ALIGN_TOP_RIGHT); { tabCW = new Fl_Group(0, 50, 540, 320, _("CW")); { tabsCW = new Fl_Tabs(0, 50, 540, 320); - tabsCW->selection_color(FL_LIGHT1); + tabsCW->selection_color((Fl_Color)FL_LIGHT1); { Fl_Group* o = new Fl_Group(0, 75, 540, 295, _("General")); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + o->align(FL_ALIGN_TOP_LEFT); { Fl_Group* o = new Fl_Group(5, 85, 530, 130, _("Receive")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Value_Slider2* o = sldrCWbandwidth = new Fl_Value_Slider2(20, 149, 335, 20, _("Filter bandwidth")); sldrCWbandwidth->tooltip(_("CW dsp filter bandwidth")); sldrCWbandwidth->type(1); sldrCWbandwidth->box(FL_DOWN_BOX); - sldrCWbandwidth->color(FL_BACKGROUND_COLOR); - sldrCWbandwidth->selection_color(FL_BACKGROUND_COLOR); + sldrCWbandwidth->color((Fl_Color)FL_BACKGROUND_COLOR); + sldrCWbandwidth->selection_color((Fl_Color)FL_BACKGROUND_COLOR); sldrCWbandwidth->labeltype(FL_NORMAL_LABEL); sldrCWbandwidth->labelfont(0); sldrCWbandwidth->labelsize(14); - sldrCWbandwidth->labelcolor(FL_FOREGROUND_COLOR); + sldrCWbandwidth->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); sldrCWbandwidth->minimum(10); sldrCWbandwidth->maximum(400); sldrCWbandwidth->step(1); sldrCWbandwidth->value(66); sldrCWbandwidth->textsize(14); sldrCWbandwidth->callback((Fl_Callback*)cb_sldrCWbandwidth); - sldrCWbandwidth->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + sldrCWbandwidth->align(FL_ALIGN_TOP_LEFT); sldrCWbandwidth->when(FL_WHEN_CHANGED); o->value(progdefaults.CWbandwidth); o->labelsize(FL_NORMAL_SIZE); o->textsize(FL_NORMAL_SIZE); } // Fl_Value_Slider2* sldrCWbandwidth { valCWrcvWPM = new Fl_Value_Output(20, 188, 35, 20, _("Rx WPM")); - valCWrcvWPM->color(FL_BACKGROUND2_COLOR); + valCWrcvWPM->color((Fl_Color)FL_BACKGROUND2_COLOR); valCWrcvWPM->callback((Fl_Callback*)cb_valCWrcvWPM); - valCWrcvWPM->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + valCWrcvWPM->align(FL_ALIGN_TOP_LEFT); } // Fl_Value_Output* valCWrcvWPM { prgsCWrcvWPM = new Fl_Progress(56, 188, 300, 20); prgsCWrcvWPM->tooltip(_("Tracked CW speed in WPM")); - prgsCWrcvWPM->color(FL_BACKGROUND_COLOR); - prgsCWrcvWPM->selection_color(FL_SELECTION_COLOR); - prgsCWrcvWPM->align(Fl_Align(FL_ALIGN_CENTER)); + prgsCWrcvWPM->color((Fl_Color)FL_BACKGROUND_COLOR); + prgsCWrcvWPM->selection_color((Fl_Color)FL_SELECTION_COLOR); + prgsCWrcvWPM->align(FL_ALIGN_CENTER); } // Fl_Progress* prgsCWrcvWPM { Fl_Check_Button* o = btnCWuseSOMdecoding = new Fl_Check_Button(33, 108, 125, 20, _("SOM decoding")); btnCWuseSOMdecoding->tooltip(_("Self Organizing Mapping")); @@ -4740,18 +4740,18 @@ an merging")); cntLower->tooltip(_("Detector low threshold")); cntLower->type(1); cntLower->box(FL_UP_BOX); - cntLower->color(FL_BACKGROUND_COLOR); - cntLower->selection_color(FL_INACTIVE_COLOR); + cntLower->color((Fl_Color)FL_BACKGROUND_COLOR); + cntLower->selection_color((Fl_Color)FL_INACTIVE_COLOR); cntLower->labeltype(FL_NORMAL_LABEL); cntLower->labelfont(0); cntLower->labelsize(14); - cntLower->labelcolor(FL_FOREGROUND_COLOR); + cntLower->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntLower->minimum(0.01); cntLower->maximum(0.99); cntLower->step(0.01); cntLower->value(0.45); cntLower->callback((Fl_Callback*)cb_cntLower); - cntLower->align(Fl_Align(FL_ALIGN_TOP)); + cntLower->align(FL_ALIGN_TOP); cntLower->when(FL_WHEN_CHANGED); o->value(progdefaults.CWlower); o->labelsize(FL_NORMAL_SIZE); @@ -4760,18 +4760,18 @@ an merging")); cntUpper->tooltip(_("Detector high threshold")); cntUpper->type(1); cntUpper->box(FL_UP_BOX); - cntUpper->color(FL_BACKGROUND_COLOR); - cntUpper->selection_color(FL_INACTIVE_COLOR); + cntUpper->color((Fl_Color)FL_BACKGROUND_COLOR); + cntUpper->selection_color((Fl_Color)FL_INACTIVE_COLOR); cntUpper->labeltype(FL_NORMAL_LABEL); cntUpper->labelfont(0); cntUpper->labelsize(14); - cntUpper->labelcolor(FL_FOREGROUND_COLOR); + cntUpper->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntUpper->minimum(0.01); cntUpper->maximum(0.99); cntUpper->step(0.01); cntUpper->value(0.55); cntUpper->callback((Fl_Callback*)cb_cntUpper); - cntUpper->align(Fl_Align(FL_ALIGN_TOP)); + cntUpper->align(FL_ALIGN_TOP); cntUpper->when(FL_WHEN_CHANGED); o->value(progdefaults.CWupper); o->labelsize(FL_NORMAL_SIZE); @@ -4801,18 +4801,18 @@ an merging")); cntCWrange->tooltip(_("Range +/- wpm")); cntCWrange->type(1); cntCWrange->box(FL_UP_BOX); - cntCWrange->color(FL_BACKGROUND_COLOR); - cntCWrange->selection_color(FL_INACTIVE_COLOR); + cntCWrange->color((Fl_Color)FL_BACKGROUND_COLOR); + cntCWrange->selection_color((Fl_Color)FL_INACTIVE_COLOR); cntCWrange->labeltype(FL_NORMAL_LABEL); cntCWrange->labelfont(0); cntCWrange->labelsize(14); - cntCWrange->labelcolor(FL_FOREGROUND_COLOR); + cntCWrange->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntCWrange->minimum(5); cntCWrange->maximum(25); cntCWrange->step(1); cntCWrange->value(10); cntCWrange->callback((Fl_Callback*)cb_cntCWrange); - cntCWrange->align(Fl_Align(FL_ALIGN_RIGHT)); + cntCWrange->align(FL_ALIGN_RIGHT); cntCWrange->when(FL_WHEN_CHANGED); o->value(progdefaults.CWrange); o->labelsize(FL_NORMAL_SIZE); @@ -4821,24 +4821,24 @@ an merging")); } // Fl_Group* o { Fl_Group* o = new Fl_Group(5, 215, 530, 150, _("Transmit")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Value_Slider2* o = sldrCWxmtWPM = new Fl_Value_Slider2(20, 240, 440, 20, _("TX WPM")); sldrCWxmtWPM->tooltip(_("My transmit CW WPM")); sldrCWxmtWPM->type(1); sldrCWxmtWPM->box(FL_DOWN_BOX); - sldrCWxmtWPM->color(FL_BACKGROUND_COLOR); - sldrCWxmtWPM->selection_color(FL_BACKGROUND_COLOR); + sldrCWxmtWPM->color((Fl_Color)FL_BACKGROUND_COLOR); + sldrCWxmtWPM->selection_color((Fl_Color)FL_BACKGROUND_COLOR); sldrCWxmtWPM->labeltype(FL_NORMAL_LABEL); sldrCWxmtWPM->labelfont(0); sldrCWxmtWPM->labelsize(14); - sldrCWxmtWPM->labelcolor(FL_FOREGROUND_COLOR); + sldrCWxmtWPM->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); sldrCWxmtWPM->minimum(5); sldrCWxmtWPM->maximum(100); sldrCWxmtWPM->step(1); sldrCWxmtWPM->value(20); sldrCWxmtWPM->textsize(14); sldrCWxmtWPM->callback((Fl_Callback*)cb_sldrCWxmtWPM); - sldrCWxmtWPM->align(Fl_Align(FL_ALIGN_RIGHT)); + sldrCWxmtWPM->align(FL_ALIGN_RIGHT); sldrCWxmtWPM->when(FL_WHEN_CHANGED); o->value(progdefaults.CWspeed); o->labelsize(FL_NORMAL_SIZE); o->textsize(FL_NORMAL_SIZE); @@ -4847,18 +4847,18 @@ an merging")); cntCWdefWPM->tooltip(_("The default CW speed")); cntCWdefWPM->type(1); cntCWdefWPM->box(FL_UP_BOX); - cntCWdefWPM->color(FL_BACKGROUND_COLOR); - cntCWdefWPM->selection_color(FL_INACTIVE_COLOR); + cntCWdefWPM->color((Fl_Color)FL_BACKGROUND_COLOR); + cntCWdefWPM->selection_color((Fl_Color)FL_INACTIVE_COLOR); cntCWdefWPM->labeltype(FL_NORMAL_LABEL); cntCWdefWPM->labelfont(0); cntCWdefWPM->labelsize(14); - cntCWdefWPM->labelcolor(FL_FOREGROUND_COLOR); + cntCWdefWPM->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntCWdefWPM->minimum(5); cntCWdefWPM->maximum(200); cntCWdefWPM->step(1); cntCWdefWPM->value(18); cntCWdefWPM->callback((Fl_Callback*)cb_cntCWdefWPM); - cntCWdefWPM->align(Fl_Align(FL_ALIGN_TOP)); + cntCWdefWPM->align(FL_ALIGN_TOP); cntCWdefWPM->when(FL_WHEN_CHANGED); o->value(progdefaults.defCWspeed); o->labelsize(FL_NORMAL_SIZE); @@ -4871,7 +4871,7 @@ an merging")); cntCWlowerlimit->step(5); cntCWlowerlimit->value(10); cntCWlowerlimit->callback((Fl_Callback*)cb_cntCWlowerlimit); - cntCWlowerlimit->align(Fl_Align(FL_ALIGN_TOP)); + cntCWlowerlimit->align(FL_ALIGN_TOP); o->value(progdefaults.CWlowerlimit); o->labelsize(FL_NORMAL_SIZE); } // Fl_Counter* cntCWlowerlimit @@ -4883,7 +4883,7 @@ an merging")); cntCWupperlimit->step(5); cntCWupperlimit->value(100); cntCWupperlimit->callback((Fl_Callback*)cb_cntCWupperlimit); - cntCWupperlimit->align(Fl_Align(FL_ALIGN_TOP)); + cntCWupperlimit->align(FL_ALIGN_TOP); o->value(progdefaults.CWupperlimit); o->labelsize(FL_NORMAL_SIZE); } // Fl_Counter* cntCWupperlimit @@ -4891,19 +4891,19 @@ an merging")); sldrCWfarnsworth->tooltip(_("My transmit CW WPM")); sldrCWfarnsworth->type(1); sldrCWfarnsworth->box(FL_DOWN_BOX); - sldrCWfarnsworth->color(FL_BACKGROUND_COLOR); - sldrCWfarnsworth->selection_color(FL_BACKGROUND_COLOR); + sldrCWfarnsworth->color((Fl_Color)FL_BACKGROUND_COLOR); + sldrCWfarnsworth->selection_color((Fl_Color)FL_BACKGROUND_COLOR); sldrCWfarnsworth->labeltype(FL_NORMAL_LABEL); sldrCWfarnsworth->labelfont(0); sldrCWfarnsworth->labelsize(14); - sldrCWfarnsworth->labelcolor(FL_FOREGROUND_COLOR); + sldrCWfarnsworth->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); sldrCWfarnsworth->minimum(5); sldrCWfarnsworth->maximum(100); sldrCWfarnsworth->step(1); sldrCWfarnsworth->value(20); sldrCWfarnsworth->textsize(14); sldrCWfarnsworth->callback((Fl_Callback*)cb_sldrCWfarnsworth); - sldrCWfarnsworth->align(Fl_Align(FL_ALIGN_RIGHT)); + sldrCWfarnsworth->align(FL_ALIGN_RIGHT); sldrCWfarnsworth->when(FL_WHEN_CHANGED); o->value(progdefaults.CWfarnsworth); o->labelsize(FL_NORMAL_SIZE); o->textsize(FL_NORMAL_SIZE); @@ -4918,27 +4918,27 @@ an merging")); o->end(); } // Fl_Group* o { Fl_Group* o = new Fl_Group(0, 75, 540, 295, _("Timing and QSK")); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + o->align(FL_ALIGN_TOP_LEFT); o->hide(); { Fl_Group* o = new Fl_Group(5, 85, 530, 120, _("Timing")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Counter2* o = cntCWweight = new Fl_Counter2(15, 114, 65, 20, _("Weight (%)")); cntCWweight->tooltip(_("Dot to dot-space ratio")); cntCWweight->type(1); cntCWweight->box(FL_UP_BOX); - cntCWweight->color(FL_BACKGROUND_COLOR); - cntCWweight->selection_color(FL_INACTIVE_COLOR); + cntCWweight->color((Fl_Color)FL_BACKGROUND_COLOR); + cntCWweight->selection_color((Fl_Color)FL_INACTIVE_COLOR); cntCWweight->labeltype(FL_NORMAL_LABEL); cntCWweight->labelfont(0); cntCWweight->labelsize(14); - cntCWweight->labelcolor(FL_FOREGROUND_COLOR); + cntCWweight->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntCWweight->minimum(20); cntCWweight->maximum(80); cntCWweight->step(1); cntCWweight->value(50); cntCWweight->callback((Fl_Callback*)cb_cntCWweight); - cntCWweight->align(Fl_Align(FL_ALIGN_RIGHT)); + cntCWweight->align(FL_ALIGN_RIGHT); cntCWweight->when(FL_WHEN_CHANGED); o->value(progdefaults.CWweight); o->labelsize(FL_NORMAL_SIZE); @@ -4947,17 +4947,17 @@ an merging")); cntCWdash2dot->tooltip(_("Dash to dot ratio")); cntCWdash2dot->type(1); cntCWdash2dot->box(FL_UP_BOX); - cntCWdash2dot->color(FL_BACKGROUND_COLOR); - cntCWdash2dot->selection_color(FL_INACTIVE_COLOR); + cntCWdash2dot->color((Fl_Color)FL_BACKGROUND_COLOR); + cntCWdash2dot->selection_color((Fl_Color)FL_INACTIVE_COLOR); cntCWdash2dot->labeltype(FL_NORMAL_LABEL); cntCWdash2dot->labelfont(0); cntCWdash2dot->labelsize(14); - cntCWdash2dot->labelcolor(FL_FOREGROUND_COLOR); + cntCWdash2dot->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntCWdash2dot->minimum(2.5); cntCWdash2dot->maximum(4); cntCWdash2dot->value(3); cntCWdash2dot->callback((Fl_Callback*)cb_cntCWdash2dot); - cntCWdash2dot->align(Fl_Align(FL_ALIGN_RIGHT)); + cntCWdash2dot->align(FL_ALIGN_RIGHT); cntCWdash2dot->when(FL_WHEN_CHANGED); o->value(progdefaults.CWdash2dot); o->labelsize(FL_NORMAL_SIZE); @@ -4966,17 +4966,17 @@ an merging")); cntCWrisetime->tooltip(_("Leading and Trailing edge risetimes (msec)")); cntCWrisetime->type(1); cntCWrisetime->box(FL_UP_BOX); - cntCWrisetime->color(FL_BACKGROUND_COLOR); - cntCWrisetime->selection_color(FL_INACTIVE_COLOR); + cntCWrisetime->color((Fl_Color)FL_BACKGROUND_COLOR); + cntCWrisetime->selection_color((Fl_Color)FL_INACTIVE_COLOR); cntCWrisetime->labeltype(FL_NORMAL_LABEL); cntCWrisetime->labelfont(0); cntCWrisetime->labelsize(14); - cntCWrisetime->labelcolor(FL_FOREGROUND_COLOR); + cntCWrisetime->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntCWrisetime->minimum(0); cntCWrisetime->maximum(15); cntCWrisetime->value(4); cntCWrisetime->callback((Fl_Callback*)cb_cntCWrisetime); - cntCWrisetime->align(Fl_Align(FL_ALIGN_RIGHT)); + cntCWrisetime->align(FL_ALIGN_RIGHT); cntCWrisetime->when(FL_WHEN_CHANGED); o->value(progdefaults.CWrisetime); o->labelsize(FL_NORMAL_SIZE); @@ -4985,7 +4985,7 @@ an merging")); mnuQSKshape->tooltip(_("Raised cosine = Hanning")); mnuQSKshape->down_box(FL_BORDER_BOX); mnuQSKshape->callback((Fl_Callback*)cb_mnuQSKshape); - mnuQSKshape->align(Fl_Align(FL_ALIGN_RIGHT)); + mnuQSKshape->align(FL_ALIGN_RIGHT); o->add("Hanning|Blackman"); o->value(progdefaults.QSKshape); o->labelsize(FL_NORMAL_SIZE); @@ -5000,7 +5000,7 @@ an merging")); } // Fl_Group* o { Fl_Group* o = new Fl_Group(5, 217, 530, 118, _("QSK")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Check_Button* o = btnQSK = new Fl_Check_Button(15, 245, 211, 20, _("QSK on right audio channel")); btnQSK->tooltip(_("Generate square wave signal on right channel")); btnQSK->down_box(FL_DOWN_BOX); @@ -5011,17 +5011,17 @@ an merging")); cntPreTiming->tooltip(_("Msec pre-keydown (+ is earlier in time)")); cntPreTiming->type(1); cntPreTiming->box(FL_UP_BOX); - cntPreTiming->color(FL_BACKGROUND_COLOR); - cntPreTiming->selection_color(FL_INACTIVE_COLOR); + cntPreTiming->color((Fl_Color)FL_BACKGROUND_COLOR); + cntPreTiming->selection_color((Fl_Color)FL_INACTIVE_COLOR); cntPreTiming->labeltype(FL_NORMAL_LABEL); cntPreTiming->labelfont(0); cntPreTiming->labelsize(14); - cntPreTiming->labelcolor(FL_FOREGROUND_COLOR); + cntPreTiming->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntPreTiming->minimum(0); cntPreTiming->maximum(20); cntPreTiming->step(0.5); cntPreTiming->callback((Fl_Callback*)cb_cntPreTiming); - cntPreTiming->align(Fl_Align(FL_ALIGN_RIGHT)); + cntPreTiming->align(FL_ALIGN_RIGHT); cntPreTiming->when(FL_WHEN_CHANGED); o->value(progdefaults.CWpre); o->labelsize(FL_NORMAL_SIZE); @@ -5030,17 +5030,17 @@ an merging")); cntPostTiming->tooltip(_("Msec post-keydown (+ is earlier in time)")); cntPostTiming->type(1); cntPostTiming->box(FL_UP_BOX); - cntPostTiming->color(FL_BACKGROUND_COLOR); - cntPostTiming->selection_color(FL_INACTIVE_COLOR); + cntPostTiming->color((Fl_Color)FL_BACKGROUND_COLOR); + cntPostTiming->selection_color((Fl_Color)FL_INACTIVE_COLOR); cntPostTiming->labeltype(FL_NORMAL_LABEL); cntPostTiming->labelfont(0); cntPostTiming->labelsize(14); - cntPostTiming->labelcolor(FL_FOREGROUND_COLOR); + cntPostTiming->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntPostTiming->minimum(-20); cntPostTiming->maximum(20); cntPostTiming->step(0.5); cntPostTiming->callback((Fl_Callback*)cb_cntPostTiming); - cntPostTiming->align(Fl_Align(FL_ALIGN_RIGHT)); + cntPostTiming->align(FL_ALIGN_RIGHT); cntPostTiming->when(FL_WHEN_CHANGED); o->value(progdefaults.CWpre); o->labelsize(FL_NORMAL_SIZE); @@ -5055,7 +5055,7 @@ an merging")); mnuTestChar->tooltip(_("Test character for QSK adjustment")); mnuTestChar->down_box(FL_BORDER_BOX); mnuTestChar->callback((Fl_Callback*)cb_mnuTestChar); - mnuTestChar->align(Fl_Align(FL_ALIGN_RIGHT)); + mnuTestChar->align(FL_ALIGN_RIGHT); o->add(szTestChar); o->value(progdefaults.TestChar); } // Fl_Choice* mnuTestChar @@ -5064,7 +5064,7 @@ an merging")); o->end(); } // Fl_Group* o { Fl_Group* o = new Fl_Group(0, 75, 540, 295, _("Prosigns")); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + o->align(FL_ALIGN_TOP_LEFT); o->hide(); { Fl_Group* o = new Fl_Group(4, 81, 530, 283); o->box(FL_ENGRAVED_FRAME); @@ -5152,14 +5152,14 @@ an merging")); txtSecondary->tooltip(_("Text to send during keyboard idle times")); txtSecondary->type(4); txtSecondary->box(FL_DOWN_BOX); - txtSecondary->color(FL_BACKGROUND2_COLOR); - txtSecondary->selection_color(FL_SELECTION_COLOR); + txtSecondary->color((Fl_Color)FL_BACKGROUND2_COLOR); + txtSecondary->selection_color((Fl_Color)FL_SELECTION_COLOR); txtSecondary->labeltype(FL_NORMAL_LABEL); txtSecondary->labelfont(0); txtSecondary->labelsize(14); - txtSecondary->labelcolor(FL_FOREGROUND_COLOR); + txtSecondary->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); txtSecondary->callback((Fl_Callback*)cb_txtSecondary); - txtSecondary->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + txtSecondary->align(FL_ALIGN_TOP_LEFT); txtSecondary->when(FL_WHEN_CHANGED); txtSecondary->labelsize(FL_NORMAL_SIZE); } // Fl_Input2* txtSecondary @@ -5174,17 +5174,17 @@ an merging")); valDominoEX_BW->tooltip(_("Filter bandwidth relative to signal width")); valDominoEX_BW->type(1); valDominoEX_BW->box(FL_UP_BOX); - valDominoEX_BW->color(FL_BACKGROUND_COLOR); - valDominoEX_BW->selection_color(FL_INACTIVE_COLOR); + valDominoEX_BW->color((Fl_Color)FL_BACKGROUND_COLOR); + valDominoEX_BW->selection_color((Fl_Color)FL_INACTIVE_COLOR); valDominoEX_BW->labeltype(FL_NORMAL_LABEL); valDominoEX_BW->labelfont(0); valDominoEX_BW->labelsize(14); - valDominoEX_BW->labelcolor(FL_FOREGROUND_COLOR); + valDominoEX_BW->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); valDominoEX_BW->minimum(1); valDominoEX_BW->maximum(2); valDominoEX_BW->value(1.5); valDominoEX_BW->callback((Fl_Callback*)cb_valDominoEX_BW); - valDominoEX_BW->align(Fl_Align(FL_ALIGN_RIGHT)); + valDominoEX_BW->align(FL_ALIGN_RIGHT); valDominoEX_BW->when(FL_WHEN_CHANGED); o->value(progdefaults.DOMINOEX_BW); o->labelsize(FL_NORMAL_SIZE); @@ -5199,15 +5199,15 @@ an merging")); valDomCWI->tooltip(_("CWI detection and suppression")); valDomCWI->type(1); valDomCWI->box(FL_DOWN_BOX); - valDomCWI->color(FL_BACKGROUND_COLOR); - valDomCWI->selection_color(FL_BACKGROUND_COLOR); + valDomCWI->color((Fl_Color)FL_BACKGROUND_COLOR); + valDomCWI->selection_color((Fl_Color)FL_BACKGROUND_COLOR); valDomCWI->labeltype(FL_NORMAL_LABEL); valDomCWI->labelfont(0); valDomCWI->labelsize(14); - valDomCWI->labelcolor(FL_FOREGROUND_COLOR); + valDomCWI->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); valDomCWI->textsize(14); valDomCWI->callback((Fl_Callback*)cb_valDomCWI); - valDomCWI->align(Fl_Align(FL_ALIGN_TOP)); + valDomCWI->align(FL_ALIGN_TOP); valDomCWI->when(FL_WHEN_CHANGED); o->value(progdefaults.DomCWI); o->labelsize(FL_NORMAL_SIZE); o->textsize(FL_NORMAL_SIZE); @@ -5215,18 +5215,18 @@ an merging")); { Fl_Counter2* o = valDominoEX_PATHS = new Fl_Counter2(364, 194, 63, 20, _("Paths (hidden)")); valDominoEX_PATHS->type(1); valDominoEX_PATHS->box(FL_UP_BOX); - valDominoEX_PATHS->color(FL_BACKGROUND_COLOR); - valDominoEX_PATHS->selection_color(FL_INACTIVE_COLOR); + valDominoEX_PATHS->color((Fl_Color)FL_BACKGROUND_COLOR); + valDominoEX_PATHS->selection_color((Fl_Color)FL_INACTIVE_COLOR); valDominoEX_PATHS->labeltype(FL_NORMAL_LABEL); valDominoEX_PATHS->labelfont(0); valDominoEX_PATHS->labelsize(14); - valDominoEX_PATHS->labelcolor(FL_FOREGROUND_COLOR); + valDominoEX_PATHS->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); valDominoEX_PATHS->minimum(4); valDominoEX_PATHS->maximum(8); valDominoEX_PATHS->step(1); valDominoEX_PATHS->value(5); valDominoEX_PATHS->callback((Fl_Callback*)cb_valDominoEX_PATHS); - valDominoEX_PATHS->align(Fl_Align(FL_ALIGN_BOTTOM)); + valDominoEX_PATHS->align(FL_ALIGN_BOTTOM); valDominoEX_PATHS->when(FL_WHEN_CHANGED); o->value(progdefaults.DOMINOEX_PATHS); o->labelsize(FL_NORMAL_SIZE); @@ -5244,7 +5244,7 @@ an merging")); selHellFont->tooltip(_("Select TX raster font")); selHellFont->down_box(FL_BORDER_BOX); selHellFont->callback((Fl_Callback*)cb_selHellFont); - selHellFont->align(Fl_Align(FL_ALIGN_RIGHT)); + selHellFont->align(FL_ALIGN_RIGHT); o->add(szFeldFonts); o->value(progdefaults.feldfontnbr); } // Fl_Choice* selHellFont @@ -5257,15 +5257,15 @@ an merging")); { Fl_Spinner2* o = valHellXmtWidth = new Fl_Spinner2(40, 112, 40, 20, _("Transmit width")); valHellXmtWidth->tooltip(_("# of multiple scans / character line")); valHellXmtWidth->box(FL_NO_BOX); - valHellXmtWidth->color(FL_BACKGROUND_COLOR); - valHellXmtWidth->selection_color(FL_BACKGROUND_COLOR); + valHellXmtWidth->color((Fl_Color)FL_BACKGROUND_COLOR); + valHellXmtWidth->selection_color((Fl_Color)FL_BACKGROUND_COLOR); valHellXmtWidth->labeltype(FL_NORMAL_LABEL); valHellXmtWidth->labelfont(0); valHellXmtWidth->labelsize(14); - valHellXmtWidth->labelcolor(FL_FOREGROUND_COLOR); + valHellXmtWidth->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); valHellXmtWidth->maximum(3); valHellXmtWidth->callback((Fl_Callback*)cb_valHellXmtWidth); - valHellXmtWidth->align(Fl_Align(FL_ALIGN_RIGHT)); + valHellXmtWidth->align(FL_ALIGN_RIGHT); valHellXmtWidth->when(FL_WHEN_RELEASE); o->value(progdefaults.HellXmtWidth); o->labelsize(FL_NORMAL_SIZE); @@ -5280,7 +5280,7 @@ an merging")); mnuHellPulse->tooltip(_("Raised cosine pulse shape factor")); mnuHellPulse->down_box(FL_BORDER_BOX); mnuHellPulse->callback((Fl_Callback*)cb_mnuHellPulse); - mnuHellPulse->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + mnuHellPulse->align(FL_ALIGN_TOP_LEFT); o->add(_("Slow (4 msec)")); o->add(_("Fast (2 msec)")); o->value(progdefaults.HellPulseFast); @@ -5289,19 +5289,19 @@ an merging")); sldrHellBW->tooltip(_("Adjust the DSP bandwidth")); sldrHellBW->type(1); sldrHellBW->box(FL_DOWN_BOX); - sldrHellBW->color(FL_BACKGROUND_COLOR); - sldrHellBW->selection_color(FL_BACKGROUND_COLOR); + sldrHellBW->color((Fl_Color)FL_BACKGROUND_COLOR); + sldrHellBW->selection_color((Fl_Color)FL_BACKGROUND_COLOR); sldrHellBW->labeltype(FL_NORMAL_LABEL); sldrHellBW->labelfont(0); sldrHellBW->labelsize(14); - sldrHellBW->labelcolor(FL_FOREGROUND_COLOR); + sldrHellBW->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); sldrHellBW->minimum(10); sldrHellBW->maximum(2400); sldrHellBW->step(5); sldrHellBW->value(400); sldrHellBW->textsize(14); sldrHellBW->callback((Fl_Callback*)cb_sldrHellBW); - sldrHellBW->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + sldrHellBW->align(FL_ALIGN_TOP_LEFT); sldrHellBW->when(FL_WHEN_CHANGED); o->value(progdefaults.HELL_BW); o->labelsize(FL_NORMAL_SIZE); o->textsize(FL_NORMAL_SIZE); @@ -5327,7 +5327,7 @@ an merging")); tabMT63->hide(); { Fl_Group* o = new Fl_Group(18, 73, 490, 115); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Check_Button* o = btnmt63_interleave = new Fl_Check_Button(163, 91, 185, 20, _("64-bit (long) interleave")); btnmt63_interleave->down_box(FL_DOWN_BOX); btnmt63_interleave->value(1); @@ -5365,16 +5365,16 @@ an merging")); } // Fl_Check_Button* btnMT63_upper_lower { Fl_Spinner2* o = MT63_tone_duration = new Fl_Spinner2(163, 253, 40, 20, _("Tone Duration (secs)")); MT63_tone_duration->box(FL_NO_BOX); - MT63_tone_duration->color(FL_BACKGROUND_COLOR); - MT63_tone_duration->selection_color(FL_BACKGROUND_COLOR); + MT63_tone_duration->color((Fl_Color)FL_BACKGROUND_COLOR); + MT63_tone_duration->selection_color((Fl_Color)FL_BACKGROUND_COLOR); MT63_tone_duration->labeltype(FL_NORMAL_LABEL); MT63_tone_duration->labelfont(0); MT63_tone_duration->labelsize(14); - MT63_tone_duration->labelcolor(FL_FOREGROUND_COLOR); + MT63_tone_duration->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); MT63_tone_duration->maximum(10); MT63_tone_duration->value(4); MT63_tone_duration->callback((Fl_Callback*)cb_MT63_tone_duration); - MT63_tone_duration->align(Fl_Align(FL_ALIGN_RIGHT)); + MT63_tone_duration->align(FL_ALIGN_RIGHT); MT63_tone_duration->when(FL_WHEN_RELEASE); o->value(progdefaults.mt63_tone_duration); o->labelsize(FL_NORMAL_SIZE); @@ -5396,7 +5396,7 @@ an merging")); mnuOlivia_Bandwidth->tooltip(_("Select bandwidth")); mnuOlivia_Bandwidth->down_box(FL_BORDER_BOX); mnuOlivia_Bandwidth->callback((Fl_Callback*)cb_mnuOlivia_Bandwidth); - mnuOlivia_Bandwidth->align(Fl_Align(FL_ALIGN_RIGHT)); + mnuOlivia_Bandwidth->align(FL_ALIGN_RIGHT); o->add(szOliviaBandwidth); o->value(2); } // Fl_Choice* mnuOlivia_Bandwidth @@ -5404,29 +5404,29 @@ an merging")); mnuOlivia_Tones->tooltip(_("Select number of tones")); mnuOlivia_Tones->down_box(FL_BORDER_BOX); mnuOlivia_Tones->callback((Fl_Callback*)cb_mnuOlivia_Tones); - mnuOlivia_Tones->align(Fl_Align(FL_ALIGN_RIGHT)); + mnuOlivia_Tones->align(FL_ALIGN_RIGHT); o->add(szOliviaTones); o->value(2); } // Fl_Choice* mnuOlivia_Tones { Fl_Group* o = new Fl_Group(79, 135, 379, 100, _("Receive synchronizer")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Counter2* o = cntOlivia_smargin = new Fl_Counter2(99, 166, 70, 20, _("Tune margin (tone frequency spacing)")); cntOlivia_smargin->tooltip(_("Change ONLY to experiment")); cntOlivia_smargin->type(1); cntOlivia_smargin->box(FL_UP_BOX); - cntOlivia_smargin->color(FL_BACKGROUND_COLOR); - cntOlivia_smargin->selection_color(FL_INACTIVE_COLOR); + cntOlivia_smargin->color((Fl_Color)FL_BACKGROUND_COLOR); + cntOlivia_smargin->selection_color((Fl_Color)FL_INACTIVE_COLOR); cntOlivia_smargin->labeltype(FL_NORMAL_LABEL); cntOlivia_smargin->labelfont(0); cntOlivia_smargin->labelsize(14); - cntOlivia_smargin->labelcolor(FL_FOREGROUND_COLOR); + cntOlivia_smargin->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntOlivia_smargin->minimum(2); cntOlivia_smargin->maximum(128); cntOlivia_smargin->step(1); cntOlivia_smargin->value(8); cntOlivia_smargin->callback((Fl_Callback*)cb_cntOlivia_smargin); - cntOlivia_smargin->align(Fl_Align(FL_ALIGN_RIGHT)); + cntOlivia_smargin->align(FL_ALIGN_RIGHT); cntOlivia_smargin->when(FL_WHEN_CHANGED); o->labelsize(FL_NORMAL_SIZE); } // Fl_Counter2* cntOlivia_smargin @@ -5434,18 +5434,18 @@ an merging")); cntOlivia_sinteg->tooltip(_("Change ONLY to experiment")); cntOlivia_sinteg->type(1); cntOlivia_sinteg->box(FL_UP_BOX); - cntOlivia_sinteg->color(FL_BACKGROUND_COLOR); - cntOlivia_sinteg->selection_color(FL_INACTIVE_COLOR); + cntOlivia_sinteg->color((Fl_Color)FL_BACKGROUND_COLOR); + cntOlivia_sinteg->selection_color((Fl_Color)FL_INACTIVE_COLOR); cntOlivia_sinteg->labeltype(FL_NORMAL_LABEL); cntOlivia_sinteg->labelfont(0); cntOlivia_sinteg->labelsize(14); - cntOlivia_sinteg->labelcolor(FL_FOREGROUND_COLOR); + cntOlivia_sinteg->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntOlivia_sinteg->minimum(2); cntOlivia_sinteg->maximum(128); cntOlivia_sinteg->step(1); cntOlivia_sinteg->value(4); cntOlivia_sinteg->callback((Fl_Callback*)cb_cntOlivia_sinteg); - cntOlivia_sinteg->align(Fl_Align(FL_ALIGN_RIGHT)); + cntOlivia_sinteg->align(FL_ALIGN_RIGHT); cntOlivia_sinteg->when(FL_WHEN_CHANGED); o->labelsize(FL_NORMAL_SIZE); } // Fl_Counter2* cntOlivia_sinteg @@ -5468,7 +5468,7 @@ an merging")); mnuContestia_Bandwidth->tooltip(_("Select bandwidth")); mnuContestia_Bandwidth->down_box(FL_BORDER_BOX); mnuContestia_Bandwidth->callback((Fl_Callback*)cb_mnuContestia_Bandwidth); - mnuContestia_Bandwidth->align(Fl_Align(FL_ALIGN_RIGHT)); + mnuContestia_Bandwidth->align(FL_ALIGN_RIGHT); o->add(szContestiaBandwidth); o->value(2); } // Fl_Choice* mnuContestia_Bandwidth @@ -5476,29 +5476,29 @@ an merging")); mnuContestia_Tones->tooltip(_("Select number of tones")); mnuContestia_Tones->down_box(FL_BORDER_BOX); mnuContestia_Tones->callback((Fl_Callback*)cb_mnuContestia_Tones); - mnuContestia_Tones->align(Fl_Align(FL_ALIGN_RIGHT)); + mnuContestia_Tones->align(FL_ALIGN_RIGHT); o->add(szContestiaTones); o->value(2); } // Fl_Choice* mnuContestia_Tones { Fl_Group* o = new Fl_Group(79, 139, 379, 100, _("Receive synchronizer")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Counter2* o = cntContestia_smargin = new Fl_Counter2(99, 170, 70, 20, _("Tune margin (tone frequency spacing)")); cntContestia_smargin->tooltip(_("Change ONLY to experiment")); cntContestia_smargin->type(1); cntContestia_smargin->box(FL_UP_BOX); - cntContestia_smargin->color(FL_BACKGROUND_COLOR); - cntContestia_smargin->selection_color(FL_INACTIVE_COLOR); + cntContestia_smargin->color((Fl_Color)FL_BACKGROUND_COLOR); + cntContestia_smargin->selection_color((Fl_Color)FL_INACTIVE_COLOR); cntContestia_smargin->labeltype(FL_NORMAL_LABEL); cntContestia_smargin->labelfont(0); cntContestia_smargin->labelsize(14); - cntContestia_smargin->labelcolor(FL_FOREGROUND_COLOR); + cntContestia_smargin->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntContestia_smargin->minimum(2); cntContestia_smargin->maximum(128); cntContestia_smargin->step(1); cntContestia_smargin->value(8); cntContestia_smargin->callback((Fl_Callback*)cb_cntContestia_smargin); - cntContestia_smargin->align(Fl_Align(FL_ALIGN_RIGHT)); + cntContestia_smargin->align(FL_ALIGN_RIGHT); cntContestia_smargin->when(FL_WHEN_CHANGED); o->labelsize(FL_NORMAL_SIZE); } // Fl_Counter2* cntContestia_smargin @@ -5506,18 +5506,18 @@ an merging")); cntContestia_sinteg->tooltip(_("Change ONLY to experiment")); cntContestia_sinteg->type(1); cntContestia_sinteg->box(FL_UP_BOX); - cntContestia_sinteg->color(FL_BACKGROUND_COLOR); - cntContestia_sinteg->selection_color(FL_INACTIVE_COLOR); + cntContestia_sinteg->color((Fl_Color)FL_BACKGROUND_COLOR); + cntContestia_sinteg->selection_color((Fl_Color)FL_INACTIVE_COLOR); cntContestia_sinteg->labeltype(FL_NORMAL_LABEL); cntContestia_sinteg->labelfont(0); cntContestia_sinteg->labelsize(14); - cntContestia_sinteg->labelcolor(FL_FOREGROUND_COLOR); + cntContestia_sinteg->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntContestia_sinteg->minimum(2); cntContestia_sinteg->maximum(128); cntContestia_sinteg->step(1); cntContestia_sinteg->value(4); cntContestia_sinteg->callback((Fl_Callback*)cb_cntContestia_sinteg); - cntContestia_sinteg->align(Fl_Align(FL_ALIGN_RIGHT)); + cntContestia_sinteg->align(FL_ALIGN_RIGHT); cntContestia_sinteg->when(FL_WHEN_CHANGED); o->labelsize(FL_NORMAL_SIZE); } // Fl_Counter2* cntContestia_sinteg @@ -5536,28 +5536,28 @@ an merging")); { tabPSK = new Fl_Group(-4, 50, 544, 322, _("PSK")); tabPSK->hide(); { tabsPSK = new Fl_Tabs(-4, 50, 544, 322); - tabsPSK->selection_color(FL_LIGHT1); + tabsPSK->selection_color((Fl_Color)FL_LIGHT1); { Fl_Group* o = new Fl_Group(0, 75, 540, 295, _("General")); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + o->align(FL_ALIGN_TOP_LEFT); { Fl_Group* o = new Fl_Group(21, 93, 490, 98, _("AFC behavior")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Counter2* o = cntSearchRange = new Fl_Counter2(31, 125, 75, 20, _("Acquisition search range (Hz)")); cntSearchRange->tooltip(_("Capture signals within this frequency range")); cntSearchRange->type(1); cntSearchRange->box(FL_UP_BOX); - cntSearchRange->color(FL_BACKGROUND_COLOR); - cntSearchRange->selection_color(FL_INACTIVE_COLOR); + cntSearchRange->color((Fl_Color)FL_BACKGROUND_COLOR); + cntSearchRange->selection_color((Fl_Color)FL_INACTIVE_COLOR); cntSearchRange->labeltype(FL_NORMAL_LABEL); cntSearchRange->labelfont(0); cntSearchRange->labelsize(14); - cntSearchRange->labelcolor(FL_FOREGROUND_COLOR); + cntSearchRange->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntSearchRange->minimum(10); cntSearchRange->maximum(500); cntSearchRange->step(10); cntSearchRange->value(200); cntSearchRange->callback((Fl_Callback*)cb_cntSearchRange); - cntSearchRange->align(Fl_Align(FL_ALIGN_RIGHT)); + cntSearchRange->align(FL_ALIGN_RIGHT); cntSearchRange->when(FL_WHEN_CHANGED); o->value(progdefaults.SearchRange); o->labelsize(FL_NORMAL_SIZE); @@ -5566,18 +5566,18 @@ an merging")); cntACQsn->tooltip(_("Capture signals over this threshold")); cntACQsn->type(1); cntACQsn->box(FL_UP_BOX); - cntACQsn->color(FL_BACKGROUND_COLOR); - cntACQsn->selection_color(FL_INACTIVE_COLOR); + cntACQsn->color((Fl_Color)FL_BACKGROUND_COLOR); + cntACQsn->selection_color((Fl_Color)FL_INACTIVE_COLOR); cntACQsn->labeltype(FL_NORMAL_LABEL); cntACQsn->labelfont(0); cntACQsn->labelsize(14); - cntACQsn->labelcolor(FL_FOREGROUND_COLOR); + cntACQsn->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntACQsn->minimum(3); cntACQsn->maximum(20); cntACQsn->step(1); cntACQsn->value(6); cntACQsn->callback((Fl_Callback*)cb_cntACQsn); - cntACQsn->align(Fl_Align(FL_ALIGN_RIGHT)); + cntACQsn->align(FL_ALIGN_RIGHT); cntACQsn->when(FL_WHEN_CHANGED); o->value(progdefaults.ACQsn); o->labelsize(FL_NORMAL_SIZE); @@ -5586,12 +5586,12 @@ an merging")); } // Fl_Group* o { Fl_Group* o = new Fl_Group(21, 191, 490, 65, _("S/N and IMD behavior")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Choice* o = mnuPSKStatusTimeout = new Fl_Choice(31, 222, 80, 20, _("after")); mnuPSKStatusTimeout->tooltip(_("Behavior of s/n imd")); mnuPSKStatusTimeout->down_box(FL_BORDER_BOX); mnuPSKStatusTimeout->callback((Fl_Callback*)cb_mnuPSKStatusTimeout); - mnuPSKStatusTimeout->align(Fl_Align(FL_ALIGN_RIGHT)); + mnuPSKStatusTimeout->align(FL_ALIGN_RIGHT); o->add(_("Clear")); o->add(_("Dim")); o->value(progdefaults.StatusDim); } // Fl_Choice* mnuPSKStatusTimeout @@ -5599,17 +5599,17 @@ an merging")); o->tooltip(_("Will occur after this time in seconds")); o->type(1); o->box(FL_UP_BOX); - o->color(FL_BACKGROUND_COLOR); - o->selection_color(FL_INACTIVE_COLOR); + o->color((Fl_Color)FL_BACKGROUND_COLOR); + o->selection_color((Fl_Color)FL_INACTIVE_COLOR); o->labeltype(FL_NORMAL_LABEL); o->labelfont(0); o->labelsize(14); - o->labelcolor(FL_FOREGROUND_COLOR); + o->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); o->minimum(0); o->maximum(30); o->step(1); o->callback((Fl_Callback*)cb_seconds); - o->align(Fl_Align(FL_ALIGN_RIGHT)); + o->align(FL_ALIGN_RIGHT); o->when(FL_WHEN_CHANGED); o->value(progdefaults.StatusTimeout); o->labelsize(FL_NORMAL_SIZE); @@ -5618,14 +5618,14 @@ an merging")); } // Fl_Group* o { Fl_Group* o = new Fl_Group(22, 258, 490, 98, _("Multi-Channel Signal Processing")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Check_Button* o = btnEnablePSKbrowsing = new Fl_Check_Button(32, 315, 180, 20, _("Multi-channel detector")); btnEnablePSKbrowsing->down_box(FL_DOWN_BOX); btnEnablePSKbrowsing->callback((Fl_Callback*)cb_btnEnablePSKbrowsing); o->value(progdefaults.pskbrowser_on); } // Fl_Check_Button* btnEnablePSKbrowsing { Fl_Box* o = new Fl_Box(32, 285, 440, 20, _("Disable on very slow CPUs of if signal browser is not used")); - o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); } // Fl_Box* o o->end(); } // Fl_Group* o @@ -5643,7 +5643,7 @@ an merging")); selShift->tooltip(_("Select carrier shift")); selShift->down_box(FL_BORDER_BOX); selShift->callback((Fl_Callback*)cb_selShift); - selShift->align(Fl_Align(FL_ALIGN_RIGHT)); + selShift->align(FL_ALIGN_RIGHT); selShift->when(FL_WHEN_CHANGED); o->add(szShifts); } // Fl_Choice* selShift @@ -5651,7 +5651,7 @@ an merging")); selBaud->tooltip(_("Select carrier baudrate")); selBaud->down_box(FL_BORDER_BOX); selBaud->callback((Fl_Callback*)cb_selBaud); - selBaud->align(Fl_Align(FL_ALIGN_RIGHT)); + selBaud->align(FL_ALIGN_RIGHT); selBaud->when(FL_WHEN_CHANGED); o->add(szBauds); } // Fl_Choice* selBaud @@ -5659,7 +5659,7 @@ an merging")); selBits->tooltip(_("Select # bits / char")); selBits->down_box(FL_BORDER_BOX); selBits->callback((Fl_Callback*)cb_selBits); - selBits->align(Fl_Align(FL_ALIGN_RIGHT)); + selBits->align(FL_ALIGN_RIGHT); selBits->when(FL_WHEN_CHANGED); o->add(szSelBits); } // Fl_Choice* selBits @@ -5667,7 +5667,7 @@ an merging")); selParity->tooltip(_("Select parity")); selParity->down_box(FL_BORDER_BOX); selParity->callback((Fl_Callback*)cb_selParity); - selParity->align(Fl_Align(FL_ALIGN_RIGHT)); + selParity->align(FL_ALIGN_RIGHT); selParity->when(FL_WHEN_CHANGED); o->add(szParity); } // Fl_Choice* selParity @@ -5675,7 +5675,7 @@ an merging")); selStopBits->tooltip(_("Select # stop bits")); selStopBits->down_box(FL_BORDER_BOX); selStopBits->callback((Fl_Callback*)cb_selStopBits); - selStopBits->align(Fl_Align(FL_ALIGN_RIGHT)); + selStopBits->align(FL_ALIGN_RIGHT); selStopBits->when(FL_WHEN_CHANGED); o->add(szStopBits); } // Fl_Choice* selStopBits @@ -5698,29 +5698,29 @@ an merging")); cntrAUTOCRLF->tooltip(_("Set page width")); cntrAUTOCRLF->type(1); cntrAUTOCRLF->box(FL_UP_BOX); - cntrAUTOCRLF->color(FL_BACKGROUND_COLOR); - cntrAUTOCRLF->selection_color(FL_INACTIVE_COLOR); + cntrAUTOCRLF->color((Fl_Color)FL_BACKGROUND_COLOR); + cntrAUTOCRLF->selection_color((Fl_Color)FL_INACTIVE_COLOR); cntrAUTOCRLF->labeltype(FL_NORMAL_LABEL); cntrAUTOCRLF->labelfont(0); cntrAUTOCRLF->labelsize(14); - cntrAUTOCRLF->labelcolor(FL_FOREGROUND_COLOR); + cntrAUTOCRLF->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntrAUTOCRLF->minimum(68); cntrAUTOCRLF->maximum(80); cntrAUTOCRLF->step(1); cntrAUTOCRLF->value(72); cntrAUTOCRLF->callback((Fl_Callback*)cb_cntrAUTOCRLF); - cntrAUTOCRLF->align(Fl_Align(FL_ALIGN_RIGHT)); + cntrAUTOCRLF->align(FL_ALIGN_RIGHT); cntrAUTOCRLF->when(FL_WHEN_CHANGED); o->labelsize(FL_NORMAL_SIZE); } // Fl_Counter2* cntrAUTOCRLF { Fl_Box* o = new Fl_Box(290, 110, 60, 20, _("after:")); - o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); } // Fl_Box* o o->end(); } // Fl_Group* o { Fl_Group* o = new Fl_Group(280, 138, 231, 52, _("Unshift On Space")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Check_Button* o = chkUOSrx = new Fl_Check_Button(329, 156, 63, 26, _("RX")); chkUOSrx->tooltip(_("Revert to Unsifted char\'s on a space")); chkUOSrx->down_box(FL_DOWN_BOX); @@ -5737,7 +5737,7 @@ an merging")); } // Fl_Group* o { Fl_Group* o = new Fl_Group(280, 190, 231, 52, _("Log RTTY frequency")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Check_Button* o = chk_useMARKfreq = new Fl_Check_Button(290, 208, 63, 26, _("Use MARK freq\'")); chk_useMARKfreq->tooltip(_("Revert to Unsifted char\'s on a space")); chk_useMARKfreq->down_box(FL_DOWN_BOX); @@ -5748,7 +5748,7 @@ an merging")); btnRTTY_mark_color->tooltip(_("Change color")); btnRTTY_mark_color->color((Fl_Color)2); btnRTTY_mark_color->callback((Fl_Callback*)cb_btnRTTY_mark_color); - btnRTTY_mark_color->align(Fl_Align(FL_ALIGN_RIGHT)); + btnRTTY_mark_color->align(FL_ALIGN_RIGHT); o->color(fl_rgb_color(progdefaults.rttymarkRGBI.R,progdefaults.rttymarkRGBI.G,progdefaults.rttymarkRGBI.B)); } // Fl_Button* btnRTTY_mark_color o->end(); @@ -5769,7 +5769,7 @@ an merging")); mnuRTTYAFCSpeed->tooltip(_("AFC tracking speed")); mnuRTTYAFCSpeed->down_box(FL_BORDER_BOX); mnuRTTYAFCSpeed->callback((Fl_Callback*)cb_mnuRTTYAFCSpeed); - mnuRTTYAFCSpeed->align(Fl_Align(FL_ALIGN_RIGHT)); + mnuRTTYAFCSpeed->align(FL_ALIGN_RIGHT); o->add("Slow"); o->add("Normal"); o->add("Fast"); o->value(progdefaults.rtty_afcspeed); } // Fl_Choice* mnuRTTYAFCSpeed @@ -5783,19 +5783,19 @@ an merging")); sldrRTTYbandwidth->tooltip(_("Adjust the DSP bandwidth")); sldrRTTYbandwidth->type(1); sldrRTTYbandwidth->box(FL_DOWN_BOX); - sldrRTTYbandwidth->color(FL_BACKGROUND_COLOR); - sldrRTTYbandwidth->selection_color(FL_BACKGROUND_COLOR); + sldrRTTYbandwidth->color((Fl_Color)FL_BACKGROUND_COLOR); + sldrRTTYbandwidth->selection_color((Fl_Color)FL_BACKGROUND_COLOR); sldrRTTYbandwidth->labeltype(FL_NORMAL_LABEL); sldrRTTYbandwidth->labelfont(0); sldrRTTYbandwidth->labelsize(14); - sldrRTTYbandwidth->labelcolor(FL_FOREGROUND_COLOR); + sldrRTTYbandwidth->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); sldrRTTYbandwidth->minimum(5); sldrRTTYbandwidth->maximum(200); sldrRTTYbandwidth->step(1); sldrRTTYbandwidth->value(25); sldrRTTYbandwidth->textsize(14); sldrRTTYbandwidth->callback((Fl_Callback*)cb_sldrRTTYbandwidth); - sldrRTTYbandwidth->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + sldrRTTYbandwidth->align(FL_ALIGN_TOP_LEFT); sldrRTTYbandwidth->when(FL_WHEN_CHANGED); o->value(progdefaults.RTTY_BW); o->labelsize(FL_NORMAL_SIZE); o->textsize(FL_NORMAL_SIZE); @@ -5803,18 +5803,18 @@ an merging")); { Fl_Counter2* o = selCustomShift = new Fl_Counter2(36, 103, 100, 20, _("Custom shift")); selCustomShift->tooltip(_("Input carrier shift")); selCustomShift->box(FL_UP_BOX); - selCustomShift->color(FL_BACKGROUND_COLOR); - selCustomShift->selection_color(FL_INACTIVE_COLOR); + selCustomShift->color((Fl_Color)FL_BACKGROUND_COLOR); + selCustomShift->selection_color((Fl_Color)FL_INACTIVE_COLOR); selCustomShift->labeltype(FL_NORMAL_LABEL); selCustomShift->labelfont(0); selCustomShift->labelsize(14); - selCustomShift->labelcolor(FL_FOREGROUND_COLOR); + selCustomShift->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); selCustomShift->minimum(10); selCustomShift->maximum(1000); selCustomShift->step(1); selCustomShift->value(450); selCustomShift->callback((Fl_Callback*)cb_selCustomShift); - selCustomShift->align(Fl_Align(FL_ALIGN_RIGHT)); + selCustomShift->align(FL_ALIGN_RIGHT); selCustomShift->when(FL_WHEN_CHANGED); o->lstep(10.0); o->labelsize(FL_NORMAL_SIZE); @@ -5831,14 +5831,14 @@ an merging")); txtTHORSecondary->tooltip(_("Text to send during keyboard idle times")); txtTHORSecondary->type(4); txtTHORSecondary->box(FL_DOWN_BOX); - txtTHORSecondary->color(FL_BACKGROUND2_COLOR); - txtTHORSecondary->selection_color(FL_SELECTION_COLOR); + txtTHORSecondary->color((Fl_Color)FL_BACKGROUND2_COLOR); + txtTHORSecondary->selection_color((Fl_Color)FL_SELECTION_COLOR); txtTHORSecondary->labeltype(FL_NORMAL_LABEL); txtTHORSecondary->labelfont(0); txtTHORSecondary->labelsize(14); - txtTHORSecondary->labelcolor(FL_FOREGROUND_COLOR); + txtTHORSecondary->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); txtTHORSecondary->callback((Fl_Callback*)cb_txtTHORSecondary); - txtTHORSecondary->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + txtTHORSecondary->align(FL_ALIGN_TOP_LEFT); txtTHORSecondary->when(FL_WHEN_CHANGED); txtTHORSecondary->labelsize(FL_NORMAL_SIZE); } // Fl_Input2* txtTHORSecondary @@ -5853,17 +5853,17 @@ an merging")); valTHOR_BW->tooltip(_("Filter bandwidth relative to signal width")); valTHOR_BW->type(1); valTHOR_BW->box(FL_UP_BOX); - valTHOR_BW->color(FL_BACKGROUND_COLOR); - valTHOR_BW->selection_color(FL_INACTIVE_COLOR); + valTHOR_BW->color((Fl_Color)FL_BACKGROUND_COLOR); + valTHOR_BW->selection_color((Fl_Color)FL_INACTIVE_COLOR); valTHOR_BW->labeltype(FL_NORMAL_LABEL); valTHOR_BW->labelfont(0); valTHOR_BW->labelsize(14); - valTHOR_BW->labelcolor(FL_FOREGROUND_COLOR); + valTHOR_BW->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); valTHOR_BW->minimum(1); valTHOR_BW->maximum(2); valTHOR_BW->value(1.5); valTHOR_BW->callback((Fl_Callback*)cb_valTHOR_BW); - valTHOR_BW->align(Fl_Align(FL_ALIGN_RIGHT)); + valTHOR_BW->align(FL_ALIGN_RIGHT); valTHOR_BW->when(FL_WHEN_CHANGED); o->value(progdefaults.THOR_BW); o->labelsize(FL_NORMAL_SIZE); @@ -5872,15 +5872,15 @@ an merging")); valThorCWI->tooltip(_("CWI detection and suppression")); valThorCWI->type(1); valThorCWI->box(FL_DOWN_BOX); - valThorCWI->color(FL_BACKGROUND_COLOR); - valThorCWI->selection_color(FL_BACKGROUND_COLOR); + valThorCWI->color((Fl_Color)FL_BACKGROUND_COLOR); + valThorCWI->selection_color((Fl_Color)FL_BACKGROUND_COLOR); valThorCWI->labeltype(FL_NORMAL_LABEL); valThorCWI->labelfont(0); valThorCWI->labelsize(14); - valThorCWI->labelcolor(FL_FOREGROUND_COLOR); + valThorCWI->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); valThorCWI->textsize(14); valThorCWI->callback((Fl_Callback*)cb_valThorCWI); - valThorCWI->align(Fl_Align(FL_ALIGN_TOP)); + valThorCWI->align(FL_ALIGN_TOP); valThorCWI->when(FL_WHEN_CHANGED); o->value(progdefaults.ThorCWI); o->labelsize(FL_NORMAL_SIZE); o->textsize(FL_NORMAL_SIZE); @@ -5888,18 +5888,18 @@ an merging")); { Fl_Counter2* o = valTHOR_PATHS = new Fl_Counter2(374, 211, 75, 21, _("Paths (hidden)")); valTHOR_PATHS->type(1); valTHOR_PATHS->box(FL_UP_BOX); - valTHOR_PATHS->color(FL_BACKGROUND_COLOR); - valTHOR_PATHS->selection_color(FL_INACTIVE_COLOR); + valTHOR_PATHS->color((Fl_Color)FL_BACKGROUND_COLOR); + valTHOR_PATHS->selection_color((Fl_Color)FL_INACTIVE_COLOR); valTHOR_PATHS->labeltype(FL_NORMAL_LABEL); valTHOR_PATHS->labelfont(0); valTHOR_PATHS->labelsize(14); - valTHOR_PATHS->labelcolor(FL_FOREGROUND_COLOR); + valTHOR_PATHS->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); valTHOR_PATHS->minimum(4); valTHOR_PATHS->maximum(8); valTHOR_PATHS->step(1); valTHOR_PATHS->value(5); valTHOR_PATHS->callback((Fl_Callback*)cb_valTHOR_PATHS); - valTHOR_PATHS->align(Fl_Align(FL_ALIGN_TOP)); + valTHOR_PATHS->align(FL_ALIGN_TOP); valTHOR_PATHS->when(FL_WHEN_CHANGED); o->value(progdefaults.THOR_PATHS); o->labelsize(FL_NORMAL_SIZE); @@ -5920,9 +5920,9 @@ an merging")); } // Fl_Check_Button* btnNvtxAdifLog { Fl_Output* o = txtNvtxCatalog = new Fl_Output(81, 145, 270, 22, _("Navtex stations file:")); txtNvtxCatalog->tooltip(_("Use Open to select descriptor file")); - txtNvtxCatalog->color(FL_LIGHT2); + txtNvtxCatalog->color((Fl_Color)FL_LIGHT2); txtNvtxCatalog->callback((Fl_Callback*)cb_txtNvtxCatalog); - txtNvtxCatalog->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + txtNvtxCatalog->align(FL_ALIGN_TOP_LEFT); o->value(fl_filename_name(progdefaults.NVTX_Catalog.c_str())); } // Fl_Output* txtNvtxCatalog { btnSelectNvtxCatalog = new Fl_Button(386, 147, 80, 20, _("Directory...")); @@ -5951,14 +5951,14 @@ an merging")); btnWefaxShift->tooltip(_("Default 800 Hz. Deutsche Wetterdienst 850Hz")); btnWefaxShift->type(2); btnWefaxShift->box(FL_DOWN_BOX); - btnWefaxShift->color(FL_BACKGROUND2_COLOR); - btnWefaxShift->selection_color(FL_SELECTION_COLOR); + btnWefaxShift->color((Fl_Color)FL_BACKGROUND2_COLOR); + btnWefaxShift->selection_color((Fl_Color)FL_SELECTION_COLOR); btnWefaxShift->labeltype(FL_NORMAL_LABEL); btnWefaxShift->labelfont(0); btnWefaxShift->labelsize(14); - btnWefaxShift->labelcolor(FL_FOREGROUND_COLOR); + btnWefaxShift->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); btnWefaxShift->callback((Fl_Callback*)cb_btnWefaxShift); - btnWefaxShift->align(Fl_Align(FL_ALIGN_RIGHT)); + btnWefaxShift->align(FL_ALIGN_RIGHT); btnWefaxShift->when(FL_WHEN_RELEASE); o->value(progdefaults.WEFAX_Shift); } // Fl_Value_Input2* btnWefaxShift @@ -5966,20 +5966,20 @@ an merging")); btnWefaxMaxRows->tooltip(_("Maximum row number for a received fax image.")); btnWefaxMaxRows->type(2); btnWefaxMaxRows->box(FL_DOWN_BOX); - btnWefaxMaxRows->color(FL_BACKGROUND2_COLOR); - btnWefaxMaxRows->selection_color(FL_SELECTION_COLOR); + btnWefaxMaxRows->color((Fl_Color)FL_BACKGROUND2_COLOR); + btnWefaxMaxRows->selection_color((Fl_Color)FL_SELECTION_COLOR); btnWefaxMaxRows->labeltype(FL_NORMAL_LABEL); btnWefaxMaxRows->labelfont(0); btnWefaxMaxRows->labelsize(14); - btnWefaxMaxRows->labelcolor(FL_FOREGROUND_COLOR); + btnWefaxMaxRows->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); btnWefaxMaxRows->callback((Fl_Callback*)cb_btnWefaxMaxRows); - btnWefaxMaxRows->align(Fl_Align(FL_ALIGN_RIGHT)); + btnWefaxMaxRows->align(FL_ALIGN_RIGHT); btnWefaxMaxRows->when(FL_WHEN_RELEASE); o->value(progdefaults.WEFAX_MaxRows); } // Fl_Value_Input2* btnWefaxMaxRows { Fl_Input* o = btnWefaxSaveDir = new Fl_Input(94, 267, 310, 20, _("Fax images destination directory")); btnWefaxSaveDir->callback((Fl_Callback*)cb_btnWefaxSaveDir); - btnWefaxSaveDir->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + btnWefaxSaveDir->align(FL_ALIGN_TOP_LEFT); o->value(progdefaults.wefax_save_dir.c_str()); } // Fl_Input* btnWefaxSaveDir { btnSelectFaxDestDir = new Fl_Button(424, 267, 80, 20, _("Directory...")); @@ -6009,7 +6009,7 @@ an merging")); tabRig->tooltip(_("Transceiver control")); tabRig->hide(); { tabsRig = new Fl_Tabs(0, 23, 540, 345); - tabsRig->selection_color(FL_LIGHT1); + tabsRig->selection_color((Fl_Color)FL_LIGHT1); { Fl_Group* o = new Fl_Group(0, 48, 540, 320, _("Hardware PTT")); { Fl_Group* o = new Fl_Group(26, 57, 490, 38); o->box(FL_ENGRAVED_FRAME); @@ -6023,7 +6023,7 @@ an merging")); } // Fl_Group* o { grpHWPTT = new Fl_Group(26, 97, 490, 171, _("h/w ptt device-pin")); grpHWPTT->box(FL_ENGRAVED_FRAME); - grpHWPTT->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + grpHWPTT->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { inpTTYdev = new Fl_Input_Choice(99, 151, 160, 22, _("Device:")); inpTTYdev->tooltip(_("Select serial port")); inpTTYdev->callback((Fl_Callback*)cb_inpTTYdev); @@ -6071,14 +6071,14 @@ an merging")); } // Fl_Group* grpHWPTT { grpPTTdelays = new Fl_Group(26, 270, 490, 91, _("PTT delays valid for all CAT/PTT types")); grpPTTdelays->box(FL_ENGRAVED_FRAME); - grpPTTdelays->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + grpPTTdelays->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Counter* o = cntPTT_on_delay = new Fl_Counter(45, 297, 100, 21, _("Start of transmit PTT delay")); cntPTT_on_delay->tooltip(_("Delay NN msec before starting audio")); cntPTT_on_delay->minimum(0); cntPTT_on_delay->maximum(500); cntPTT_on_delay->step(1); cntPTT_on_delay->callback((Fl_Callback*)cb_cntPTT_on_delay); - cntPTT_on_delay->align(Fl_Align(FL_ALIGN_RIGHT)); + cntPTT_on_delay->align(FL_ALIGN_RIGHT); o->value(progdefaults.PTT_on_delay); o->lstep(10); } // Fl_Counter* cntPTT_on_delay @@ -6088,7 +6088,7 @@ an merging")); cntPTT_off_delay->maximum(500); cntPTT_off_delay->step(1); cntPTT_off_delay->callback((Fl_Callback*)cb_cntPTT_off_delay); - cntPTT_off_delay->align(Fl_Align(FL_ALIGN_RIGHT)); + cntPTT_off_delay->align(FL_ALIGN_RIGHT); o->value(progdefaults.PTT_off_delay); o->lstep(10); } // Fl_Counter* cntPTT_off_delay @@ -6108,8 +6108,8 @@ an merging")); grpRigCAT->box(FL_ENGRAVED_FRAME); { Fl_Output* o = txtXmlRigFilename = new Fl_Output(35, 107, 130, 22, _("Rig description file:")); txtXmlRigFilename->tooltip(_("Use Open to select descriptor file")); - txtXmlRigFilename->color(FL_LIGHT2); - txtXmlRigFilename->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + txtXmlRigFilename->color((Fl_Color)FL_LIGHT2); + txtXmlRigFilename->align(FL_ALIGN_TOP_LEFT); o->value(fl_filename_name(progdefaults.XmlRigFilename.c_str())); } // Fl_Output* txtXmlRigFilename { btnSelectRigXmlFile = new Fl_Button(168, 107, 60, 22, _("Open...")); @@ -6124,16 +6124,16 @@ an merging")); { Fl_Value_Input2* o = cntRigCatRetries = new Fl_Value_Input2(50, 150, 60, 22, _("Retries")); cntRigCatRetries->tooltip(_("# retries before giving up")); cntRigCatRetries->box(FL_DOWN_BOX); - cntRigCatRetries->color(FL_BACKGROUND2_COLOR); - cntRigCatRetries->selection_color(FL_SELECTION_COLOR); + cntRigCatRetries->color((Fl_Color)FL_BACKGROUND2_COLOR); + cntRigCatRetries->selection_color((Fl_Color)FL_SELECTION_COLOR); cntRigCatRetries->labeltype(FL_NORMAL_LABEL); cntRigCatRetries->labelfont(0); cntRigCatRetries->labelsize(14); - cntRigCatRetries->labelcolor(FL_FOREGROUND_COLOR); + cntRigCatRetries->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntRigCatRetries->maximum(1000); cntRigCatRetries->step(1); cntRigCatRetries->callback((Fl_Callback*)cb_cntRigCatRetries); - cntRigCatRetries->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + cntRigCatRetries->align(FL_ALIGN_TOP_LEFT); cntRigCatRetries->when(FL_WHEN_CHANGED); o->value(progdefaults.RigCatRetries); o->labelsize(FL_NORMAL_SIZE); @@ -6141,32 +6141,32 @@ an merging")); { Fl_Value_Input2* o = cntRigCatTimeout = new Fl_Value_Input2(168, 150, 60, 22, _("Retry interval (ms)")); cntRigCatTimeout->tooltip(_("Time between retires in msec")); cntRigCatTimeout->box(FL_DOWN_BOX); - cntRigCatTimeout->color(FL_BACKGROUND2_COLOR); - cntRigCatTimeout->selection_color(FL_SELECTION_COLOR); + cntRigCatTimeout->color((Fl_Color)FL_BACKGROUND2_COLOR); + cntRigCatTimeout->selection_color((Fl_Color)FL_SELECTION_COLOR); cntRigCatTimeout->labeltype(FL_NORMAL_LABEL); cntRigCatTimeout->labelfont(0); cntRigCatTimeout->labelsize(14); - cntRigCatTimeout->labelcolor(FL_FOREGROUND_COLOR); + cntRigCatTimeout->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntRigCatTimeout->maximum(10000); cntRigCatTimeout->step(1); cntRigCatTimeout->callback((Fl_Callback*)cb_cntRigCatTimeout); - cntRigCatTimeout->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + cntRigCatTimeout->align(FL_ALIGN_TOP_LEFT); cntRigCatTimeout->when(FL_WHEN_CHANGED); o->value(progdefaults.RigCatTimeout); o->labelsize(FL_NORMAL_SIZE); } // Fl_Value_Input2* cntRigCatTimeout { Fl_Value_Input2* o = cntRigCatWait = new Fl_Value_Input2(50, 190, 60, 22, _("Write delay (ms)")); cntRigCatWait->box(FL_DOWN_BOX); - cntRigCatWait->color(FL_BACKGROUND2_COLOR); - cntRigCatWait->selection_color(FL_SELECTION_COLOR); + cntRigCatWait->color((Fl_Color)FL_BACKGROUND2_COLOR); + cntRigCatWait->selection_color((Fl_Color)FL_SELECTION_COLOR); cntRigCatWait->labeltype(FL_NORMAL_LABEL); cntRigCatWait->labelfont(0); cntRigCatWait->labelsize(14); - cntRigCatWait->labelcolor(FL_FOREGROUND_COLOR); + cntRigCatWait->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntRigCatWait->maximum(10000); cntRigCatWait->step(1); cntRigCatWait->callback((Fl_Callback*)cb_cntRigCatWait); - cntRigCatWait->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + cntRigCatWait->align(FL_ALIGN_TOP_LEFT); cntRigCatWait->when(FL_WHEN_CHANGED); o->value(progdefaults.RigCatWait); o->labelsize(FL_NORMAL_SIZE); @@ -6181,18 +6181,18 @@ an merging")); { Fl_Counter2* o = valRigCatStopbits = new Fl_Counter2(408, 184, 95, 21, _("Stopbits")); valRigCatStopbits->type(1); valRigCatStopbits->box(FL_UP_BOX); - valRigCatStopbits->color(FL_BACKGROUND_COLOR); - valRigCatStopbits->selection_color(FL_INACTIVE_COLOR); + valRigCatStopbits->color((Fl_Color)FL_BACKGROUND_COLOR); + valRigCatStopbits->selection_color((Fl_Color)FL_INACTIVE_COLOR); valRigCatStopbits->labeltype(FL_NORMAL_LABEL); valRigCatStopbits->labelfont(0); valRigCatStopbits->labelsize(14); - valRigCatStopbits->labelcolor(FL_FOREGROUND_COLOR); + valRigCatStopbits->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); valRigCatStopbits->minimum(1); valRigCatStopbits->maximum(2); valRigCatStopbits->step(1); valRigCatStopbits->value(1); valRigCatStopbits->callback((Fl_Callback*)cb_valRigCatStopbits); - valRigCatStopbits->align(Fl_Align(FL_ALIGN_LEFT)); + valRigCatStopbits->align(FL_ALIGN_LEFT); valRigCatStopbits->when(FL_WHEN_CHANGED); o->value(progdefaults.RigCatStopbits); o->labelsize(FL_NORMAL_SIZE); @@ -6271,14 +6271,14 @@ an merging")); { Fl_ComboBox* o = cboHamlibRig = new Fl_ComboBox(77, 88, 160, 22, _("Rig:")); cboHamlibRig->tooltip(_("Select the rig by name")); cboHamlibRig->box(FL_DOWN_BOX); - cboHamlibRig->color(FL_BACKGROUND2_COLOR); - cboHamlibRig->selection_color(FL_BACKGROUND_COLOR); + cboHamlibRig->color((Fl_Color)FL_BACKGROUND2_COLOR); + cboHamlibRig->selection_color((Fl_Color)FL_BACKGROUND_COLOR); cboHamlibRig->labeltype(FL_NORMAL_LABEL); cboHamlibRig->labelfont(0); cboHamlibRig->labelsize(14); - cboHamlibRig->labelcolor(FL_FOREGROUND_COLOR); + cboHamlibRig->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cboHamlibRig->callback((Fl_Callback*)cb_cboHamlibRig); - cboHamlibRig->align(Fl_Align(FL_ALIGN_LEFT)); + cboHamlibRig->align(FL_ALIGN_LEFT); cboHamlibRig->when(FL_WHEN_RELEASE); o->readonly(); cboHamlibRig->labelsize(FL_NORMAL_SIZE); @@ -6291,16 +6291,16 @@ an merging")); { Fl_Value_Input2* o = cntHamlibRetries = new Fl_Value_Input2(42, 128, 70, 24, _("Retries")); cntHamlibRetries->tooltip(_("# times to resend command before giving up")); cntHamlibRetries->box(FL_DOWN_BOX); - cntHamlibRetries->color(FL_BACKGROUND2_COLOR); - cntHamlibRetries->selection_color(FL_SELECTION_COLOR); + cntHamlibRetries->color((Fl_Color)FL_BACKGROUND2_COLOR); + cntHamlibRetries->selection_color((Fl_Color)FL_SELECTION_COLOR); cntHamlibRetries->labeltype(FL_NORMAL_LABEL); cntHamlibRetries->labelfont(0); cntHamlibRetries->labelsize(14); - cntHamlibRetries->labelcolor(FL_FOREGROUND_COLOR); + cntHamlibRetries->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntHamlibRetries->maximum(1000); cntHamlibRetries->step(1); cntHamlibRetries->callback((Fl_Callback*)cb_cntHamlibRetries); - cntHamlibRetries->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + cntHamlibRetries->align(FL_ALIGN_TOP_LEFT); cntHamlibRetries->when(FL_WHEN_CHANGED); o->value(progdefaults.HamlibRetries); o->labelsize(FL_NORMAL_SIZE); @@ -6308,16 +6308,16 @@ an merging")); { Fl_Value_Input2* o = cntHamlibTimeout = new Fl_Value_Input2(167, 128, 70, 24, _("Retry Interval (ms)")); cntHamlibTimeout->tooltip(_("Msec\'s between retries")); cntHamlibTimeout->box(FL_DOWN_BOX); - cntHamlibTimeout->color(FL_BACKGROUND2_COLOR); - cntHamlibTimeout->selection_color(FL_SELECTION_COLOR); + cntHamlibTimeout->color((Fl_Color)FL_BACKGROUND2_COLOR); + cntHamlibTimeout->selection_color((Fl_Color)FL_SELECTION_COLOR); cntHamlibTimeout->labeltype(FL_NORMAL_LABEL); cntHamlibTimeout->labelfont(0); cntHamlibTimeout->labelsize(14); - cntHamlibTimeout->labelcolor(FL_FOREGROUND_COLOR); + cntHamlibTimeout->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntHamlibTimeout->maximum(10000); cntHamlibTimeout->step(1); cntHamlibTimeout->callback((Fl_Callback*)cb_cntHamlibTimeout); - cntHamlibTimeout->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + cntHamlibTimeout->align(FL_ALIGN_TOP_LEFT); cntHamlibTimeout->when(FL_WHEN_CHANGED); o->value(progdefaults.HamlibTimeout); o->labelsize(FL_NORMAL_SIZE); @@ -6325,16 +6325,16 @@ an merging")); { Fl_Value_Input2* o = cntHamlibWriteDelay = new Fl_Value_Input2(42, 171, 70, 24, _("Write delay (ms)")); cntHamlibWriteDelay->tooltip(_("Msec\'s between sequential commands")); cntHamlibWriteDelay->box(FL_DOWN_BOX); - cntHamlibWriteDelay->color(FL_BACKGROUND2_COLOR); - cntHamlibWriteDelay->selection_color(FL_SELECTION_COLOR); + cntHamlibWriteDelay->color((Fl_Color)FL_BACKGROUND2_COLOR); + cntHamlibWriteDelay->selection_color((Fl_Color)FL_SELECTION_COLOR); cntHamlibWriteDelay->labeltype(FL_NORMAL_LABEL); cntHamlibWriteDelay->labelfont(0); cntHamlibWriteDelay->labelsize(14); - cntHamlibWriteDelay->labelcolor(FL_FOREGROUND_COLOR); + cntHamlibWriteDelay->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntHamlibWriteDelay->maximum(10000); cntHamlibWriteDelay->step(1); cntHamlibWriteDelay->callback((Fl_Callback*)cb_cntHamlibWriteDelay); - cntHamlibWriteDelay->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + cntHamlibWriteDelay->align(FL_ALIGN_TOP_LEFT); cntHamlibWriteDelay->when(FL_WHEN_CHANGED); o->value(progdefaults.HamlibWriteDelay); o->labelsize(FL_NORMAL_SIZE); @@ -6342,16 +6342,16 @@ an merging")); { Fl_Value_Input2* o = cntHamlibWait = new Fl_Value_Input2(168, 171, 70, 24, _("Post write delay (ms)")); cntHamlibWait->tooltip(_("Wait interval (msecs) before reading response")); cntHamlibWait->box(FL_DOWN_BOX); - cntHamlibWait->color(FL_BACKGROUND2_COLOR); - cntHamlibWait->selection_color(FL_SELECTION_COLOR); + cntHamlibWait->color((Fl_Color)FL_BACKGROUND2_COLOR); + cntHamlibWait->selection_color((Fl_Color)FL_SELECTION_COLOR); cntHamlibWait->labeltype(FL_NORMAL_LABEL); cntHamlibWait->labelfont(0); cntHamlibWait->labelsize(14); - cntHamlibWait->labelcolor(FL_FOREGROUND_COLOR); + cntHamlibWait->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntHamlibWait->maximum(10000); cntHamlibWait->step(1); cntHamlibWait->callback((Fl_Callback*)cb_cntHamlibWait); - cntHamlibWait->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + cntHamlibWait->align(FL_ALIGN_TOP_LEFT); cntHamlibWait->when(FL_WHEN_CHANGED); o->value(progdefaults.HamlibWait); o->labelsize(FL_NORMAL_SIZE); @@ -6366,18 +6366,18 @@ an merging")); { Fl_Counter2* o = valHamRigStopbits = new Fl_Counter2(401, 158, 95, 21, _("Stopbits")); valHamRigStopbits->type(1); valHamRigStopbits->box(FL_UP_BOX); - valHamRigStopbits->color(FL_BACKGROUND_COLOR); - valHamRigStopbits->selection_color(FL_INACTIVE_COLOR); + valHamRigStopbits->color((Fl_Color)FL_BACKGROUND_COLOR); + valHamRigStopbits->selection_color((Fl_Color)FL_INACTIVE_COLOR); valHamRigStopbits->labeltype(FL_NORMAL_LABEL); valHamRigStopbits->labelfont(0); valHamRigStopbits->labelsize(14); - valHamRigStopbits->labelcolor(FL_FOREGROUND_COLOR); + valHamRigStopbits->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); valHamRigStopbits->minimum(1); valHamRigStopbits->maximum(2); valHamRigStopbits->step(1); valHamRigStopbits->value(1); valHamRigStopbits->callback((Fl_Callback*)cb_valHamRigStopbits); - valHamRigStopbits->align(Fl_Align(FL_ALIGN_LEFT)); + valHamRigStopbits->align(FL_ALIGN_LEFT); valHamRigStopbits->when(FL_WHEN_CHANGED); o->value(progdefaults.HamRigStopbits); o->labelsize(FL_NORMAL_SIZE); @@ -6386,18 +6386,18 @@ an merging")); cntHamlibTimeout0->tooltip(_("Msec\'s between retries")); cntHamlibTimeout0->type(1); cntHamlibTimeout0->box(FL_UP_BOX); - cntHamlibTimeout0->color(FL_BACKGROUND_COLOR); - cntHamlibTimeout0->selection_color(FL_INACTIVE_COLOR); + cntHamlibTimeout0->color((Fl_Color)FL_BACKGROUND_COLOR); + cntHamlibTimeout0->selection_color((Fl_Color)FL_INACTIVE_COLOR); cntHamlibTimeout0->labeltype(FL_NORMAL_LABEL); cntHamlibTimeout0->labelfont(0); cntHamlibTimeout0->labelsize(14); - cntHamlibTimeout0->labelcolor(FL_FOREGROUND_COLOR); + cntHamlibTimeout0->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntHamlibTimeout0->minimum(2); cntHamlibTimeout0->maximum(20000); cntHamlibTimeout0->step(1); cntHamlibTimeout0->value(10); cntHamlibTimeout0->callback((Fl_Callback*)cb_cntHamlibTimeout0); - cntHamlibTimeout0->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + cntHamlibTimeout0->align(FL_ALIGN_TOP_LEFT); cntHamlibTimeout0->when(FL_WHEN_CHANGED); cntHamlibTimeout0->hide(); o->value(progdefaults.HamlibTimeout); @@ -6405,14 +6405,14 @@ an merging")); { inpHamlibConfig = new Fl_Input2(32, 321, 320, 22, _("Advanced configuration:")); inpHamlibConfig->tooltip(_("Optional configuration\nin format: param=val ...")); inpHamlibConfig->box(FL_DOWN_BOX); - inpHamlibConfig->color(FL_BACKGROUND2_COLOR); - inpHamlibConfig->selection_color(FL_SELECTION_COLOR); + inpHamlibConfig->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpHamlibConfig->selection_color((Fl_Color)FL_SELECTION_COLOR); inpHamlibConfig->labeltype(FL_NORMAL_LABEL); inpHamlibConfig->labelfont(0); inpHamlibConfig->labelsize(14); - inpHamlibConfig->labelcolor(FL_FOREGROUND_COLOR); + inpHamlibConfig->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); inpHamlibConfig->callback((Fl_Callback*)cb_inpHamlibConfig); - inpHamlibConfig->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpHamlibConfig->align(FL_ALIGN_TOP_LEFT); inpHamlibConfig->when(FL_WHEN_RELEASE); inpHamlibConfig->value(progdefaults.HamConfig.c_str()); inpHamlibConfig->labelsize(FL_NORMAL_SIZE); @@ -6425,7 +6425,7 @@ an merging")); mnuSideband->tooltip(_("Force the rig sideband. Takes\neffect when rig mode changes.")); mnuSideband->down_box(FL_BORDER_BOX); mnuSideband->callback((Fl_Callback*)cb_mnuSideband); - mnuSideband->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + mnuSideband->align(FL_ALIGN_TOP_LEFT); } // Fl_Choice* mnuSideband { Fl_Round_Button* o = btnHamlibCMDptt = new Fl_Round_Button(57, 213, 200, 20, _("PTT via Hamlib command")); btnHamlibCMDptt->tooltip(_("PTT is a hamlib command")); @@ -6475,7 +6475,7 @@ an merging")); { Fl_Output* o = new Fl_Output(177, 85, 190, 58); o->type(12); o->box(FL_BORDER_BOX); - o->color(FL_LIGHT1); + o->color((Fl_Color)FL_LIGHT1); o->value(_("Control via Memory Mapped\nshared variables\ni.e.: Kachina program")); } // Fl_Output* o { Fl_Check_Button* o = chkUSEMEMMAP = new Fl_Check_Button(177, 153, 120, 20, _("Use Memmap")); @@ -6504,7 +6504,7 @@ an merging")); { Fl_Output* o = new Fl_Output(178, 80, 190, 58); o->type(12); o->box(FL_BORDER_BOX); - o->color(FL_LIGHT1); + o->color((Fl_Color)FL_LIGHT1); o->value(_("Rig control via external\nprogram using xmlrpc\nremote calls.")); } // Fl_Output* o { chkUSEXMLRPC = new Fl_Check_Button(178, 148, 183, 20, _("Use XML-RPC program")); @@ -6528,7 +6528,7 @@ an merging")); tabSoundCard->tooltip(_("Audio devices")); tabSoundCard->hide(); { tabsSoundCard = new Fl_Tabs(0, 25, 540, 345); - tabsSoundCard->selection_color(FL_LIGHT1); + tabsSoundCard->selection_color((Fl_Color)FL_LIGHT1); { tabAudio = new Fl_Group(0, 50, 540, 320, _("Devices")); { AudioOSS = new Fl_Group(20, 65, 490, 45); AudioOSS->box(FL_ENGRAVED_FRAME); @@ -6576,14 +6576,14 @@ an merging")); { Fl_Input2* o = inpPulseServer = new Fl_Input2(275, 201, 225, 25, _("Server string:")); inpPulseServer->tooltip(_("Leave this blank or refer to\nhttp://www.pulseaudio.org/wiki/ServerStrings")); inpPulseServer->box(FL_DOWN_BOX); - inpPulseServer->color(FL_BACKGROUND2_COLOR); - inpPulseServer->selection_color(FL_SELECTION_COLOR); + inpPulseServer->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpPulseServer->selection_color((Fl_Color)FL_SELECTION_COLOR); inpPulseServer->labeltype(FL_NORMAL_LABEL); inpPulseServer->labelfont(0); inpPulseServer->labelsize(14); - inpPulseServer->labelcolor(FL_FOREGROUND_COLOR); + inpPulseServer->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); inpPulseServer->callback((Fl_Callback*)cb_inpPulseServer); - inpPulseServer->align(Fl_Align(FL_ALIGN_LEFT)); + inpPulseServer->align(FL_ALIGN_LEFT); inpPulseServer->when(FL_WHEN_RELEASE); o->value(progdefaults.PulseServer.c_str()); inpPulseServer->labelsize(FL_NORMAL_SIZE); @@ -6606,13 +6606,13 @@ an merging")); tabAudioOpt->hide(); { grpAudioSampleRate = new Fl_Group(23, 65, 490, 90, _("Sample rate")); grpAudioSampleRate->box(FL_ENGRAVED_FRAME); - grpAudioSampleRate->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + grpAudioSampleRate->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Choice* o = menuInSampleRate = new Fl_Choice(33, 94, 100, 20, _("Capture")); menuInSampleRate->tooltip(_("Force a specific sample rate. Select \"Native\" if \"Auto\"\ndoes not work we\ ll with your audio device.")); menuInSampleRate->down_box(FL_BORDER_BOX); menuInSampleRate->callback((Fl_Callback*)cb_menuInSampleRate); - menuInSampleRate->align(Fl_Align(FL_ALIGN_RIGHT)); + menuInSampleRate->align(FL_ALIGN_RIGHT); //extern Fl_Menu_Item sample_rate_menu[]; //o->menu(sample_rate_menu); o->clear_changed(); @@ -6620,7 +6620,7 @@ ll with your audio device.")); { Fl_Choice* o = menuOutSampleRate = new Fl_Choice(33, 124, 100, 20, _("Playback")); menuOutSampleRate->down_box(FL_BORDER_BOX); menuOutSampleRate->callback((Fl_Callback*)cb_menuOutSampleRate); - menuOutSampleRate->align(Fl_Align(FL_ALIGN_RIGHT)); + menuOutSampleRate->align(FL_ALIGN_RIGHT); //extern Fl_Menu_Item sample_rate_menu[]; //o->menu(sample_rate_menu); o->clear_changed(); @@ -6630,24 +6630,24 @@ ll with your audio device.")); menuSampleConverter->tooltip(_("Set the type of resampler used of offset correction")); menuSampleConverter->down_box(FL_BORDER_BOX); menuSampleConverter->callback((Fl_Callback*)cb_menuSampleConverter); - menuSampleConverter->align(Fl_Align(FL_ALIGN_TOP)); + menuSampleConverter->align(FL_ALIGN_TOP); } // Fl_Choice* menuSampleConverter grpAudioSampleRate->end(); } // Fl_Group* grpAudioSampleRate { Fl_Group* o = new Fl_Group(23, 155, 490, 62, _("Corrections")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Spinner2* o = cntRxRateCorr = new Fl_Spinner2(33, 185, 85, 20, _("RX ppm")); cntRxRateCorr->tooltip(_("RX sound card correction")); cntRxRateCorr->box(FL_NO_BOX); - cntRxRateCorr->color(FL_BACKGROUND_COLOR); - cntRxRateCorr->selection_color(FL_BACKGROUND_COLOR); + cntRxRateCorr->color((Fl_Color)FL_BACKGROUND_COLOR); + cntRxRateCorr->selection_color((Fl_Color)FL_BACKGROUND_COLOR); cntRxRateCorr->labeltype(FL_NORMAL_LABEL); cntRxRateCorr->labelfont(0); cntRxRateCorr->labelsize(14); - cntRxRateCorr->labelcolor(FL_FOREGROUND_COLOR); + cntRxRateCorr->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntRxRateCorr->callback((Fl_Callback*)cb_cntRxRateCorr); - cntRxRateCorr->align(Fl_Align(FL_ALIGN_RIGHT)); + cntRxRateCorr->align(FL_ALIGN_RIGHT); cntRxRateCorr->when(FL_WHEN_RELEASE); o->step(1); o->minimum(-50000); @@ -6657,14 +6657,14 @@ ll with your audio device.")); { Fl_Spinner2* o = cntTxRateCorr = new Fl_Spinner2(194, 185, 85, 20, _("TX ppm")); cntTxRateCorr->tooltip(_("TX sound card correction")); cntTxRateCorr->box(FL_NO_BOX); - cntTxRateCorr->color(FL_BACKGROUND_COLOR); - cntTxRateCorr->selection_color(FL_BACKGROUND_COLOR); + cntTxRateCorr->color((Fl_Color)FL_BACKGROUND_COLOR); + cntTxRateCorr->selection_color((Fl_Color)FL_BACKGROUND_COLOR); cntTxRateCorr->labeltype(FL_NORMAL_LABEL); cntTxRateCorr->labelfont(0); cntTxRateCorr->labelsize(14); - cntTxRateCorr->labelcolor(FL_FOREGROUND_COLOR); + cntTxRateCorr->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntTxRateCorr->callback((Fl_Callback*)cb_cntTxRateCorr); - cntTxRateCorr->align(Fl_Align(FL_ALIGN_RIGHT)); + cntTxRateCorr->align(FL_ALIGN_RIGHT); cntTxRateCorr->when(FL_WHEN_RELEASE); o->step(1); o->minimum(-50000); @@ -6674,14 +6674,14 @@ ll with your audio device.")); { Fl_Spinner2* o = cntTxOffset = new Fl_Spinner2(356, 185, 85, 20, _("TX offset")); cntTxOffset->tooltip(_("Difference between Rx & Tx freq (rig offset)")); cntTxOffset->box(FL_NO_BOX); - cntTxOffset->color(FL_BACKGROUND_COLOR); - cntTxOffset->selection_color(FL_BACKGROUND_COLOR); + cntTxOffset->color((Fl_Color)FL_BACKGROUND_COLOR); + cntTxOffset->selection_color((Fl_Color)FL_BACKGROUND_COLOR); cntTxOffset->labeltype(FL_NORMAL_LABEL); cntTxOffset->labelfont(0); cntTxOffset->labelsize(14); - cntTxOffset->labelcolor(FL_FOREGROUND_COLOR); + cntTxOffset->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntTxOffset->callback((Fl_Callback*)cb_cntTxOffset); - cntTxOffset->align(Fl_Align(FL_ALIGN_RIGHT)); + cntTxOffset->align(FL_ALIGN_RIGHT); cntTxOffset->when(FL_WHEN_RELEASE); o->value(progdefaults.TxOffset); o->step(1); @@ -6696,7 +6696,7 @@ ll with your audio device.")); tabMixer->hide(); { Fl_Group* o = new Fl_Group(23, 69, 490, 145, _("OSS mixer")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Check_Button* o = btnMixer = new Fl_Check_Button(33, 98, 125, 25, _("Manage mixer")); btnMixer->tooltip(_("Add mixer controls to main dialog")); btnMixer->down_box(FL_DOWN_BOX); @@ -6721,16 +6721,16 @@ ll with your audio device.")); valPCMvolume->tooltip(_("Set the sound card PCM level")); valPCMvolume->type(1); valPCMvolume->box(FL_DOWN_BOX); - valPCMvolume->color(FL_BACKGROUND_COLOR); - valPCMvolume->selection_color(FL_SELECTION_COLOR); + valPCMvolume->color((Fl_Color)FL_BACKGROUND_COLOR); + valPCMvolume->selection_color((Fl_Color)FL_SELECTION_COLOR); valPCMvolume->labeltype(FL_NORMAL_LABEL); valPCMvolume->labelfont(0); valPCMvolume->labelsize(14); - valPCMvolume->labelcolor(FL_FOREGROUND_COLOR); + valPCMvolume->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); valPCMvolume->value(0.8); valPCMvolume->textsize(14); valPCMvolume->callback((Fl_Callback*)cb_valPCMvolume); - valPCMvolume->align(Fl_Align(FL_ALIGN_RIGHT)); + valPCMvolume->align(FL_ALIGN_RIGHT); valPCMvolume->when(FL_WHEN_CHANGED); o->labelsize(FL_NORMAL_SIZE); o->textsize(FL_NORMAL_SIZE); } // Fl_Value_Slider2* valPCMvolume @@ -6761,7 +6761,7 @@ ll with your audio device.")); { Fl_Group* o = new Fl_Group(39, 165, 454, 187, _("...\nThese controls are on other tabs.\nThey are replicated here for convenie\ nce.\nYou may change the state from either location.\n...")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_BOTTOM|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_BOTTOM|FL_ALIGN_INSIDE); { Fl_Check_Button* o = btnPTTrightchannel2 = new Fl_Check_Button(112, 175, 250, 20, _("PTT tone on right audio channel ")); btnPTTrightchannel2->tooltip(_("1000 Hz tone when PTT enabled\nCan be used in lieu of or in addition to other\ PTT types")); @@ -6793,7 +6793,7 @@ nce.\nYou may change the state from either location.\n...")); tabID->hide(); { Fl_Group* o = new Fl_Group(22, 35, 490, 103, _("Video Preamble ID")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { btnsendid = new Fl_Check_Button(32, 58, 150, 20, _("Transmit mode ID")); btnsendid->tooltip(_("Waterfall video ID")); btnsendid->down_box(FL_DOWN_BOX); @@ -6808,14 +6808,14 @@ nce.\nYou may change the state from either location.\n...")); { Fl_Input2* o = valVideotext = new Fl_Input2(199, 83, 161, 20, _(":")); valVideotext->tooltip(_("Limit to a few characters,\nas in CQEM or IOTA etc.")); valVideotext->box(FL_DOWN_BOX); - valVideotext->color(FL_BACKGROUND2_COLOR); - valVideotext->selection_color(FL_SELECTION_COLOR); + valVideotext->color((Fl_Color)FL_BACKGROUND2_COLOR); + valVideotext->selection_color((Fl_Color)FL_SELECTION_COLOR); valVideotext->labeltype(FL_NORMAL_LABEL); valVideotext->labelfont(0); valVideotext->labelsize(14); - valVideotext->labelcolor(FL_FOREGROUND_COLOR); + valVideotext->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); valVideotext->callback((Fl_Callback*)cb_valVideotext); - valVideotext->align(Fl_Align(FL_ALIGN_LEFT)); + valVideotext->align(FL_ALIGN_LEFT); valVideotext->when(FL_WHEN_RELEASE); o->value(progdefaults.strTextid.c_str()); valVideotext->labelsize(FL_NORMAL_SIZE); @@ -6831,19 +6831,19 @@ nce.\nYou may change the state from either location.\n...")); sldrVideowidth->tooltip(_("Set the number of characters per row")); sldrVideowidth->type(1); sldrVideowidth->box(FL_DOWN_BOX); - sldrVideowidth->color(FL_BACKGROUND_COLOR); - sldrVideowidth->selection_color(FL_BACKGROUND_COLOR); + sldrVideowidth->color((Fl_Color)FL_BACKGROUND_COLOR); + sldrVideowidth->selection_color((Fl_Color)FL_BACKGROUND_COLOR); sldrVideowidth->labeltype(FL_NORMAL_LABEL); sldrVideowidth->labelfont(0); sldrVideowidth->labelsize(14); - sldrVideowidth->labelcolor(FL_FOREGROUND_COLOR); + sldrVideowidth->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); sldrVideowidth->minimum(1); sldrVideowidth->maximum(8); sldrVideowidth->step(1); sldrVideowidth->value(4); sldrVideowidth->textsize(14); sldrVideowidth->callback((Fl_Callback*)cb_sldrVideowidth); - sldrVideowidth->align(Fl_Align(FL_ALIGN_LEFT)); + sldrVideowidth->align(FL_ALIGN_LEFT); sldrVideowidth->when(FL_WHEN_CHANGED); o->value(progdefaults.videowidth); o->labelsize(FL_NORMAL_SIZE); o->textsize(FL_NORMAL_SIZE); @@ -6865,7 +6865,7 @@ nce.\nYou may change the state from either location.\n...")); } // Fl_Group* o { sld = new Fl_Group(22, 138, 490, 60, _("CW Postamble ID")); sld->box(FL_ENGRAVED_FRAME); - sld->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + sld->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Check_Button* o = btnCWID = new Fl_Check_Button(32, 165, 140, 20, _("Transmit callsign")); btnCWID->tooltip(_("Send Callsign in CW at end of every transmission")); btnCWID->down_box(FL_DOWN_BOX); @@ -6876,19 +6876,19 @@ nce.\nYou may change the state from either location.\n...")); sldrCWIDwpm->tooltip(_("Send at this WPM")); sldrCWIDwpm->type(1); sldrCWIDwpm->box(FL_DOWN_BOX); - sldrCWIDwpm->color(FL_BACKGROUND_COLOR); - sldrCWIDwpm->selection_color(FL_BACKGROUND_COLOR); + sldrCWIDwpm->color((Fl_Color)FL_BACKGROUND_COLOR); + sldrCWIDwpm->selection_color((Fl_Color)FL_BACKGROUND_COLOR); sldrCWIDwpm->labeltype(FL_NORMAL_LABEL); sldrCWIDwpm->labelfont(0); sldrCWIDwpm->labelsize(14); - sldrCWIDwpm->labelcolor(FL_FOREGROUND_COLOR); + sldrCWIDwpm->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); sldrCWIDwpm->minimum(15); sldrCWIDwpm->maximum(40); sldrCWIDwpm->step(1); sldrCWIDwpm->value(18); sldrCWIDwpm->textsize(14); sldrCWIDwpm->callback((Fl_Callback*)cb_sldrCWIDwpm); - sldrCWIDwpm->align(Fl_Align(FL_ALIGN_TOP)); + sldrCWIDwpm->align(FL_ALIGN_TOP); sldrCWIDwpm->when(FL_WHEN_CHANGED); o->value(progdefaults.CWIDwpm); o->labelsize(FL_NORMAL_SIZE); o->textsize(FL_NORMAL_SIZE); @@ -6900,7 +6900,7 @@ nce.\nYou may change the state from either location.\n...")); } // Fl_Group* sld { Fl_Group* o = new Fl_Group(22, 198, 295, 167, _("Reed-Solomon ID (Rx)")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Check_Button* o = chkRSidWideSearch = new Fl_Check_Button(32, 247, 270, 20, _("Detector searches entire passband")); chkRSidWideSearch->tooltip(_("ON - search over entire waterfall\nOFF - limit search to +/- 200 Hz")); chkRSidWideSearch->down_box(FL_DOWN_BOX); @@ -6935,17 +6935,17 @@ d frequency")); sldrRSIDsquelch->tooltip(_("Open squelch for nn sec if RSID detected")); sldrRSIDsquelch->type(1); sldrRSIDsquelch->box(FL_DOWN_BOX); - sldrRSIDsquelch->color(FL_BACKGROUND_COLOR); - sldrRSIDsquelch->selection_color(FL_BACKGROUND_COLOR); + sldrRSIDsquelch->color((Fl_Color)FL_BACKGROUND_COLOR); + sldrRSIDsquelch->selection_color((Fl_Color)FL_BACKGROUND_COLOR); sldrRSIDsquelch->labeltype(FL_NORMAL_LABEL); sldrRSIDsquelch->labelfont(0); sldrRSIDsquelch->labelsize(14); - sldrRSIDsquelch->labelcolor(FL_FOREGROUND_COLOR); + sldrRSIDsquelch->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); sldrRSIDsquelch->maximum(20); sldrRSIDsquelch->step(1); sldrRSIDsquelch->textsize(14); sldrRSIDsquelch->callback((Fl_Callback*)cb_sldrRSIDsquelch); - sldrRSIDsquelch->align(Fl_Align(FL_ALIGN_RIGHT)); + sldrRSIDsquelch->align(FL_ALIGN_RIGHT); sldrRSIDsquelch->when(FL_WHEN_CHANGED); o->value(progdefaults.rsid_squelch); o->labelsize(FL_NORMAL_SIZE); o->textsize(FL_NORMAL_SIZE); @@ -6954,7 +6954,7 @@ d frequency")); } // Fl_Group* o { Fl_Group* o = new Fl_Group(317, 198, 195, 85, _("Reed-Solomon ID (Tx)")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { bRSIDTxModes = new Fl_Button(345, 222, 130, 20, _("Transmit modes")); bRSIDTxModes->callback((Fl_Callback*)cb_bRSIDTxModes); } // Fl_Button* bRSIDTxModes @@ -6968,7 +6968,7 @@ d frequency")); } // Fl_Group* o { Fl_Group* o = new Fl_Group(317, 284, 195, 80, _("Pre-Signal Tone")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Counter* o = val_pretone = new Fl_Counter(340, 310, 140, 21, _("Seconds")); val_pretone->tooltip(_("Use for triggering amplifier carrier detect")); val_pretone->minimum(0); @@ -6983,11 +6983,11 @@ d frequency")); { tabMisc = new Fl_Group(0, 25, 540, 345, _("Misc")); tabMisc->hide(); { tabsMisc = new Fl_Tabs(0, 25, 540, 345); - tabsMisc->selection_color(FL_LIGHT1); + tabsMisc->selection_color((Fl_Color)FL_LIGHT1); { tabCPUspeed = new Fl_Group(0, 50, 540, 320, _("CPU")); { Fl_Group* o = new Fl_Group(25, 75, 490, 51); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Check_Button* o = chkSlowCpu = new Fl_Check_Button(171, 90, 225, 20, _("Slow CPU (less than 700MHz)")); chkSlowCpu->tooltip(_("Enable if you\'re computer does not decode properly")); chkSlowCpu->down_box(FL_DOWN_BOX); @@ -7002,7 +7002,7 @@ d frequency")); tabNBEMS->hide(); { Fl_Group* o = new Fl_Group(20, 65, 500, 75, _("NBEMS data file interface")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Check_Button* o = chkAutoExtract = new Fl_Check_Button(74, 96, 75, 20, _("Enable")); chkAutoExtract->tooltip(_("Extract files for use with external \"wrap / flmsg\" program")); chkAutoExtract->down_box(FL_DOWN_BOX); @@ -7019,7 +7019,7 @@ d frequency")); } // Fl_Group* o { Fl_Group* o = new Fl_Group(20, 141, 500, 130, _("Reception of flmsg files")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Check_Button* o = chk_open_flmsg = new Fl_Check_Button(74, 168, 136, 20, _("Open with flmsg")); chk_open_flmsg->tooltip(_("Open message with flmsg")); chk_open_flmsg->down_box(FL_DOWN_BOX); @@ -7035,14 +7035,14 @@ d frequency")); { Fl_Input2* o = txt_flmsg_pathname = new Fl_Input2(74, 199, 330, 24, _("flmsg:")); txt_flmsg_pathname->tooltip(_("Enter full path-filename for flmsg")); txt_flmsg_pathname->box(FL_DOWN_BOX); - txt_flmsg_pathname->color(FL_BACKGROUND2_COLOR); - txt_flmsg_pathname->selection_color(FL_SELECTION_COLOR); + txt_flmsg_pathname->color((Fl_Color)FL_BACKGROUND2_COLOR); + txt_flmsg_pathname->selection_color((Fl_Color)FL_SELECTION_COLOR); txt_flmsg_pathname->labeltype(FL_NORMAL_LABEL); txt_flmsg_pathname->labelfont(0); txt_flmsg_pathname->labelsize(14); - txt_flmsg_pathname->labelcolor(FL_FOREGROUND_COLOR); + txt_flmsg_pathname->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); txt_flmsg_pathname->callback((Fl_Callback*)cb_txt_flmsg_pathname); - txt_flmsg_pathname->align(Fl_Align(FL_ALIGN_LEFT)); + txt_flmsg_pathname->align(FL_ALIGN_LEFT); txt_flmsg_pathname->when(FL_WHEN_CHANGED); o->value(progdefaults.flmsg_pathname.c_str()); } // Fl_Input2* txt_flmsg_pathname @@ -7053,15 +7053,15 @@ d frequency")); { Fl_Value_Slider* o = sldr_extract_timeout = new Fl_Value_Slider(40, 237, 364, 21, _("Timeout (secs)")); sldr_extract_timeout->tooltip(_("Extract times out after NN seconds of inactivity.")); sldr_extract_timeout->type(5); - sldr_extract_timeout->color(FL_LIGHT3); - sldr_extract_timeout->selection_color(FL_FOREGROUND_COLOR); + sldr_extract_timeout->color((Fl_Color)FL_LIGHT3); + sldr_extract_timeout->selection_color((Fl_Color)FL_FOREGROUND_COLOR); sldr_extract_timeout->minimum(1); sldr_extract_timeout->maximum(10); sldr_extract_timeout->step(0.5); sldr_extract_timeout->value(4); sldr_extract_timeout->textsize(14); sldr_extract_timeout->callback((Fl_Callback*)cb_sldr_extract_timeout); - sldr_extract_timeout->align(Fl_Align(FL_ALIGN_RIGHT)); + sldr_extract_timeout->align(FL_ALIGN_RIGHT); o->value(progdefaults.extract_timeout); } // Fl_Value_Slider* sldr_extract_timeout o->end(); @@ -7069,27 +7069,27 @@ d frequency")); tabNBEMS->end(); } // Fl_Group* tabNBEMS { tabPskmail = new Fl_Group(0, 50, 540, 320, _("Pskmail")); - tabPskmail->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + tabPskmail->align(FL_ALIGN_TOP_LEFT); tabPskmail->hide(); { Fl_Group* o = new Fl_Group(26, 58, 490, 174, _("Mail Server Attributes")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Counter2* o = cntServerCarrier = new Fl_Counter2(77, 86, 80, 20, _("Carrier frequency (Hz)")); cntServerCarrier->tooltip(_("Default listen / transmit frequency")); cntServerCarrier->type(1); cntServerCarrier->box(FL_UP_BOX); - cntServerCarrier->color(FL_BACKGROUND_COLOR); - cntServerCarrier->selection_color(FL_INACTIVE_COLOR); + cntServerCarrier->color((Fl_Color)FL_BACKGROUND_COLOR); + cntServerCarrier->selection_color((Fl_Color)FL_INACTIVE_COLOR); cntServerCarrier->labeltype(FL_NORMAL_LABEL); cntServerCarrier->labelfont(0); cntServerCarrier->labelsize(14); - cntServerCarrier->labelcolor(FL_FOREGROUND_COLOR); + cntServerCarrier->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntServerCarrier->minimum(500); cntServerCarrier->maximum(2500); cntServerCarrier->step(25); cntServerCarrier->value(1500); cntServerCarrier->callback((Fl_Callback*)cb_cntServerCarrier); - cntServerCarrier->align(Fl_Align(FL_ALIGN_RIGHT)); + cntServerCarrier->align(FL_ALIGN_RIGHT); cntServerCarrier->when(FL_WHEN_CHANGED); o->value(progdefaults.ServerCarrier); o->labelsize(FL_NORMAL_SIZE); @@ -7098,18 +7098,18 @@ d frequency")); cntServerOffset->tooltip(_("Listen for signals within this range")); cntServerOffset->type(1); cntServerOffset->box(FL_UP_BOX); - cntServerOffset->color(FL_BACKGROUND_COLOR); - cntServerOffset->selection_color(FL_INACTIVE_COLOR); + cntServerOffset->color((Fl_Color)FL_BACKGROUND_COLOR); + cntServerOffset->selection_color((Fl_Color)FL_INACTIVE_COLOR); cntServerOffset->labeltype(FL_NORMAL_LABEL); cntServerOffset->labelfont(0); cntServerOffset->labelsize(14); - cntServerOffset->labelcolor(FL_FOREGROUND_COLOR); + cntServerOffset->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntServerOffset->minimum(10); cntServerOffset->maximum(500); cntServerOffset->step(10); cntServerOffset->value(100); cntServerOffset->callback((Fl_Callback*)cb_cntServerOffset); - cntServerOffset->align(Fl_Align(FL_ALIGN_RIGHT)); + cntServerOffset->align(FL_ALIGN_RIGHT); cntServerOffset->when(FL_WHEN_CHANGED); o->value(progdefaults.SearchRange); o->labelsize(FL_NORMAL_SIZE); @@ -7118,18 +7118,18 @@ d frequency")); cntServerACQsn->tooltip(_("Capture signals over this threshold")); cntServerACQsn->type(1); cntServerACQsn->box(FL_UP_BOX); - cntServerACQsn->color(FL_BACKGROUND_COLOR); - cntServerACQsn->selection_color(FL_INACTIVE_COLOR); + cntServerACQsn->color((Fl_Color)FL_BACKGROUND_COLOR); + cntServerACQsn->selection_color((Fl_Color)FL_INACTIVE_COLOR); cntServerACQsn->labeltype(FL_NORMAL_LABEL); cntServerACQsn->labelfont(0); cntServerACQsn->labelsize(14); - cntServerACQsn->labelcolor(FL_FOREGROUND_COLOR); + cntServerACQsn->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntServerACQsn->minimum(3); cntServerACQsn->maximum(20); cntServerACQsn->step(1); cntServerACQsn->value(6); cntServerACQsn->callback((Fl_Callback*)cb_cntServerACQsn); - cntServerACQsn->align(Fl_Align(FL_ALIGN_RIGHT)); + cntServerACQsn->align(FL_ALIGN_RIGHT); cntServerACQsn->when(FL_WHEN_CHANGED); o->value(progdefaults.ServerACQsn); o->labelsize(FL_NORMAL_SIZE); @@ -7138,18 +7138,18 @@ d frequency")); cntServerAFCrange->tooltip(_("Limit AFC movement to this range")); cntServerAFCrange->type(1); cntServerAFCrange->box(FL_UP_BOX); - cntServerAFCrange->color(FL_BACKGROUND_COLOR); - cntServerAFCrange->selection_color(FL_INACTIVE_COLOR); + cntServerAFCrange->color((Fl_Color)FL_BACKGROUND_COLOR); + cntServerAFCrange->selection_color((Fl_Color)FL_INACTIVE_COLOR); cntServerAFCrange->labeltype(FL_NORMAL_LABEL); cntServerAFCrange->labelfont(0); cntServerAFCrange->labelsize(14); - cntServerAFCrange->labelcolor(FL_FOREGROUND_COLOR); + cntServerAFCrange->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntServerAFCrange->minimum(10); cntServerAFCrange->maximum(500); cntServerAFCrange->step(10); cntServerAFCrange->value(25); cntServerAFCrange->callback((Fl_Callback*)cb_cntServerAFCrange); - cntServerAFCrange->align(Fl_Align(FL_ALIGN_RIGHT)); + cntServerAFCrange->align(FL_ALIGN_RIGHT); cntServerAFCrange->when(FL_WHEN_CHANGED); o->value(progdefaults.SearchRange); o->labelsize(FL_NORMAL_SIZE); @@ -7165,7 +7165,7 @@ d frequency")); } // Fl_Group* o { Fl_Group* o = new Fl_Group(26, 234, 490, 131, _("General")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Check_Button* o = btn_arq_s2n_report = new Fl_Check_Button(51, 259, 250, 20, _("Report ARQ frames average S/N")); btn_arq_s2n_report->down_box(FL_DOWN_BOX); btn_arq_s2n_report->callback((Fl_Callback*)cb_btn_arq_s2n_report); @@ -7179,7 +7179,7 @@ d frequency")); tabSpot->hide(); { Fl_Group* o = new Fl_Group(30, 72, 490, 215, _("PSK Reporter")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { btnPSKRepAuto = new Fl_Check_Button(40, 103, 324, 20, _("Automatically spot callsigns in decoded text")); btnPSKRepAuto->tooltip(_("Parse all incoming text")); btnPSKRepAuto->down_box(FL_DOWN_BOX); @@ -7201,14 +7201,14 @@ d frequency")); { inpPSKRepHost = new Fl_Input2(81, 203, 220, 24, _("Host:")); inpPSKRepHost->tooltip(_("To whom the connection is made")); inpPSKRepHost->box(FL_DOWN_BOX); - inpPSKRepHost->color(FL_BACKGROUND2_COLOR); - inpPSKRepHost->selection_color(FL_SELECTION_COLOR); + inpPSKRepHost->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpPSKRepHost->selection_color((Fl_Color)FL_SELECTION_COLOR); inpPSKRepHost->labeltype(FL_NORMAL_LABEL); inpPSKRepHost->labelfont(0); inpPSKRepHost->labelsize(14); - inpPSKRepHost->labelcolor(FL_FOREGROUND_COLOR); + inpPSKRepHost->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); inpPSKRepHost->callback((Fl_Callback*)cb_inpPSKRepHost); - inpPSKRepHost->align(Fl_Align(FL_ALIGN_LEFT)); + inpPSKRepHost->align(FL_ALIGN_LEFT); inpPSKRepHost->when(FL_WHEN_CHANGED); inpPSKRepHost->value(progdefaults.pskrep_host.c_str()); inpPSKRepHost->labelsize(FL_NORMAL_SIZE); @@ -7216,14 +7216,14 @@ d frequency")); { inpPSKRepPort = new Fl_Input2(450, 203, 60, 24, _("Port:")); inpPSKRepPort->tooltip(_("Using UDP port #")); inpPSKRepPort->box(FL_DOWN_BOX); - inpPSKRepPort->color(FL_BACKGROUND2_COLOR); - inpPSKRepPort->selection_color(FL_SELECTION_COLOR); + inpPSKRepPort->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpPSKRepPort->selection_color((Fl_Color)FL_SELECTION_COLOR); inpPSKRepPort->labeltype(FL_NORMAL_LABEL); inpPSKRepPort->labelfont(0); inpPSKRepPort->labelsize(14); - inpPSKRepPort->labelcolor(FL_FOREGROUND_COLOR); + inpPSKRepPort->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); inpPSKRepPort->callback((Fl_Callback*)cb_inpPSKRepPort); - inpPSKRepPort->align(Fl_Align(FL_ALIGN_LEFT)); + inpPSKRepPort->align(FL_ALIGN_LEFT); inpPSKRepPort->when(FL_WHEN_CHANGED); inpPSKRepPort->value(progdefaults.pskrep_port.c_str()); inpPSKRepPort->labelsize(FL_NORMAL_SIZE); @@ -7244,22 +7244,22 @@ d frequency")); tabSweetSpot->hide(); { Fl_Group* o = new Fl_Group(28, 71, 490, 75); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Value_Input2* o = valCWsweetspot = new Fl_Value_Input2(65, 82, 65, 20, _("CW")); valCWsweetspot->tooltip(_("Default CW tracking point")); valCWsweetspot->box(FL_DOWN_BOX); - valCWsweetspot->color(FL_BACKGROUND2_COLOR); - valCWsweetspot->selection_color(FL_SELECTION_COLOR); + valCWsweetspot->color((Fl_Color)FL_BACKGROUND2_COLOR); + valCWsweetspot->selection_color((Fl_Color)FL_SELECTION_COLOR); valCWsweetspot->labeltype(FL_NORMAL_LABEL); valCWsweetspot->labelfont(0); valCWsweetspot->labelsize(14); - valCWsweetspot->labelcolor(FL_FOREGROUND_COLOR); + valCWsweetspot->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); valCWsweetspot->minimum(200); valCWsweetspot->maximum(4000); valCWsweetspot->step(1); valCWsweetspot->value(1000); valCWsweetspot->callback((Fl_Callback*)cb_valCWsweetspot); - valCWsweetspot->align(Fl_Align(FL_ALIGN_LEFT)); + valCWsweetspot->align(FL_ALIGN_LEFT); valCWsweetspot->when(FL_WHEN_CHANGED); o->value(progdefaults.CWsweetspot); o->labelsize(FL_NORMAL_SIZE); @@ -7267,18 +7267,18 @@ d frequency")); { Fl_Value_Input2* o = valRTTYsweetspot = new Fl_Value_Input2(243, 82, 65, 20, _("RTTY")); valRTTYsweetspot->tooltip(_("Default RTTY tracking point")); valRTTYsweetspot->box(FL_DOWN_BOX); - valRTTYsweetspot->color(FL_BACKGROUND2_COLOR); - valRTTYsweetspot->selection_color(FL_SELECTION_COLOR); + valRTTYsweetspot->color((Fl_Color)FL_BACKGROUND2_COLOR); + valRTTYsweetspot->selection_color((Fl_Color)FL_SELECTION_COLOR); valRTTYsweetspot->labeltype(FL_NORMAL_LABEL); valRTTYsweetspot->labelfont(0); valRTTYsweetspot->labelsize(14); - valRTTYsweetspot->labelcolor(FL_FOREGROUND_COLOR); + valRTTYsweetspot->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); valRTTYsweetspot->minimum(200); valRTTYsweetspot->maximum(4000); valRTTYsweetspot->step(1); valRTTYsweetspot->value(1000); valRTTYsweetspot->callback((Fl_Callback*)cb_valRTTYsweetspot); - valRTTYsweetspot->align(Fl_Align(FL_ALIGN_LEFT)); + valRTTYsweetspot->align(FL_ALIGN_LEFT); valRTTYsweetspot->when(FL_WHEN_CHANGED); o->value(progdefaults.RTTYsweetspot); o->labelsize(FL_NORMAL_SIZE); @@ -7286,18 +7286,18 @@ d frequency")); { Fl_Value_Input2* o = valPSKsweetspot = new Fl_Value_Input2(443, 82, 65, 20, _("PSK et al.")); valPSKsweetspot->tooltip(_("Default for all other modems")); valPSKsweetspot->box(FL_DOWN_BOX); - valPSKsweetspot->color(FL_BACKGROUND2_COLOR); - valPSKsweetspot->selection_color(FL_SELECTION_COLOR); + valPSKsweetspot->color((Fl_Color)FL_BACKGROUND2_COLOR); + valPSKsweetspot->selection_color((Fl_Color)FL_SELECTION_COLOR); valPSKsweetspot->labeltype(FL_NORMAL_LABEL); valPSKsweetspot->labelfont(0); valPSKsweetspot->labelsize(14); - valPSKsweetspot->labelcolor(FL_FOREGROUND_COLOR); + valPSKsweetspot->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); valPSKsweetspot->minimum(200); valPSKsweetspot->maximum(4000); valPSKsweetspot->step(1); valPSKsweetspot->value(1000); valPSKsweetspot->callback((Fl_Callback*)cb_valPSKsweetspot); - valPSKsweetspot->align(Fl_Align(FL_ALIGN_LEFT)); + valPSKsweetspot->align(FL_ALIGN_LEFT); valPSKsweetspot->when(FL_WHEN_CHANGED); o->value(progdefaults.PSKsweetspot); o->labelsize(FL_NORMAL_SIZE); @@ -7313,7 +7313,7 @@ d frequency")); } // Fl_Group* o { Fl_Group* o = new Fl_Group(28, 151, 490, 60, _("K3 A1A configuation")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Check_Button* o = btnCWIsLSB = new Fl_Check_Button(243, 172, 70, 15, _("CW is LSB")); btnCWIsLSB->tooltip(_("Select this for Elecraft K3\nOther radios should not need it.")); btnCWIsLSB->down_box(FL_DOWN_BOX); @@ -7328,13 +7328,13 @@ d frequency")); tabText_IO->hide(); { grpTalker = new Fl_Group(29, 132, 490, 73, _("Talker Socket (MS only)")); grpTalker->box(FL_ENGRAVED_FRAME); - grpTalker->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + grpTalker->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { btnConnectTalker = new Fl_Light_Button(55, 152, 74, 20, _("Talker")); - btnConnectTalker->selection_color(FL_DARK_GREEN); + btnConnectTalker->selection_color((Fl_Color)FL_DARK_GREEN); btnConnectTalker->callback((Fl_Callback*)cb_btnConnectTalker); } // Fl_Light_Button* btnConnectTalker { Fl_Box* o = new Fl_Box(134, 152, 345, 20, _("Connect/disconnect to Talker socket server")); - o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); } // Fl_Box* o { Fl_Check_Button* o = btn_auto_talk = new Fl_Check_Button(55, 180, 391, 15, _("Auto connect when fldigi opens (server must be up)")); btn_auto_talk->down_box(FL_DOWN_BOX); @@ -7345,7 +7345,7 @@ d frequency")); } // Fl_Group* grpTalker { Fl_Group* o = new Fl_Group(29, 72, 490, 56, _("Capture rx text to external file")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Check_Button* o = chkRxStream = new Fl_Check_Button(55, 99, 175, 20, _("Enable rx text stream")); chkRxStream->tooltip(_("Send rx text to file: textout.txt")); chkRxStream->down_box(FL_DOWN_BOX); @@ -7370,11 +7370,11 @@ d frequency")); tabWX->hide(); { Fl_Group* o = new Fl_Group(27, 60, 490, 300, _("Weather query specification")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Input* o = inpWXsta = new Fl_Input(92, 92, 43, 24, _("METAR station ID code")); inpWXsta->tooltip(_("for example KMDQ for \nHuntsville-Madison Executive Airport, AL")); inpWXsta->callback((Fl_Callback*)cb_inpWXsta); - inpWXsta->align(Fl_Align(FL_ALIGN_RIGHT)); + inpWXsta->align(FL_ALIGN_RIGHT); o->value(progdefaults.wx_sta.c_str()); } // Fl_Input* inpWXsta { Fl_Check_Button* o = btn_wx_full = new Fl_Check_Button(229, 130, 70, 15, _("Full report")); @@ -7432,13 +7432,13 @@ d frequency")); o->value(progdefaults.wx_mbars); } // Fl_Check_Button* btn_wx_mbars { Fl_Box* o = new Fl_Box(67, 212, 156, 19, _("Temperature")); - o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); } // Fl_Box* o { Fl_Box* o = new Fl_Box(67, 240, 156, 19, _("Wind speed/dir")); - o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); } // Fl_Box* o { Fl_Box* o = new Fl_Box(67, 269, 156, 19, _("Barometric pressure")); - o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); } // Fl_Box* o { btn_metar_search = new Fl_Button(308, 92, 130, 24, _("Search on web")); btn_metar_search->callback((Fl_Callback*)cb_btn_metar_search); @@ -7458,7 +7458,7 @@ d frequency")); { Fl_Group* o = new Fl_Group(0, 46, 540, 324, _("Call Lookup")); { Fl_Group* o = new Fl_Group(27, 52, 490, 122, _("Web Browser lookup")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Round_Button* o = btnQRZWEBnotavailable = new Fl_Round_Button(49, 78, 337, 20, _("None")); btnQRZWEBnotavailable->tooltip(_("Do not use callsign lookup via web browser")); btnQRZWEBnotavailable->down_box(FL_DOWN_BOX); @@ -7488,7 +7488,7 @@ d frequency")); } // Fl_Group* o { Fl_Group* o = new Fl_Group(27, 176, 490, 190, _("Data base lookup")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Round_Button* o = btnQRZXMLnotavailable = new Fl_Round_Button(49, 199, 337, 20, _("None")); btnQRZXMLnotavailable->tooltip(_("Do not use callsign database")); btnQRZXMLnotavailable->down_box(FL_DOWN_BOX); @@ -7529,14 +7529,14 @@ d frequency")); { Fl_Input2* o = txtQRZpathname = new Fl_Input2(174, 227, 300, 20, _("at:")); txtQRZpathname->tooltip(_("ie: /home/dave/CALLBK/ or C:/CALLBK/\nLeave blank to search for database")); txtQRZpathname->box(FL_DOWN_BOX); - txtQRZpathname->color(FL_BACKGROUND2_COLOR); - txtQRZpathname->selection_color(FL_SELECTION_COLOR); + txtQRZpathname->color((Fl_Color)FL_BACKGROUND2_COLOR); + txtQRZpathname->selection_color((Fl_Color)FL_SELECTION_COLOR); txtQRZpathname->labeltype(FL_NORMAL_LABEL); txtQRZpathname->labelfont(0); txtQRZpathname->labelsize(14); - txtQRZpathname->labelcolor(FL_FOREGROUND_COLOR); + txtQRZpathname->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); txtQRZpathname->callback((Fl_Callback*)cb_txtQRZpathname); - txtQRZpathname->align(Fl_Align(FL_ALIGN_LEFT)); + txtQRZpathname->align(FL_ALIGN_LEFT); txtQRZpathname->when(FL_WHEN_RELEASE); o->value(progdefaults.QRZpathname.c_str()); txtQRZpathname->labelsize(FL_NORMAL_SIZE); @@ -7544,14 +7544,14 @@ d frequency")); { Fl_Input2* o = inpQRZusername = new Fl_Input2(257, 255, 150, 20, _("User name")); inpQRZusername->tooltip(_("Your login name")); inpQRZusername->box(FL_DOWN_BOX); - inpQRZusername->color(FL_BACKGROUND2_COLOR); - inpQRZusername->selection_color(FL_SELECTION_COLOR); + inpQRZusername->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpQRZusername->selection_color((Fl_Color)FL_SELECTION_COLOR); inpQRZusername->labeltype(FL_NORMAL_LABEL); inpQRZusername->labelfont(0); inpQRZusername->labelsize(14); - inpQRZusername->labelcolor(FL_FOREGROUND_COLOR); + inpQRZusername->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); inpQRZusername->callback((Fl_Callback*)cb_inpQRZusername); - inpQRZusername->align(Fl_Align(FL_ALIGN_LEFT)); + inpQRZusername->align(FL_ALIGN_LEFT); inpQRZusername->when(FL_WHEN_RELEASE); o->value(progdefaults.QRZusername.c_str()); inpQRZusername->labelsize(FL_NORMAL_SIZE); @@ -7559,14 +7559,14 @@ d frequency")); { Fl_Input2* o = inpQRZuserpassword = new Fl_Input2(257, 281, 150, 20, _("Password")); inpQRZuserpassword->tooltip(_("Your login password")); inpQRZuserpassword->box(FL_DOWN_BOX); - inpQRZuserpassword->color(FL_BACKGROUND2_COLOR); - inpQRZuserpassword->selection_color(FL_SELECTION_COLOR); + inpQRZuserpassword->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpQRZuserpassword->selection_color((Fl_Color)FL_SELECTION_COLOR); inpQRZuserpassword->labeltype(FL_NORMAL_LABEL); inpQRZuserpassword->labelfont(0); inpQRZuserpassword->labelsize(14); - inpQRZuserpassword->labelcolor(FL_FOREGROUND_COLOR); + inpQRZuserpassword->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); inpQRZuserpassword->callback((Fl_Callback*)cb_inpQRZuserpassword); - inpQRZuserpassword->align(Fl_Align(FL_ALIGN_LEFT)); + inpQRZuserpassword->align(FL_ALIGN_LEFT); inpQRZuserpassword->when(FL_WHEN_RELEASE); o->value(progdefaults.QRZuserpassword.c_str()); o->type(FL_SECRET_INPUT); @@ -7585,14 +7585,14 @@ d frequency")); { Fl_Input2* o = inpEQSL_id = new Fl_Input2(194, 58, 150, 20, _("User ID")); inpEQSL_id->tooltip(_("Your login name")); inpEQSL_id->box(FL_DOWN_BOX); - inpEQSL_id->color(FL_BACKGROUND2_COLOR); - inpEQSL_id->selection_color(FL_SELECTION_COLOR); + inpEQSL_id->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpEQSL_id->selection_color((Fl_Color)FL_SELECTION_COLOR); inpEQSL_id->labeltype(FL_NORMAL_LABEL); inpEQSL_id->labelfont(0); inpEQSL_id->labelsize(14); - inpEQSL_id->labelcolor(FL_FOREGROUND_COLOR); + inpEQSL_id->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); inpEQSL_id->callback((Fl_Callback*)cb_inpEQSL_id); - inpEQSL_id->align(Fl_Align(FL_ALIGN_LEFT)); + inpEQSL_id->align(FL_ALIGN_LEFT); inpEQSL_id->when(FL_WHEN_RELEASE); o->value(progdefaults.eqsl_id.c_str()); inpEQSL_id->labelsize(FL_NORMAL_SIZE); @@ -7600,14 +7600,14 @@ d frequency")); { Fl_Input2* o = inpEQSL_pwd = new Fl_Input2(194, 85, 150, 20, _("Password")); inpEQSL_pwd->tooltip(_("Your login password")); inpEQSL_pwd->box(FL_DOWN_BOX); - inpEQSL_pwd->color(FL_BACKGROUND2_COLOR); - inpEQSL_pwd->selection_color(FL_SELECTION_COLOR); + inpEQSL_pwd->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpEQSL_pwd->selection_color((Fl_Color)FL_SELECTION_COLOR); inpEQSL_pwd->labeltype(FL_NORMAL_LABEL); inpEQSL_pwd->labelfont(0); inpEQSL_pwd->labelsize(14); - inpEQSL_pwd->labelcolor(FL_FOREGROUND_COLOR); + inpEQSL_pwd->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); inpEQSL_pwd->callback((Fl_Callback*)cb_inpEQSL_pwd); - inpEQSL_pwd->align(Fl_Align(FL_ALIGN_LEFT)); + inpEQSL_pwd->align(FL_ALIGN_LEFT); inpEQSL_pwd->when(FL_WHEN_RELEASE); o->value(progdefaults.eqsl_pwd.c_str()); o->type(FL_SECRET_INPUT); @@ -7620,21 +7620,21 @@ d frequency")); { Fl_Input2* o = inpEQSL_nick = new Fl_Input2(194, 114, 150, 20, _("QTH Nickname")); inpEQSL_nick->tooltip(_("Your login name")); inpEQSL_nick->box(FL_DOWN_BOX); - inpEQSL_nick->color(FL_BACKGROUND2_COLOR); - inpEQSL_nick->selection_color(FL_SELECTION_COLOR); + inpEQSL_nick->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpEQSL_nick->selection_color((Fl_Color)FL_SELECTION_COLOR); inpEQSL_nick->labeltype(FL_NORMAL_LABEL); inpEQSL_nick->labelfont(0); inpEQSL_nick->labelsize(14); - inpEQSL_nick->labelcolor(FL_FOREGROUND_COLOR); + inpEQSL_nick->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); inpEQSL_nick->callback((Fl_Callback*)cb_inpEQSL_nick); - inpEQSL_nick->align(Fl_Align(FL_ALIGN_LEFT)); + inpEQSL_nick->align(FL_ALIGN_LEFT); inpEQSL_nick->when(FL_WHEN_RELEASE); o->value(progdefaults.eqsl_nick.c_str()); inpEQSL_nick->labelsize(FL_NORMAL_SIZE); } // Fl_Input2* inpEQSL_nick { Fl_Group* o = new Fl_Group(22, 141, 492, 223, _("Options")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Check_Button* o = btn_send_when_logged = new Fl_Check_Button(47, 166, 70, 15, _("send when logged (log button, , )")); btn_send_when_logged->tooltip(_("automatic data upload")); btn_send_when_logged->down_box(FL_DOWN_BOX); @@ -7645,28 +7645,28 @@ d frequency")); txt_eqsl_default_message->tooltip(_("default text to send with etc")); txt_eqsl_default_message->type(4); txt_eqsl_default_message->box(FL_DOWN_BOX); - txt_eqsl_default_message->color(FL_BACKGROUND2_COLOR); - txt_eqsl_default_message->selection_color(FL_SELECTION_COLOR); + txt_eqsl_default_message->color((Fl_Color)FL_BACKGROUND2_COLOR); + txt_eqsl_default_message->selection_color((Fl_Color)FL_SELECTION_COLOR); txt_eqsl_default_message->labeltype(FL_NORMAL_LABEL); txt_eqsl_default_message->labelfont(0); txt_eqsl_default_message->labelsize(14); - txt_eqsl_default_message->labelcolor(FL_FOREGROUND_COLOR); + txt_eqsl_default_message->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); txt_eqsl_default_message->callback((Fl_Callback*)cb_txt_eqsl_default_message); - txt_eqsl_default_message->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + txt_eqsl_default_message->align(FL_ALIGN_TOP_LEFT); txt_eqsl_default_message->when(FL_WHEN_CHANGED); o->value(progdefaults.eqsl_default_message.c_str()); } // Fl_Input2* txt_eqsl_default_message { Fl_Group* o = new Fl_Group(26, 270, 484, 90, _("Text Tags (tags use {} delimiters)")); o->box(FL_THIN_DOWN_BOX); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { eqsl_txt1 = new Fl_Box(32, 317, 220, 17, _("{CALL} other ops call sign")); - eqsl_txt1->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); + eqsl_txt1->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); } // Fl_Box* eqsl_txt1 { eqsl_txt2 = new Fl_Box(30, 336, 220, 17, _("{MODE} full mode / submode")); - eqsl_txt2->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); + eqsl_txt2->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); } // Fl_Box* eqsl_txt2 { eqsl_txt3 = new Fl_Box(278, 317, 220, 17, _("{NAME} other ops name")); - eqsl_txt3->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); + eqsl_txt3->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); } // Fl_Box* eqsl_txt3 { new Fl_Box(46, 293, 440, 17, _("These tags can also be used in ")); } // Fl_Box* o @@ -7705,7 +7705,7 @@ d frequency")); void openConfig() { if (!dlgConfig) createConfig(); - progdefaults.loadDefaults(); +progdefaults.loadDefaults(); } void closeDialog() { @@ -7714,25 +7714,28 @@ void closeDialog() { void createConfig() { if (!dlgConfig) { - dlgConfig = ConfigureDialog(); - dlgConfig->xclass(PACKAGE_NAME); - } + dlgConfig = ConfigureDialog(); + dlgConfig->xclass(PACKAGE_NAME); + } } void WefaxDestDirSet(Fl_File_Chooser *w, void *userdata) { /* http://www.fltk.org/documentation.php/doc-1.1/Fl_File_Chooser.html */ - if( ( w->value() != NULL ) && ( ! w->shown() ) ) { - btnWefaxSaveDir->value( w->value() ); - btnWefaxSaveDir->redraw(); - cb_btnWefaxSaveDir( btnWefaxSaveDir, NULL ); - } +if( ( w->value() != NULL ) && ( ! w->shown() ) ) { + btnWefaxSaveDir->value( w->value() ); + btnWefaxSaveDir->redraw(); + cb_btnWefaxSaveDir( btnWefaxSaveDir, NULL ); +} } void NvtxCatalogSet(Fl_File_Chooser *w, void *userdata) { /* http://www.fltk.org/documentation.php/doc-1.1/Fl_File_Chooser.html */ - if( ( w->value() != NULL ) && ( ! w->shown() ) ) { - txtNvtxCatalog->value( w->value() ); - txtNvtxCatalog->redraw(); - cb_txtNvtxCatalog( txtNvtxCatalog, NULL ); - } +if( ( w->value() != NULL ) && ( ! w->shown() ) ) { + txtNvtxCatalog->value( w->value() ); + txtNvtxCatalog->redraw(); + cb_txtNvtxCatalog( txtNvtxCatalog, NULL ); +} +} + +void make_window() { } diff --git a/src/dialogs/confdialog.fl b/src/dialogs/confdialog.fl index 917347c9..23f5bee8 100644 --- a/src/dialogs/confdialog.fl +++ b/src/dialogs/confdialog.fl @@ -1,106 +1,84 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0300 +version 1.0110 i18n_type 1 i18n_include "gettext.h" i18n_function _ header_name {.h} code_name {.cxx} -decl {\#include } {private local +decl {\#include } {} + +decl {\#include } {} + +decl {\#include } {} + +decl {\#include } {} + +decl {\#include } {} + +decl {\#include "main.h"} {} + +decl {\#include "fl_digi.h"} {} + +decl {\#include "soundconf.h"} {} + +decl {\#include "globals.h"} {public } -decl {\#include } {private local +decl {\#include "modem.h"} {public } -decl {\#include } {private local +decl {\#include "configuration.h"} {public } -decl {\#include } {private local +decl {\#include "combo.h"} {public } -decl {\#include } {private local +decl {\#include "colorsfonts.h"} {} + +decl {\#include "waterfall.h"} {} + +decl {\#include "rigxml.h"} {} + +decl {\#include "lookupcall.h"} {} + +decl {\#include "icons.h"} {} + +decl {\#include "Viewer.h"} {} + +decl {\#include "pskrep.h"} {global } -decl {\#include "main.h"} {private local +decl {\#include "flinput2.h"} {public } -decl {\#include "fl_digi.h"} {private local +decl {\#include "flslider2.h"} {public } -decl {\#include "soundconf.h"} {private local +decl {\#include "flmisc.h"} {public } -decl {\#include "globals.h"} {public local -} +decl {\#include "logsupport.h"} {} -decl {\#include "modem.h"} {public local -} +decl {\#include "notify.h"} {} -decl {\#include "configuration.h"} {public local -} +decl {\#include "debug.h"} {} -decl {\#include "combo.h"} {public local -} +decl {\#include "status.h"} {} -decl {\#include "colorsfonts.h"} {private local -} +decl {\#include "rx_extract.h"} {} -decl {\#include "waterfall.h"} {private local -} +decl {extern void WefaxDestDirSet(Fl_File_Chooser *w, void *userdata);} {} -decl {\#include "rigxml.h"} {private local -} - -decl {\#include "lookupcall.h"} {private local -} - -decl {\#include "icons.h"} {private local -} - -decl {\#include "Viewer.h"} {private local -} - -decl {\#include "pskrep.h"} {private global -} - -decl {\#include "flinput2.h"} {public local -} - -decl {\#include "flslider2.h"} {public local -} - -decl {\#include "flmisc.h"} {public local -} - -decl {\#include "logsupport.h"} {private local -} - -decl {\#include "notify.h"} {private local -} - -decl {\#include "debug.h"} {private local -} - -decl {\#include "status.h"} {private local -} - -decl {\#include "rx_extract.h"} {private local -} - -decl {extern void WefaxDestDirSet(Fl_File_Chooser *w, void *userdata);} {private local -} - -decl {extern void NvtxCatalogSet(Fl_File_Chooser *w, void *userdata);} {private local -} +decl {extern void NvtxCatalogSet(Fl_File_Chooser *w, void *userdata);} {} decl {\#if USE_HAMLIB \#include "hamlib.h" -\#endif} {private local +\#endif} {} + +decl {Fl_Double_Window *dlgConfig;} {public } -decl {Fl_Double_Window *dlgConfig;} {public local -} - -decl {Mode_Browser* mode_browser;} {public local +decl {Mode_Browser* mode_browser;} {public } Function {set_qrzxml_buttons(Fl_Button* b)} {return_type void diff --git a/src/dialogs/fl_digi.cxx b/src/dialogs/fl_digi.cxx index 72bc0426..4a6b6670 100644 --- a/src/dialogs/fl_digi.cxx +++ b/src/dialogs/fl_digi.cxx @@ -6324,7 +6324,11 @@ int get_tx_char(void) if (progStatus.repeatMacro > -1 && text2repeat.length()) { char *repeat_content = &text2repeat[repeatchar]; tx_encoder.push(repeat_content); +#if FLDIGI_FLTK_API_MAJOR == 1 && FLDIGI_FLTK_API_MINOR == 3 repeatchar += fl_utf8len1(*repeat_content); +#else + repeatchar += 1; +#endif if (repeatchar == text2repeat.length()) { text2repeat.clear(); @@ -6381,18 +6385,30 @@ int get_tx_char(void) } break; default: +#if FLDIGI_FLTK_API_MAJOR == 1 && FLDIGI_FLTK_API_MINOR == 3 char utf8_char[6]; int utf8_len = fl_utf8encode(c, utf8_char); tx_encoder.push("^" + string(utf8_char, utf8_len)); +#else + string tmp("^"); + tmp += c; + tx_encoder.push(tmp); +#endif } } else if (c == '\n') { tx_encoder.push("\r\n"); } else { +#if FLDIGI_FLTK_API_MAJOR == 1 && FLDIGI_FLTK_API_MINOR == 3 char utf8_char[6]; int utf8_len = fl_utf8encode(c, utf8_char); tx_encoder.push(string(utf8_char, utf8_len)); +#else + string tmp; + tmp += c; + tx_encoder.push(tmp); +#endif } transmit: diff --git a/src/dialogs/notifydialog.cxx b/src/dialogs/notifydialog.cxx index 3a2ff656..f755e5f7 100644 --- a/src/dialogs/notifydialog.cxx +++ b/src/dialogs/notifydialog.cxx @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0300 +// generated by Fast Light User Interface Designer (fluid) version 1.0110 #include "gettext.h" #include "notifydialog.h" @@ -9,10 +9,10 @@ Fl_Group *grpNotifyEvent=(Fl_Group *)0; Fl_Choice *mnuNotifyEvent=(Fl_Choice *)0; -Fl_Light_Button *btnNotifyEnabled=(Fl_Light_Button *)0; - Fl_Input2 *inpNotifyRE=(Fl_Input2 *)0; +Fl_Light_Button *btnNotifyEnabled=(Fl_Light_Button *)0; + Fl_Group *grpNotifyFilter=(Fl_Group *)0; Fl_Round_Button *chkNotifyFilterCall=(Fl_Round_Button *)0; @@ -105,42 +105,42 @@ Fl_Double_Window* make_notify_window() { w = o; { grpNotifyEvent = new Fl_Group(2, 2, 219, 126, _("Event")); grpNotifyEvent->box(FL_ENGRAVED_FRAME); - grpNotifyEvent->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + grpNotifyEvent->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { mnuNotifyEvent = new Fl_Choice(10, 29, 205, 22); mnuNotifyEvent->down_box(FL_BORDER_BOX); } // Fl_Choice* mnuNotifyEvent - { btnNotifyEnabled = new Fl_Light_Button(131, 94, 80, 23, _("Enabled")); - } // Fl_Light_Button* btnNotifyEnabled { Fl_Input2* o = inpNotifyRE = new Fl_Input2(36, 61, 175, 23, _("RE:")); inpNotifyRE->box(FL_DOWN_BOX); - inpNotifyRE->color(FL_BACKGROUND2_COLOR); - inpNotifyRE->selection_color(FL_SELECTION_COLOR); + inpNotifyRE->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpNotifyRE->selection_color((Fl_Color)FL_SELECTION_COLOR); inpNotifyRE->labeltype(FL_NORMAL_LABEL); inpNotifyRE->labelfont(0); inpNotifyRE->labelsize(14); - inpNotifyRE->labelcolor(FL_FOREGROUND_COLOR); - inpNotifyRE->align(Fl_Align(FL_ALIGN_LEFT)); + inpNotifyRE->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpNotifyRE->align(FL_ALIGN_LEFT); inpNotifyRE->when(FL_WHEN_RELEASE); o->labelsize(FL_NORMAL_SIZE); } // Fl_Input2* inpNotifyRE + { btnNotifyEnabled = new Fl_Light_Button(131, 94, 80, 23, _("Enabled")); + } // Fl_Light_Button* btnNotifyEnabled grpNotifyEvent->end(); } // Fl_Group* grpNotifyEvent { grpNotifyFilter = new Fl_Group(2, 130, 219, 176, _("Filter")); grpNotifyFilter->box(FL_ENGRAVED_FRAME); - grpNotifyFilter->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + grpNotifyFilter->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { chkNotifyFilterCall = new Fl_Round_Button(12, 157, 80, 20, _("Callsign")); chkNotifyFilterCall->down_box(FL_ROUND_DOWN_BOX); chkNotifyFilterCall->callback((Fl_Callback*)cb_chkNotifyFilterCall); } // Fl_Round_Button* chkNotifyFilterCall { inpNotifyFilterCall = new Fl_Input2(131, 157, 80, 20); inpNotifyFilterCall->box(FL_DOWN_BOX); - inpNotifyFilterCall->color(FL_BACKGROUND2_COLOR); - inpNotifyFilterCall->selection_color(FL_SELECTION_COLOR); + inpNotifyFilterCall->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpNotifyFilterCall->selection_color((Fl_Color)FL_SELECTION_COLOR); inpNotifyFilterCall->labeltype(FL_NORMAL_LABEL); inpNotifyFilterCall->labelfont(0); inpNotifyFilterCall->labelsize(14); - inpNotifyFilterCall->labelcolor(FL_FOREGROUND_COLOR); - inpNotifyFilterCall->align(Fl_Align(FL_ALIGN_CENTER)); + inpNotifyFilterCall->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpNotifyFilterCall->align(FL_ALIGN_CENTER); inpNotifyFilterCall->when(FL_WHEN_RELEASE); } // Fl_Input2* inpNotifyFilterCall { chkNotifyFilterDXCC = new Fl_Round_Button(12, 186, 110, 20, _("DXCC entity")); @@ -163,7 +163,7 @@ Fl_Double_Window* make_notify_window() { } // Fl_Group* grpNotifyFilter { grpNotifyDup = new Fl_Group(2, 308, 219, 149, _("Duplicates")); grpNotifyDup->box(FL_ENGRAVED_FRAME); - grpNotifyDup->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + grpNotifyDup->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { chkNotifyDupIgnore = new Fl_Check_Button(12, 337, 145, 20, _("Ignore duplicates")); chkNotifyDupIgnore->down_box(FL_DOWN_BOX); } // Fl_Check_Button* chkNotifyDupIgnore @@ -172,16 +172,16 @@ Fl_Double_Window* make_notify_window() { } // Fl_Choice* mnuNotifyDupWhich { Fl_Spinner2* o = cntNotifyDupTime = new Fl_Spinner2(93, 397, 60, 20, _("Time (s):")); cntNotifyDupTime->box(FL_NO_BOX); - cntNotifyDupTime->color(FL_BACKGROUND_COLOR); - cntNotifyDupTime->selection_color(FL_BACKGROUND_COLOR); + cntNotifyDupTime->color((Fl_Color)FL_BACKGROUND_COLOR); + cntNotifyDupTime->selection_color((Fl_Color)FL_BACKGROUND_COLOR); cntNotifyDupTime->labeltype(FL_NORMAL_LABEL); cntNotifyDupTime->labelfont(0); cntNotifyDupTime->labelsize(14); - cntNotifyDupTime->labelcolor(FL_FOREGROUND_COLOR); + cntNotifyDupTime->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntNotifyDupTime->minimum(0); cntNotifyDupTime->maximum(97200); cntNotifyDupTime->value(600); - cntNotifyDupTime->align(Fl_Align(FL_ALIGN_LEFT)); + cntNotifyDupTime->align(FL_ALIGN_LEFT); cntNotifyDupTime->when(FL_WHEN_RELEASE); o->labelsize(FL_NORMAL_SIZE); } // Fl_Spinner2* cntNotifyDupTime @@ -195,32 +195,32 @@ Fl_Double_Window* make_notify_window() { } // Fl_Group* grpNotifyDup { grpNotifyAction = new Fl_Group(222, 2, 276, 394, _("Action")); grpNotifyAction->box(FL_ENGRAVED_FRAME); - grpNotifyAction->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + grpNotifyAction->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { Fl_Spinner2* o = cntNotifyActionLimit = new Fl_Spinner2(232, 40, 52, 20, _("Trigger limit (s):")); cntNotifyActionLimit->tooltip(_("Minimum time between events")); cntNotifyActionLimit->box(FL_NO_BOX); - cntNotifyActionLimit->color(FL_BACKGROUND_COLOR); - cntNotifyActionLimit->selection_color(FL_BACKGROUND_COLOR); + cntNotifyActionLimit->color((Fl_Color)FL_BACKGROUND_COLOR); + cntNotifyActionLimit->selection_color((Fl_Color)FL_BACKGROUND_COLOR); cntNotifyActionLimit->labeltype(FL_NORMAL_LABEL); cntNotifyActionLimit->labelfont(0); cntNotifyActionLimit->labelsize(14); - cntNotifyActionLimit->labelcolor(FL_FOREGROUND_COLOR); + cntNotifyActionLimit->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntNotifyActionLimit->minimum(0); cntNotifyActionLimit->maximum(3600); - cntNotifyActionLimit->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + cntNotifyActionLimit->align(FL_ALIGN_TOP_LEFT); cntNotifyActionLimit->when(FL_WHEN_RELEASE); o->labelsize(FL_NORMAL_SIZE); } // Fl_Spinner2* cntNotifyActionLimit { Fl_Input2* o = inpNotifyActionDialog = new Fl_Input2(232, 82, 218, 60, _("Show alert window:")); inpNotifyActionDialog->type(4); inpNotifyActionDialog->box(FL_DOWN_BOX); - inpNotifyActionDialog->color(FL_BACKGROUND2_COLOR); - inpNotifyActionDialog->selection_color(FL_SELECTION_COLOR); + inpNotifyActionDialog->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpNotifyActionDialog->selection_color((Fl_Color)FL_SELECTION_COLOR); inpNotifyActionDialog->labeltype(FL_NORMAL_LABEL); inpNotifyActionDialog->labelfont(0); inpNotifyActionDialog->labelsize(14); - inpNotifyActionDialog->labelcolor(FL_FOREGROUND_COLOR); - inpNotifyActionDialog->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpNotifyActionDialog->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpNotifyActionDialog->align(FL_ALIGN_TOP_LEFT); inpNotifyActionDialog->when(FL_WHEN_RELEASE); o->labelsize(FL_NORMAL_SIZE); } // Fl_Input2* inpNotifyActionDialog @@ -229,29 +229,29 @@ Fl_Double_Window* make_notify_window() { } // Fl_Button* btnNotifyActionDialogDefault { Fl_Spinner2* o = cntNotifyActionDialogTimeout = new Fl_Spinner2(232, 164, 52, 20, _("Hide window after (s):")); cntNotifyActionDialogTimeout->box(FL_NO_BOX); - cntNotifyActionDialogTimeout->color(FL_BACKGROUND_COLOR); - cntNotifyActionDialogTimeout->selection_color(FL_BACKGROUND_COLOR); + cntNotifyActionDialogTimeout->color((Fl_Color)FL_BACKGROUND_COLOR); + cntNotifyActionDialogTimeout->selection_color((Fl_Color)FL_BACKGROUND_COLOR); cntNotifyActionDialogTimeout->labeltype(FL_NORMAL_LABEL); cntNotifyActionDialogTimeout->labelfont(0); cntNotifyActionDialogTimeout->labelsize(14); - cntNotifyActionDialogTimeout->labelcolor(FL_FOREGROUND_COLOR); + cntNotifyActionDialogTimeout->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cntNotifyActionDialogTimeout->minimum(0); cntNotifyActionDialogTimeout->maximum(3600); cntNotifyActionDialogTimeout->value(5); - cntNotifyActionDialogTimeout->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + cntNotifyActionDialogTimeout->align(FL_ALIGN_TOP_LEFT); cntNotifyActionDialogTimeout->when(FL_WHEN_RELEASE); o->labelsize(FL_NORMAL_SIZE); } // Fl_Spinner2* cntNotifyActionDialogTimeout { Fl_Input2* o = inpNotifyActionRXMarker = new Fl_Input2(232, 205, 218, 60, _("Append to RX text:")); inpNotifyActionRXMarker->type(4); inpNotifyActionRXMarker->box(FL_DOWN_BOX); - inpNotifyActionRXMarker->color(FL_BACKGROUND2_COLOR); - inpNotifyActionRXMarker->selection_color(FL_SELECTION_COLOR); + inpNotifyActionRXMarker->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpNotifyActionRXMarker->selection_color((Fl_Color)FL_SELECTION_COLOR); inpNotifyActionRXMarker->labeltype(FL_NORMAL_LABEL); inpNotifyActionRXMarker->labelfont(0); inpNotifyActionRXMarker->labelsize(14); - inpNotifyActionRXMarker->labelcolor(FL_FOREGROUND_COLOR); - inpNotifyActionRXMarker->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpNotifyActionRXMarker->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpNotifyActionRXMarker->align(FL_ALIGN_TOP_LEFT); inpNotifyActionRXMarker->when(FL_WHEN_RELEASE); o->labelsize(FL_NORMAL_SIZE); } // Fl_Input2* inpNotifyActionRXMarker @@ -261,13 +261,13 @@ Fl_Double_Window* make_notify_window() { { Fl_Input2* o = inpNotifyActionMacro = new Fl_Input2(232, 287, 218, 60, _("Append to TX text:")); inpNotifyActionMacro->type(4); inpNotifyActionMacro->box(FL_DOWN_BOX); - inpNotifyActionMacro->color(FL_BACKGROUND2_COLOR); - inpNotifyActionMacro->selection_color(FL_SELECTION_COLOR); + inpNotifyActionMacro->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpNotifyActionMacro->selection_color((Fl_Color)FL_SELECTION_COLOR); inpNotifyActionMacro->labeltype(FL_NORMAL_LABEL); inpNotifyActionMacro->labelfont(0); inpNotifyActionMacro->labelsize(14); - inpNotifyActionMacro->labelcolor(FL_FOREGROUND_COLOR); - inpNotifyActionMacro->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpNotifyActionMacro->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpNotifyActionMacro->align(FL_ALIGN_TOP_LEFT); inpNotifyActionMacro->when(FL_WHEN_RELEASE); o->labelsize(FL_NORMAL_SIZE); } // Fl_Input2* inpNotifyActionMacro @@ -276,13 +276,13 @@ Fl_Double_Window* make_notify_window() { } // Fl_Button* btnNotifyActionMacro { Fl_Input2* o = inpNotifyActionProgram = new Fl_Input2(232, 368, 218, 23, _("Run program:")); inpNotifyActionProgram->box(FL_DOWN_BOX); - inpNotifyActionProgram->color(FL_BACKGROUND2_COLOR); - inpNotifyActionProgram->selection_color(FL_SELECTION_COLOR); + inpNotifyActionProgram->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpNotifyActionProgram->selection_color((Fl_Color)FL_SELECTION_COLOR); inpNotifyActionProgram->labeltype(FL_NORMAL_LABEL); inpNotifyActionProgram->labelfont(0); inpNotifyActionProgram->labelsize(14); - inpNotifyActionProgram->labelcolor(FL_FOREGROUND_COLOR); - inpNotifyActionProgram->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpNotifyActionProgram->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpNotifyActionProgram->align(FL_ALIGN_TOP_LEFT); inpNotifyActionProgram->when(FL_WHEN_RELEASE); o->labelsize(FL_NORMAL_SIZE); } // Fl_Input2* inpNotifyActionProgram @@ -303,13 +303,13 @@ Fl_Double_Window* make_notify_window() { } // Fl_Button* btnNotifyClose { tblNotifyList = new Table(2, 460, 496, 88); tblNotifyList->box(FL_UP_FRAME); - tblNotifyList->color(FL_BACKGROUND_COLOR); - tblNotifyList->selection_color(FL_SELECTION_COLOR); + tblNotifyList->color((Fl_Color)FL_BACKGROUND_COLOR); + tblNotifyList->selection_color((Fl_Color)FL_SELECTION_COLOR); tblNotifyList->labeltype(FL_NORMAL_LABEL); tblNotifyList->labelfont(0); tblNotifyList->labelsize(14); - tblNotifyList->labelcolor(FL_FOREGROUND_COLOR); - tblNotifyList->align(Fl_Align(FL_ALIGN_CENTER)); + tblNotifyList->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + tblNotifyList->align(FL_ALIGN_CENTER); tblNotifyList->when(FL_WHEN_RELEASE); Fl_Group::current()->resizable(tblNotifyList); } // Table* tblNotifyList @@ -341,38 +341,38 @@ Fl_Double_Window* make_dxcc_window() { w = o; { tblNotifyFilterDXCC = new Table(2, 2, 432, 370); tblNotifyFilterDXCC->box(FL_UP_FRAME); - tblNotifyFilterDXCC->color(FL_BACKGROUND2_COLOR); - tblNotifyFilterDXCC->selection_color(FL_SELECTION_COLOR); + tblNotifyFilterDXCC->color((Fl_Color)FL_BACKGROUND2_COLOR); + tblNotifyFilterDXCC->selection_color((Fl_Color)FL_SELECTION_COLOR); tblNotifyFilterDXCC->labeltype(FL_NORMAL_LABEL); tblNotifyFilterDXCC->labelfont(0); tblNotifyFilterDXCC->labelsize(14); - tblNotifyFilterDXCC->labelcolor(FL_FOREGROUND_COLOR); - tblNotifyFilterDXCC->align(Fl_Align(FL_ALIGN_CENTER)); + tblNotifyFilterDXCC->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + tblNotifyFilterDXCC->align(FL_ALIGN_CENTER); tblNotifyFilterDXCC->when(FL_WHEN_RELEASE); Fl_Group::current()->resizable(tblNotifyFilterDXCC); } // Table* tblNotifyFilterDXCC { Fl_Input2* o = inpNotifyDXCCSearchCountry = new Fl_Input2(104, 382, 120, 23, _("Find country:")); inpNotifyDXCCSearchCountry->tooltip(_("Press return to continue the search")); inpNotifyDXCCSearchCountry->box(FL_DOWN_BOX); - inpNotifyDXCCSearchCountry->color(FL_BACKGROUND2_COLOR); - inpNotifyDXCCSearchCountry->selection_color(FL_SELECTION_COLOR); + inpNotifyDXCCSearchCountry->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpNotifyDXCCSearchCountry->selection_color((Fl_Color)FL_SELECTION_COLOR); inpNotifyDXCCSearchCountry->labeltype(FL_NORMAL_LABEL); inpNotifyDXCCSearchCountry->labelfont(0); inpNotifyDXCCSearchCountry->labelsize(14); - inpNotifyDXCCSearchCountry->labelcolor(FL_FOREGROUND_COLOR); - inpNotifyDXCCSearchCountry->align(Fl_Align(FL_ALIGN_LEFT)); + inpNotifyDXCCSearchCountry->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpNotifyDXCCSearchCountry->align(FL_ALIGN_LEFT); inpNotifyDXCCSearchCountry->when(FL_WHEN_RELEASE); o->labelsize(FL_NORMAL_SIZE); } // Fl_Input2* inpNotifyDXCCSearchCountry { Fl_Input2* o = inpNotifyDXCCSearchCallsign = new Fl_Input2(104, 415, 120, 23, _("Find prefix:")); inpNotifyDXCCSearchCallsign->box(FL_DOWN_BOX); - inpNotifyDXCCSearchCallsign->color(FL_BACKGROUND2_COLOR); - inpNotifyDXCCSearchCallsign->selection_color(FL_SELECTION_COLOR); + inpNotifyDXCCSearchCallsign->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpNotifyDXCCSearchCallsign->selection_color((Fl_Color)FL_SELECTION_COLOR); inpNotifyDXCCSearchCallsign->labeltype(FL_NORMAL_LABEL); inpNotifyDXCCSearchCallsign->labelfont(0); inpNotifyDXCCSearchCallsign->labelsize(14); - inpNotifyDXCCSearchCallsign->labelcolor(FL_FOREGROUND_COLOR); - inpNotifyDXCCSearchCallsign->align(Fl_Align(FL_ALIGN_LEFT)); + inpNotifyDXCCSearchCallsign->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpNotifyDXCCSearchCallsign->align(FL_ALIGN_LEFT); inpNotifyDXCCSearchCallsign->when(FL_WHEN_RELEASE); o->labelsize(FL_NORMAL_SIZE); } // Fl_Input2* inpNotifyDXCCSearchCallsign diff --git a/src/dialogs/notifydialog.fl b/src/dialogs/notifydialog.fl index 899bdd7e..6d854396 100644 --- a/src/dialogs/notifydialog.fl +++ b/src/dialogs/notifydialog.fl @@ -1,12 +1,11 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0300 +version 1.0110 i18n_type 1 i18n_include "gettext.h" i18n_function _ header_name {.h} code_name {.cxx} -decl {\#include } {private local -} +decl {\#include } {} decl {\#include "table.h"} {public global } @@ -17,32 +16,31 @@ decl {\#include "flinput2.h"} {public global decl {\#include "flslider2.h"} {public global } -decl {\#include "notify.h"} {private local -} +decl {\#include "notify.h"} {} Function {make_notify_window()} {open } { Fl_Window {} { label Notifications open - xywh {671 439 500 550} type Double resizable size_range {500 550 0 0} visible + xywh {671 315 500 550} type Double resizable size_range {500 550 0 0} visible } { Fl_Group grpNotifyEvent { label Event open xywh {2 2 219 126} box ENGRAVED_FRAME align 21 } { - Fl_Choice mnuNotifyEvent {open selected + Fl_Choice mnuNotifyEvent {open xywh {10 29 205 22} down_box BORDER_BOX } {} - Fl_Light_Button btnNotifyEnabled { - label Enabled - xywh {131 94 80 23} - } Fl_Input inpNotifyRE { - label {RE:} + label {RE:} selected xywh {36 61 175 23} code0 {o->labelsize(FL_NORMAL_SIZE);} class Fl_Input2 } + Fl_Light_Button btnNotifyEnabled { + label Enabled + xywh {131 94 80 23} + } } Fl_Group grpNotifyFilter { label Filter open diff --git a/src/flarq-src/arqdialogs.cxx b/src/flarq-src/arqdialogs.cxx index 2d49da68..b3e899d6 100644 --- a/src/flarq-src/arqdialogs.cxx +++ b/src/flarq-src/arqdialogs.cxx @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0300 +// generated by Fast Light User Interface Designer (fluid) version 1.0110 #include "arqdialogs.h" #include @@ -118,7 +118,7 @@ Fl_Double_Window* arq_dialog() { Fl_Double_Window* w; { Fl_Double_Window* o = new Fl_Double_Window(515, 415, "flarq"); w = o; - o->color(FL_LIGHT1); + o->color((Fl_Color)FL_LIGHT1); o->callback((Fl_Callback*)cb_flarq); { mnu = new Fl_Menu_Bar(0, 0, 516, 22); mnu->menu(menu_mnu); @@ -128,19 +128,19 @@ Fl_Double_Window* arq_dialog() { o->box(FL_ENGRAVED_FRAME); { btnCONNECT = new Fl_Button(5, 28, 90, 24, "Connnect"); btnCONNECT->tooltip("Connect to other station"); - btnCONNECT->color(FL_LIGHT1); + btnCONNECT->color((Fl_Color)FL_LIGHT1); btnCONNECT->callback((Fl_Callback*)cb_btnCONNECT); } // Fl_Button* btnCONNECT { txtURCALL = new Fl_Input2(97, 28, 70, 24); txtURCALL->tooltip("Connect-to callsign"); txtURCALL->box(FL_DOWN_BOX); - txtURCALL->color(FL_BACKGROUND2_COLOR); - txtURCALL->selection_color(FL_SELECTION_COLOR); + txtURCALL->color((Fl_Color)FL_BACKGROUND2_COLOR); + txtURCALL->selection_color((Fl_Color)FL_SELECTION_COLOR); txtURCALL->labeltype(FL_NORMAL_LABEL); txtURCALL->labelfont(0); txtURCALL->labelsize(14); - txtURCALL->labelcolor(FL_FOREGROUND_COLOR); - txtURCALL->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); + txtURCALL->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + txtURCALL->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); txtURCALL->when(FL_WHEN_RELEASE); } // Fl_Input2* txtURCALL { btnBEACON = new Fl_Light_Button(168, 28, 79, 24, "Beacon"); @@ -150,13 +150,13 @@ Fl_Double_Window* arq_dialog() { } // Fl_Light_Button* btnBEACON { Fl_Input2* o = txtBeaconing = new Fl_Input2(249, 28, 261, 24, "output:"); txtBeaconing->box(FL_FLAT_BOX); - txtBeaconing->color(FL_LIGHT1); - txtBeaconing->selection_color(FL_SELECTION_COLOR); + txtBeaconing->color((Fl_Color)FL_LIGHT1); + txtBeaconing->selection_color((Fl_Color)FL_SELECTION_COLOR); txtBeaconing->labeltype(FL_NORMAL_LABEL); txtBeaconing->labelfont(0); txtBeaconing->labelsize(14); - txtBeaconing->labelcolor(FL_FOREGROUND_COLOR); - txtBeaconing->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); + txtBeaconing->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + txtBeaconing->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); txtBeaconing->when(FL_WHEN_RELEASE); Fl_Group::current()->resizable(txtBeaconing); o->type(FL_NORMAL_OUTPUT); @@ -168,19 +168,19 @@ Fl_Double_Window* arq_dialog() { { indCONNECT = new Fl_Box(5, 60, 18, 18); indCONNECT->tooltip("ARQ state"); indCONNECT->box(FL_DIAMOND_DOWN_BOX); - indCONNECT->color(FL_LIGHT1); + indCONNECT->color((Fl_Color)FL_LIGHT1); indCONNECT->labelfont(13); - indCONNECT->align(Fl_Align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE)); + indCONNECT->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE); } // Fl_Box* indCONNECT { Fl_Input2* o = txtState = new Fl_Input2(27, 57, 483, 24, "Disconnecting"); txtState->box(FL_FLAT_BOX); - txtState->color(FL_LIGHT1); - txtState->selection_color(FL_SELECTION_COLOR); + txtState->color((Fl_Color)FL_LIGHT1); + txtState->selection_color((Fl_Color)FL_SELECTION_COLOR); txtState->labeltype(FL_NORMAL_LABEL); txtState->labelfont(0); txtState->labelsize(14); - txtState->labelcolor(FL_FOREGROUND_COLOR); - txtState->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); + txtState->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + txtState->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); txtState->when(FL_WHEN_RELEASE); Fl_Group::current()->resizable(txtState); o->type(FL_NORMAL_OUTPUT); @@ -199,26 +199,26 @@ Fl_Double_Window* arq_dialog() { { Fl_Input2* o = txtStatus = new Fl_Input2(5, 208, 220, 22); txtStatus->tooltip("Status messages"); txtStatus->box(FL_DOWN_BOX); - txtStatus->color(FL_BACKGROUND2_COLOR); - txtStatus->selection_color(FL_SELECTION_COLOR); + txtStatus->color((Fl_Color)FL_BACKGROUND2_COLOR); + txtStatus->selection_color((Fl_Color)FL_SELECTION_COLOR); txtStatus->labeltype(FL_NORMAL_LABEL); txtStatus->labelfont(0); txtStatus->labelsize(14); - txtStatus->labelcolor(FL_FOREGROUND_COLOR); - txtStatus->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); + txtStatus->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + txtStatus->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); txtStatus->when(FL_WHEN_RELEASE); Fl_Group::current()->resizable(txtStatus); o->type(FL_NORMAL_OUTPUT); } // Fl_Input2* txtStatus { Fl_Input2* o = txtStatus2 = new Fl_Input2(225, 208, 170, 22); txtStatus2->box(FL_DOWN_BOX); - txtStatus2->color(FL_BACKGROUND2_COLOR); - txtStatus2->selection_color(FL_SELECTION_COLOR); + txtStatus2->color((Fl_Color)FL_BACKGROUND2_COLOR); + txtStatus2->selection_color((Fl_Color)FL_SELECTION_COLOR); txtStatus2->labeltype(FL_NORMAL_LABEL); txtStatus2->labelfont(0); txtStatus2->labelsize(14); - txtStatus2->labelcolor(FL_FOREGROUND_COLOR); - txtStatus2->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); + txtStatus2->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + txtStatus2->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); txtStatus2->when(FL_WHEN_RELEASE); o->type(FL_NORMAL_OUTPUT); } // Fl_Input2* txtStatus2 @@ -236,7 +236,7 @@ Fl_Double_Window* arq_dialog() { } // Fl_Group* o { Fl_Group* o = new Fl_Group(0, 235, 515, 180, "Plain Talk"); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { txtRX = new Fl_Text_Display(5, 255, 505, 130); txtRX->box(FL_DOWN_BOX); txtRX->textfont(4); @@ -247,14 +247,14 @@ Fl_Double_Window* arq_dialog() { { txtTX = new Fl_Input2(5, 390, 450, 22, "input:"); txtTX->tooltip("Plain talk text - ENTER to send"); txtTX->box(FL_DOWN_BOX); - txtTX->color(FL_BACKGROUND2_COLOR); - txtTX->selection_color(FL_SELECTION_COLOR); + txtTX->color((Fl_Color)FL_BACKGROUND2_COLOR); + txtTX->selection_color((Fl_Color)FL_SELECTION_COLOR); txtTX->labeltype(FL_NORMAL_LABEL); txtTX->labelfont(0); txtTX->labelsize(14); - txtTX->labelcolor(FL_FOREGROUND_COLOR); + txtTX->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); txtTX->callback((Fl_Callback*)cb_txtTX); - txtTX->align(Fl_Align(FL_ALIGN_CENTER)); + txtTX->align(FL_ALIGN_CENTER); txtTX->when(FL_WHEN_ENTER_KEY); Fl_Group::current()->resizable(txtTX); txtTX->value(""); @@ -338,28 +338,28 @@ Fl_Double_Window* arq_configure() { w = o; { Fl_Input2* o = txtMyCall = new Fl_Input2(98, 13, 150, 24, "My Call:"); txtMyCall->box(FL_DOWN_BOX); - txtMyCall->color(FL_BACKGROUND2_COLOR); - txtMyCall->selection_color(FL_SELECTION_COLOR); + txtMyCall->color((Fl_Color)FL_BACKGROUND2_COLOR); + txtMyCall->selection_color((Fl_Color)FL_SELECTION_COLOR); txtMyCall->labeltype(FL_NORMAL_LABEL); txtMyCall->labelfont(0); txtMyCall->labelsize(14); - txtMyCall->labelcolor(FL_FOREGROUND_COLOR); + txtMyCall->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); txtMyCall->callback((Fl_Callback*)cb_txtMyCall); - txtMyCall->align(Fl_Align(FL_ALIGN_LEFT)); + txtMyCall->align(FL_ALIGN_LEFT); txtMyCall->when(FL_WHEN_RELEASE); o->value(MyCall.c_str()); } // Fl_Input2* txtMyCall { Fl_Input2* o = txtBEACONTXT = new Fl_Input2(98, 42, 370, 24, "Beacon Text"); txtBEACONTXT->tooltip("Text for the beacon 64 chars max"); txtBEACONTXT->box(FL_DOWN_BOX); - txtBEACONTXT->color(FL_BACKGROUND2_COLOR); - txtBEACONTXT->selection_color(FL_SELECTION_COLOR); + txtBEACONTXT->color((Fl_Color)FL_BACKGROUND2_COLOR); + txtBEACONTXT->selection_color((Fl_Color)FL_SELECTION_COLOR); txtBEACONTXT->labeltype(FL_NORMAL_LABEL); txtBEACONTXT->labelfont(0); txtBEACONTXT->labelsize(14); - txtBEACONTXT->labelcolor(FL_FOREGROUND_COLOR); + txtBEACONTXT->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); txtBEACONTXT->callback((Fl_Callback*)cb_txtBEACONTXT); - txtBEACONTXT->align(Fl_Align(FL_ALIGN_LEFT)); + txtBEACONTXT->align(FL_ALIGN_LEFT); txtBEACONTXT->when(FL_WHEN_RELEASE); Fl_Group::current()->resizable(txtBEACONTXT); o->value(beacontext.c_str()); @@ -367,14 +367,14 @@ Fl_Double_Window* arq_configure() { { Fl_Spinner2* o = spnRetries = new Fl_Spinner2(146, 71, 45, 22, "Retries:"); spnRetries->tooltip("# retries before connection declared down"); spnRetries->box(FL_NO_BOX); - spnRetries->color(FL_BACKGROUND_COLOR); - spnRetries->selection_color(FL_BACKGROUND_COLOR); + spnRetries->color((Fl_Color)FL_BACKGROUND_COLOR); + spnRetries->selection_color((Fl_Color)FL_BACKGROUND_COLOR); spnRetries->labeltype(FL_NORMAL_LABEL); spnRetries->labelfont(0); spnRetries->labelsize(14); - spnRetries->labelcolor(FL_FOREGROUND_COLOR); + spnRetries->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); spnRetries->callback((Fl_Callback*)cb_spnRetries); - spnRetries->align(Fl_Align(FL_ALIGN_LEFT)); + spnRetries->align(FL_ALIGN_LEFT); spnRetries->when(FL_WHEN_RELEASE); o->minimum(2); o->maximum(20); @@ -384,14 +384,14 @@ Fl_Double_Window* arq_configure() { { Fl_Spinner2* o = spnWaitTime = new Fl_Spinner2(121, 98, 70, 22, "Wait time (sec):"); spnWaitTime->tooltip("Time between retries"); spnWaitTime->box(FL_NO_BOX); - spnWaitTime->color(FL_BACKGROUND_COLOR); - spnWaitTime->selection_color(FL_BACKGROUND_COLOR); + spnWaitTime->color((Fl_Color)FL_BACKGROUND_COLOR); + spnWaitTime->selection_color((Fl_Color)FL_BACKGROUND_COLOR); spnWaitTime->labeltype(FL_NORMAL_LABEL); spnWaitTime->labelfont(0); spnWaitTime->labelsize(14); - spnWaitTime->labelcolor(FL_FOREGROUND_COLOR); + spnWaitTime->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); spnWaitTime->callback((Fl_Callback*)cb_spnWaitTime); - spnWaitTime->align(Fl_Align(FL_ALIGN_LEFT)); + spnWaitTime->align(FL_ALIGN_LEFT); spnWaitTime->when(FL_WHEN_RELEASE); o->minimum(10); o->maximum(30); @@ -401,14 +401,14 @@ Fl_Double_Window* arq_configure() { { Fl_Spinner2* o = spnTimeout = new Fl_Spinner2(121, 126, 70, 22, "Timeout (sec):"); spnTimeout->tooltip("Time out for dead connection"); spnTimeout->box(FL_NO_BOX); - spnTimeout->color(FL_BACKGROUND_COLOR); - spnTimeout->selection_color(FL_BACKGROUND_COLOR); + spnTimeout->color((Fl_Color)FL_BACKGROUND_COLOR); + spnTimeout->selection_color((Fl_Color)FL_BACKGROUND_COLOR); spnTimeout->labeltype(FL_NORMAL_LABEL); spnTimeout->labelfont(0); spnTimeout->labelsize(14); - spnTimeout->labelcolor(FL_FOREGROUND_COLOR); + spnTimeout->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); spnTimeout->callback((Fl_Callback*)cb_spnTimeout); - spnTimeout->align(Fl_Align(FL_ALIGN_LEFT)); + spnTimeout->align(FL_ALIGN_LEFT); spnTimeout->when(FL_WHEN_RELEASE); o->minimum(30); o->maximum(300); @@ -418,14 +418,14 @@ Fl_Double_Window* arq_configure() { { Fl_Spinner2* o = spnTxDelay = new Fl_Spinner2(317, 98, 70, 22, "Tx delay (msec):"); spnTxDelay->tooltip("delay from Rx to Tx"); spnTxDelay->box(FL_NO_BOX); - spnTxDelay->color(FL_BACKGROUND_COLOR); - spnTxDelay->selection_color(FL_BACKGROUND_COLOR); + spnTxDelay->color((Fl_Color)FL_BACKGROUND_COLOR); + spnTxDelay->selection_color((Fl_Color)FL_BACKGROUND_COLOR); spnTxDelay->labeltype(FL_NORMAL_LABEL); spnTxDelay->labelfont(0); spnTxDelay->labelsize(14); - spnTxDelay->labelcolor(FL_FOREGROUND_COLOR); + spnTxDelay->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); spnTxDelay->callback((Fl_Callback*)cb_spnTxDelay); - spnTxDelay->align(Fl_Align(FL_ALIGN_LEFT)); + spnTxDelay->align(FL_ALIGN_LEFT); spnTxDelay->when(FL_WHEN_RELEASE); o->minimum(200); o->maximum(2000); @@ -435,15 +435,15 @@ Fl_Double_Window* arq_configure() { { Fl_Spinner2* o = spnBcnInterval = new Fl_Spinner2(398, 71, 70, 22, "Beacon interval (sec)"); spnBcnInterval->tooltip("Time between beacon transmissions"); spnBcnInterval->box(FL_NO_BOX); - spnBcnInterval->color(FL_BACKGROUND_COLOR); - spnBcnInterval->selection_color(FL_BACKGROUND_COLOR); + spnBcnInterval->color((Fl_Color)FL_BACKGROUND_COLOR); + spnBcnInterval->selection_color((Fl_Color)FL_BACKGROUND_COLOR); spnBcnInterval->labeltype(FL_NORMAL_LABEL); spnBcnInterval->labelfont(0); spnBcnInterval->labelsize(14); - spnBcnInterval->labelcolor(FL_FOREGROUND_COLOR); + spnBcnInterval->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); spnBcnInterval->value(120); spnBcnInterval->callback((Fl_Callback*)cb_spnBcnInterval); - spnBcnInterval->align(Fl_Align(FL_ALIGN_LEFT)); + spnBcnInterval->align(FL_ALIGN_LEFT); spnBcnInterval->when(FL_WHEN_RELEASE); o->minimum(60); o->maximum(3600); o->step(30); @@ -454,14 +454,14 @@ Fl_Double_Window* arq_configure() { } // Fl_Button* btnOK { choiceBlockSize = new Fl_ComboBox(314, 126, 72, 24, "Block Size:"); choiceBlockSize->box(FL_DOWN_BOX); - choiceBlockSize->color(FL_BACKGROUND2_COLOR); - choiceBlockSize->selection_color(FL_BACKGROUND_COLOR); + choiceBlockSize->color((Fl_Color)FL_BACKGROUND2_COLOR); + choiceBlockSize->selection_color((Fl_Color)FL_BACKGROUND_COLOR); choiceBlockSize->labeltype(FL_NORMAL_LABEL); choiceBlockSize->labelfont(0); choiceBlockSize->labelsize(14); - choiceBlockSize->labelcolor(FL_FOREGROUND_COLOR); + choiceBlockSize->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); choiceBlockSize->callback((Fl_Callback*)cb_choiceBlockSize); - choiceBlockSize->align(Fl_Align(FL_ALIGN_LEFT)); + choiceBlockSize->align(FL_ALIGN_LEFT); choiceBlockSize->when(FL_WHEN_RELEASE); choiceBlockSize->end(); } // Fl_ComboBox* choiceBlockSize @@ -490,13 +490,13 @@ Fl_Double_Window* arq_SendSelect() { w = o; { tblOutgoing = new Table(0, 3, 500, 140); tblOutgoing->box(FL_DOWN_BOX); - tblOutgoing->color(FL_BACKGROUND2_COLOR); + tblOutgoing->color((Fl_Color)FL_BACKGROUND2_COLOR); tblOutgoing->selection_color((Fl_Color)246); tblOutgoing->labeltype(FL_NORMAL_LABEL); tblOutgoing->labelfont(0); tblOutgoing->labelsize(14); - tblOutgoing->labelcolor(FL_FOREGROUND_COLOR); - tblOutgoing->align(Fl_Align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE)); + tblOutgoing->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + tblOutgoing->align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE); tblOutgoing->when(FL_WHEN_RELEASE); } // Table* tblOutgoing { send_Cancel = new Fl_Button(335, 145, 70, 20, "Cancel"); @@ -554,24 +554,24 @@ Fl_Double_Window* arq_composer() { w = o; { inpMailTo = new Fl_Input2(48, 4, 460, 24, "To:"); inpMailTo->box(FL_DOWN_BOX); - inpMailTo->color(FL_BACKGROUND2_COLOR); - inpMailTo->selection_color(FL_SELECTION_COLOR); + inpMailTo->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpMailTo->selection_color((Fl_Color)FL_SELECTION_COLOR); inpMailTo->labeltype(FL_NORMAL_LABEL); inpMailTo->labelfont(0); inpMailTo->labelsize(14); - inpMailTo->labelcolor(FL_FOREGROUND_COLOR); - inpMailTo->align(Fl_Align(FL_ALIGN_LEFT)); + inpMailTo->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpMailTo->align(FL_ALIGN_LEFT); inpMailTo->when(FL_WHEN_RELEASE); } // Fl_Input2* inpMailTo { inpMailSubj = new Fl_Input2(48, 30, 460, 24, "Subj:"); inpMailSubj->box(FL_DOWN_BOX); - inpMailSubj->color(FL_BACKGROUND2_COLOR); - inpMailSubj->selection_color(FL_SELECTION_COLOR); + inpMailSubj->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpMailSubj->selection_color((Fl_Color)FL_SELECTION_COLOR); inpMailSubj->labeltype(FL_NORMAL_LABEL); inpMailSubj->labelfont(0); inpMailSubj->labelsize(14); - inpMailSubj->labelcolor(FL_FOREGROUND_COLOR); - inpMailSubj->align(Fl_Align(FL_ALIGN_LEFT)); + inpMailSubj->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpMailSubj->align(FL_ALIGN_LEFT); inpMailSubj->when(FL_WHEN_RELEASE); } // Fl_Input2* inpMailSubj { txtMailText = new Fl_Text_Editor(0, 56, 510, 188); diff --git a/src/flarq-src/include/arqdialogs.h b/src/flarq-src/include/arqdialogs.h index 7e702ce4..7c247a03 100644 --- a/src/flarq-src/include/arqdialogs.h +++ b/src/flarq-src/include/arqdialogs.h @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0300 +// generated by Fast Light User Interface Designer (fluid) version 1.0110 #ifndef arqdialogs_h #define arqdialogs_h diff --git a/src/include/colorsfonts.h b/src/include/colorsfonts.h index b9f4fc9d..1443db55 100644 --- a/src/include/colorsfonts.h +++ b/src/include/colorsfonts.h @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0300 +// generated by Fast Light User Interface Designer (fluid) version 1.0110 #ifndef colorsfonts_h #define colorsfonts_h @@ -84,5 +84,6 @@ extern Fl_Button *btnLOGBOOKdefault_colors_font; #include #include "fl_digi.h" extern Fl_Menu_Button *CHARSETstatus; +extern Fl_Box *CHARSETlabel; Fl_Double_Window* make_colorsfonts(); #endif diff --git a/src/include/confdialog.h b/src/include/confdialog.h index 3b6e26d7..002cf7ea 100644 --- a/src/include/confdialog.h +++ b/src/include/confdialog.h @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0300 +// generated by Fast Light User Interface Designer (fluid) version 1.0110 #ifndef confdialog_h #define confdialog_h diff --git a/src/include/lgbook.h b/src/include/lgbook.h index 4f8d46e5..020f978c 100644 --- a/src/include/lgbook.h +++ b/src/include/lgbook.h @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0300 +// generated by Fast Light User Interface Designer (fluid) version 1.0110 #ifndef lgbook_h #define lgbook_h diff --git a/src/include/notifydialog.h b/src/include/notifydialog.h index 2280ca1b..18a22f33 100644 --- a/src/include/notifydialog.h +++ b/src/include/notifydialog.h @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0300 +// generated by Fast Light User Interface Designer (fluid) version 1.0110 #ifndef notifydialog_h #define notifydialog_h @@ -11,9 +11,9 @@ extern Fl_Group *grpNotifyEvent; #include extern Fl_Choice *mnuNotifyEvent; +extern Fl_Input2 *inpNotifyRE; #include extern Fl_Light_Button *btnNotifyEnabled; -extern Fl_Input2 *inpNotifyRE; extern Fl_Group *grpNotifyFilter; #include extern Fl_Round_Button *chkNotifyFilterCall; diff --git a/src/logbook/lgbook.cxx b/src/logbook/lgbook.cxx index 2e6a3693..84dbcf99 100644 --- a/src/logbook/lgbook.cxx +++ b/src/logbook/lgbook.cxx @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0300 +// generated by Fast Light User Interface Designer (fluid) version 1.0110 #include "gettext.h" #include "lgbook.h" @@ -392,7 +392,7 @@ void create_logbook_dialogs() { { wExport = new Fl_Double_Window(675, 439, _("Export Setup")); { Fl_Group* o = new Fl_Group(4, 4, 388, 400, _("Select Records to Export")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { chkExportBrowser = new Fl_Check_Browser(13, 25, 370, 295); } // Fl_Check_Browser* chkExportBrowser { btnClearAll = new Fl_Button(69, 325, 90, 24, _("Clear All")); @@ -404,28 +404,28 @@ void create_logbook_dialogs() { { inp_export_start_date = new Fl_DateInput(14, 371, 100, 22, _("Start Date")); inp_export_start_date->tooltip(_("Start date for export")); inp_export_start_date->box(FL_DOWN_BOX); - inp_export_start_date->color(FL_BACKGROUND2_COLOR); - inp_export_start_date->selection_color(FL_SELECTION_COLOR); + inp_export_start_date->color((Fl_Color)FL_BACKGROUND2_COLOR); + inp_export_start_date->selection_color((Fl_Color)FL_SELECTION_COLOR); inp_export_start_date->labeltype(FL_NORMAL_LABEL); inp_export_start_date->labelfont(0); inp_export_start_date->labelsize(14); - inp_export_start_date->labelcolor(FL_FOREGROUND_COLOR); + inp_export_start_date->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); inp_export_start_date->callback((Fl_Callback*)cb_inp_export_start_date); - inp_export_start_date->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inp_export_start_date->align(FL_ALIGN_TOP_LEFT); inp_export_start_date->when(FL_WHEN_RELEASE); inp_export_start_date->format(2); } // Fl_DateInput* inp_export_start_date { inp_export_stop_date = new Fl_DateInput(138, 371, 100, 22, _("Stop Date")); inp_export_stop_date->tooltip(_("Inclusive stop date for export")); inp_export_stop_date->box(FL_DOWN_BOX); - inp_export_stop_date->color(FL_BACKGROUND2_COLOR); - inp_export_stop_date->selection_color(FL_SELECTION_COLOR); + inp_export_stop_date->color((Fl_Color)FL_BACKGROUND2_COLOR); + inp_export_stop_date->selection_color((Fl_Color)FL_SELECTION_COLOR); inp_export_stop_date->labeltype(FL_NORMAL_LABEL); inp_export_stop_date->labelfont(0); inp_export_stop_date->labelsize(14); - inp_export_stop_date->labelcolor(FL_FOREGROUND_COLOR); + inp_export_stop_date->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); inp_export_stop_date->callback((Fl_Callback*)cb_inp_export_stop_date); - inp_export_stop_date->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inp_export_stop_date->align(FL_ALIGN_TOP_LEFT); inp_export_stop_date->when(FL_WHEN_RELEASE); inp_export_stop_date->format(2); } // Fl_DateInput* inp_export_stop_date @@ -444,7 +444,7 @@ void create_logbook_dialogs() { } // Fl_Button* btnCancel { Fl_Group* o = new Fl_Group(392, 4, 280, 400, _("Select Fields to Export")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { btnClearAllFields = new Fl_Button(395, 372, 90, 24, _("Clear All")); btnClearAllFields->callback((Fl_Callback*)cb_btnClearAllFields); } // Fl_Button* btnClearAllFields @@ -563,433 +563,433 @@ void create_logbook_dialogs() { { inpDate_log = new Fl_DateInput(4, 24, 100, 24, _("Date On")); inpDate_log->tooltip(_("Date QSO started")); inpDate_log->box(FL_DOWN_BOX); - inpDate_log->color(FL_BACKGROUND2_COLOR); - inpDate_log->selection_color(FL_SELECTION_COLOR); + inpDate_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpDate_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpDate_log->labeltype(FL_NORMAL_LABEL); inpDate_log->labelfont(0); inpDate_log->labelsize(14); - inpDate_log->labelcolor(FL_FOREGROUND_COLOR); - inpDate_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpDate_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpDate_log->align(FL_ALIGN_TOP_LEFT); inpDate_log->when(FL_WHEN_RELEASE); inpDate_log->format(2); } // Fl_DateInput* inpDate_log { inpTimeOn_log = new Fl_Input2(106, 24, 70, 24, _("Time On")); inpTimeOn_log->tooltip(_("Time QSO started")); inpTimeOn_log->box(FL_DOWN_BOX); - inpTimeOn_log->color(FL_BACKGROUND2_COLOR); - inpTimeOn_log->selection_color(FL_SELECTION_COLOR); + inpTimeOn_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpTimeOn_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpTimeOn_log->labeltype(FL_NORMAL_LABEL); inpTimeOn_log->labelfont(0); inpTimeOn_log->labelsize(14); - inpTimeOn_log->labelcolor(FL_FOREGROUND_COLOR); - inpTimeOn_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpTimeOn_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpTimeOn_log->align(FL_ALIGN_TOP_LEFT); inpTimeOn_log->when(FL_WHEN_RELEASE); } // Fl_Input2* inpTimeOn_log { inpCall_log = new Fl_Input2(178, 24, 100, 24, _("Call")); inpCall_log->tooltip(_("Call sign worked")); inpCall_log->box(FL_DOWN_BOX); - inpCall_log->color(FL_BACKGROUND2_COLOR); - inpCall_log->selection_color(FL_SELECTION_COLOR); + inpCall_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpCall_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpCall_log->labeltype(FL_NORMAL_LABEL); inpCall_log->labelfont(0); inpCall_log->labelsize(14); - inpCall_log->labelcolor(FL_FOREGROUND_COLOR); - inpCall_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpCall_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpCall_log->align(FL_ALIGN_TOP_LEFT); inpCall_log->when(FL_WHEN_RELEASE); } // Fl_Input2* inpCall_log { inpName_log = new Fl_Input2(280, 24, 166, 24, _("Name")); inpName_log->tooltip(_("Operator worked")); inpName_log->box(FL_DOWN_BOX); - inpName_log->color(FL_BACKGROUND2_COLOR); - inpName_log->selection_color(FL_SELECTION_COLOR); + inpName_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpName_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpName_log->labeltype(FL_NORMAL_LABEL); inpName_log->labelfont(0); inpName_log->labelsize(14); - inpName_log->labelcolor(FL_FOREGROUND_COLOR); - inpName_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpName_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpName_log->align(FL_ALIGN_TOP_LEFT); inpName_log->when(FL_WHEN_RELEASE); } // Fl_Input2* inpName_log { inpRstR_log = new Fl_Input2(448, 24, 36, 24, _("In")); inpRstR_log->tooltip(_("Rst received")); inpRstR_log->box(FL_DOWN_BOX); - inpRstR_log->color(FL_BACKGROUND2_COLOR); - inpRstR_log->selection_color(FL_SELECTION_COLOR); + inpRstR_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpRstR_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpRstR_log->labeltype(FL_NORMAL_LABEL); inpRstR_log->labelfont(0); inpRstR_log->labelsize(14); - inpRstR_log->labelcolor(FL_FOREGROUND_COLOR); - inpRstR_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpRstR_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpRstR_log->align(FL_ALIGN_TOP_LEFT); inpRstR_log->when(FL_WHEN_RELEASE); } // Fl_Input2* inpRstR_log { Fl_DateInput* o = inpQSLrcvddate_log = new Fl_DateInput(486, 24, 100, 24, _("QSL-rcvd")); inpQSLrcvddate_log->tooltip(_("QSL received on this date")); inpQSLrcvddate_log->box(FL_DOWN_BOX); - inpQSLrcvddate_log->color(FL_BACKGROUND2_COLOR); - inpQSLrcvddate_log->selection_color(FL_SELECTION_COLOR); + inpQSLrcvddate_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpQSLrcvddate_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpQSLrcvddate_log->labeltype(FL_NORMAL_LABEL); inpQSLrcvddate_log->labelfont(0); inpQSLrcvddate_log->labelsize(14); - inpQSLrcvddate_log->labelcolor(FL_FOREGROUND_COLOR); - inpQSLrcvddate_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpQSLrcvddate_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpQSLrcvddate_log->align(FL_ALIGN_TOP_LEFT); inpQSLrcvddate_log->when(FL_WHEN_RELEASE); o->format(2); } // Fl_DateInput* inpQSLrcvddate_log { inpDateOff_log = new Fl_DateInput(4, 68, 100, 24, _("Date Off")); inpDateOff_log->tooltip(_("Date QSO Ended")); inpDateOff_log->box(FL_DOWN_BOX); - inpDateOff_log->color(FL_BACKGROUND2_COLOR); - inpDateOff_log->selection_color(FL_SELECTION_COLOR); + inpDateOff_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpDateOff_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpDateOff_log->labeltype(FL_NORMAL_LABEL); inpDateOff_log->labelfont(0); inpDateOff_log->labelsize(14); - inpDateOff_log->labelcolor(FL_FOREGROUND_COLOR); - inpDateOff_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpDateOff_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpDateOff_log->align(FL_ALIGN_TOP_LEFT); inpDateOff_log->when(FL_WHEN_RELEASE); inpDateOff_log->format(2); } // Fl_DateInput* inpDateOff_log { inpTimeOff_log = new Fl_Input2(106, 68, 70, 24, _("Time Off")); inpTimeOff_log->tooltip(_("Time QSO ended")); inpTimeOff_log->box(FL_DOWN_BOX); - inpTimeOff_log->color(FL_BACKGROUND2_COLOR); - inpTimeOff_log->selection_color(FL_SELECTION_COLOR); + inpTimeOff_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpTimeOff_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpTimeOff_log->labeltype(FL_NORMAL_LABEL); inpTimeOff_log->labelfont(0); inpTimeOff_log->labelsize(14); - inpTimeOff_log->labelcolor(FL_FOREGROUND_COLOR); - inpTimeOff_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpTimeOff_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpTimeOff_log->align(FL_ALIGN_TOP_LEFT); inpTimeOff_log->when(FL_WHEN_RELEASE); } // Fl_Input2* inpTimeOff_log { inpFreq_log = new Fl_Input2(178, 68, 100, 24, _("Freq.")); inpFreq_log->tooltip(_("Frequency in MHz")); inpFreq_log->box(FL_DOWN_BOX); - inpFreq_log->color(FL_BACKGROUND2_COLOR); - inpFreq_log->selection_color(FL_SELECTION_COLOR); + inpFreq_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpFreq_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpFreq_log->labeltype(FL_NORMAL_LABEL); inpFreq_log->labelfont(0); inpFreq_log->labelsize(14); - inpFreq_log->labelcolor(FL_FOREGROUND_COLOR); - inpFreq_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpFreq_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpFreq_log->align(FL_ALIGN_TOP_LEFT); inpFreq_log->when(FL_WHEN_RELEASE); } // Fl_Input2* inpFreq_log { inpMode_log = new Fl_Input2(280, 68, 127, 24, _("Mode")); inpMode_log->tooltip(_("Mode in use")); inpMode_log->box(FL_DOWN_BOX); - inpMode_log->color(FL_BACKGROUND2_COLOR); - inpMode_log->selection_color(FL_SELECTION_COLOR); + inpMode_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpMode_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpMode_log->labeltype(FL_NORMAL_LABEL); inpMode_log->labelfont(0); inpMode_log->labelsize(14); - inpMode_log->labelcolor(FL_FOREGROUND_COLOR); - inpMode_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpMode_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpMode_log->align(FL_ALIGN_TOP_LEFT); inpMode_log->when(FL_WHEN_RELEASE); } // Fl_Input2* inpMode_log { inpTX_pwr_log = new Fl_Input2(410, 68, 36, 24, _("Pwr")); inpTX_pwr_log->tooltip(_("Transmit power used")); inpTX_pwr_log->box(FL_DOWN_BOX); - inpTX_pwr_log->color(FL_BACKGROUND2_COLOR); - inpTX_pwr_log->selection_color(FL_SELECTION_COLOR); + inpTX_pwr_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpTX_pwr_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpTX_pwr_log->labeltype(FL_NORMAL_LABEL); inpTX_pwr_log->labelfont(0); inpTX_pwr_log->labelsize(14); - inpTX_pwr_log->labelcolor(FL_FOREGROUND_COLOR); - inpTX_pwr_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpTX_pwr_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpTX_pwr_log->align(FL_ALIGN_TOP_LEFT); inpTX_pwr_log->when(FL_WHEN_RELEASE); } // Fl_Input2* inpTX_pwr_log { inpRstS_log = new Fl_Input2(448, 68, 36, 24, _("Out")); inpRstS_log->tooltip(_("Rst sent")); inpRstS_log->box(FL_DOWN_BOX); - inpRstS_log->color(FL_BACKGROUND2_COLOR); - inpRstS_log->selection_color(FL_SELECTION_COLOR); + inpRstS_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpRstS_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpRstS_log->labeltype(FL_NORMAL_LABEL); inpRstS_log->labelfont(0); inpRstS_log->labelsize(14); - inpRstS_log->labelcolor(FL_FOREGROUND_COLOR); - inpRstS_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpRstS_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpRstS_log->align(FL_ALIGN_TOP_LEFT); inpRstS_log->when(FL_WHEN_RELEASE); } // Fl_Input2* inpRstS_log { Fl_DateInput* o = inpQSLsentdate_log = new Fl_DateInput(486, 68, 100, 24, _("QSL-sent")); inpQSLsentdate_log->tooltip(_("QSL sent on this date")); inpQSLsentdate_log->box(FL_DOWN_BOX); - inpQSLsentdate_log->color(FL_BACKGROUND2_COLOR); - inpQSLsentdate_log->selection_color(FL_SELECTION_COLOR); + inpQSLsentdate_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpQSLsentdate_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpQSLsentdate_log->labeltype(FL_NORMAL_LABEL); inpQSLsentdate_log->labelfont(0); inpQSLsentdate_log->labelsize(14); - inpQSLsentdate_log->labelcolor(FL_FOREGROUND_COLOR); - inpQSLsentdate_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpQSLsentdate_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpQSLsentdate_log->align(FL_ALIGN_TOP_LEFT); inpQSLsentdate_log->when(FL_WHEN_RELEASE); o->format(2); } // Fl_DateInput* inpQSLsentdate_log { inpQth_log = new Fl_Input2(4, 112, 232, 24, _("Qth")); inpQth_log->tooltip(_("City of station worked")); inpQth_log->box(FL_DOWN_BOX); - inpQth_log->color(FL_BACKGROUND2_COLOR); - inpQth_log->selection_color(FL_SELECTION_COLOR); + inpQth_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpQth_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpQth_log->labeltype(FL_NORMAL_LABEL); inpQth_log->labelfont(0); inpQth_log->labelsize(14); - inpQth_log->labelcolor(FL_FOREGROUND_COLOR); - inpQth_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpQth_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpQth_log->align(FL_ALIGN_TOP_LEFT); inpQth_log->when(FL_WHEN_RELEASE); } // Fl_Input2* inpQth_log { inpState_log = new Fl_Input2(240, 112, 44, 24, _("St")); inpState_log->tooltip(_("US state of station worked")); inpState_log->box(FL_DOWN_BOX); - inpState_log->color(FL_BACKGROUND2_COLOR); - inpState_log->selection_color(FL_SELECTION_COLOR); + inpState_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpState_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpState_log->labeltype(FL_NORMAL_LABEL); inpState_log->labelfont(0); inpState_log->labelsize(14); - inpState_log->labelcolor(FL_FOREGROUND_COLOR); - inpState_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpState_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpState_log->align(FL_ALIGN_TOP_LEFT); inpState_log->when(FL_WHEN_RELEASE); } // Fl_Input2* inpState_log { inpVE_Prov_log = new Fl_Input2(287, 112, 44, 24, _("Pr")); inpVE_Prov_log->tooltip(_("Province of station worked")); inpVE_Prov_log->box(FL_DOWN_BOX); - inpVE_Prov_log->color(FL_BACKGROUND2_COLOR); - inpVE_Prov_log->selection_color(FL_SELECTION_COLOR); + inpVE_Prov_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpVE_Prov_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpVE_Prov_log->labeltype(FL_NORMAL_LABEL); inpVE_Prov_log->labelfont(0); inpVE_Prov_log->labelsize(14); - inpVE_Prov_log->labelcolor(FL_FOREGROUND_COLOR); - inpVE_Prov_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpVE_Prov_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpVE_Prov_log->align(FL_ALIGN_TOP_LEFT); inpVE_Prov_log->when(FL_WHEN_RELEASE); } // Fl_Input2* inpVE_Prov_log { inpCountry_log = new Fl_Input2(334, 112, 166, 24, _("Country")); inpCountry_log->tooltip(_("Country of station worked")); inpCountry_log->box(FL_DOWN_BOX); - inpCountry_log->color(FL_BACKGROUND2_COLOR); - inpCountry_log->selection_color(FL_SELECTION_COLOR); + inpCountry_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpCountry_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpCountry_log->labeltype(FL_NORMAL_LABEL); inpCountry_log->labelfont(0); inpCountry_log->labelsize(14); - inpCountry_log->labelcolor(FL_FOREGROUND_COLOR); - inpCountry_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpCountry_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpCountry_log->align(FL_ALIGN_TOP_LEFT); inpCountry_log->when(FL_WHEN_RELEASE); } // Fl_Input2* inpCountry_log { inpLoc_log = new Fl_Input2(506, 112, 80, 24, _("Loc")); inpLoc_log->tooltip(_("Stations grid square")); inpLoc_log->box(FL_DOWN_BOX); - inpLoc_log->color(FL_BACKGROUND2_COLOR); - inpLoc_log->selection_color(FL_SELECTION_COLOR); + inpLoc_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpLoc_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpLoc_log->labeltype(FL_NORMAL_LABEL); inpLoc_log->labelfont(0); inpLoc_log->labelsize(14); - inpLoc_log->labelcolor(FL_FOREGROUND_COLOR); - inpLoc_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpLoc_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpLoc_log->align(FL_ALIGN_TOP_LEFT); inpLoc_log->when(FL_WHEN_RELEASE); } // Fl_Input2* inpLoc_log { inpNotes_log = new Fl_Input2(4, 156, 300, 72, _("Notes")); inpNotes_log->tooltip(_("Interesting notes")); inpNotes_log->type(4); inpNotes_log->box(FL_DOWN_BOX); - inpNotes_log->color(FL_BACKGROUND2_COLOR); - inpNotes_log->selection_color(FL_SELECTION_COLOR); + inpNotes_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpNotes_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpNotes_log->labeltype(FL_NORMAL_LABEL); inpNotes_log->labelfont(0); inpNotes_log->labelsize(14); - inpNotes_log->labelcolor(FL_FOREGROUND_COLOR); - inpNotes_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpNotes_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpNotes_log->align(FL_ALIGN_TOP_LEFT); inpNotes_log->when(FL_WHEN_RELEASE); } // Fl_Input2* inpNotes_log { inpCNTY_log = new Fl_Input2(311, 156, 120, 24, _("County")); inpCNTY_log->tooltip(_("County")); inpCNTY_log->box(FL_DOWN_BOX); - inpCNTY_log->color(FL_BACKGROUND2_COLOR); - inpCNTY_log->selection_color(FL_SELECTION_COLOR); + inpCNTY_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpCNTY_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpCNTY_log->labeltype(FL_NORMAL_LABEL); inpCNTY_log->labelfont(0); inpCNTY_log->labelsize(14); - inpCNTY_log->labelcolor(FL_FOREGROUND_COLOR); - inpCNTY_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpCNTY_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpCNTY_log->align(FL_ALIGN_TOP_LEFT); inpCNTY_log->when(FL_WHEN_RELEASE); } // Fl_Input2* inpCNTY_log { inpIOTA_log = new Fl_Input2(435, 156, 70, 24, _("IOTA")); inpIOTA_log->tooltip(_("Islands on the air")); inpIOTA_log->box(FL_DOWN_BOX); - inpIOTA_log->color(FL_BACKGROUND2_COLOR); - inpIOTA_log->selection_color(FL_SELECTION_COLOR); + inpIOTA_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpIOTA_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpIOTA_log->labeltype(FL_NORMAL_LABEL); inpIOTA_log->labelfont(0); inpIOTA_log->labelsize(14); - inpIOTA_log->labelcolor(FL_FOREGROUND_COLOR); - inpIOTA_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpIOTA_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpIOTA_log->align(FL_ALIGN_TOP_LEFT); inpIOTA_log->when(FL_WHEN_RELEASE); } // Fl_Input2* inpIOTA_log { inpCQZ_log = new Fl_Input2(516, 156, 70, 24, _("CQZ")); inpCQZ_log->tooltip(_("CQ zone")); inpCQZ_log->box(FL_DOWN_BOX); - inpCQZ_log->color(FL_BACKGROUND2_COLOR); - inpCQZ_log->selection_color(FL_SELECTION_COLOR); + inpCQZ_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpCQZ_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpCQZ_log->labeltype(FL_NORMAL_LABEL); inpCQZ_log->labelfont(0); inpCQZ_log->labelsize(14); - inpCQZ_log->labelcolor(FL_FOREGROUND_COLOR); - inpCQZ_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpCQZ_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpCQZ_log->align(FL_ALIGN_TOP_LEFT); inpCQZ_log->when(FL_WHEN_RELEASE); } // Fl_Input2* inpCQZ_log { inpITUZ_log = new Fl_Input2(311, 204, 80, 24, _("ITUZ")); inpITUZ_log->tooltip(_("ITU zone")); inpITUZ_log->box(FL_DOWN_BOX); - inpITUZ_log->color(FL_BACKGROUND2_COLOR); - inpITUZ_log->selection_color(FL_SELECTION_COLOR); + inpITUZ_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpITUZ_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpITUZ_log->labeltype(FL_NORMAL_LABEL); inpITUZ_log->labelfont(0); inpITUZ_log->labelsize(12); - inpITUZ_log->labelcolor(FL_FOREGROUND_COLOR); - inpITUZ_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpITUZ_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpITUZ_log->align(FL_ALIGN_TOP_LEFT); inpITUZ_log->when(FL_WHEN_RELEASE); } // Fl_Input2* inpITUZ_log { inpCONT_log = new Fl_Input2(409, 204, 80, 24, _("CONT")); inpCONT_log->tooltip(_("Continent")); inpCONT_log->box(FL_DOWN_BOX); - inpCONT_log->color(FL_BACKGROUND2_COLOR); - inpCONT_log->selection_color(FL_SELECTION_COLOR); + inpCONT_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpCONT_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpCONT_log->labeltype(FL_NORMAL_LABEL); inpCONT_log->labelfont(0); inpCONT_log->labelsize(12); - inpCONT_log->labelcolor(FL_FOREGROUND_COLOR); - inpCONT_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpCONT_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpCONT_log->align(FL_ALIGN_TOP_LEFT); inpCONT_log->when(FL_WHEN_RELEASE); } // Fl_Input2* inpCONT_log { inpDXCC_log = new Fl_Input2(506, 204, 80, 24, _("DXCC")); inpDXCC_log->tooltip(_("DXCC designator")); inpDXCC_log->box(FL_DOWN_BOX); - inpDXCC_log->color(FL_BACKGROUND2_COLOR); - inpDXCC_log->selection_color(FL_SELECTION_COLOR); + inpDXCC_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpDXCC_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpDXCC_log->labeltype(FL_NORMAL_LABEL); inpDXCC_log->labelfont(0); inpDXCC_log->labelsize(12); - inpDXCC_log->labelcolor(FL_FOREGROUND_COLOR); - inpDXCC_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); + inpDXCC_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpDXCC_log->align(FL_ALIGN_TOP_LEFT); inpDXCC_log->when(FL_WHEN_RELEASE); } // Fl_Input2* inpDXCC_log { inpSerNoOut_log = new Fl_Input2(4, 252, 55, 24, _("Ser out")); inpSerNoOut_log->tooltip(_("Contest seral # sent")); inpSerNoOut_log->box(FL_DOWN_BOX); - inpSerNoOut_log->color(FL_BACKGROUND2_COLOR); - inpSerNoOut_log->selection_color(FL_SELECTION_COLOR); + inpSerNoOut_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpSerNoOut_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpSerNoOut_log->labeltype(FL_NORMAL_LABEL); inpSerNoOut_log->labelfont(0); inpSerNoOut_log->labelsize(14); - inpSerNoOut_log->labelcolor(FL_FOREGROUND_COLOR); - inpSerNoOut_log->align(Fl_Align(FL_ALIGN_TOP)); + inpSerNoOut_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpSerNoOut_log->align(FL_ALIGN_TOP); inpSerNoOut_log->when(FL_WHEN_RELEASE); } // Fl_Input2* inpSerNoOut_log { inpMyXchg_log = new Fl_Input2(63, 252, 176, 24, _("Exchange Out")); inpMyXchg_log->tooltip(_("Contest exchange sent")); inpMyXchg_log->box(FL_DOWN_BOX); - inpMyXchg_log->color(FL_BACKGROUND2_COLOR); - inpMyXchg_log->selection_color(FL_SELECTION_COLOR); + inpMyXchg_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpMyXchg_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpMyXchg_log->labeltype(FL_NORMAL_LABEL); inpMyXchg_log->labelfont(0); inpMyXchg_log->labelsize(14); - inpMyXchg_log->labelcolor(FL_FOREGROUND_COLOR); - inpMyXchg_log->align(Fl_Align(FL_ALIGN_TOP)); + inpMyXchg_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpMyXchg_log->align(FL_ALIGN_TOP); inpMyXchg_log->when(FL_WHEN_RELEASE); } // Fl_Input2* inpMyXchg_log { inpSerNoIn_log = new Fl_Input2(242, 252, 55, 24, _("Ser in")); inpSerNoIn_log->tooltip(_("Contest serial # received")); inpSerNoIn_log->box(FL_DOWN_BOX); - inpSerNoIn_log->color(FL_BACKGROUND2_COLOR); - inpSerNoIn_log->selection_color(FL_SELECTION_COLOR); + inpSerNoIn_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpSerNoIn_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpSerNoIn_log->labeltype(FL_NORMAL_LABEL); inpSerNoIn_log->labelfont(0); inpSerNoIn_log->labelsize(14); - inpSerNoIn_log->labelcolor(FL_FOREGROUND_COLOR); - inpSerNoIn_log->align(Fl_Align(FL_ALIGN_TOP)); + inpSerNoIn_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpSerNoIn_log->align(FL_ALIGN_TOP); inpSerNoIn_log->when(FL_WHEN_RELEASE); } // Fl_Input2* inpSerNoIn_log { inpXchgIn_log = new Fl_Input2(299, 252, 176, 24, _("Exchange In")); inpXchgIn_log->tooltip(_("Contest exchange received")); inpXchgIn_log->box(FL_DOWN_BOX); - inpXchgIn_log->color(FL_BACKGROUND2_COLOR); - inpXchgIn_log->selection_color(FL_SELECTION_COLOR); + inpXchgIn_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpXchgIn_log->selection_color((Fl_Color)FL_SELECTION_COLOR); inpXchgIn_log->labeltype(FL_NORMAL_LABEL); inpXchgIn_log->labelfont(0); inpXchgIn_log->labelsize(14); - inpXchgIn_log->labelcolor(FL_FOREGROUND_COLOR); - inpXchgIn_log->align(Fl_Align(FL_ALIGN_TOP)); + inpXchgIn_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpXchgIn_log->align(FL_ALIGN_TOP); inpXchgIn_log->when(FL_WHEN_RELEASE); } // Fl_Input2* inpXchgIn_log { inpSearchString = new Fl_Input2(481, 252, 105, 24, _("Call Search")); inpSearchString->tooltip(_("Search for this callsign")); inpSearchString->box(FL_DOWN_BOX); - inpSearchString->color(FL_BACKGROUND2_COLOR); - inpSearchString->selection_color(FL_SELECTION_COLOR); + inpSearchString->color((Fl_Color)FL_BACKGROUND2_COLOR); + inpSearchString->selection_color((Fl_Color)FL_SELECTION_COLOR); inpSearchString->labeltype(FL_NORMAL_LABEL); inpSearchString->labelfont(0); inpSearchString->labelsize(14); - inpSearchString->labelcolor(FL_FOREGROUND_COLOR); - inpSearchString->align(Fl_Align(FL_ALIGN_TOP)); + inpSearchString->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + inpSearchString->align(FL_ALIGN_TOP); inpSearchString->when(FL_WHEN_RELEASE); } // Fl_Input2* inpSearchString { txtNbrRecs_log = new Fl_Input2(54, 284, 65, 22, _("Recs")); txtNbrRecs_log->tooltip(_("# Records in logbook")); txtNbrRecs_log->box(FL_DOWN_BOX); - txtNbrRecs_log->color(FL_BACKGROUND2_COLOR); - txtNbrRecs_log->selection_color(FL_SELECTION_COLOR); + txtNbrRecs_log->color((Fl_Color)FL_BACKGROUND2_COLOR); + txtNbrRecs_log->selection_color((Fl_Color)FL_SELECTION_COLOR); txtNbrRecs_log->labeltype(FL_NORMAL_LABEL); txtNbrRecs_log->labelfont(0); txtNbrRecs_log->labelsize(14); - txtNbrRecs_log->labelcolor(FL_FOREGROUND_COLOR); - txtNbrRecs_log->align(Fl_Align(FL_ALIGN_LEFT)); + txtNbrRecs_log->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + txtNbrRecs_log->align(FL_ALIGN_LEFT); txtNbrRecs_log->when(FL_WHEN_RELEASE); } // Fl_Input2* txtNbrRecs_log { bNewSave = new Fl_Button(135, 284, 75, 22, _("New")); bNewSave->tooltip(_("New record / Save record")); bNewSave->shortcut(0x8004e); - bNewSave->color(FL_LIGHT1); + bNewSave->color((Fl_Color)FL_LIGHT1); bNewSave->selection_color((Fl_Color)48); bNewSave->callback((Fl_Callback*)cb_btnNewSave); } // Fl_Button* bNewSave { bUpdateCancel = new Fl_Button(222, 284, 75, 22, _("Update")); bUpdateCancel->tooltip(_("Update the current record")); bUpdateCancel->shortcut(0x80055); - bUpdateCancel->color(FL_LIGHT1); + bUpdateCancel->color((Fl_Color)FL_LIGHT1); bUpdateCancel->selection_color((Fl_Color)48); bUpdateCancel->callback((Fl_Callback*)cb_btnUpdateCancel); } // Fl_Button* bUpdateCancel { bDelete = new Fl_Button(310, 284, 75, 22, _("Delete")); bDelete->tooltip(_("Delete the current record")); bDelete->shortcut(0x80044); - bDelete->color(FL_LIGHT1); + bDelete->color((Fl_Color)FL_LIGHT1); bDelete->selection_color((Fl_Color)48); bDelete->callback((Fl_Callback*)cb_btnDelete); } // Fl_Button* bDelete { bDialFreq = new Fl_Button(398, 284, 75, 22, _("Dial")); bDialFreq->tooltip(_("Retrieve for active modem use")); bDialFreq->shortcut(0x50066); - bDialFreq->color(FL_LIGHT1); + bDialFreq->color((Fl_Color)FL_LIGHT1); bDialFreq->selection_color((Fl_Color)48); bDialFreq->callback((Fl_Callback*)cb_btnDialFreq); } // Fl_Button* bDialFreq { bSearchPrev = new Fl_Button(495, 284, 24, 22); bSearchPrev->tooltip(_("Find previous")); - bSearchPrev->color(FL_LIGHT1); + bSearchPrev->color((Fl_Color)FL_LIGHT1); bSearchPrev->selection_color((Fl_Color)48); bSearchPrev->callback((Fl_Callback*)cb_search); - bSearchPrev->align(Fl_Align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE)); + bSearchPrev->align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE); bSearchPrev->image(new Fl_Pixmap(left_arrow_icon)); } // Fl_Button* bSearchPrev { bSearchNext = new Fl_Button(547, 284, 24, 22); bSearchNext->tooltip(_("Find next")); - bSearchNext->color(FL_LIGHT1); + bSearchNext->color((Fl_Color)FL_LIGHT1); bSearchNext->selection_color((Fl_Color)48); bSearchNext->callback((Fl_Callback*)cb_search); - bSearchNext->align(Fl_Align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE)); + bSearchNext->align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE); bSearchNext->image(new Fl_Pixmap(right_arrow_icon)); } // Fl_Button* bSearchNext { wBrowser = new Table(2, 315, 586, 195); wBrowser->box(FL_DOWN_FRAME); - wBrowser->color(FL_BACKGROUND2_COLOR); - wBrowser->selection_color(FL_SELECTION_COLOR); + wBrowser->color((Fl_Color)FL_BACKGROUND2_COLOR); + wBrowser->selection_color((Fl_Color)FL_SELECTION_COLOR); wBrowser->labeltype(FL_NORMAL_LABEL); wBrowser->labelfont(0); wBrowser->labelsize(14); - wBrowser->labelcolor(FL_FOREGROUND_COLOR); - wBrowser->align(Fl_Align(FL_ALIGN_TOP)); + wBrowser->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); + wBrowser->align(FL_ALIGN_TOP); wBrowser->when(FL_WHEN_RELEASE); wBrowser->end(); Fl_Group::current()->resizable(wBrowser); @@ -997,29 +997,29 @@ void create_logbook_dialogs() { dlgLogbook->end(); } // Fl_Double_Window* dlgLogbook wBrowser->align (FL_ALIGN_TOP | FL_ALIGN_LEFT); - wBrowser->addColumn (_("Date"),85); - wBrowser->colcallback (0,cb_SortByDate); - wBrowser->addColumn (_("Time"),47); - wBrowser->addColumn (_("Callsign"),100); - wBrowser->colcallback (2,cb_SortByCall); - wBrowser->addColumn (_("Name"),110); - wBrowser->addColumn (_("Frequency"),120); - wBrowser->colcallback (4,cb_SortByFreq); - wBrowser->addColumn (_("Mode"),103); - wBrowser->colcallback (5,cb_SortByMode); - wBrowser->addHiddenColumn ("rn"); - wBrowser->allowSort(true); - wBrowser->callback(cb_browser); - wBrowser->when(FL_WHEN_CHANGED); - wBrowser->rowSize (FL_NORMAL_SIZE); - wBrowser->headerSize (FL_NORMAL_SIZE); - wBrowser->allowResize (1); - wBrowser->gridEnabled (0); - dlgLogbook->xclass(PACKAGE_TARNAME); +wBrowser->addColumn (_("Date"),85); +wBrowser->colcallback (0,cb_SortByDate); +wBrowser->addColumn (_("Time"),47); +wBrowser->addColumn (_("Callsign"),100); +wBrowser->colcallback (2,cb_SortByCall); +wBrowser->addColumn (_("Name"),110); +wBrowser->addColumn (_("Frequency"),120); +wBrowser->colcallback (4,cb_SortByFreq); +wBrowser->addColumn (_("Mode"),103); +wBrowser->colcallback (5,cb_SortByMode); +wBrowser->addHiddenColumn ("rn"); +wBrowser->allowSort(true); +wBrowser->callback(cb_browser); +wBrowser->when(FL_WHEN_CHANGED); +wBrowser->rowSize (FL_NORMAL_SIZE); +wBrowser->headerSize (FL_NORMAL_SIZE); +wBrowser->allowResize (1); +wBrowser->gridEnabled (0); +dlgLogbook->xclass(PACKAGE_TARNAME); { wCabrillo = new Fl_Double_Window(675, 340, _("Cabrillo Setup")); { Fl_Group* o = new Fl_Group(4, 4, 388, 305, _("Select Records to Export")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { chkCabBrowser = new Fl_Check_Browser(13, 25, 370, 245); } // Fl_Check_Browser* chkCabBrowser { btnCabClearAll = new Fl_Button(69, 277, 110, 24, _("Clear All")); @@ -1038,17 +1038,17 @@ void create_logbook_dialogs() { } // Fl_Button* btnCabCancel { Fl_Group* o = new Fl_Group(390, 4, 283, 305, _("Select Cabrillo Contest & Fields")); o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); { cboContest = new Fl_ComboBox(486, 41, 180, 20, _("Contest:")); cboContest->box(FL_BORDER_BOX); - cboContest->color(FL_BACKGROUND2_COLOR); - cboContest->selection_color(FL_BACKGROUND_COLOR); + cboContest->color((Fl_Color)FL_BACKGROUND2_COLOR); + cboContest->selection_color((Fl_Color)FL_BACKGROUND_COLOR); cboContest->labeltype(FL_NORMAL_LABEL); cboContest->labelfont(0); cboContest->labelsize(14); - cboContest->labelcolor(FL_FOREGROUND_COLOR); + cboContest->labelcolor((Fl_Color)FL_FOREGROUND_COLOR); cboContest->callback((Fl_Callback*)cb_cboContest); - cboContest->align(Fl_Align(FL_ALIGN_LEFT)); + cboContest->align(FL_ALIGN_LEFT); cboContest->when(FL_WHEN_RELEASE); cboContest->end(); } // Fl_ComboBox* cboContest diff --git a/src/logbook/lgbook.fl b/src/logbook/lgbook.fl index 523c30e8..ec648f81 100644 --- a/src/logbook/lgbook.fl +++ b/src/logbook/lgbook.fl @@ -1,23 +1,19 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0300 +version 1.0110 i18n_type 1 i18n_include "gettext.h" i18n_function _ header_name {.h} code_name {.cxx} -decl {\#include } {private local -} +decl {\#include } {} -decl {\#include } {private local -} +decl {\#include } {} -decl {\#include "logsupport.h"} {private local -} +decl {\#include "logsupport.h"} {} -decl {\#include "pixmaps.h"} {private local -} +decl {\#include "pixmaps.h"} {} -decl {\#include "flinput2.h"} {public local +decl {\#include "flinput2.h"} {public } Function {create_logbook_dialogs()} {open return_type void @@ -307,11 +303,11 @@ btnSelectNotes->value(0);} } } Fl_Window dlgLogbook { - label Logbook + label Logbook open xywh {603 71 590 514} type Double resizable visible } { Fl_Input inpDate_log { - label {Date On} + label {Date On} selected tooltip {Date QSO started} xywh {4 24 100 24} align 5 code0 {\#include "calendar.h"} code1 {inpDate_log->format(2);} @@ -528,7 +524,7 @@ wBrowser->allowResize (1); wBrowser->gridEnabled (0); dlgLogbook->xclass(PACKAGE_TARNAME);} {} Fl_Window wCabrillo { - label {Cabrillo Setup} selected + label {Cabrillo Setup} xywh {516 612 675 340} type Double hide } { Fl_Group {} { diff --git a/src/main.cxx b/src/main.cxx index ef642069..0df72b59 100644 --- a/src/main.cxx +++ b/src/main.cxx @@ -453,6 +453,13 @@ int main(int argc, char ** argv) FSEL::create(); make_colorsfonts(); +#if FLDIGI_FLTK_API_MAJOR == 1 && FLDIGI_FLTK_API_MINOR < 3 + CHARSETlabel->hide(); + CHARSETstatus->hide(); +#else + CHARSETlabel->show(); + CHARSETstatus->show(); +#endif populate_charset_menu(); set_default_charset(); setTabColors(); diff --git a/src/widgets/psk_browser.cxx b/src/widgets/psk_browser.cxx index e36bdb7f..8aa921ac 100644 --- a/src/widgets/psk_browser.cxx +++ b/src/widgets/psk_browser.cxx @@ -258,7 +258,11 @@ void pskBrowser::addchr(int ch, int freq, unsigned char c, int md) // 0 < ch < c if (linechars[ch] > nchars) { if (progdefaults.VIEWERmarquee) { while (linechars[ch] > nchars) { +#if FLDIGI_FLTK_API_MAJOR == 1 && FLDIGI_FLTK_API_MINOR == 3 bwsrline[ch].erase(0, fl_utf8len1(bwsrline[ch][0])); +#else + bwsrline[ch].erase(0, 1); +#endif linechars[ch]--; } } else {