--- trunk/src/main.c	2009/06/22 13:05:30	3
+++ trunk/src/main.c	2009/06/22 14:25:59	4
@@ -1452,16 +1452,29 @@
 
 #ifdef USE_STACKABLE_WINDOW
 void on_export_clicked(GtkButton *button, appdata_t *appdata) {
-  GtkWidget *dialog = gtk_dialog_new();
+  GtkWidget *but, *dialog = gtk_dialog_new();
 
-  GtkWidget *but = 
-    hildon_button_new_with_text(HILDON_SIZE_AUTO,
-				HILDON_BUTTON_ARRANGEMENT_VERTICAL,
-				_("Export to Maemo Mapper"),
-				_("Write a Maemo Mapper POI file"));
+  gtk_window_set_title(GTK_WINDOW(dialog), _("Export"));
 
-  gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox),
-		    but);
+  but = hildon_button_new_with_text(HILDON_SIZE_AUTO,
+				    HILDON_BUTTON_ARRANGEMENT_VERTICAL,
+				    _("Export to Maemo Mapper"),
+				    _("Write a Maemo Mapper POI file"));
+  gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), but);
+  
+
+  but = hildon_button_new_with_text(HILDON_SIZE_AUTO,
+				    HILDON_BUTTON_ARRANGEMENT_VERTICAL,
+				    _("Export Field Notes"),
+				    _("Write a Garmin Field Notes file"));
+  gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), but);
+  
+
+  but = hildon_button_new_with_text(HILDON_SIZE_AUTO,
+				    HILDON_BUTTON_ARRANGEMENT_VERTICAL,
+				    _("Export Garmin GPX"),
+				    _("Write GPX file of modified points"));
+  gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), but);
   
 
 #if 0
@@ -1498,6 +1511,7 @@
     hildon_app_menu_append(menu, GTK_BUTTON(button));
   }
 
+#if 0
   if(mode == MENU_GPXLIST || mode == MENU_CACHELIST) {
     button = gtk_button_new_with_label(_("Export to Mapper"));
     g_signal_connect_after(button, "clicked", 
@@ -1521,6 +1535,21 @@
 			   G_CALLBACK(cb_menu_search), appdata);
     hildon_app_menu_append(menu, GTK_BUTTON(button));
   }
+#else
+
+  if(mode == MENU_GPXLIST) {
+    button = gtk_button_new_with_label(_("Export"));
+    g_signal_connect_after(button, "clicked", 
+			   G_CALLBACK(on_export_clicked), appdata);
+    hildon_app_menu_append(menu, GTK_BUTTON(button));
+
+    button = gtk_button_new_with_label(_("Search"));
+    g_signal_connect_after(button, "clicked", 
+			   G_CALLBACK(cb_menu_search), appdata);
+    hildon_app_menu_append(menu, GTK_BUTTON(button));
+  }
+
+#endif
 
   button = gtk_button_new_with_label(_("About"));
   g_signal_connect_after(button, "clicked",