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 31 by harbaum, Sat Jul 25 10:29:30 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
1528  static GtkWidget *export_menu_create(appdata_t *appdata) {  typedef struct {
1529    GtkWidget *button;    char *label, *desc;
1530    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    GtkSignalFunc activate_cb;
1531    } menu_entry_t;
1532    
1533    button = hildon_button_new_with_text(  typedef struct {
1534              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    const char *title;
1535              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    const menu_entry_t *menu;
1536              _("Export to Maemo Mapper"),    int len;
1537              _("Save a Maemo Mapper POI file"));  } submenu_t;
1538    g_signal_connect(button, "clicked",  
1539                     G_CALLBACK(cb_menu_export_mmpoi), appdata);  #define COLUMNS  1
1540    hildon_app_menu_append(menu, GTK_BUTTON(button));  
1541    void on_submenu_entry_clicked(GtkButton *button, GtkWidget *menu) {
1542    
1543      /* force closing of submenu dialog */
1544      gtk_dialog_response(GTK_DIALOG(menu), GTK_RESPONSE_NONE);
1545      gtk_widget_hide(menu);
1546    
1547      /* let gtk clean up */
1548      while(gtk_events_pending())
1549        gtk_main_iteration();
1550    }
1551    
1552    static GtkWidget *app_submenu_create(appdata_t *appdata,
1553                                         const submenu_t *submenu) {
1554    
1555      /* create a oridinary dialog box */
1556      GtkWidget *dialog = gtk_dialog_new();
1557      gtk_window_set_title(GTK_WINDOW(dialog), _(submenu->title));
1558      gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
1559      gtk_window_set_transient_for(GTK_WINDOW(dialog),
1560                                   GTK_WINDOW(appdata->window));
1561      gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
1562    
1563      GtkWidget *table = gtk_table_new(submenu->len/COLUMNS, COLUMNS, TRUE);
1564      int x = 0, y = 0;
1565    
1566      const menu_entry_t *menu_entries = submenu->menu;
1567      while(menu_entries->label) {
1568        GtkWidget *button = NULL;
1569    
1570    button = hildon_button_new_with_text(      button = hildon_button_new_with_text(
1571              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1572              HILDON_BUTTON_ARRANGEMENT_VERTICAL,              HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1573              _("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));  
1574    
1575    button = hildon_button_new_with_text(      /* try to center both texts */
1576              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,      hildon_button_set_title_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1577              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));  
1578    
1579    gtk_widget_show_all(GTK_WIDGET(menu));      g_signal_connect(button, "clicked",
1580                         G_CALLBACK(on_submenu_entry_clicked), dialog);
1581    
1582        g_signal_connect(button, "clicked",
1583                         menu_entries->activate_cb, appdata);
1584    
1585        gtk_table_attach_defaults(GTK_TABLE(table),  button, x, x+1, y, y+1);
1586    
1587        x++;
1588        if(x == COLUMNS) { x = 0; y++; }
1589    
1590    return GTK_WIDGET(menu);      menu_entries++;
1591  }    }
1592    
1593  /* 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);  
1594    
1595    /* 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())));  
1596  }  }
1597    
1598  static GtkWidget *tools_menu_create(appdata_t *appdata) {  /* popup the dialog shaped submenu */
1599    GtkWidget *button;  static void submenu_popup(GtkWidget *menu) {
1600    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    gtk_widget_show_all(menu);
1601      gtk_dialog_run(GTK_DIALOG(menu));
1602    /* the following doesn't have an effect */    gtk_widget_hide(menu);
1603    //  gtk_window_set_title(GTK_WINDOW(menu), "Tools");  }
1604    
1605    button = hildon_button_new_with_text(  static void submenu_cleanup(GtkWidget *menu) {
1606              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    gtk_widget_destroy(menu);
1607              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));  
1608    
1609    static const menu_entry_t submenu_export_entries[] = {
1610      { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1611        G_CALLBACK(cb_menu_export_mmpoi)  },
1612      { "Export Field Notes",      "Save a Garmin Field Notes file",
1613        G_CALLBACK(cb_menu_export_log)    },
1614      { "Export Garmin GPX",       "Save modified waypoints in GPX file",
1615        G_CALLBACK(cb_menu_export_garmin) },
1616      { NULL, NULL, NULL }
1617    };
1618    
1619    button = hildon_button_new_with_text(  static const submenu_t submenu_export = {
1620              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    "Export", submenu_export_entries,
1621              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    sizeof(submenu_export_entries)/sizeof(menu_entry_t)-1
1622              _("Geotext"),  };
             _("Text analysis"));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_geotext), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
   
1623    
1624    button = hildon_button_new_with_text(  /* the export submenu */
1625              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,  void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1626              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    if(!appdata->export_menu)
1627              _("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));  
1628    
1629    return GTK_WIDGET(menu);    submenu_popup(appdata->export_menu);
1630  }  }
1631    
1632    static const menu_entry_t submenu_tools_entries[] = {
1633      { "Geomath",          "Geocoordinate calculation",
1634        G_CALLBACK(cb_menu_geomath) },
1635      { "Geotext",          "Text analysis",
1636        G_CALLBACK(cb_menu_geotext) },
1637      { "Precise Position", "Calculate a precise GPS position",
1638        G_CALLBACK(cb_menu_precpos) },
1639      { NULL, NULL, NULL }
1640    };
1641    
1642    static const submenu_t submenu_tools = {
1643      "Tools", submenu_tools_entries,
1644      sizeof(submenu_tools_entries)/sizeof(menu_entry_t)-1
1645    };
1646    
1647  /* the tools submenu */  /* the tools submenu */
1648  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1649    if(!appdata->tools_menu)    if(!appdata->tools_menu)
1650      appdata->tools_menu = tools_menu_create(appdata);      appdata->tools_menu = app_submenu_create(appdata, &submenu_tools);
1651    
1652    /* 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())));  
1653  }  }
1654    
   
1655  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {
1656    GtkWidget *button;    GtkWidget *button;
1657    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
# Line 1863  void cleanup(appdata_t *appdata) { Line 1872  void cleanup(appdata_t *appdata) {
1872    if(appdata->image_path) free(appdata->image_path);    if(appdata->image_path) free(appdata->image_path);
1873    if(appdata->search_str) free(appdata->search_str);    if(appdata->search_str) free(appdata->search_str);
1874    
1875    #ifdef USE_STACKABLE_WINDOW
1876      if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
1877      if(appdata->tools_menu)  submenu_cleanup(appdata->tools_menu);
1878    #endif
1879    
1880    gnome_vfs_shutdown();    gnome_vfs_shutdown();
1881    icons_free();    icons_free();
1882    gps_release(appdata);    gps_release(appdata);
# Line 2234  int main(int argc, char *argv[]) { Line 2248  int main(int argc, char *argv[]) {
2248    
2249    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2250    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
   
2251  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
2252    menu_create(&appdata);    menu_create(&appdata);
2253  #else  #else
Legend:
Removed from v.21  
changed lines
  Added in v.31