kopia lustrzana https://gitlab.com/gridtracker.org/gridtracker
Squashed commits '${title}'
rodzic
902bf6f79e
commit
a7f5f1e3b2
4
LICENSE
4
LICENSE
|
@ -1,7 +1,7 @@
|
||||||
BSD 3-Clause License
|
BSD 3-Clause License
|
||||||
|
|
||||||
Copyright (c) 2018-2020 Stephen Tag Loomis
|
Copyright (c) 2018-2023 Stephen Loomis
|
||||||
Copyright (c) 2018-2022 GridTricker.org
|
Copyright (c) 2020-2023 GridTricker.org
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
|
|
|
@ -4,9 +4,9 @@ Upstream-Contact: GridTracker Team <contact@gridtracker.org>
|
||||||
Source: https://gitlab.com/gridtracker.org/gridtracker
|
Source: https://gitlab.com/gridtracker.org/gridtracker
|
||||||
|
|
||||||
Files: *
|
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
|
License: BSD-3-clause
|
||||||
Copyright (c) 2018-2022 GridTricker.org
|
Copyright (c) 2020-2023 GridTricker.org
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
.
|
.
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
|
|
|
@ -42,8 +42,7 @@ Run gridtracker, no arguments needed.
|
||||||
|
|
||||||
.SH COPYRIGHT
|
.SH COPYRIGHT
|
||||||
.PP
|
.PP
|
||||||
Copyright (c) 2018-2020 Stephen Tag Loomis. All rights reserved.
|
Copyright (c) 2020-2023 GridTracker.org. All rights reserved.
|
||||||
Copyright (c) 2020-2022 GridTracker.org. All rights reserved.
|
|
||||||
Released under BSD 3-Clause License
|
Released under BSD 3-Clause License
|
||||||
https://gridtracker.org
|
https://gridtracker.org
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<!--
|
<!--
|
||||||
GridTracker Copyright © 2018-2022 GridTracker.org
|
GridTracker Copyright © 2018-2023 Stephen Loomis
|
||||||
|
GridTracker Copyright © 2020-2023 GridTracker.org
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
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"
|
<a href="#" style="cursor: pointer"
|
||||||
onclick="require('nw.gui').Shell.openExternal('https://gridtracker.org/grid-tracker/');">GridTracker.org!</a>
|
onclick="require('nw.gui').Shell.openExternal('https://gridtracker.org/grid-tracker/');">GridTracker.org!</a>
|
||||||
</p>
|
</p>
|
||||||
<p>Copyright © 2022 GridTracker.org</p>
|
<p>Copyright © 2023 GridTracker.org</p>
|
||||||
<img src="./gridview.png" /> <br />
|
<img src="./gridview.png" /> <br />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -461,7 +461,7 @@
|
||||||
"settings.about.FeatureList4": "天氣",
|
"settings.about.FeatureList4": "天氣",
|
||||||
"settings.about.FeatureList5": "當前的太陽和空間條件和更多!",
|
"settings.about.FeatureList5": "當前的太陽和空間條件和更多!",
|
||||||
"settings.about.HomepageLink": "了解更多關於",
|
"settings.about.HomepageLink": "了解更多關於",
|
||||||
"settings.about.Copyright": "版權所有;2022 GridTracker.org",
|
"settings.about.Copyright": "版權所有;2023 GridTracker.org",
|
||||||
"alertPopup.title": "新警報!!!",
|
"alertPopup.title": "新警報!!!",
|
||||||
"alertPopup.dismiss": "解除",
|
"alertPopup.dismiss": "解除",
|
||||||
"updatePopup.newUpdate": "GridTracker已有新的版本!",
|
"updatePopup.newUpdate": "GridTracker已有新的版本!",
|
||||||
|
|
|
@ -461,7 +461,7 @@
|
||||||
"settings.about.FeatureList4": "天气",
|
"settings.about.FeatureList4": "天气",
|
||||||
"settings.about.FeatureList5": "当前的太阳和空间条件和更多!",
|
"settings.about.FeatureList5": "当前的太阳和空间条件和更多!",
|
||||||
"settings.about.HomepageLink": "了解更多关于",
|
"settings.about.HomepageLink": "了解更多关于",
|
||||||
"settings.about.Copyright": "版权所有;2022 GridTracker.org",
|
"settings.about.Copyright": "版权所有;2023 GridTracker.org",
|
||||||
"alertPopup.title": "新警报!!!",
|
"alertPopup.title": "新警报!!!",
|
||||||
"alertPopup.dismiss": "解除",
|
"alertPopup.dismiss": "解除",
|
||||||
"updatePopup.newUpdate": "GridTracker已有新的版本!",
|
"updatePopup.newUpdate": "GridTracker已有新的版本!",
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// GridTracker Copyright © 2022 GridTracker.org
|
// GridTracker Copyright © 2023 GridTracker.org
|
||||||
// All rights reserved.
|
// All rights reserved.
|
||||||
// See LICENSE for more information.
|
// See LICENSE for more information.
|
||||||
var g_fromDirectCallNoFileDialog = false;
|
var g_fromDirectCallNoFileDialog = false;
|
||||||
|
@ -605,7 +605,7 @@ function getUTCString(d)
|
||||||
return Y + "-" + M + "-" + D + " " + h + ":" + m + ":" + s;
|
return Y + "-" + M + "-" + D + " " + h + ":" + m + ":" + s;
|
||||||
}
|
}
|
||||||
|
|
||||||
function lotwCallback(buffer, flag)
|
function lotwCallback(buffer, flag, cookies, url)
|
||||||
{
|
{
|
||||||
var rawAdiBuffer = String(buffer);
|
var rawAdiBuffer = String(buffer);
|
||||||
if (rawAdiBuffer.indexOf("password incorrect") > -1)
|
if (rawAdiBuffer.indexOf("password incorrect") > -1)
|
||||||
|
@ -630,12 +630,6 @@ function lotwCallback(buffer, flag)
|
||||||
// Extract header showing type of call
|
// 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);
|
// 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(
|
rawAdiBuffer = cleanAndPrepADIF(
|
||||||
adiFileName,
|
adiFileName,
|
||||||
rawAdiBuffer,
|
rawAdiBuffer,
|
||||||
|
@ -650,6 +644,12 @@ function lotwCallback(buffer, flag)
|
||||||
);
|
);
|
||||||
|
|
||||||
onAdiLoadComplete(rawAdiBuffer, true, adiFileName, true);
|
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")
|
if (typeof callback === "function")
|
||||||
{
|
{
|
||||||
// Call it, since we have confirmed it is callable
|
// Call it, since we have confirmed it is callable
|
||||||
callback(fileBuffer, flag, cookies);
|
callback(fileBuffer, flag, cookies, file_url);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.on("error", function ()
|
.on("error", function ()
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// GridTracker Copyright © 2022 GridTracker.org
|
// GridTracker Copyright © 2023 GridTracker.org
|
||||||
// All rights reserved.
|
// All rights reserved.
|
||||||
// See LICENSE for more information.
|
// See LICENSE for more information.
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// GridTracker Copyright © 2022 GridTracker.org
|
// GridTracker Copyright © 2023 GridTracker.org
|
||||||
// All rights reserved.
|
// All rights reserved.
|
||||||
// See LICENSE for more information.
|
// See LICENSE for more information.
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// GridTracker Copyright © 2022 GridTracker.org
|
// GridTracker Copyright © 2023 GridTracker.org
|
||||||
// All rights reserved.
|
// All rights reserved.
|
||||||
// See LICENSE for more information.
|
// See LICENSE for more information.
|
||||||
const pjson = require("./package.json");
|
const pjson = require("./package.json");
|
||||||
|
@ -8197,15 +8197,18 @@ function showWorkedBox(sortIndex, nextPage, redraw)
|
||||||
var worker = "";
|
var worker = "";
|
||||||
worker +=
|
worker +=
|
||||||
"<table id='logTable' style='white-space:nowrap;overflow:auto;overflow-x;hidden;' class='darkTable' align=center>";
|
"<table id='logTable' style='white-space:nowrap;overflow:auto;overflow-x;hidden;' class='darkTable' align=center>";
|
||||||
worker += "<tr>";
|
worker += "<tr><th><input type='text' id='searchWB' style='margin:0px' class='inputTextValue' value='" + g_searchWB + "' size='8' oninput='window.opener.showWorkedSearchChanged(this);' / >";
|
||||||
worker +=
|
if (g_searchWB.length > 0)
|
||||||
"<th><input type='text' id='searchWB' style='margin:0px' class='inputTextValue' value='" +
|
{
|
||||||
g_searchWB +
|
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;'/>";
|
||||||
"' size='8' oninput='window.opener.showWorkedSearchChanged(this);' / ></th>";
|
}
|
||||||
worker +=
|
worker += "</th>";
|
||||||
"<th><input type='text' id='searchGrid' style='margin:0px' class='inputTextValue' value='" +
|
worker += "<th><input type='text' id='searchGrid' style='margin:0px' class='inputTextValue' value='" + g_gridSearch + "' size='6' oninput='window.opener.showWorkedSearchGrid(this);' / >";
|
||||||
g_gridSearch +
|
if (g_gridSearch.length > 0)
|
||||||
"' size='6' oninput='window.opener.showWorkedSearchGrid(this);' / ></th>";
|
{
|
||||||
|
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='bandFilterDiv'></div></th>";
|
||||||
worker += "<th><div id='modeFilterDiv'></div></th>";
|
worker += "<th><div id='modeFilterDiv'></div></th>";
|
||||||
worker += "<th><div id='qslFilterDiv'></div></th>";
|
worker += "<th><div id='qslFilterDiv'></div></th>";
|
||||||
|
@ -8213,24 +8216,16 @@ function showWorkedBox(sortIndex, nextPage, redraw)
|
||||||
worker += "<th></th>";
|
worker += "<th></th>";
|
||||||
worker += "<th colspan=2><div id='dxccFilterDiv'></div></th>";
|
worker += "<th colspan=2><div id='dxccFilterDiv'></div></th>";
|
||||||
worker += "</tr> ";
|
worker += "</tr> ";
|
||||||
worker +=
|
worker += "<tr><th style='cursor:pointer;' align=center onclick='window.opener.showWorkedBox(0);'>Station</th>";
|
||||||
"<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 +=
|
worker += "<th style='cursor:pointer;' align=center onclick='window.opener.showWorkedBox(5);'>Band</th>";
|
||||||
"<th style='cursor:pointer;' align=center onclick='window.opener.showWorkedBox(1);'>Grid</th>";
|
worker += "<th style='cursor:pointer;' align=center onclick='window.opener.showWorkedBox(2);'>Mode</th>";
|
||||||
worker +=
|
worker += "<th style='cursor:pointer;' align=center onclick='window.opener.showWorkedBox(6);'>QSL</th>";
|
||||||
"<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>Sent</th>";
|
||||||
worker += "<th align=center>Rcvd</th>";
|
worker += "<th align=center>Rcvd</th>";
|
||||||
worker +=
|
worker += "<th style='cursor:pointer;' align=center onclick='window.opener.showWorkedBox(3);'>DXCC</th>";
|
||||||
"<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 +=
|
worker += "<th style='cursor:pointer;' align=center onclick='window.opener.showWorkedBox(4);'>When</th>";
|
||||||
"<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.lotwUseEnable == true) worker += "<th>LoTW</th>";
|
||||||
if (g_callsignLookups.eqslUseEnable == true) worker += "<th>eQSL</th>";
|
if (g_callsignLookups.eqslUseEnable == true) worker += "<th>eQSL</th>";
|
||||||
if (g_callsignLookups.oqrsUseEnable == true) worker += "<th>OQRS</th>";
|
if (g_callsignLookups.oqrsUseEnable == true) worker += "<th>OQRS</th>";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// GridTracker Copyright © 2022 GridTracker.org
|
// GridTracker Copyright © 2023 GridTracker.org
|
||||||
// All rights reserved.
|
// All rights reserved.
|
||||||
// See LICENSE for more information.
|
// See LICENSE for more information.
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// GridTracker Copyright © 2022 GridTracker.org
|
// GridTracker Copyright © 2023 GridTracker.org
|
||||||
// All rights reserved.
|
// All rights reserved.
|
||||||
// See LICENSE for more information.
|
// See LICENSE for more information.
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// GridTracker Copyright © 2022 GridTracker.org
|
// GridTracker Copyright © 2023 GridTracker.org
|
||||||
// All rights reserved.
|
// All rights reserved.
|
||||||
// See LICENSE for more information.
|
// See LICENSE for more information.
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// GridTracker Copyright © 2022 GridTracker.org
|
// GridTracker Copyright © 2023 GridTracker.org
|
||||||
// All rights reserved.
|
// All rights reserved.
|
||||||
// See LICENSE for more information.
|
// See LICENSE for more information.
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// GridTracker Copyright © 2022 GridTracker.org
|
// GridTracker Copyright © 2023 GridTracker.org
|
||||||
// All rights reserved.
|
// All rights reserved.
|
||||||
// See LICENSE for more information.
|
// See LICENSE for more information.
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
],
|
],
|
||||||
"mac": {
|
"mac": {
|
||||||
"icon": "gridview.icns",
|
"icon": "gridview.icns",
|
||||||
"copyright": "Copyright (c) 2022 GridTracker.org",
|
"copyright": "Copyright (c) 2023 GridTracker.org",
|
||||||
"plistStrings": {
|
"plistStrings": {
|
||||||
"CFBundleIdentifier": "org.gridtracker.gridtracker",
|
"CFBundleIdentifier": "org.gridtracker.gridtracker",
|
||||||
"CFBundleDocumentTypes": []
|
"CFBundleDocumentTypes": []
|
||||||
|
@ -39,7 +39,7 @@
|
||||||
},
|
},
|
||||||
"win": {
|
"win": {
|
||||||
"icon": "gridview.ico",
|
"icon": "gridview.ico",
|
||||||
"copyright": "Copyright (c) 2022 GridTracker.org"
|
"copyright": "Copyright (c) 2023 GridTracker.org"
|
||||||
},
|
},
|
||||||
"nsis": {
|
"nsis": {
|
||||||
"installDirectory": "$PROGRAMFILES\\${_APPNAME}",
|
"installDirectory": "$PROGRAMFILES\\${_APPNAME}",
|
||||||
|
|
|
@ -64,8 +64,8 @@ VIAddVersionKey ProductVersion "${VERSION}"
|
||||||
VIAddVersionKey CompanyName "${COMPANY}"
|
VIAddVersionKey CompanyName "${COMPANY}"
|
||||||
VIAddVersionKey CompanyWebsite "${URL}"
|
VIAddVersionKey CompanyWebsite "${URL}"
|
||||||
VIAddVersionKey FileVersion "${VERSION}"
|
VIAddVersionKey FileVersion "${VERSION}"
|
||||||
VIAddVersionKey FileDescription "An Amateur Radio Community"
|
VIAddVersionKey FileDescription "An Amateur Radio Companion"
|
||||||
VIAddVersionKey LegalCopyright "2022 Gridtracker.org"
|
VIAddVersionKey LegalCopyright "2023 GridTracker.org"
|
||||||
InstallDirRegKey HKLM "${REGKEY}" Path
|
InstallDirRegKey HKLM "${REGKEY}" Path
|
||||||
ShowUninstDetails nevershow
|
ShowUninstDetails nevershow
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@ VIAddVersionKey ProductVersion "${VERSION}"
|
||||||
VIAddVersionKey CompanyName "${COMPANY}"
|
VIAddVersionKey CompanyName "${COMPANY}"
|
||||||
VIAddVersionKey CompanyWebsite "${URL}"
|
VIAddVersionKey CompanyWebsite "${URL}"
|
||||||
VIAddVersionKey FileVersion "${VERSION}"
|
VIAddVersionKey FileVersion "${VERSION}"
|
||||||
VIAddVersionKey FileDescription "An Amateur Radio Community"
|
VIAddVersionKey FileDescription "An Amateur Radio Companion"
|
||||||
VIAddVersionKey LegalCopyright "${CPYEAR} Gridtracker.org"
|
VIAddVersionKey LegalCopyright "${CPYEAR} Gridtracker.org"
|
||||||
|
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue