From cf48dd107b422ccfba755fb2217318745b0cd99f Mon Sep 17 00:00:00 2001
From: Tommy Mikkelsen <tm@orstrand.dk>
Date: Tue, 16 Aug 2022 11:27:58 +0200
Subject: [PATCH] #553 WIP

---
 src/components/modules/General/wtng-tt.vue    |  2 +-
 .../modules/General/wtng-ttlabel.vue          | 28 +++++++++-------
 .../modules/Main/Settings/SettingsGeneral.vue |  2 +-
 .../Main/Settings/SettingsLibraryMapping.vue  | 26 +++------------
 .../modules/PMS/Settings/settings.vue         | 32 ++++---------------
 .../modules/PMS/ViewState/ViewState.vue       | 12 +++----
 6 files changed, 37 insertions(+), 65 deletions(-)

diff --git a/src/components/modules/General/wtng-tt.vue b/src/components/modules/General/wtng-tt.vue
index 88b8916..2b172b5 100644
--- a/src/components/modules/General/wtng-tt.vue
+++ b/src/components/modules/General/wtng-tt.vue
@@ -19,7 +19,7 @@
             },
             color:{
                 type:String,
-                default: 'teal'
+                default: 'limegreen'
             }
         },
         computed:{
diff --git a/src/components/modules/General/wtng-ttlabel.vue b/src/components/modules/General/wtng-ttlabel.vue
index acd6156..257f20f 100644
--- a/src/components/modules/General/wtng-ttlabel.vue
+++ b/src/components/modules/General/wtng-ttlabel.vue
@@ -1,14 +1,11 @@
 <template v-slot:label>
-    <span class="icon is-right font-weight-bold" v-bind:id="ttid">
-        <!--<slot name="label"></slot>-->
-        <span size="lg">
-        {{ label }}
-        </span>
+    <p class="icon is-right font-weight-bold" :style="getStyle">
+        {{ getLabel }}
+        <span :id="ttid"><i :style="getIconStyle" class="ttqmark far fa-question-circle"></i></span>
         <b-tooltip v-bind:target="ttid" triggers="hover">
             {{ tooltip }}
         </b-tooltip>
-        <span id="ttid"><i :style="getStyle" class="ttqmark far fa-question-circle"></i></span>
-    </span>
+    </p>
 </template>
 
 <script>
@@ -21,11 +18,15 @@
             },
             size:{
                 type:String,
-                default: "lg"
+                default: "20px"
             },
             color:{
                 type:String,
-                default: 'teal'
+                default: 'black'
+            },
+            iconColor:{
+                type:String,
+                default: 'limegreen'
             },
             label:{
                 type: String
@@ -36,17 +37,22 @@
                 return this.makeid(16)
             },
             tooltip: function() {
-                console.log('Ged 44-3', this.tt)
                 return i18n.t(this.tt);
             },
             getLabel: function() {
-                return this.label;
+                return i18n.t(this.label);
             },
             getStyle: function(){
                 return {
                     color: this.color,
                     fontSize: this.size
                 }
+            },
+            getIconStyle: function(){
+                return {
+                    color: this.iconColor,
+                    fontSize: this.size
+                }
             }
         },
         methods:{
diff --git a/src/components/modules/Main/Settings/SettingsGeneral.vue b/src/components/modules/Main/Settings/SettingsGeneral.vue
index fce121a..b9d108a 100644
--- a/src/components/modules/Main/Settings/SettingsGeneral.vue
+++ b/src/components/modules/Main/Settings/SettingsGeneral.vue
@@ -50,7 +50,7 @@
 <script>
   import i18n from '../../../../i18n';
   import { wtconfig } from '../../General/wtutils';
-  import WTNGtt from '../../General/wtng-tt.vue'
+  import WTNGtt from '../../General/wtng-tt.vue';
 
   const log = require("electron-log");
   export default {
diff --git a/src/components/modules/Main/Settings/SettingsLibraryMapping.vue b/src/components/modules/Main/Settings/SettingsLibraryMapping.vue
index bee4b88..81d3894 100644
--- a/src/components/modules/Main/Settings/SettingsLibraryMapping.vue
+++ b/src/components/modules/Main/Settings/SettingsLibraryMapping.vue
@@ -9,7 +9,8 @@
     <br>
     <!-- Select Lib -->
     <div class="d-flex align-items-center">
-      <b-form-group id="SelLibGroup" v-bind:label="$t('Modules.ET.optExpType.lblSelectSelection')" label-size="lg" label-class="font-weight-bold pt-0">
+      <b-form-group>
+        <WTNGttlabel tt="Common.Settings.LibMapping.ttSelectLibrary" label="Modules.ET.optExpType.lblSelectSelection" />
         <b-form-select
           v-model="selLib"
           id="selLib"
@@ -18,28 +19,10 @@
           style="width: auto"
           name="selLib">
         </b-form-select>
-        <WTNGtt tt="Common.Settings.LibMapping.ttSelectLibrary" size="20px"></WTNGtt>
       </b-form-group>
     </div>
     <br>
 
-    <div class="d-flex align-items-center">
-      <b-form-group id="SelLibGroup" v-bind:label="$t('Modules.ET.optExpType.lblSelectSelection')" label-size="lg" label-class="font-weight-bold pt-0">
-        <b-form-select
-          v-model="selLib"
-          id="selLib"
-          :options="selLibOptions"
-          @change="getLibPath"
-          style="width: auto"
-          name="selLib">
-        </b-form-select>
-        <WTNGtt tt="Common.Settings.LibMapping.ttSelectLibrary" size="20px"></WTNGtt>
-      </b-form-group>
-    </div>
-    <br>
-
-
-
     <!-- Table of section path -->
     <b-table ref="table"
       striped
@@ -66,13 +49,14 @@
   import i18n from '../../../../i18n';
   import store from '../../../../store';
   import { wtconfig, dialog } from '../../General/wtutils';
-  import WTNGtt from '../../General/wtng-tt.vue'
+  import WTNGttlabel from '../../General/wtng-ttlabel.vue'
   import { pms } from '../../General/pms';
 
+
   const log = require("electron-log");
   export default {
     components: {
-            WTNGtt
+            WTNGttlabel
         },
     data() {
       return {
diff --git a/src/components/modules/PMS/Settings/settings.vue b/src/components/modules/PMS/Settings/settings.vue
index a0ebb35..b6718f5 100644
--- a/src/components/modules/PMS/Settings/settings.vue
+++ b/src/components/modules/PMS/Settings/settings.vue
@@ -11,27 +11,8 @@
   <p>{{ $t("Modules.PMS.Settings.Notice") }}</p>
   <br>
   <div> <!-- Settings to show -->
-
-<!-- tt="Modules.PMS.Settings.TTSettingsFilter" color="green" -->
-
-    <b-form-group id="FilterSettingsGroup" label-size="lg" label-class="font-weight-bold pt-0">
-      <WTNGttlabel tt="Modules.PMS.Settings.TTSettingsFilter" label="GummiGed 664 lidt mere" />
-
-
-<!--
-        <template v-slot:label>
-            <div class="icon is-right">
-                {{$t(`Modules.PMS.Settings.SettingsFilter`)}}
-                <b-tooltip target="FilterSettingsTT" triggers="hover">
-                    {{ $t(`Modules.PMS.Settings.TTSettingsFilter`) }}
-                </b-tooltip>
-                <span id="FilterSettingsTT"><i class="ttqmark far fa-question-circle"></i></span>
-            </div>
-        </template>
-        -->
-
-
-
+    <b-form-group>
+      <WTNGttlabel tt="Modules.PMS.Settings.TTSettingsFilter" label="Modules.PMS.Settings.SettingsFilter" />
       <b-form-radio-group
         id="FilterSettings"
         v-model="selFilterSetting"
@@ -43,7 +24,9 @@
     </b-form-group>
   </div>
   <div class="d-flex align-items-center">
-    <b-form-group id="etLibraryGroup" v-bind:label="$t('Modules.PMS.Settings.SelectSettingsSelection')" label-size="lg" label-class="font-weight-bold pt-0">
+    <!--<b-form-group id="etLibraryGroup" v-bind:label="$t('Modules.PMS.Settings.SelectSettingsSelection')" label-size="lg" label-class="font-weight-bold pt-0"> -->
+    <b-form-group>
+      <WTNGttlabel tt="Modules.PMS.Settings.TTSelectSettingsSelection" label="Modules.PMS.Settings.SelectSettingsSelection" />
       <b-form-select
         v-model="selSection"
         id="selSection"
@@ -52,7 +35,6 @@
         style="width: 75%"
         name="selSection">
       </b-form-select>
-      <WTNGtt tt="Modules.PMS.Settings.TTSelectSettingsSelection" size="20px"></WTNGtt>
     </b-form-group>
   </div>
   <div> <!-- Modal popup -->
@@ -133,14 +115,14 @@
     const log = require("electron-log");
     const {JSONPath} = require('jsonpath-plus');
     import {wtconfig} from './../../General/wtutils';
-    import WTNGtt from './../../General/wtng-tt.vue';
+   // import WTNGtt from './../../General/wtng-tt.vue';
     import WTNGttlabel from './../../General/wtng-ttlabel.vue'
     import i18n from '../../../../i18n';
     import store from '../../../../store';
     import { pmssettings } from "./scripts/settings";
     export default {
         components: {
-            WTNGtt,
+    //        WTNGtt,
             WTNGttlabel
         },
         data() {
diff --git a/src/components/modules/PMS/ViewState/ViewState.vue b/src/components/modules/PMS/ViewState/ViewState.vue
index 7d39f1e..85e5142 100644
--- a/src/components/modules/PMS/ViewState/ViewState.vue
+++ b/src/components/modules/PMS/ViewState/ViewState.vue
@@ -7,7 +7,8 @@
       <h5>{{ $t(`Modules.PMS.ViewState.Description`) }}</h5>
     </div>
     <div class="d-flex align-items-center">
-      <b-form-group id="ViewStateSelSourceUsrGroup" v-bind:label="$t('Modules.PMS.ViewState.selSourceUsr')" label-size="lg" label-class="font-weight-bold pt-0" name="ViewStateSelSourceUsrGroup">
+      <b-form-group name="ViewStateSelSourceUsrGroup">
+        <WTNGttlabel tt="Modules.PMS.ViewState.ttSelSourceUsr" label="Modules.PMS.ViewState.selSourceUsr" />
         <b-form-select
           v-model="selSrcUsr"
           id="selSrcUsr"
@@ -16,14 +17,14 @@
           style="width: 75%"
           name="selSrcUsr">
         </b-form-select>
-        <WTNGtt tt="Modules.PMS.ViewState.ttSelSourceUsr" size="20px"></WTNGtt>
       </b-form-group>
     </div>
     <div ref="libSpinner" id="libSpinner" :hidden="WaitForUsers">
       <b-spinner id="libLoad" class="ml-auto text-danger"></b-spinner>
     </div>
     <div class="d-flex align-items-center">
-      <b-form-group id="ViewStateSelTargetUsrGroup" v-bind:label="$t('Modules.PMS.ViewState.selTargetUsr')" label-size="lg" label-class="font-weight-bold pt-0" name="ViewStateSelTargetUsrGroup">
+      <b-form-group name="ViewStateSelTargetUsrGroup">
+        <WTNGttlabel tt="Modules.PMS.ViewState.ttSelTargetUsr" label="Modules.PMS.ViewState.selTargetUsr" />
         <b-form-select
           v-model="selTargetUsr"
           @change="selTargetUsrChanged"
@@ -32,7 +33,6 @@
           style="width: 75%"
           name="selTargetUsr">
         </b-form-select>
-        <WTNGtt tt="Modules.PMS.ViewState.ttSelTargetUsr" size="20px"></WTNGtt>
       </b-form-group>
     </div>
     <br>
@@ -72,7 +72,7 @@
   import i18n from '../../../../i18n';
   import store from '../../../../store';
   import { wtconfig } from '../../General/wtutils'
-  import WTNGtt from '../../General/wtng-tt.vue'
+  import WTNGttlabel from './../../General/wtng-ttlabel.vue'
   import { status } from '../../General/status';
   import { viewstate } from "./scripts/viewstate";
   import statusDiv from '../../General/status.vue'
@@ -80,7 +80,7 @@
   export default {
     components: {
       statusDiv,
-      WTNGtt
+      WTNGttlabel
     },
       data() {
         return {