mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

mobile: remove filter settings

Browse source 
These are not used anymore.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-02-19 21:52:10 +01:00 committed by Dirk Hohndel
parent eed4e2746d
commit 4cff23ef7a
5 changed files with 0 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/pref.h
View file

@ -121,8 +121,6 @@ struct preferences {
int o2consumption; // ml per min int o2consumption; // ml per min
int pscr_ratio; // dump ratio times 1000 int pscr_ratio; // dump ratio times 1000
bool use_default_file; 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 extraEnvironmentalDefault;
bool salinityEditDefault; bool salinityEditDefault;

6
core/settings/qPrefGeneral.cpp
View file

@ -21,8 +21,6 @@ void qPrefGeneral::loadSync(bool doSync)
disk_defaultsetpoint(doSync); disk_defaultsetpoint(doSync);
disk_o2consumption(doSync); disk_o2consumption(doSync);
disk_pscr_ratio(doSync); disk_pscr_ratio(doSync);
disk_filterFullTextNotes(doSync);
disk_filterCaseSensitive(doSync);
if (!doSync) { if (!doSync) {
load_diveshareExport_uid(); 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_QSTRING(General, "diveshareExport/uid", diveshareExport_uid);
HANDLE_PROP_BOOL(General, "diveshareExport/private", diveshareExport_private); HANDLE_PROP_BOOL(General, "diveshareExport/private", diveshareExport_private);
HANDLE_PREFERENCE_BOOL(General, "filterFullTextNotes", filterFullTextNotes);
HANDLE_PREFERENCE_BOOL(General, "filterCaseSensitive", filterCaseSensitive);

10
core/settings/qPrefGeneral.h
View file

@ -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(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(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 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: public:
static qPrefGeneral *instance(); static qPrefGeneral *instance();
@ -29,8 +27,6 @@ public:
static int pscr_ratio() { return prefs.pscr_ratio; } static int pscr_ratio() { return prefs.pscr_ratio; }
static QString diveshareExport_uid() { return st_diveshareExport_uid; } static QString diveshareExport_uid() { return st_diveshareExport_uid; }
static bool diveshareExport_private() { return st_diveshareExport_private; } static bool diveshareExport_private() { return st_diveshareExport_private; }
static bool filterFullTextNotes() { return prefs.filterFullTextNotes; }
static bool filterCaseSensitive() { return prefs.filterCaseSensitive; }
public slots: public slots:
static void set_defaultsetpoint(int value); static void set_defaultsetpoint(int value);
@ -38,8 +34,6 @@ public slots:
static void set_pscr_ratio(int value); static void set_pscr_ratio(int value);
static void set_diveshareExport_uid(const QString& value); static void set_diveshareExport_uid(const QString& value);
static void set_diveshareExport_private(bool value); static void set_diveshareExport_private(bool value);
static void set_filterFullTextNotes(bool value);
static void set_filterCaseSensitive(bool value);
signals: signals:
void defaultsetpointChanged(int value); void defaultsetpointChanged(int value);
@ -47,9 +41,7 @@ signals:
void pscr_ratioChanged(int value); void pscr_ratioChanged(int value);
void diveshareExport_uidChanged(const QString& value); void diveshareExport_uidChanged(const QString& value);
void diveshareExport_privateChanged(bool value); void diveshareExport_privateChanged(bool value);
void filterFullTextNotesChanged(bool value);
void salinityEditDefaultChanged(bool value); void salinityEditDefaultChanged(bool value);
void filterCaseSensitiveChanged(bool value);
private: private:
qPrefGeneral() {} qPrefGeneral() {}
@ -57,8 +49,6 @@ private:
static void disk_defaultsetpoint(bool doSync); static void disk_defaultsetpoint(bool doSync);
static void disk_o2consumption(bool doSync); static void disk_o2consumption(bool doSync);
static void disk_pscr_ratio(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 // class variables are load only
static void load_diveshareExport_uid(); static void load_diveshareExport_uid();

2
core/subsurfacestartup.c
View file

@ -101,8 +101,6 @@ struct preferences default_prefs = {
.auto_recalculate_thumbnails = true, .auto_recalculate_thumbnails = true,
.extract_video_thumbnails = true, .extract_video_thumbnails = true,
.extract_video_thumbnails_position = 20, // The first fifth seems like a reasonable place .extract_video_thumbnails_position = 20, // The first fifth seems like a reasonable place
.filterCaseSensitive = false,
.filterFullTextNotes = true,
}; };
int run_survey; int run_survey;

44
mobile-widgets/qml/Settings.qml
View file

@ -545,50 +545,6 @@ TemplatePage {
TemplateLine { TemplateLine {
visible: sectionAdvanced.isExpanded 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 { GridLayout {
id: whichBluetoothDevices id: whichBluetoothDevices
visible: sectionAdvanced.isExpanded visible: sectionAdvanced.isExpanded