Diff of /trunk/src/main.c

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

revision 168 by harbaum, Mon Nov 9 10:49:51 2009 UTC revision 193 by harbaum, Tue Nov 17 20:13:09 2009 UTC
# Line 33  Line 33 
33  #include <hildon/hildon-banner.h>  #include <hildon/hildon-banner.h>
34  #if MAEMO_VERSION_MAJOR >= 5  #if MAEMO_VERSION_MAJOR >= 5
35  #include <hildon/hildon-note.h>  #include <hildon/hildon-note.h>
36    #include <hildon/hildon-entry.h>
37  #include <hildon/hildon-check-button.h>  #include <hildon/hildon-check-button.h>
38  #endif  #endif
39  #endif  #endif
# Line 689  static void gpxlist_set(GtkListStore *st Line 690  static void gpxlist_set(GtkListStore *st
690                       GPXLIST_COL_OPEN, !gpx->closed,                       GPXLIST_COL_OPEN, !gpx->closed,
691                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,
692  #ifdef USE_PANNABLE_AREA  #ifdef USE_PANNABLE_AREA
693                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 7),                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 4),
694  #endif  #endif
695                       GPXLIST_COL_DATA, gpx,                       GPXLIST_COL_DATA, gpx,
696                       -1);                       -1);
# Line 1151  cb_menu_about(GtkWidget *window, gpointe Line 1152  cb_menu_about(GtkWidget *window, gpointe
1152    
1153    GtkWidget *button = gtk_button_new();    GtkWidget *button = gtk_button_new();
1154    gtk_button_set_image(GTK_BUTTON(button),    gtk_button_set_image(GTK_BUTTON(button),
1155                         icon_get_widget(ICON_MISC, 8));                         icon_get_widget(ICON_MISC, 5));
1156    gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);    gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1157    g_signal_connect(button, "clicked",    g_signal_connect(button, "clicked",
1158                     G_CALLBACK(on_paypal_button_clicked), &context);                     G_CALLBACK(on_paypal_button_clicked), &context);
# Line 1450  cb_menu_search(GtkWidget *window, gpoint Line 1451  cb_menu_search(GtkWidget *window, gpoint
1451    
1452    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1453                                gtk_label_new(_("Search for:")));                                gtk_label_new(_("Search for:")));
1454    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1455      context.entry = gtk_entry_new();
1456    #else
1457      context.entry = hildon_entry_new(HILDON_SIZE_AUTO);
1458    #endif
1459    
1460    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1461                                context.entry = gtk_entry_new());                                context.entry);
1462    
1463    if(appdata->search_str)    if(appdata->search_str)
1464      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);
1465    
# Line 1668  cb_menu_precpos(GtkWidget *window, gpoin Line 1676  cb_menu_precpos(GtkWidget *window, gpoin
1676    precise_position((appdata_t *)data);    precise_position((appdata_t *)data);
1677  }  }
1678    
1679    static void
1680    cb_menu_geotoad(GtkWidget *window, gpointer data) {
1681      geotoad((appdata_t *)data);
1682    }
1683    
1684  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1685  typedef struct {  typedef struct {
1686    char *label, *desc;    char *label, *desc;
# Line 1782  static const menu_entry_t submenu_tools_ Line 1795  static const menu_entry_t submenu_tools_
1795      G_CALLBACK(cb_menu_geotext) },      G_CALLBACK(cb_menu_geotext) },
1796    { "Precise Position", "Calculate a precise GPS position",    { "Precise Position", "Calculate a precise GPS position",
1797      G_CALLBACK(cb_menu_precpos) },      G_CALLBACK(cb_menu_precpos) },
1798      { "GeoToad",          "Use GeoToad online downloader",
1799        G_CALLBACK(cb_menu_geotoad) },
1800    { NULL, NULL, NULL }    { NULL, NULL, NULL }
1801  };  };
1802    
# Line 1983  void menu_create(appdata_t *appdata) { Line 1998  void menu_create(appdata_t *appdata) {
1998    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1999                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
2000    
2001      item = gtk_menu_item_new_with_label( _("GeoToad") );
2002      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
2003      g_signal_connect(item, "activate",
2004                       GTK_SIGNAL_FUNC(cb_menu_geotoad), appdata);
2005    
2006    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
2007    
2008  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
Legend:
Removed from v.168  
changed lines
  Added in v.193