Diff of /trunk/src/main.c

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

revision 6 by harbaum, Wed Jun 24 19:20:21 2009 UTC revision 7 by harbaum, Thu Jun 25 15:24:24 2009 UTC
# Line 1527  void on_tools_clicked(GtkButton *button, Line 1527  void on_tools_clicked(GtkButton *button,
1527              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1528              HILDON_BUTTON_ARRANGEMENT_VERTICAL,              HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1529              _("Precise Position"),              _("Precise Position"),
1530              _("Calculate a very precise GPS posotions"));              _("Calculate a very precise GPS position"));
1531    g_signal_connect(but, "clicked",    g_signal_connect(but, "clicked",
1532                     G_CALLBACK(cb_menu_precpos), appdata);                     G_CALLBACK(cb_menu_precpos), appdata);
1533    gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);
# Line 1541  HildonAppMenu *menu_create(appdata_t *ap Line 1541  HildonAppMenu *menu_create(appdata_t *ap
1541    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1542    
1543    /* ------- */    /* ------- */
1544      button = gtk_button_new_with_label(_("About"));
1545      g_signal_connect_after(button, "clicked",
1546                             G_CALLBACK(cb_menu_about), appdata);
1547      hildon_app_menu_append(menu, GTK_BUTTON(button));
1548    
1549    button = gtk_button_new_with_label(_("Settings"));    button = gtk_button_new_with_label(_("Settings"));
1550    g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),    g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),
1551                           appdata);                           appdata);
# Line 1552  HildonAppMenu *menu_create(appdata_t *ap Line 1557  HildonAppMenu *menu_create(appdata_t *ap
1557                             G_CALLBACK(cb_menu_add), appdata);                             G_CALLBACK(cb_menu_add), appdata);
1558      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1559    
1560      button = gtk_button_new_with_label(_("Import dir"));      button = gtk_button_new_with_label(_("Import directory"));
1561      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1562                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1563      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
# Line 1575  HildonAppMenu *menu_create(appdata_t *ap Line 1580  HildonAppMenu *menu_create(appdata_t *ap
1580                           G_CALLBACK(on_tools_clicked), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1581    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1582    
   button = gtk_button_new_with_label(_("About"));  
   g_signal_connect_after(button, "clicked",  
                          G_CALLBACK(cb_menu_about), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
   
1583    gtk_widget_show(GTK_WIDGET(menu));    gtk_widget_show(GTK_WIDGET(menu));
1584    
1585    return menu;    return menu;
# Line 1598  void menu_create(appdata_t *appdata) { Line 1598  void menu_create(appdata_t *appdata) {
1598    GtkWidget *submenu = gtk_menu_new();    GtkWidget *submenu = gtk_menu_new();
1599    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1600    
1601    item = gtk_menu_item_new_with_label( _("File...") );    item = gtk_menu_item_new_with_label( _("File") );
1602    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1603    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);
1604    
1605    item = gtk_menu_item_new_with_label( _("Directory...") );    item = gtk_menu_item_new_with_label( _("Directory") );
1606    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1607    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);
1608    
# Line 1629  void menu_create(appdata_t *appdata) { Line 1629  void menu_create(appdata_t *appdata) {
1629    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1630    
1631  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1632    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI...") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1633    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1634    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1635                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);
1636  #endif  #endif
1637    
1638    item = gtk_menu_item_new_with_label( _("Garmin Field Notes...") );    item = gtk_menu_item_new_with_label( _("Garmin Field Notes") );
1639    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1640    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1641                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);
1642    
1643    item = gtk_menu_item_new_with_label( _("Garmin GPX...") );    item = gtk_menu_item_new_with_label( _("Garmin GPX") );
1644    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1645    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1646                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
# Line 1648  void menu_create(appdata_t *appdata) { Line 1648  void menu_create(appdata_t *appdata) {
1648  #ifdef USE_BREAD_CRUMB_TRAIL  #ifdef USE_BREAD_CRUMB_TRAIL
1649    appdata->menu_search =    appdata->menu_search =
1650  #endif  #endif
1651    item = gtk_menu_item_new_with_label( _("Search...") );    item = gtk_menu_item_new_with_label( _("Search") );
1652    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1653    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);
1654    
# Line 1690  void menu_create(appdata_t *appdata) { Line 1690  void menu_create(appdata_t *appdata) {
1690    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1691    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1692    
1693    item = gtk_menu_item_new_with_label( _("Geomath...") );    item = gtk_menu_item_new_with_label( _("Geomath") );
1694    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1695    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1696                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);
1697    
1698    item = gtk_menu_item_new_with_label( _("Geotext...") );    item = gtk_menu_item_new_with_label( _("Geotext") );
1699    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1700    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1701                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);
1702    
1703    item = gtk_menu_item_new_with_label( _("Precise Position...") );    item = gtk_menu_item_new_with_label( _("Precise Position") );
1704    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1705    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1706                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
# Line 1708  void menu_create(appdata_t *appdata) { Line 1708  void menu_create(appdata_t *appdata) {
1708    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1709    
1710  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
1711    item = gtk_menu_item_new_with_label( _("Help...") );    item = gtk_menu_item_new_with_label( _("Help") );
1712    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1713    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);
1714  #endif  #endif
1715    
1716    item = gtk_menu_item_new_with_label( _("About...") );    item = gtk_menu_item_new_with_label( _("About") );
1717    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1718    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);
1719    
Legend:
Removed from v.6  
changed lines
  Added in v.7