w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix-2.2.1'

This commit is contained in:
Bill Somerville 2020-06-05 23:52:19 +01:00
parent 451b6747b7 01a1a421d5
commit 00dfab9c88
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
16 changed files with 7334 additions and 683 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -1107,6 +1107,7 @@ set (LANGUAGES
ja # Japanese ja # Japanese
zh # Chinese zh # Chinese
zh_HK # Chinese per Hong Kong zh_HK # Chinese per Hong Kong
it # Italian
) )
foreach (lang_ ${LANGUAGES}) foreach (lang_ ${LANGUAGES})
file (TO_NATIVE_PATH ${CMAKE_SOURCE_DIR}/translations/wsjtx_${lang_}.ts ts_) file (TO_NATIVE_PATH ${CMAKE_SOURCE_DIR}/translations/wsjtx_${lang_}.ts ts_)

40
NEWS
View File

@ -13,6 +13,46 @@
Copyright 2001 - 2020 by Joe Taylor, K1JT. Copyright 2001 - 2020 by Joe Taylor, K1JT.
Release: WSJT-X 2.2.1
June 6, 2020
---------------------
WSJT-X v2.2.1 is a bug fix release that fixes regressions found in the
prior v2.2.0 release. Here is a brief summary;
- Incorporate a revised Hamlib version the address a regression in
rig control of some rigs including the Yaesu FT-991 and FT-891.
- Repair a defect in 6 character gridsquare lookup from the CALL3.TXT
database, and improve "Lookup" button processing.
- Repair a defect with selecting Wide Graph 2D spectrum types in
translated UIs.
- Repair a regression that blocked the Highlight Callsign UDP request
from highlighting terms including a '+' character.
- Repair a regression where occasional Highlight Callsign UDP
requests with the 'Highlight last' parameter as true highlighted a
match in a prior period. This fix include a performance improvement
when processing any Highlight Callsign request with 'Highlight
last' as true.
- Include support for the Yaesu FT-920 when controlled by Ham Radio
Deluxe. This change inadvertently missed the v2.2.0 GA release.
- Correct a documentation issue with the UDP Message Protocol
Status(1) message Special Operations Mode enumeration values ("WW
DIGI added", Fox, and Hound renumbered). Thanks to Sam, W2JDB, for
raising this issue.
- Updated Catalan UI translation, tnx Xavi, EA3W.
- Italian UI translation, tnx Marco, PY1ZRJ.
- Updated Spanish UI translation, tnx Cédric, EA4AC.
Release: WSJT-X 2.2 Release: WSJT-X 2.2
June 2, 2020 June 2, 2020
------------------- -------------------

5
Network/NetworkMessage.hpp
View File

@ -194,8 +194,9 @@
* 2 -> EU VHF * 2 -> EU VHF
* 3 -> FIELD DAY * 3 -> FIELD DAY
* 4 -> RTTY RU * 4 -> RTTY RU
* 5 -> FOX * 5 -> WW DIGI
* 6 -> HOUND * 6 -> FOX
* 7 -> HOUND
* *
* The Frequency Tolerance and T/R period fields may have a value * The Frequency Tolerance and T/R period fields may have a value
* of the maximum quint32 value which implies the field is not * of the maximum quint32 value which implies the field is not

40
Release_Notes.txt
View File

@ -13,6 +13,46 @@
Copyright 2001 - 2020 by Joe Taylor, K1JT. Copyright 2001 - 2020 by Joe Taylor, K1JT.
Release: WSJT-X 2.2.1
June 6, 2020
---------------------
WSJT-X v2.2.1 is a bug fix release that fixes regressions found in the
prior v2.2.0 release. Here is a brief summary;
- Incorporate a revised Hamlib version the address a regression in
rig control of some rigs including the Yaesu FT-991 and FT-891.
- Repair a defect in 6 character gridsquare lookup from the CALL3.TXT
database, and improve "Lookup" button processing.
- Repair a defect with selecting Wide Graph 2D spectrum types in
translated UIs.
- Repair a regression that blocked the Highlight Callsign UDP request
from highlighting terms including a '+' character.
- Repair a regression where occasional Highlight Callsign UDP
requests with the 'Highlight last' parameter as true highlighted a
match in a prior period. This fix include a performance improvement
when processing any Highlight Callsign request with 'Highlight
last' as true.
- Include support for the Yaesu FT-920 when controlled by Ham Radio
Deluxe. This change inadvertently missed the v2.2.0 GA release.
- Correct a documentation issue with the UDP Message Protocol
Status(1) message Special Operations Mode enumeration values ("WW
DIGI added", Fox, and Hound renumbered). Thanks to Sam, W2JDB, for
raising this issue.
- Updated Catalan UI translation, tnx Xavi, EA3W.
- Italian UI translation, tnx Marco, PY1ZRJ.
- Updated Spanish UI translation, tnx Cédric, EA4AC.
Release: WSJT-X 2.2 Release: WSJT-X 2.2
June 2, 2020 June 2, 2020
------------------- -------------------

10
Transceiver/HRDTransceiver.cpp
View File

@ -236,7 +236,7 @@ int HRDTransceiver::do_start ()
vfo_A_button_ = find_button (QRegExp ("^(VFO~A|Main)$")); vfo_A_button_ = find_button (QRegExp ("^(VFO~A|Main)$"));
vfo_B_button_ = find_button (QRegExp ("^(VFO~B|Sub)$")); vfo_B_button_ = find_button (QRegExp ("^(VFO~B|Sub)$"));
vfo_toggle_button_ = find_button (QRegExp ("^(A~/~B)$")); vfo_toggle_button_ = find_button (QRegExp ("^(A~/~B|VFO~A/B)$"));
split_mode_button_ = find_button (QRegExp ("^(Spl~On|Spl_On|Split|Split~On)$")); split_mode_button_ = find_button (QRegExp ("^(Spl~On|Spl_On|Split|Split~On)$"));
split_off_button_ = find_button (QRegExp ("^(Spl~Off|Spl_Off|Split~Off)$")); split_off_button_ = find_button (QRegExp ("^(Spl~Off|Spl_Off|Split~Off)$"));
@ -392,17 +392,17 @@ std::vector<int> HRDTransceiver::find_dropdown_selection (int dropdown, QRegExp
void HRDTransceiver::map_modes (int dropdown, ModeMap *map) void HRDTransceiver::map_modes (int dropdown, ModeMap *map)
{ {
// order matters here (both in the map and in the regexps) // order matters here (both in the map and in the regexps)
map->push_back (std::forward_as_tuple (CW, find_dropdown_selection (dropdown, QRegExp ("^(CW|CW\\(N\\))|CWL$")))); map->push_back (std::forward_as_tuple (CW, find_dropdown_selection (dropdown, QRegExp ("^(CW|CW\\(N\\)|CW-LSB|CWL)$"))));
map->push_back (std::forward_as_tuple (CW_R, find_dropdown_selection (dropdown, QRegExp ("^(CW-R|CW-R\\(N\\)|CW|CWU)$")))); map->push_back (std::forward_as_tuple (CW_R, find_dropdown_selection (dropdown, QRegExp ("^(CW-R|CW-R\\(N\\)|CW|CW-USB|CWU)$"))));
map->push_back (std::forward_as_tuple (LSB, find_dropdown_selection (dropdown, QRegExp ("^(LSB\\(N\\)|LSB)$")))); map->push_back (std::forward_as_tuple (LSB, find_dropdown_selection (dropdown, QRegExp ("^(LSB\\(N\\)|LSB)$"))));
map->push_back (std::forward_as_tuple (USB, find_dropdown_selection (dropdown, QRegExp ("^(USB\\(N\\)|USB)$")))); map->push_back (std::forward_as_tuple (USB, find_dropdown_selection (dropdown, QRegExp ("^(USB\\(N\\)|USB)$"))));
map->push_back (std::forward_as_tuple (DIG_U, find_dropdown_selection (dropdown, QRegExp ("^(DIG|DIGU|DATA-U|PKT-U|DATA|USER-U|USB)$")))); map->push_back (std::forward_as_tuple (DIG_U, find_dropdown_selection (dropdown, QRegExp ("^(DIG|DIGU|DATA-U|PKT-U|DATA|AFSK|USER-U|USB)$"))));
map->push_back (std::forward_as_tuple (DIG_L, find_dropdown_selection (dropdown, QRegExp ("^(DIG|DIGL|DATA-L|PKT-L|DATA-R|USER-L|LSB)$")))); map->push_back (std::forward_as_tuple (DIG_L, find_dropdown_selection (dropdown, QRegExp ("^(DIG|DIGL|DATA-L|PKT-L|DATA-R|USER-L|LSB)$"))));
map->push_back (std::forward_as_tuple (FSK, find_dropdown_selection (dropdown, QRegExp ("^(DIG|FSK|RTTY|RTTY-LSB)$")))); map->push_back (std::forward_as_tuple (FSK, find_dropdown_selection (dropdown, QRegExp ("^(DIG|FSK|RTTY|RTTY-LSB)$"))));
map->push_back (std::forward_as_tuple (FSK_R, find_dropdown_selection (dropdown, QRegExp ("^(DIG|FSK-R|RTTY-R|RTTY|RTTY-USB)$")))); map->push_back (std::forward_as_tuple (FSK_R, find_dropdown_selection (dropdown, QRegExp ("^(DIG|FSK-R|RTTY-R|RTTY|RTTY-USB)$"))));
map->push_back (std::forward_as_tuple (AM, find_dropdown_selection (dropdown, QRegExp ("^(AM|DSB|SAM|DRM)$")))); map->push_back (std::forward_as_tuple (AM, find_dropdown_selection (dropdown, QRegExp ("^(AM|DSB|SAM|DRM)$"))));
map->push_back (std::forward_as_tuple (FM, find_dropdown_selection (dropdown, QRegExp ("^(FM|FM\\(N\\)|FM-N|WFM)$")))); map->push_back (std::forward_as_tuple (FM, find_dropdown_selection (dropdown, QRegExp ("^(FM|FM\\(N\\)|FM-N|WFM)$"))));
map->push_back (std::forward_as_tuple (DIG_FM, find_dropdown_selection (dropdown, QRegExp ("^(PKT-FM|PKT|FM)$")))); map->push_back (std::forward_as_tuple (DIG_FM, find_dropdown_selection (dropdown, QRegExp ("^(PKT-FM|PKT|DATA\\(FM\\)|FM)$"))));
#if WSJT_TRACE_CAT #if WSJT_TRACE_CAT
TRACE_CAT ("HRDTransceiver", "for dropdown" << dropdown_names_[dropdown]); TRACE_CAT ("HRDTransceiver", "for dropdown" << dropdown_names_[dropdown]);

5
UDPExamples/ClientWidget.cpp
View File

@ -415,8 +415,9 @@ void ClientWidget::update_status (QString const& id, Frequency f, QString const&
case 2: special = "[EU VHF]"; break; case 2: special = "[EU VHF]"; break;
case 3: special = "[FD]"; break; case 3: special = "[FD]"; break;
case 4: special = "[RTTY RU]"; break; case 4: special = "[RTTY RU]"; break;
case 5: special = "[Fox]"; break; case 5: special = "[WW DIGI]"; break;
case 6: special = "[Hound]"; break; case 6: special = "[Fox]"; break;
case 7: special = "[Hound]"; break;
default: break; default: break;
} }
de_label_->setText (de_call.size () >= 0 ? QString {"DE: %1%2%3"}.arg (de_call) de_label_->setText (de_call.size () >= 0 ? QString {"DE: %1%2%3"}.arg (de_call)

4
Versions.cmake
View File

@ -1,6 +1,6 @@
# Version number components # Version number components
set (WSJTX_VERSION_MAJOR 2) set (WSJTX_VERSION_MAJOR 2)
set (WSJTX_VERSION_MINOR 2) set (WSJTX_VERSION_MINOR 2)
set (WSJTX_VERSION_PATCH 0) set (WSJTX_VERSION_PATCH 1)
set (WSJTX_RC 4) # release candidate number, comment out or zero for development versions #set (WSJTX_RC 1) # release candidate number, comment out or zero for development versions
set (WSJTX_VERSION_IS_RELEASE 1) # set to 1 for final release build set (WSJTX_VERSION_IS_RELEASE 1) # set to 1 for final release build

110
translations/wsjtx_ca.ts
View File

@ -21,7 +21,7 @@
<source>Are you sure you want to delete the %n selected QSO(s) from the log?</source> <source>Are you sure you want to delete the %n selected QSO(s) from the log?</source>
<translatorcomment>sorry i don&apos;t understand how to fix this</translatorcomment> <translatorcomment>sorry i don&apos;t understand how to fix this</translatorcomment>
<translation> <translation>
<numerusform>Segur que vols esborrar els %n QSO&apos;s seleccionats del registre ?</numerusform> <numerusform>Segur que vols esborrar els %n QSO&apos;s seleccionats del log ?</numerusform>
<numerusform></numerusform> <numerusform></numerusform>
</translation> </translation>
</message> </message>
@ -251,7 +251,7 @@
<message> <message>
<location filename="../widgets/CabrilloLogWindow.ui" line="14"/> <location filename="../widgets/CabrilloLogWindow.ui" line="14"/>
<source>Contest Log</source> <source>Contest Log</source>
<translation>Registre de Concurs</translation> <translation>Log de Concurs</translation>
</message> </message>
<message> <message>
<location filename="../widgets/CabrilloLogWindow.ui" line="20"/> <location filename="../widgets/CabrilloLogWindow.ui" line="20"/>
@ -604,7 +604,7 @@ Format:
<message> <message>
<location filename="../Configuration.cpp" line="2514"/> <location filename="../Configuration.cpp" line="2514"/>
<source>Save Directory</source> <source>Save Directory</source>
<translation>Desa el directori</translation> <translation>Directori de Guardar</translation>
</message> </message>
<message> <message>
<location filename="../Configuration.cpp" line="2528"/> <location filename="../Configuration.cpp" line="2528"/>
@ -1269,7 +1269,7 @@ Error: %2 - %3</translation>
<message> <message>
<location filename="../widgets/ExportCabrillo.cpp" line="80"/> <location filename="../widgets/ExportCabrillo.cpp" line="80"/>
<source>Cabrillo Log (*.cbr)</source> <source>Cabrillo Log (*.cbr)</source>
<translation>Registre Cabrillo (*.cbr)</translation> <translation>Log Cabrillo (*.cbr)</translation>
</message> </message>
<message> <message>
<location filename="../widgets/ExportCabrillo.cpp" line="105"/> <location filename="../widgets/ExportCabrillo.cpp" line="105"/>
@ -1354,7 +1354,7 @@ Error: %2 - %3</translation>
<message> <message>
<location filename="../widgets/FoxLogWindow.ui" line="17"/> <location filename="../widgets/FoxLogWindow.ui" line="17"/>
<source>Fox Log</source> <source>Fox Log</source>
<translation>Registre Guineu</translation> <translation>Log Fox</translation>
</message> </message>
<message> <message>
<location filename="../widgets/FoxLogWindow.ui" line="26"/> <location filename="../widgets/FoxLogWindow.ui" line="26"/>
@ -1396,7 +1396,7 @@ Error: %2 - %3</translation>
<message> <message>
<location filename="../widgets/FoxLogWindow.cpp" line="61"/> <location filename="../widgets/FoxLogWindow.cpp" line="61"/>
<source>ADIF Log (*.adi)</source> <source>ADIF Log (*.adi)</source>
<translation>Registre ADIF (*.adi)</translation> <translation>Log ADIF (*.adi)</translation>
</message> </message>
<message> <message>
<location filename="../widgets/FoxLogWindow.cpp" line="73"/> <location filename="../widgets/FoxLogWindow.cpp" line="73"/>
@ -1421,7 +1421,7 @@ Error: %2 - %3</translation>
<message> <message>
<location filename="../widgets/FoxLogWindow.cpp" line="85"/> <location filename="../widgets/FoxLogWindow.cpp" line="85"/>
<source>Are you sure you want to erase file FoxQSO.txt and start a new Fox log?</source> <source>Are you sure you want to erase file FoxQSO.txt and start a new Fox log?</source>
<translation>Estàs segur que vols esborrar el fitxer FoxQSO.txt i començar un nou registre de FOX (Guineu)?</translation> <translation>Estàs segur que vols esborrar el fitxer FoxQSO.txt i començar un log nou de FOX ?</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1875,7 +1875,7 @@ Error: %2 - %3</translation>
<message> <message>
<location filename="../widgets/logqso.cpp" line="172"/> <location filename="../widgets/logqso.cpp" line="172"/>
<source>Log file error</source> <source>Log file error</source>
<translation>Error al fitxer de registre</translation> <translation>Error al fitxer de log</translation>
</message> </message>
<message> <message>
<location filename="../widgets/logqso.cpp" line="173"/> <location filename="../widgets/logqso.cpp" line="173"/>
@ -1979,7 +1979,7 @@ Error(%2): %3</translation>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="343"/> <location filename="../widgets/mainwindow.ui" line="343"/>
<source>Enter this QSO in log</source> <source>Enter this QSO in log</source>
<translation>Introdueix aquest QSO al registre</translation> <translation>Introdueix aquest QSO al log</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="346"/> <location filename="../widgets/mainwindow.ui" line="346"/>
@ -1994,7 +1994,7 @@ Error(%2): %3</translation>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="362"/> <location filename="../widgets/mainwindow.ui" line="362"/>
<source>&amp;Stop</source> <source>&amp;Stop</source>
<translation>&amp;Atura</translation> <translation>&amp;Aturar</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="375"/> <location filename="../widgets/mainwindow.ui" line="375"/>
@ -2019,7 +2019,7 @@ Error(%2): %3</translation>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="414"/> <location filename="../widgets/mainwindow.ui" line="414"/>
<source>&amp;Erase</source> <source>&amp;Erase</source>
<translation>&amp;Esborra</translation> <translation>&amp;Esborrar</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="424"/> <location filename="../widgets/mainwindow.ui" line="424"/>
@ -2145,7 +2145,7 @@ en Groc quan és massa baix</translation>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="846"/> <location filename="../widgets/mainwindow.ui" line="846"/>
<source>Search for callsign in database</source> <source>Search for callsign in database</source>
<translation>Buscar el indicatiu a la base de dades</translation> <translation>Buscar l&apos;indicatiu a la base de dades</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="849"/> <location filename="../widgets/mainwindow.ui" line="849"/>
@ -2431,7 +2431,7 @@ No està disponible per als titulars de indicatiu no estàndard.</translation>
<location filename="../widgets/mainwindow.ui" line="1394"/> <location filename="../widgets/mainwindow.ui" line="1394"/>
<location filename="../widgets/mainwindow.cpp" line="5863"/> <location filename="../widgets/mainwindow.cpp" line="5863"/>
<source>Fox</source> <source>Fox</source>
<translation>Guineu</translation> <translation>Fox</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="1404"/> <location filename="../widgets/mainwindow.ui" line="1404"/>
@ -3128,7 +3128,7 @@ La llista es pot mantenir a la configuració (F2).</translation>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="2904"/> <location filename="../widgets/mainwindow.ui" line="2904"/>
<source>Configuration</source> <source>Configuration</source>
<translation>Configuració</translation> <translation>Ajustos</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="2907"/> <location filename="../widgets/mainwindow.ui" line="2907"/>
@ -3168,12 +3168,12 @@ La llista es pot mantenir a la configuració (F2).</translation>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="2938"/> <location filename="../widgets/mainwindow.ui" line="2938"/>
<source>Shift+F6</source> <source>Shift+F6</source>
<translation>Shift+F6</translation> <translation>Majúscules+F6</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="2943"/> <location filename="../widgets/mainwindow.ui" line="2943"/>
<source>Delete all *.wav &amp;&amp; *.c2 files in SaveDir</source> <source>Delete all *.wav &amp;&amp; *.c2 files in SaveDir</source>
<translation>Esborra tots els fitxers *.wav &amp;&amp; *.c2 del directori Guardar</translation> <translation>Esborrar tots els fitxers *.wav i *.c2</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="2965"/> <location filename="../widgets/mainwindow.ui" line="2965"/>
@ -3228,12 +3228,12 @@ La llista es pot mantenir a la configuració (F2).</translation>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3045"/> <location filename="../widgets/mainwindow.ui" line="3045"/>
<source>Erase ALL.TXT</source> <source>Erase ALL.TXT</source>
<translation>Esborrar ALL.TXT</translation> <translation>Esborrar el fitxer ALL.TXT</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3050"/> <location filename="../widgets/mainwindow.ui" line="3050"/>
<source>Erase wsjtx_log.adi</source> <source>Erase wsjtx_log.adi</source>
<translation>Esborrar wsjt_lg.adi</translation> <translation>Esborrar el fitxer wsjt_log.adi</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3058"/> <location filename="../widgets/mainwindow.ui" line="3058"/>
@ -3248,7 +3248,7 @@ La llista es pot mantenir a la configuració (F2).</translation>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3074"/> <location filename="../widgets/mainwindow.ui" line="3074"/>
<source>Prompt me to log QSO</source> <source>Prompt me to log QSO</source>
<translation>Inclòure el QSO al registre</translation> <translation>Inclòure el QSO al log</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3082"/> <location filename="../widgets/mainwindow.ui" line="3082"/>
@ -3285,7 +3285,7 @@ La llista es pot mantenir a la configuració (F2).</translation>
<location filename="../widgets/mainwindow.ui" line="3125"/> <location filename="../widgets/mainwindow.ui" line="3125"/>
<location filename="../widgets/mainwindow.cpp" line="8102"/> <location filename="../widgets/mainwindow.cpp" line="8102"/>
<source>Runaway Tx watchdog</source> <source>Runaway Tx watchdog</source>
<translation>Vigilant de fugida TX</translation> <translation>Seguretat de TX</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3133"/> <location filename="../widgets/mainwindow.ui" line="3133"/>
@ -3345,7 +3345,7 @@ La llista es pot mantenir a la configuració (F2).</translation>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3209"/> <location filename="../widgets/mainwindow.ui" line="3209"/>
<source>Open log directory</source> <source>Open log directory</source>
<translation>Obre el directori del registre</translation> <translation>Obre el directori del log</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3217"/> <location filename="../widgets/mainwindow.ui" line="3217"/>
@ -3410,7 +3410,7 @@ La llista es pot mantenir a la configuració (F2).</translation>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3289"/> <location filename="../widgets/mainwindow.ui" line="3289"/>
<source>&amp;Download Samples ...</source> <source>&amp;Download Samples ...</source>
<translation>&amp;Descarregueu mostres ...</translation> <translation>&amp;Descarrega mostres ...</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3292"/> <location filename="../widgets/mainwindow.ui" line="3292"/>
@ -3501,12 +3501,12 @@ La llista es pot mantenir a la configuració (F2).</translation>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3414"/> <location filename="../widgets/mainwindow.ui" line="3414"/>
<source>Shift+F1</source> <source>Shift+F1</source>
<translation>Shift+F1</translation> <translation>Majúscules+F1</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3422"/> <location filename="../widgets/mainwindow.ui" line="3422"/>
<source>Fox log</source> <source>Fox log</source>
<translation>Log Guineu</translation> <translation>Log Fox</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3427"/> <location filename="../widgets/mainwindow.ui" line="3427"/>
@ -3516,7 +3516,7 @@ La llista es pot mantenir a la configuració (F2).</translation>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3432"/> <location filename="../widgets/mainwindow.ui" line="3432"/>
<source>Reset Cabrillo log ...</source> <source>Reset Cabrillo log ...</source>
<translation>Restableix el registre de Cabrillo ...</translation> <translation>Restableix el log de Cabrillo ...</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3437"/> <location filename="../widgets/mainwindow.ui" line="3437"/>
@ -3526,12 +3526,12 @@ La llista es pot mantenir a la configuració (F2).</translation>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3442"/> <location filename="../widgets/mainwindow.ui" line="3442"/>
<source>Contest Log</source> <source>Contest Log</source>
<translation>Registre de Concurs</translation> <translation>Log de Concurs</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3447"/> <location filename="../widgets/mainwindow.ui" line="3447"/>
<source>Export Cabrillo log ...</source> <source>Export Cabrillo log ...</source>
<translation>Exporta el registre de Cabrillo ...</translation> <translation>Exporta el log de Cabrillo ...</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3452"/> <location filename="../widgets/mainwindow.ui" line="3452"/>
@ -3541,7 +3541,7 @@ La llista es pot mantenir a la configuració (F2).</translation>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3457"/> <location filename="../widgets/mainwindow.ui" line="3457"/>
<source>Contest log</source> <source>Contest log</source>
<translation>Registre de Concurs</translation> <translation>Log de Concurs</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3462"/> <location filename="../widgets/mainwindow.ui" line="3462"/>
@ -3573,12 +3573,12 @@ La llista es pot mantenir a la configuració (F2).</translation>
<message> <message>
<location filename="../widgets/mainwindow.cpp" line="497"/> <location filename="../widgets/mainwindow.cpp" line="497"/>
<source>Error Scanning ADIF Log</source> <source>Error Scanning ADIF Log</source>
<translation>Error d&apos;escaneig del registre ADIF</translation> <translation>Error d&apos;escaneig del log ADIF</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.cpp" line="501"/> <location filename="../widgets/mainwindow.cpp" line="501"/>
<source>Scanned ADIF log, %1 worked before records created</source> <source>Scanned ADIF log, %1 worked before records created</source>
<translation>Registre ADIF escanejat, %1 funcionava abans de la creació de registres</translation> <translation>Log ADIF escanejat, %1 funcionava abans de la creació de registres</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.cpp" line="619"/> <location filename="../widgets/mainwindow.cpp" line="619"/>
@ -3818,12 +3818,12 @@ La llista es pot mantenir a la configuració (F2).</translation>
<message> <message>
<location filename="../widgets/mainwindow.cpp" line="3622"/> <location filename="../widgets/mainwindow.cpp" line="3622"/>
<source>Please choose another dial frequency. WSJT-X will not operate in Fox mode in the standard FT8 sub-bands.</source> <source>Please choose another dial frequency. WSJT-X will not operate in Fox mode in the standard FT8 sub-bands.</source>
<translation>Tria una altra freqüència de treball. WSJT-X no funcionarà en mode Guineu a les sub-bandes FT8 estàndard.</translation> <translation>Tria una altra freqüència de treball. WSJT-X no funcionarà en mode Fox a les sub-bandes FT8 estàndard.</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.cpp" line="3626"/> <location filename="../widgets/mainwindow.cpp" line="3626"/>
<source>Fox Mode warning</source> <source>Fox Mode warning</source>
<translation>Avís de mode Guineu</translation> <translation>Avís de mode Fox</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.cpp" line="4216"/> <location filename="../widgets/mainwindow.cpp" line="4216"/>
@ -3884,7 +3884,7 @@ ja és a CALL3.TXT, vols substituir-lo ?</translation>
<message> <message>
<location filename="../widgets/mainwindow.cpp" line="5657"/> <location filename="../widgets/mainwindow.cpp" line="5657"/>
<source>Log file error</source> <source>Log file error</source>
<translation>Error al fitxer de registre</translation> <translation>Error al fitxer de log</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.cpp" line="5658"/> <location filename="../widgets/mainwindow.cpp" line="5658"/>
@ -3894,7 +3894,7 @@ ja és a CALL3.TXT, vols substituir-lo ?</translation>
<message> <message>
<location filename="../widgets/mainwindow.cpp" line="5674"/> <location filename="../widgets/mainwindow.cpp" line="5674"/>
<source>Error sending log to N1MM</source> <source>Error sending log to N1MM</source>
<translation>Error al enviar el registre a N1MM</translation> <translation>Error al enviar el log a N1MM</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.cpp" line="5675"/> <location filename="../widgets/mainwindow.cpp" line="5675"/>
@ -3937,17 +3937,17 @@ ja és a CALL3.TXT, vols substituir-lo ?</translation>
<message> <message>
<location filename="../widgets/mainwindow.cpp" line="6476"/> <location filename="../widgets/mainwindow.cpp" line="6476"/>
<source>Are you sure you want to erase your contest log?</source> <source>Are you sure you want to erase your contest log?</source>
<translation>Estàs segur que vols esborrar el registre del concurs ?</translation> <translation>Estàs segur que vols esborrar el log del concurs ?</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.cpp" line="6477"/> <location filename="../widgets/mainwindow.cpp" line="6477"/>
<source>Doing this will remove all QSO records for the current contest. They will be kept in the ADIF log file but will not be available for export in your Cabrillo log.</source> <source>Doing this will remove all QSO records for the current contest. They will be kept in the ADIF log file but will not be available for export in your Cabrillo log.</source>
<translation>Si fas això, suprimiràs tots els registres de QSO del concurs actual. Es conservaran al fitxer de registre ADIF, però no es podran exportar al registre de Cabrillo.</translation> <translation>Si fas això, suprimiràs tots els registres de QSO del concurs actual. Es conservaran al fitxer de log ADIF, però no es podran exportar al log de Cabrillo.</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.cpp" line="6490"/> <location filename="../widgets/mainwindow.cpp" line="6490"/>
<source>Cabrillo Log saved</source> <source>Cabrillo Log saved</source>
<translation>Registre Cabrillo desat</translation> <translation>Log Cabrillo desat</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.cpp" line="6498"/> <location filename="../widgets/mainwindow.cpp" line="6498"/>
@ -4015,7 +4015,7 @@ UDP server %2:%3</translation>
<location filename="../widgets/mainwindow.cpp" line="8179"/> <location filename="../widgets/mainwindow.cpp" line="8179"/>
<location filename="../widgets/mainwindow.cpp" line="8859"/> <location filename="../widgets/mainwindow.cpp" line="8859"/>
<source>Log File Error</source> <source>Log File Error</source>
<translation>Error al fitxer de registre</translation> <translation>Error al fitxer de log</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.cpp" line="8222"/> <location filename="../widgets/mainwindow.cpp" line="8222"/>
@ -4498,7 +4498,7 @@ Error(%2): %3</translation>
<message> <message>
<location filename="../models/StationList.cpp" line="364"/> <location filename="../models/StationList.cpp" line="364"/>
<source>Band</source> <source>Band</source>
<translation>Manda</translation> <translation>Banda</translation>
</message> </message>
<message> <message>
<location filename="../models/StationList.cpp" line="365"/> <location filename="../models/StationList.cpp" line="365"/>
@ -4883,7 +4883,7 @@ Error(%2): %3</translation>
<message> <message>
<location filename="../Configuration.ui" line="329"/> <location filename="../Configuration.ui" line="329"/>
<source>Tx watchdog:</source> <source>Tx watchdog:</source>
<translation>TX vigilant:</translation> <translation>Seguretat de TX:</translation>
</message> </message>
<message> <message>
<location filename="../Configuration.ui" line="339"/> <location filename="../Configuration.ui" line="339"/>
@ -5482,7 +5482,7 @@ channels; then you will usually want to select mono or
both here.</source> both here.</source>
<translation>Selecciona el canal d&apos;àudio que s&apos;utilitza per a la transmissió. <translation>Selecciona el canal d&apos;àudio que s&apos;utilitza per a la transmissió.
A menys de que tinguis diversos equips connectats a diferents A menys de que tinguis diversos equips connectats a diferents
canals, llavors normalment voldras seleccionar mono o canals, llavors normalment voldràs seleccionar mono o
els dos canals.</translation> els dos canals.</translation>
</message> </message>
<message> <message>
@ -5494,7 +5494,7 @@ els dos canals.</translation>
<location filename="../Configuration.ui" line="1465"/> <location filename="../Configuration.ui" line="1465"/>
<location filename="../Configuration.ui" line="1468"/> <location filename="../Configuration.ui" line="1468"/>
<source>Save Directory</source> <source>Save Directory</source>
<translation>Desa el directori</translation> <translation>Directori de Guardar</translation>
</message> </message>
<message> <message>
<location filename="../Configuration.ui" line="1474"/> <location filename="../Configuration.ui" line="1474"/>
@ -5605,7 +5605,7 @@ Fes clic, MAJÚ + clic i, CTRL+clic per seleccionar els elements.</translation>
<message> <message>
<location filename="../Configuration.ui" line="1695"/> <location filename="../Configuration.ui" line="1695"/>
<source>Reporting and logging settings</source> <source>Reporting and logging settings</source>
<translation>Configuració d&apos;informes i registre</translation> <translation>Configuració d&apos;informes i registres</translation>
</message> </message>
<message> <message>
<location filename="../Configuration.ui" line="1701"/> <location filename="../Configuration.ui" line="1701"/>
@ -5615,7 +5615,7 @@ Fes clic, MAJÚ + clic i, CTRL+clic per seleccionar els elements.</translation>
<message> <message>
<location filename="../Configuration.ui" line="1707"/> <location filename="../Configuration.ui" line="1707"/>
<source>The program will pop up a partially completed Log QSO dialog when you send a 73 or free text message.</source> <source>The program will pop up a partially completed Log QSO dialog when you send a 73 or free text message.</source>
<translation>El programa apareixerà un diàleg de QSO de registre parcialment completat quan envieu un missatge de text 73 o lliure.</translation> <translation>El programa apareixerà un diàleg de QSO de registre parcialment completat quan enviïs un missatge de text 73 o lliure.</translation>
</message> </message>
<message> <message>
<location filename="../Configuration.ui" line="1710"/> <location filename="../Configuration.ui" line="1710"/>
@ -5633,8 +5633,8 @@ Fes clic, MAJÚ + clic i, CTRL+clic per seleccionar els elements.</translation>
saved by this program. saved by this program.
Check this option to save the sent and received reports in the Check this option to save the sent and received reports in the
comments field.</source> comments field.</source>
<translation>Alguns programes de registre no acceptaran el tipus d’informes <translation>Alguns programes de log no acceptaran el tipus d’informes
desat per aquest programa. desats per aquest programa.
Comprova aquesta opció per desar els informes enviats i rebuts Comprova aquesta opció per desar els informes enviats i rebuts
al camp de comentaris.</translation> al camp de comentaris.</translation>
</message> </message>
@ -5648,17 +5648,17 @@ al camp de comentaris.</translation>
<source>Check this option to force the clearing of the DX Call <source>Check this option to force the clearing of the DX Call
and DX Grid fields when a 73 or free text message is sent.</source> and DX Grid fields when a 73 or free text message is sent.</source>
<translation>Marca aquesta opció per a forçar l&apos;eliminació dels camps <translation>Marca aquesta opció per a forçar l&apos;eliminació dels camps
Crida de DX i Locator DX quan s’envia un missatge de text 73 o lliure.</translation> Indicatiu DX i Locator DX quan s’envia un missatge de text 73 o lliure.</translation>
</message> </message>
<message> <message>
<location filename="../Configuration.ui" line="1757"/> <location filename="../Configuration.ui" line="1757"/>
<source>Clear &amp;DX call and grid after logging</source> <source>Clear &amp;DX call and grid after logging</source>
<translation>Buida les graelles Crida i &amp;DX després del registre</translation> <translation>Buida les graelles Indicatiu DX i Locator&amp;DX després del registre</translation>
</message> </message>
<message> <message>
<location filename="../Configuration.ui" line="1764"/> <location filename="../Configuration.ui" line="1764"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Some logging programs will not accept WSJT-X mode names.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Some logging programs will not accept WSJT-X mode names.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Alguns programes de registre no accepten noms del mode WSJT-X.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Alguns programes de log no accepten noms del mode WSJT-X.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location filename="../Configuration.ui" line="1767"/> <location filename="../Configuration.ui" line="1767"/>
@ -5678,7 +5678,7 @@ Crida de DX i Locator DX quan s’envia un missatge de text 73 o lliure.</transl
<message> <message>
<location filename="../Configuration.ui" line="1784"/> <location filename="../Configuration.ui" line="1784"/>
<source>Log automatically (contesting only)</source> <source>Log automatically (contesting only)</source>
<translation>Registre automàtic (només concurs)</translation> <translation>Log automàtic (només concurs)</translation>
</message> </message>
<message> <message>
<location filename="../Configuration.ui" line="1801"/> <location filename="../Configuration.ui" line="1801"/>
@ -5799,7 +5799,7 @@ per avaluar la propagació i el rendiment del sistema.</translation>
<message> <message>
<location filename="../Configuration.ui" line="1992"/> <location filename="../Configuration.ui" line="1992"/>
<source>Default frequencies and band specific station details setup</source> <source>Default frequencies and band specific station details setup</source>
<translation>Configuració predeterminada de les freqüències i banda amb detalls específics de l&apos;estació</translation> <translation>Configuració predeterminada de les freqüències i bandes amb detalls específics de l&apos;estació</translation>
</message> </message>
<message> <message>
<location filename="../Configuration.ui" line="1998"/> <location filename="../Configuration.ui" line="1998"/>
@ -5871,7 +5871,7 @@ Fes clic amb el botó dret per a les opcions d&apos;inserció i eliminació.</tr
<message> <message>
<location filename="../Configuration.ui" line="2231"/> <location filename="../Configuration.ui" line="2231"/>
<source>Rescan ADIF Log</source> <source>Rescan ADIF Log</source>
<translation>Escaneig de nou el registre ADIF</translation> <translation>Escaneig de nou el log ADIF</translation>
</message> </message>
<message> <message>
<location filename="../Configuration.ui" line="2240"/> <location filename="../Configuration.ui" line="2240"/>
@ -5931,7 +5931,7 @@ Fes clic amb el botó dret per a les opcions d&apos;inserció i eliminació.</tr
<message> <message>
<location filename="../Configuration.ui" line="2338"/> <location filename="../Configuration.ui" line="2338"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;URL of the ARRL LotW user&apos;s last upload dates and times data file which is used to highlight decodes from stations that are known to upload their log file to LotW.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;URL of the ARRL LotW user&apos;s last upload dates and times data file which is used to highlight decodes from stations that are known to upload their log file to LotW.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;URL de l&apos;últim fitxer de dades de dates i hores de càrrega de ARRL LotW que s&apos;utilitza per ressaltar descodificacions d&apos;estacions que se sap que carreguen el seu arxiu de registre a LotW.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;URL de l&apos;últim fitxer de dades de dates i hores de càrrega de ARRL LotW que s&apos;utilitza per ressaltar descodificacions d&apos;estacions que se sap que carreguen el seu arxiu de log a LotW.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location filename="../Configuration.ui" line="2341"/> <location filename="../Configuration.ui" line="2341"/>
@ -6031,12 +6031,12 @@ Fes clic amb el botó dret per a les opcions d&apos;inserció i eliminació.</tr
<message> <message>
<location filename="../Configuration.ui" line="2540"/> <location filename="../Configuration.ui" line="2540"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;FT8 DXpedition mode: Fox (DXpedition) operator.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;FT8 DXpedition mode: Fox (DXpedition) operator.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Mode FT8 DXpedition: operador Guineu (DXpedition).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Mode FT8 DXpedition: operador Fox (DXpedition).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location filename="../Configuration.ui" line="2543"/> <location filename="../Configuration.ui" line="2543"/>
<source>Fox</source> <source>Fox</source>
<translation>Guineu</translation> <translation>Fox</translation>
</message> </message>
<message> <message>
<location filename="../Configuration.ui" line="2562"/> <location filename="../Configuration.ui" line="2562"/>

829
translations/wsjtx_es.ts
View File

File diff suppressed because it is too large Load Diff

6306
translations/wsjtx_it.ts Normal file
View File

File diff suppressed because it is too large Load Diff

581
translations/wsjtx_ja.ts
View File

File diff suppressed because it is too large Load Diff

19
widgets/displaytext.cpp
View File

@ -13,7 +13,6 @@
#include <QListIterator> #include <QListIterator>
#include <QRegularExpression> #include <QRegularExpression>
#include <QScrollBar> #include <QScrollBar>
#include <QDebug>
#include "Configuration.hpp" #include "Configuration.hpp"
#include "Network/LotWUsers.hpp" #include "Network/LotWUsers.hpp"
@ -126,8 +125,6 @@ namespace
void DisplayText::appendText(QString const& text, QColor bg, QColor fg void DisplayText::appendText(QString const& text, QColor bg, QColor fg
, QString const& call1, QString const& call2) , QString const& call1, QString const& call2)
{ {
// qDebug () << "DisplayText::appendText: text:" << text << "Nbsp pos:" << text.indexOf (QChar::Nbsp);
auto cursor = textCursor (); auto cursor = textCursor ();
cursor.movePosition (QTextCursor::End); cursor.movePosition (QTextCursor::End);
auto block_format = cursor.blockFormat (); auto block_format = cursor.blockFormat ();
@ -548,12 +545,18 @@ namespace
void DisplayText::highlight_callsign (QString const& callsign, QColor const& bg, void DisplayText::highlight_callsign (QString const& callsign, QColor const& bg,
QColor const& fg, bool last_period_only) QColor const& fg, bool last_period_only)
{ {
// qDebug () << "DisplayText::highlight_callsign: callsign:" << callsign << "last period:" << last_period_only;
if (!callsign.size ()) if (!callsign.size ())
{ {
return; return;
} }
QRegularExpression target {QString {"<?"} + callsign + QString {">?"}, QRegularExpression::DontCaptureOption}; auto regexp = callsign;
// allow for hashed callsigns and escape any regexp metacharacters
QRegularExpression target {QString {"<?"}
+ regexp.replace (QLatin1Char {'+'}, QLatin1String {"\\+"})
.replace (QLatin1Char {'.'}, QLatin1String {"\\."})
.replace (QLatin1Char {'?'}, QLatin1String {"\\?"})
+ QString {">?"}
, QRegularExpression::DontCaptureOption};
QTextCharFormat old_format {currentCharFormat ()}; QTextCharFormat old_format {currentCharFormat ()};
QTextCursor cursor {document ()}; QTextCursor cursor {document ()};
if (last_period_only) if (last_period_only)
@ -568,10 +571,10 @@ void DisplayText::highlight_callsign (QString const& callsign, QColor const& bg,
{ {
period_start = prior; period_start = prior;
} }
while (!cursor.isNull () && cursor > period_start) cursor = period_start;
while (!cursor.isNull ())
{ {
cursor = document ()->find (target, cursor cursor = document ()->find (target, cursor, QTextDocument::FindWholeWords);
, QTextDocument::FindBackward | QTextDocument::FindWholeWords);
if (!cursor.isNull () && cursor.hasSelection ()) if (!cursor.isNull () && cursor.hasSelection ())
{ {
if (bg.isValid () || fg.isValid ()) if (bg.isValid () || fg.isValid ())

31
widgets/mainwindow.cpp
View File

@ -812,7 +812,8 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
char const * const power[] = {"1 mW","2 mW","5 mW","10 mW","20 mW","50 mW","100 mW","200 mW","500 mW", char const * const power[] = {"1 mW","2 mW","5 mW","10 mW","20 mW","50 mW","100 mW","200 mW","500 mW",
"1 W","2 W","5 W","10 W","20 W","50 W","100 W","200 W","500 W","1 kW"}; "1 W","2 W","5 W","10 W","20 W","50 W","100 W","200 W","500 W","1 kW"};
for(auto i = 0u; i < sizeof power / sizeof power[0]; ++i) { //Initialize dBm values for(auto i = 0u; i < sizeof power / sizeof power[0]; ++i) { //Initialize dBm values
ui->TxPowerComboBox->addItem (QString {"%1 dBm %2"}.arg (int ((10. * i / 3.) + .5)).arg (power[i])); auto dBm = int ((10. * i / 3.) + .5);
ui->TxPowerComboBox->addItem (QString {"%1 dBm %2"}.arg (dBm).arg (power[i]), dBm);
} }
m_dateTimeRcvdRR73=QDateTime::currentDateTimeUtc(); m_dateTimeRcvdRR73=QDateTime::currentDateTimeUtc();
@ -2065,7 +2066,7 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
break; break;
case Qt::Key_L: case Qt::Key_L:
if(e->modifiers() & Qt::ControlModifier) { if(e->modifiers() & Qt::ControlModifier) {
lookup(); lookup(true);
genStdMsgs(m_rpt); genStdMsgs(m_rpt);
return; return;
} }
@ -4912,12 +4913,10 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
// i.e. compound version of same base call // i.e. compound version of same base call
ui->dxCallEntry->setText (hiscall); ui->dxCallEntry->setText (hiscall);
} }
if (hisgrid.contains (grid_regexp)) { if (hisgrid.contains (grid_regexp)) {
if(ui->dxGridEntry->text().mid(0,4) != hisgrid) ui->dxGridEntry->setText(hisgrid); if(ui->dxGridEntry->text().mid(0,4) != hisgrid) ui->dxGridEntry->setText(hisgrid);
} }
if (!ui->dxGridEntry->text ().size ()) lookup(false);
lookup();
m_hisGrid = ui->dxGridEntry->text(); m_hisGrid = ui->dxGridEntry->text();
QString rpt = message.report(); QString rpt = message.report();
@ -5325,9 +5324,10 @@ void MainWindow::clearDX ()
m_QSOProgress = CALLING; m_QSOProgress = CALLING;
} }
void MainWindow::lookup() //lookup() void MainWindow::lookup(bool lookupButtonClicked)
{ {
QString hisCall {ui->dxCallEntry->text()}; QString hisCall {ui->dxCallEntry->text()};
QString hisgrid0 {ui->dxGridEntry->text()};
if (!hisCall.size ()) return; if (!hisCall.size ()) return;
QFile f {m_config.writeable_data_dir ().absoluteFilePath ("CALL3.TXT")}; QFile f {m_config.writeable_data_dir ().absoluteFilePath ("CALL3.TXT")};
if (f.open (QIODevice::ReadOnly | QIODevice::Text)) if (f.open (QIODevice::ReadOnly | QIODevice::Text))
@ -5337,7 +5337,13 @@ void MainWindow::lookup() //lookup()
for(int i=0; i<999999; i++) { for(int i=0; i<999999; i++) {
n=f.readLine(c,sizeof(c)); n=f.readLine(c,sizeof(c));
if(n <= 0) { if(n <= 0) {
ui->dxGridEntry->clear (); if(lookupButtonClicked) {
QString msg=hisCall + tr(" not found in CALL3.TXT");
MessageBox::information_message (this, msg);
}
if(!hisgrid0.contains(grid_regexp)) {
ui->dxGridEntry->clear();
}
break; break;
} }
QString t=QString(c); QString t=QString(c);
@ -5348,9 +5354,11 @@ void MainWindow::lookup() //lookup()
if(i1>0) { if(i1>0) {
hisgrid=hisgrid.mid(0,4); hisgrid=hisgrid.mid(0,4);
} else { } else {
hisgrid=hisgrid.mid(0,4) + hisgrid.mid(4,2).toLower(); hisgrid=hisgrid.mid(0,6).toUpper();
} }
if(hisgrid.left(4)==hisgrid0.left(4) or (hisgrid0.size()==0)) {
ui->dxGridEntry->setText(hisgrid); ui->dxGridEntry->setText(hisgrid);
}
break; break;
} }
} }
@ -5360,7 +5368,7 @@ void MainWindow::lookup() //lookup()
void MainWindow::on_lookupButton_clicked() //Lookup button void MainWindow::on_lookupButton_clicked() //Lookup button
{ {
lookup(); lookup(true);
} }
void MainWindow::on_addButton_clicked() //Add button void MainWindow::on_addButton_clicked() //Add button
@ -7781,10 +7789,9 @@ void MainWindow::uploadResponse(QString response)
} }
} }
void MainWindow::on_TxPowerComboBox_currentIndexChanged(const QString &arg1) void MainWindow::on_TxPowerComboBox_currentIndexChanged(int index)
{ {
int i1=arg1.indexOf(" "); m_dBm = ui->TxPowerComboBox->itemData (index).toInt ();
m_dBm=arg1.mid(0,i1).toInt();
} }
void MainWindow::on_sbTxPercent_valueChanged(int n) void MainWindow::on_sbTxPercent_valueChanged(int n)

4
widgets/mainwindow.h
View File

@ -276,7 +276,7 @@ private slots:
void on_actionWSPR_triggered(); void on_actionWSPR_triggered();
void on_actionWSPR_LF_triggered(); void on_actionWSPR_LF_triggered();
void on_syncSpinBox_valueChanged(int n); void on_syncSpinBox_valueChanged(int n);
void on_TxPowerComboBox_currentIndexChanged(const QString &arg1); void on_TxPowerComboBox_currentIndexChanged(int);
void on_sbTxPercent_valueChanged(int n); void on_sbTxPercent_valueChanged(int n);
void on_cbUploadWSPR_Spots_toggled(bool b); void on_cbUploadWSPR_Spots_toggled(bool b);
void WSPR_config(bool b); void WSPR_config(bool b);
@ -700,7 +700,7 @@ private:
void genStdMsgs(QString rpt, bool unconditional = false); void genStdMsgs(QString rpt, bool unconditional = false);
void genCQMsg(); void genCQMsg();
void clearDX (); void clearDX ();
void lookup(); void lookup(bool lookupButtonClicked);
void ba2msg(QByteArray ba, char* message); void ba2msg(QByteArray ba, char* message);
void msgtype(QString t, QLineEdit* tx); void msgtype(QString t, QLineEdit* tx);
void stub(); void stub();

20
widgets/widegraph.cpp
View File

@ -315,22 +315,28 @@ void WideGraph::setModeTx(QString modeTx) //setModeTx
ui->widePlot->update(); ui->widePlot->update();
} }
//Current-Cumulative-Yellow void WideGraph::on_spec2dComboBox_currentIndexChanged(int index)
void WideGraph::on_spec2dComboBox_currentIndexChanged(const QString &arg1)
{ {
ui->widePlot->setCurrent(false); ui->widePlot->setCurrent(false);
ui->widePlot->setCumulative(false); ui->widePlot->setCumulative(false);
ui->widePlot->setLinearAvg(false); ui->widePlot->setLinearAvg(false);
ui->widePlot->setReference(false); ui->widePlot->setReference(false);
ui->smoSpinBox->setEnabled(false); ui->smoSpinBox->setEnabled(false);
if(arg1=="Current") ui->widePlot->setCurrent(true); switch (index)
if(arg1=="Cumulative") ui->widePlot->setCumulative(true); {
if(arg1=="Linear Avg") { case 0: // Current
ui->widePlot->setCurrent(true);
break;
case 1: // Cumulative
ui->widePlot->setCumulative(true);
break;
case 2: // Linear Avg
ui->widePlot->setLinearAvg(true); ui->widePlot->setLinearAvg(true);
ui->smoSpinBox->setEnabled(true); ui->smoSpinBox->setEnabled(true);
} break;
if(arg1=="Reference") { case 3: // Reference
ui->widePlot->setReference(true); ui->widePlot->setReference(true);
break;
} }
replot(); replot();
} }

2
widgets/widegraph.h
View File

@ -68,7 +68,7 @@ protected:
private slots: private slots:
void on_waterfallAvgSpinBox_valueChanged(int arg1); void on_waterfallAvgSpinBox_valueChanged(int arg1);
void on_bppSpinBox_valueChanged(int arg1); void on_bppSpinBox_valueChanged(int arg1);
void on_spec2dComboBox_currentIndexChanged(const QString &arg1); void on_spec2dComboBox_currentIndexChanged(int);
void on_fSplitSpinBox_valueChanged(int n); void on_fSplitSpinBox_valueChanged(int n);
void on_fStartSpinBox_valueChanged(int n); void on_fStartSpinBox_valueChanged(int n);
void on_paletteComboBox_activated(const QString &palette); void on_paletteComboBox_activated(const QString &palette);