summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2020-02-19 21:52:10 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-03-01 10:21:44 -0800
commit4cff23ef7a9a5cc7e747198eacc2694a16d8f561 (patch)
tree8698324b47545a7459e9f56338eeb4f4edd99c2d
parenteed4e2746d5a81975f3cabf440e241a38a4aec7c (diff)
downloadsubsurface-4cff23ef7a9a5cc7e747198eacc2694a16d8f561.tar.gz
mobile: remove filter settings
These are not used anymore. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
-rw-r--r--core/pref.h2
-rw-r--r--core/settings/qPrefGeneral.cpp6
-rw-r--r--core/settings/qPrefGeneral.h10
-rw-r--r--core/subsurfacestartup.c2
-rw-r--r--mobile-widgets/qml/Settings.qml44
5 files changed, 0 insertions, 64 deletions
diff --git a/core/pref.h b/core/pref.h
index cfad1abfe..344308549 100644
--- a/core/pref.h
+++ b/core/pref.h
@@ -121,8 +121,6 @@ struct preferences {
int o2consumption; // ml per min
int pscr_ratio; // dump ratio times 1000
bool use_default_file;
- bool filterFullTextNotes; // mobile only - include notes information in full text searh
- bool filterCaseSensitive; // mobile only - make fltering case sensitive
bool extraEnvironmentalDefault;
bool salinityEditDefault;
diff --git a/core/settings/qPrefGeneral.cpp b/core/settings/qPrefGeneral.cpp
index 96b9a1aca..c790bcda7 100644
--- a/core/settings/qPrefGeneral.cpp
+++ b/core/settings/qPrefGeneral.cpp
@@ -21,8 +21,6 @@ void qPrefGeneral::loadSync(bool doSync)
disk_defaultsetpoint(doSync);
disk_o2consumption(doSync);
disk_pscr_ratio(doSync);
- disk_filterFullTextNotes(doSync);
- disk_filterCaseSensitive(doSync);
if (!doSync) {
load_diveshareExport_uid();
@@ -39,7 +37,3 @@ HANDLE_PREFERENCE_INT(General, "pscr_ratio", pscr_ratio);
HANDLE_PROP_QSTRING(General, "diveshareExport/uid", diveshareExport_uid);
HANDLE_PROP_BOOL(General, "diveshareExport/private", diveshareExport_private);
-
-HANDLE_PREFERENCE_BOOL(General, "filterFullTextNotes", filterFullTextNotes);
-
-HANDLE_PREFERENCE_BOOL(General, "filterCaseSensitive", filterCaseSensitive);
diff --git a/core/settings/qPrefGeneral.h b/core/settings/qPrefGeneral.h
index 236dc5b21..5b334d86d 100644
--- a/core/settings/qPrefGeneral.h
+++ b/core/settings/qPrefGeneral.h
@@ -12,8 +12,6 @@ class qPrefGeneral : public QObject {
Q_PROPERTY(int pscr_ratio READ pscr_ratio WRITE set_pscr_ratio NOTIFY pscr_ratioChanged)
Q_PROPERTY(QString diveshareExport_uid READ diveshareExport_uid WRITE set_diveshareExport_uid NOTIFY diveshareExport_uidChanged)
Q_PROPERTY(bool diveshareExport_private READ diveshareExport_private WRITE set_diveshareExport_private NOTIFY diveshareExport_privateChanged)
- Q_PROPERTY(bool filterFullTextNotes READ filterFullTextNotes WRITE set_filterFullTextNotes NOTIFY filterFullTextNotesChanged)
- Q_PROPERTY(bool filterCaseSensitive READ filterCaseSensitive WRITE set_filterCaseSensitive NOTIFY filterCaseSensitiveChanged)
public:
static qPrefGeneral *instance();
@@ -29,8 +27,6 @@ public:
static int pscr_ratio() { return prefs.pscr_ratio; }
static QString diveshareExport_uid() { return st_diveshareExport_uid; }
static bool diveshareExport_private() { return st_diveshareExport_private; }
- static bool filterFullTextNotes() { return prefs.filterFullTextNotes; }
- static bool filterCaseSensitive() { return prefs.filterCaseSensitive; }
public slots:
static void set_defaultsetpoint(int value);
@@ -38,8 +34,6 @@ public slots:
static void set_pscr_ratio(int value);
static void set_diveshareExport_uid(const QString& value);
static void set_diveshareExport_private(bool value);
- static void set_filterFullTextNotes(bool value);
- static void set_filterCaseSensitive(bool value);
signals:
void defaultsetpointChanged(int value);
@@ -47,9 +41,7 @@ signals:
void pscr_ratioChanged(int value);
void diveshareExport_uidChanged(const QString& value);
void diveshareExport_privateChanged(bool value);
- void filterFullTextNotesChanged(bool value);
void salinityEditDefaultChanged(bool value);
- void filterCaseSensitiveChanged(bool value);
private:
qPrefGeneral() {}
@@ -57,8 +49,6 @@ private:
static void disk_defaultsetpoint(bool doSync);
static void disk_o2consumption(bool doSync);
static void disk_pscr_ratio(bool doSync);
- static void disk_filterFullTextNotes(bool doSync);
- static void disk_filterCaseSensitive(bool doSync);
// class variables are load only
static void load_diveshareExport_uid();
diff --git a/core/subsurfacestartup.c b/core/subsurfacestartup.c
index bc3197ef1..db18c34ce 100644
--- a/core/subsurfacestartup.c
+++ b/core/subsurfacestartup.c
@@ -101,8 +101,6 @@ struct preferences default_prefs = {
.auto_recalculate_thumbnails = true,
.extract_video_thumbnails = true,
.extract_video_thumbnails_position = 20, // The first fifth seems like a reasonable place
- .filterCaseSensitive = false,
- .filterFullTextNotes = true,
};
int run_survey;
diff --git a/mobile-widgets/qml/Settings.qml b/mobile-widgets/qml/Settings.qml
index 1828b32dd..a4b55097e 100644
--- a/mobile-widgets/qml/Settings.qml
+++ b/mobile-widgets/qml/Settings.qml
@@ -546,50 +546,6 @@ TemplatePage {
visible: sectionAdvanced.isExpanded
}
GridLayout {
- id: filterPrefs
- visible: sectionAdvanced.isExpanded
- columns: 2
-
- TemplateLabel {
- text: qsTr("Filter preferences")
- font.pointSize: subsurfaceTheme.headingPointSize
- font.weight: Font.Light
- Layout.topMargin: Kirigami.Units.largeSpacing
- Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
- Layout.columnSpan: 2
- }
- TemplateLabel {
- text: qsTr("Include notes in full text filtering")
- Layout.preferredWidth: gridWidth * 0.75
- }
-
- SsrfSwitch {
- id: fullTextNotes
- checked: PrefGeneral.filterFullTextNotes
- Layout.preferredWidth: gridWidth * 0.25
- onClicked: {
- PrefGeneral.filterFullTextNotes = checked
- }
- }
-
- TemplateLabel {
- text: qsTr("Match filter case sensitive")
- Layout.preferredWidth: gridWidth * 0.75
- }
-
- SsrfSwitch {
- id: filterCaseSensitive
- checked: PrefGeneral.filterCaseSensitive
- Layout.preferredWidth: gridWidth * 0.25
- onClicked: {
- PrefGeneral.filterCaseSensitive = checked
- }
- }
- }
- TemplateLine {
- visible: sectionAdvanced.isExpanded
- }
- GridLayout {
id: whichBluetoothDevices
visible: sectionAdvanced.isExpanded
columns: 2