Diff of /trunk/src/main.c

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

revision 31 by harbaum, Sat Jul 25 10:29:30 2009 UTC revision 50 by harbaum, Wed Aug 12 09:31:09 2009 UTC
# Line 202  void cachelist_view_onRowActivated(GtkTr Line 202  void cachelist_view_onRowActivated(GtkTr
202    GtkTreeIter   iter;    GtkTreeIter   iter;
203    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
204    
205    #ifdef USE_MAEMO
206      /* check if a cache is already selected and ignore click if yes */
207      /* (was probably a double click) */
208      if(appdata->cur_cache) return;
209    #endif
210    
211    if(gtk_tree_model_get_iter(model, &iter, path)) {    if(gtk_tree_model_get_iter(model, &iter, path)) {
212      cache_t *cache;      cache_t *cache;
213      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);
# Line 587  void cachelist_dialog(appdata_t *appdata Line 593  void cachelist_dialog(appdata_t *appdata
593    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
594    
595    appdata->cur_gpx = gpx;    appdata->cur_gpx = gpx;
596    char *title = g_strdup_printf("GPXView - %s", gpx->name);    char *title = g_strdup_printf("%s - GPXView", gpx->name);
597    gtk_window_set_title(GTK_WINDOW(window), title);    gtk_window_set_title(GTK_WINDOW(window), title);
598    g_free(title);    g_free(title);
599    
# Line 713  static void gpxlist_view_onRowActivated( Line 719  static void gpxlist_view_onRowActivated(
719    GtkTreeIter   iter;    GtkTreeIter   iter;
720    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
721    
722    #ifdef USE_MAEMO
723      /* check if a cache is already selected and ignore click if yes */
724      /* (was probably a double click) */
725      if(appdata->cur_gpx) return;
726    #endif
727    
728    if (gtk_tree_model_get_iter(model, &iter, path)) {    if (gtk_tree_model_get_iter(model, &iter, path)) {
729      gpx_t *gpx;      gpx_t *gpx;
730      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);
# Line 1017  static void gpxlist_add(appdata_t *appda Line 1029  static void gpxlist_add(appdata_t *appda
1029    
1030  /******************** begin of menu *********************/  /******************** begin of menu *********************/
1031    
1032    typedef struct {
1033      appdata_t *appdata;
1034      GtkWidget *dialog;
1035    } about_context_t;
1036    
1037    #ifdef ENABLE_BROWSER_INTERFACE
1038    void on_paypal_button_clicked(GtkButton *button, about_context_t *context) {
1039      gtk_dialog_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_ACCEPT);
1040      browser_url(context->appdata,
1041                  "https://www.paypal.com/cgi-bin/webscr"
1042                  "?cmd=_s-xclick&hosted_button_id=7400558");
1043    }
1044    #endif
1045    
1046  static void  static void
1047  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1048    GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new());    about_context_t context;
1049    
1050    gtk_about_dialog_set_name(about, "GPXView");    context.appdata = (appdata_t *)data;
   gtk_about_dialog_set_version(about, VERSION);  
1051    
1052  #ifdef ENABLE_LIBLOCATION  #ifdef ENABLE_LIBLOCATION
1053    char *uses = "uses liblocation";    char *uses = "uses liblocation";
# Line 1032  cb_menu_about(GtkWidget *window, gpointe Line 1057  cb_menu_about(GtkWidget *window, gpointe
1057    char *uses = "uses gpsd";    char *uses = "uses gpsd";
1058  #endif  #endif
1059    
1060    char *str = g_strdup_printf("%s\n\n(%s)",    const gchar *authors[] = {
1061                        _("GPXView (c) 2008-2009 by\n"      "Till Harbaum <till@harbaum.org>",
1062                          "Till Harbaum <till@harbaum.org>\n"      "John Stowers <john.stowers@gmail.com>",
1063                          "Mailing list: gpxview-users@garage.maemo.org"),      NULL };
1064                        _(uses)  
1065                        );    context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,
1066                            "name", "GPXView",
1067    gtk_about_dialog_set_copyright(about, str);                          "version", VERSION,
1068    g_free(str);                          "copyright", _("Copyright 2008-2009"),
1069                            "authors", authors,
1070    gtk_about_dialog_set_website(about,                          "website", _("http://www.harbaum.org/till/maemo"),
1071         _("http://www.harbaum.org/till/maemo"));                          "comments", _(uses),
1072                            NULL);
1073    gtk_about_dialog_set_comments(about,  
1074         _("Geocaching.com GPX file viewer"));  #ifdef ENABLE_BROWSER_INTERFACE
1075      /* add a way to donate to the project */
1076    gtk_widget_show_all(GTK_WIDGET(about));    GtkWidget *alignment = gtk_alignment_new(0.5, 0, 0, 0);
1077    gtk_dialog_run(GTK_DIALOG(about));  
1078    gtk_widget_destroy(GTK_WIDGET(about));    GtkWidget *hbox = gtk_hbox_new(FALSE, 8);
1079      gtk_box_pack_start(GTK_BOX(hbox),
1080                         gtk_label_new(_("Do you like GPXView?")),
1081                         FALSE, FALSE, 0);
1082    
1083      GtkWidget *button = gtk_button_new();
1084      gtk_button_set_image(GTK_BUTTON(button),
1085                           icon_get_widget(ICON_MISC, 8));
1086      gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1087      g_signal_connect(button, "clicked",
1088                       G_CALLBACK(on_paypal_button_clicked), &context);
1089      gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1090    
1091      gtk_container_add(GTK_CONTAINER(alignment), hbox);
1092      gtk_box_pack_start_defaults(GTK_BOX((GTK_DIALOG(context.dialog))->vbox),
1093                                  alignment);
1094    
1095      gtk_widget_show_all(alignment);
1096    #endif
1097    
1098      gtk_dialog_run(GTK_DIALOG(context.dialog));
1099      gtk_widget_destroy(context.dialog);
1100  }  }
1101    
1102  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1433  cb_menu_search(GtkWidget *window, gpoint Line 1479  cb_menu_search(GtkWidget *window, gpoint
1479      gtk_widget_destroy(dialog);      gtk_widget_destroy(dialog);
1480  }  }
1481    
1482  void on_window_destroy (GtkWidget *widget, gpointer data);  static void on_window_destroy (GtkWidget *widget, gpointer data);
1483    
1484  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1485  static void  static void
# Line 1509  cb_menu_export_garmin(GtkWidget *widget, Line 1555  cb_menu_export_garmin(GtkWidget *widget,
1555    garmin_export(appdata);    garmin_export(appdata);
1556  }  }
1557    
1558    #ifdef ENABLE_OSM_GPS_MAP
1559    static void
1560    cb_menu_map(GtkWidget *window, gpointer data) {
1561      map((appdata_t *)data);
1562    }
1563    #endif
1564    
1565  static void  static void
1566  cb_menu_geomath(GtkWidget *window, gpointer data) {  cb_menu_geomath(GtkWidget *window, gpointer data) {
1567    geomath_dialog((appdata_t *)data);    geomath_dialog((appdata_t *)data);
# Line 1677  HildonAppMenu *menu_create(appdata_t *ap Line 1730  HildonAppMenu *menu_create(appdata_t *ap
1730      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1731                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1732      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1733    
   if(mode == MENU_GPXLIST) {  
1734      button = gtk_button_new_with_label(_("Export"));      button = gtk_button_new_with_label(_("Export"));
1735      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1736                             G_CALLBACK(on_export_clicked), appdata);                             G_CALLBACK(on_export_clicked), appdata);
# Line 1696  HildonAppMenu *menu_create(appdata_t *ap Line 1747  HildonAppMenu *menu_create(appdata_t *ap
1747                           G_CALLBACK(on_tools_clicked), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1748    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1749    
1750    #ifdef ENABLE_OSM_GPS_MAP
1751      if((mode == MENU_GPXLIST) || (mode == MENU_CACHELIST)) {
1752        button = gtk_button_new_with_label(_("Map"));
1753        g_signal_connect_after(button, "clicked",
1754                               G_CALLBACK(cb_menu_map), appdata);
1755        hildon_app_menu_append(menu, GTK_BUTTON(button));
1756      }
1757    #endif
1758    
1759  #ifdef HILDON_HELP  #ifdef HILDON_HELP
1760    button = gtk_button_new_with_label(_("Help"));    button = gtk_button_new_with_label(_("Help"));
1761    g_signal_connect_after(button, "clicked",    g_signal_connect_after(button, "clicked",
# Line 1813  void menu_create(appdata_t *appdata) { Line 1873  void menu_create(appdata_t *appdata) {
1873    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1874    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1875    
1876    #ifdef ENABLE_OSM_GPS_MAP
1877      item = gtk_menu_item_new_with_label( _("Map") );
1878      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1879      g_signal_connect(item, "activate",
1880                       GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1881    #endif
1882    
1883    item = gtk_menu_item_new_with_label( _("Geomath") );    item = gtk_menu_item_new_with_label( _("Geomath") );
1884    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1885    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1905  void cleanup(appdata_t *appdata) { Line 1972  void cleanup(appdata_t *appdata) {
1972    puts("everything is gone");    puts("everything is gone");
1973  }  }
1974    
1975  void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
1976    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1977    
1978    gconf_save_state(appdata);    gconf_save_state(appdata);
Legend:
Removed from v.31  
changed lines
  Added in v.50