Diff of /trunk/src/main.c

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

revision 20 by harbaum, Sat Jul 4 19:42:28 2009 UTC revision 32 by harbaum, Tue Jul 28 13:21:22 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    #ifdef ENABLE_OSM_GPS_MAP
1513    static void
1514    cb_menu_map(GtkWidget *window, gpointer data) {
1515      map((appdata_t *)data);
1516    }
1517    #endif
1518    
1519  static void  static void
1520  cb_menu_geomath(GtkWidget *window, gpointer data) {  cb_menu_geomath(GtkWidget *window, gpointer data) {
1521    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  
1522  }  }
1523    
1524  static void  static void
1525  cb_menu_geotext(GtkWidget *window, gpointer data) {  cb_menu_geotext(GtkWidget *window, gpointer data) {
1526    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  
1527  }  }
1528    
1529  static void  static void
1530  cb_menu_precpos(GtkWidget *window, gpointer data) {  cb_menu_precpos(GtkWidget *window, gpointer data) {
1531    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  
1532  }  }
1533    
1534  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1535  static GtkWidget *export_menu_create(appdata_t *appdata) {  typedef struct {
1536    GtkWidget *button;    char *label, *desc;
1537    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    GtkSignalFunc activate_cb;
1538    } menu_entry_t;
1539    
1540    button = hildon_button_new_with_text(  typedef struct {
1541              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    const char *title;
1542              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    const menu_entry_t *menu;
1543              _("Export to Maemo Mapper"),    int len;
1544              _("Save a Maemo Mapper POI file"));  } submenu_t;
1545    g_signal_connect(button, "clicked",  
1546                     G_CALLBACK(cb_menu_export_mmpoi), appdata);  #define COLUMNS  1
1547    hildon_app_menu_append(menu, GTK_BUTTON(button));  
1548    void on_submenu_entry_clicked(GtkButton *button, GtkWidget *menu) {
1549    
1550      /* force closing of submenu dialog */
1551      gtk_dialog_response(GTK_DIALOG(menu), GTK_RESPONSE_NONE);
1552      gtk_widget_hide(menu);
1553    
1554      /* let gtk clean up */
1555      while(gtk_events_pending())
1556        gtk_main_iteration();
1557    }
1558    
1559    static GtkWidget *app_submenu_create(appdata_t *appdata,
1560                                         const submenu_t *submenu) {
1561    
1562      /* create a oridinary dialog box */
1563      GtkWidget *dialog = gtk_dialog_new();
1564      gtk_window_set_title(GTK_WINDOW(dialog), _(submenu->title));
1565      gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
1566      gtk_window_set_transient_for(GTK_WINDOW(dialog),
1567                                   GTK_WINDOW(appdata->window));
1568      gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
1569    
1570      GtkWidget *table = gtk_table_new(submenu->len/COLUMNS, COLUMNS, TRUE);
1571      int x = 0, y = 0;
1572    
1573      const menu_entry_t *menu_entries = submenu->menu;
1574      while(menu_entries->label) {
1575        GtkWidget *button = NULL;
1576    
1577    button = hildon_button_new_with_text(      button = hildon_button_new_with_text(
1578              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1579              HILDON_BUTTON_ARRANGEMENT_VERTICAL,              HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1580              _("Export Field Notes"),              _(menu_entries->label), _(menu_entries->desc));
             _("Save a Garmin Field Notes file"));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_export_log), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1581    
1582    button = hildon_button_new_with_text(      /* try to center both texts */
1583              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,      hildon_button_set_title_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1584              HILDON_BUTTON_ARRANGEMENT_VERTICAL,      hildon_button_set_value_alignment(HILDON_BUTTON(button), 0.5, 0.5);
             _("Export Garmin GPX"),  
             _("Save modified waypoints in GPX file"));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_export_garmin), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1585    
1586    gtk_widget_show_all(GTK_WIDGET(menu));      g_signal_connect(button, "clicked",
1587                         G_CALLBACK(on_submenu_entry_clicked), dialog);
1588    
1589        g_signal_connect(button, "clicked",
1590                         menu_entries->activate_cb, appdata);
1591    
1592        gtk_table_attach_defaults(GTK_TABLE(table),  button, x, x+1, y, y+1);
1593    
1594        x++;
1595        if(x == COLUMNS) { x = 0; y++; }
1596    
1597    return GTK_WIDGET(menu);      menu_entries++;
1598  }    }
1599    
1600  /* the export submenu */    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);
 void on_export_clicked(GtkButton *button, appdata_t *appdata) {  
   if(!appdata->export_menu)  
     appdata->export_menu = export_menu_create(appdata);  
1601    
1602    /* draw a popup menu */    return dialog;
   hildon_app_menu_popup(HILDON_APP_MENU(appdata->export_menu),  
                         GTK_WINDOW(hildon_window_stack_peek(  
                     hildon_window_stack_get_default())));  
1603  }  }
1604    
1605  static GtkWidget *tools_menu_create(appdata_t *appdata) {  /* popup the dialog shaped submenu */
1606    GtkWidget *button;  static void submenu_popup(GtkWidget *menu) {
1607    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    gtk_widget_show_all(menu);
1608      gtk_dialog_run(GTK_DIALOG(menu));
1609      gtk_widget_hide(menu);
1610    }
1611    
1612    button = hildon_button_new_with_text(  static void submenu_cleanup(GtkWidget *menu) {
1613              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    gtk_widget_destroy(menu);
1614              HILDON_BUTTON_ARRANGEMENT_VERTICAL,  }
             _("Geomath"),  
             _("Geocoordinate calculation"));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_geomath), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1615    
1616    static const menu_entry_t submenu_export_entries[] = {
1617      { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1618        G_CALLBACK(cb_menu_export_mmpoi)  },
1619      { "Export Field Notes",      "Save a Garmin Field Notes file",
1620        G_CALLBACK(cb_menu_export_log)    },
1621      { "Export Garmin GPX",       "Save modified waypoints in GPX file",
1622        G_CALLBACK(cb_menu_export_garmin) },
1623      { NULL, NULL, NULL }
1624    };
1625    
1626    button = hildon_button_new_with_text(  static const submenu_t submenu_export = {
1627              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    "Export", submenu_export_entries,
1628              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    sizeof(submenu_export_entries)/sizeof(menu_entry_t)-1
1629              _("Geotext"),  };
             _("Text analysis"));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_geotext), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
   
1630    
1631    button = hildon_button_new_with_text(  /* the export submenu */
1632              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,  void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1633              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    if(!appdata->export_menu)
1634              _("Precise Position"),      appdata->export_menu = app_submenu_create(appdata, &submenu_export);
             _("Calculate a precise GPS position"));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_precpos), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
   
   gtk_widget_show_all(GTK_WIDGET(menu));  
1635    
1636    return GTK_WIDGET(menu);    submenu_popup(appdata->export_menu);
1637  }  }
1638    
1639    static const menu_entry_t submenu_tools_entries[] = {
1640    #ifdef ENABLE_OSM_GPS_MAP
1641      { "Map",              "Display an interactive world map",
1642        G_CALLBACK(cb_menu_map) },
1643    #endif
1644      { "Geomath",          "Geocoordinate calculation",
1645        G_CALLBACK(cb_menu_geomath) },
1646      { "Geotext",          "Text analysis",
1647        G_CALLBACK(cb_menu_geotext) },
1648      { "Precise Position", "Calculate a precise GPS position",
1649        G_CALLBACK(cb_menu_precpos) },
1650      { NULL, NULL, NULL }
1651    };
1652    
1653    static const submenu_t submenu_tools = {
1654      "Tools", submenu_tools_entries,
1655      sizeof(submenu_tools_entries)/sizeof(menu_entry_t)-1
1656    };
1657    
1658  /* the tools submenu */  /* the tools submenu */
1659  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1660    if(!appdata->tools_menu)    if(!appdata->tools_menu)
1661      appdata->tools_menu = tools_menu_create(appdata);      appdata->tools_menu = app_submenu_create(appdata, &submenu_tools);
1662    
1663    /* draw a popup menu */    submenu_popup(appdata->tools_menu);
   hildon_app_menu_popup(HILDON_APP_MENU(appdata->tools_menu),  
                         GTK_WINDOW(hildon_window_stack_peek(  
                     hildon_window_stack_get_default())));  
1664  }  }
1665    
   
1666  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {
1667    GtkWidget *button;    GtkWidget *button;
1668    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
# Line 1801  void menu_create(appdata_t *appdata) { Line 1824  void menu_create(appdata_t *appdata) {
1824    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1825    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1826    
1827    #ifdef ENABLE_OSM_GPS_MAP
1828      item = gtk_menu_item_new_with_label( _("Map") );
1829      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1830      g_signal_connect(item, "activate",
1831                       GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1832    #endif
1833    
1834    item = gtk_menu_item_new_with_label( _("Geomath") );    item = gtk_menu_item_new_with_label( _("Geomath") );
1835    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1836    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1860  void cleanup(appdata_t *appdata) { Line 1890  void cleanup(appdata_t *appdata) {
1890    if(appdata->image_path) free(appdata->image_path);    if(appdata->image_path) free(appdata->image_path);
1891    if(appdata->search_str) free(appdata->search_str);    if(appdata->search_str) free(appdata->search_str);
1892    
1893    #ifdef USE_STACKABLE_WINDOW
1894      if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
1895      if(appdata->tools_menu)  submenu_cleanup(appdata->tools_menu);
1896    #endif
1897    
1898    gnome_vfs_shutdown();    gnome_vfs_shutdown();
1899    icons_free();    icons_free();
1900    gps_release(appdata);    gps_release(appdata);
# Line 2231  int main(int argc, char *argv[]) { Line 2266  int main(int argc, char *argv[]) {
2266    
2267    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2268    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
   
2269  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
2270    menu_create(&appdata);    menu_create(&appdata);
2271  #else  #else
Legend:
Removed from v.20  
changed lines
  Added in v.32