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

QSL VIA 

* Added QSL_VIA field in ADIF files.
pull/1/head
Remi Chateauneu 2013-05-31 19:20:00 -05:00 zatwierdzone przez David Freese
rodzic 6cd70171ef
commit 34b3baf16f
9 zmienionych plików z 127 dodań i 83 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -4323,7 +4323,8 @@ void LOGBOOK_colors_font()
ypos = inpNotes_log->y() + inpNotes_log->h() - wh;
Fl_Input2* row5[] = {
inpITUZ_log, inpCONT_log, inpDXCC_log };
inpITUZ_log, inpCONT_log, inpDXCC_log, inpQSL_VIA_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);
}

1
src/include/field_def.h
Wyświetl plik

@ -36,6 +36,7 @@ SRX,
STX,
TX_PWR,
EXPORT, // flag used internally in fldigi's logbook
QSL_VIA,
NUMFIELDS };
#endif

2
src/include/lgbook.h
Wyświetl plik

@ -37,6 +37,7 @@ extern Fl_Check_Button *btnSelectRSTrcvd;
extern Fl_Check_Button *btnSelectQth;
extern Fl_Check_Button *btnSelectLOC;
extern Fl_Check_Button *btnSelectState;
extern Fl_Check_Button *btnSelectQSL_VIA;
extern Fl_Check_Button *btnSelectProvince;
extern Fl_Check_Button *btnSelectCountry;
extern Fl_Check_Button *btnSelectNotes;
@ -79,6 +80,7 @@ extern Fl_Input2 *inpCQZ_log;
extern Fl_Input2 *inpITUZ_log;
extern Fl_Input2 *inpCONT_log;
extern Fl_Input2 *inpDXCC_log;
extern Fl_Input2 *inpQSL_VIA_log;
extern Fl_Input2 *inpSerNoOut_log;
extern Fl_Input2 *inpMyXchg_log;
extern Fl_Input2 *inpSerNoIn_log;

1
src/logbook/adif_io.cxx
Wyświetl plik

@ -57,6 +57,7 @@ FIELD fields[] = {
{COUNTRY, "COUNTRY", &btnSelectCountry}, // contacted stations DXCC entity name
{CQZ, "CQZ", &btnSelectCQZ}, // contacted stations CQ Zone
{DXCC, "DXCC", &btnSelectDXCC}, // contacted stations Country Code
{QSL_VIA, "QSL_VIA", &btnSelectQSL_VIA}, // contacted stations path
{IOTA, "IOTA", &btnSelectIOTA}, // Islands on the air
{ITUZ, "ITUZ", &btnSelectITUZ}, // ITU zone
{CONT, "CONT", &btnSelectCONT}, // contacted stations continent

95
src/logbook/lgbook.cxx
Wyświetl plik

@ -156,6 +156,8 @@ Fl_Check_Button *btnSelectLOC=(Fl_Check_Button *)0;
Fl_Check_Button *btnSelectState=(Fl_Check_Button *)0;
Fl_Check_Button *btnSelectQSL_VIA=(Fl_Check_Button *)0;
Fl_Check_Button *btnSelectProvince=(Fl_Check_Button *)0;
Fl_Check_Button *btnSelectCountry=(Fl_Check_Button *)0;
@ -273,6 +275,8 @@ Fl_Input2 *inpCONT_log=(Fl_Input2 *)0;
Fl_Input2 *inpDXCC_log=(Fl_Input2 *)0;
Fl_Input2 *inpQSL_VIA_log=(Fl_Input2 *)0;
Fl_Input2 *inpSerNoOut_log=(Fl_Input2 *)0;
Fl_Input2 *inpMyXchg_log=(Fl_Input2 *)0;
@ -389,7 +393,7 @@ btnCabRSTrcvd->value(1);
}
void create_logbook_dialogs() {
{ wExport = new Fl_Double_Window(675, 439, _("Export Setup"));
{ wExport = new Fl_Double_Window(675, 435, _("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));
@ -445,10 +449,10 @@ void create_logbook_dialogs() {
{ 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));
{ btnClearAllFields = new Fl_Button(395, 372, 90, 24, _("Clear All"));
{ btnClearAllFields = new Fl_Button(395, 375, 90, 24, _("Clear All"));
btnClearAllFields->callback((Fl_Callback*)cb_btnClearAllFields);
} // Fl_Button* btnClearAllFields
{ btnCheckAllFields = new Fl_Button(487, 372, 90, 24, _("Check All"));
{ btnCheckAllFields = new Fl_Button(487, 375, 90, 24, _("Check All"));
btnCheckAllFields->callback((Fl_Callback*)cb_btnCheckAllFields);
} // Fl_Button* btnCheckAllFields
{ btnSelectCall = new Fl_Check_Button(402, 31, 70, 15, _("Call"));
@ -459,107 +463,110 @@ void create_logbook_dialogs() {
btnSelectName->down_box(FL_DOWN_BOX);
btnSelectName->value(1);
} // Fl_Check_Button* btnSelectName
{ btnSelectFreq = new Fl_Check_Button(402, 74, 70, 15, _("Freq"));
{ btnSelectFreq = new Fl_Check_Button(402, 73, 70, 15, _("Freq"));
btnSelectFreq->down_box(FL_DOWN_BOX);
btnSelectFreq->value(1);
} // Fl_Check_Button* btnSelectFreq
{ btnSelectBand = new Fl_Check_Button(402, 96, 70, 15, _("Band"));
{ btnSelectBand = new Fl_Check_Button(402, 94, 70, 15, _("Band"));
btnSelectBand->down_box(FL_DOWN_BOX);
} // Fl_Check_Button* btnSelectBand
{ btnSelectMode = new Fl_Check_Button(402, 117, 70, 15, _("Mode"));
{ btnSelectMode = new Fl_Check_Button(402, 115, 70, 15, _("Mode"));
btnSelectMode->down_box(FL_DOWN_BOX);
btnSelectMode->value(1);
} // Fl_Check_Button* btnSelectMode
{ btnSelectQSOdateOn = new Fl_Check_Button(402, 139, 70, 15, _("QSO Date On"));
{ btnSelectQSOdateOn = new Fl_Check_Button(402, 136, 70, 15, _("QSO Date On"));
btnSelectQSOdateOn->down_box(FL_DOWN_BOX);
btnSelectQSOdateOn->value(1);
} // Fl_Check_Button* btnSelectQSOdateOn
{ btnSelectQSOdateOff = new Fl_Check_Button(402, 161, 70, 15, _("QSO Date Off"));
{ btnSelectQSOdateOff = new Fl_Check_Button(402, 157, 70, 15, _("QSO Date Off"));
btnSelectQSOdateOff->down_box(FL_DOWN_BOX);
btnSelectQSOdateOff->value(1);
} // Fl_Check_Button* btnSelectQSOdateOff
{ btnSelectTimeON = new Fl_Check_Button(402, 183, 70, 15, _("Time ON"));
{ btnSelectTimeON = new Fl_Check_Button(402, 178, 70, 15, _("Time ON"));
btnSelectTimeON->down_box(FL_DOWN_BOX);
btnSelectTimeON->value(1);
} // Fl_Check_Button* btnSelectTimeON
{ btnSelectTimeOFF = new Fl_Check_Button(402, 204, 70, 15, _("Time OFF"));
{ btnSelectTimeOFF = new Fl_Check_Button(402, 199, 70, 15, _("Time OFF"));
btnSelectTimeOFF->down_box(FL_DOWN_BOX);
btnSelectTimeOFF->value(1);
} // Fl_Check_Button* btnSelectTimeOFF
{ btnSelectTX_pwr = new Fl_Check_Button(402, 226, 70, 15, _("TX Power"));
{ btnSelectTX_pwr = new Fl_Check_Button(402, 220, 70, 15, _("TX Power"));
btnSelectTX_pwr->down_box(FL_DOWN_BOX);
} // Fl_Check_Button* btnSelectTX_pwr
{ btnSelectRSTsent = new Fl_Check_Button(402, 248, 70, 15, _("RST sent"));
{ btnSelectRSTsent = new Fl_Check_Button(402, 241, 70, 15, _("RST sent"));
btnSelectRSTsent->down_box(FL_DOWN_BOX);
btnSelectRSTsent->value(1);
} // Fl_Check_Button* btnSelectRSTsent
{ btnSelectRSTrcvd = new Fl_Check_Button(402, 269, 70, 15, _("RST rcvd"));
{ btnSelectRSTrcvd = new Fl_Check_Button(402, 262, 70, 15, _("RST rcvd"));
btnSelectRSTrcvd->down_box(FL_DOWN_BOX);
btnSelectRSTrcvd->value(1);
} // Fl_Check_Button* btnSelectRSTrcvd
{ btnSelectQth = new Fl_Check_Button(402, 291, 70, 15, _("Qth"));
{ btnSelectQth = new Fl_Check_Button(402, 283, 70, 15, _("Qth"));
btnSelectQth->down_box(FL_DOWN_BOX);
} // Fl_Check_Button* btnSelectQth
{ btnSelectLOC = new Fl_Check_Button(402, 313, 70, 15, _("LOC"));
{ btnSelectLOC = new Fl_Check_Button(402, 304, 70, 15, _("LOC"));
btnSelectLOC->down_box(FL_DOWN_BOX);
btnSelectLOC->value(1);
} // Fl_Check_Button* btnSelectLOC
{ btnSelectState = new Fl_Check_Button(400, 335, 70, 15, _("State"));
{ btnSelectState = new Fl_Check_Button(402, 325, 70, 15, _("State"));
btnSelectState->down_box(FL_DOWN_BOX);
} // Fl_Check_Button* btnSelectState
{ btnSelectQSL_VIA = new Fl_Check_Button(402, 346, 70, 15, _("QSL-VIA"));
btnSelectQSL_VIA->down_box(FL_DOWN_BOX);
} // Fl_Check_Button* btnSelectQSL_VIA
{ btnSelectProvince = new Fl_Check_Button(533, 31, 70, 15, _("Province"));
btnSelectProvince->down_box(FL_DOWN_BOX);
} // Fl_Check_Button* btnSelectProvince
{ btnSelectCountry = new Fl_Check_Button(533, 51, 70, 15, _("Country"));
{ btnSelectCountry = new Fl_Check_Button(533, 52, 70, 15, _("Country"));
btnSelectCountry->down_box(FL_DOWN_BOX);
} // Fl_Check_Button* btnSelectCountry
{ btnSelectNotes = new Fl_Check_Button(533, 73, 70, 15, _("Notes"));
btnSelectNotes->down_box(FL_DOWN_BOX);
} // Fl_Check_Button* btnSelectNotes
{ btnSelectQSLrcvd = new Fl_Check_Button(533, 95, 70, 15, _("QSL rcvd date"));
{ btnSelectQSLrcvd = new Fl_Check_Button(533, 94, 70, 15, _("QSL rcvd date"));
btnSelectQSLrcvd->down_box(FL_DOWN_BOX);
} // Fl_Check_Button* btnSelectQSLrcvd
{ btnSelectQSLsent = new Fl_Check_Button(533, 117, 70, 15, _("QSL sent date"));
{ btnSelectQSLsent = new Fl_Check_Button(533, 115, 70, 15, _("QSL sent date"));
btnSelectQSLsent->down_box(FL_DOWN_BOX);
} // Fl_Check_Button* btnSelectQSLsent
{ btnSelectSerialIN = new Fl_Check_Button(533, 138, 70, 15, _("Serial # in"));
{ btnSelectSerialIN = new Fl_Check_Button(533, 136, 70, 15, _("Serial # in"));
btnSelectSerialIN->down_box(FL_DOWN_BOX);
} // Fl_Check_Button* btnSelectSerialIN
{ btnSelectSerialOUT = new Fl_Check_Button(533, 160, 70, 15, _("Serial # out"));
{ btnSelectSerialOUT = new Fl_Check_Button(533, 157, 70, 15, _("Serial # out"));
btnSelectSerialOUT->down_box(FL_DOWN_BOX);
} // Fl_Check_Button* btnSelectSerialOUT
{ btnSelectXchgIn = new Fl_Check_Button(533, 182, 70, 15, _("Exchange In"));
{ btnSelectXchgIn = new Fl_Check_Button(533, 178, 70, 15, _("Exchange In"));
btnSelectXchgIn->down_box(FL_DOWN_BOX);
} // Fl_Check_Button* btnSelectXchgIn
{ btnSelectMyXchg = new Fl_Check_Button(533, 204, 70, 15, _("Exchange Out"));
{ btnSelectMyXchg = new Fl_Check_Button(533, 199, 70, 15, _("Exchange Out"));
btnSelectMyXchg->down_box(FL_DOWN_BOX);
} // Fl_Check_Button* btnSelectMyXchg
{ btnSelectCNTY = new Fl_Check_Button(533, 226, 70, 15, _("County"));
{ btnSelectCNTY = new Fl_Check_Button(533, 220, 70, 15, _("County"));
btnSelectCNTY->down_box(FL_DOWN_BOX);
} // Fl_Check_Button* btnSelectCNTY
{ btnSelectCONT = new Fl_Check_Button(534, 247, 70, 15, _("Continent"));
{ btnSelectCONT = new Fl_Check_Button(533, 241, 70, 15, _("Continent"));
btnSelectCONT->down_box(FL_DOWN_BOX);
} // Fl_Check_Button* btnSelectCONT
{ btnSelectCQZ = new Fl_Check_Button(534, 269, 70, 15, _("CQZ"));
{ btnSelectCQZ = new Fl_Check_Button(533, 262, 70, 15, _("CQZ"));
btnSelectCQZ->down_box(FL_DOWN_BOX);
} // Fl_Check_Button* btnSelectCQZ
{ btnSelectDXCC = new Fl_Check_Button(534, 291, 70, 15, _("DXCC"));
{ btnSelectDXCC = new Fl_Check_Button(533, 283, 70, 15, _("DXCC"));
btnSelectDXCC->down_box(FL_DOWN_BOX);
} // Fl_Check_Button* btnSelectDXCC
{ btnSelectIOTA = new Fl_Check_Button(534, 313, 70, 15, _("IOTA"));
{ btnSelectIOTA = new Fl_Check_Button(533, 304, 70, 15, _("IOTA"));
btnSelectIOTA->down_box(FL_DOWN_BOX);
} // Fl_Check_Button* btnSelectIOTA
{ btnSelectITUZ = new Fl_Check_Button(534, 335, 70, 15, _("ITUZ"));
{ btnSelectITUZ = new Fl_Check_Button(533, 325, 70, 15, _("ITUZ"));
btnSelectITUZ->down_box(FL_DOWN_BOX);
} // Fl_Check_Button* btnSelectITUZ
{ btnSetFieldDefaults = new Fl_Button(578, 372, 90, 24, _("Defaults"));
{ btnSetFieldDefaults = new Fl_Button(578, 375, 90, 24, _("Defaults"));
btnSetFieldDefaults->callback((Fl_Callback*)cb_btnSetFieldDefaults);
} // Fl_Button* btnSetFieldDefaults
o->end();
} // Fl_Group* o
wExport->end();
} // Fl_Double_Window* wExport
{ dlgLogbook = new Fl_Double_Window(590, 514, _("Logbook"));
{ dlgLogbook = new Fl_Double_Window(590, 510, _("Logbook"));
{ inpDate_log = new Fl_DateInput(4, 24, 100, 24, _("Date On"));
inpDate_log->tooltip(_("Date QSO started"));
inpDate_log->box(FL_DOWN_BOX);
@ -829,44 +836,56 @@ void create_logbook_dialogs() {
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 = new Fl_Input2(311, 204, 59, 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->labelsize(14);
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 = new Fl_Input2(374, 204, 66, 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->labelsize(14);
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 = new Fl_Input2(445, 204, 70, 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->labelsize(14);
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
{ inpQSL_VIA_log = new Fl_Input2(518, 204, 70, 24, _("QSL-VIA"));
inpQSL_VIA_log->tooltip(_("QSL route of contacted station"));
inpQSL_VIA_log->box(FL_DOWN_BOX);
inpQSL_VIA_log->color(FL_BACKGROUND2_COLOR);
inpQSL_VIA_log->selection_color(FL_SELECTION_COLOR);
inpQSL_VIA_log->labeltype(FL_NORMAL_LABEL);
inpQSL_VIA_log->labelfont(0);
inpQSL_VIA_log->labelsize(14);
inpQSL_VIA_log->labelcolor(FL_FOREGROUND_COLOR);
inpQSL_VIA_log->align(Fl_Align(FL_ALIGN_TOP_LEFT));
inpQSL_VIA_log->when(FL_WHEN_RELEASE);
} // Fl_Input2* inpQSL_VIA_log
{ inpSerNoOut_log = new Fl_Input2(4, 252, 55, 24, _("Ser out"));
inpSerNoOut_log->tooltip(_("Contest seral # sent"));
inpSerNoOut_log->tooltip(_("Contest serial # sent"));
inpSerNoOut_log->box(FL_DOWN_BOX);
inpSerNoOut_log->color(FL_BACKGROUND2_COLOR);
inpSerNoOut_log->selection_color(FL_SELECTION_COLOR);

101
src/logbook/lgbook.fl
Wyświetl plik

@ -1,26 +1,30 @@
# data file for the Fltk User Interface Designer (fluid)
version 1.0110
version 1.0302
i18n_type 1
i18n_include "gettext.h"
i18n_function _
header_name {.h}
code_name {.cxx}
decl {\#include <config.h>} {}
decl {\#include <config.h>} {private local
}
decl {\#include <FL/Fl_Pixmap.H>} {}
decl {\#include <FL/Fl_Pixmap.H>} {private local
}
decl {\#include "logsupport.h"} {}
decl {\#include "logsupport.h"} {private local
}
decl {\#include "pixmaps.h"} {}
decl {\#include "pixmaps.h"} {private local
}
decl {\#include "flinput2.h"} {public
decl {\#include "flinput2.h"} {public local
}
Function {create_logbook_dialogs()} {open return_type void
} {
Fl_Window wExport {
label {Export Setup}
xywh {517 143 675 439} type Double visible
label {Export Setup} open
xywh {168 180 675 435} type Double hide
} {
Fl_Group {} {
label {Select Records to Export}
@ -110,7 +114,7 @@ btnSelectCQZ->value(0);
btnSelectITUZ->value(0);
btnSelectTX_pwr->value(0);
btnSelectNotes->value(0);}
xywh {395 372 90 24}
xywh {395 375 90 24}
}
Fl_Button btnCheckAllFields {
label {Check All}
@ -144,7 +148,7 @@ btnSelectCQZ->value(1);
btnSelectITUZ->value(1);
btnSelectTX_pwr->value(1);
btnSelectNotes->value(1);}
xywh {487 372 90 24}
xywh {487 375 90 24}
}
Fl_Check_Button btnSelectCall {
label Call
@ -156,55 +160,59 @@ btnSelectNotes->value(1);}
}
Fl_Check_Button btnSelectFreq {
label Freq
xywh {402 74 70 15} down_box DOWN_BOX value 1
xywh {402 73 70 15} down_box DOWN_BOX value 1
}
Fl_Check_Button btnSelectBand {
label Band
xywh {402 96 70 15} down_box DOWN_BOX
xywh {402 94 70 15} down_box DOWN_BOX
}
Fl_Check_Button btnSelectMode {
label Mode
xywh {402 117 70 15} down_box DOWN_BOX value 1
xywh {402 115 70 15} down_box DOWN_BOX value 1
}
Fl_Check_Button btnSelectQSOdateOn {
label {QSO Date On}
xywh {402 139 70 15} down_box DOWN_BOX value 1
xywh {402 136 70 15} down_box DOWN_BOX value 1
}
Fl_Check_Button btnSelectQSOdateOff {
label {QSO Date Off}
xywh {402 161 70 15} down_box DOWN_BOX value 1
xywh {402 157 70 15} down_box DOWN_BOX value 1
}
Fl_Check_Button btnSelectTimeON {
label {Time ON}
xywh {402 183 70 15} down_box DOWN_BOX value 1
xywh {402 178 70 15} down_box DOWN_BOX value 1
}
Fl_Check_Button btnSelectTimeOFF {
label {Time OFF}
xywh {402 204 70 15} down_box DOWN_BOX value 1
xywh {402 199 70 15} down_box DOWN_BOX value 1
}
Fl_Check_Button btnSelectTX_pwr {
label {TX Power}
xywh {402 226 70 15} down_box DOWN_BOX
xywh {402 220 70 15} down_box DOWN_BOX
}
Fl_Check_Button btnSelectRSTsent {
label {RST sent}
xywh {402 248 70 15} down_box DOWN_BOX value 1
xywh {402 241 70 15} down_box DOWN_BOX value 1
}
Fl_Check_Button btnSelectRSTrcvd {
label {RST rcvd}
xywh {402 269 70 15} down_box DOWN_BOX value 1
xywh {402 262 70 15} down_box DOWN_BOX value 1
}
Fl_Check_Button btnSelectQth {
label Qth
xywh {402 291 70 15} down_box DOWN_BOX
xywh {402 283 70 15} down_box DOWN_BOX
}
Fl_Check_Button btnSelectLOC {
label LOC
xywh {402 313 70 15} down_box DOWN_BOX value 1
xywh {402 304 70 15} down_box DOWN_BOX value 1
}
Fl_Check_Button btnSelectState {
label State
xywh {400 335 70 15} down_box DOWN_BOX
xywh {402 325 70 15} down_box DOWN_BOX
}
Fl_Check_Button btnSelectQSL_VIA {
label {QSL-VIA}
xywh {402 346 70 15} down_box DOWN_BOX
}
Fl_Check_Button btnSelectProvince {
label Province
@ -212,7 +220,7 @@ btnSelectNotes->value(1);}
}
Fl_Check_Button btnSelectCountry {
label Country
xywh {533 51 70 15} down_box DOWN_BOX
xywh {533 52 70 15} down_box DOWN_BOX
}
Fl_Check_Button btnSelectNotes {
label Notes
@ -220,51 +228,51 @@ btnSelectNotes->value(1);}
}
Fl_Check_Button btnSelectQSLrcvd {
label {QSL rcvd date}
xywh {533 95 70 15} down_box DOWN_BOX
xywh {533 94 70 15} down_box DOWN_BOX
}
Fl_Check_Button btnSelectQSLsent {
label {QSL sent date}
xywh {533 117 70 15} down_box DOWN_BOX
xywh {533 115 70 15} down_box DOWN_BOX
}
Fl_Check_Button btnSelectSerialIN {
label {Serial \# in}
xywh {533 138 70 15} down_box DOWN_BOX
xywh {533 136 70 15} down_box DOWN_BOX
}
Fl_Check_Button btnSelectSerialOUT {
label {Serial \# out}
xywh {533 160 70 15} down_box DOWN_BOX
xywh {533 157 70 15} down_box DOWN_BOX
}
Fl_Check_Button btnSelectXchgIn {
label {Exchange In}
xywh {533 182 70 15} down_box DOWN_BOX
xywh {533 178 70 15} down_box DOWN_BOX
}
Fl_Check_Button btnSelectMyXchg {
label {Exchange Out}
xywh {533 204 70 15} down_box DOWN_BOX
xywh {533 199 70 15} down_box DOWN_BOX
}
Fl_Check_Button btnSelectCNTY {
label County
xywh {533 226 70 15} down_box DOWN_BOX
xywh {533 220 70 15} down_box DOWN_BOX
}
Fl_Check_Button btnSelectCONT {
label Continent
xywh {534 247 70 15} down_box DOWN_BOX
xywh {533 241 70 15} down_box DOWN_BOX
}
Fl_Check_Button btnSelectCQZ {
label CQZ
xywh {534 269 70 15} down_box DOWN_BOX
xywh {533 262 70 15} down_box DOWN_BOX
}
Fl_Check_Button btnSelectDXCC {
label DXCC
xywh {534 291 70 15} down_box DOWN_BOX
xywh {533 283 70 15} down_box DOWN_BOX
}
Fl_Check_Button btnSelectIOTA {
label IOTA
xywh {534 313 70 15} down_box DOWN_BOX
xywh {533 304 70 15} down_box DOWN_BOX
}
Fl_Check_Button btnSelectITUZ {
label ITUZ
xywh {534 335 70 15} down_box DOWN_BOX
xywh {533 325 70 15} down_box DOWN_BOX
}
Fl_Button btnSetFieldDefaults {
label Defaults
@ -298,16 +306,16 @@ btnSelectCQZ->value(0);
btnSelectITUZ->value(0);
btnSelectTX_pwr->value(0);
btnSelectNotes->value(0);}
xywh {578 372 90 24}
xywh {578 375 90 24}
}
}
}
Fl_Window dlgLogbook {
label Logbook open
xywh {603 71 590 514} type Double resizable visible
xywh {522 70 590 510} type Double resizable visible
} {
Fl_Input inpDate_log {
label {Date On} selected
label {Date On}
tooltip {Date QSO started} xywh {4 24 100 24} align 5
code0 {\#include "calendar.h"}
code1 {inpDate_log->format(2);}
@ -424,22 +432,27 @@ btnSelectNotes->value(0);}
}
Fl_Input inpITUZ_log {
label ITUZ
tooltip {ITU zone} xywh {311 204 80 24} labelsize 12 align 5
tooltip {ITU zone} xywh {311 204 59 24} align 5
class Fl_Input2
}
Fl_Input inpCONT_log {
label CONT
tooltip Continent xywh {409 204 80 24} labelsize 12 align 5
tooltip Continent xywh {374 204 66 24} align 5
class Fl_Input2
}
Fl_Input inpDXCC_log {
label DXCC
tooltip {DXCC designator} xywh {506 204 80 24} labelsize 12 align 5
tooltip {DXCC designator} xywh {445 204 70 24} align 5
class Fl_Input2
}
Fl_Input inpQSL_VIA_log {
label {QSL-VIA}
tooltip {QSL route of contacted station} xywh {518 204 70 24} align 5
class Fl_Input2
}
Fl_Input inpSerNoOut_log {
label {Ser out}
tooltip {Contest seral \# sent} xywh {4 252 55 24} align 1
tooltip {Contest serial \# sent} xywh {4 252 55 24} align 1
class Fl_Input2
}
Fl_Input inpMyXchg_log {
@ -497,7 +510,7 @@ btnSelectNotes->value(0);}
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
Fl_Group wBrowser {open selected
xywh {2 315 586 195} box DOWN_FRAME color 7 selection_color 15 resizable
code0 {\#include "table.h"}
class Table

5
src/logbook/logsupport.cxx
Wyświetl plik

@ -911,6 +911,7 @@ void clearRecord() {
inpNotes_log->value ("");
inpIOTA_log->value("");
inpDXCC_log->value("");
inpQSL_VIA_log->value("");
inpCONT_log->value("");
inpCNTY_log->value("");
inpCQZ_log->value("");
@ -964,6 +965,7 @@ void saveRecord() {
rec.putField(CNTY, inpCNTY_log->value());
rec.putField(IOTA, inpIOTA_log->value());
rec.putField(DXCC, inpDXCC_log->value());
rec.putField(DXCC, inpQSL_VIA_log->value());
rec.putField(CONT, inpCONT_log->value());
rec.putField(CQZ, inpCQZ_log->value());
rec.putField(ITUZ, inpITUZ_log->value());
@ -1018,6 +1020,7 @@ cQsoRec rec;
rec.putField(CNTY, inpCNTY_log->value());
rec.putField(IOTA, inpIOTA_log->value());
rec.putField(DXCC, inpDXCC_log->value());
rec.putField(QSL_VIA, inpQSL_VIA_log->value());
rec.putField(CONT, inpCONT_log->value());
rec.putField(CQZ, inpCQZ_log->value());
rec.putField(ITUZ, inpITUZ_log->value());
@ -1089,6 +1092,7 @@ void EditRecord( int i )
inpCNTY_log->value(editQSO->getField(CNTY));
inpIOTA_log->value(editQSO->getField(IOTA));
inpDXCC_log->value(editQSO->getField(DXCC));
inpQSL_VIA_log->value(editQSO->getField(QSL_VIA));
inpCONT_log->value(editQSO->getField(CONT));
inpCQZ_log->value(editQSO->getField(CQZ));
inpITUZ_log->value(editQSO->getField(ITUZ));
@ -1142,6 +1146,7 @@ void AddRecord ()
inpCNTY_log->value("");
inpIOTA_log->value("");
inpDXCC_log->value("");
inpQSL_VIA_log->value("");
inpCONT_log->value("");
inpCQZ_log->value("");
inpITUZ_log->value("");

1
src/logbook/xmlrpc_log.cxx
Wyświetl plik

@ -191,6 +191,7 @@ void xml_add_record()
// need to add the remaining fields
adif_str(IOTA, "");
adif_str(DXCC, "");
adif_str(QSL_VIA, "");
adif_str(QSLRDATE, "");
adif_str(QSLSDATE, "");
adif.append("<eor>");

1
src/logger/logger.cxx
Wyświetl plik

@ -124,6 +124,7 @@ void submit_ADIF(cQsoRec &rec)
// QSO log area.
putadif(IOTA, rec.getField(IOTA));
putadif(DXCC, rec.getField(DXCC));
putadif(QSL_VIA, rec.getField(QSL_VIA));
putadif(QSLRDATE, rec.getField(QSLRDATE));
putadif(QSLSDATE, rec.getField(QSLSDATE));