summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/settings/qPrefDiveComputer.cpp2
-rw-r--r--core/settings/qPrefEquipment.cpp1
-rw-r--r--core/settings/qPrefGeneral.cpp2
-rw-r--r--core/settings/qPrefGeocoding.cpp4
-rw-r--r--core/settings/qPrefGeocoding.h1
-rw-r--r--core/settings/qPrefLog.cpp3
-rw-r--r--core/settings/qPrefMedia.cpp1
-rw-r--r--core/settings/qPrefTechnicalDetails.h1
-rw-r--r--desktop-widgets/preferences/preferences_dc.cpp1
-rw-r--r--desktop-widgets/preferences/preferences_defaults.cpp6
-rw-r--r--desktop-widgets/preferences/preferences_equipment.cpp2
-rw-r--r--desktop-widgets/preferences/preferences_georeference.ui29
-rw-r--r--desktop-widgets/preferences/preferences_media.cpp6
-rw-r--r--desktop-widgets/preferences/preferences_media.ui2
-rw-r--r--desktop-widgets/preferences/preferences_reset.cpp1
-rw-r--r--desktop-widgets/preferences/preferences_reset.h2
-rw-r--r--desktop-widgets/preferences/preferences_reset.ui7
-rw-r--r--packaging/ios/Subsurface-mobile.pro6
18 files changed, 40 insertions, 37 deletions
diff --git a/core/settings/qPrefDiveComputer.cpp b/core/settings/qPrefDiveComputer.cpp
index c19f56c18..0ee74254a 100644
--- a/core/settings/qPrefDiveComputer.cpp
+++ b/core/settings/qPrefDiveComputer.cpp
@@ -10,7 +10,6 @@ qPrefDiveComputer *qPrefDiveComputer::instance()
return self;
}
-
void qPrefDiveComputer::loadSync(bool doSync)
{
// last computer used
@@ -30,7 +29,6 @@ void qPrefDiveComputer::loadSync(bool doSync)
DISK_DC(2)
DISK_DC(3)
DISK_DC(4)
-
}
// these are the 'active' settings
diff --git a/core/settings/qPrefEquipment.cpp b/core/settings/qPrefEquipment.cpp
index f7bdb01e1..10c6877aa 100644
--- a/core/settings/qPrefEquipment.cpp
+++ b/core/settings/qPrefEquipment.cpp
@@ -14,7 +14,6 @@ void qPrefEquipment::loadSync(bool doSync)
{
disk_default_cylinder(doSync);
disk_display_unused_tanks(doSync);
-
}
HANDLE_PREFERENCE_TXT(Equipment, "default_cylinder", default_cylinder);
diff --git a/core/settings/qPrefGeneral.cpp b/core/settings/qPrefGeneral.cpp
index 25ed835f0..96b9a1aca 100644
--- a/core/settings/qPrefGeneral.cpp
+++ b/core/settings/qPrefGeneral.cpp
@@ -2,7 +2,6 @@
#include "qPrefGeneral.h"
#include "qPrefPrivate.h"
-
static const QString group = QStringLiteral("GeneralSettings");
QString qPrefGeneral::st_diveshareExport_uid;
@@ -17,7 +16,6 @@ qPrefGeneral *qPrefGeneral::instance()
return self;
}
-
void qPrefGeneral::loadSync(bool doSync)
{
disk_defaultsetpoint(doSync);
diff --git a/core/settings/qPrefGeocoding.cpp b/core/settings/qPrefGeocoding.cpp
index 57450eac2..2c27ea4f4 100644
--- a/core/settings/qPrefGeocoding.cpp
+++ b/core/settings/qPrefGeocoding.cpp
@@ -17,7 +17,6 @@ void qPrefGeocoding::loadSync(bool doSync)
disk_third_taxonomy_category(doSync);
}
-
void qPrefGeocoding::set_first_taxonomy_category(taxonomy_category value)
{
if (value != prefs.geocoding.category[0]) {
@@ -34,7 +33,6 @@ void qPrefGeocoding::disk_first_taxonomy_category(bool doSync)
prefs.geocoding.category[0] = (enum taxonomy_category)qPrefPrivate::propValue(keyFromGroupAndName(group, "cat0"), default_prefs.geocoding.category[0]).toInt();
}
-
void qPrefGeocoding::set_second_taxonomy_category(taxonomy_category value)
{
if (value != prefs.geocoding.category[1]) {
@@ -43,6 +41,7 @@ void qPrefGeocoding::set_second_taxonomy_category(taxonomy_category value)
emit instance()->second_taxonomy_categoryChanged(value);
}
}
+
void qPrefGeocoding::disk_second_taxonomy_category(bool doSync)
{
if (doSync)
@@ -60,6 +59,7 @@ void qPrefGeocoding::set_third_taxonomy_category(taxonomy_category value)
emit instance()->third_taxonomy_categoryChanged(value);
}
}
+
void qPrefGeocoding::disk_third_taxonomy_category(bool doSync)
{
if (doSync)
diff --git a/core/settings/qPrefGeocoding.h b/core/settings/qPrefGeocoding.h
index f2eb95fbc..c8c4c106d 100644
--- a/core/settings/qPrefGeocoding.h
+++ b/core/settings/qPrefGeocoding.h
@@ -5,7 +5,6 @@
#include <QObject>
-
class qPrefGeocoding : public QObject {
Q_OBJECT
Q_PROPERTY(taxonomy_category first_taxonomy_category READ first_taxonomy_category WRITE set_first_taxonomy_category NOTIFY first_taxonomy_categoryChanged)
diff --git a/core/settings/qPrefLog.cpp b/core/settings/qPrefLog.cpp
index 2ce9ae550..3a267b56d 100644
--- a/core/settings/qPrefLog.cpp
+++ b/core/settings/qPrefLog.cpp
@@ -19,8 +19,6 @@ void qPrefLog::loadSync(bool doSync)
disk_show_average_depth(doSync);
}
-HANDLE_PREFERENCE_TXT(Log, "default_filename", default_filename);
-
void qPrefLog::set_default_file_behavior(enum def_file_behavior value)
{
if (value != prefs.default_file_behavior ||
@@ -50,6 +48,7 @@ void qPrefLog::disk_default_file_behavior(bool doSync)
}
}
+HANDLE_PREFERENCE_TXT(Log, "default_filename", default_filename);
HANDLE_PREFERENCE_BOOL(Log, "extraEnvironmentalDefault", extraEnvironmentalDefault);
diff --git a/core/settings/qPrefMedia.cpp b/core/settings/qPrefMedia.cpp
index 557b2124f..60e68f3d9 100644
--- a/core/settings/qPrefMedia.cpp
+++ b/core/settings/qPrefMedia.cpp
@@ -17,7 +17,6 @@ void qPrefMedia::loadSync(bool doSync)
disk_ffmpeg_executable(doSync);
disk_auto_recalculate_thumbnails(doSync);
disk_auto_recalculate_thumbnails(doSync);
-
}
HANDLE_PREFERENCE_BOOL(Media, "auto_recalculate_thumbnails", auto_recalculate_thumbnails);
diff --git a/core/settings/qPrefTechnicalDetails.h b/core/settings/qPrefTechnicalDetails.h
index 5b62aa7ea..f50aa35b2 100644
--- a/core/settings/qPrefTechnicalDetails.h
+++ b/core/settings/qPrefTechnicalDetails.h
@@ -5,7 +5,6 @@
#include <QObject>
-
class qPrefTechnicalDetails : public QObject {
Q_OBJECT
Q_PROPERTY(bool calcalltissues READ calcalltissues WRITE set_calcalltissues NOTIFY calcalltissuesChanged)
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>
diff --git a/packaging/ios/Subsurface-mobile.pro b/packaging/ios/Subsurface-mobile.pro
index bfbf8e413..017392405 100644
--- a/packaging/ios/Subsurface-mobile.pro
+++ b/packaging/ios/Subsurface-mobile.pro
@@ -101,6 +101,9 @@ SOURCES += ../../subsurface-mobile-main.cpp \
../../core/settings/qPrefProxy.cpp \
../../core/settings/qPrefTechnicalDetails.cpp \
../../core/settings/qPrefUnit.cpp \
+ ../../core/settings/qPrefEquipment.cpp \
+ ../../core/settings/qPrefLog.cpp \
+ ../../core/settings/qPrefMedia.cpp \
../../core/settings/qPrefUpdateManager.cpp \
../../core/subsurface-qt/CylinderObjectHelper.cpp \
../../core/subsurface-qt/DiveObjectHelper.cpp \
@@ -226,6 +229,9 @@ HEADERS += \
../../core/settings/qPrefProxy.h \
../../core/settings/qPrefTechnicalDetails.h \
../../core/settings/qPrefUnit.h \
+ ../../core/settings/qPrefEquipment.h \
+ ../../core/settings/qPrefLog.h \
+ ../../core/settings/qPrefMedia.h \
../../core/settings/qPrefUpdateManager.h \
../../core/subsurface-qt/CylinderObjectHelper.h \
../../core/subsurface-qt/DiveObjectHelper.h \
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-27 21:31:37 +0000