From 50eeb8175b9451c067fd307df17d986c13a3b853 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Tue, 11 Apr 2023 14:43:01 +0200 Subject: [PATCH] gui related adjustments --- gui/preload-main.js | 28 +- gui/src/index.html | 616 +++++++++++++++++++++++++++++++++++++------- tnc/config.ini | 4 +- 3 files changed, 527 insertions(+), 121 deletions(-) diff --git a/gui/preload-main.js b/gui/preload-main.js index f8410fbb..60cf33f5 100644 --- a/gui/preload-main.js +++ b/gui/preload-main.js @@ -425,7 +425,6 @@ window.addEventListener("DOMContentLoaded", () => { if (config.radiocontrol == "rigctld") { document.getElementById("radio-control-switch-disabled").checked = false; document.getElementById("radio-control-switch-rigctld").checked = true; - document.getElementById("radio-control-switch-help").checked = false; document.getElementById("radio-control-disabled").style.visibility = "hidden"; @@ -439,7 +438,6 @@ window.addEventListener("DOMContentLoaded", () => { document.getElementById("radio-control-rigctld").style.display = "block"; } else { document.getElementById("radio-control-switch-disabled").checked = true; - document.getElementById("radio-control-switch-help").checked = false; document.getElementById("radio-control-switch-rigctld").checked = false; document.getElementById("radio-control-help").style.display = "none"; @@ -532,29 +530,7 @@ window.addEventListener("DOMContentLoaded", () => { FD.saveConfig(config, configPath); }); - // // radio settings 'network' event listener - document - .getElementById("radio-control-switch-help") - .addEventListener("click", () => { - //document.getElementById("hamlib_info_field").innerHTML = - // "Set the ip and port of a rigctld session"; - document.getElementById("radio-control-disabled").style.display = "none"; - document.getElementById("radio-control-disabled").style.visibility = - "hidden"; - - document.getElementById("radio-control-help").style.display = "block"; - document.getElementById("radio-control-help").style.visibility = - "visible"; - - document.getElementById("radio-control-rigctld").style.visibility = - "hidden"; - document.getElementById("radio-control-rigctld").style.display = "none"; - - config.radiocontrol = "rigctld"; - //fs.writeFileSync(configPath, JSON.stringify(config, null, 2)); - FD.saveConfig(config, configPath); - }); // // radio settings 'rigctld' event listener document @@ -1983,9 +1959,9 @@ ipcRenderer.on("action-update-tnc-state", (event, arg) => { // AUDIO RECORDING if (arg.audio_recording == "True") { - document.getElementById("startStopRecording").textContent = "Stop Rec"; + document.getElementById("startStopRecording").textContent = "Stop recording"; } else { - document.getElementById("startStopRecording").textContent = "Start Rec"; + document.getElementById("startStopRecording").textContent = "Start recording"; } //CHANNEL CODEC2 BUSY STATE if (arg.is_codec2_traffic == "True") { diff --git a/gui/src/index.html b/gui/src/index.html index 807170b7..145eb226 100644 --- a/gui/src/index.html +++ b/gui/src/index.html @@ -54,6 +54,7 @@ for="local-remote-switch1" > + Local tnc + Remote tnc
- TNC IP + tnc ip + Start tnc
@@ -229,10 +233,10 @@ -
+
-
-
- AUDIO -
+
+ + + +
+
+
+ +
+
+ Audio devices +
+
+ + + + + + + +
+
+
+ + + + +
-
+
@@ -291,7 +326,7 @@
-
+
@@ -302,18 +337,25 @@ >
- +
- TNC RIG CONTROL -
+
+
+ +
+
+ Rig control +
+
+
- None + None / Vox
-
+ +
+ + +
+ + + + + + +
+
+
+ + +
@@ -387,9 +435,9 @@
Rigctld Network settingsRigctld - IP + Address
- Rigctld application + Rigctld + Service
-
-
- MY STATION +
+ +
+
+
+ +
+
+ My station +
+
+ + + + + + + +
+
+
@@ -558,13 +635,17 @@
-
- - UPDATER -
+
+
+
+
+ +
+
+ Updater +
+
+
+
+ + + +
+ + + + + + + +
+
+
+ +
-
+
- - AUDIO LEVEL + +
+
+
+ +
+
+ Audio level +
+
+ +
+
+ + + + + + + +
+
+
+ +
-
+
-
+
-
+
-
+
-
- PING, CQ & BEACON +
+ +
+
+
+ +
+
+ Broadcasts +
+
+ + + + + + + +
+
+
+ + +
@@ -835,7 +1002,7 @@ id="sendCQ" type="button" > - CQ + Call cq cq cq
@@ -853,7 +1020,7 @@ id="startBeacon" class="btn btn-sm btn-outline-secondary" > - + Toggle beacon
@@ -863,11 +1030,15 @@
-
+
-
+
+
+
- rd + signal
+
+ +
+ + + + + + + +
+
+
+ + +
@@ -964,12 +1159,38 @@
-
- - HEARD STATIONS +
+ +
+
+
+ +
+
+ Heard stations +
+
+ + + + + + + +
+
+
+ + +
@@ -1108,7 +1329,7 @@
@@ -1532,6 +1753,213 @@ + + + + + + + + + + + + + + + + + + + + + + + -
- - -
+
+ + +
+
- + +
@@ -2623,8 +3052,8 @@
- These options are - experimental and may not work as expected. + These options may + not work and are for experienced users only!
@@ -2746,3 +3175,4 @@
+ diff --git a/tnc/config.ini b/tnc/config.ini index ca718df7..0f15a8df 100644 --- a/tnc/config.ini +++ b/tnc/config.ini @@ -10,8 +10,8 @@ ssid_list = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] [AUDIO] #audio settings -rx = 2 -tx = 3 +rx = 0 +tx = 1 txaudiolevel = 78 auto_tune = False