Preferences UI: final cleanup

This commit does some final cleaning up to the code, mostly deleting
white space and comments.

Signed-off-by: willemferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

9 files changed, 31 insertions, 25 deletions

diff --git a/desktop-widgets/preferences/preferences_dc.cpp b/desktop-widgets/preferences/preferences_dc.cpp
index c39754497..f79e11b5a 100644
--- a/desktop-widgets/preferences/preferences_dc.cpp
+++ b/desktop-widgets/preferences/preferences_dc.cpp
@@ -30,7 +30,6 @@ void PreferencesDc::on_resetRememberedDCs_clicked()
 	qPrefDiveComputer::set_vendor4(QString());
 }
 
-
 void PreferencesDc::refreshSettings()
 {
 }
diff --git a/desktop-widgets/preferences/preferences_defaults.cpp b/desktop-widgets/preferences/preferences_defaults.cpp
index 7b3c16148..98e33a2ff 100644
--- a/desktop-widgets/preferences/preferences_defaults.cpp
+++ b/desktop-widgets/preferences/preferences_defaults.cpp
@@ -22,12 +22,6 @@ PreferencesDefaults::~PreferencesDefaults()
 	delete ui;
 }
 
-/*void PreferencesDefaults::on_resetSettings_clicked()
-{
-	auto dialog = PreferencesDialog::instance();
-	dialog->defaultsRequested();
-} */
-
 void PreferencesDefaults::refreshSettings()
 {
 	ui->font->setCurrentFont(qPrefDisplay::divelist_font());
diff --git a/desktop-widgets/preferences/preferences_equipment.cpp b/desktop-widgets/preferences/preferences_equipment.cpp
index bd5ac4158..7435f3539 100644
--- a/desktop-widgets/preferences/preferences_equipment.cpp
+++ b/desktop-widgets/preferences/preferences_equipment.cpp
@@ -9,8 +9,6 @@
 #include <QMessageBox>
 #include <QSortFilterProxyModel>
 
-#include "qt-models/models.h"
-
 PreferencesEquipment::PreferencesEquipment() : AbstractPreferencesWidget(tr("Equipment"), QIcon(":preferences-equipment-icon"), 5)
 {
 	ui = new Ui::PreferencesEquipment();
diff --git a/desktop-widgets/preferences/preferences_georeference.ui b/desktop-widgets/preferences/preferences_georeference.ui
index e3e7fe4c7..04aeff14d 100644
--- a/desktop-widgets/preferences/preferences_georeference.ui
+++ b/desktop-widgets/preferences/preferences_georeference.ui
@@ -14,11 +14,34 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+
    <item>
-    <widget class="QGroupBox" name="groupBox_12">
-     <property name="title">
-      <string>Dive site layout</string>
+    <widget class="QLabel" name="label_georef1">
+     <property name="toolTip">
+      <string extracomment="Help info 1"/>
+     </property>
+     <property name="text">
+      <string>Reverse dive site lookup format</string>
+     </property>
+    </widget>
+   </item>
+
+   <item>
+    <widget class="QLabel" name="label_georef2">
+     <property name="toolTip">
+      <string extracomment="Help info 1"/>
      </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+     <property name="text">
+      <string>Selecting the blue globe icon to the right of Location in the Notes tab opens the Edit Dive Site panel. There, an icon to the right of the dive site coordinates allows reverse lookup of the dive site. This finds the country and closest town to the divesite and adds them as dive site tags above the dive site name in the Notes tab. The combo boxes below allow one to select the order in which these tags are shown in the Notes tab. This requires an Internet connection.</string>
+     </property>
+    </widget>
+   </item>
+
+   <item>
+    <widget class="QGroupBox" name="groupBox_12">
      <layout class="QHBoxLayout" name="horizontalLayout_10">
       <item>
        <widget class="QComboBox" name="first_item">
diff --git a/desktop-widgets/preferences/preferences_media.cpp b/desktop-widgets/preferences/preferences_media.cpp
index 14cdfe49c..c376d1410 100644
--- a/desktop-widgets/preferences/preferences_media.cpp
+++ b/desktop-widgets/preferences/preferences_media.cpp
@@ -3,6 +3,7 @@
 #include "ui_preferences_media.h"
 #include "core/settings/qPrefMedia.h"
 #include "core/qthelper.h"
+#include "qt-models/models.h"
 
 #include <QApplication>
 #include <QMessageBox>
@@ -10,13 +11,10 @@
 #include <QFileDialog>
 #include <QProcess>
 
-#include "qt-models/models.h"
-
 PreferencesMedia::PreferencesMedia() : AbstractPreferencesWidget(tr("Media"), QIcon(":preferences-media-icon"), 6)
 {
 	ui = new Ui::PreferencesMedia();
 	ui->setupUi(this);
-
 }
 
 PreferencesMedia::~PreferencesMedia()
@@ -75,7 +73,6 @@ void PreferencesMedia::refreshSettings()
 	ui->ffmpegExecutable->setText(qPrefMedia::ffmpeg_executable());
 
 	ui->auto_recalculate_thumbnails->setChecked(prefs.auto_recalculate_thumbnails);
-
 }
 
 void PreferencesMedia::syncSettings()
@@ -85,5 +82,4 @@ void PreferencesMedia::syncSettings()
 	media->set_extract_video_thumbnails_position(ui->videoThumbnailPosition->value());
 	media->set_ffmpeg_executable(ui->ffmpegExecutable->text());
 	qPrefMedia::set_auto_recalculate_thumbnails(ui->auto_recalculate_thumbnails->isChecked());
-
 }
diff --git a/desktop-widgets/preferences/preferences_media.ui b/desktop-widgets/preferences/preferences_media.ui
index f82e6fdcb..64e9d5986 100644
--- a/desktop-widgets/preferences/preferences_media.ui
+++ b/desktop-widgets/preferences/preferences_media.ui
@@ -35,7 +35,7 @@
       <bool>true</bool>
      </property>
      <property name="text">
-      <string>Photographs or videos are sometimes edited. If a photo is more recent than its thumbnail, checking the checkbox below will allow creating a new thumbnail after the media has been edited.</string>
+      <string>Photographs or videos are sometimes edited after being uploaded and linked to Subsurface. If a photo is therefore more recent than its original thumbnail, checking the checkbox below will allow creating a new thumbnail after the media has been edited.</string>
      </property>
     </widget>
    </item>
diff --git a/desktop-widgets/preferences/preferences_reset.cpp b/desktop-widgets/preferences/preferences_reset.cpp
index 2ebfef91a..3fd6aa07e 100644
--- a/desktop-widgets/preferences/preferences_reset.cpp
+++ b/desktop-widgets/preferences/preferences_reset.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "preferences_reset.h"
 #include "ui_preferences_reset.h"
-#include "core/dive.h"
 #include "preferencesdialog.h"
 
 PreferencesReset::PreferencesReset(): AbstractPreferencesWidget(tr("Reset"), QIcon(":preferences-reset-icon"), 11 ), ui(new Ui::PreferencesReset())
diff --git a/desktop-widgets/preferences/preferences_reset.h b/desktop-widgets/preferences/preferences_reset.h
index bf5af593b..7bd8c4798 100644
--- a/desktop-widgets/preferences/preferences_reset.h
+++ b/desktop-widgets/preferences/preferences_reset.h
@@ -22,8 +22,8 @@ public slots:
 
 private:
 	Ui::PreferencesReset *ui;
-};
 
+};
 
 #endif
 
diff --git a/desktop-widgets/preferences/preferences_reset.ui b/desktop-widgets/preferences/preferences_reset.ui
index c9e53dd5f..6e5da21ab 100644
--- a/desktop-widgets/preferences/preferences_reset.ui
+++ b/desktop-widgets/preferences/preferences_reset.ui
@@ -15,9 +15,6 @@
   </property>
   <layout class="QGridLayout" name="gridLayout">
 
-
-
-
    <item row="0" column="0" colspan="2">
    <layout class="QHBoxLayout" name="horizontalLayout">
 
@@ -39,7 +36,7 @@
       <bool>true</bool>
      </property>
      <property name="text">
-      <string>Selecting this button will reset all settings to their default values</string>
+      <string>Selecting this button will reset all preferences to their default values</string>
      </property>
     </widget>
    </item>
@@ -50,7 +47,7 @@
    <item row="1" column="0">
     <widget class="QPushButton" name="resetSettings">
      <property name="text">
-      <string>Reset all settings</string>
+      <string>Reset all preferences</string>
      </property>
     </widget>
    </item>