*
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "viking.h"
#include <string.h>
+#include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
+
enum {
VLP_UPDATE_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 GtkItemFactoryEntry base_entries[] = {
- { "/C_ut", NULL, (GtkItemFactoryCallback) vik_layers_panel_cut_selected, -1, "<StockItem>", GTK_STOCK_CUT },
- { "/_Copy", NULL, (GtkItemFactoryCallback) vik_layers_panel_copy_selected, -1, "<StockItem>", GTK_STOCK_COPY },
- { "/_Paste", NULL, (GtkItemFactoryCallback) vik_layers_panel_paste_selected, -1, "<StockItem>", GTK_STOCK_PASTE },
- { "/_Delete", NULL, (GtkItemFactoryCallback) vik_layers_panel_delete_selected, -1, "<StockItem>", GTK_STOCK_DELETE },
- { "/New Layer", NULL, NULL, -1, "<Branch>" },
+ { N_("/C_ut"), NULL, (GtkItemFactoryCallback) vik_layers_panel_cut_selected, -1, "<StockItem>", GTK_STOCK_CUT },
+ { N_("/_Copy"), NULL, (GtkItemFactoryCallback) vik_layers_panel_copy_selected, -1, "<StockItem>", GTK_STOCK_COPY },
+ { N_("/_Paste"), NULL, (GtkItemFactoryCallback) vik_layers_panel_paste_selected, -1, "<StockItem>", GTK_STOCK_PASTE },
+ { N_("/_Delete"), NULL, (GtkItemFactoryCallback) vik_layers_panel_delete_selected, -1, "<StockItem>", GTK_STOCK_DELETE },
+ { N_("/New Layer"), NULL, NULL, -1, "<Branch>" },
};
-#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 );
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;
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_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 );
{
/* 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 );
+ /* 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 );
+ 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;
switch ( type )
{
- case VIK_TREEVIEW_TYPE_LAYER: visible = (VIK_LAYER(p)->visible ^= 1); break;
- case VIK_TREEVIEW_TYPE_SUBLAYER: visible = vik_layer_sublayer_toggle_visible ( VIK_LAYER(vik_treeview_item_get_parent(vlp->vt, iter)), vik_treeview_item_get_data(vlp->vt, iter), p); break;
+ case VIK_TREEVIEW_TYPE_LAYER:
+ visible = (VIK_LAYER(p)->visible ^= 1);
+ vik_layer_emit_update_although_invisible ( VIK_LAYER(p) ); /* set trigger for half-drawn */
+ break;
+ case VIK_TREEVIEW_TYPE_SUBLAYER:
+ visible = vik_layer_sublayer_toggle_visible ( VIK_LAYER(vik_treeview_item_get_parent(vlp->vt, iter)),
+ vik_treeview_item_get_data(vlp->vt, iter), p);
+ vik_layer_emit_update_although_invisible ( VIK_LAYER(vik_treeview_item_get_parent(vlp->vt, iter)) );
+ break;
default: return;
}
vik_treeview_item_set_visible ( vlp->vt, iter, visible );
-
- vik_layers_panel_emit_update ( vlp );
}
static void layers_item_edited (VikLayersPanel *vlp, GtkTreeIter *iter, const gchar *new_text)
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;
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;
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 );
+}
+
gboolean vik_layers_panel_new_layer ( VikLayersPanel *vlp, gint type )
{
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 );
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 )
{
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 ) ), VIK_GTK_WINDOW_FROM_WIDGET(vlp->vt) );
+ 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
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 );
VikAggregateLayer *parent = vik_treeview_item_get_parent ( vlp->vt, &iter );
if ( parent )
{
- a_clipboard_copy ( vlp );
- if ( vik_aggregate_layer_delete ( parent, &iter ) )
- vik_layers_panel_emit_update ( vlp );
+ /* 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 (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 ( 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 )
{
- 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;
a_clipboard_paste ( 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 )
{
+ /* 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 );
+
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 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 );
if ( vik_layer_get_interface(sel->type)->delete_item ) {
- vik_layer_get_interface(sel->type)->delete_item ( sel, type, vik_treeview_item_get_pointer(sel->vt, &iter) );
+ gint subtype = vik_treeview_item_get_data( vlp->vt, &iter);
+ vik_layer_get_interface(sel->type)->delete_item ( sel, subtype, vik_treeview_item_get_pointer(sel->vt, &iter) );
}
}
}
return rv;
}
+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, include_invisible));
+}
+
VikAggregateLayer *vik_layers_panel_get_top_layer ( VikLayersPanel *vlp )
{
return vlp->toplayer;
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 */
}
G_OBJECT_CLASS(parent_class)->finalize(gob);
}
+VikTreeview *vik_layers_panel_get_treeview ( VikLayersPanel *vlp )
+{
+ return vlp->vt;
+}
projects / andy / viking.git / blobdiff