From 88cbcf5c6ea56a8e31617a426e7ca8221999afe8 Mon Sep 17 00:00:00 2001
From: willemferguson <willemferguson@zoology.up.ac.za>
Date: Wed, 25 Dec 2019 07:26:58 +0200
Subject: Cosmetic updates to .UI files for Preferences

This is a cosmetic update to remove some warning messages
while building a fresh subsurface. These warnings were due to
duplicate label names in the .UI files.

Signed-off-by: willemferguson <willemferguson@zoology.up.ac.za>
---
 desktop-widgets/preferences/preferences_dc.ui    |  8 ++++----
 desktop-widgets/preferences/preferences_log.ui   | 16 ++++++++--------
 desktop-widgets/preferences/preferences_media.ui | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'desktop-widgets')

diff --git a/desktop-widgets/preferences/preferences_dc.ui b/desktop-widgets/preferences/preferences_dc.ui
index cb93eddae..51f66c847 100644
--- a/desktop-widgets/preferences/preferences_dc.ui
+++ b/desktop-widgets/preferences/preferences_dc.ui
@@ -16,7 +16,7 @@
   <layout class="QVBoxLayout" name="verticalLayout">
 
    <item>
-    <widget class="QLabel" name="label_help2">
+    <widget class="QLabel" name="label_dc_help">
      <property name="toolTip">
       <string extracomment="Help info 1"/>
      </property>
@@ -31,7 +31,7 @@
      <layout class="QGridLayout" name="gridlayout">
 
    <item row="0" column="0">
-    <widget class="QLabel" name="label_help2">
+    <widget class="QLabel" name="label_dc_help1">
      <property name="toolTip">
       <string extracomment="Help info 1"/>
      </property>
@@ -42,7 +42,7 @@
    </item>
 
    <item row="1" column="0" colspan="2">
-    <widget class="QLabel" name="label_help2">
+    <widget class="QLabel" name="label_dc_help2">
      <property name="toolTip">
       <string extracomment="Help info 1"/>
      </property>
@@ -64,7 +64,7 @@
    </item>
 
    <item row="2" column="1">
-    <widget class="QLabel" name="label_help2">
+    <widget class="QLabel" name="label_dc_help3">
      <property name="text">
       <string> </string>
      </property>
diff --git a/desktop-widgets/preferences/preferences_log.ui b/desktop-widgets/preferences/preferences_log.ui
index 8dd76ad4c..9d1214b92 100644
--- a/desktop-widgets/preferences/preferences_log.ui
+++ b/desktop-widgets/preferences/preferences_log.ui
@@ -15,13 +15,13 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
 
-      <item>
-       <widget class="QLabel" name="label_9">
-        <property name="text">
-         <string>DIVE LOG</string>
-        </property>
-       </widget>
-      </item>
+   <item>
+    <widget class="QLabel" name="label_log1">
+     <property name="text">
+      <string>DIVE LOG</string>
+     </property>
+    </widget>
+   </item>
 
    <item>
     <widget class="QGroupBox" name="groupBox_3">
@@ -71,7 +71,7 @@
        </layout>
       </item>
       <item row="1" column="0">
-       <widget class="QLabel" name="label_9">
+       <widget class="QLabel" name="label_log_9">
         <property name="text">
          <string>Local dive log file</string>
         </property>
diff --git a/desktop-widgets/preferences/preferences_media.ui b/desktop-widgets/preferences/preferences_media.ui
index 64e9d5986..fbd142911 100644
--- a/desktop-widgets/preferences/preferences_media.ui
+++ b/desktop-widgets/preferences/preferences_media.ui
@@ -16,7 +16,7 @@
   <layout class="QVBoxLayout" name="verticalLayout">
 
    <item>
-    <widget class="QLabel" name="label_help4">
+    <widget class="QLabel" name="label_help_thumbnails1">
      <property name="toolTip">
       <string extracomment="Help info 1"/>
      </property>
@@ -27,7 +27,7 @@
    </item>
 
    <item>
-    <widget class="QLabel" name="label_help4">
+    <widget class="QLabel" name="label_help_thumbnails2">
      <property name="toolTip">
       <string extracomment="Help info 1"/>
      </property>
@@ -49,7 +49,7 @@
    </item>
 
    <item>
-    <widget class="QLabel" name="label_help4">
+    <widget class="QLabel" name="label_help_media_1">
      <property name="toolTip">
       <string extracomment="Help info 1"/>
      </property>
@@ -60,7 +60,7 @@
    </item>
 
    <item>
-    <widget class="QLabel" name="label_help4">
+    <widget class="QLabel" name="label_help_video_1">
      <property name="toolTip">
       <string extracomment="Help info 1"/>
      </property>
@@ -87,7 +87,7 @@
       </property>
 
       <item row="0" column="0" colspan="2">
-       <widget class="QLabel" name="label_help4">
+       <widget class="QLabel" name="label_help_video_2">
         <property name="toolTip">
          <string extracomment="Help info 2"/>
         </property>
@@ -131,7 +131,7 @@
       </item>
 
       <item row="3" column="0" colspan="2">
-       <widget class="QLabel" name="label_help4">
+       <widget class="QLabel" name="label_help_video_3">
         <property name="toolTip">
          <string extracomment="Help info 3"/>
         </property>
-- 
cgit v1.2.3-70-g09d2