X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/4c77d5e0aec3c7aab32965ca4e02abb17bb6108f..8e7bf2f684e122505fa081216f05ac72a81b76be:/src/viklayerspanel.c?ds=inline diff --git a/src/viklayerspanel.c b/src/viklayerspanel.c index ddbcc47d..5e4a7949 100644 --- a/src/viklayerspanel.c +++ b/src/viklayerspanel.c @@ -28,6 +28,7 @@ #include #include +#include enum { VLP_UPDATE_SIGNAL, @@ -36,8 +37,6 @@ enum { static void layers_panel_class_init ( VikLayersPanelClass *klass ); static void layers_panel_init ( VikLayersPanel *vlp ); -static void layers_item_edited (VikLayersPanel *vlp, GtkTreeIter *iter, const gchar *new_text); -static void layers_item_toggled (VikLayersPanel *vlp, GtkTreeIter *iter); static guint layers_panel_signals[VLP_LAST_SIGNAL] = { 0 }; @@ -63,13 +62,15 @@ static GtkItemFactoryEntry base_entries[] = { { N_("/New Layer"), NULL, NULL, -1, "" }, }; -#define NUM_BASE_ENTRIES 5 +#define NUM_BASE_ENTRIES (sizeof(base_entries)/sizeof(base_entries[0])) static void layers_item_toggled (VikLayersPanel *vlp, GtkTreeIter *iter); static void layers_item_edited (VikLayersPanel *vlp, GtkTreeIter *iter, const gchar *new_text); +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 ); @@ -131,7 +132,13 @@ VikViewport *vik_layers_panel_get_viewport ( VikLayersPanel *vlp ) static void layers_panel_init ( VikLayersPanel *vlp ) { GtkWidget *hbox; - GtkWidget *upbutton, *upimage, *downbutton, *downimage; + GtkWidget *addbutton, *addimage; + GtkWidget *removebutton, *removeimage; + GtkWidget *upbutton, *upimage; + GtkWidget *downbutton, *downimage; + GtkWidget *cutbutton, *cutimage; + GtkWidget *copybutton, *copyimage; + GtkWidget *pastebutton, *pasteimage; GtkWidget *scrolledwindow; GtkItemFactoryEntry entry; guint i, tmp; @@ -148,21 +155,61 @@ static void layers_panel_init ( VikLayersPanel *vlp ) vik_treeview_add_layer ( vlp->vt, NULL, &(vlp->toplayer_iter), VIK_LAYER(vlp->toplayer)->name, NULL, vlp->toplayer, VIK_LAYER_AGGREGATE, VIK_LAYER_AGGREGATE ); vik_layer_realize ( VIK_LAYER(vlp->toplayer), vlp->vt, &(vlp->toplayer_iter) ); - g_signal_connect_swapped ( vlp->vt, "popup_menu", G_CALLBACK(layers_popup_cb), vlp); + g_signal_connect_swapped ( vlp->vt, "popup_menu", G_CALLBACK(menu_popup_cb), 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); - - upimage = gtk_image_new_from_stock ( GTK_STOCK_GO_UP, GTK_ICON_SIZE_BUTTON ); + 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 ); + addbutton = gtk_button_new ( ); + gtk_container_add ( GTK_CONTAINER(addbutton), addimage ); + gtk_widget_set_tooltip_text ( GTK_WIDGET(addbutton), _("Add new layer")); + gtk_box_pack_start ( GTK_BOX(hbox), addbutton, TRUE, TRUE, 0 ); + g_signal_connect_swapped ( G_OBJECT(addbutton), "clicked", G_CALLBACK(layers_popup_cb), vlp ); + /* Remove button */ + removeimage = gtk_image_new_from_stock ( GTK_STOCK_REMOVE, GTK_ICON_SIZE_SMALL_TOOLBAR ); + removebutton = gtk_button_new ( ); + gtk_container_add ( GTK_CONTAINER(removebutton), removeimage ); + gtk_widget_set_tooltip_text ( GTK_WIDGET(removebutton), _("Remove selected layer")); + gtk_box_pack_start ( GTK_BOX(hbox), removebutton, TRUE, TRUE, 0 ); + g_signal_connect_swapped ( G_OBJECT(removebutton), "clicked", G_CALLBACK(vik_layers_panel_delete_selected), vlp ); + /* Up button */ + upimage = gtk_image_new_from_stock ( GTK_STOCK_GO_UP, GTK_ICON_SIZE_SMALL_TOOLBAR ); upbutton = gtk_button_new ( ); gtk_container_add ( GTK_CONTAINER(upbutton), upimage ); + gtk_widget_set_tooltip_text ( GTK_WIDGET(upbutton), _("Move selected layer up")); gtk_box_pack_start ( GTK_BOX(hbox), upbutton, TRUE, TRUE, 0 ); g_signal_connect_swapped ( G_OBJECT(upbutton), "clicked", G_CALLBACK(layers_move_item_up), vlp ); - downimage = gtk_image_new_from_stock ( GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_BUTTON ); + /* Down button */ + downimage = gtk_image_new_from_stock ( GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_SMALL_TOOLBAR ); downbutton = gtk_button_new ( ); gtk_container_add ( GTK_CONTAINER(downbutton), downimage ); + gtk_widget_set_tooltip_text ( GTK_WIDGET(downbutton), _("Move selected layer down")); gtk_box_pack_start ( GTK_BOX(hbox), downbutton, TRUE, TRUE, 0 ); g_signal_connect_swapped ( G_OBJECT(downbutton), "clicked", G_CALLBACK(layers_move_item_down), vlp ); + /* Cut button */ + cutimage = gtk_image_new_from_stock ( GTK_STOCK_CUT, GTK_ICON_SIZE_SMALL_TOOLBAR ); + cutbutton = gtk_button_new ( ); + gtk_container_add ( GTK_CONTAINER(cutbutton), cutimage ); + gtk_widget_set_tooltip_text ( GTK_WIDGET(cutbutton), _("Cut selected layer")); + gtk_box_pack_start ( GTK_BOX(hbox), cutbutton, TRUE, TRUE, 0 ); + g_signal_connect_swapped ( G_OBJECT(cutbutton), "clicked", G_CALLBACK(vik_layers_panel_cut_selected), vlp ); + /* Copy button */ + copyimage = gtk_image_new_from_stock ( GTK_STOCK_COPY, GTK_ICON_SIZE_SMALL_TOOLBAR ); + copybutton = gtk_button_new ( ); + gtk_container_add ( GTK_CONTAINER(copybutton), copyimage ); + gtk_widget_set_tooltip_text ( GTK_WIDGET(copybutton), _("Copy selected layer")); + gtk_box_pack_start ( GTK_BOX(hbox), copybutton, TRUE, TRUE, 0 ); + g_signal_connect_swapped ( G_OBJECT(copybutton), "clicked", G_CALLBACK(vik_layers_panel_copy_selected), vlp ); + /* Paste button */ + pasteimage = gtk_image_new_from_stock ( GTK_STOCK_PASTE, GTK_ICON_SIZE_SMALL_TOOLBAR ); + pastebutton = gtk_button_new ( ); + gtk_container_add ( GTK_CONTAINER(pastebutton),pasteimage ); + gtk_widget_set_tooltip_text ( GTK_WIDGET(pastebutton), _("Paste layer below selected layer")); + gtk_box_pack_start ( GTK_BOX(hbox), pastebutton, TRUE, TRUE, 0 ); + g_signal_connect_swapped ( G_OBJECT(pastebutton), "clicked", G_CALLBACK(vik_layers_panel_paste_selected), vlp ); scrolledwindow = gtk_scrolled_window_new ( NULL, NULL ); gtk_scrolled_window_set_policy ( GTK_SCROLLED_WINDOW(scrolledwindow), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC ); @@ -172,12 +219,16 @@ 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.? */ - entry.path = g_strdup_printf("%s/New %s Layer", base_entries[NUM_BASE_ENTRIES-1].path, 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; entry.callback = (GtkItemFactoryCallback) vik_layers_panel_new_layer; entry.callback_action = i; @@ -267,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; @@ -328,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; @@ -341,12 +402,23 @@ static void layers_popup ( VikLayersPanel *vlp, GtkTreeIter *iter, gint mouse_bu gtk_menu_popup ( menu, NULL, NULL, NULL, NULL, mouse_button, gtk_get_current_event_time() ); } -static void layers_popup_cb ( VikLayersPanel *vlp ) +static void menu_popup_cb ( VikLayersPanel *vlp ) { GtkTreeIter iter; layers_popup ( vlp, vik_treeview_get_selected_iter ( vlp->vt, &iter ) ? &iter : NULL, 0 ); } +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; @@ -355,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; @@ -408,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 ) @@ -419,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 ) { @@ -441,7 +520,9 @@ gboolean vik_layers_panel_properties ( VikLayersPanel *vlp ) { if ( vik_treeview_item_get_data ( vlp->vt, &iter ) == VIK_LAYER_AGGREGATE ) a_dialog_info_msg ( VIK_GTK_WINDOW_FROM_WIDGET(vlp), _("Aggregate Layers have no settable properties.") ); - vik_layer_properties ( VIK_LAYER( vik_treeview_item_get_pointer ( vlp->vt, &iter ) ), vlp->vvp ); + VikLayer *layer = VIK_LAYER( vik_treeview_item_get_pointer ( vlp->vt, &iter ) ); + if (vik_layer_properties ( layer, vlp->vvp )) + vik_layer_emit_update ( layer, FALSE ); return TRUE; } else @@ -465,48 +546,56 @@ void vik_layers_panel_cut_selected ( VikLayersPanel *vlp ) gint type; GtkTreeIter iter; - g_return_if_fail ( vik_treeview_get_selected_iter ( vlp->vt, &iter ) ); + if ( ! vik_treeview_get_selected_iter ( vlp->vt, &iter ) ) + /* Nothing to do */ + return; type = vik_treeview_item_get_type ( vlp->vt, &iter ); if ( type == VIK_TREEVIEW_TYPE_LAYER ) { VikAggregateLayer *parent = vik_treeview_item_get_parent ( vlp->vt, &iter ); - if ( parent ) { - /* reset trigger if trigger deleted */ if ( vik_layers_panel_get_selected ( vlp ) == vik_viewport_get_trigger ( vlp->vvp ) ) vik_viewport_set_trigger ( vlp->vvp, NULL ); a_clipboard_copy_selected ( vlp ); - if ( vik_aggregate_layer_delete ( parent, &iter ) ) - vik_layers_panel_emit_update ( vlp ); + + if (IS_VIK_AGGREGATE_LAYER(parent)) { + if ( vik_aggregate_layer_delete ( parent, &iter ) ) + vik_layers_panel_emit_update ( vlp ); + } } else a_dialog_info_msg ( VIK_GTK_WINDOW_FROM_WIDGET(vlp), _("You cannot cut the Top Layer.") ); } + else if (type == VIK_TREEVIEW_TYPE_SUBLAYER) { + VikLayer *sel = vik_layers_panel_get_selected ( vlp ); + if ( vik_layer_get_interface(sel->type)->cut_item ) { + gint subtype = vik_treeview_item_get_data( vlp->vt, &iter); + vik_layer_get_interface(sel->type)->cut_item ( sel, subtype, vik_treeview_item_get_pointer(sel->vt, &iter) ); + } + } } void vik_layers_panel_copy_selected ( VikLayersPanel *vlp ) { - gint type; GtkTreeIter iter; - - g_return_if_fail ( vik_treeview_get_selected_iter ( vlp->vt, &iter ) ); - - type = vik_treeview_item_get_type ( vlp->vt, &iter ); - - if ( type == VIK_TREEVIEW_TYPE_LAYER ) { - a_clipboard_copy_selected ( vlp ); - } + if ( ! vik_treeview_get_selected_iter ( vlp->vt, &iter ) ) + /* Nothing to do */ + return; + // NB clipboard contains layer vs sublayer logic, so don't need to do it here + a_clipboard_copy_selected ( vlp ); } void vik_layers_panel_paste_selected ( VikLayersPanel *vlp ) { GtkTreeIter iter; - g_return_if_fail ( vik_treeview_get_selected_iter ( vlp->vt, &iter ) ); + if ( ! vik_treeview_get_selected_iter ( vlp->vt, &iter ) ) + /* Nothing to do */ + return; a_clipboard_paste ( vlp ); } @@ -515,12 +604,20 @@ void vik_layers_panel_delete_selected ( VikLayersPanel *vlp ) gint type; GtkTreeIter iter; - g_return_if_fail ( vik_treeview_get_selected_iter ( vlp->vt, &iter ) ); + if ( ! vik_treeview_get_selected_iter ( vlp->vt, &iter ) ) + /* Nothing to do */ + return; type = vik_treeview_item_get_type ( vlp->vt, &iter ); 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 ) { @@ -604,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 ) @@ -618,7 +715,7 @@ VikAggregateLayer *vik_layers_panel_get_top_layer ( VikLayersPanel *vlp ) void vik_layers_panel_clear ( VikLayersPanel *vlp ) { - if ( (! vik_aggregate_layer_is_empty(vlp->toplayer)) && a_dialog_overwrite ( VIK_GTK_WINDOW_FROM_WIDGET(vlp), _("Are you sure you wish to delete all layers?"), NULL ) ) + if ( (! vik_aggregate_layer_is_empty(vlp->toplayer)) && a_dialog_yes_or_no ( VIK_GTK_WINDOW_FROM_WIDGET(vlp), _("Are you sure you wish to delete all layers?"), NULL ) ) vik_aggregate_layer_clear ( vlp->toplayer ); /* simply deletes all layers */ } @@ -635,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; +}