Merge branch 'map-selection-broken' into 'master'

Fixed map selection issue, and chat window not saving position on app exit

See merge request gridtracker.org/gridtracker!229

If this is changing anything in the UI or operational behavior, please prepare to update the wiki!

.gitlab-ci.yml

@@ -94,10 +94,6 @@ win:package:
       7zr e NsProcess.zip -y -o/usr/share/nsis/Include/ Include/nsProcess.nsh
       7zr e NsProcess.zip -y -o/usr/share/nsis/Plugins/x86-unicode/ Plugin/nsProcessW.dll
       mv /usr/share/nsis/Plugins/x86-unicode/nsProcessW.dll /usr/share/nsis/Plugins/x86-unicode/nsProcess.dll
-      ## eval $(ssh-agent -s)
-      ## echo "$NR0Q_PRIV" | tr -d '\r' | ssh-add -
-      ## mkdir -p ~/.ssh; chmod 700 ~/.ssh
-      ## scp -o StrictHostKeyChecking=no -P $NR0Q_SSH_PORT mchambers@$NR0Q_SERVER_ADDRESS:~/codecert.spc ./
   script:
     - |
       # Making our Windows packages 
@@ -107,11 +103,12 @@ win:package:
       npm install --prefer-offline
       npm run dist-win
       for dir in dist/*-win-* ; do
-          if [  -f $dir ] && [[ "$dir" == *"-Setup.exe" ]] ; then
-            echo "deleting broken installer $dir"
-            rm $dir
-          fi
+        if [  -f $dir ] && [[ "$dir" == *"-Setup.exe" ]] ; then
+          echo "deleting broken installer $dir"
+          rm $dir
+        fi
       done
+      rm dist/*-win-*/locales/*.info
       # Now we need to sign the executable before it get's stuffed into Nullsoft
       # using mono signcode
       ## signcode -spc codecert.spc -t http://time.certum.pl/ -a sha256 dist/GridTracker-*-win-*/*.exe

debian/changelog

@@ -1,3 +1,8 @@
+gridtracker (1.22.1010) unstable; urgency=low
+  - Fix issue with map selection not saving/restoring
+
+ -- Tag Loomis <n0ttl@gridtracker.org>  Sun, 09 Oct 2022 12:00:00 -0000
+
 gridtracker (1.22.1009) unstable; urgency=low
   - Fix issue loading logs and generating scores tab
 

gridtracker.spec

@@ -1,6 +1,6 @@
 Name:           {{{ git_name name=gridtracker }}}
 Summary:        GridTracker: An amateur radio companion to WSJT-X or JTDX
-Version:        {{{ git_version lead=1.22.1009 }}}
+Version:        {{{ git_version lead=1.22.1010 }}}
 Release:        1%{?dist}
 BuildArch:      noarch
 Source0:        {{{ git_dir_pack }}}
@@ -40,6 +40,8 @@ DESTDIR=${RPM_BUILD_ROOT} make clean
 %license %{_docdir}/%{name}/
 
 %changelog
+* Sun Oct 09 2022 Tag Loomis <n0ttl@gridtracker.org> - 1.22.1010-1
+  - Fix issue with map selection not saving/restoring
 * Sat Oct 08 2022 Tag Loomis <n0ttl@gridtracker.org> - 1.22.1009-1
   - Fix issue with loading logs and generating scores
 * Sat Oct 08 2022 Matthew Chambers <nr0q@gridtracker.org> - 1.22.1008-1

package.nw/lib/gt.js

@@ -286,6 +286,7 @@ function saveAndCloseApp()
     g_statsWindowHandle.window.saveScreenSettings();
     g_baWindowHandle.window.saveScreenSettings();
     g_lookupWindowHandle.window.saveScreenSettings();
+    g_chatWindowHandle.window.saveScreenSettings();
   }
   catch (e)
   {
@@ -5502,7 +5503,7 @@ function initMap()
     var saveSettings = false;
     g_maps = Object.keys(g_maps).sort().reduce((obj, key) => { obj[key] = g_maps[key]; return obj; }, {});
     
-    if (typeof Number(g_mapSettings.mapIndex) == "number")
+    if (typeof g_mapSettings.mapIndex == "number")
     {
       var foundKey = null;
       for (const key in g_maps)
@@ -5521,7 +5522,7 @@ function initMap()
       saveSettings = true;
     }
     
-    if (typeof Number(g_mapSettings.nightMapIndex) == "number")
+    if (typeof g_mapSettings.nightMapIndex == "number")
     {
       var foundKey = null;
       for (const key in g_maps)

package.nw/lib/pota.js

@@ -218,17 +218,20 @@ function reportPotaRBN(callSpot)
     spotterGrid: callSpot.spotterGrid
   }
   
-  getPostJSONBuffer(
-    "https://api.pota.app/spot",
-    rbnReportResult,
-    null,
-    "https",
-    443,
-    report,
-    10000,
-    null,
-    null
-  );
+  if (Number(report.frequency) > 0)
+  {
+    getPostJSONBuffer(
+      "https://api.pota.app/spot",
+      rbnReportResult,
+      null,
+      "https",
+      443,
+      report,
+      10000,
+      null,
+      null
+    );
+  }
 }
 
 function reportPotaQSO(record)

package.nw/package.json

@@ -1,7 +1,7 @@
 {
   "name": "GridTracker",
   "product_string_do_not_use": "gridtracker",
-  "version": "1.22.1009",
+  "version": "1.22.1010",
   "betaVersion": "",
   "description": "GridTracker, an amateur radio companion",
   "author": "GridTracker.org",