Merge branch 'copyright_startup' into 'master'

Harmonize copyrights and add version to startup. See merge request gridtracker.org/gridtracker!15
2020-11-03 18:02:55 +00:00 · 2020-11-03 18:02:55 +00:00 · 2d82088336
commit 2d82088336
--- a/package.nw/GridTracker.html
+++ b/package.nw/GridTracker.html
@ -1,23 +1,37 @@
 <!DOCTYPE html>
 <!--
-    This file is part of GridTracker.
+Copyright (c) 2018-2020 GridTricker.org
+All rights reserved.

-    GridTracker is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, version 3 of the License.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:

-    GridTracker is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.

-    You should have received a copy of the GNU General Public License
-    along with GridTracker.  If not, see <https://www.gnu.org/licenses/>.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <html lang="en" xml:lang="en">
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>GridTracker &copy;2020 N0TTL</title>
+    <title>GridTracker &copy;2020 GridTracker.org</title>
    <link rel="stylesheet" href="./lib/dp-dark.css" />
    <link rel="stylesheet" href="./lib/ol.css" />
    <link rel="stylesheet" href="./lib/style.css" />
@ -42,10 +56,10 @@
      <div class="fill">
        <img src="gridview.png" alt="" />
        <div>
-          <h1>GridTracker by</h1>
-          <h1>N&Oslash;TTL</h1>
-          <h2>&amp;</h2>
-          <h1>N2VFL</h1>
+          <h1><div id="startupVersionDiv">GridTracker</div></h1>
+          <h2>originally created by</h2>
+          <h2>N&Oslash;TTL &amp; N2VFL</h1>
+          <h3>Further information at GridTracker.org</h3>
        </div>
      </div>
      <div id="startupStatusDiv">Initial Startup</div>
@ -3376,21 +3390,13 @@
        </div>
        <div id="aboutDiv" class="settingsTabcontent">
          <div class="mapItem" style="padding: 4px">
-            <h2>GridTracker</h2>
-            <br />
-            GridTracker listens to traffic from WSJT-X and displays it on a map<br />
-            <i>It will also load ADIF log files</i> - Feb 2018<br />
-            <br />
-            &copy;2020 Stephen "Tag" Loomis / N&Oslash;TTL<br />
-            <br />
-            &copy;2020 Henry "atouk" Forte / N2VFL<br />
-            <p></p>
-            <h3>Contributors</h3>
-            <b>NR&Oslash;Q</b>
+            <h2><div id="aboutVersionDiv">GridTracker</div></h2>
            <p>
-              "d3jake" KE&Oslash;RIY - "Don" KB2YSI - K4KPW - "Paul" K6PST
-              <br />
-              <img src="./gridview.png" /> <br />
+            GridTracker listens to traffic from WSJT-X and similar programs,
+            displays it on a map, and creates traffic alerts and a roster
+            display of interesting traffic.</p>
+            <p>Copyright &copy; 2020 GridTracker.org<p />
+            <img src="./gridview.png" /> <br />
            </p>
          </div>
        </div>
--- a/package.nw/lib/adif.js
+++ b/package.nw/lib/adif.js
@ -1,4 +1,6 @@
-// GridTracker ©2020 N0TTL
+// GridTracker Copyright © 2020 GridTracker.org
+// All rights reserved.
+// See LICENSE for more information.

 var selectStartupLink = null;

--- a/package.nw/lib/alerts.js
+++ b/package.nw/lib/alerts.js
@ -1,4 +1,7 @@
-// GridTracker ©2020 N0TTL
+// GridTracker Copyright © 2020 GridTracker.org
+// All rights reserved.
+// See LICENSE for more information.
+
 var g_alerts = Object();
 var g_classicAlerts = Object();
 var g_phonetics = Object();
--- a/package.nw/lib/callsigns.js
+++ b/package.nw/lib/callsigns.js
@ -1,4 +1,6 @@
-// GridTracker ©2020 N0TTL
+// GridTracker Copyright © 2020 GridTracker.org
+// All rights reserved.
+// See LICENSE for more information.

 var g_lotwCallsigns = Object();
 var g_lotwFile = "";
--- a/package.nw/lib/gt.js
+++ b/package.nw/lib/gt.js
@ -1,4 +1,6 @@
-// GridTracker ©2020 N0TTL
+// GridTracker ©2020 GridTracker.org
+// All rights reserved.
+// See LICENSE for more information.
 var gtVersion = 1200927;
 var gtBeta = "Elsa III";
 var g_startVersion = 0;
@ -25,7 +27,7 @@ var gtShortVersion =
  vers.substr(3, 4) +
  " " +
  gtBeta;
-var gtVersionString = "GridTracker ©2020 N0TTL " + gtShortVersion;
+var gtVersionString = "GridTracker " + gtShortVersion;

 var g_windowName = "GT-main";
 var os = require("os");
@ -568,7 +570,7 @@ var g_gridAlpha = "88";
 if (typeof g_mapMemory[6] == "undefined") g_mapMemory[6] = g_mapMemory[0];

 function qsoBackupFileInit() {
-  var adifHeader = "GridTracker by N0TTL v" + gtVersion + " <EOH>\r\n";
+  var adifHeader = "GridTracker v" + gtVersion + " <EOH>\r\n";
  if (!fs.existsSync(g_qsoLogFile)) {
    fs.writeFileSync(g_qsoLogFile, adifHeader);
  }
@ -11628,6 +11630,8 @@ var g_startupTable = [

 function init() {
  window.document.title = gtVersionString;
+  startupVersionDiv.innerHTML = gtVersionString;
+  aboutVersionDiv.innerHTML = gtVersionString;
  g_currentDay = parseInt(timeNowSec() / 86400);
  if (mediaCheck() == false) {
    startupDiv.style.display = "none";
--- a/package.nw/lib/gtws.js
+++ b/package.nw/lib/gtws.js
@ -1,4 +1,7 @@
-// GridTracker ©2020 N0TTL
+// GridTracker Copyright © 2020 GridTracker.org
+// All rights reserved.
+// See LICENSE for more information.
+
 var g_gtEngineInterval = null;
 var g_chatRecvFunctions = {
  uuid: gtChatSetUUID,
--- a/package.nw/lib/protos.js
+++ b/package.nw/lib/protos.js
@ -1,4 +1,6 @@
-// GridTracker ©2020 N0TTL
+// GridTracker Copyright © 2020 GridTracker.org
+// All rights reserved.
+// See LICENSE for more information.

 // Incoming is already   float fixed (  14.037 ) for 14,037,000hz
 Number.prototype.formatBand = function () {
--- a/package.nw/lib/roster.js
+++ b/package.nw/lib/roster.js
@ -1,4 +1,6 @@
-// GridTracker ©2020 N0TTL
+// GridTracker Copyright © 2020 GridTracker.org
+// All rights reserved.
+// See LICENSE for more information.

 var fs = require("fs");

--- a/package.nw/lib/stats.js
+++ b/package.nw/lib/stats.js
@ -1,4 +1,6 @@
-// GridTracker ©2020 N0TTL
+// GridTracker Copyright © 2020 GridTracker.org
+// All rights reserved.
+// See LICENSE for more information.

 document.oncontextmenu = function (event) {
  event.preventDefault();