From e1df2ab141aa7c592650e2c394b858af64e9e93d Mon Sep 17 00:00:00 2001
From: DJ2LS <dj2ls@proton.me>
Date: Sun, 15 Oct 2023 07:37:28 +0200
Subject: [PATCH] adjusted rigcontrol settings

---
 gui_vue/src/components/main_rig_control.vue | 38 +++++++++--------
 gui_vue/src/components/settings_hamlib.vue  | 45 ++++++++++++++-------
 2 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/gui_vue/src/components/main_rig_control.vue b/gui_vue/src/components/main_rig_control.vue
index e209c2df..7cc43f54 100644
--- a/gui_vue/src/components/main_rig_control.vue
+++ b/gui_vue/src/components/main_rig_control.vue
@@ -133,29 +133,27 @@ alert("not yet implemented")
         >
           <div class="input-group input-group-sm mb-1">
             <div class="input-group input-group-sm mb-1">
-              <span class="input-group-text">Rigctld</span>
-              <span class="input-group-text">Address</span>
-              <input
-                type="text"
-                class="form-control"
-                placeholder="rigctld IP"
-                id="hamlib_rigctld_ip"
-                aria-label="Device IP"
-                v-model="settings.hamlib_rigctld_ip"
-              />
-              <span class="input-group-text">Port</span>
-              <input
-                type="text"
-                class="form-control"
-                placeholder="rigctld port"
-                id="hamlib_rigctld_port"
-                aria-label="Device Port"
-                v-model="settings.hamlib_rigctld_port"
-              />
+
+<span class="input-group-text"> Radio port </span>
+
+    <select
+      class="form-select form-select-sm"
+      aria-label=".form-select-sm"
+      id="hamlib_deviceport"
+      style="width: 7rem"
+      @change="saveSettings"
+      v-model="settings.hamlib_deviceport"
+    >
+      <!--<option selected value="/dev/ttyUSB0">/dev/ttyUSB0</option>
+                                    <option value="/dev/ttyUSB1">/dev/ttyUSB1</option>-->
+    </select>
+
+
+
             </div>
 
             <div class="input-group input-group-sm mb-1">
-              <span class="input-group-text">Rigctld</span>
+              <span class="input-group-text">Rigctld service</span>
               <button
                 class="btn btn-outline-success"
                 type="button"
diff --git a/gui_vue/src/components/settings_hamlib.vue b/gui_vue/src/components/settings_hamlib.vue
index c4f88d95..ef320e0d 100644
--- a/gui_vue/src/components/settings_hamlib.vue
+++ b/gui_vue/src/components/settings_hamlib.vue
@@ -42,6 +42,37 @@ function saveSettings() {
       v-model="settings.hamlib_rigctld_server_port"
     />
   </div>
+
+
+    <div class="input-group input-group-sm mb-1">
+    <span class="input-group-text" style="width: 180px"
+      >Rigctld remote ip</span
+    >
+              <input
+                type="text"
+                class="form-control"
+                placeholder="rigctld IP"
+                id="hamlib_rigctld_ip"
+                aria-label="Device IP"
+                v-model="settings.hamlib_rigctld_ip"
+              />
+  </div>
+
+    <div class="input-group input-group-sm mb-1">
+    <span class="input-group-text" style="width: 180px"
+      >Rigctld remote port</span
+    >
+              <input
+                type="text"
+                class="form-control"
+                placeholder="rigctld port"
+                id="hamlib_rigctld_port"
+                aria-label="Device Port"
+                v-model="settings.hamlib_rigctld_port"
+              />
+  </div>
+
+
   <hr class="m-2" />
   <div class="input-group input-group-sm mb-1">
     <span class="input-group-text" style="width: 180px"> Radio model </span>
@@ -320,21 +351,7 @@ function saveSettings() {
       <option value="33001">ELAD FDM-DUO</option>
     </datalist>
   </div>
-  <div class="input-group input-group-sm mb-1">
-    <span class="input-group-text" style="width: 180px"> Device port </span>
 
-    <select
-      class="form-select form-select-sm"
-      aria-label=".form-select-sm"
-      id="hamlib_deviceport"
-      style="width: 7rem"
-      @change="saveSettings"
-      v-model="settings.hamlib_deviceport"
-    >
-      <!--<option selected value="/dev/ttyUSB0">/dev/ttyUSB0</option>
-                                    <option value="/dev/ttyUSB1">/dev/ttyUSB1</option>-->
-    </select>
-  </div>
   <div class="input-group input-group-sm mb-1">
     <span class="input-group-text" style="width: 180px">Serial speed</span>