From b6edd073b249d458d705555d126db862953ed1eb Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Sat, 27 May 2023 11:28:07 +0200 Subject: [PATCH 1/3] show connected station in chat --- gui/main.js | 2 ++ gui/preload-chat.js | 10 ++++++++++ gui/src/chat-module.html | 11 +++++++++++ 3 files changed, 23 insertions(+) diff --git a/gui/main.js b/gui/main.js index 482c8559..50c1d92c 100644 --- a/gui/main.js +++ b/gui/main.js @@ -454,6 +454,8 @@ ipcMain.on("request-update-transmission-status", (event, arg) => { ipcMain.on("request-update-reception-status", (event, arg) => { win.webContents.send("action-update-reception-status", arg); + chat.webContents.send("action-update-reception-status", arg); + }); ipcMain.on("request-open-tnc-log", () => { diff --git a/gui/preload-chat.js b/gui/preload-chat.js index 4c600cf7..a4ae8eed 100644 --- a/gui/preload-chat.js +++ b/gui/preload-chat.js @@ -661,8 +661,18 @@ ipcRenderer.on("return-select-user-image", (event, arg) => { }); }); +ipcRenderer.on("action-update-reception-status", (event, arg) => { + var data = arg["data"][0]; + + document.getElementById("txtConnectedWithChat").textContent = data.dxcallsign; +}); + + ipcRenderer.on("action-update-transmission-status", (event, arg) => { var data = arg["data"][0]; + + document.getElementById("txtConnectedWithChat").textContent = data.dxcallsign; + console.log(data.status); if (data.uuid !== "no-uuid") { db.get(data.uuid, { diff --git a/gui/src/chat-module.html b/gui/src/chat-module.html index dddc0c7d..3447b6e6 100644 --- a/gui/src/chat-module.html +++ b/gui/src/chat-module.html @@ -264,7 +264,18 @@ Help + + + + + ------ From d04f3e65da517786afa29102509e30449728ab96 Mon Sep 17 00:00:00 2001 From: Mashintime Date: Fri, 9 Jun 2023 18:10:11 -0400 Subject: [PATCH 2/3] Clear chat connected to when session closes --- gui/main.js | 5 +++++ gui/preload-chat.js | 9 ++++++++- gui/preload-main.js | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/gui/main.js b/gui/main.js index 50c1d92c..b3a0119e 100644 --- a/gui/main.js +++ b/gui/main.js @@ -386,6 +386,11 @@ ipcMain.on("request-show-chat-window", () => { chat.show(); }); +ipcMain.on("request-clear-chat-connected", () => { + //Clear chat window's connected with text + chat.webContents.send("action-clear-reception-status"); +}); + // UPDATE TNC CONNECTION ipcMain.on("request-update-tnc-ip", (event, data) => { win.webContents.send("action-update-tnc-ip", data); diff --git a/gui/preload-chat.js b/gui/preload-chat.js index a4ae8eed..46f0ec6e 100644 --- a/gui/preload-chat.js +++ b/gui/preload-chat.js @@ -666,7 +666,14 @@ ipcRenderer.on("action-update-reception-status", (event, arg) => { document.getElementById("txtConnectedWithChat").textContent = data.dxcallsign; }); - +ipcRenderer.on("action-clear-reception-status", (event) => { + //Clear connected with textbox + let cwc = document.getElementById("txtConnectedWithChat"); + if (cwc.textContent != "------") { + cwc.textContent = "------"; + //console.log("Reseting connected with"); + } +}); ipcRenderer.on("action-update-transmission-status", (event, arg) => { var data = arg["data"][0]; diff --git a/gui/preload-main.js b/gui/preload-main.js index b2da4b9a..f2762387 100644 --- a/gui/preload-main.js +++ b/gui/preload-main.js @@ -2254,6 +2254,7 @@ ipcRenderer.on("action-update-tnc-state", (event, arg) => { "bi bi-chat-fill text-success me-1"; } else { document.getElementById("spnConnectedWith").className = "bi bi-chat-fill"; + ipcRenderer.send("request-clear-chat-connected"); } // HAMLIB STATUS From b6e37a70b99dafc8444d03ccc3db30d70a3f02a8 Mon Sep 17 00:00:00 2001 From: Mashintime Date: Sat, 10 Jun 2023 09:06:33 -0400 Subject: [PATCH 3/3] Update discord url to redirect url --- gui/preload-main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/preload-main.js b/gui/preload-main.js index f2762387..b11eac5b 100644 --- a/gui/preload-main.js +++ b/gui/preload-main.js @@ -1371,7 +1371,7 @@ window.addEventListener("DOMContentLoaded", () => { // Discord Link clicked document.getElementById("discordUrl").addEventListener("click", () => { - shell.openExternal("https://discord.gg/jnADeDtxUF"); + shell.openExternal("https://discord.freedata.app/"); }); // startTNC button clicked