FlapJackApps/subsurface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused part of the geocoding preferences

Browse Source 
And always turn on geocoding. The user needs to trigger this manually
anyway, so there's no point in having the extra option in the preferences.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-10-05 23:02:55 +01:00
parent 44762c4252
commit 5861da0bce
4 changed files with 11 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qt-ui/preferences.cpp
View File

@ -241,9 +241,11 @@ void PreferencesDialog::setUiFromPrefs()
ui.cloud_background_sync->setChecked(prefs.cloud_background_sync);
// GeoManagement
#ifdef DISABLED
ui.enable_geocoding->setChecked( prefs.geocoding.enable_geocoding );
ui.parse_without_gps->setChecked(prefs.geocoding.parse_dive_without_gps);
ui.tag_existing_dives->setChecked(prefs.geocoding.tag_existing_dives);
#endif
ui.first_item->setCurrentIndex(prefs.geocoding.category[0]);
ui.second_item->setCurrentIndex(prefs.geocoding.category[1]);
ui.third_item->setCurrentIndex(prefs.geocoding.category[2]);
@ -417,9 +419,11 @@ void PreferencesDialog::syncSettings()
s.endGroup();
s.beginGroup("geocoding");
#ifdef DISABLED
s.setValue("enable_geocoding", ui.enable_geocoding->isChecked());
s.setValue("parse_dives_without_gps", ui.parse_without_gps->isChecked());
s.setValue("parse_dive_without_gps", ui.parse_without_gps->isChecked());
s.setValue("tag_existing_dives", ui.tag_existing_dives->isChecked());
#endif
s.setValue("cat0", ui.first_item->currentIndex());
s.setValue("cat1", ui.second_item->currentIndex());
s.setValue("cat2", ui.third_item->currentIndex());

30
qt-ui/preferences.ui
View File

@ -1432,36 +1432,6 @@
<property name="margin">
<number>5</number>
</property>
<item>
<widget class="QGroupBox" name="groupBox_Geocoding">
<property name="title">
<string>Dive site geo lookup</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_8">
<item>
<widget class="QCheckBox" name="enable_geocoding">
<property name="text">
<string>Enable geocoding for dive site management</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="parse_without_gps">
<property name="text">
<string>Parse site without GPS data</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="tag_existing_dives">
<property name="text">
<string>Same format for existing dives</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_12">
<property name="title">

6
qthelper.cpp
View File

@ -1538,9 +1538,13 @@ void loadPreferences()
// GeoManagement
s.beginGroup("geocoding");
#ifdef DISABLED
GET_BOOL("enable_geocoding", geocoding.enable_geocoding);
GET_BOOL("parse_dives_without_gps", geocoding.parse_dive_without_gps);
GET_BOOL("parse_dive_without_gps", geocoding.parse_dive_without_gps);
GET_BOOL("tag_existing_dives", geocoding.tag_existing_dives);
#else
prefs.geocoding.enable_geocoding = true;
#endif
GET_ENUM("cat0", taxonomy_category, geocoding.category[0]);
GET_ENUM("cat1", taxonomy_category, geocoding.category[1]);
GET_ENUM("cat2", taxonomy_category, geocoding.category[2]);

2
subsurfacestartup.c
View File

@ -73,7 +73,7 @@ struct preferences default_prefs = {
.defaultsetpoint = 1100,
.cloud_background_sync = true,
.geocoding = {
.enable_geocoding = false,
.enable_geocoding = true,
.parse_dive_without_gps = false,
.tag_existing_dives = false,
.category = { 0 }