Group "Export Layer" entries in a submenu

Signed-off-by: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>

diff --git a/ChangeLog b/ChangeLog
index a6c31c8079dfa4bac5640e225d5a5f28dfbfda42..74c2362873353e8e606064d6d106623d450ea086 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-16
+Guilhem Bonnefille <guilhem.bonnefille@gmail.com>:
+       * Group "Export Layer..." entries in a sub-menu.
+

 2007-08-16
 Quy Tonthat <qtonthat@gmail.com>:
        * Clean up and eliminate compiler warning.
 2007-08-16
 Quy Tonthat <qtonthat@gmail.com>:
        * Clean up and eliminate compiler warning.

diff --git a/src/viktrwlayer.c b/src/viktrwlayer.c
index 2a65350b89f938ca33241cf0742cd7d1eaf66090..48b8471ca5381cef2058f336869aa59f9d0ca79e 100644 (file)
--- a/src/viktrwlayer.c
+++ b/src/viktrwlayer.c
@@ -1586,6 +1586,7 @@ void vik_trw_layer_add_menu_items ( VikTrwLayer *vtl, GtkMenu *menu, gpointer vl
 {
   static gpointer pass_along[2];
   GtkWidget *item;
 {
   static gpointer pass_along[2];
   GtkWidget *item;

+  GtkMenu *export_submenu;

   pass_along[0] = vtl;
   pass_along[1] = vlp;
 
   pass_along[0] = vtl;
   pass_along[1] = vlp;
 


@@ -1603,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 );
 
   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_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 );
   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 );
 
   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 );
   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" );
   gtk_widget_show ( item );
 
   item = gtk_menu_item_new_with_label ( "New Waypoint" );