Parse directly but update informations in callbacks only if we got a sentence that...

[mapper] / src / settings-gconf.h

diff --git a/src/settings-gconf.h b/src/settings-gconf.h
index 3c07f4150f8c4d5c9756af3cd943c616120dd905..f13d391cecd16e62ae519a7299160d5e283b19a6 100644 (file)
--- a/src/settings-gconf.h
+++ b/src/settings-gconf.h
@@ -2,29 +2,24 @@
 #define CONFIG_FILE_ROUTE "route.gpx"
 #define CONFIG_FILE_TRACK "track.gpx"
 
-/* Default OSM Repository */
-#define REPO_DEFAULT_NAME "OpenStreet"
+#define GCONF_KEY_PREFIX "/apps/maemo/mapper"
+
+#define REPO_DEFAULT_NAME "OpenStreetMap"
+#ifdef WITH_DEVICE_770
 #define REPO_DEFAULT_CACHE_BASE "~/MyDocs/.documents/Maps/"
-#define REPO_DEFAULT_CACHE_DIR REPO_DEFAULT_CACHE_BASE"OpenStreet"
+#else
+#define REPO_DEFAULT_CACHE_BASE "~/Maps/"
+#endif
+#define REPO_DEFAULT_CACHE_DIR REPO_DEFAULT_CACHE_BASE"OpenStreetMap"
 #define REPO_DEFAULT_MAP_URI "http://tile.openstreetmap.org/%0d/%d/%d.png"
-#define REPO_DEFAULT_DL_ZOOM_STEPS (2)
+#define REPO_DEFAULT_DL_ZOOM_STEPS (1)
 #define REPO_DEFAULT_VIEW_ZOOM_STEPS (1)
 
-#define HELP_ID_PREFIX "help_maemomapper_"
-#define HELP_ID_INTRO HELP_ID_PREFIX"intro"
-#define HELP_ID_GETSTARTED HELP_ID_PREFIX"getstarted"
-#define HELP_ID_ABOUT HELP_ID_PREFIX"about"
-#define HELP_ID_SETTINGS HELP_ID_PREFIX"settings"
-#define HELP_ID_REPOMAN HELP_ID_PREFIX"repoman"
-#define HELP_ID_MAPMAN HELP_ID_PREFIX"mapman"
-#define HELP_ID_DOWNROUTE HELP_ID_PREFIX"downroute"
-#define HELP_ID_POICAT HELP_ID_PREFIX"poicat"
-
-#define GCONF_KEY_PREFIX "/apps/maemo/mapper"
-
 /* GPS */
-#define GCONF_KEY_RCVR_MAC GCONF_KEY_PREFIX"/receiver_mac"
-#define GCONF_KEY_RCVR_CHAN GCONF_KEY_PREFIX"/receiver_channel"
+#define GCONF_KEY_GPS_TYPE GCONF_KEY_PREFIX"/receiver_type"
+#define GCONF_KEY_GPS_MAC GCONF_KEY_PREFIX"/receiver_mac"
+#define GCONF_KEY_GPS_PORT GCONF_KEY_PREFIX"/receiver_port"
+#define GCONF_KEY_GPS_CHAN GCONF_KEY_PREFIX"/receiver_channel"
 #define GCONF_KEY_ENABLE_GPS GCONF_KEY_PREFIX"/enable_gps"
 #define GCONF_KEY_GPS_INFO GCONF_KEY_PREFIX"/gps_info"
 
@@ -33,7 +28,10 @@
 #define GCONF_KEY_GPS_FILTER_HDOP GCONF_KEY_PREFIX"/gps_filter_hdop"
 #define GCONF_KEY_GPS_FILTER_VDOP GCONF_KEY_PREFIX"/gps_filter_vdop"
 #define GCONF_KEY_GPS_FILTER_ANGLE GCONF_KEY_PREFIX"/gps_filter_angle"
+#define GCONF_KEY_GPS_FILTER_OSM GCONF_KEY_PREFIX"/gps_filter_osm"
+#define GCONF_KEY_GPS_FILTER_MAXDROP GCONF_KEY_PREFIX"/gps_filter_maxdrop"
 
+/* Misc */
 #define GCONF_KEY_MAP_URI_FORMAT GCONF_KEY_PREFIX"/map_uri_format"
 #define GCONF_KEY_MAP_ZOOM_STEPS GCONF_KEY_PREFIX"/map_zoom_steps"
 #define GCONF_KEY_MAP_DIR_NAME GCONF_KEY_PREFIX"/map_cache_dir"
@@ -64,6 +62,8 @@
 
 /* POI */
 #define GCONF_KEY_POI_ZOOM GCONF_KEY_PREFIX"/poi_zoom"
+#define GCONF_KEY_POI_THEME_BASE GCONF_KEY_PREFIX"/poi_theme_base"
+#define GCONF_KEY_POI_ICON_THEME GCONF_KEY_PREFIX"/poi_icon_theme"
 
 #define GCONF_KEY_AUTOCENTER_MODE GCONF_KEY_PREFIX"/autocenter_mode"
 #define GCONF_KEY_LEAD_AMOUNT GCONF_KEY_PREFIX"/lead_amount"