Diff of /trunk/src/main.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 21 by harbaum, Sun Jul 5 17:38:06 2009 UTC revision 24 by harbaum, Mon Jul 6 14:07:36 2009 UTC
# Line 1493  static void Line 1493  static void
1493  cb_menu_export_log(GtkWidget *widget, gpointer data) {  cb_menu_export_log(GtkWidget *widget, gpointer data) {
1494    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1495    notes_log_export(appdata);    notes_log_export(appdata);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1496  }  }
1497    
1498  #ifdef USE_MAEMO  #ifdef USE_MAEMO
# Line 1503  static void Line 1500  static void
1500  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1501    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1502    mmpoi_export(appdata);    mmpoi_export(appdata);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1503  }  }
1504  #endif  #endif
1505    
# Line 1513  static void Line 1507  static void
1507  cb_menu_export_garmin(GtkWidget *widget, gpointer data) {  cb_menu_export_garmin(GtkWidget *widget, gpointer data) {
1508    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1509    garmin_export(appdata);    garmin_export(appdata);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1510  }  }
1511    
1512  static void  static void
1513  cb_menu_geomath(GtkWidget *window, gpointer data) {  cb_menu_geomath(GtkWidget *window, gpointer data) {
1514    geomath_dialog((appdata_t *)data);    geomath_dialog((appdata_t *)data);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1515  }  }
1516    
1517  static void  static void
1518  cb_menu_geotext(GtkWidget *window, gpointer data) {  cb_menu_geotext(GtkWidget *window, gpointer data) {
1519    geotext_dialog((appdata_t *)data);    geotext_dialog((appdata_t *)data);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1520  }  }
1521    
1522  static void  static void
1523  cb_menu_precpos(GtkWidget *window, gpointer data) {  cb_menu_precpos(GtkWidget *window, gpointer data) {
1524    precise_position((appdata_t *)data);    precise_position((appdata_t *)data);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1525  }  }
1526    
1527  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
# Line 1552  static GtkWidget *export_menu_create(app Line 1534  static GtkWidget *export_menu_create(app
1534              HILDON_BUTTON_ARRANGEMENT_VERTICAL,              HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1535              _("Export to Maemo Mapper"),              _("Export to Maemo Mapper"),
1536              _("Save a Maemo Mapper POI file"));              _("Save a Maemo Mapper POI file"));
1537    g_signal_connect(button, "clicked",    g_signal_connect_after(button, "clicked",
1538                     G_CALLBACK(cb_menu_export_mmpoi), appdata);                     G_CALLBACK(cb_menu_export_mmpoi), appdata);
1539    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1540    
# Line 1561  static GtkWidget *export_menu_create(app Line 1543  static GtkWidget *export_menu_create(app
1543              HILDON_BUTTON_ARRANGEMENT_VERTICAL,              HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1544              _("Export Field Notes"),              _("Export Field Notes"),
1545              _("Save a Garmin Field Notes file"));              _("Save a Garmin Field Notes file"));
1546    g_signal_connect(button, "clicked",    g_signal_connect_after(button, "clicked",
1547                     G_CALLBACK(cb_menu_export_log), appdata);                     G_CALLBACK(cb_menu_export_log), appdata);
1548    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1549    
# Line 1570  static GtkWidget *export_menu_create(app Line 1552  static GtkWidget *export_menu_create(app
1552              HILDON_BUTTON_ARRANGEMENT_VERTICAL,              HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1553              _("Export Garmin GPX"),              _("Export Garmin GPX"),
1554              _("Save modified waypoints in GPX file"));              _("Save modified waypoints in GPX file"));
1555    g_signal_connect(button, "clicked",    g_signal_connect_after(button, "clicked",
1556                     G_CALLBACK(cb_menu_export_garmin), appdata);                     G_CALLBACK(cb_menu_export_garmin), appdata);
1557    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1558    
# Line 1602  static GtkWidget *tools_menu_create(appd Line 1584  static GtkWidget *tools_menu_create(appd
1584              HILDON_BUTTON_ARRANGEMENT_VERTICAL,              HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1585              _("Geomath"),              _("Geomath"),
1586              _("Geocoordinate calculation"));              _("Geocoordinate calculation"));
1587    g_signal_connect(button, "clicked",    g_signal_connect_after(button, "clicked",
1588                     G_CALLBACK(cb_menu_geomath), appdata);                     G_CALLBACK(cb_menu_geomath), appdata);
1589    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1590    
# Line 1612  static GtkWidget *tools_menu_create(appd Line 1594  static GtkWidget *tools_menu_create(appd
1594              HILDON_BUTTON_ARRANGEMENT_VERTICAL,              HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1595              _("Geotext"),              _("Geotext"),
1596              _("Text analysis"));              _("Text analysis"));
1597    g_signal_connect(button, "clicked",    g_signal_connect_after(button, "clicked",
1598                     G_CALLBACK(cb_menu_geotext), appdata);                     G_CALLBACK(cb_menu_geotext), appdata);
1599    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1600    
# Line 1622  static GtkWidget *tools_menu_create(appd Line 1604  static GtkWidget *tools_menu_create(appd
1604              HILDON_BUTTON_ARRANGEMENT_VERTICAL,              HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1605              _("Precise Position"),              _("Precise Position"),
1606              _("Calculate a precise GPS position"));              _("Calculate a precise GPS position"));
1607    g_signal_connect(button, "clicked",    g_signal_connect_after(button, "clicked",
1608                     G_CALLBACK(cb_menu_precpos), appdata);                     G_CALLBACK(cb_menu_precpos), appdata);
1609    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1610    
Legend:
Removed from v.21  
changed lines
  Added in v.24