From 192e40fc51165a78f7e1cf7f746e8c1963658637 Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Thu, 30 May 2013 00:10:40 +0100 Subject: [PATCH] Map data license does not need to be shown every time for the default map. --- src/vikmapslayer.c | 5 +++++ src/vikmapslayer.h | 1 + src/vikwindow.c | 1 + 3 files changed, 7 insertions(+) diff --git a/src/vikmapslayer.c b/src/vikmapslayer.c index 5fd761a0..42b60cc9 100644 --- a/src/vikmapslayer.c +++ b/src/vikmapslayer.c @@ -516,6 +516,11 @@ static guint map_uniq_id_to_index ( guint uniq_id ) return NUM_MAP_TYPES; /* no such thing */ } +void vik_maps_layer_pretend_licence_shown ( VikMapsLayer *vml ) +{ + vml->license_notice_shown = TRUE; +} + static gboolean maps_layer_set_param ( VikMapsLayer *vml, guint16 id, VikLayerParamData data, VikViewport *vvp, gboolean is_file_operation ) { // When loading from a file don't need the license reminder diff --git a/src/vikmapslayer.h b/src/vikmapslayer.h index fd050d2b..fd0214fd 100644 --- a/src/vikmapslayer.h +++ b/src/vikmapslayer.h @@ -55,6 +55,7 @@ gint vik_maps_layer_get_map_type(VikMapsLayer *vml); gchar *vik_maps_layer_get_map_label(VikMapsLayer *vml); gchar *maps_layer_default_dir (); void vik_maps_layer_download ( VikMapsLayer *vml, VikViewport *vvp, gboolean only_new ); +void vik_maps_layer_pretend_licence_shown ( VikMapsLayer *vml ); G_END_DECLS diff --git a/src/vikwindow.c b/src/vikwindow.c index 4b74fc1d..c651848c 100644 --- a/src/vikwindow.c +++ b/src/vikwindow.c @@ -430,6 +430,7 @@ void vik_window_new_window_finish ( VikWindow *vw ) // Maybe add a default map layer if ( a_vik_get_add_default_map_layer () ) { VikMapsLayer *vml = VIK_MAPS_LAYER ( vik_layer_create(VIK_LAYER_MAPS, vw->viking_vvp, NULL, FALSE) ); + vik_maps_layer_pretend_licence_shown ( vml ); vik_layer_rename ( VIK_LAYER(vml), _("Default Map") ); vik_aggregate_layer_add_layer ( vik_layers_panel_get_top_layer(vw->viking_vlp), VIK_LAYER(vml), TRUE ); -- 2.39.5