X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/d91e5f2b887eb6dc28b96fca6687635aace1630a..8e7bf2f684e122505fa081216f05ac72a81b76be:/src/viklayerspanel.c diff --git a/src/viklayerspanel.c b/src/viklayerspanel.c index c237683a..5e4a7949 100644 --- a/src/viklayerspanel.c +++ b/src/viklayerspanel.c @@ -28,6 +28,7 @@ #include #include +#include enum { VLP_UPDATE_SIGNAL, @@ -69,6 +70,7 @@ static void menu_popup_cb (VikLayersPanel *vlp); static void layers_popup_cb (VikLayersPanel *vlp); static void layers_popup ( VikLayersPanel *vlp, GtkTreeIter *iter, gint mouse_button ); static gboolean layers_button_press_cb (VikLayersPanel *vlp, GdkEventButton *event); +static gboolean layers_key_press_cb (VikLayersPanel *vlp, GdkEventKey *event); static void layers_move_item ( VikLayersPanel *vlp, gboolean up ); static void layers_move_item_up ( VikLayersPanel *vlp ); static void layers_move_item_down ( VikLayersPanel *vlp ); @@ -157,6 +159,7 @@ static void layers_panel_init ( VikLayersPanel *vlp ) g_signal_connect_swapped ( vlp->vt, "button_press_event", G_CALLBACK(layers_button_press_cb), vlp); g_signal_connect_swapped ( vlp->vt, "item_toggled", G_CALLBACK(layers_item_toggled), vlp); g_signal_connect_swapped ( vlp->vt, "item_edited", G_CALLBACK(layers_item_edited), vlp); + g_signal_connect_swapped ( vlp->vt, "key_press_event", G_CALLBACK(layers_key_press_cb), vlp); /* Add button */ addimage = gtk_image_new_from_stock ( GTK_STOCK_ADD, GTK_ICON_SIZE_SMALL_TOOLBAR ); @@ -216,13 +219,14 @@ static void layers_panel_init ( VikLayersPanel *vlp ) gtk_box_pack_start ( GTK_BOX(vlp), hbox, FALSE, FALSE, 0 ); vlp->popup_factory = gtk_item_factory_new ( GTK_TYPE_MENU, "
", NULL ); + gtk_item_factory_set_translate_func (vlp->popup_factory, + (GtkTranslateFunc) gettext, NULL, NULL); gtk_item_factory_create_items ( vlp->popup_factory, NUM_BASE_ENTRIES, base_entries, vlp ); for ( i = 0; i < VIK_LAYER_NUM_TYPES; i++ ) { /* TODO: FIXME: if name has a '/' in it it will get all messed up. why not have an itemfactory field with name, icon, shortcut, etc.? */ - /* Note: we use a temporary label in order to share translation with other codde */ - gchar *label = g_strdup_printf(_("New %s Layer"), vik_layer_get_interface(i)->name ); + gchar *label = g_strdup_printf(_("New _%s Layer"), vik_layer_get_interface(i)->name ); entry.path = g_strdup_printf("%s/%s", base_entries[NUM_BASE_ENTRIES-1].path, label ); g_free ( label ); entry.accelerator = NULL; @@ -314,6 +318,16 @@ static gboolean layers_button_press_cb ( VikLayersPanel *vlp, GdkEventButton *ev return FALSE; } +static gboolean layers_key_press_cb ( VikLayersPanel *vlp, GdkEventKey *event ) +{ + // Accept all forms of delete keys + if (event->keyval == GDK_Delete || event->keyval == GDK_KP_Delete || event->keyval == GDK_BackSpace) { + vik_layers_panel_delete_selected (vlp); + return TRUE; + } + return FALSE; +} + static void layers_popup ( VikLayersPanel *vlp, GtkTreeIter *iter, gint mouse_button ) { GtkMenu *menu = NULL; @@ -375,7 +389,7 @@ static void layers_popup ( VikLayersPanel *vlp, GtkTreeIter *iter, gint mouse_bu else { menu = GTK_MENU ( gtk_menu_new () ); - if ( ! vik_layer_sublayer_add_menu_items ( vik_treeview_item_get_parent ( vlp->vt, iter ), menu, vlp, vik_treeview_item_get_data ( vlp->vt, iter ), vik_treeview_item_get_pointer ( vlp->vt, iter ), iter ) ) + if ( ! vik_layer_sublayer_add_menu_items ( vik_treeview_item_get_parent ( vlp->vt, iter ), menu, vlp, vik_treeview_item_get_data ( vlp->vt, iter ), vik_treeview_item_get_pointer ( vlp->vt, iter ), iter, vlp->vvp ) ) { gtk_widget_destroy ( GTK_WIDGET(menu) ); return; @@ -399,6 +413,12 @@ static void layers_popup_cb ( VikLayersPanel *vlp ) layers_popup ( vlp, NULL, 0 ); } +/** + * vik_layers_panel_new_layer: + * @type: type of the new layer + * + * Create a new layer and add to panel. + */ gboolean vik_layers_panel_new_layer ( VikLayersPanel *vlp, gint type ) { VikLayer *l; @@ -407,12 +427,17 @@ gboolean vik_layers_panel_new_layer ( VikLayersPanel *vlp, gint type ) if ( l ) { vik_layers_panel_add_layer ( vlp, l ); - vik_layers_panel_emit_update ( vlp ); return TRUE; } return FALSE; } +/** + * vik_layers_panel_add_layer: + * @l: existing layer + * + * Add an existing layer to panel. + */ void vik_layers_panel_add_layer ( VikLayersPanel *vlp, VikLayer *l ) { GtkTreeIter iter; @@ -460,6 +485,8 @@ void vik_layers_panel_add_layer ( VikLayersPanel *vlp, VikLayer *l ) else vik_aggregate_layer_add_layer ( addtoagg, l ); } + + vik_layers_panel_emit_update ( vlp ); } static void layers_move_item ( VikLayersPanel *vlp, gboolean up ) @@ -471,7 +498,7 @@ static void layers_move_item ( VikLayersPanel *vlp, gboolean up ) if ( ! vik_treeview_get_selected_iter ( vlp->vt, &iter ) ) return; - vik_treeview_select_iter ( vlp->vt, &iter ); /* cancel any layer-name editing going on... */ + vik_treeview_select_iter ( vlp->vt, &iter, FALSE ); /* cancel any layer-name editing going on... */ if ( vik_treeview_item_get_type ( vlp->vt, &iter ) == VIK_TREEVIEW_TYPE_LAYER ) { @@ -495,7 +522,7 @@ gboolean vik_layers_panel_properties ( VikLayersPanel *vlp ) a_dialog_info_msg ( VIK_GTK_WINDOW_FROM_WIDGET(vlp), _("Aggregate Layers have no settable properties.") ); VikLayer *layer = VIK_LAYER( vik_treeview_item_get_pointer ( vlp->vt, &iter ) ); if (vik_layer_properties ( layer, vlp->vvp )) - vik_layer_emit_update ( layer ); + vik_layer_emit_update ( layer, FALSE ); return TRUE; } else @@ -585,6 +612,12 @@ void vik_layers_panel_delete_selected ( VikLayersPanel *vlp ) if ( type == VIK_TREEVIEW_TYPE_LAYER ) { + // Get confirmation from the user + if ( ! a_dialog_yes_or_no ( VIK_GTK_WINDOW_FROM_WIDGET(vlp), + _("Are you sure you want to delete %s?"), + vik_layer_get_name ( VIK_LAYER(vik_treeview_item_get_pointer ( vlp->vt, &iter )) ) ) ) + return; + VikAggregateLayer *parent = vik_treeview_item_get_parent ( vlp->vt, &iter ); if ( parent ) { @@ -668,11 +701,11 @@ VikLayer *vik_layers_panel_get_layer_of_type ( VikLayersPanel *vlp, gint type ) return rv; } -GList *vik_layers_panel_get_all_layers_of_type(VikLayersPanel *vlp, gint type) +GList *vik_layers_panel_get_all_layers_of_type(VikLayersPanel *vlp, gint type, gboolean include_invisible) { GList *layers = NULL; - return (vik_aggregate_layer_get_all_layers_of_type ( vlp->toplayer, layers, type )); + return (vik_aggregate_layer_get_all_layers_of_type ( vlp->toplayer, layers, type, include_invisible)); } VikAggregateLayer *vik_layers_panel_get_top_layer ( VikLayersPanel *vlp ) @@ -699,3 +732,7 @@ static void layers_panel_finalize ( GObject *gob ) G_OBJECT_CLASS(parent_class)->finalize(gob); } +VikTreeview *vik_layers_panel_get_treeview ( VikLayersPanel *vlp ) +{ + return vlp->vt; +}