From 8652643f5bfa8f57735add7934b6c071892c6b9c Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Tue, 5 Sep 2023 21:06:48 +0200 Subject: [PATCH] smaller gui updates --- gui_vue/electron/main.ts | 9 ++- gui_vue/index.html | 2 +- gui_vue/public/electron-vite.animate.svg | 34 ---------- gui_vue/public/electron-vite.svg | 26 -------- gui_vue/public/vite.svg | 1 - gui_vue/src/js/preload-main.js | 84 ------------------------ 6 files changed, 5 insertions(+), 151 deletions(-) delete mode 100644 gui_vue/public/electron-vite.animate.svg delete mode 100644 gui_vue/public/electron-vite.svg delete mode 100644 gui_vue/public/vite.svg diff --git a/gui_vue/electron/main.ts b/gui_vue/electron/main.ts index 16bb0994..4a8e299a 100644 --- a/gui_vue/electron/main.ts +++ b/gui_vue/electron/main.ts @@ -28,7 +28,7 @@ const VITE_DEV_SERVER_URL = process.env['VITE_DEV_SERVER_URL'] function createWindow() { win = new BrowserWindow({ - icon: path.join(process.env.PUBLIC, 'electron-vite.svg'), + icon: path.join(process.env.PUBLIC, 'icon_cube_border.png'), //webPreferences: { // preload: path.join(__dirname, 'preload.js'), //}, @@ -46,6 +46,9 @@ function createWindow() { }, }) + win.setMenuBarVisibility(false); + + // Test active push message to Renderer-process. win.webContents.on('did-finish-load', () => { win?.webContents.send('main-process-message', (new Date).toLocaleString()) @@ -64,7 +67,3 @@ app.on('window-all-closed', () => { }) app.whenReady().then(createWindow) - -ipcMain.on("request-update-daemon-state", (event, arg) => { - win.webContents.send("action-update-daemon-state", arg); -}); diff --git a/gui_vue/index.html b/gui_vue/index.html index 143557b5..fdedaa61 100644 --- a/gui_vue/index.html +++ b/gui_vue/index.html @@ -4,7 +4,7 @@ - Vite + Vue + TS + FreeDATA
diff --git a/gui_vue/public/electron-vite.animate.svg b/gui_vue/public/electron-vite.animate.svg deleted file mode 100644 index 864b1f61..00000000 --- a/gui_vue/public/electron-vite.animate.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gui_vue/public/electron-vite.svg b/gui_vue/public/electron-vite.svg deleted file mode 100644 index e4b75fcd..00000000 --- a/gui_vue/public/electron-vite.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gui_vue/public/vite.svg b/gui_vue/public/vite.svg deleted file mode 100644 index e7b8dfb1..00000000 --- a/gui_vue/public/vite.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/gui_vue/src/js/preload-main.js b/gui_vue/src/js/preload-main.js index b70b24cd..27e32275 100644 --- a/gui_vue/src/js/preload-main.js +++ b/gui_vue/src/js/preload-main.js @@ -2758,7 +2758,6 @@ ipcRenderer.on("action-update-hamlib-test", (event, arg) => { //document.getElementById("testHamlibAdvanced").className = "btn btn-sm btn-danger"; } }); - ipcRenderer.on("action-update-daemon-connection", (event, arg) => { if (arg.daemon_connection == "open") { document.getElementById("daemon_connection_state").className = @@ -2776,88 +2775,6 @@ ipcRenderer.on("action-update-daemon-connection", (event, arg) => { //document.getElementById("blurdiv").style.webkitFilter = "blur(10px)"; } }); - -ipcRenderer.on("action-update-tnc-connection", (event, arg) => { - if (arg.tnc_connection == "open") { - /* - document.getElementById('hamlib_deviceid').disabled = true; - document.getElementById('hamlib_deviceport').disabled = true; - document.getElementById('testHamlib').disabled = true; - document.getElementById('hamlib_ptt_protocol').disabled = true; - document.getElementById('audio_input_selectbox').disabled = true; - document.getElementById('audio_output_selectbox').disabled = true; - //document.getElementById('stopTNC').disabled = false; - document.getElementById('startTNC').disabled = true; - document.getElementById('dxCall').disabled = false; - document.getElementById("hamlib_serialspeed").disabled = true; - document.getElementById("openDataModule").disabled = false; - */ - - // collapse settings screen - var collapseFirstRow = new bootstrap.Collapse( - document.getElementById("collapseFirstRow"), - { toggle: false }, - ); - collapseFirstRow.hide(); - var collapseSecondRow = new bootstrap.Collapse( - document.getElementById("collapseSecondRow"), - { toggle: false }, - ); - collapseSecondRow.hide(); - var collapseThirdRow = new bootstrap.Collapse( - document.getElementById("collapseThirdRow"), - { toggle: false }, - ); - collapseThirdRow.show(); - var collapseFourthRow = new bootstrap.Collapse( - document.getElementById("collapseFourthRow"), - { toggle: false }, - ); - collapseFourthRow.show(); - - //Set tuning for fancy graphics mode (high/low CPU) - set_CPU_mode(); - - //GUI will auto connect to TNC if already running, if that is the case increment start count if 0 - if (tncStartCount == 0) tncStartCount++; - } else { - /* - document.getElementById('hamlib_deviceid').disabled = false; - document.getElementById('hamlib_deviceport').disabled = false; - document.getElementById('testHamlib').disabled = false; - document.getElementById('hamlib_ptt_protocol').disabled = false; - document.getElementById('audio_input_selectbox').disabled = false; - document.getElementById('audio_output_selectbox').disabled = false; - //document.getElementById('stopTNC').disabled = true; - document.getElementById('startTNC').disabled = false; - document.getElementById('dxCall').disabled = true; - document.getElementById("hamlib_serialspeed").disabled = false; - document.getElementById("openDataModule").disabled = true; - */ - // collapse settings screen - var collapseFirstRow = new bootstrap.Collapse( - document.getElementById("collapseFirstRow"), - { toggle: false }, - ); - collapseFirstRow.show(); - var collapseSecondRow = new bootstrap.Collapse( - document.getElementById("collapseSecondRow"), - { toggle: false }, - ); - collapseSecondRow.show(); - var collapseThirdRow = new bootstrap.Collapse( - document.getElementById("collapseThirdRow"), - { toggle: false }, - ); - collapseThirdRow.hide(); - var collapseFourthRow = new bootstrap.Collapse( - document.getElementById("collapseFourthRow"), - { toggle: false }, - ); - collapseFourthRow.hide(); - } -}); - ipcRenderer.on("action-update-rx-buffer", (event, arg) => { var data = arg.data["data"]; @@ -3144,7 +3061,6 @@ ipcRenderer.on("action-updater", (event, arg) => { }); // ----------- INFO MODAL ACTIONS ------------------------------- - // CQ TRANSMITTING ipcRenderer.on("action-show-cq-toast-transmitting", (event, data) => { displayToast(