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

Miscellaneous UI changes 

* Change sliders to horizontal type
* Rearrange Contest config tab so that text labels can be expanded, and resize
  various text fields
* Realign sliders in CW modem tab
* Restore some Tango icons, with X11 colour names substituted with hex byte
  values from /etc/X11/rgb.txt so that they are drawn correctly on woe32.
* Gettext-ise FText context menus and some additional main window strings
* s/Files/File/ in main window... at last
pull/2/head
Stelios Bounanos 2008-12-18 09:14:18 +00:00
rodzic f524c3fc65
commit 1909b75582
5 zmienionych plików z 1085 dodań i 741 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

85
src/dialogs/confdialog.cxx
Wyświetl plik

@ -2059,7 +2059,6 @@ static const char szBaudRates[] = "300|600|1200|2400|4800|9600|19200|38400|57600
{ tabOperator = new Fl_Group(0, 25, 500, 345, _("Operator"));
tabOperator->callback((Fl_Callback*)cb_tabOperator);
tabOperator->when(FL_WHEN_CHANGED);
tabOperator->hide();
{ Fl_Group* o = new Fl_Group(5, 35, 490, 165, _("Station"));
o->box(FL_ENGRAVED_FRAME);
o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
@ -2128,6 +2127,7 @@ static const char szBaudRates[] = "300|600|1200|2400|4800|9600|19200|38400|57600
tabOperator->end();
} // Fl_Group* tabOperator
{ tabUI = new Fl_Group(0, 25, 500, 345, _("UI"));
tabUI->hide();
{ tabsUI = new Fl_Tabs(0, 25, 500, 345);
tabsUI->selection_color(FL_LIGHT1);
{ tabUserInterface = new Fl_Group(0, 50, 500, 320, _("General"));
@ -2243,9 +2243,9 @@ static const char szBaudRates[] = "300|600|1200|2400|4800|9600|19200|38400|57600
{ Fl_Group* o = new Fl_Group(5, 60, 490, 80, _("Exchanges"));
o->box(FL_ENGRAVED_FRAME);
o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
{ lblSend = new Fl_Box(26, 95, 55, 25, _("Send:"));
{ lblSend = new Fl_Box(15, 95, 55, 20, _("Send:"));
} // Fl_Box* lblSend
{ Fl_Input2* o = inpSend1 = new Fl_Input2(81, 95, 70, 25, _("Xchg 1"));
{ Fl_Input2* o = inpSend1 = new Fl_Input2(70, 95, 70, 20, _("1"));
inpSend1->box(FL_DOWN_BOX);
inpSend1->color(FL_BACKGROUND2_COLOR);
inpSend1->selection_color(FL_SELECTION_COLOR);
@ -2258,7 +2258,7 @@ static const char szBaudRates[] = "300|600|1200|2400|4800|9600|19200|38400|57600
inpSend1->when(FL_WHEN_RELEASE);
o->value(progdefaults.Xchg1.c_str());
} // Fl_Input2* inpSend1
{ Fl_Input2* o = inpSend2 = new Fl_Input2(159, 95, 70, 25, _("Xchg 2"));
{ Fl_Input2* o = inpSend2 = new Fl_Input2(150, 95, 70, 20, _("2"));
inpSend2->box(FL_DOWN_BOX);
inpSend2->color(FL_BACKGROUND2_COLOR);
inpSend2->selection_color(FL_SELECTION_COLOR);
@ -2271,7 +2271,7 @@ static const char szBaudRates[] = "300|600|1200|2400|4800|9600|19200|38400|57600
inpSend2->when(FL_WHEN_RELEASE);
o->value(progdefaults.Xchg2.c_str());
} // Fl_Input2* inpSend2
{ Fl_Input2* o = inpSend3 = new Fl_Input2(239, 95, 70, 25, _("Xchg 3"));
{ Fl_Input2* o = inpSend3 = new Fl_Input2(230, 95, 70, 20, _("3"));
inpSend3->box(FL_DOWN_BOX);
inpSend3->color(FL_BACKGROUND2_COLOR);
inpSend3->selection_color(FL_SELECTION_COLOR);
@ -2284,19 +2284,19 @@ static const char szBaudRates[] = "300|600|1200|2400|4800|9600|19200|38400|57600
inpSend3->when(FL_WHEN_RELEASE);
o->value(progdefaults.Xchg3.c_str());
} // Fl_Input2* inpSend3
{ Fl_Check_Button* o = btn599 = new Fl_Check_Button(326, 75, 130, 20, _("RST always 599"));
{ Fl_Check_Button* o = btn599 = new Fl_Check_Button(310, 80, 130, 20, _("RST always 599"));
btn599->down_box(FL_DOWN_BOX);
btn599->callback((Fl_Callback*)cb_btn599);
o->value(progdefaults.fixed599);
} // Fl_Check_Button* btn599
{ Fl_Check_Button* o = btnCutNbrs = new Fl_Check_Button(326, 110, 70, 15, _("Send CW cut #\'s"));
{ Fl_Check_Button* o = btnCutNbrs = new Fl_Check_Button(310, 110, 180, 20, _("Send CW cut numbers"));
btnCutNbrs->down_box(FL_DOWN_BOX);
btnCutNbrs->callback((Fl_Callback*)cb_btnCutNbrs);
o->value(progdefaults.cutnbrs);
} // Fl_Check_Button* btnCutNbrs
o->end();
} // Fl_Group* o
{ Fl_Group* o = new Fl_Group(5, 150, 490, 65, _("Serial Number"));
{ Fl_Group* o = new Fl_Group(5, 150, 490, 65, _("Serial number"));
o->box(FL_ENGRAVED_FRAME);
o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
{ btnUseLeadingZeros = new Fl_Check_Button(26, 176, 154, 20, _("Use leading zeros"));
@ -2304,14 +2304,14 @@ static const char szBaudRates[] = "300|600|1200|2400|4800|9600|19200|38400|57600
btnUseLeadingZeros->value(1);
btnUseLeadingZeros->callback((Fl_Callback*)cb_btnUseLeadingZeros);
} // Fl_Check_Button* btnUseLeadingZeros
{ Fl_Value_Input* o = nbrContestStart = new Fl_Value_Input(221, 176, 45, 20, _("Starting #"));
{ Fl_Value_Input* o = nbrContestStart = new Fl_Value_Input(221, 176, 45, 20, _("Start"));
nbrContestStart->maximum(10000);
nbrContestStart->step(1);
nbrContestStart->callback((Fl_Callback*)cb_nbrContestStart);
nbrContestStart->align(FL_ALIGN_TOP);
o->value(progdefaults.ContestStart);
} // Fl_Value_Input* nbrContestStart
{ nbrContestDigits = new Fl_Value_Input(303, 175, 45, 20, _("# of digits"));
{ nbrContestDigits = new Fl_Value_Input(303, 175, 45, 20, _("Digits"));
nbrContestDigits->minimum(1);
nbrContestDigits->maximum(5);
nbrContestDigits->step(1);
@ -2324,50 +2324,50 @@ static const char szBaudRates[] = "300|600|1200|2400|4800|9600|19200|38400|57600
} // Fl_Button* btnResetSerNbr
o->end();
} // Fl_Group* o
{ Fl_Group* o = new Fl_Group(5, 225, 490, 130, _("Dup Check"));
{ Fl_Group* o = new Fl_Group(5, 225, 490, 130, _("Duplicates check"));
o->box(FL_ENGRAVED_FRAME);
o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
{ Fl_Check_Button* o = btnDupCheckOn = new Fl_Check_Button(172, 250, 90, 15, _("Dup Check On CALL +"));
{ Fl_Check_Button* o = btnDupCheckOn = new Fl_Check_Button(15, 253, 80, 20, _("Callsign"));
btnDupCheckOn->down_box(FL_DOWN_BOX);
btnDupCheckOn->callback((Fl_Callback*)cb_btnDupCheckOn);
o->value(0);
} // Fl_Check_Button* btnDupCheckOn
{ Fl_Check_Button* o = btnDupBand = new Fl_Check_Button(15, 283, 70, 15, _("Band"));
{ Fl_Check_Button* o = btnDupBand = new Fl_Check_Button(156, 253, 70, 20, _("Band"));
btnDupBand->down_box(FL_DOWN_BOX);
btnDupBand->callback((Fl_Callback*)cb_btnDupBand);
o->value(progdefaults.dupband);
} // Fl_Check_Button* btnDupBand
{ Fl_Check_Button* o = btnDupMode = new Fl_Check_Button(94, 283, 70, 15, _("Mode"));
{ Fl_Check_Button* o = btnDupMode = new Fl_Check_Button(276, 253, 70, 20, _("Mode"));
btnDupMode->down_box(FL_DOWN_BOX);
btnDupMode->callback((Fl_Callback*)cb_btnDupMode);
o->value(progdefaults.dupmode);
} // Fl_Check_Button* btnDupMode
{ Fl_Check_Button* o = btnDupState = new Fl_Check_Button(172, 283, 70, 15, _("State"));
{ Fl_Check_Button* o = btnDupState = new Fl_Check_Button(395, 253, 70, 20, _("State"));
btnDupState->down_box(FL_DOWN_BOX);
btnDupState->callback((Fl_Callback*)cb_btnDupState);
o->value(progdefaults.dupstate);
} // Fl_Check_Button* btnDupState
{ Fl_Check_Button* o = btnDupXchg1 = new Fl_Check_Button(252, 283, 70, 15, _("Xchg 1"));
{ Fl_Check_Button* o = btnDupXchg1 = new Fl_Check_Button(15, 283, 105, 20, _("Exchange 1"));
btnDupXchg1->down_box(FL_DOWN_BOX);
btnDupXchg1->callback((Fl_Callback*)cb_btnDupXchg1);
o->value(progdefaults.dupxchg1);
} // Fl_Check_Button* btnDupXchg1
{ Fl_Check_Button* o = btnDupXchg2 = new Fl_Check_Button(331, 283, 70, 15, _("Xchg 2"));
{ Fl_Check_Button* o = btnDupXchg2 = new Fl_Check_Button(156, 283, 105, 20, _("Exchange 2"));
btnDupXchg2->down_box(FL_DOWN_BOX);
btnDupXchg2->callback((Fl_Callback*)cb_btnDupXchg2);
o->value(progdefaults.dupxchg2);
} // Fl_Check_Button* btnDupXchg2
{ Fl_Check_Button* o = btnDupXchg3 = new Fl_Check_Button(410, 283, 70, 15, _("Xchg 3"));
{ Fl_Check_Button* o = btnDupXchg3 = new Fl_Check_Button(276, 283, 105, 20, _("Exchange 3"));
btnDupXchg3->down_box(FL_DOWN_BOX);
btnDupXchg3->callback((Fl_Callback*)cb_btnDupXchg3);
o->value(progdefaults.dupxchg3);
} // Fl_Check_Button* btnDupXchg3
{ Fl_Check_Button* o = btnDupTimeSpan = new Fl_Check_Button(94, 317, 70, 15, _("Time span over"));
{ Fl_Check_Button* o = btnDupTimeSpan = new Fl_Check_Button(15, 313, 129, 20, _("Time span over"));
btnDupTimeSpan->down_box(FL_DOWN_BOX);
btnDupTimeSpan->callback((Fl_Callback*)cb_btnDupTimeSpan);
o->value(progdefaults.duptimespan);
} // Fl_Check_Button* btnDupTimeSpan
{ Fl_Value_Input* o = nbrTimeSpan = new Fl_Value_Input(230, 313, 53, 22, _("minutes"));
{ Fl_Value_Input* o = nbrTimeSpan = new Fl_Value_Input(158, 313, 53, 20, _("minutes"));
nbrTimeSpan->maximum(1440);
nbrTimeSpan->step(1);
nbrTimeSpan->value(120);
@ -2495,7 +2495,7 @@ static const char szBaudRates[] = "300|600|1200|2400|4800|9600|19200|38400|57600
o->value(progdefaults.viewXmtSignal);
} // Fl_Check_Button* btnViewXmtSignal
{ Fl_Value_Slider* o = valTxMonitorLevel = new Fl_Value_Slider(270, 315, 200, 20, _("Signal level"));
valTxMonitorLevel->type(5);
valTxMonitorLevel->type(1);
valTxMonitorLevel->selection_color(FL_SELECTION_COLOR);
valTxMonitorLevel->step(0.05);
valTxMonitorLevel->value(0.5);
@ -2612,9 +2612,8 @@ an merging"));
{ Fl_Group* o = new Fl_Group(5, 85, 490, 130, _("Receive"));
o->box(FL_ENGRAVED_FRAME);
o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
{ Fl_Value_Slider* o = sldrCWbandwidth = new Fl_Value_Slider(70, 117, 240, 20, _("Filter bandwidth"));
sldrCWbandwidth->type(5);
sldrCWbandwidth->color(FL_BACKGROUND2_COLOR);
{ Fl_Value_Slider* o = sldrCWbandwidth = new Fl_Value_Slider(40, 115, 290, 20, _("Filter bandwidth"));
sldrCWbandwidth->type(1);
sldrCWbandwidth->selection_color(FL_SELECTION_COLOR);
sldrCWbandwidth->minimum(10);
sldrCWbandwidth->maximum(500);
@ -2625,13 +2624,13 @@ an merging"));
sldrCWbandwidth->align(FL_ALIGN_RIGHT);
o->value(progdefaults.CWbandwidth);
} // Fl_Value_Slider* sldrCWbandwidth
{ Fl_Check_Button* o = btnCWrcvTrack = new Fl_Check_Button(70, 150, 80, 20, _("Tracking"));
{ Fl_Check_Button* o = btnCWrcvTrack = new Fl_Check_Button(40, 150, 80, 20, _("Tracking"));
btnCWrcvTrack->down_box(FL_DOWN_BOX);
btnCWrcvTrack->value(1);
btnCWrcvTrack->callback((Fl_Callback*)cb_btnCWrcvTrack);
o->value(progdefaults.CWtrack);
} // Fl_Check_Button* btnCWrcvTrack
{ Fl_Counter* o = cntCWrange = new Fl_Counter(220, 150, 65, 20, _("Tracking range (WPM)"));
{ Fl_Counter* o = cntCWrange = new Fl_Counter(225, 150, 65, 20, _("Tracking range (WPM)"));
cntCWrange->type(1);
cntCWrange->minimum(5);
cntCWrange->maximum(25);
@ -2641,23 +2640,25 @@ an merging"));
cntCWrange->align(FL_ALIGN_RIGHT);
o->value(progdefaults.CWrange);
} // Fl_Counter* cntCWrange
{ valCWrcvWPM = new Fl_Value_Output(130, 188, 35, 20, _("RX WPM"));
{ valCWrcvWPM = new Fl_Value_Output(40, 188, 35, 20);
valCWrcvWPM->color(FL_BACKGROUND2_COLOR);
valCWrcvWPM->callback((Fl_Callback*)cb_valCWrcvWPM);
} // Fl_Value_Output* valCWrcvWPM
{ prgsCWrcvWPM = new Fl_Progress(165, 188, 275, 20);
{ prgsCWrcvWPM = new Fl_Progress(75, 188, 255, 20);
prgsCWrcvWPM->color(FL_BACKGROUND_COLOR);
prgsCWrcvWPM->selection_color(FL_SELECTION_COLOR);
prgsCWrcvWPM->align(FL_ALIGN_CENTER);
} // Fl_Progress* prgsCWrcvWPM
{ Fl_Box* o = new Fl_Box(330, 188, 70, 20, _("RX WPM"));
o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
} // Fl_Box* o
o->end();
} // Fl_Group* o
{ Fl_Group* o = new Fl_Group(5, 215, 490, 110, _("Transmit"));
o->box(FL_ENGRAVED_FRAME);
o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
{ Fl_Value_Slider* o = sldrCWxmtWPM = new Fl_Value_Slider(130, 248, 310, 20, _("TX WPM"));
sldrCWxmtWPM->type(5);
sldrCWxmtWPM->color(FL_BACKGROUND2_COLOR);
{ Fl_Value_Slider* o = sldrCWxmtWPM = new Fl_Value_Slider(40, 248, 290, 20, _("TX WPM"));
sldrCWxmtWPM->type(1);
sldrCWxmtWPM->selection_color(FL_SELECTION_COLOR);
sldrCWxmtWPM->minimum(5);
sldrCWxmtWPM->maximum(100);
@ -2665,10 +2666,10 @@ an merging"));
sldrCWxmtWPM->value(20);
sldrCWxmtWPM->textsize(14);
sldrCWxmtWPM->callback((Fl_Callback*)cb_sldrCWxmtWPM);
sldrCWxmtWPM->align(FL_ALIGN_LEFT);
sldrCWxmtWPM->align(FL_ALIGN_RIGHT);
o->value(progdefaults.CWspeed);
} // Fl_Value_Slider* sldrCWxmtWPM
{ Fl_Counter* o = cntCWdefWPM = new Fl_Counter(130, 294, 64, 20, _("Default"));
{ Fl_Counter* o = cntCWdefWPM = new Fl_Counter(40, 294, 64, 20, _("Default"));
cntCWdefWPM->type(1);
cntCWdefWPM->minimum(5);
cntCWdefWPM->maximum(200);
@ -2678,7 +2679,7 @@ an merging"));
cntCWdefWPM->align(FL_ALIGN_TOP);
o->value(progdefaults.defCWspeed);
} // Fl_Counter* cntCWdefWPM
{ Fl_Counter* o = cntCWlowerlimit = new Fl_Counter(250, 294, 65, 20, _("Lower limit"));
{ Fl_Counter* o = cntCWlowerlimit = new Fl_Counter(152, 294, 65, 20, _("Lower limit"));
cntCWlowerlimit->type(1);
cntCWlowerlimit->minimum(5);
cntCWlowerlimit->maximum(20);
@ -2688,7 +2689,7 @@ an merging"));
cntCWlowerlimit->align(FL_ALIGN_TOP);
o->value(progdefaults.CWlowerlimit);
} // Fl_Counter* cntCWlowerlimit
{ Fl_Counter* o = cntCWupperlimit = new Fl_Counter(375, 294, 65, 20, _("Upper limit"));
{ Fl_Counter* o = cntCWupperlimit = new Fl_Counter(265, 294, 65, 20, _("Upper limit"));
cntCWupperlimit->type(1);
cntCWupperlimit->minimum(25);
cntCWupperlimit->maximum(200);
@ -2822,7 +2823,7 @@ an merging"));
} // Fl_Check_Button* chkDominoEX_FEC
{ Fl_Value_Slider* o = valDomCWI = new Fl_Value_Slider(15, 207, 260, 20, _("CWI threshold"));
valDomCWI->tooltip(_("CWI detection and suppression"));
valDomCWI->type(5);
valDomCWI->type(1);
valDomCWI->selection_color(FL_SELECTION_COLOR);
valDomCWI->textsize(14);
valDomCWI->callback((Fl_Callback*)cb_valDomCWI);
@ -2880,7 +2881,7 @@ an merging"));
o->value(progdefaults.HellPulseFast);
} // Fl_Choice* mnuHellPulse
{ Fl_Value_Slider* o = sldrHellBW = new Fl_Value_Slider(206, 147, 246, 20, _("Receive filter bandwidth"));
sldrHellBW->type(5);
sldrHellBW->type(1);
sldrHellBW->selection_color(FL_SELECTION_COLOR);
sldrHellBW->minimum(10);
sldrHellBW->maximum(2400);
@ -2982,7 +2983,6 @@ an merging"));
tabsPSK->selection_color(FL_LIGHT1);
{ Fl_Group* o = new Fl_Group(0, 75, 500, 295, _("General"));
o->align(FL_ALIGN_TOP_LEFT);
o->hide();
{ Fl_Group* o = new Fl_Group(5, 85, 490, 98, _("AFC behavior"));
o->box(FL_ENGRAVED_FRAME);
o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
@ -3062,6 +3062,7 @@ an merging"));
} // Fl_Group* o
{ Fl_Group* o = new Fl_Group(0, 75, 500, 295, _("Viewer"));
o->align(FL_ALIGN_TOP_LEFT);
o->hide();
{ Fl_Group* o = new Fl_Group(5, 85, 490, 110);
o->box(FL_ENGRAVED_FRAME);
{ Fl_Check_Button* o = btnMarquee = new Fl_Check_Button(212, 125, 165, 20, _("Continuous scrolling"));
@ -3264,7 +3265,7 @@ an merging"));
} // Fl_Check_Button* valTHOR_SOFT
{ Fl_Value_Slider* o = valThorCWI = new Fl_Value_Slider(15, 218, 260, 20, _("CWI threshold"));
valThorCWI->tooltip(_("CWI detection and suppression"));
valThorCWI->type(5);
valThorCWI->type(1);
valThorCWI->selection_color(FL_SELECTION_COLOR);
valThorCWI->textsize(14);
valThorCWI->callback((Fl_Callback*)cb_valThorCWI);
@ -3444,7 +3445,6 @@ an merging"));
o->end();
} // Fl_Group* o
{ Fl_Group* o = new Fl_Group(0, 50, 500, 320, _("Hamlib"));
o->hide();
{ chkUSEHAMLIB = new Fl_Check_Button(195, 60, 100, 20, _("Use Hamlib"));
chkUSEHAMLIB->down_box(FL_DOWN_BOX);
chkUSEHAMLIB->callback((Fl_Callback*)cb_chkUSEHAMLIB);
@ -3585,6 +3585,7 @@ an merging"));
o->end();
} // Fl_Group* o
{ Fl_Group* o = new Fl_Group(0, 50, 500, 320, _("XML-RPC"));
o->hide();
{ grpXMLRPC = new Fl_Group(5, 60, 490, 160);
grpXMLRPC->box(FL_ENGRAVED_FRAME);
{ Fl_Output* o = new Fl_Output(160, 79, 190, 58);
@ -3764,7 +3765,7 @@ l with your sound hardware."));
btnLineIn->callback((Fl_Callback*)cb_btnLineIn);
} // Fl_Light_Button* btnLineIn
{ valPCMvolume = new Fl_Value_Slider(15, 167, 340, 21, _("PCM"));
valPCMvolume->type(5);
valPCMvolume->type(1);
valPCMvolume->selection_color(FL_SELECTION_COLOR);
valPCMvolume->value(0.8);
valPCMvolume->textsize(14);
@ -3837,7 +3838,7 @@ l with your sound hardware."));
o->value(progdefaults.CWid);
} // Fl_Check_Button* btnCWID
{ Fl_Value_Slider* o = sldrCWIDwpm = new Fl_Value_Slider(285, 185, 200, 20, _("Speed (WPM):"));
sldrCWIDwpm->type(5);
sldrCWIDwpm->type(1);
sldrCWIDwpm->selection_color(FL_SELECTION_COLOR);
sldrCWIDwpm->minimum(15);
sldrCWIDwpm->maximum(40);

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

@ -69,15 +69,15 @@ static const char szBaudRates[] = "300|600|1200|2400|4800|9600|19200|38400|57600
code {} {}
Fl_Window {} {
label {Fldigi configuration} open
xywh {557 96 500 400} type Double color 45 selection_color 51 labelsize 18 align 80 visible
xywh {386 274 500 400} type Double color 45 selection_color 51 labelsize 18 align 80 visible
} {
Fl_Tabs tabsConfigure {open
xywh {0 0 500 372} color 50 selection_color 50
} {
Fl_Group tabOperator {
label Operator
callback {progdefaults.changed = true;} open
xywh {0 25 500 345} when 1 hide
callback {progdefaults.changed = true;} open selected
xywh {0 25 500 345} when 1
} {
Fl_Group {} {
label Station open
@ -133,7 +133,7 @@ progdefaults.changed = true;}
}
Fl_Group tabUI {
label UI open
xywh {0 25 500 345}
xywh {0 25 500 345} hide
} {
Fl_Tabs tabsUI {open
xywh {0 25 500 345} selection_color 50
@ -209,7 +209,7 @@ progdefaults.changed = true;}
Fl_Check_Button btnAutoFillQSO {
label {Auto-fill Country and Azimuth}
callback {progdefaults.autofill_qso_fields = o->value();
progdefaults.changed = true;} selected
progdefaults.changed = true;}
xywh {25 207 225 20} down_box DOWN_BOX
code0 {o->value(progdefaults.autofill_qso_fields);}
}
@ -270,29 +270,29 @@ progdefaults.changed = true;}
} {
Fl_Box lblSend {
label {Send:}
xywh {26 95 55 25}
xywh {15 95 55 20}
}
Fl_Input inpSend1 {
label {Xchg 1}
label 1
callback {progdefaults.Xchg1=o->value();
progdefaults.changed = true;}
xywh {81 95 70 25} align 1
xywh {70 95 70 20} align 1
code0 {o->value(progdefaults.Xchg1.c_str());}
class Fl_Input2
}
Fl_Input inpSend2 {
label {Xchg 2}
label 2
callback {progdefaults.Xchg2=o->value();
progdefaults.changed = true;}
xywh {159 95 70 25} align 1
xywh {150 95 70 20} align 1
code0 {o->value(progdefaults.Xchg2.c_str());}
class Fl_Input2
}
Fl_Input inpSend3 {
label {Xchg 3}
label 3
callback {progdefaults.Xchg3=o->value();
progdefaults.changed = true;}
xywh {239 95 70 25} align 1
xywh {230 95 70 20} align 1
code0 {o->value(progdefaults.Xchg3.c_str());}
class Fl_Input2
}
@ -300,19 +300,19 @@ progdefaults.changed = true;}
label {RST always 599}
callback {progdefaults.fixed599 = o->value();
progdefaults.changed = true;}
xywh {326 75 130 20} down_box DOWN_BOX
xywh {310 80 130 20} down_box DOWN_BOX
code0 {o->value(progdefaults.fixed599);}
}
Fl_Check_Button btnCutNbrs {
label {Send CW cut \#'s}
label {Send CW cut numbers}
callback {progdefaults.cutnbrs=o->value();
progdefaults.changed = true;}
xywh {326 110 70 15} down_box DOWN_BOX
xywh {310 110 180 20} down_box DOWN_BOX
code0 {o->value(progdefaults.cutnbrs);}
}
}
Fl_Group {} {
label {Serial Number} open
label {Serial number} open
xywh {5 150 490 65} box ENGRAVED_FRAME align 21
} {
Fl_Check_Button btnUseLeadingZeros {
@ -322,14 +322,14 @@ progdefaults.changed = true;}
xywh {26 176 154 20} down_box DOWN_BOX value 1
}
Fl_Value_Input nbrContestStart {
label {Starting \#}
label Start
callback {progdefaults.ContestStart = (int)o->value();
progdefaults.changed = true;}
xywh {221 176 45 20} align 1 maximum 10000 step 1
code0 {o->value(progdefaults.ContestStart);}
}
Fl_Value_Input nbrContestDigits {
label {\# of digits}
label Digits
callback {progdefaults.ContestDigits = (int)o->value();
progdefaults.changed = true;}
xywh {303 175 45 20} align 1 minimum 1 maximum 5 step 1 value 3
@ -341,69 +341,69 @@ progdefaults.changed = true;}
}
}
Fl_Group {} {
label {Dup Check} open
label {Duplicates check} open
xywh {5 225 490 130} box ENGRAVED_FRAME align 21
} {
Fl_Check_Button btnDupCheckOn {
label {Dup Check On CALL +}
label Callsign
callback {EnableDupCheck = o->value();}
xywh {172 250 90 15} down_box DOWN_BOX
xywh {15 253 80 20} down_box DOWN_BOX
code0 {o->value(0);}
}
Fl_Check_Button btnDupBand {
label Band
callback {progdefaults.dupband = o->value();
progdefaults.changed = true;}
xywh {15 283 70 15} down_box DOWN_BOX
xywh {156 253 70 20} down_box DOWN_BOX
code0 {o->value(progdefaults.dupband);}
}
Fl_Check_Button btnDupMode {
label Mode
callback {progdefaults.dupmode = o->value();
progdefaults.changed = true;}
xywh {94 283 70 15} down_box DOWN_BOX
xywh {276 253 70 20} down_box DOWN_BOX
code0 {o->value(progdefaults.dupmode);}
}
Fl_Check_Button btnDupState {
label State
callback {progdefaults.dupstate = o->value();
progdefaults.changed = true;}
xywh {172 283 70 15} down_box DOWN_BOX
xywh {395 253 70 20} down_box DOWN_BOX
code0 {o->value(progdefaults.dupstate);}
}
Fl_Check_Button btnDupXchg1 {
label {Xchg 1}
label {Exchange 1}
callback {progdefaults.dupxchg1 = o->value();
progdefaults.changed = true;}
xywh {252 283 70 15} down_box DOWN_BOX
xywh {15 283 105 20} down_box DOWN_BOX
code0 {o->value(progdefaults.dupxchg1);}
}
Fl_Check_Button btnDupXchg2 {
label {Xchg 2}
label {Exchange 2}
callback {progdefaults.dupxchg2 = o->value();
progdefaults.changed = true;}
xywh {331 283 70 15} down_box DOWN_BOX
xywh {156 283 105 20} down_box DOWN_BOX
code0 {o->value(progdefaults.dupxchg2);}
}
Fl_Check_Button btnDupXchg3 {
label {Xchg 3}
label {Exchange 3}
callback {progdefaults.dupxchg3 = o->value();
progdefaults.changed = true;}
xywh {410 283 70 15} down_box DOWN_BOX
xywh {276 283 105 20} down_box DOWN_BOX
code0 {o->value(progdefaults.dupxchg3);}
}
Fl_Check_Button btnDupTimeSpan {
label {Time span over}
callback {progdefaults.duptimespan=o->value();
progdefaults.changed = true;}
xywh {94 317 70 15} down_box DOWN_BOX
xywh {15 313 129 20} down_box DOWN_BOX
code0 {o->value(progdefaults.duptimespan);}
}
Fl_Value_Input nbrTimeSpan {
label minutes
callback {progdefaults.timespan = o->value();
progdefaults.changed = true;}
xywh {230 313 53 22} align 8 maximum 1440 step 1 value 120
xywh {158 313 53 20} align 8 maximum 1440 step 1 value 120
code0 {o->value(progdefaults.timespan);}
}
}
@ -595,7 +595,7 @@ progdefaults.changed = true;}
label {Signal level}
callback {progdefaults.TxMonitorLevel = o->value();
progdefaults.changed = true;}
xywh {270 315 200 20} type {Horz Knob} selection_color 15 align 1 step 0.05 value 0.5 textsize 14
xywh {270 315 200 20} type Horizontal selection_color 15 align 1 step 0.05 value 0.5 textsize 14
code0 {o->value(progdefaults.TxMonitorLevel);}
}
}
@ -717,30 +717,33 @@ behaves inside the waterfall} xywh {15 196 150 22} down_box BORDER_BOX align 8
label {Filter bandwidth}
callback {progdefaults.CWbandwidth = (int)o->value();
progdefaults.changed = true;}
xywh {70 117 240 20} type {Horz Knob} color 7 selection_color 15 align 8 minimum 10 maximum 500 step 10 value 150 textsize 14
xywh {40 115 290 20} type Horizontal selection_color 15 align 8 minimum 10 maximum 500 step 10 value 150 textsize 14
code0 {o->value(progdefaults.CWbandwidth);}
}
Fl_Check_Button btnCWrcvTrack {
label Tracking
callback {progdefaults.CWtrack = o->value();
progdefaults.changed = true;}
xywh {70 150 80 20} down_box DOWN_BOX value 1
xywh {40 150 80 20} down_box DOWN_BOX value 1
code0 {o->value(progdefaults.CWtrack);}
}
Fl_Counter cntCWrange {
label {Tracking range (WPM)}
callback {progdefaults.CWrange = (int)o->value();
progdefaults.changed = true;}
xywh {220 150 65 20} type Simple align 8 minimum 5 maximum 25 step 1 value 10
xywh {225 150 65 20} type Simple align 8 minimum 5 maximum 25 step 1 value 10
code0 {o->value(progdefaults.CWrange);}
}
Fl_Value_Output valCWrcvWPM {
label {RX WPM}
callback {progdefaults.changed = true;}
xywh {130 188 35 20} color 7
xywh {40 188 35 20} color 7
}
Fl_Progress prgsCWrcvWPM {
xywh {165 188 275 20} color 49 selection_color 15 align 0
xywh {75 188 255 20} color 49 selection_color 15 align 0
}
Fl_Box {} {
label {RX WPM}
xywh {330 188 70 20} align 20
}
}
Fl_Group {} {
@ -753,14 +756,14 @@ progdefaults.changed = true;}
cntPreTiming->maximum((int)(2400/o->value())/2.0);
cntPostTiming->maximum((int)(2400/o->value())/2.0);
progdefaults.changed = true;}
xywh {130 248 310 20} type {Horz Knob} color 7 selection_color 15 align 4 minimum 5 maximum 100 step 1 value 20 textsize 14
xywh {40 248 290 20} type Horizontal selection_color 15 align 8 minimum 5 maximum 100 step 1 value 20 textsize 14
code0 {o->value(progdefaults.CWspeed);}
}
Fl_Counter cntCWdefWPM {
label Default
callback {progdefaults.defCWspeed = (int)o->value();
progdefaults.changed = true;}
xywh {130 294 64 20} type Simple align 1 minimum 5 maximum 200 step 1 value 18
xywh {40 294 64 20} type Simple align 1 minimum 5 maximum 200 step 1 value 18
code0 {o->value(progdefaults.defCWspeed);}
}
Fl_Counter cntCWlowerlimit {
@ -771,7 +774,7 @@ sldrCWxmtWPM->minimum(o->value());
sldrCWxmtWPM->value(progdefaults.CWspeed);
sldrCWxmtWPM->redraw();
cntCWupperlimit->minimum(o->value()+20);}
xywh {250 294 65 20} type Simple align 1 minimum 5 maximum 20 step 5 value 10
xywh {152 294 65 20} type Simple align 1 minimum 5 maximum 20 step 5 value 10
code0 {o->value(progdefaults.CWlowerlimit);}
}
Fl_Counter cntCWupperlimit {
@ -782,7 +785,7 @@ sldrCWxmtWPM->maximum(o->value());
sldrCWxmtWPM->value(progdefaults.CWspeed);
sldrCWxmtWPM->redraw();
cntCWlowerlimit->maximum(o->value()-20);}
xywh {375 294 65 20} type Simple align 1 minimum 25 maximum 200 step 5 value 100
xywh {265 294 65 20} type Simple align 1 minimum 25 maximum 200 step 5 value 100
code0 {o->value(progdefaults.CWupperlimit);}
}
}
@ -806,14 +809,14 @@ progdefaults.changed = true;}
label {Dash to dot ratio}
callback {progdefaults.CWdash2dot=o->value();
progdefaults.changed = true;}
xywh {211 114 64 20} type Simple align 8 minimum 2.5 maximum 4 step 0.1 value 3
xywh {211 114 64 20} type Simple align 8 minimum 2.5 maximum 4 value 3
code0 {o->value(progdefaults.CWdash2dot);}
}
Fl_Counter cntCWrisetime {
label Edge
callback {progdefaults.CWrisetime=o->value();
progdefaults.changed = true;}
tooltip {Leading and trailing edge risetimes (ms)} xywh {15 144 65 21} type Simple align 8 minimum 0 maximum 15 step 0.1 value 4
tooltip {Leading and trailing edge risetimes (ms)} xywh {15 144 65 21} type Simple align 8 minimum 0 maximum 15 value 4
code0 {o->value(progdefaults.CWrisetime);}
}
}
@ -875,7 +878,7 @@ progdefaults.changed = true;}
callback {progdefaults.DOMINOEX_BW = o->value();
resetDOMEX();
progdefaults.changed = true;}
tooltip {Filter bandwidth relative to signal width} xywh {156 141 63 20} type Simple align 8 minimum 1 maximum 2 step 0.1 value 1.5
tooltip {Filter bandwidth relative to signal width} xywh {156 141 63 20} type Simple align 8 minimum 1 maximum 2 value 1.5
code0 {o->value(progdefaults.DOMINOEX_BW);}
}
Fl_Check_Button chkDominoEX_FEC {
@ -889,7 +892,7 @@ progdefaults.changed = true;}
label {CWI threshold}
callback {progdefaults.DomCWI = o->value();
progdefaults.changed = true;}
tooltip {CWI detection and suppression} xywh {15 207 260 20} type {Horz Knob} selection_color 15 align 1 step 0.01 textsize 14
tooltip {CWI detection and suppression} xywh {15 207 260 20} type Horizontal selection_color 15 align 1 textsize 14
code0 {o->value(progdefaults.DomCWI);}
}
Fl_Counter valDominoEX_PATHS {
@ -951,7 +954,7 @@ progdefaults.changed = true;} open
Fl_Value_Slider sldrHellBW {
label {Receive filter bandwidth}
callback {progdefaults.HELL_BW = sldrHellBW->value();}
xywh {206 147 246 20} type {Horz Knob} selection_color 15 align 5 minimum 10 maximum 2400 step 5 value 400 textsize 14
xywh {206 147 246 20} type Horizontal selection_color 15 align 5 minimum 10 maximum 2400 step 5 value 400 textsize 14
code0 {o->value(progdefaults.HELL_BW);}
}
Fl_Check_Button btnFeldHellIdle {
@ -1058,7 +1061,7 @@ progdefaults.changed = true;}
} {
Fl_Group {} {
label General open
xywh {0 75 500 295} align 5 hide
xywh {0 75 500 295} align 5
} {
Fl_Group {} {
label {AFC behavior} open
@ -1127,7 +1130,7 @@ progdefaults.changed = true;}
}
Fl_Group {} {
label Viewer open
xywh {0 75 500 295} align 5
xywh {0 75 500 295} align 5 hide
} {
Fl_Group {} {open
xywh {5 85 490 110} box ENGRAVED_FRAME
@ -1342,7 +1345,7 @@ progdefaults.changed = true;}
callback {progdefaults.THOR_BW = o->value();
resetTHOR();
progdefaults.changed = true;}
tooltip {Filter bandwidth relative to signal width} xywh {156 141 63 20} type Simple align 8 minimum 1 maximum 2 step 0.1 value 1.5
tooltip {Filter bandwidth relative to signal width} xywh {156 141 63 20} type Simple align 8 minimum 1 maximum 2 value 1.5
code0 {o->value(progdefaults.THOR_BW);}
}
Fl_Check_Button valTHOR_SOFT {
@ -1356,7 +1359,7 @@ progdefaults.changed = true;}
label {CWI threshold}
callback {progdefaults.ThorCWI = o->value();
progdefaults.changed = true;}
tooltip {CWI detection and suppression} xywh {15 218 260 20} type {Horz Knob} selection_color 15 align 1 step 0.01 textsize 14
tooltip {CWI detection and suppression} xywh {15 218 260 20} type Horizontal selection_color 15 align 1 textsize 14
code0 {o->value(progdefaults.ThorCWI);}
}
Fl_Counter valTHOR_PATHS {
@ -1643,7 +1646,7 @@ progdefaults.changed = true;}
}
Fl_Group {} {
label Hamlib open
xywh {0 50 500 320} hide
xywh {0 50 500 320}
} {
Fl_Check_Button chkUSEHAMLIB {
label {Use Hamlib}
@ -1886,7 +1889,7 @@ progdefaults.changed = true;}
}
Fl_Group {} {
label {XML-RPC} open
xywh {0 50 500 320}
xywh {0 50 500 320} hide
} {
Fl_Group grpXMLRPC {open
xywh {5 60 490 160} box ENGRAVED_FRAME
@ -2149,7 +2152,7 @@ progdefaults.changed = true;}
label PCM
callback {setPCMvolume(o->value());
progdefaults.changed = true;}
xywh {15 167 340 21} type {Horz Knob} selection_color 15 align 8 step 0.01 value 0.8 textsize 14
xywh {15 167 340 21} type Horizontal selection_color 15 align 8 value 0.8 textsize 14
code0 {extern void setPCMvolume(double);}
}
}
@ -2221,7 +2224,7 @@ progdefaults.changed = true;}
label {Speed (WPM):}
callback {progdefaults.CWIDwpm = (int)o->value();
progdefaults.changed = true;}
xywh {285 185 200 20} type {Horz Knob} selection_color 15 align 1 minimum 15 maximum 40 step 1 value 18 textsize 14
xywh {285 185 200 20} type Horizontal selection_color 15 align 1 minimum 15 maximum 40 step 1 value 18 textsize 14
code0 {o->value(progdefaults.CWIDwpm);}
}
}

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

@ -365,7 +365,7 @@ Fl_Menu_Item quick_change_olivia[] = {
{ "8/500", 0, cb_oliviaA, (void *)MODE_OLIVIA },
{ "16/500", 0, cb_oliviaB, (void *)MODE_OLIVIA },
{ "32/1000", 0, cb_oliviaC, (void *)MODE_OLIVIA },
{ "Custom", 0, cb_oliviaCustom, (void *)MODE_OLIVIA },
{ _("Custom..."), 0, cb_oliviaCustom, (void *)MODE_OLIVIA },
{ 0 }
};
@ -373,7 +373,7 @@ Fl_Menu_Item quick_change_rtty[] = {
{ "RTTY-45", 0, cb_rtty45, (void *)MODE_RTTY },
{ "RTTY-50", 0, cb_rtty50, (void *)MODE_RTTY },
{ "RTTY-75", 0, cb_rtty75, (void *)MODE_RTTY },
{ "Custom", 0, cb_rttyCustom, (void *)MODE_RTTY },
{ _("Custom..."), 0, cb_rttyCustom, (void *)MODE_RTTY },
{ 0 }
};
@ -890,7 +890,7 @@ void cb_mnuPlayback(Fl_Widget *w, void *d)
playval = false;
}
else if (btnAutoSpot->value()) {
put_status("Spotting disabled", 3.0);
put_status(_("Spotting disabled"), 3.0);
btnAutoSpot->value(0);
btnAutoSpot->do_callback();
}
@ -1103,12 +1103,12 @@ void cb_mnuAudioInfo(Fl_Widget*, void*)
string devtext[2], headers[2];
SoundPort::devices_info(devtext[0], devtext[1]);
if (devtext[0] != devtext[1]) {
headers[0] = "Capture device";
headers[1] = "Playback device";
headers[0] = _("Capture device");
headers[1] = _("Playback device");
ndev = 2;
}
else {
headers[0] = "Capture and playback devices";
headers[0] = _("Capture and playback devices");
ndev = 1;
}
@ -1580,7 +1580,7 @@ bool clean_exit(void) {
#define CONTEST_FIELDS_MLABEL _("Contest fields")
Fl_Menu_Item menu_[] = {
{_("&Files"), 0, 0, 0, FL_SUBMENU, FL_NORMAL_LABEL, 0, 14, 0},
{_("&File"), 0, 0, 0, FL_SUBMENU, FL_NORMAL_LABEL, 0, 14, 0},
{ make_icon_label(_("Open macros..."), file_open_icon), 0, (Fl_Callback*)cb_mnuOpenMacro, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ make_icon_label(_("Save macros..."), save_as_icon), 0, (Fl_Callback*)cb_mnuSaveMacro, 0, FL_MENU_DIVIDER, _FL_MULTI_LABEL, 0, 14, 0},
{ make_icon_label(_("Show config"), folder_open_icon), 0, cb_ShowConfig, 0, FL_MENU_DIVIDER, _FL_MULTI_LABEL, 0, 14, 0},
@ -1598,8 +1598,8 @@ Fl_Menu_Item menu_[] = {
#if USE_SNDFILE
{ make_icon_label(_("Audio")), 0, 0, 0, FL_MENU_DIVIDER | FL_SUBMENU, _FL_MULTI_LABEL, 0, 14, 0},
{_("Rx capture"), 0, (Fl_Callback*)cb_mnuCapture, 0, FL_MENU_TOGGLE, FL_NORMAL_LABEL, 0, 14, 0},
{_("Tx generate"), 0, (Fl_Callback*)cb_mnuGenerate, 0, FL_MENU_TOGGLE, FL_NORMAL_LABEL, 0, 14, 0},
{_("RX capture"), 0, (Fl_Callback*)cb_mnuCapture, 0, FL_MENU_TOGGLE, FL_NORMAL_LABEL, 0, 14, 0},
{_("TX generate"), 0, (Fl_Callback*)cb_mnuGenerate, 0, FL_MENU_TOGGLE, FL_NORMAL_LABEL, 0, 14, 0},
{_("Playback"), 0, (Fl_Callback*)cb_mnuPlayback, 0, FL_MENU_TOGGLE, FL_NORMAL_LABEL, 0, 14, 0},
{0,0,0,0,0,0,0,0,0},
#endif
@ -1650,7 +1650,7 @@ Fl_Menu_Item menu_[] = {
{ "8/500", 0, cb_oliviaA, (void *)MODE_OLIVIA, 0, FL_NORMAL_LABEL, 0, 14, 0},
{ "16/500", 0, cb_oliviaB, (void *)MODE_OLIVIA, 0, FL_NORMAL_LABEL, 0, 14, 0},
{ "32/1000", 0, cb_oliviaC, (void *)MODE_OLIVIA, FL_MENU_DIVIDER, FL_NORMAL_LABEL, 0, 14, 0},
{ "Custom", 0, cb_oliviaCustom, (void *)MODE_OLIVIA, 0, FL_NORMAL_LABEL, 0, 14, 0},
{ _("Custom..."), 0, cb_oliviaCustom, (void *)MODE_OLIVIA, 0, FL_NORMAL_LABEL, 0, 14, 0},
{0,0,0,0,0,0,0,0,0},
{"PSK", 0, 0, 0, FL_SUBMENU, FL_NORMAL_LABEL, 0, 14, 0},
@ -1668,7 +1668,7 @@ Fl_Menu_Item menu_[] = {
{ "RTTY-45", 0, cb_rtty45, (void *)MODE_RTTY, 0, FL_NORMAL_LABEL, 0, 14, 0},
{ "RTTY-50", 0, cb_rtty50, (void *)MODE_RTTY, 0, FL_NORMAL_LABEL, 0, 14, 0},
{ "RTTY-75", 0, cb_rtty75, (void *)MODE_RTTY, FL_MENU_DIVIDER, FL_NORMAL_LABEL, 0, 14, 0},
{ "Custom", 0, cb_rttyCustom, (void *)MODE_RTTY, 0, FL_NORMAL_LABEL, 0, 14, 0},
{ _("Custom..."), 0, cb_rttyCustom, (void *)MODE_RTTY, 0, FL_NORMAL_LABEL, 0, 14, 0},
{0,0,0,0,0,0,0,0,0},
{"THOR", 0, 0, 0, FL_SUBMENU, FL_NORMAL_LABEL, 0, 14, 0},
@ -2311,7 +2311,7 @@ void create_fl_digi_main() {
inpVEprov->tooltip(_("Can. Province"));
inpVEprov->align(FL_ALIGN_INSIDE);
Fl_Box *fm11box = new Fl_Box(rightof(inpVEprov), y3, w_fm6, qh - pad, _("Ctny"));
Fl_Box *fm11box = new Fl_Box(rightof(inpVEprov), y3, w_fm6, qh - pad, _("Cnty"));
fm11box->align(FL_ALIGN_INSIDE);
inpCountry = new Fl_Input2(rightof(fm11box), y3, w_inpCountry, qh - pad, "");
inpCountry->tooltip(_("Country"));
@ -3252,6 +3252,6 @@ void qsy(long long rfc, long long fmid)
bool quick_choice(const char* title, bool sel)
{
Fl_Menu_Item m[] = { { "Confirm" }, { "Cancel" }, { 0 } };
Fl_Menu_Item m[] = { { _("Confirm") }, { _("Cancel") }, { 0 } };
return m->popup(Fl::event_x(), Fl::event_y(), title, m + !sel) == m;
}

1527
src/misc/pixmaps.cxx
Wyświetl plik

Plik diff jest za duży Load Diff

73
src/widgets/FTextView.cxx
Wyświetl plik

@ -55,6 +55,7 @@
#include "locator.h"
#include "logsupport.h"
#include "status.h"
#include "gettext.h"
#include "debug.h"
@ -215,7 +216,7 @@ void FTextBase::set_style(int attr, Fl_Font f, int s, Fl_Color c, int set)
/// @return 0 on success, -1 on error
int FTextBase::readFile(const char* fn)
{
if ( !(fn || (fn = FSEL::select("Insert text", "Text\t*.txt"))) )
if ( !(fn || (fn = FSEL::select(_("Insert text"), "Text\t*.txt"))) )
return -1;
int ret = 0, pos = insert_position();
@ -268,7 +269,7 @@ int FTextBase::readFile(const char* fn)
///
void FTextBase::saveFile(void)
{
const char *fn = FSEL::saveas("Save text as", "Text\t*.txt");
const char *fn = FSEL::saveas(_("Save text as"), "Text\t*.txt");
if (fn) {
#ifdef __CYGWIN__
ofstream tfile(fn);
@ -395,29 +396,29 @@ void FTextBase::reset_styles(int set)
#endif
Fl_Menu_Item FTextView::view_menu[] = {
{ make_icon_label(LOOKUP_SYMBOL "&Look up call", net_icon), 0, 0, 0, FL_MENU_DIVIDER, _FL_MULTI_LABEL },
{ make_icon_label(ENTER_SYMBOL "&Call", enter_key_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(LOOKUP_SYMBOL _("&Look up call"), net_icon), 0, 0, 0, FL_MENU_DIVIDER, _FL_MULTI_LABEL },
{ make_icon_label(ENTER_SYMBOL _("&Call"), enter_key_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(ENTER_SYMBOL "&Name", enter_key_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(ENTER_SYMBOL "QT&H", enter_key_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(ENTER_SYMBOL "&State", enter_key_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(ENTER_SYMBOL "&Province", enter_key_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(ENTER_SYMBOL "Countr&y", enter_key_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(ENTER_SYMBOL "&Locator", enter_key_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(ENTER_SYMBOL "&RST(r)", enter_key_icon), 0, 0, 0, FL_MENU_DIVIDER, _FL_MULTI_LABEL },
{ make_icon_label(ENTER_SYMBOL "Serial Nr", enter_key_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(ENTER_SYMBOL "Xchg &1", enter_key_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(ENTER_SYMBOL "Xchg &2", enter_key_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(ENTER_SYMBOL "Xchg &3", enter_key_icon), 0, 0, 0, FL_MENU_DIVIDER, _FL_MULTI_LABEL },
{ make_icon_label("Insert divider", insert_link_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label("&Copy", edit_copy_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label("C&lear", edit_clear_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label("Select All", edit_select_all_icon), 0, 0, 0, FL_MENU_DIVIDER, _FL_MULTI_LABEL },
{ make_icon_label(ENTER_SYMBOL _("QT&H"), enter_key_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(ENTER_SYMBOL _("&State"), enter_key_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(ENTER_SYMBOL _("&Province"), enter_key_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(ENTER_SYMBOL _("Countr&y"), enter_key_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(ENTER_SYMBOL _("&Locator"), enter_key_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(ENTER_SYMBOL _("&RST(r)"), enter_key_icon), 0, 0, 0, FL_MENU_DIVIDER, _FL_MULTI_LABEL },
{ make_icon_label(ENTER_SYMBOL _("Serial number"), enter_key_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(ENTER_SYMBOL _("Exchange &1"), enter_key_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(ENTER_SYMBOL _("Exchange &2"), enter_key_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(ENTER_SYMBOL _("Exchange &3"), enter_key_icon), 0, 0, 0, FL_MENU_DIVIDER, _FL_MULTI_LABEL },
{ make_icon_label(_("Insert divider"), insert_link_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(_("&Copy"), edit_copy_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(_("C&lear"), edit_clear_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(_("Select All"), edit_select_all_icon), 0, 0, 0, FL_MENU_DIVIDER, _FL_MULTI_LABEL },
#if 0 //#ifndef NDEBUG
{ "(debug) &Append file...", 0, 0, 0, FL_MENU_DIVIDER, FL_NORMAL_LABEL },
#endif
{ make_icon_label("Save &as...", save_as_icon), 0, 0, 0, FL_MENU_DIVIDER, _FL_MULTI_LABEL },
{ "Quick entry", 0, 0, 0, FL_MENU_TOGGLE, FL_NORMAL_LABEL },
{ "Word &wrap", 0, 0, 0, FL_MENU_TOGGLE, FL_NORMAL_LABEL },
{ make_icon_label(_("Save &as..."), save_as_icon), 0, 0, 0, FL_MENU_DIVIDER, _FL_MULTI_LABEL },
{ _("Quick entry"), 0, 0, 0, FL_MENU_TOGGLE, FL_NORMAL_LABEL },
{ _("Word &wrap"), 0, 0, 0, FL_MENU_TOGGLE, FL_NORMAL_LABEL },
{ 0 }
};
static bool view_init = false;
@ -895,7 +896,7 @@ const char* FTextView::dxcc_lookup_call(int x, int y)
if (len < sizeof(tip)) {
const char** data;
if (SearchLog(s, &data) > 0)
snprintf(tip + len, sizeof(tip) - len, "\n%s (%s)", "* worked before", data[0]);
snprintf(tip + len, sizeof(tip) - len, "\n* %s (%s)", _("worked before"), data[0]);
}
ret = tip;
@ -935,16 +936,16 @@ void FTextView::dxcc_tooltip(void* obj)
Fl_Menu_Item FTextEdit::edit_menu[] = {
{ make_icon_label("&Transmit", tx_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label("&Abort", process_stop_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label("&Receive", rx_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label("Send &image...", image_icon), 0, 0, 0, FL_MENU_DIVIDER, _FL_MULTI_LABEL },
{ make_icon_label("C&lear", edit_clear_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label("Cu&t", edit_cut_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label("&Copy", edit_copy_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label("&Paste", edit_paste_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label("Insert &file...", file_open_icon), 0, 0, 0, FL_MENU_DIVIDER, _FL_MULTI_LABEL },
{ "Word &wrap", 0, 0, 0, FL_MENU_TOGGLE, FL_NORMAL_LABEL } ,
{ make_icon_label(_("&Transmit"), tx_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(_("&Abort"), process_stop_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(_("&Receive"), rx_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(_("Send &image..."), image_icon), 0, 0, 0, FL_MENU_DIVIDER, _FL_MULTI_LABEL },
{ make_icon_label(_("C&lear"), edit_clear_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(_("Cu&t"), edit_cut_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(_("&Copy"), edit_copy_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(_("&Paste"), edit_paste_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(_("Insert &file..."), file_open_icon), 0, 0, 0, FL_MENU_DIVIDER, _FL_MULTI_LABEL },
{ _("Word &wrap"), 0, 0, 0, FL_MENU_TOGGLE, FL_NORMAL_LABEL } ,
{ 0 }
};
static bool edit_init = false;
@ -1576,10 +1577,10 @@ int FTextEdit::kf_paste(int c, Fl_Text_Editor_mod* e)
// ----------------------------------------------------------------------------
Fl_Menu_Item FTextLog::log_menu[] = {
{ make_icon_label("C&lear", edit_clear_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label("&Copy", edit_copy_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label("Save to &file...", save_as_icon), 0, 0, 0, FL_MENU_DIVIDER, _FL_MULTI_LABEL },
{ "Word &wrap", 0, 0, 0, FL_MENU_TOGGLE },
{ make_icon_label(_("C&lear"), edit_clear_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(_("&Copy"), edit_copy_icon), 0, 0, 0, 0, _FL_MULTI_LABEL },
{ make_icon_label(_("Save to &file..."), save_as_icon), 0, 0, 0, FL_MENU_DIVIDER, _FL_MULTI_LABEL },
{ _("Word &wrap"), 0, 0, 0, FL_MENU_TOGGLE },
{ 0 }
};
static bool log_init = false;