Document recent activities

[andy/viking.git] / src / viklayerspanel.c

diff --git a/src/viklayerspanel.c b/src/viklayerspanel.c
index 11ba08c64aa3cbf08a2c1883850f8455047efae3..ddbcc47d8138838f99eec873a5e9072b425e3eb4 100644 (file)
--- a/src/viklayerspanel.c
+++ b/src/viklayerspanel.c
@@ -19,10 +19,16 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "viking.h"
 
 #include <string.h>
 
+#include <glib/gi18n.h>
+
 enum {
   VLP_UPDATE_SIGNAL,
   VLP_LAST_SIGNAL
@@ -50,11 +56,11 @@ struct _VikLayersPanel {
 };
 
 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
@@ -136,7 +142,7 @@ 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 );
@@ -206,14 +212,19 @@ static void layers_item_toggled (VikLayersPanel *vlp, GtkTreeIter *iter)
 
   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)
@@ -384,7 +395,13 @@ 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 );
@@ -423,8 +440,8 @@ 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 ) ), VIK_GTK_WINDOW_FROM_WIDGET(vlp->vt) );
+      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 );
     return TRUE;
   }
   else
@@ -455,14 +472,20 @@ void vik_layers_panel_cut_selected ( VikLayersPanel *vlp )
   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 );
     }
     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.") );
   }
 }
 
@@ -482,7 +505,6 @@ void vik_layers_panel_copy_selected ( VikLayersPanel *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 ) );
   a_clipboard_paste ( vlp );
@@ -502,13 +524,17 @@ void vik_layers_panel_delete_selected ( VikLayersPanel *vlp )
     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 );
@@ -592,7 +618,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_overwrite ( 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 */
 }