From 75b5be8f40df3d3b7d354eead0439b53b2490024 Mon Sep 17 00:00:00 2001
From: willemferguson <willemferguson@zoology.up.ac.za>
Date: Tue, 10 Dec 2019 15:02:13 +0200
Subject: Preferences UI: add reset tab

Add a separate preferences tab for resetting all preferences to their default values.
One or two very small alterations to other sections of the preferences UI code.

Signed-off-by: willemferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 .../preferences/preferences_defaults.ui            | 97 ++++++++++++----------
 1 file changed, 54 insertions(+), 43 deletions(-)

(limited to 'desktop-widgets/preferences/preferences_defaults.ui')

diff --git a/desktop-widgets/preferences/preferences_defaults.ui b/desktop-widgets/preferences/preferences_defaults.ui
index 3d9e45c98..030bb77d6 100644
--- a/desktop-widgets/preferences/preferences_defaults.ui
+++ b/desktop-widgets/preferences/preferences_defaults.ui
@@ -14,15 +14,17 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+
    <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
-      <string>Lists and tables</string>
+      <string>Font for lists and tables</string>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout_1">
       <property name="margin">
        <number>5</number>
       </property>
+
       <item>
        <widget class="QLabel" name="label_7">
         <property name="text">
@@ -33,6 +35,18 @@
       <item>
        <widget class="QFontComboBox" name="font"/>
       </item>
+
+      <item>
+       <widget class="QLabel" name="label_default1">
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+        <property name="text">
+         <string></string>
+        </property>
+       </widget>
+      </item>
+
       <item>
        <widget class="QLabel" name="label_8">
         <property name="text">
@@ -43,6 +57,7 @@
       <item>
        <widget class="QDoubleSpinBox" name="fontsize"/>
       </item>
+
      </layout>
     </widget>
    </item>
@@ -52,43 +67,55 @@
      <property name="title">
       <string>Animations</string>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <layout class="QVBoxLayout" name="verticalLayout_4">
       <property name="margin">
        <number>5</number>
       </property>
+
       <item>
-       <widget class="QLabel" name="label_15">
-        <property name="text">
-         <string>Speed</string>
+       <widget class="QLabel" name="label_help4">
+        <property name="toolTip">
+         <string extracomment="Help info 1"/>
         </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QSlider" name="velocitySlider">
-        <property name="maximum">
-         <number>500</number>
+        <property name="wordWrap">
+         <bool>true</bool>
         </property>
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
+        <property name="text">
+         <string>In some actions, e.g. when zooming the dive profile, the changing axis values are animated. Select the speed with which this animation should occur (maximum = 500):</string>
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QSpinBox" name="velocitySpinBox">
-        <property name="maximum">
-         <number>500</number>
-        </property>
-       </widget>
+
+      <item>  
+       <layout class="QHBoxLayout" name="horizontalLayout_4">
+        <item>
+         <widget class="QLabel" name="label_15">
+          <property name="text">
+            <string>Speed</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSlider" name="velocitySlider">
+          <property name="maximum">
+           <number>500</number>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="velocitySpinBox">
+          <property name="maximum">
+           <number>500</number>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
-     </layout>
-    </widget>
-   </item>
 
-   <item>
-    <widget class="QPushButton" name="resetSettings">
-     <property name="text">
-      <string>Reset all settings to their default value</string>
-     </property>
+     </layout>
     </widget>
    </item>
 
@@ -109,22 +136,6 @@
  </widget>
  <resources/>
  <connections>
-  <connection>
-   <sender>btnUseDefaultFile</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>chooseFile</receiver>
-   <slot>setHidden(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>462</x>
-     <y>136</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>528</x>
-     <y>145</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>velocitySlider</sender>
    <signal>valueChanged(int)</signal>
-- 
cgit v1.2.3-70-g09d2