Diff of /trunk/src/main.c

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

revision 24 by harbaum, Mon Jul 6 14:07:36 2009 UTC revision 40 by harbaum, Sun Aug 2 19:05:24 2009 UTC
# Line 587  void cachelist_dialog(appdata_t *appdata Line 587  void cachelist_dialog(appdata_t *appdata
587    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
588    
589    appdata->cur_gpx = gpx;    appdata->cur_gpx = gpx;
590    char *title = g_strdup_printf("GPXView - %s", gpx->name);    char *title = g_strdup_printf("%s - GPXView", gpx->name);
591    gtk_window_set_title(GTK_WINDOW(window), title);    gtk_window_set_title(GTK_WINDOW(window), title);
592    g_free(title);    g_free(title);
593    
# Line 1433  cb_menu_search(GtkWidget *window, gpoint Line 1433  cb_menu_search(GtkWidget *window, gpoint
1433      gtk_widget_destroy(dialog);      gtk_widget_destroy(dialog);
1434  }  }
1435    
1436  void on_window_destroy (GtkWidget *widget, gpointer data);  static void on_window_destroy (GtkWidget *widget, gpointer data);
1437    
1438  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1439  static void  static void
# Line 1509  cb_menu_export_garmin(GtkWidget *widget, Line 1509  cb_menu_export_garmin(GtkWidget *widget,
1509    garmin_export(appdata);    garmin_export(appdata);
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);
# Line 1525  cb_menu_precpos(GtkWidget *window, gpoin Line 1532  cb_menu_precpos(GtkWidget *window, gpoin
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;
   button = hildon_button_new_with_text(  
             HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,  
             HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
             _("Export to Maemo Mapper"),  
             _("Save a Maemo Mapper POI file"));  
   g_signal_connect_after(button, "clicked",  
                    G_CALLBACK(cb_menu_export_mmpoi), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
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 Field Notes"),    int len;
1544              _("Save a Garmin Field Notes file"));  } submenu_t;
   g_signal_connect_after(button, "clicked",  
                    G_CALLBACK(cb_menu_export_log), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1545    
1546    button = hildon_button_new_with_text(  #define COLUMNS  1
             HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,  
             HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
             _("Export Garmin GPX"),  
             _("Save modified waypoints in GPX file"));  
   g_signal_connect_after(button, "clicked",  
                    G_CALLBACK(cb_menu_export_garmin), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1547    
1548    gtk_widget_show_all(GTK_WIDGET(menu));  void on_submenu_entry_clicked(GtkButton *button, GtkWidget *menu) {
1549    
1550    return GTK_WIDGET(menu);    /* 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  /* the export submenu */  static GtkWidget *app_submenu_create(appdata_t *appdata,
1560  void on_export_clicked(GtkButton *button, appdata_t *appdata) {                                       const submenu_t *submenu) {
   if(!appdata->export_menu)  
     appdata->export_menu = export_menu_create(appdata);  
1561    
1562    /* draw a popup menu */    /* create a oridinary dialog box */
1563    hildon_app_menu_popup(HILDON_APP_MENU(appdata->export_menu),    GtkWidget *dialog = gtk_dialog_new();
1564                          GTK_WINDOW(hildon_window_stack_peek(    gtk_window_set_title(GTK_WINDOW(dialog), _(submenu->title));
1565                      hildon_window_stack_get_default())));    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  static GtkWidget *tools_menu_create(appdata_t *appdata) {    GtkWidget *table = gtk_table_new(submenu->len/COLUMNS, COLUMNS, TRUE);
1571    GtkWidget *button;    int x = 0, y = 0;
   HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());  
1572    
1573    /* the following doesn't have an effect */    const menu_entry_t *menu_entries = submenu->menu;
1574    //  gtk_window_set_title(GTK_WINDOW(menu), "Tools");    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              _("Geomath"),              _(menu_entries->label), _(menu_entries->desc));
             _("Geocoordinate calculation"));  
   g_signal_connect_after(button, "clicked",  
                    G_CALLBACK(cb_menu_geomath), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1581    
1582        /* try to center both texts */
1583        hildon_button_set_title_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1584        hildon_button_set_value_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1585    
1586    button = hildon_button_new_with_text(      g_signal_connect(button, "clicked",
1587              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,                       G_CALLBACK(on_submenu_entry_clicked), dialog);
1588              HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
1589              _("Geotext"),      g_signal_connect(button, "clicked",
1590              _("Text analysis"));                       menu_entries->activate_cb, appdata);
1591    g_signal_connect_after(button, "clicked",  
1592                     G_CALLBACK(cb_menu_geotext), appdata);      gtk_table_attach_defaults(GTK_TABLE(table),  button, x, x+1, y, y+1);
1593    hildon_app_menu_append(menu, GTK_BUTTON(button));  
1594        x++;
1595        if(x == COLUMNS) { x = 0; y++; }
1596    
1597    button = hildon_button_new_with_text(      menu_entries++;
1598              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    }
             HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
             _("Precise Position"),  
             _("Calculate a precise GPS position"));  
   g_signal_connect_after(button, "clicked",  
                    G_CALLBACK(cb_menu_precpos), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1599    
1600    gtk_widget_show_all(GTK_WIDGET(menu));    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);
1601    
1602    return GTK_WIDGET(menu);    return dialog;
1603  }  }
1604    
1605    /* popup the dialog shaped submenu */
1606    static void submenu_popup(GtkWidget *menu) {
1607      gtk_widget_show_all(menu);
1608      gtk_dialog_run(GTK_DIALOG(menu));
1609      gtk_widget_hide(menu);
1610    }
1611    
1612    static void submenu_cleanup(GtkWidget *menu) {
1613      gtk_widget_destroy(menu);
1614    }
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    static const submenu_t submenu_export = {
1627      "Export", submenu_export_entries,
1628      sizeof(submenu_export_entries)/sizeof(menu_entry_t)-1
1629    };
1630    
1631    /* the export submenu */
1632    void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1633      if(!appdata->export_menu)
1634        appdata->export_menu = app_submenu_create(appdata, &submenu_export);
1635    
1636      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 1786  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 1845  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 1873  void cleanup(appdata_t *appdata) { Line 1923  void cleanup(appdata_t *appdata) {
1923    puts("everything is gone");    puts("everything is gone");
1924  }  }
1925    
1926  void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
1927    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1928    
1929    gconf_save_state(appdata);    gconf_save_state(appdata);
# Line 2216  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.24  
changed lines
  Added in v.40