From e9d89941ce57528e01b9b623e3c42afb8e658f77 Mon Sep 17 00:00:00 2001 From: dj2ls Date: Wed, 16 Feb 2022 11:28:40 +0100 Subject: [PATCH] disabled rigctl and direct control on win also fixed app loading for linux --- gui/main.js | 24 +++++++++++++----------- gui/preload-main.js | 8 ++++++++ 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/gui/main.js b/gui/main.js index 52e29140..8fbd21ec 100644 --- a/gui/main.js +++ b/gui/main.js @@ -172,21 +172,23 @@ app.whenReady().then(() => { createWindow(); // start daemon by checking os - // https://stackoverflow.com/a/5775120 console.log("Trying to start daemon binary") - if(os.platform()=='linux' || os.platform()=='darwin'){ - daemonProcess = exec('./tnc/daemon', function callback(err, stdout, stderr) { - if (err) { - console.log(os.platform()); - console.error(err); - console.error("Can't start daemon binary"); - console.error("--> this is only working with the app bundle and a precompiled binaries"); - return; - } - console.log(stdout); + + if(os.platform()=='linux'){ + + daemonProcess = exec('./tnc/daemon', []) + + daemonProcess.on('error', (err) => { + console.log(err); }); + + daemonProcess.on('message', (data) => { + console.log(data); + }); + } + if(os.platform()=='win32' || os.platform()=='win64'){ diff --git a/gui/preload-main.js b/gui/preload-main.js index 178fca93..377dedaa 100644 --- a/gui/preload-main.js +++ b/gui/preload-main.js @@ -41,6 +41,14 @@ window.addEventListener('DOMContentLoaded', () => { }) */ + + // DISABLE HAMLIB DIRECT AND RIGCTL ON WINDOWS + if(os.platform()=='win32' || os.platform()=='win64'){ + + document.getElementById("radio-control-switch1").style.disabled = true; + document.getElementById("radio-control-switch2").style.disabled = true; + } + // ENABLE TOOLTIPS EVERYWHERE // https://getbootstrap.com/docs/5.1/components/tooltips/ var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'))