X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/0df66d57a7784625fcb5f66147c45ed7450f2592..bc07590a14b533ff65b0c4e802e160de7816ec0d:/src/viklayerspanel.c?ds=inline diff --git a/src/viklayerspanel.c b/src/viklayerspanel.c index 485d9eae..48050d15 100644 --- a/src/viklayerspanel.c +++ b/src/viklayerspanel.c @@ -19,20 +19,23 @@ * */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "viking.h" #include +#include +#include + enum { VLP_UPDATE_SIGNAL, + VLP_DELETE_LAYER_SIGNAL, VLP_LAST_SIGNAL }; -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 }; static GObjectClass *parent_class; @@ -45,55 +48,30 @@ struct _VikLayersPanel { VikTreeview *vt; VikViewport *vvp; /* reference */ - - GtkItemFactory *popup_factory; }; -static GtkItemFactoryEntry base_entries[] = { - { "/C_ut", NULL, (GtkItemFactoryCallback) vik_layers_panel_cut_selected, -1, "", GTK_STOCK_CUT }, - { "/_Copy", NULL, (GtkItemFactoryCallback) vik_layers_panel_copy_selected, -1, "", GTK_STOCK_COPY }, - { "/_Paste", NULL, (GtkItemFactoryCallback) vik_layers_panel_paste_selected, -1, "", GTK_STOCK_PASTE }, - { "/_Delete", NULL, (GtkItemFactoryCallback) vik_layers_panel_delete_selected, -1, "", GTK_STOCK_DELETE }, - { "/New Layer", NULL, NULL, -1, "" }, +static GtkActionEntry entries[] = { + { "Cut", GTK_STOCK_CUT, N_("C_ut"), NULL, NULL, (GCallback) vik_layers_panel_cut_selected }, + { "Copy", GTK_STOCK_COPY, N_("_Copy"), NULL, NULL, (GCallback) vik_layers_panel_copy_selected }, + { "Paste", GTK_STOCK_PASTE, N_("_Paste"), NULL, NULL, (GCallback) vik_layers_panel_paste_selected }, + { "Delete", GTK_STOCK_DELETE, N_("_Delete"), NULL, NULL, (GCallback) vik_layers_panel_delete_selected }, }; -#define NUM_BASE_ENTRIES 5 - 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 ); static void layers_panel_finalize ( GObject *gob ); -GType vik_layers_panel_get_type() -{ - static GType vlp_type = 0; +G_DEFINE_TYPE (VikLayersPanel, vik_layers_panel, GTK_TYPE_VBOX) - if (!vlp_type) - { - static const GTypeInfo vlp_info = - { - sizeof (VikLayersPanelClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) layers_panel_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (VikLayersPanel), - 0, - (GInstanceInitFunc) layers_panel_init, - }; - vlp_type = g_type_register_static ( GTK_TYPE_VBOX, "VikLayersPanel", &vlp_info, 0 ); - } - - return vlp_type; -} - -static void layers_panel_class_init ( VikLayersPanelClass *klass ) +static void vik_layers_panel_class_init ( VikLayersPanelClass *klass ) { GObjectClass *object_class; @@ -104,6 +82,7 @@ static void layers_panel_class_init ( VikLayersPanelClass *klass ) parent_class = g_type_class_peek_parent (klass); layers_panel_signals[VLP_UPDATE_SIGNAL] = g_signal_new ( "update", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (VikLayersPanelClass, update), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + layers_panel_signals[VLP_DELETE_LAYER_SIGNAL] = g_signal_new ( "delete_layer", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (VikLayersPanelClass, update), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); } VikLayersPanel *vik_layers_panel_new () @@ -122,13 +101,75 @@ VikViewport *vik_layers_panel_get_viewport ( VikLayersPanel *vlp ) return vlp->vvp; } -static void layers_panel_init ( VikLayersPanel *vlp ) +static gboolean layers_panel_new_layer ( gpointer lpnl[2] ) +{ + return vik_layers_panel_new_layer ( lpnl[0], GPOINTER_TO_INT(lpnl[1]) ); +} + +/** + * Create menu popup on demand + * @full: offer cut/copy options as well - not just the new layer options + */ +static GtkWidget* layers_panel_create_popup ( VikLayersPanel *vlp, gboolean full ) +{ + GtkWidget *menu = gtk_menu_new (); + GtkWidget *menuitem; + guint ii; + + if ( full ) { + for ( ii = 0; ii < G_N_ELEMENTS(entries); ii++ ) { + if ( entries[ii].stock_id ) { + menuitem = gtk_image_menu_item_new_with_mnemonic ( entries[ii].label ); + gtk_image_menu_item_set_image ( (GtkImageMenuItem*)menuitem, gtk_image_new_from_stock (entries[ii].stock_id, GTK_ICON_SIZE_MENU) ); + } + else + menuitem = gtk_menu_item_new_with_mnemonic ( entries[ii].label ); + + g_signal_connect_swapped ( G_OBJECT(menuitem), "activate", G_CALLBACK(entries[ii].callback), vlp ); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show ( menuitem ); + } + } + + GtkWidget *submenu = gtk_menu_new(); + menuitem = gtk_menu_item_new_with_mnemonic ( _("New Layer") ); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show ( menuitem ); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu ); + + // Static: so memory accessible yet not continually allocated + static gpointer lpnl[VIK_LAYER_NUM_TYPES][2]; + + for ( ii = 0; ii < VIK_LAYER_NUM_TYPES; ii++ ) { + if ( vik_layer_get_interface(ii)->icon ) { + menuitem = gtk_image_menu_item_new_with_mnemonic ( vik_layer_get_interface(ii)->name ); + gtk_image_menu_item_set_image ( (GtkImageMenuItem*)menuitem, gtk_image_new_from_pixbuf ( vik_layer_load_icon (ii) ) ); + } + else + menuitem = gtk_menu_item_new_with_mnemonic ( vik_layer_get_interface(ii)->name ); + + lpnl[ii][0] = vlp; + lpnl[ii][1] = GINT_TO_POINTER(ii); + + g_signal_connect_swapped ( G_OBJECT(menuitem), "activate", G_CALLBACK(layers_panel_new_layer), lpnl[ii] ); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), menuitem); + gtk_widget_show ( menuitem ); + } + + return menu; +} + +static void vik_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; vlp->vvp = NULL; @@ -136,27 +177,67 @@ static void layers_panel_init ( VikLayersPanel *vlp ) vlp->vt = vik_treeview_new ( ); vlp->toplayer = vik_aggregate_layer_new (); - vik_layer_rename ( VIK_LAYER(vlp->toplayer), "Top Layer"); + vik_layer_rename ( VIK_LAYER(vlp->toplayer), _("Top Layer")); g_signal_connect_swapped ( G_OBJECT(vlp->toplayer), "update", G_CALLBACK(vik_layers_panel_emit_update), 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_treeview_add_layer ( vlp->vt, NULL, &(vlp->toplayer_iter), VIK_LAYER(vlp->toplayer)->name, NULL, TRUE, 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 into selected container layer or otherwise above 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 ); @@ -164,34 +245,25 @@ static void layers_panel_init ( VikLayersPanel *vlp ) gtk_box_pack_start ( GTK_BOX(vlp), scrolledwindow, TRUE, TRUE, 0 ); 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_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 ); - entry.accelerator = NULL; - entry.callback = (GtkItemFactoryCallback) vik_layers_panel_new_layer; - entry.callback_action = i; - if ( vik_layer_get_interface(i)->icon ) - { - entry.item_type = ""; - entry.extra_data = gdk_pixdata_serialize ( vik_layer_get_interface(i)->icon, &tmp ); - } - else - entry.item_type = ""; - - gtk_item_factory_create_item ( vlp->popup_factory, &entry, vlp, 1 ); - g_free ( (gpointer) entry.extra_data ); - g_free ( entry.path ); - } +/** + * Invoke the actual drawing via signal method + */ +static gboolean idle_draw_panel ( VikLayersPanel *vlp ) +{ + g_signal_emit ( G_OBJECT(vlp), layers_panel_signals[VLP_UPDATE_SIGNAL], 0 ); + return FALSE; // Nothing else to do } void vik_layers_panel_emit_update ( VikLayersPanel *vlp ) { - g_signal_emit ( G_OBJECT(vlp), layers_panel_signals[VLP_UPDATE_SIGNAL], 0 ); + // Only ever draw when there is time to do so + if ( g_thread_self() != vik_window_get_thread (VIK_WINDOW(VIK_GTK_WINDOW_FROM_WIDGET(vlp))) ) + // Drawing requested from another (background) thread, so handle via the gdk thread method + gdk_threads_add_idle ( (GSourceFunc) idle_draw_panel, vlp ); + else + g_idle_add ( (GSourceFunc) idle_draw_panel, vlp ); } static void layers_item_toggled (VikLayersPanel *vlp, GtkTreeIter *iter) @@ -223,6 +295,14 @@ static void layers_item_toggled (VikLayersPanel *vlp, GtkTreeIter *iter) static void layers_item_edited (VikLayersPanel *vlp, GtkTreeIter *iter, const gchar *new_text) { + if ( !new_text ) + return; + + if ( new_text[0] == '\0' ) { + a_dialog_error_msg ( GTK_WINDOW(VIK_WINDOW_FROM_WIDGET(vlp)), _("New name can not be blank.") ); + return; + } + if ( vik_treeview_item_get_type ( vlp->vt, iter ) == VIK_TREEVIEW_TYPE_LAYER ) { VikLayer *l; @@ -248,7 +328,7 @@ static gboolean layers_button_press_cb ( VikLayersPanel *vlp, GdkEventButton *ev { if (event->button == 3) { - GtkTreeIter iter; + static GtkTreeIter iter; if ( vik_treeview_get_iter_at_pos ( vlp->vt, &iter, event->x, event->y ) ) { layers_popup ( vlp, &iter, 3 ); @@ -261,6 +341,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; @@ -273,7 +363,7 @@ static void layers_popup ( VikLayersPanel *vlp, GtkTreeIter *iter, gint mouse_bu VikLayer *layer = VIK_LAYER(vik_treeview_item_get_pointer ( vlp->vt, iter )); if ( layer->type == VIK_LAYER_AGGREGATE ) - menu = GTK_MENU(gtk_item_factory_get_widget ( vlp->popup_factory, "
" )); + menu = GTK_MENU ( layers_panel_create_popup ( vlp, TRUE ) ); else { GtkWidget *del, *prop; @@ -315,14 +405,13 @@ static void layers_popup ( VikLayersPanel *vlp, GtkTreeIter *iter, gint mouse_bu gtk_menu_shell_append (GTK_MENU_SHELL (menu), del); gtk_widget_show ( del ); } - - vik_layer_add_menu_items ( layer, menu, vlp ); - } + } + vik_layer_add_menu_items ( layer, menu, vlp ); } 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; @@ -331,17 +420,30 @@ static void layers_popup ( VikLayersPanel *vlp, GtkTreeIter *iter, gint mouse_bu } } else - menu = GTK_MENU(gtk_item_factory_get_widget ( vlp->popup_factory, base_entries[NUM_BASE_ENTRIES-1].path )); + { + menu = GTK_MENU ( layers_panel_create_popup ( vlp, FALSE ) ); + } 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 ); } -gboolean vik_layers_panel_new_layer ( VikLayersPanel *vlp, gint type ) +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, VikLayerTypeEnum type ) { VikLayer *l; g_assert ( vlp->vvp ); @@ -349,12 +451,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; @@ -364,7 +471,7 @@ void vik_layers_panel_add_layer ( VikLayersPanel *vlp, VikLayer *l ) vik_layer_change_coord_mode ( l, vik_viewport_get_coord_mode(vlp->vvp) ); if ( ! vik_treeview_get_selected_iter ( vlp->vt, &iter ) ) - vik_aggregate_layer_add_layer ( vlp->toplayer, l ); + vik_aggregate_layer_add_layer ( vlp->toplayer, l, TRUE ); else { VikAggregateLayer *addtoagg; @@ -389,13 +496,21 @@ void vik_layers_panel_add_layer ( VikLayersPanel *vlp, VikLayer *l ) VikLayer *vl = VIK_LAYER(vik_treeview_item_get_parent ( vlp->vt, &iter )); replace_iter = &(vl->iter); g_assert ( vl->realized ); - addtoagg = VIK_AGGREGATE_LAYER(vik_treeview_item_get_parent ( vlp->vt, &(vl->iter) ) ); + VikLayer *grandpa = (vik_treeview_item_get_parent ( vlp->vt, &(vl->iter) ) ); + if (IS_VIK_AGGREGATE_LAYER(grandpa)) + addtoagg = VIK_AGGREGATE_LAYER(grandpa); + else { + addtoagg = vlp->toplayer; + replace_iter = &grandpa->iter; + } } if ( replace_iter ) vik_aggregate_layer_insert_layer ( addtoagg, l, replace_iter ); else - vik_aggregate_layer_add_layer ( addtoagg, l ); + vik_aggregate_layer_add_layer ( addtoagg, l, TRUE ); } + + vik_layers_panel_emit_update ( vlp ); } static void layers_move_item ( VikLayersPanel *vlp, gboolean up ) @@ -407,7 +522,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 ) { @@ -428,8 +543,10 @@ gboolean vik_layers_panel_properties ( VikLayersPanel *vlp ) if ( vik_treeview_get_selected_iter ( vlp->vt, &iter ) && vik_treeview_item_get_type ( vlp->vt, &iter ) == VIK_TREEVIEW_TYPE_LAYER ) { 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 ); + 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 ); return TRUE; } else @@ -442,60 +559,62 @@ void vik_layers_panel_draw_all ( VikLayersPanel *vlp ) vik_aggregate_layer_draw ( vlp->toplayer, vlp->vvp ); } -void vik_layers_panel_draw_all_using_viewport ( VikLayersPanel *vlp, VikViewport *vvp ) -{ - if ( vlp->vvp && VIK_LAYER(vlp->toplayer)->visible ) - vik_aggregate_layer_draw ( vlp->toplayer, vvp ); -} - 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." ); + 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 ) +gboolean vik_layers_panel_paste_selected ( VikLayersPanel *vlp ) { GtkTreeIter iter; - g_return_if_fail ( vik_treeview_get_selected_iter ( vlp->vt, &iter ) ); - a_clipboard_paste ( vlp ); + if ( ! vik_treeview_get_selected_iter ( vlp->vt, &iter ) ) + /* Nothing to do */ + return FALSE; + return a_clipboard_paste ( vlp ); } void vik_layers_panel_delete_selected ( VikLayersPanel *vlp ) @@ -503,12 +622,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 ) { @@ -517,12 +644,15 @@ void vik_layers_panel_delete_selected ( VikLayersPanel *vlp ) vik_viewport_set_trigger ( vlp->vvp, NULL ); if (IS_VIK_AGGREGATE_LAYER(parent)) { + + g_signal_emit ( G_OBJECT(vlp), layers_panel_signals[VLP_DELETE_LAYER_SIGNAL], 0 ); + 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 delete the Top Layer." ); + a_dialog_info_msg ( VIK_GTK_WINDOW_FROM_WIDGET(vlp), _("You cannot delete the Top Layer.") ); } else if (type == VIK_TREEVIEW_TYPE_SUBLAYER) { VikLayer *sel = vik_layers_panel_get_selected ( vlp ); @@ -580,7 +710,7 @@ gboolean vik_layers_panel_tool ( VikLayersPanel *vlp, guint16 layer_type, VikToo } #endif -VikLayer *vik_layers_panel_get_layer_of_type ( VikLayersPanel *vlp, gint type ) +VikLayer *vik_layers_panel_get_layer_of_type ( VikLayersPanel *vlp, VikLayerTypeEnum type ) { VikLayer *rv = vik_layers_panel_get_selected ( vlp ); if ( rv == NULL || rv->type != type ) @@ -592,11 +722,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 ) @@ -606,8 +736,10 @@ 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 ) ) { + g_signal_emit ( G_OBJECT(vlp), layers_panel_signals[VLP_DELETE_LAYER_SIGNAL], 0 ); vik_aggregate_layer_clear ( vlp->toplayer ); /* simply deletes all layers */ + } } void vik_layers_panel_change_coord_mode ( VikLayersPanel *vlp, VikCoordMode mode ) @@ -619,7 +751,10 @@ static void layers_panel_finalize ( GObject *gob ) { VikLayersPanel *vlp = VIK_LAYERS_PANEL ( gob ); g_object_unref ( VIK_LAYER(vlp->toplayer) ); - g_object_unref ( G_OBJECT(vlp->popup_factory) ); G_OBJECT_CLASS(parent_class)->finalize(gob); } +VikTreeview *vik_layers_panel_get_treeview ( VikLayersPanel *vlp ) +{ + return vlp->vt; +}