diff --git a/src/dialogs/colorsfonts.cxx b/src/dialogs/colorsfonts.cxx index 4b8209e0..03cc0ee9 100644 --- a/src/dialogs/colorsfonts.cxx +++ b/src/dialogs/colorsfonts.cxx @@ -130,6 +130,27 @@ static void cbLOGGINGFontBrowser(Fl_Widget*, void*) { 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; +} + Fl_Double_Window *dlgColorFont=(Fl_Double_Window *)0; Fl_Button *btnClrFntClose=(Fl_Button *)0; @@ -256,57 +277,6 @@ static void cb_btnFD_SystemColor(Fl_Button*, void*) { progdefaults.changed = true; } -Fl_Output *LOGGINGdisplay=(Fl_Output *)0; - -Fl_Button *btnLOGGING_color=(Fl_Button *)0; - -static void cb_btnLOGGING_color(Fl_Button*, void*) { - uchar r, g, b; - Fl::get_color(progdefaults.LOGGINGcolor, r, g, b); - - if (!fl_color_chooser("Background", r, g, b)) - return; - - progdefaults.LOGGINGcolor = fl_rgb_color(r, g, b); - - LOGGINGdisplay->color(progdefaults.LOGGINGcolor); - LOGGINGdisplay->redraw(); - - LOGGING_colors_font(); - - progdefaults.changed = true; -} - -Fl_Button *btn_LOGGING_font=(Fl_Button *)0; - -static void cb_btn_LOGGING_font(Fl_Button*, void*) { - font_browser->fontNumber(progdefaults.LOGGINGtextfont); -font_browser->fontSize(progdefaults.LOGGINGtextsize); -font_browser->fontColor(progdefaults.LOGGINGtextcolor); -font_browser->fontFilter(Font_Browser::ALL_TYPES); -font_browser->callback(cbLOGGINGFontBrowser); -font_browser->show(); -} - -Fl_Button *btnLOGGINGdefault_colors_font=(Fl_Button *)0; - -static void cb_btnLOGGINGdefault_colors_font(Fl_Button*, void*) { - progdefaults.LOGGINGcolor = FL_BACKGROUND2_COLOR; -progdefaults.LOGGINGtextfont = (Fl_Font)0; -progdefaults.LOGGINGtextsize = 12; -progdefaults.LOGGINGtextcolor = FL_BLACK; - -LOGGINGdisplay->color(progdefaults.LOGGINGcolor); -LOGGINGdisplay->textsize(progdefaults.LOGGINGtextsize); -LOGGINGdisplay->textcolor(progdefaults.LOGGINGtextcolor); -LOGGINGdisplay->textfont(progdefaults.LOGGINGtextfont); -LOGGINGdisplay->redraw(); - -LOGGING_colors_font(); - -progdefaults.changed = true; -} - Fl_Check_Button *btnUseGroupColors=(Fl_Check_Button *)0; static void cb_btnUseGroupColors(Fl_Check_Button* o, void*) { @@ -886,6 +856,108 @@ progdefaults.changed = true; Fl_Box *overcolor=(Fl_Box *)0; +Fl_Output *LOGGINGdisplay=(Fl_Output *)0; + +Fl_Button *btnLOGGING_color=(Fl_Button *)0; + +static void cb_btnLOGGING_color(Fl_Button*, void*) { + uchar r, g, b; + Fl::get_color(progdefaults.LOGGINGcolor, r, g, b); + + if (!fl_color_chooser("Background", r, g, b)) + return; + + progdefaults.LOGGINGcolor = fl_rgb_color(r, g, b); + + LOGGINGdisplay->color(progdefaults.LOGGINGcolor); + LOGGINGdisplay->redraw(); + + LOGGING_colors_font(); + + progdefaults.changed = true; +} + +Fl_Button *btn_LOGGING_font=(Fl_Button *)0; + +static void cb_btn_LOGGING_font(Fl_Button*, void*) { + font_browser->fontNumber(progdefaults.LOGGINGtextfont); +font_browser->fontSize(progdefaults.LOGGINGtextsize); +font_browser->fontColor(progdefaults.LOGGINGtextcolor); +font_browser->fontFilter(Font_Browser::ALL_TYPES); +font_browser->callback(cbLOGGINGFontBrowser); +font_browser->show(); +} + +Fl_Button *btnLOGGINGdefault_colors_font=(Fl_Button *)0; + +static void cb_btnLOGGINGdefault_colors_font(Fl_Button*, void*) { + progdefaults.LOGGINGcolor = FL_BACKGROUND2_COLOR; +progdefaults.LOGGINGtextfont = (Fl_Font)0; +progdefaults.LOGGINGtextsize = 12; +progdefaults.LOGGINGtextcolor = FL_BLACK; + +LOGGINGdisplay->color(progdefaults.LOGGINGcolor); +LOGGINGdisplay->textsize(progdefaults.LOGGINGtextsize); +LOGGINGdisplay->textcolor(progdefaults.LOGGINGtextcolor); +LOGGINGdisplay->textfont(progdefaults.LOGGINGtextfont); +LOGGINGdisplay->redraw(); + +LOGGING_colors_font(); + +progdefaults.changed = true; +} + +Fl_Output *LOGBOOKdisplay=(Fl_Output *)0; + +Fl_Button *btnLOGBOOK_color=(Fl_Button *)0; + +static void cb_btnLOGBOOK_color(Fl_Button*, void*) { + uchar r, g, b; + Fl::get_color(progdefaults.LOGBOOKcolor, r, g, b); + + if (!fl_color_chooser("Background", r, g, b)) + return; + + progdefaults.LOGBOOKcolor = fl_rgb_color(r, g, b); + + LOGBOOKdisplay->color(progdefaults.LOGBOOKcolor); + LOGBOOKdisplay->redraw(); + + LOGBOOK_colors_font(); + + progdefaults.changed = true; +} + +Fl_Button *btn_LOGBOOK_font=(Fl_Button *)0; + +static void cb_btn_LOGBOOK_font(Fl_Button*, void*) { + font_browser->fontNumber(progdefaults.LOGBOOKtextfont); +font_browser->fontSize(progdefaults.LOGBOOKtextsize); +font_browser->fontColor(progdefaults.LOGBOOKtextcolor); +font_browser->fontFilter(Font_Browser::ALL_TYPES); +font_browser->callback(cbLOGBOOKFontBrowser); +font_browser->show(); +} + +Fl_Button *btnLOGBOOKdefault_colors_font=(Fl_Button *)0; + +static void cb_btnLOGBOOKdefault_colors_font(Fl_Button*, void*) { + progdefaults.LOGBOOKcolor = FL_BACKGROUND2_COLOR; +progdefaults.LOGBOOKtextfont = (Fl_Font)0; +progdefaults.LOGBOOKtextsize = 12; +progdefaults.LOGBOOKtextcolor = FL_BLACK; + +LOGBOOKdisplay->color(progdefaults.LOGBOOKcolor); +LOGBOOKdisplay->textsize(progdefaults.LOGBOOKtextsize); +LOGBOOKdisplay->textcolor(progdefaults.LOGBOOKtextcolor); +LOGBOOKdisplay->textfont(progdefaults.LOGBOOKtextfont); +LOGBOOKdisplay->redraw(); + +LOGBOOK_colors_font(); + +progdefaults.changed = true; +} + Fl_Double_Window* make_colorsfonts() { font_browser = new Font_Browser; { dlgColorFont = new Fl_Double_Window(375, 220, _("Colors and Fonts")); @@ -893,7 +965,7 @@ Fl_Double_Window* make_colorsfonts() { btnClrFntClose->callback((Fl_Callback*)cb_btnClrFntClose); } // Fl_Button* btnClrFntClose { tabsColors = new Fl_Tabs(0, 5, 375, 185); - { Fl_Group* o = new Fl_Group(0, 30, 375, 155, _("Displays")); + { Fl_Group* o = new Fl_Group(0, 30, 375, 155, _("Disp")); { Fl_Group* o = new Fl_Group(3, 34, 370, 87); o->box(FL_ENGRAVED_FRAME); { Fl_Box* o = FDdisplay = new Fl_Box(70, 38, 235, 45, _("14070.150")); @@ -919,26 +991,6 @@ Fl_Double_Window* make_colorsfonts() { } // Fl_Button* btnFD_SystemColor o->end(); } // Fl_Group* o - { Fl_Group* o = new Fl_Group(3, 123, 370, 62, _("Logging Panel Controls")); - o->box(FL_ENGRAVED_FRAME); - o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); - { Fl_Output* o = LOGGINGdisplay = new Fl_Output(19, 147, 98, 25); - o->textfont(progdefaults.LOGGINGtextfont);o->textsize(progdefaults.LOGGINGtextsize);o->textcolor(progdefaults.LOGGINGtextcolor); - o->color(progdefaults.LOGGINGcolor); - o->value("W1HKJ"); - o->redraw(); - } // Fl_Output* LOGGINGdisplay - { btnLOGGING_color = new Fl_Button(127, 147, 80, 25, _("Bg Color")); - btnLOGGING_color->callback((Fl_Callback*)cb_btnLOGGING_color); - } // Fl_Button* btnLOGGING_color - { btn_LOGGING_font = new Fl_Button(217, 147, 55, 25, _("Font")); - btn_LOGGING_font->callback((Fl_Callback*)cb_btn_LOGGING_font); - } // Fl_Button* btn_LOGGING_font - { btnLOGGINGdefault_colors_font = new Fl_Button(283, 147, 80, 25, _("Default")); - btnLOGGINGdefault_colors_font->callback((Fl_Callback*)cb_btnLOGGINGdefault_colors_font); - } // Fl_Button* btnLOGGINGdefault_colors_font - o->end(); - } // Fl_Group* o o->end(); } // Fl_Group* o { Fl_Group* o = new Fl_Group(5, 30, 365, 156, _("F_keys")); @@ -1168,6 +1220,50 @@ Fl_Double_Window* make_colorsfonts() { } // Fl_Box* o o->end(); } // Fl_Group* o + { Fl_Group* o = new Fl_Group(0, 30, 375, 155, _("Log")); + 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)); + { 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); + o->value("W1HKJ"); + o->redraw(); + } // Fl_Output* LOGGINGdisplay + { btnLOGGING_color = new Fl_Button(127, 57, 80, 25, _("Bg Color")); + btnLOGGING_color->callback((Fl_Callback*)cb_btnLOGGING_color); + } // Fl_Button* btnLOGGING_color + { btn_LOGGING_font = new Fl_Button(217, 57, 55, 25, _("Font")); + btn_LOGGING_font->callback((Fl_Callback*)cb_btn_LOGGING_font); + } // Fl_Button* btn_LOGGING_font + { btnLOGGINGdefault_colors_font = new Fl_Button(283, 57, 80, 25, _("Default")); + btnLOGGINGdefault_colors_font->callback((Fl_Callback*)cb_btnLOGGINGdefault_colors_font); + } // Fl_Button* btnLOGGINGdefault_colors_font + o->end(); + } // 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)); + { 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); + o->value("14.070000"); + o->redraw(); + } // Fl_Output* LOGBOOKdisplay + { btnLOGBOOK_color = new Fl_Button(127, 132, 80, 25, _("Bg Color")); + btnLOGBOOK_color->callback((Fl_Callback*)cb_btnLOGBOOK_color); + } // Fl_Button* btnLOGBOOK_color + { btn_LOGBOOK_font = new Fl_Button(217, 132, 55, 25, _("Font")); + btn_LOGBOOK_font->callback((Fl_Callback*)cb_btn_LOGBOOK_font); + } // Fl_Button* btn_LOGBOOK_font + { btnLOGBOOKdefault_colors_font = new Fl_Button(283, 132, 80, 25, _("Default")); + btnLOGBOOKdefault_colors_font->callback((Fl_Callback*)cb_btnLOGBOOKdefault_colors_font); + } // Fl_Button* btnLOGBOOKdefault_colors_font + o->end(); + } // Fl_Group* o + o->end(); + } // Fl_Group* o tabsColors->end(); } // Fl_Tabs* tabsColors dlgColorFont->xclass(PACKAGE_TARNAME); diff --git a/src/dialogs/colorsfonts.fl b/src/dialogs/colorsfonts.fl index 255ee8f3..648fee1a 100644 --- a/src/dialogs/colorsfonts.fl +++ b/src/dialogs/colorsfonts.fl @@ -156,6 +156,28 @@ Function {cbLOGGINGFontBrowser(Fl_Widget*, void*)} {open private return_type voi progdefaults.changed = true;} {} } +Function {cbLOGBOOKFontBrowser(Fl_Widget*, void*)} {open private return_type void +} { + code {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;} {} +} + Function {make_colorsfonts()} {open } { code {font_browser = new Font_Browser;} {} @@ -173,7 +195,7 @@ Function {make_colorsfonts()} {open xywh {0 5 375 185} } { Fl_Group {} { - label Displays open + label Disp open selected xywh {0 30 375 155} } { Fl_Group {} {open @@ -297,64 +319,6 @@ font_browser->show();} xywh {284 89 80 24} } } - Fl_Group {} { - label {Logging Panel Controls} open - xywh {3 123 370 62} box ENGRAVED_FRAME align 21 - } { - Fl_Output LOGGINGdisplay { - xywh {19 147 98 25} - code0 {o->textfont(progdefaults.LOGGINGtextfont);o->textsize(progdefaults.LOGGINGtextsize);o->textcolor(progdefaults.LOGGINGtextcolor);} - code1 {o->color(progdefaults.LOGGINGcolor);} - code2 {o->value("W1HKJ");} - code3 {o->redraw();} - } - Fl_Button btnLOGGING_color { - label {Bg Color} - callback {uchar r, g, b; - Fl::get_color(progdefaults.LOGGINGcolor, r, g, b); - - if (!fl_color_chooser("Background", r, g, b)) - return; - - progdefaults.LOGGINGcolor = fl_rgb_color(r, g, b); - - LOGGINGdisplay->color(progdefaults.LOGGINGcolor); - LOGGINGdisplay->redraw(); - - LOGGING_colors_font(); - - progdefaults.changed = true;} - xywh {127 147 80 25} - } - Fl_Button btn_LOGGING_font { - label Font - callback {font_browser->fontNumber(progdefaults.LOGGINGtextfont); -font_browser->fontSize(progdefaults.LOGGINGtextsize); -font_browser->fontColor(progdefaults.LOGGINGtextcolor); -font_browser->fontFilter(Font_Browser::ALL_TYPES); -font_browser->callback(cbLOGGINGFontBrowser); -font_browser->show();} - xywh {217 147 55 25} - } - Fl_Button btnLOGGINGdefault_colors_font { - label Default - callback {progdefaults.LOGGINGcolor = FL_BACKGROUND2_COLOR; -progdefaults.LOGGINGtextfont = (Fl_Font)0; -progdefaults.LOGGINGtextsize = 12; -progdefaults.LOGGINGtextcolor = FL_BLACK; - -LOGGINGdisplay->color(progdefaults.LOGGINGcolor); -LOGGINGdisplay->textsize(progdefaults.LOGGINGtextsize); -LOGGINGdisplay->textcolor(progdefaults.LOGGINGtextcolor); -LOGGINGdisplay->textfont(progdefaults.LOGGINGtextfont); -LOGGINGdisplay->redraw(); - -LOGGING_colors_font(); - -progdefaults.changed = true;} selected - xywh {283 147 80 25} - } - } } Fl_Group {} { label F_keys open @@ -988,6 +952,127 @@ progdefaults.changed = true;} xywh {27 41 316 21} } } + Fl_Group {} { + label Log open + xywh {0 30 375 155} hide + } { + Fl_Group {} { + label {Logging Panel Controls} open + xywh {1 33 372 65} box ENGRAVED_FRAME align 21 + } { + Fl_Output LOGGINGdisplay { + xywh {19 57 98 25} + code0 {o->textfont(progdefaults.LOGGINGtextfont);o->textsize(progdefaults.LOGGINGtextsize);o->textcolor(progdefaults.LOGGINGtextcolor);} + code1 {o->color(progdefaults.LOGGINGcolor);} + code2 {o->value("W1HKJ");} + code3 {o->redraw();} + } + Fl_Button btnLOGGING_color { + label {Bg Color} + callback {uchar r, g, b; + Fl::get_color(progdefaults.LOGGINGcolor, r, g, b); + + if (!fl_color_chooser("Background", r, g, b)) + return; + + progdefaults.LOGGINGcolor = fl_rgb_color(r, g, b); + + LOGGINGdisplay->color(progdefaults.LOGGINGcolor); + LOGGINGdisplay->redraw(); + + LOGGING_colors_font(); + + progdefaults.changed = true;} + xywh {127 57 80 25} + } + Fl_Button btn_LOGGING_font { + label Font + callback {font_browser->fontNumber(progdefaults.LOGGINGtextfont); +font_browser->fontSize(progdefaults.LOGGINGtextsize); +font_browser->fontColor(progdefaults.LOGGINGtextcolor); +font_browser->fontFilter(Font_Browser::ALL_TYPES); +font_browser->callback(cbLOGGINGFontBrowser); +font_browser->show();} + xywh {217 57 55 25} + } + Fl_Button btnLOGGINGdefault_colors_font { + label Default + callback {progdefaults.LOGGINGcolor = FL_BACKGROUND2_COLOR; +progdefaults.LOGGINGtextfont = (Fl_Font)0; +progdefaults.LOGGINGtextsize = 12; +progdefaults.LOGGINGtextcolor = FL_BLACK; + +LOGGINGdisplay->color(progdefaults.LOGGINGcolor); +LOGGINGdisplay->textsize(progdefaults.LOGGINGtextsize); +LOGGINGdisplay->textcolor(progdefaults.LOGGINGtextcolor); +LOGGINGdisplay->textfont(progdefaults.LOGGINGtextfont); +LOGGINGdisplay->redraw(); + +LOGGING_colors_font(); + +progdefaults.changed = true;} + xywh {283 57 80 25} + } + } + Fl_Group {} { + label {Logbook Dialog} open + xywh {3 108 370 65} box ENGRAVED_FRAME align 21 + } { + Fl_Output LOGBOOKdisplay { + xywh {19 132 98 25} + code0 {o->textfont(progdefaults.LOGGINGtextfont);o->textsize(progdefaults.LOGGINGtextsize);o->textcolor(progdefaults.LOGBOOKtextcolor);} + code1 {o->color(progdefaults.LOGBOOKcolor);} + code2 {o->value("14.070000");} + code3 {o->redraw();} + } + Fl_Button btnLOGBOOK_color { + label {Bg Color} + callback {uchar r, g, b; + Fl::get_color(progdefaults.LOGBOOKcolor, r, g, b); + + if (!fl_color_chooser("Background", r, g, b)) + return; + + progdefaults.LOGBOOKcolor = fl_rgb_color(r, g, b); + + LOGBOOKdisplay->color(progdefaults.LOGBOOKcolor); + LOGBOOKdisplay->redraw(); + + LOGBOOK_colors_font(); + + progdefaults.changed = true;} + xywh {127 132 80 25} + } + Fl_Button btn_LOGBOOK_font { + label Font + callback {font_browser->fontNumber(progdefaults.LOGBOOKtextfont); +font_browser->fontSize(progdefaults.LOGBOOKtextsize); +font_browser->fontColor(progdefaults.LOGBOOKtextcolor); +font_browser->fontFilter(Font_Browser::ALL_TYPES); +font_browser->callback(cbLOGBOOKFontBrowser); +font_browser->show();} + xywh {217 132 55 25} + } + Fl_Button btnLOGBOOKdefault_colors_font { + label Default + callback {progdefaults.LOGBOOKcolor = FL_BACKGROUND2_COLOR; +progdefaults.LOGBOOKtextfont = (Fl_Font)0; +progdefaults.LOGBOOKtextsize = 12; +progdefaults.LOGBOOKtextcolor = FL_BLACK; + +LOGBOOKdisplay->color(progdefaults.LOGBOOKcolor); +LOGBOOKdisplay->textsize(progdefaults.LOGBOOKtextsize); +LOGBOOKdisplay->textcolor(progdefaults.LOGBOOKtextcolor); +LOGBOOKdisplay->textfont(progdefaults.LOGBOOKtextfont); +LOGBOOKdisplay->redraw(); + +LOGBOOK_colors_font(); + +progdefaults.changed = true;} + xywh {283 132 80 25} + } + } + } } } } diff --git a/src/dialogs/fl_digi.cxx b/src/dialogs/fl_digi.cxx index 7c1de807..00d4213d 100644 --- a/src/dialogs/fl_digi.cxx +++ b/src/dialogs/fl_digi.cxx @@ -3887,6 +3887,7 @@ void combo_color_font(Fl_ComboBox *cbo) void LOGGING_colors_font() { +// int wh = fl_height(progdefaults.LOGGINGtextfont, progdefaults.LOGGINGtextsize) + 4; // input / output fields Fl_Input* in[] = { inpFreq1, @@ -3899,11 +3900,14 @@ void LOGGING_colors_font() inpQth, inpLoc, inpAZ, inpState, inpVEprov, inpCountry, inpSerNo1, inpSerNo2, outSerNo1, outSerNo2, - inpXchgIn1, inpXchgIn2, - inpNotes }; - for (size_t i = 0; i < sizeof(in)/sizeof(*in); i++) + inpXchgIn1, inpXchgIn2 }; + for (size_t i = 0; i < sizeof(in)/sizeof(*in); i++) { input_color_font(in[i]); - +// in[i]->size(in[i]->w(), wh); + } + input_color_font(inpNotes); +// inpNotes->size(inpNotes->w(), wh*2); + // buttons, boxes Fl_Widget *wid[] = { MODEstatus, Status1, Status2, StatusBar, WARNstatus }; @@ -3921,6 +3925,162 @@ void LOGGING_colors_font() combo_color_font(qso_opMODE); combo_color_font(qso_opBW); + fl_digi_main->redraw(); + +} + +inline void inp_font_pos(Fl_Input2* inp, int x, int y, int w, int h) +{ + inp->textsize(progdefaults.LOGBOOKtextsize); + inp->textfont(progdefaults.LOGBOOKtextfont); + inp->textcolor(progdefaults.LOGBOOKtextcolor); + inp->color(progdefaults.LOGBOOKcolor); + int ls = progdefaults.LOGBOOKtextsize; + inp->labelsize(ls < 14 ? ls : 14); + inp->redraw_label(); + inp->resize(x, y, w, h); +} + +inline void date_font_pos(Fl_DateInput* inp, int x, int y, int w, int h) +{ + inp->textsize(progdefaults.LOGBOOKtextsize); + inp->textfont(progdefaults.LOGBOOKtextfont); + inp->textcolor(progdefaults.LOGBOOKtextcolor); + inp->color(progdefaults.LOGBOOKcolor); + int ls = progdefaults.LOGBOOKtextsize; + inp->labelsize(ls < 14 ? ls : 14); + inp->redraw_label(); + inp->resize(x, y, w, h); +} + +void LOGBOOK_colors_font() +{ + if (!dlgLogbook) return; + +// input / output / date / text fields + fl_font(progdefaults.LOGBOOKtextfont, progdefaults.LOGBOOKtextsize); + int wh = fl_height() + 4;// + 8; + int width_date = fl_width("888888888") + wh; + int width_time = fl_width("23:59:599"); +// int width_call = fl_width("WW/WW8WWW/WW."); + int width_freq = fl_width("99.9999999"); + int width_rst = fl_width("5999"); + int width_pwr = fl_width("0000"); + int width_loc = fl_width("XX88XXX"); + int width_mode = fl_width("CONTESTIA"); + + int dlg_width = inpDate_log->x() + + width_date + 2 + + width_time + 2 + + width_freq + 2 + + width_mode + 2 + + width_pwr + 2 + + width_rst + 2 + + width_date + 2; + + int newheight = 24 + 4*(wh + 20) + 3*wh + 4 + bNewSave->h() + 4 + wBrowser->h() + 2; + + dlgLogbook->resize(dlgLogbook->x(), dlgLogbook->y(), dlg_width, newheight);//dlgLogbook->h()); + +// row1 + int ypos = 24; + int xpos = inpDate_log->x(); + + date_font_pos(inpDate_log, xpos, ypos, width_date, wh); xpos += width_date + 2; + inp_font_pos(inpTimeOn_log, xpos, ypos, width_time, wh); xpos += width_time + 2; + inp_font_pos(inpCall_log, xpos, ypos, width_freq, wh); + + date_font_pos(inpQSLrcvddate_log, + dlg_width - 2 - width_date, ypos, width_date, wh); + inp_font_pos(inpRstR_log, + inpQSLrcvddate_log->x() - 2 - width_rst, ypos, + width_rst, wh); + inp_font_pos(inpName_log, + inpCall_log->x() + width_freq + 2, ypos, + inpRstR_log->x() - 2 - (inpCall_log->x() + width_freq + 2), wh); +// row2 + ypos += wh + 20; + xpos = inpDateOff_log->x(); + + date_font_pos(inpDateOff_log, xpos, ypos, width_date, wh); xpos += width_date + 2; + inp_font_pos(inpTimeOff_log, xpos, ypos, width_time, wh); xpos += width_time + 2; + inp_font_pos(inpFreq_log, xpos, ypos, width_freq, wh); + + date_font_pos(inpQSLsentdate_log, + dlg_width - 2 - width_date, ypos, width_date, wh); + inp_font_pos(inpRstS_log, + inpQSLsentdate_log->x() - 2 - width_rst, ypos, + width_rst, wh); + inp_font_pos(inpTX_pwr_log, + inpRstS_log->x() - 2 - width_pwr, ypos, + width_pwr, wh); + inp_font_pos(inpMode_log, + inpFreq_log->x() + width_freq + 2, ypos, + inpTX_pwr_log->x() - 2 - (inpFreq_log->x() + width_freq + 2), wh); +// row 3 + ypos += (20 + wh); + + inp_font_pos(inpLoc_log, + dlg_width - 2 - width_loc, ypos, width_loc, wh); + inp_font_pos(inpCountry_log, + inpLoc_log->x() - 2 - inpCountry_log->w(), ypos, inpCountry_log->w(), wh); + inp_font_pos(inpVE_Prov_log, + inpCountry_log->x() - 2 - inpVE_Prov_log->w(), ypos, inpVE_Prov_log->w(), wh); + inp_font_pos(inpState_log, + inpVE_Prov_log->x() - 2 - inpState_log->w(), ypos, inpState_log->w(), wh); + inp_font_pos(inpQth_log, + inpQth_log->x(), ypos, inpState_log->x() - 2 - inpQth_log->x(), wh); + + ypos += (20 + wh); + Fl_Input2* row4[] = { + inpCNTY_log, inpIOTA_log, inpCQZ_log }; + for (size_t i = 0; i < sizeof(row4)/sizeof(*row4); i++) { + inp_font_pos(row4[i], row4[i]->x(), ypos, row4[i]->w(), wh); + } + + inp_font_pos(inpNotes_log, inpNotes_log->x(), ypos, inpNotes_log->w(), 3 * wh); + + ypos = inpNotes_log->y() + inpNotes_log->h() - wh; + Fl_Input2* row5[] = { + inpITUZ_log, inpCONT_log, inpDXCC_log }; + for (size_t i = 0; i < sizeof(row5)/sizeof(*row5); i++) { + inp_font_pos(row5[i], row5[i]->x(), ypos, row5[i]->w(), wh); + } + + ypos += 20 + wh; + Fl_Input2* row6[] = { + inpSerNoOut_log, inpMyXchg_log, inpSerNoIn_log, inpXchgIn_log, inpSearchString }; + for (size_t i = 0; i < sizeof(row6)/sizeof(*row6); i++) { + inp_font_pos(row6[i], row6[i]->x(), ypos, row6[i]->w(), wh); + } + + ypos += wh + 4; + txtNbrRecs_log->textcolor(progdefaults.LOGBOOKtextcolor); + txtNbrRecs_log->color(progdefaults.LOGBOOKcolor); + txtNbrRecs_log->resize(txtNbrRecs_log->x(), ypos, txtNbrRecs_log->w(), txtNbrRecs_log->h()); + int ls = progdefaults.LOGBOOKtextsize; + txtNbrRecs_log->labelsize(ls < 14 ? ls : 14); + txtNbrRecs_log->redraw_label(); + + Fl_Button* btns[] = { bNewSave, bUpdateCancel, bDelete, bDialFreq, + bSearchPrev, bSearchNext }; + for (size_t i = 0; i < sizeof(btns)/sizeof(*btns); i++) { + btns[i]->resize(btns[i]->x(), ypos, btns[i]->w(), btns[i]->h()); + btns[i]->redraw(); + } + +// browser (table) + ypos += btns[0]->h() + 4; + + wBrowser->color(progdefaults.LOGBOOKcolor); + wBrowser->selection_color(FL_SELECTION_COLOR); + + wBrowser->resize(wBrowser->x(), ypos, dlgLogbook->w() - 2*wBrowser->x(), dlgLogbook->h() - 2 - ypos); + + dlgLogbook->init_sizes(); + dlgLogbook->damage(); + dlgLogbook->redraw(); + } void create_fl_digi_main_primary() { diff --git a/src/include/calendar.h b/src/include/calendar.h index a329ab0b..63928a26 100644 --- a/src/include/calendar.h +++ b/src/include/calendar.h @@ -136,8 +136,10 @@ class Fl_DateInput : public Fl_Group { void format (int); const char *value (); void value (const char *); + void color (Fl_Color); void textfont (int); void textsize (int); + void textcolor (Fl_Color); void labelfont (int); void labelsize (int); void labelcolor (int); diff --git a/src/include/colorsfonts.h b/src/include/colorsfonts.h index d497063f..963d9803 100644 --- a/src/include/colorsfonts.h +++ b/src/include/colorsfonts.h @@ -21,11 +21,6 @@ extern Fl_Button *btn_freq_control_font; extern Fl_Button *btnBackgroundColor; extern Fl_Button *btnForegroundColor; extern Fl_Button *btnFD_SystemColor; -#include -extern Fl_Output *LOGGINGdisplay; -extern Fl_Button *btnLOGGING_color; -extern Fl_Button *btn_LOGGING_font; -extern Fl_Button *btnLOGGINGdefault_colors_font; #include extern Fl_Check_Button *btnUseGroupColors; extern Fl_Button *btnGroup1; @@ -77,5 +72,14 @@ extern Fl_Button *btnNormalSignal; extern Fl_Box *normalcolor; extern Fl_Button *btnOverSignal; extern Fl_Box *overcolor; +#include +extern Fl_Output *LOGGINGdisplay; +extern Fl_Button *btnLOGGING_color; +extern Fl_Button *btn_LOGGING_font; +extern Fl_Button *btnLOGGINGdefault_colors_font; +extern Fl_Output *LOGBOOKdisplay; +extern Fl_Button *btnLOGBOOK_color; +extern Fl_Button *btn_LOGBOOK_font; +extern Fl_Button *btnLOGBOOKdefault_colors_font; Fl_Double_Window* make_colorsfonts(); #endif diff --git a/src/include/configuration.h b/src/include/configuration.h index c41b240d..d1c9d706 100644 --- a/src/include/configuration.h +++ b/src/include/configuration.h @@ -1234,6 +1234,18 @@ ELEM_(int, LOGGINGtextsize, "LOGGINGTEXTSIZE", \ "Logging Controls font size", \ 12) \ + ELEM_(Fl_Color, LOGBOOKtextcolor, "LOGBOOKTEXTCOLOR", \ + "Text color in logbook dialog", \ + FL_BLACK) \ + ELEM_(Fl_Color, LOGBOOKcolor, "LOGBOOKCOLOR", \ + "Background color in logbook dialog", \ + FL_BACKGROUND2_COLOR) \ + ELEM_(Fl_Font, LOGBOOKtextfont, "LOGBOOKTEXTFONT", \ + "Logbook dialog controls font number", \ + FL_HELVETICA) \ + ELEM_(int, LOGBOOKtextsize, "LOGBOOKTEXTSIZE", \ + "Logbook dialog controls font size", \ + 12) \ ELEM_(std::string, FreqControlFontName, "FREQCONTROLFONTNAME", \ "Frequency Control font name", \ "") \ diff --git a/src/include/fl_digi.h b/src/include/fl_digi.h index a2bf9506..eadd493b 100644 --- a/src/include/fl_digi.h +++ b/src/include/fl_digi.h @@ -265,6 +265,7 @@ extern void start_tx(); extern void abort_tx(); extern void LOGGING_colors_font(); +extern void LOGBOOK_colors_font(); extern void colorize_macro(int i); extern void colorize_macros(); diff --git a/src/include/lgbook.h b/src/include/lgbook.h index acbc7c60..4f8d46e5 100644 --- a/src/include/lgbook.h +++ b/src/include/lgbook.h @@ -54,32 +54,37 @@ extern Fl_Check_Button *btnSelectIOTA; extern Fl_Check_Button *btnSelectITUZ; extern Fl_Button *btnSetFieldDefaults; extern Fl_Double_Window *dlgLogbook; -extern Fl_Group *editGroup; extern Fl_DateInput *inpDate_log; extern Fl_Input2 *inpTimeOn_log; -extern Fl_DateInput *inpDateOff_log; -extern Fl_Input2 *inpTimeOff_log; extern Fl_Input2 *inpCall_log; extern Fl_Input2 *inpName_log; +extern Fl_Input2 *inpRstR_log; +extern Fl_DateInput *inpQSLrcvddate_log; +extern Fl_DateInput *inpDateOff_log; +extern Fl_Input2 *inpTimeOff_log; extern Fl_Input2 *inpFreq_log; extern Fl_Input2 *inpMode_log; -extern Fl_Input2 *inpRstR_log; -extern Fl_Input2 *inpRstS_log; extern Fl_Input2 *inpTX_pwr_log; -extern Fl_DateInput *inpQSLrcvddate_log; +extern Fl_Input2 *inpRstS_log; extern Fl_DateInput *inpQSLsentdate_log; extern Fl_Input2 *inpQth_log; extern Fl_Input2 *inpState_log; extern Fl_Input2 *inpVE_Prov_log; extern Fl_Input2 *inpCountry_log; extern Fl_Input2 *inpLoc_log; +extern Fl_Input2 *inpNotes_log; extern Fl_Input2 *inpCNTY_log; extern Fl_Input2 *inpIOTA_log; extern Fl_Input2 *inpCQZ_log; extern Fl_Input2 *inpITUZ_log; extern Fl_Input2 *inpCONT_log; extern Fl_Input2 *inpDXCC_log; -extern Fl_Input2 *inpNotes_log; +extern Fl_Input2 *inpSerNoOut_log; +extern Fl_Input2 *inpMyXchg_log; +extern Fl_Input2 *inpSerNoIn_log; +extern Fl_Input2 *inpXchgIn_log; +extern Fl_Input2 *inpSearchString; +extern Fl_Input2 *txtNbrRecs_log; extern void cb_btnNewSave(Fl_Button*, void*); extern Fl_Button *bNewSave; extern void cb_btnUpdateCancel(Fl_Button*, void*); @@ -88,12 +93,6 @@ extern void cb_btnDelete(Fl_Button*, void*); extern Fl_Button *bDelete; extern void cb_btnDialFreq(Fl_Button*, void*); extern Fl_Button *bDialFreq; -extern Fl_Input2 *txtNbrRecs_log; -extern Fl_Input2 *inpSerNoOut_log; -extern Fl_Input2 *inpMyXchg_log; -extern Fl_Input2 *inpSerNoIn_log; -extern Fl_Input2 *inpXchgIn_log; -extern Fl_Input2 *inpSearchString; extern void cb_search(Fl_Button*, void*); extern Fl_Button *bSearchPrev; extern Fl_Button *bSearchNext; diff --git a/src/include/table.h b/src/include/table.h index b4316530..365f1f28 100644 --- a/src/include/table.h +++ b/src/include/table.h @@ -115,7 +115,6 @@ protected: virtual void drawRow(int row, char *rowData[], int x, int y); virtual void draw(); - virtual void resize(int x, int y, int w, int h); void calcDimensions(); void scrolled(); @@ -143,6 +142,8 @@ public: int scrollbSize() const; void scrollbSize(int size); + virtual void resize(int x, int y, int w, int h); + Fl_Align headerAlign(int column) const; void headerAlign(int column, Fl_Align align); @@ -213,6 +214,8 @@ public: void NextPage (); void GotoRow (int); + int vScrollWidth() { return (vScroll ? vScroll->w() : 0);} + bool search(int& row, int& col, bool rev, const char* re); }; diff --git a/src/logbook/calendar.cxx b/src/logbook/calendar.cxx index 9f486731..229c95fd 100644 --- a/src/logbook/calendar.cxx +++ b/src/logbook/calendar.cxx @@ -512,7 +512,7 @@ void btnDateInput_cb (Fl_Widget *v, void *d) Fl_DateInput::Fl_DateInput (int X,int Y,int W,int H, const char *L) : Fl_Group (X, Y, W, H, 0) { - Btn = new Fl_Button (X + W - H + 1, Y + 1, H - 2, H - 2); + Btn = new Fl_Button (X + W - H, Y, H, H); (new Fl_Pixmap (time_icon))->label (Btn); Btn->callback ((Fl_Callback *)btnDateInput_cb, 0); Input = new Fl_Input2 (X, Y, W-H, H, L); @@ -550,6 +550,16 @@ void Fl_DateInput::textsize(int sz) Input->textsize (sz); } +void Fl_DateInput::textcolor(Fl_Color c) +{ + Input->textcolor(c); +} + +void Fl_DateInput::color(Fl_Color c) +{ + Input->color(c); +} + void Fl_DateInput::labelfont(int fnt) { Input->labelfont(fnt); diff --git a/src/logbook/lgbook.cxx b/src/logbook/lgbook.cxx index 70a1880d..5cb055f8 100644 --- a/src/logbook/lgbook.cxx +++ b/src/logbook/lgbook.cxx @@ -223,31 +223,29 @@ btnSelectNotes->value(0); Fl_Double_Window *dlgLogbook=(Fl_Double_Window *)0; -Fl_Group *editGroup=(Fl_Group *)0; - Fl_DateInput *inpDate_log=(Fl_DateInput *)0; Fl_Input2 *inpTimeOn_log=(Fl_Input2 *)0; -Fl_DateInput *inpDateOff_log=(Fl_DateInput *)0; - -Fl_Input2 *inpTimeOff_log=(Fl_Input2 *)0; - Fl_Input2 *inpCall_log=(Fl_Input2 *)0; Fl_Input2 *inpName_log=(Fl_Input2 *)0; +Fl_Input2 *inpRstR_log=(Fl_Input2 *)0; + +Fl_DateInput *inpQSLrcvddate_log=(Fl_DateInput *)0; + +Fl_DateInput *inpDateOff_log=(Fl_DateInput *)0; + +Fl_Input2 *inpTimeOff_log=(Fl_Input2 *)0; + Fl_Input2 *inpFreq_log=(Fl_Input2 *)0; Fl_Input2 *inpMode_log=(Fl_Input2 *)0; -Fl_Input2 *inpRstR_log=(Fl_Input2 *)0; - -Fl_Input2 *inpRstS_log=(Fl_Input2 *)0; - Fl_Input2 *inpTX_pwr_log=(Fl_Input2 *)0; -Fl_DateInput *inpQSLrcvddate_log=(Fl_DateInput *)0; +Fl_Input2 *inpRstS_log=(Fl_Input2 *)0; Fl_DateInput *inpQSLsentdate_log=(Fl_DateInput *)0; @@ -261,6 +259,8 @@ Fl_Input2 *inpCountry_log=(Fl_Input2 *)0; Fl_Input2 *inpLoc_log=(Fl_Input2 *)0; +Fl_Input2 *inpNotes_log=(Fl_Input2 *)0; + Fl_Input2 *inpCNTY_log=(Fl_Input2 *)0; Fl_Input2 *inpIOTA_log=(Fl_Input2 *)0; @@ -273,18 +273,6 @@ Fl_Input2 *inpCONT_log=(Fl_Input2 *)0; Fl_Input2 *inpDXCC_log=(Fl_Input2 *)0; -Fl_Input2 *inpNotes_log=(Fl_Input2 *)0; - -Fl_Button *bNewSave=(Fl_Button *)0; - -Fl_Button *bUpdateCancel=(Fl_Button *)0; - -Fl_Button *bDelete=(Fl_Button *)0; - -Fl_Button *bDialFreq=(Fl_Button *)0; - -Fl_Input2 *txtNbrRecs_log=(Fl_Input2 *)0; - Fl_Input2 *inpSerNoOut_log=(Fl_Input2 *)0; Fl_Input2 *inpMyXchg_log=(Fl_Input2 *)0; @@ -295,6 +283,16 @@ Fl_Input2 *inpXchgIn_log=(Fl_Input2 *)0; Fl_Input2 *inpSearchString=(Fl_Input2 *)0; +Fl_Input2 *txtNbrRecs_log=(Fl_Input2 *)0; + +Fl_Button *bNewSave=(Fl_Button *)0; + +Fl_Button *bUpdateCancel=(Fl_Button *)0; + +Fl_Button *bDelete=(Fl_Button *)0; + +Fl_Button *bDialFreq=(Fl_Button *)0; + Fl_Button *bSearchPrev=(Fl_Button *)0; Fl_Button *bSearchNext=(Fl_Button *)0; @@ -562,443 +560,429 @@ void create_logbook_dialogs() { wExport->set_modal(); wExport->end(); } // Fl_Double_Window* wExport - { dlgLogbook = new Fl_Double_Window(590, 490, _("Logbook")); - dlgLogbook->color(FL_DARK1); - { editGroup = new Fl_Group(2, 2, 586, 290); - editGroup->box(FL_ENGRAVED_FRAME); - editGroup->color(FL_LIGHT2); - { inpDate_log = new Fl_DateInput(6, 20, 100, 22, _("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->labeltype(FL_NORMAL_LABEL); - inpDate_log->labelfont(0); - inpDate_log->labelsize(12); - inpDate_log->labelcolor(FL_FOREGROUND_COLOR); - inpDate_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpDate_log->when(FL_WHEN_RELEASE); - inpDate_log->format(2); - } // Fl_DateInput* inpDate_log - { inpTimeOn_log = new Fl_Input2(108, 20, 60, 22, _("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->labeltype(FL_NORMAL_LABEL); - inpTimeOn_log->labelfont(0); - inpTimeOn_log->labelsize(12); - inpTimeOn_log->labelcolor(FL_FOREGROUND_COLOR); - inpTimeOn_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpTimeOn_log->when(FL_WHEN_RELEASE); - } // Fl_Input2* inpTimeOn_log - { inpDateOff_log = new Fl_DateInput(170, 20, 96, 22, _("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->labeltype(FL_NORMAL_LABEL); - inpDateOff_log->labelfont(0); - inpDateOff_log->labelsize(12); - inpDateOff_log->labelcolor(FL_FOREGROUND_COLOR); - inpDateOff_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpDateOff_log->when(FL_WHEN_RELEASE); - inpDateOff_log->format(2); - } // Fl_DateInput* inpDateOff_log - { inpTimeOff_log = new Fl_Input2(268, 20, 60, 22, _("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->labeltype(FL_NORMAL_LABEL); - inpTimeOff_log->labelfont(0); - inpTimeOff_log->labelsize(12); - inpTimeOff_log->labelcolor(FL_FOREGROUND_COLOR); - inpTimeOff_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpTimeOff_log->when(FL_WHEN_RELEASE); - } // Fl_Input2* inpTimeOff_log - { inpCall_log = new Fl_Input2(330, 20, 91, 22, _("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->labeltype(FL_NORMAL_LABEL); - inpCall_log->labelfont(0); - inpCall_log->labelsize(12); - inpCall_log->labelcolor(FL_FOREGROUND_COLOR); - inpCall_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpCall_log->when(FL_WHEN_RELEASE); - } // Fl_Input2* inpCall_log - { inpName_log = new Fl_Input2(424, 20, 160, 22, _("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->labeltype(FL_NORMAL_LABEL); - inpName_log->labelfont(0); - inpName_log->labelsize(12); - inpName_log->labelcolor(FL_FOREGROUND_COLOR); - inpName_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpName_log->when(FL_WHEN_RELEASE); - } // Fl_Input2* inpName_log - { inpFreq_log = new Fl_Input2(6, 60, 100, 22, _("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->labeltype(FL_NORMAL_LABEL); - inpFreq_log->labelfont(0); - inpFreq_log->labelsize(12); - inpFreq_log->labelcolor(FL_FOREGROUND_COLOR); - inpFreq_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpFreq_log->when(FL_WHEN_RELEASE); - } // Fl_Input2* inpFreq_log - { inpMode_log = new Fl_Input2(109, 60, 130, 22, _("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->labeltype(FL_NORMAL_LABEL); - inpMode_log->labelfont(0); - inpMode_log->labelsize(12); - inpMode_log->labelcolor(FL_FOREGROUND_COLOR); - inpMode_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpMode_log->when(FL_WHEN_RELEASE); - } // Fl_Input2* inpMode_log - { inpRstR_log = new Fl_Input2(242, 60, 35, 22, _("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->labeltype(FL_NORMAL_LABEL); - inpRstR_log->labelfont(0); - inpRstR_log->labelsize(12); - inpRstR_log->labelcolor(FL_FOREGROUND_COLOR); - inpRstR_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpRstR_log->when(FL_WHEN_RELEASE); - } // Fl_Input2* inpRstR_log - { inpRstS_log = new Fl_Input2(280, 60, 35, 22, _("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->labeltype(FL_NORMAL_LABEL); - inpRstS_log->labelfont(0); - inpRstS_log->labelsize(12); - inpRstS_log->labelcolor(FL_FOREGROUND_COLOR); - inpRstS_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpRstS_log->when(FL_WHEN_RELEASE); - } // Fl_Input2* inpRstS_log - { inpTX_pwr_log = new Fl_Input2(318, 60, 60, 22, _("Tx Power")); - 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->labeltype(FL_NORMAL_LABEL); - inpTX_pwr_log->labelfont(0); - inpTX_pwr_log->labelsize(12); - inpTX_pwr_log->labelcolor(FL_FOREGROUND_COLOR); - inpTX_pwr_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpTX_pwr_log->when(FL_WHEN_RELEASE); - } // Fl_Input2* inpTX_pwr_log - { Fl_DateInput* o = inpQSLrcvddate_log = new Fl_DateInput(381, 60, 100, 22, _("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->labeltype(FL_NORMAL_LABEL); - inpQSLrcvddate_log->labelfont(0); - inpQSLrcvddate_log->labelsize(12); - inpQSLrcvddate_log->labelcolor(FL_FOREGROUND_COLOR); - inpQSLrcvddate_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpQSLrcvddate_log->when(FL_WHEN_RELEASE); - o->format(2); - } // Fl_DateInput* inpQSLrcvddate_log - { Fl_DateInput* o = inpQSLsentdate_log = new Fl_DateInput(484, 60, 100, 22, _("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->labeltype(FL_NORMAL_LABEL); - inpQSLsentdate_log->labelfont(0); - inpQSLsentdate_log->labelsize(12); - inpQSLsentdate_log->labelcolor(FL_FOREGROUND_COLOR); - inpQSLsentdate_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpQSLsentdate_log->when(FL_WHEN_RELEASE); - o->format(2); - } // Fl_DateInput* inpQSLsentdate_log - { inpQth_log = new Fl_Input2(6, 101, 236, 22, _("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->labeltype(FL_NORMAL_LABEL); - inpQth_log->labelfont(0); - inpQth_log->labelsize(12); - inpQth_log->labelcolor(FL_FOREGROUND_COLOR); - inpQth_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpQth_log->when(FL_WHEN_RELEASE); - } // Fl_Input2* inpQth_log - { inpState_log = new Fl_Input2(247, 101, 44, 22, _("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->labeltype(FL_NORMAL_LABEL); - inpState_log->labelfont(0); - inpState_log->labelsize(12); - inpState_log->labelcolor(FL_FOREGROUND_COLOR); - inpState_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpState_log->when(FL_WHEN_RELEASE); - } // Fl_Input2* inpState_log - { inpVE_Prov_log = new Fl_Input2(296, 101, 44, 22, _("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->labeltype(FL_NORMAL_LABEL); - inpVE_Prov_log->labelfont(0); - inpVE_Prov_log->labelsize(12); - inpVE_Prov_log->labelcolor(FL_FOREGROUND_COLOR); - inpVE_Prov_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpVE_Prov_log->when(FL_WHEN_RELEASE); - } // Fl_Input2* inpVE_Prov_log - { inpCountry_log = new Fl_Input2(345, 101, 154, 22, _("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->labeltype(FL_NORMAL_LABEL); - inpCountry_log->labelfont(0); - inpCountry_log->labelsize(12); - inpCountry_log->labelcolor(FL_FOREGROUND_COLOR); - inpCountry_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpCountry_log->when(FL_WHEN_RELEASE); - } // Fl_Input2* inpCountry_log - { inpLoc_log = new Fl_Input2(504, 101, 80, 22, _("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->labeltype(FL_NORMAL_LABEL); - inpLoc_log->labelfont(0); - inpLoc_log->labelsize(12); - inpLoc_log->labelcolor(FL_FOREGROUND_COLOR); - inpLoc_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpLoc_log->when(FL_WHEN_RELEASE); - } // Fl_Input2* inpLoc_log - { inpCNTY_log = new Fl_Input2(6, 142, 120, 22, _("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->labeltype(FL_NORMAL_LABEL); - inpCNTY_log->labelfont(0); - inpCNTY_log->labelsize(12); - inpCNTY_log->labelcolor(FL_FOREGROUND_COLOR); - inpCNTY_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpCNTY_log->when(FL_WHEN_RELEASE); - } // Fl_Input2* inpCNTY_log - { inpIOTA_log = new Fl_Input2(137, 142, 80, 22, _("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->labeltype(FL_NORMAL_LABEL); - inpIOTA_log->labelfont(0); - inpIOTA_log->labelsize(12); - inpIOTA_log->labelcolor(FL_FOREGROUND_COLOR); - inpIOTA_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpIOTA_log->when(FL_WHEN_RELEASE); - } // Fl_Input2* inpIOTA_log - { inpCQZ_log = new Fl_Input2(229, 142, 80, 22, _("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->labeltype(FL_NORMAL_LABEL); - inpCQZ_log->labelfont(0); - inpCQZ_log->labelsize(12); - inpCQZ_log->labelcolor(FL_FOREGROUND_COLOR); - inpCQZ_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpCQZ_log->when(FL_WHEN_RELEASE); - } // Fl_Input2* inpCQZ_log - { inpITUZ_log = new Fl_Input2(320, 142, 80, 22, _("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->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->when(FL_WHEN_RELEASE); - } // Fl_Input2* inpITUZ_log - { inpCONT_log = new Fl_Input2(412, 142, 80, 22, _("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->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->when(FL_WHEN_RELEASE); - } // Fl_Input2* inpCONT_log - { inpDXCC_log = new Fl_Input2(504, 142, 80, 22, _("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->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->when(FL_WHEN_RELEASE); - } // Fl_Input2* inpDXCC_log - { inpNotes_log = new Fl_Input2(6, 180, 578, 35, _("Notes")); - inpNotes_log->tooltip(_("Interesting notes (80 chars max)")); - 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->labeltype(FL_NORMAL_LABEL); - inpNotes_log->labelfont(0); - inpNotes_log->labelsize(12); - inpNotes_log->labelcolor(FL_FOREGROUND_COLOR); - inpNotes_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpNotes_log->when(FL_WHEN_RELEASE); - } // Fl_Input2* inpNotes_log - { bNewSave = new Fl_Button(117, 263, 75, 22, _("New")); - bNewSave->tooltip(_("New record / Save record")); - bNewSave->shortcut(0x8004e); - bNewSave->color(FL_LIGHT1); - bNewSave->selection_color((Fl_Color)48); - bNewSave->callback((Fl_Callback*)cb_btnNewSave); - } // Fl_Button* bNewSave - { bUpdateCancel = new Fl_Button(204, 263, 75, 22, _("Update")); - bUpdateCancel->tooltip(_("Update the current record")); - bUpdateCancel->shortcut(0x80055); - bUpdateCancel->color(FL_LIGHT1); - bUpdateCancel->selection_color((Fl_Color)48); - bUpdateCancel->callback((Fl_Callback*)cb_btnUpdateCancel); - } // Fl_Button* bUpdateCancel - { bDelete = new Fl_Button(292, 263, 75, 22, _("Delete")); - bDelete->tooltip(_("Delete the current record")); - bDelete->shortcut(0x80044); - bDelete->color(FL_LIGHT1); - bDelete->selection_color((Fl_Color)48); - bDelete->callback((Fl_Callback*)cb_btnDelete); - } // Fl_Button* bDelete - { bDialFreq = new Fl_Button(380, 263, 75, 22, _("Dial")); - bDialFreq->tooltip(_("Retrieve for active modem use")); - bDialFreq->shortcut(0x50066); - bDialFreq->color(FL_LIGHT1); - bDialFreq->selection_color((Fl_Color)48); - bDialFreq->callback((Fl_Callback*)cb_btnDialFreq); - } // Fl_Button* bDialFreq - { txtNbrRecs_log = new Fl_Input2(41, 263, 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->labeltype(FL_NORMAL_LABEL); - txtNbrRecs_log->labelfont(0); - txtNbrRecs_log->labelsize(12); - txtNbrRecs_log->labelcolor(FL_FOREGROUND_COLOR); - txtNbrRecs_log->align(Fl_Align(FL_ALIGN_LEFT)); - txtNbrRecs_log->when(FL_WHEN_RELEASE); - } // Fl_Input2* txtNbrRecs_log - { Fl_Group* o = new Fl_Group(6, 216, 460, 44); - o->box(FL_ENGRAVED_FRAME); - { inpSerNoOut_log = new Fl_Input2(11, 233, 55, 22, _("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->labeltype(FL_NORMAL_LABEL); - inpSerNoOut_log->labelfont(0); - inpSerNoOut_log->labelsize(12); - inpSerNoOut_log->labelcolor(FL_FOREGROUND_COLOR); - inpSerNoOut_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpSerNoOut_log->when(FL_WHEN_RELEASE); - } // Fl_Input2* inpSerNoOut_log - { inpMyXchg_log = new Fl_Input2(68, 233, 164, 22, _("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->labeltype(FL_NORMAL_LABEL); - inpMyXchg_log->labelfont(0); - inpMyXchg_log->labelsize(12); - inpMyXchg_log->labelcolor(FL_FOREGROUND_COLOR); - inpMyXchg_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpMyXchg_log->when(FL_WHEN_RELEASE); - } // Fl_Input2* inpMyXchg_log - { inpSerNoIn_log = new Fl_Input2(235, 233, 55, 22, _("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->labeltype(FL_NORMAL_LABEL); - inpSerNoIn_log->labelfont(0); - inpSerNoIn_log->labelsize(12); - inpSerNoIn_log->labelcolor(FL_FOREGROUND_COLOR); - inpSerNoIn_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpSerNoIn_log->when(FL_WHEN_RELEASE); - } // Fl_Input2* inpSerNoIn_log - { inpXchgIn_log = new Fl_Input2(293, 233, 164, 22, _("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->labeltype(FL_NORMAL_LABEL); - inpXchgIn_log->labelfont(0); - inpXchgIn_log->labelsize(12); - inpXchgIn_log->labelcolor(FL_FOREGROUND_COLOR); - inpXchgIn_log->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpXchgIn_log->when(FL_WHEN_RELEASE); - } // Fl_Input2* inpXchgIn_log - o->end(); - } // Fl_Group* o - { Fl_Group* o = new Fl_Group(468, 216, 116, 73); - o->box(FL_ENGRAVED_FRAME); - { inpSearchString = new Fl_Input2(474, 233, 105, 22, _("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->labeltype(FL_NORMAL_LABEL); - inpSearchString->labelfont(0); - inpSearchString->labelsize(12); - inpSearchString->labelcolor(FL_FOREGROUND_COLOR); - inpSearchString->align(Fl_Align(FL_ALIGN_TOP_LEFT)); - inpSearchString->when(FL_WHEN_RELEASE); - } // Fl_Input2* inpSearchString - { bSearchPrev = new Fl_Button(475, 263, 24, 22); - bSearchPrev->tooltip(_("Find previous")); - bSearchPrev->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->image(new Fl_Pixmap(left_arrow_icon)); - } // Fl_Button* bSearchPrev - { bSearchNext = new Fl_Button(554, 263, 24, 22); - bSearchNext->tooltip(_("Find next")); - bSearchNext->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->image(new Fl_Pixmap(right_arrow_icon)); - } // Fl_Button* bSearchNext - o->end(); - } // Fl_Group* o - editGroup->end(); - } // Fl_Group* editGroup - { wBrowser = new Table(2, 293, 585, 195); + { dlgLogbook = new Fl_Double_Window(590, 514, _("Logbook")); + { 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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->labeltype(FL_NORMAL_LABEL); + inpSearchString->labelfont(0); + inpSearchString->labelsize(14); + inpSearchString->labelcolor(FL_FOREGROUND_COLOR); + inpSearchString->align(Fl_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->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->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->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->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->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->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->selection_color((Fl_Color)48); + bSearchPrev->callback((Fl_Callback*)cb_search); + bSearchPrev->align(Fl_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->selection_color((Fl_Color)48); + bSearchNext->callback((Fl_Callback*)cb_search); + bSearchNext->align(Fl_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); diff --git a/src/logbook/lgbook.fl b/src/logbook/lgbook.fl index 2d2d4e46..63488d5f 100644 --- a/src/logbook/lgbook.fl +++ b/src/logbook/lgbook.fl @@ -308,213 +308,201 @@ btnSelectNotes->value(0);} } Fl_Window dlgLogbook { label Logbook open - xywh {603 71 590 490} type Double color 47 resizable visible + xywh {603 71 590 514} type Double resizable visible } { - Fl_Group editGroup {open - xywh {2 2 586 290} box ENGRAVED_FRAME color 52 - } { - Fl_Input inpDate_log { - label {Date On} - tooltip {Date QSO started} xywh {6 20 100 22} labelsize 12 align 5 - code0 {\#include "calendar.h"} - code1 {inpDate_log->format(2);} - class Fl_DateInput - } - Fl_Input inpTimeOn_log { - label {Time On} - tooltip {Time QSO started} xywh {108 20 60 22} labelsize 12 align 5 - class Fl_Input2 - } - Fl_Input inpDateOff_log { - label {Date Off} - tooltip {Date QSO Ended} xywh {170 20 96 22} labelsize 12 align 5 - code0 {\#include "calendar.h"} - code1 {inpDateOff_log->format(2);} - class Fl_DateInput - } - Fl_Input inpTimeOff_log { - label {Time Off} - tooltip {Time QSO ended} xywh {268 20 60 22} labelsize 12 align 5 - class Fl_Input2 - } - Fl_Input inpCall_log { - label Call - tooltip {Call sign worked} xywh {330 20 91 22} labelsize 12 align 5 - class Fl_Input2 - } - Fl_Input inpName_log { - label Name - tooltip {Operator worked} xywh {424 20 160 22} labelsize 12 align 5 - class Fl_Input2 - } - Fl_Input inpFreq_log { - label {Freq.} - tooltip {Frequency in MHz} xywh {6 60 100 22} labelsize 12 align 5 - class Fl_Input2 - } - Fl_Input inpMode_log { - label Mode - tooltip {Mode in use} xywh {109 60 130 22} labelsize 12 align 5 - class Fl_Input2 - } - Fl_Input inpRstR_log { - label In - tooltip {Rst received} xywh {242 60 35 22} labelsize 12 align 5 - class Fl_Input2 - } - Fl_Input inpRstS_log { - label Out - tooltip {Rst sent} xywh {280 60 35 22} labelsize 12 align 5 - class Fl_Input2 - } - Fl_Input inpTX_pwr_log { - label {Tx Power} - tooltip {Transmit power used} xywh {318 60 60 22} labelsize 12 align 5 - class Fl_Input2 - } - Fl_Input inpQSLrcvddate_log { - label {QSL-rcvd} - tooltip {QSL received on this date} xywh {381 60 100 22} labelsize 12 align 5 - code1 {o->format(2);} - class Fl_DateInput - } - Fl_Input inpQSLsentdate_log { - label {QSL-sent} - tooltip {QSL sent on this date} xywh {484 60 100 22} labelsize 12 align 5 - code1 {o->format(2);} - class Fl_DateInput - } - Fl_Input inpQth_log { - label Qth - tooltip {City of station worked} xywh {6 101 236 22} labelsize 12 align 5 - class Fl_Input2 - } - Fl_Input inpState_log { - label St - tooltip {US state of station worked} xywh {247 101 44 22} labelsize 12 align 5 - class Fl_Input2 - } - Fl_Input inpVE_Prov_log { - label Pr - tooltip {Province of station worked} xywh {296 101 44 22} labelsize 12 align 5 - class Fl_Input2 - } - Fl_Input inpCountry_log { - label Country - tooltip {Country of station worked} xywh {345 101 154 22} labelsize 12 align 5 - class Fl_Input2 - } - Fl_Input inpLoc_log { - label Loc - tooltip {Stations grid square} xywh {504 101 80 22} labelsize 12 align 5 - class Fl_Input2 - } - Fl_Input inpCNTY_log { - label County - tooltip County xywh {6 142 120 22} labelsize 12 align 5 - class Fl_Input2 - } - Fl_Input inpIOTA_log { - label IOTA - tooltip {Islands on the air} xywh {137 142 80 22} labelsize 12 align 5 - class Fl_Input2 - } - Fl_Input inpCQZ_log { - label CQZ - tooltip {CQ zone} xywh {229 142 80 22} labelsize 12 align 5 - class Fl_Input2 - } - Fl_Input inpITUZ_log { - label ITUZ - tooltip {ITU zone} xywh {320 142 80 22} labelsize 12 align 5 - class Fl_Input2 - } - Fl_Input inpCONT_log { - label CONT - tooltip Continent xywh {412 142 80 22} labelsize 12 align 5 - class Fl_Input2 - } - Fl_Input inpDXCC_log { - label DXCC - tooltip {DXCC designator} xywh {504 142 80 22} labelsize 12 align 5 - class Fl_Input2 - } - Fl_Input inpNotes_log { - label Notes - tooltip {Interesting notes (80 chars max)} xywh {6 180 578 35} type Multiline labelsize 12 align 5 - class Fl_Input2 - } - Fl_Button bNewSave { - label New - callback cb_btnNewSave - tooltip {New record / Save record} xywh {117 263 75 22} shortcut 0x8004e color 50 selection_color 48 - } - Fl_Button bUpdateCancel { - label Update - callback cb_btnUpdateCancel - tooltip {Update the current record} xywh {204 263 75 22} shortcut 0x80055 color 50 selection_color 48 - } - Fl_Button bDelete { - label Delete - callback cb_btnDelete - tooltip {Delete the current record} xywh {292 263 75 22} shortcut 0x80044 color 50 selection_color 48 - } - Fl_Button bDialFreq { - label Dial - callback cb_btnDialFreq - tooltip {Retrieve for active modem use} xywh {380 263 75 22} shortcut 0x50066 color 50 selection_color 48 - } - Fl_Input txtNbrRecs_log { - label Recs - tooltip {\# Records in logbook} xywh {41 263 65 22} labelsize 12 - class Fl_Input2 - } - Fl_Group {} {open - xywh {6 216 460 44} box ENGRAVED_FRAME - } { - Fl_Input inpSerNoOut_log { - label {Ser\# out} - tooltip {Contest seral \# sent} xywh {11 233 55 22} labelsize 12 align 5 - class Fl_Input2 - } - Fl_Input inpMyXchg_log { - label {Exchange Out} - tooltip {Contest exchange sent} xywh {68 233 164 22} labelsize 12 align 5 - class Fl_Input2 - } - Fl_Input inpSerNoIn_log { - label {Ser\# in} - tooltip {Contest serial \# received} xywh {235 233 55 22} labelsize 12 align 5 - class Fl_Input2 - } - Fl_Input inpXchgIn_log { - label {Exchange In} - tooltip {Contest exchange received} xywh {293 233 164 22} labelsize 12 align 5 - class Fl_Input2 - } - } - Fl_Group {} {open - xywh {468 216 116 73} box ENGRAVED_FRAME - } { - Fl_Input inpSearchString { - label {Call Search} - tooltip {Search for this callsign} xywh {474 233 105 22} labelsize 12 align 5 - class Fl_Input2 - } - Fl_Button bSearchPrev { - callback cb_search - tooltip {Find previous} xywh {475 263 24 22} color 50 selection_color 48 align 16 - code0 {bSearchPrev->image(new Fl_Pixmap(left_arrow_icon));} - } - Fl_Button bSearchNext { - callback cb_search - tooltip {Find next} xywh {554 263 24 22} color 50 selection_color 48 align 16 - code0 {bSearchNext->image(new Fl_Pixmap(right_arrow_icon));} - } - } + Fl_Input inpDate_log { + label {Date On} + tooltip {Date QSO started} xywh {4 24 100 24} align 5 + code0 {\#include "calendar.h"} + code1 {inpDate_log->format(2);} + class Fl_DateInput } - Fl_Group wBrowser {open selected - xywh {2 293 585 195} box DOWN_FRAME color 7 selection_color 15 resizable + Fl_Input inpTimeOn_log { + label {Time On} + tooltip {Time QSO started} xywh {106 24 70 24} align 5 + class Fl_Input2 + } + Fl_Input inpCall_log { + label Call + tooltip {Call sign worked} xywh {178 24 100 24} align 5 + class Fl_Input2 + } + Fl_Input inpName_log { + label Name + tooltip {Operator worked} xywh {280 24 166 24} align 5 + class Fl_Input2 + } + Fl_Input inpRstR_log { + label In + tooltip {Rst received} xywh {448 24 36 24} align 5 + class Fl_Input2 + } + Fl_Input inpQSLrcvddate_log { + label {QSL-rcvd} + tooltip {QSL received on this date} xywh {486 24 100 24} align 5 + code1 {o->format(2);} + class Fl_DateInput + } + Fl_Input inpDateOff_log { + label {Date Off} + tooltip {Date QSO Ended} xywh {4 68 100 24} align 5 + code0 {\#include "calendar.h"} + code1 {inpDateOff_log->format(2);} + class Fl_DateInput + } + Fl_Input inpTimeOff_log { + label {Time Off} + tooltip {Time QSO ended} xywh {106 68 70 24} align 5 + class Fl_Input2 + } + Fl_Input inpFreq_log { + label {Freq.} + tooltip {Frequency in MHz} xywh {178 68 100 24} align 5 + class Fl_Input2 + } + Fl_Input inpMode_log { + label Mode + tooltip {Mode in use} xywh {280 68 127 24} align 5 + class Fl_Input2 + } + Fl_Input inpTX_pwr_log { + label Pwr + tooltip {Transmit power used} xywh {410 68 36 24} align 5 + class Fl_Input2 + } + Fl_Input inpRstS_log { + label Out + tooltip {Rst sent} xywh {448 68 36 24} align 5 + class Fl_Input2 + } + Fl_Input inpQSLsentdate_log { + label {QSL-sent} + tooltip {QSL sent on this date} xywh {486 68 100 24} align 5 + code1 {o->format(2);} + class Fl_DateInput + } + Fl_Input inpQth_log { + label Qth + tooltip {City of station worked} xywh {4 112 232 24} align 5 + class Fl_Input2 + } + Fl_Input inpState_log { + label St + tooltip {US state of station worked} xywh {240 112 44 24} align 5 + class Fl_Input2 + } + Fl_Input inpVE_Prov_log { + label Pr + tooltip {Province of station worked} xywh {287 112 44 24} align 5 + class Fl_Input2 + } + Fl_Input inpCountry_log { + label Country + tooltip {Country of station worked} xywh {334 112 166 24} align 5 + class Fl_Input2 + } + Fl_Input inpLoc_log { + label Loc + tooltip {Stations grid square} xywh {506 112 80 24} align 5 + class Fl_Input2 + } + Fl_Input inpNotes_log { + label Notes + tooltip {Interesting notes} xywh {4 156 300 72} type Multiline align 5 + class Fl_Input2 + } + Fl_Input inpCNTY_log { + label County + tooltip County xywh {311 156 120 24} align 5 + class Fl_Input2 + } + Fl_Input inpIOTA_log { + label IOTA + tooltip {Islands on the air} xywh {435 156 70 24} align 5 + class Fl_Input2 + } + Fl_Input inpCQZ_log { + label CQZ + tooltip {CQ zone} xywh {516 156 70 24} align 5 + class Fl_Input2 + } + Fl_Input inpITUZ_log { + label ITUZ + tooltip {ITU zone} xywh {311 204 80 24} labelsize 12 align 5 + class Fl_Input2 + } + Fl_Input inpCONT_log { + label CONT + tooltip Continent xywh {409 204 80 24} labelsize 12 align 5 + class Fl_Input2 + } + Fl_Input inpDXCC_log { + label DXCC + tooltip {DXCC designator} xywh {506 204 80 24} labelsize 12 align 5 + class Fl_Input2 + } + Fl_Input inpSerNoOut_log { + label {Ser out} + tooltip {Contest seral \# sent} xywh {4 252 55 24} align 1 + class Fl_Input2 + } + Fl_Input inpMyXchg_log { + label {Exchange Out} + tooltip {Contest exchange sent} xywh {63 252 176 24} align 1 + class Fl_Input2 + } + Fl_Input inpSerNoIn_log { + label {Ser in} + tooltip {Contest serial \# received} xywh {242 252 55 24} align 1 + class Fl_Input2 + } + Fl_Input inpXchgIn_log { + label {Exchange In} + tooltip {Contest exchange received} xywh {299 252 176 24} align 1 + class Fl_Input2 + } + Fl_Input inpSearchString { + label {Call Search} + tooltip {Search for this callsign} xywh {481 252 105 24} align 1 + class Fl_Input2 + } + Fl_Input txtNbrRecs_log { + label Recs selected + tooltip {\# Records in logbook} xywh {54 284 65 22} + class Fl_Input2 + } + Fl_Button bNewSave { + label New + callback cb_btnNewSave + tooltip {New record / Save record} xywh {135 284 75 22} shortcut 0x8004e color 50 selection_color 48 + } + Fl_Button bUpdateCancel { + label Update + callback cb_btnUpdateCancel + tooltip {Update the current record} xywh {222 284 75 22} shortcut 0x80055 color 50 selection_color 48 + } + Fl_Button bDelete { + label Delete + callback cb_btnDelete + tooltip {Delete the current record} xywh {310 284 75 22} shortcut 0x80044 color 50 selection_color 48 + } + Fl_Button bDialFreq { + label Dial + callback cb_btnDialFreq + tooltip {Retrieve for active modem use} xywh {398 284 75 22} shortcut 0x50066 color 50 selection_color 48 + } + Fl_Button bSearchPrev { + callback cb_search + tooltip {Find previous} xywh {495 284 24 22} color 50 selection_color 48 align 16 + code0 {bSearchPrev->image(new Fl_Pixmap(left_arrow_icon));} + } + Fl_Button bSearchNext { + callback cb_search + tooltip {Find next} xywh {547 284 24 22} color 50 selection_color 48 align 16 + code0 {bSearchNext->image(new Fl_Pixmap(right_arrow_icon));} + } + Fl_Group wBrowser {open + xywh {2 315 586 195} box DOWN_FRAME color 7 selection_color 15 resizable code0 {\#include "table.h"} class Table } {} diff --git a/src/logbook/logsupport.cxx b/src/logbook/logsupport.cxx index b9ad2630..30b300f9 100644 --- a/src/logbook/logsupport.cxx +++ b/src/logbook/logsupport.cxx @@ -917,7 +917,6 @@ void clearRecord() { inpITUZ_log->value(""); inpTX_pwr_log->value(""); inpSearchString->value (""); - editGroup->show(); } void saveRecord() { @@ -1094,7 +1093,6 @@ void EditRecord( int i ) inpCQZ_log->value(editQSO->getField(CQZ)); inpITUZ_log->value(editQSO->getField(ITUZ)); inpTX_pwr_log->value(editQSO->getField(TX_PWR)); - editGroup->show(); } std::string sDate_on = ""; diff --git a/src/logbook/table.cxx b/src/logbook/table.cxx index bd06fa20..a1f79453 100644 --- a/src/logbook/table.cxx +++ b/src/logbook/table.cxx @@ -1591,8 +1591,27 @@ void Table::draw() { * * FLTK internal. Called when Table widget is resized. */ -void Table::resize(int x, int y, int w, int h) { - Fl_Widget::resize(x, y, w, h); +void Table::resize(int x, int y, int w2, int h) { +// resize the columns proportionally if the width changes + if (w2 != w()) { + int iw = w() - (vScroll->visible() ? vScroll->w() : 0) - 4; + int iw2 = w2 - (vScroll->visible() ? vScroll->w() : 0) - 4; + if (iw > 0 && iw2 > 0) { + int lastcol = 0; + int iw3 = 0; + for (int i = 0; i < nCols - 1; i++) { + if (!header[i].hidden) { + header[i].width = (int)(1.0 * header[i].width * iw2 / iw + 0.5); + iw3 += header[i].width; + lastcol = i; + } + } + // adjust last visible column + if (iw3 < iw2) header[lastcol].width += (iw2 - iw3); + if (iw3 > iw2) header[lastcol].width -= (iw3 - iw2); + } + } + Fl_Widget::resize(x, y, w2, h); resized(); damage(FL_DAMAGE_ALL); } diff --git a/src/main.cxx b/src/main.cxx index 2bc565c5..03a0136e 100644 --- a/src/main.cxx +++ b/src/main.cxx @@ -474,6 +474,7 @@ int main(int argc, char ** argv) dlgViewer = createViewer(); create_logbook_dialogs(); + LOGBOOK_colors_font(); // OS X will prevent the main window from being resized if we change its // size *after* it has been shown. With some X11 window managers, OTOH,