Group "Export Layer" entries in a submenu

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

diff --git a/src/viktrwlayer.c b/src/viktrwlayer.c
index 44a4a4c6abe8e3044a402a111411c589750224dc..48b8471ca5381cef2058f336869aa59f9d0ca79e 100644 (file)
--- a/src/viktrwlayer.c
+++ b/src/viktrwlayer.c
@@ -474,7 +474,6 @@ static void trw_layer_copy_item ( VikTrwLayer *vtl, gint subtype, gpointer subla
   guint8 *id;
   guint il;
 
-  g_debug("%s:%s() called\n", __FILE__, __PRETTY_FUNCTION__);
   if (!sublayer) {
     *item = NULL;
     return;
@@ -1587,6 +1586,7 @@ void vik_trw_layer_add_menu_items ( VikTrwLayer *vtl, GtkMenu *menu, gpointer vl
 {
   static gpointer pass_along[2];
   GtkWidget *item;
+  GtkMenu *export_submenu;
   pass_along[0] = vtl;
   pass_along[1] = vlp;
 
@@ -1604,19 +1604,25 @@ void vik_trw_layer_add_menu_items ( VikTrwLayer *vtl, GtkMenu *menu, gpointer vl
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
   gtk_widget_show ( item );
 
-  item = gtk_menu_item_new_with_label ( "Export Layer as GPSPoint" );
-  g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(trw_layer_export_gpspoint), pass_along );
+  export_submenu = gtk_menu_new ();
+  item = gtk_menu_item_new_with_label ( "Export layer" );
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
   gtk_widget_show ( item );
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), export_submenu);
+  
+  item = gtk_menu_item_new_with_label ( "Export as GPSPoint" );
+  g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(trw_layer_export_gpspoint), pass_along );
+  gtk_menu_shell_append (GTK_MENU_SHELL (export_submenu), item);
+  gtk_widget_show ( item );
 
-  item = gtk_menu_item_new_with_label ( "Export Layer as GPSMapper" );
+  item = gtk_menu_item_new_with_label ( "Export as GPSMapper" );
   g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(trw_layer_export_gpsmapper), pass_along );
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+  gtk_menu_shell_append (GTK_MENU_SHELL (export_submenu), item);
   gtk_widget_show ( item );
 
-  item = gtk_menu_item_new_with_label ( "Export Layer as GPX" );
+  item = gtk_menu_item_new_with_label ( "Export as GPX" );
   g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(trw_layer_export_gpx), pass_along );
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+  gtk_menu_shell_append (GTK_MENU_SHELL (export_submenu), item);
   gtk_widget_show ( item );
 
   item = gtk_menu_item_new_with_label ( "New Waypoint" );