mirror
/
gridtracker
kopia lustrzana https://gitlab.com/gridtracker.org/gridtracker
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Squashed commits '${title}'

merge-requests/262/merge
T Loomis 2023-01-07 23:49:54 +00:00
rodzic 902bf6f79e
commit a7f5f1e3b2
18 zmienionych plików z 52 dodań i 57 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
LICENSE
Wyświetl plik

@ -1,7 +1,7 @@
BSD 3-Clause License
Copyright (c) 2018-2020 Stephen Tag Loomis
Copyright (c) 2018-2022 GridTricker.org
Copyright (c) 2018-2023 Stephen Loomis
Copyright (c) 2020-2023 GridTricker.org
All rights reserved.
Redistribution and use in source and binary forms, with or without

4
debian/copyright vendored
Wyświetl plik

@ -4,9 +4,9 @@ Upstream-Contact: GridTracker Team <contact@gridtracker.org>
Source: https://gitlab.com/gridtracker.org/gridtracker
Files: *
Copyright: Copyright (c) 2018-2020 by Tag Loomis, 2020-2022 by GridTracker.org
Copyright: Copyright (c) 2018-2023 Stephen Loomis, Copyright (c) 2020-2023 GridTracker.org
License: BSD-3-clause
Copyright (c) 2018-2022 GridTricker.org
Copyright (c) 2020-2023 GridTricker.org
All rights reserved.
.
Redistribution and use in source and binary forms, with or without

3
gridtracker.1
Wyświetl plik

@ -42,8 +42,7 @@ Run gridtracker, no arguments needed.
.SH COPYRIGHT
.PP
Copyright (c) 2018-2020 Stephen Tag Loomis. All rights reserved.
Copyright (c) 2020-2022 GridTracker.org. All rights reserved.
Copyright (c) 2020-2023 GridTracker.org. All rights reserved.
Released under BSD 3-Clause License
https://gridtracker.org

5
package.nw/GridTracker.html
Wyświetl plik

@ -1,6 +1,7 @@
<!DOCTYPE html>
<!--
GridTracker Copyright © 2018-2022 GridTracker.org
GridTracker Copyright © 2018-2023 Stephen Loomis
GridTracker Copyright © 2020-2023 GridTracker.org
All rights reserved.
Redistribution and use in source and binary forms, with or without
@ -3102,7 +3103,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<a href="#" style="cursor: pointer"
onclick="require('nw.gui').Shell.openExternal('https://gridtracker.org/grid-tracker/');">GridTracker.org!</a>
</p>
<p>Copyright &copy; 2022 GridTracker.org</p>
<p>Copyright &copy; 2023 GridTracker.org</p>
<img src="./gridview.png" /> <br />
</div>
</div>

2
package.nw/i18n/cn-t.json
Wyświetl plik

@ -461,7 +461,7 @@
"settings.about.FeatureList4": "天氣",
"settings.about.FeatureList5": "當前的太陽和空間條件和更多！",
"settings.about.HomepageLink": "了解更多關於",
"settings.about.Copyright": "版權所有；2022 GridTracker.org",
"settings.about.Copyright": "版權所有；2023 GridTracker.org",
"alertPopup.title": "新警報！！！",
"alertPopup.dismiss": "解除",
"updatePopup.newUpdate": "GridTracker已有新的版本！",

2
package.nw/i18n/cn.json
Wyświetl plik

@ -461,7 +461,7 @@
"settings.about.FeatureList4": "天气",
"settings.about.FeatureList5": "当前的太阳和空间条件和更多！",
"settings.about.HomepageLink": "了解更多关于",
"settings.about.Copyright": "版权所有；2022 GridTracker.org",
"settings.about.Copyright": "版权所有；2023 GridTracker.org",
"alertPopup.title": "新警报！！！",
"alertPopup.dismiss": "解除",
"updatePopup.newUpdate": "GridTracker已有新的版本！",

18
package.nw/lib/adif.js
Wyświetl plik

@ -1,4 +1,4 @@
// GridTracker Copyright © 2022 GridTracker.org
// GridTracker Copyright © 2023 GridTracker.org
// All rights reserved.
// See LICENSE for more information.
var g_fromDirectCallNoFileDialog = false;
@ -605,7 +605,7 @@ function getUTCString(d)
return Y + "-" + M + "-" + D + " " + h + ":" + m + ":" + s;
}
function lotwCallback(buffer, flag)
function lotwCallback(buffer, flag, cookies, url)
{
var rawAdiBuffer = String(buffer);
if (rawAdiBuffer.indexOf("password incorrect") > -1)
@ -630,12 +630,6 @@ function lotwCallback(buffer, flag)
// Extract header showing type of call
// var lotwQSHeader = rawAdiBuffer.match(/^<APP_LoTW_LAST(QSL|QSORX):\d+>(\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2})/m);
if (rawAdiBuffer.indexOf("QSL ONLY: YES") == -1)
{
// This is the QSO download, fire the QSL download now
nodeTimers.setTimeout(grabLoTWQSL, 500);
}
rawAdiBuffer = cleanAndPrepADIF(
adiFileName,
rawAdiBuffer,
@ -650,6 +644,12 @@ function lotwCallback(buffer, flag)
);
onAdiLoadComplete(rawAdiBuffer, true, adiFileName, true);
if (url.indexOf("qso_qsl=no") != -1)
{
// This is the QSO download, fire the QSL download now
nodeTimers.setTimeout(grabLoTWQSL, 500);
}
}
}
}
@ -1521,7 +1521,7 @@ function getABuffer(
if (typeof callback === "function")
{
// Call it, since we have confirmed it is callable
callback(fileBuffer, flag, cookies);
callback(fileBuffer, flag, cookies, file_url);
}
})
.on("error", function ()

2
package.nw/lib/alerts.js
Wyświetl plik

@ -1,4 +1,4 @@
// GridTracker Copyright © 2022 GridTracker.org
// GridTracker Copyright © 2023 GridTracker.org
// All rights reserved.
// See LICENSE for more information.

2
package.nw/lib/callsigns.js
Wyświetl plik

@ -1,4 +1,4 @@
// GridTracker Copyright © 2022 GridTracker.org
// GridTracker Copyright © 2023 GridTracker.org
// All rights reserved.
// See LICENSE for more information.

47
package.nw/lib/gt.js
Wyświetl plik

@ -1,4 +1,4 @@
// GridTracker Copyright © 2022 GridTracker.org
// GridTracker Copyright © 2023 GridTracker.org
// All rights reserved.
// See LICENSE for more information.
const pjson = require("./package.json");
@ -8197,15 +8197,18 @@ function showWorkedBox(sortIndex, nextPage, redraw)
var worker = "";
worker +=
"<table id='logTable' style='white-space:nowrap;overflow:auto;overflow-x;hidden;' class='darkTable' align=center>";
worker += "<tr>";
worker +=
"<th><input type='text' id='searchWB' style='margin:0px' class='inputTextValue' value='" +
g_searchWB +
"' size='8' oninput='window.opener.showWorkedSearchChanged(this);' / ></th>";
worker +=
"<th><input type='text' id='searchGrid' style='margin:0px' class='inputTextValue' value='" +
g_gridSearch +
"' size='6' oninput='window.opener.showWorkedSearchGrid(this);' / ></th>";
worker += "<tr><th><input type='text' id='searchWB' style='margin:0px' class='inputTextValue' value='" + g_searchWB + "' size='8' oninput='window.opener.showWorkedSearchChanged(this);' / >";
if (g_searchWB.length > 0)
{
worker += "<img title='Clear Callsign' onclick='searchWB.value=\"\";window.opener.showWorkedSearchChanged(searchWB);' src='/img/trash_24x48.png' style='width: 30px; margin:0px; padding:0px; margin-bottom: -4px; cursor: pointer;'/>";
}
worker += "</th>";
worker += "<th><input type='text' id='searchGrid' style='margin:0px' class='inputTextValue' value='" + g_gridSearch + "' size='6' oninput='window.opener.showWorkedSearchGrid(this);' / >";
if (g_gridSearch.length > 0)
{
worker += "<img title='Clear Grid' onclick='searchGrid.value=\"\";window.opener.showWorkedSearchGrid(searchGrid);' src='/img/trash_24x48.png' style='width: 30px; margin:0px; padding:0px; margin-bottom: -4px; cursor: pointer;'/>";
}
worker += "</th>";
worker += "<th><div id='bandFilterDiv'></div></th>";
worker += "<th><div id='modeFilterDiv'></div></th>";
worker += "<th><div id='qslFilterDiv'></div></th>";
@ -8213,24 +8216,16 @@ function showWorkedBox(sortIndex, nextPage, redraw)
worker += "<th></th>";
worker += "<th colspan=2><div id='dxccFilterDiv'></div></th>";
worker += "</tr> ";
worker +=
"<tr><th style='cursor:pointer;' align=center onclick='window.opener.showWorkedBox(0);'>Station</th>";
worker +=
"<th style='cursor:pointer;' align=center onclick='window.opener.showWorkedBox(1);'>Grid</th>";
worker +=
"<th style='cursor:pointer;' align=center onclick='window.opener.showWorkedBox(5);'>Band</th>";
worker +=
"<th style='cursor:pointer;' align=center onclick='window.opener.showWorkedBox(2);'>Mode</th>";
worker +=
"<th style='cursor:pointer;' align=center onclick='window.opener.showWorkedBox(6);'>QSL</th>";
worker += "<tr><th style='cursor:pointer;' align=center onclick='window.opener.showWorkedBox(0);'>Station</th>";
worker += "<th style='cursor:pointer;' align=center onclick='window.opener.showWorkedBox(1);'>Grid</th>";
worker += "<th style='cursor:pointer;' align=center onclick='window.opener.showWorkedBox(5);'>Band</th>";
worker += "<th style='cursor:pointer;' align=center onclick='window.opener.showWorkedBox(2);'>Mode</th>";
worker += "<th style='cursor:pointer;' align=center onclick='window.opener.showWorkedBox(6);'>QSL</th>";
worker += "<th align=center>Sent</th>";
worker += "<th align=center>Rcvd</th>";
worker +=
"<th style='cursor:pointer;' align=center onclick='window.opener.showWorkedBox(3);'>DXCC</th>";
worker +=
"<th style='cursor:pointer;' align=center onclick='window.opener.showWorkedBox(3);'>Flag</th>";
worker +=
"<th style='cursor:pointer;' align=center onclick='window.opener.showWorkedBox(4);'>When</th>";
worker += "<th style='cursor:pointer;' align=center onclick='window.opener.showWorkedBox(3);'>DXCC</th>";
worker += "<th style='cursor:pointer;' align=center onclick='window.opener.showWorkedBox(3);'>Flag</th>";
worker += "<th style='cursor:pointer;' align=center onclick='window.opener.showWorkedBox(4);'>When</th>";
if (g_callsignLookups.lotwUseEnable == true) worker += "<th>LoTW</th>";
if (g_callsignLookups.eqslUseEnable == true) worker += "<th>eQSL</th>";
if (g_callsignLookups.oqrsUseEnable == true) worker += "<th>OQRS</th>";

2
package.nw/lib/gtws.js
Wyświetl plik

@ -1,4 +1,4 @@
// GridTracker Copyright © 2022 GridTracker.org
// GridTracker Copyright © 2023 GridTracker.org
// All rights reserved.
// See LICENSE for more information.

2
package.nw/lib/pota.js
Wyświetl plik

@ -1,4 +1,4 @@
// GridTracker Copyright © 2022 GridTracker.org
// GridTracker Copyright © 2023 GridTracker.org
// All rights reserved.
// See LICENSE for more information.

2
package.nw/lib/protos.js
Wyświetl plik

@ -1,4 +1,4 @@
// GridTracker Copyright © 2022 GridTracker.org
// GridTracker Copyright © 2023 GridTracker.org
// All rights reserved.
// See LICENSE for more information.

2
package.nw/lib/roster.js
Wyświetl plik

@ -1,4 +1,4 @@
// GridTracker Copyright © 2022 GridTracker.org
// GridTracker Copyright © 2023 GridTracker.org
// All rights reserved.
// See LICENSE for more information.

2
package.nw/lib/stats.js
Wyświetl plik

@ -1,4 +1,4 @@
// GridTracker Copyright © 2022 GridTracker.org
// GridTracker Copyright © 2023 GridTracker.org
// All rights reserved.
// See LICENSE for more information.

4
package.nw/package.json
Wyświetl plik

@ -31,7 +31,7 @@
],
"mac": {
"icon": "gridview.icns",
"copyright": "Copyright (c) 2022 GridTracker.org",
"copyright": "Copyright (c) 2023 GridTracker.org",
"plistStrings": {
"CFBundleIdentifier": "org.gridtracker.gridtracker",
"CFBundleDocumentTypes": []
@ -39,7 +39,7 @@
},
"win": {
"icon": "gridview.ico",
"copyright": "Copyright (c) 2022 GridTracker.org"
"copyright": "Copyright (c) 2023 GridTracker.org"
},
"nsis": {
"installDirectory": "$PROGRAMFILES\\${_APPNAME}",

4
windows/setup.nsi.tmpl
Wyświetl plik

@ -64,8 +64,8 @@ VIAddVersionKey ProductVersion "${VERSION}"
VIAddVersionKey CompanyName "${COMPANY}"
VIAddVersionKey CompanyWebsite "${URL}"
VIAddVersionKey FileVersion "${VERSION}"
VIAddVersionKey FileDescription "An Amateur Radio Community"
VIAddVersionKey LegalCopyright "2022 Gridtracker.org"
VIAddVersionKey FileDescription "An Amateur Radio Companion"
VIAddVersionKey LegalCopyright "2023 GridTracker.org"
InstallDirRegKey HKLM "${REGKEY}" Path
ShowUninstDetails nevershow

2
windows/win_installer.nsi
Wyświetl plik

@ -34,7 +34,7 @@ VIAddVersionKey ProductVersion "${VERSION}"
VIAddVersionKey CompanyName "${COMPANY}"
VIAddVersionKey CompanyWebsite "${URL}"
VIAddVersionKey FileVersion "${VERSION}"
VIAddVersionKey FileDescription "An Amateur Radio Community"
VIAddVersionKey FileDescription "An Amateur Radio Companion"
VIAddVersionKey LegalCopyright "${CPYEAR} Gridtracker.org"