Move Hamlib to front

Author: int2001

advanced.html

@@ -185,7 +185,7 @@
 					</div>
 					<div class="row">
 						<div class="col">
-							<div class="mb-3 col-mb3">
+							<div class="mb-3 col-mb-3">
 								<label for="wavelog_radioname">Radio Name</label>
 								<input type="text" class="form-control form-control-sm" name="wavelog_radioname"
 									id="wavelog_radioname" value="" />
@@ -196,30 +196,42 @@
 						</div>
 						<div class="col">
 							<div class="mb-1 col-mb-1">
-								<label for="wavelog_pmode" class="text-center">Set MODE via FLRig</label>
+								<label for="wavelog_pmode" class="text-center" id="pmode_label">Set MODE via Radio</label>
 								<input type="checkbox" value="1" class="form-control form-control-sm" name="wavelog_pmode" id="wavelog_pmode" title="Try to set Mode automatically" value="" />
 							</div>
 						</div>
 					</div>
 					<div class="row">
 						<div class="col">
-							<div class="mb-3 col-mb-3">
-								<label for="flrig_host">FLRig Host</label>
-								<input type="text" class="form-control form-control-sm" name="flrig_host"
-									id="flrig_host" value="" />
+							<div class="mb-3">
+								<label for="radio_type">Radio Control</label>
+								<select id="radio_type" class="form-control form-control-sm">
+									<option value="none">No Radio</option>
+									<option value="flrig">FLRig</option>
+									<option value="hamlib">Hamlib</option>
+								</select>
 							</div>
 						</div>
 						<div class="col">
 							<div class="mb-2 col-mb-2">
-								<label for="flrig_port">FLRig Port</label>
-								<input type="number" class="form-control form-control-sm" name="flrig_port"
-									id="flrig_port" value="" />
+								<label for="radio_host" id="host_label">Radio Host</label>
+								<input type="text" class="form-control form-control-sm" name="radio_host"
+									id="radio_host" value="" disabled />
 							</div>
 						</div>
 						<div class="col">
 							<div class="mb-1 col-mb-1">
-								<label for="flrig_ena">FLRig Enabled</label>
-								<input type="checkbox" value="1" class="form-control form-control-sm" name="flrig_ena" id="flrig_ena" value="" />
+								<label for="radio_port" id="port_label">Radio Port</label>
+								<input type="number" class="form-control form-control-sm" name="radio_port"
+									id="radio_port" value="" disabled />
+							</div>
+						</div>
+					</div>
+					<div class="row" id="hamlib_options" style="display: none;">
+						<div class="col">
+							<div class="mb-1 col-mb-1">
+								<label for="ignore_pwr">Ignore Power</label>
+								<input type="checkbox" value="1" class="form-control form-control-sm" name="ignore_pwr" id="ignore_pwr" title="log out of wavelog to disregard old value" value="" />
 							</div>
 						</div>
 					</div>

advanced.js

@@ -69,36 +69,6 @@ function createWindow () {
 	return mainWindow;
 }
 
-function createAdvancedWindow (mainWindow) {
-	let advancedWindow;
-	globalShortcut.register('Control+Shift+D', () => {
-		if (!advancedWindow || advancedWindow.isDestroyed()) {
-			const bounds = mainWindow.getBounds();
-			advancedWindow = new BrowserWindow({
-				width: 430,
-				height: 250,
-				resizable: false,
-				autoHideMenuBar: app.isPackaged,
-				webPreferences: {
-					contextIsolation: false,
-					nodeIntegration: true,
-					devTools: !app.isPackaged,
-					enableRemoteModule: true,
-				},
-				x: bounds.x + bounds.width + 10,
-				y: bounds.y,
-			});
-			if (app.isPackaged) {
-				advancedWindow.setMenu(null);
-			}
-			advancedWindow.loadFile('advanced.html');
-			advancedWindow.setTitle(require('./package.json').name + " V" + require('./package.json').version);
-		} else {
-			advancedWindow.focus();
-		}
-
-	});
-}
 
 ipcMain.on("set_config", async (event,arg) => {
 	defaultcfg=arg;
@@ -222,7 +192,6 @@ if (!gotTheLock) {
 	app.whenReady().then(() => {
 		powerSaveBlockerId = powerSaveBlocker.start('prevent-app-suspension');
 		s_mainWindow=createWindow();
-		createAdvancedWindow(s_mainWindow);
 		globalShortcut.register('Control+Shift+I', () => { return false; });
 		app.on('activate', function () {
 			if (BrowserWindow.getAllWindows().length === 0) createWindow()