added save previous user input string and input label options to datasource search...

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

diff --git a/src/vikaggregatelayer.c b/src/vikaggregatelayer.c
index ea7ee1e934937f27096b091ad0ebf4de57fd30d9..496aa9998fbffd3114e8753e79a7153639679c35 100644 (file)
--- a/src/vikaggregatelayer.c
+++ b/src/vikaggregatelayer.c
@@ -33,7 +33,7 @@ static void aggregate_layer_marshall( VikAggregateLayer *val, guint8 **data, gin
 static VikAggregateLayer *aggregate_layer_unmarshall( guint8 *data, gint len, VikViewport *vvp );
 static void aggregate_layer_change_coord_mode ( VikAggregateLayer *val, VikCoordMode mode );
 static void aggregate_layer_drag_drop_request ( VikAggregateLayer *val_src, VikAggregateLayer *val_dest, GtkTreeIter *src_item_iter, GtkTreePath *dest_path );
-
+static const gchar* aggregate_layer_tooltip ( VikAggregateLayer *val );
 static void aggregate_layer_add_menu_items ( VikAggregateLayer *val, GtkMenu *menu, gpointer vlp );
 
 VikLayerInterface vik_aggregate_layer_interface = {
@@ -70,7 +70,7 @@ VikLayerInterface vik_aggregate_layer_interface = {
   (VikLayerFuncSublayerRenameRequest)   NULL,
   (VikLayerFuncSublayerToggleVisible)   NULL,
   (VikLayerFuncSublayerTooltip)         NULL,
-  (VikLayerFuncLayerTooltip)            NULL,
+  (VikLayerFuncLayerTooltip)            aggregate_layer_tooltip,
   (VikLayerFuncLayerSelected)           NULL,
 
   (VikLayerFuncMarshall)               aggregate_layer_marshall,
@@ -494,6 +494,47 @@ static void aggregate_layer_waypoint_list_dialog ( menu_array_values values )
   g_free ( title );
 }
 
+/**
+ * Search all TrackWaypoint layers in this aggregate layer for an item on the user specified date
+ */
+static void aggregate_layer_search_date ( menu_array_values values )
+{
+  VikAggregateLayer *val = VIK_AGGREGATE_LAYER ( values[MA_VAL] );
+  VikCoord position;
+  gchar *date_str = a_dialog_get_date ( VIK_GTK_WINDOW_FROM_LAYER(val), _("Search by Date") );
+
+  if ( !date_str )
+    return;
+
+  VikViewport *vvp = vik_window_viewport ( VIK_WINDOW(VIK_GTK_WINDOW_FROM_LAYER(val)) );
+
+  GList *gl = NULL;
+  gl = vik_aggregate_layer_get_all_layers_of_type ( val, gl, VIK_LAYER_TRW, TRUE );
+  gboolean found = FALSE;
+  // Search tracks first
+  while ( gl && !found ) {
+    // Make it auto select the item if found
+    found = vik_trw_layer_find_date ( VIK_TRW_LAYER(gl->data), date_str, &position, vvp, TRUE, TRUE );
+    gl = g_list_next ( gl );
+  }
+  g_list_free ( gl );
+  if ( !found ) {
+    // Reset and try on Waypoints
+    gl = NULL;
+    gl = vik_aggregate_layer_get_all_layers_of_type ( val, gl, VIK_LAYER_TRW, TRUE );
+    while ( gl && !found ) {
+      // Make it auto select the item if found
+      found = vik_trw_layer_find_date ( VIK_TRW_LAYER(gl->data), date_str, &position, vvp, FALSE, TRUE );
+      gl = g_list_next ( gl );
+    }
+    g_list_free ( gl );
+  }
+
+  if ( !found )
+    a_dialog_info_msg ( VIK_GTK_WINDOW_FROM_LAYER(val), _("No items found with the requested date.") );
+  g_free ( date_str );
+}
+
 /**
  * aggregate_layer_track_create_list:
  * @vl:        The layer that should create the track and layers list
@@ -632,6 +673,19 @@ static void aggregate_layer_add_menu_items ( VikAggregateLayer *val, GtkMenu *me
   g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(aggregate_layer_waypoint_list_dialog), values );
   gtk_menu_shell_append ( GTK_MENU_SHELL(menu), item );
   gtk_widget_show ( item );
+
+  GtkWidget *search_submenu = gtk_menu_new ();
+  item = gtk_image_menu_item_new_with_mnemonic ( _("Searc_h") );
+  gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, GTK_ICON_SIZE_MENU) );
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+  gtk_widget_show ( item );
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), search_submenu );
+
+  item = gtk_menu_item_new_with_mnemonic ( _("By _Date...") );
+  g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(aggregate_layer_search_date), values );
+  gtk_menu_shell_append ( GTK_MENU_SHELL(search_submenu), item );
+  gtk_widget_set_tooltip_text (item, _("Find the first item with a specified date"));
+  gtk_widget_show ( item );
 }
 
 static void disconnect_layer_signal ( VikLayer *vl, VikAggregateLayer *val )
@@ -841,3 +895,20 @@ static void aggregate_layer_drag_drop_request ( VikAggregateLayer *val_src, VikA
   g_free(dp);
 }
 
+/**
+ * Generate tooltip text for the layer.
+ */
+static const gchar* aggregate_layer_tooltip ( VikAggregateLayer *val )
+{
+  static gchar tmp_buf[128];
+  tmp_buf[0] = '\0';
+
+  GList *children = val->children;
+  if ( children ) {
+    gint nn = g_list_length (children);
+    // Could have a more complicated tooltip that numbers each type of layers,
+    //  but for now a simple overall count
+    g_snprintf (tmp_buf, sizeof(tmp_buf), ngettext("One layer", "%d layers", nn), nn );
+  }
+  return tmp_buf;
+}