Add sublayer tooltip callback definition.

diff --git a/src/vikaggregatelayer.c b/src/vikaggregatelayer.c
index 884340f787ca5dc20fd362e58092869817e05346..9e90c71f6beb4334e57014f25154d18cb79634a1 100644 (file)
--- a/src/vikaggregatelayer.c
+++ b/src/vikaggregatelayer.c
@@ -62,6 +62,7 @@ VikLayerInterface vik_aggregate_layer_interface = {
 
   (VikLayerFuncSublayerRenameRequest)   NULL,
   (VikLayerFuncSublayerToggleVisible)   NULL,
+  (VikLayerFuncSublayerTooltip)         NULL,
 
   (VikLayerFuncMarshall)               aggregate_layer_marshall,
   (VikLayerFuncUnmarshall)             aggregate_layer_unmarshall,

diff --git a/src/vikcoordlayer.c b/src/vikcoordlayer.c
index 587d631b588f6f77cbf31cec6f5954a893208a56..f9c0984f1f855c4b2ef96b809336933fd3ea338d 100644 (file)
--- a/src/vikcoordlayer.c
+++ b/src/vikcoordlayer.c
@@ -82,6 +82,7 @@ VikLayerInterface vik_coord_layer_interface = {
 
   (VikLayerFuncSublayerRenameRequest)   NULL,
   (VikLayerFuncSublayerToggleVisible)   NULL,
+  (VikLayerFuncSublayerTooltip)         NULL,
 
   (VikLayerFuncMarshall)               coord_layer_marshall,
   (VikLayerFuncUnmarshall)             coord_layer_unmarshall,

diff --git a/src/vikdemlayer.c b/src/vikdemlayer.c
index 0313c1d7179b984ccc410e4983579c8904831481..d6cac06fda9a950885e4e9f06d96c2639c01f215 100644 (file)
--- a/src/vikdemlayer.c
+++ b/src/vikdemlayer.c
@@ -212,6 +212,7 @@ VikLayerInterface vik_dem_layer_interface = {
 
   (VikLayerFuncSublayerRenameRequest)   NULL,
   (VikLayerFuncSublayerToggleVisible)   NULL,
+  (VikLayerFuncSublayerTooltip)         NULL,
 
   (VikLayerFuncMarshall)               dem_layer_marshall,
   (VikLayerFuncUnmarshall)             dem_layer_unmarshall,

diff --git a/src/vikgeoreflayer.c b/src/vikgeoreflayer.c
index 2c5e9237af3d064b30a993ca102cf1671b75feb7..93aff65e57a1a5e04ba5515703535ddb74ea42ec 100644 (file)
--- a/src/vikgeoreflayer.c
+++ b/src/vikgeoreflayer.c
@@ -105,6 +105,7 @@ VikLayerInterface vik_georef_layer_interface = {
 
   (VikLayerFuncSublayerRenameRequest)   NULL,
   (VikLayerFuncSublayerToggleVisible)   NULL,
+  (VikLayerFuncSublayerTooltip)         NULL,
 
   (VikLayerFuncMarshall)               georef_layer_marshall,
   (VikLayerFuncUnmarshall)             georef_layer_unmarshall,

diff --git a/src/vikgpslayer.c b/src/vikgpslayer.c
index bd708fd8bba6acd5d8fa75490bbf7b3e10948ca4..49cacdffd8627380fe36493da9190bd8b04a90f5 100644 (file)
--- a/src/vikgpslayer.c
+++ b/src/vikgpslayer.c
@@ -197,6 +197,7 @@ VikLayerInterface vik_gps_layer_interface = {
 
   (VikLayerFuncSublayerRenameRequest)   NULL,
   (VikLayerFuncSublayerToggleVisible)   NULL,
+  (VikLayerFuncSublayerTooltip)         NULL,
 
   (VikLayerFuncMarshall)               gps_layer_marshall,
   (VikLayerFuncUnmarshall)             gps_layer_unmarshall,

diff --git a/src/viklayer.c b/src/viklayer.c
index b635e628e93f73d9737dfd7733777ac8010cef97..c44d3b2198afda7fae41f63873f539b8029aeb0d 100644 (file)
--- a/src/viklayer.c
+++ b/src/viklayer.c
@@ -438,6 +438,13 @@ const gchar *vik_layer_sublayer_rename_request ( VikLayer *l, const gchar *newna
   return NULL;
 }
 
+const gchar* vik_layer_sublayer_tooltip ( VikLayer *l, gint subtype, gpointer sublayer )
+{
+  if ( vik_layer_interfaces[l->type]->sublayer_tooltip )
+    return vik_layer_interfaces[l->type]->sublayer_tooltip ( l, subtype, sublayer );
+  return NULL;
+}
+
 GdkPixbuf *vik_layer_load_icon ( gint type )
 {
   g_assert ( type < VIK_LAYER_NUM_TYPES );

diff --git a/src/viklayer.h b/src/viklayer.h
index ebbed39e16fe048ef37dbd85c416f948332944a5..25092962fa5c919509dae3b3faff158e1e03ad57 100644 (file)
--- a/src/viklayer.h
+++ b/src/viklayer.h
@@ -144,12 +144,14 @@ typedef void          (*VikLayerFuncChangeCoordMode)       (VikLayer *,VikCoordM
 
 typedef void          (*VikLayerFuncSetMenuItemsSelection)          (VikLayer *,guint16);
 typedef guint16          (*VikLayerFuncGetMenuItemsSelection)          (VikLayer *);
+
 typedef void          (*VikLayerFuncAddMenuItems)          (VikLayer *,GtkMenu *,gpointer); /* gpointer is a VikLayersPanel */
 typedef gboolean      (*VikLayerFuncSublayerAddMenuItems)  (VikLayer *,GtkMenu *,gpointer, /* first gpointer is a VikLayersPanel */
                                                             gint,gpointer,GtkTreeIter *);
 typedef const gchar * (*VikLayerFuncSublayerRenameRequest) (VikLayer *,const gchar *,gpointer,
                                                             gint,VikViewport *,GtkTreeIter *); /* first gpointer is a VikLayersPanel */
 typedef gboolean      (*VikLayerFuncSublayerToggleVisible) (VikLayer *,gint,gpointer);
+typedef const gchar * (*VikLayerFuncSublayerTooltip)       (VikLayer *,gint,gpointer);
 
 typedef void          (*VikLayerFuncMarshall)              (VikLayer *, guint8 **, gint *);
 typedef VikLayer *    (*VikLayerFuncUnmarshall)            (guint8 *, gint, VikViewport *);
@@ -222,6 +224,7 @@ struct _VikLayerInterface {
   VikLayerFuncSublayerAddMenuItems  sublayer_add_menu_items;
   VikLayerFuncSublayerRenameRequest sublayer_rename_request;
   VikLayerFuncSublayerToggleVisible sublayer_toggle_visible;
+  VikLayerFuncSublayerTooltip       sublayer_tooltip;
 
   VikLayerFuncMarshall              marshall;
   VikLayerFuncUnmarshall            unmarshall;
@@ -278,6 +281,8 @@ const gchar *vik_layer_sublayer_rename_request ( VikLayer *l, const gchar *newna
 
 gboolean vik_layer_sublayer_toggle_visible ( VikLayer *l, gint subtype, gpointer sublayer );
 
+const gchar* vik_layer_sublayer_tooltip ( VikLayer *l, gint subtype, gpointer sublayer );
+
 /* TODO: put in layerspanel */
 GdkPixbuf *vik_layer_load_icon ( gint type );
 

diff --git a/src/vikmapslayer.c b/src/vikmapslayer.c
index f8354fa283c30f966d1aefa45a5d57e57bae0333..17c26d67b16ea6e694532c24d8ed0ddf7c92e445 100644 (file)
--- a/src/vikmapslayer.c
+++ b/src/vikmapslayer.c
@@ -166,6 +166,7 @@ VikLayerInterface vik_maps_layer_interface = {
 
   (VikLayerFuncSublayerRenameRequest)   NULL,
   (VikLayerFuncSublayerToggleVisible)   NULL,
+  (VikLayerFuncSublayerTooltip)         NULL,
 
   (VikLayerFuncMarshall)               maps_layer_marshall,
   (VikLayerFuncUnmarshall)             maps_layer_unmarshall,

diff --git a/src/viktrwlayer.c b/src/viktrwlayer.c
index 24c2dacc2160519e73bcb4808d40645d1ca7e315..103f93cde2cee9697d7caa09ddc4891ed09ecec4 100644 (file)
--- a/src/viktrwlayer.c
+++ b/src/viktrwlayer.c
@@ -441,6 +441,7 @@ VikLayerInterface vik_trw_layer_interface = {
 
   (VikLayerFuncSublayerRenameRequest)   vik_trw_layer_sublayer_rename_request,
   (VikLayerFuncSublayerToggleVisible)   vik_trw_layer_sublayer_toggle_visible,
+  (VikLayerFuncSublayerTooltip)         NULL,
 
   (VikLayerFuncMarshall)                trw_layer_marshall,
   (VikLayerFuncUnmarshall)              trw_layer_unmarshall,