Diff of /trunk/src/main.c

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

revision 40 by harbaum, Sun Aug 2 19:05:24 2009 UTC revision 107 by harbaum, Fri Sep 11 12:16:50 2009 UTC
# Line 138  gpx_t *choose_file(appdata_t *appdata, g Line 138  gpx_t *choose_file(appdata_t *appdata, g
138    gtk_widget_show_all (GTK_WIDGET(dialog));    gtk_widget_show_all (GTK_WIDGET(dialog));
139    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {
140      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
141    
142        if(filename) {
143          gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));
144    
145      gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));        if(!whole_dir)
146            gpx = gpx_parse(dialog, filename);
147      if(!whole_dir)        else {
148        gpx = gpx_parse(dialog, filename);          /* cur trailing '/' if present */
149      else {          if(strlastchr(filename) == '/')
150        /* cur trailing '/' if present */            filename[strlen(filename)] = 0;
151        if(strlastchr(filename) == '/')  
152          filename[strlen(filename)] = 0;          gpx = gpx_parse_dir(dialog, filename);
   
       gpx = gpx_parse_dir(dialog, filename);  
     }  
   
     gpx_busy_dialog_destroy(dialog);  
   
     /* save path if gpx was successfully loaded */  
     if(gpx) {  
       char *r = strrchr(filename, '/');  
   
       /* there is a delimiter, use everything left of it as path */  
       if(r && !whole_dir) {  
         *r = 0;  
         if(appdata->path) free(appdata->path);  
         appdata->path = strdup(filename);  
         /* restore path ... just in case ... */  
         *r = '/';  
153        }        }
154    
155          gpx_busy_dialog_destroy(dialog);
156    
157          /* save path if gpx was successfully loaded */
158          if(gpx) {
159            char *r = strrchr(filename, '/');
160    
161            /* there is a delimiter, use everything left of it as path */
162            if(r && !whole_dir) {
163              *r = 0;
164              if(appdata->path) free(appdata->path);
165              appdata->path = strdup(filename);
166              /* restore path ... just in case ... */
167              *r = '/';
168            }
169    
170            if(whole_dir)
171              appdata->path = strdup(filename);
172          } else
173            errorf(_("Load error"));
174    
175        if(whole_dir)        g_free (filename);
176          appdata->path = strdup(filename);      } else {
177    #ifndef USE_MAEMO
178          errorf(_("Error accessing the file."));
179    #else
180          errorf(_("Error accessing the file. This may happen if the file "
181                   "resides on a remote file system. Please copy the file onto "
182                   "the device (e.g. onto the memory card) and try again."));
183    #endif
184      }      }
   
     g_free (filename);  
185    }    }
186    
187    gtk_widget_destroy (dialog);    gtk_widget_destroy (dialog);
# Line 202  void cachelist_view_onRowActivated(GtkTr Line 213  void cachelist_view_onRowActivated(GtkTr
213    GtkTreeIter   iter;    GtkTreeIter   iter;
214    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
215    
216    #ifdef USE_MAEMO
217      /* check if a cache is already selected and ignore click if yes */
218      /* (was probably a double click) */
219      if(appdata->cur_cache) return;
220    #endif
221    
222    if(gtk_tree_model_get_iter(model, &iter, path)) {    if(gtk_tree_model_get_iter(model, &iter, path)) {
223      cache_t *cache;      cache_t *cache;
224      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);
# Line 713  static void gpxlist_view_onRowActivated( Line 730  static void gpxlist_view_onRowActivated(
730    GtkTreeIter   iter;    GtkTreeIter   iter;
731    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
732    
733    #ifdef USE_MAEMO
734      /* check if a cache is already selected and ignore click if yes */
735      /* (was probably a double click) */
736      if(appdata->cur_gpx) return;
737    #endif
738    
739    if (gtk_tree_model_get_iter(model, &iter, path)) {    if (gtk_tree_model_get_iter(model, &iter, path)) {
740      gpx_t *gpx;      gpx_t *gpx;
741      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);
# Line 954  static GtkWidget *gpxlist_create_view_an Line 977  static GtkWidget *gpxlist_create_view_an
977    GtkTreeIter sel_iter;    GtkTreeIter sel_iter;
978    gboolean sel_iter_valid = FALSE;    gboolean sel_iter_valid = FALSE;
979    while(gpx) {    while(gpx) {
980      GtkTreeIter         iter;      /* don't display entries that failed at load */
981      gtk_list_store_append(appdata->gpxstore, &iter);      if(!gpx->failed) {
982      gpxlist_set(appdata->gpxstore, &iter, gpx);        GtkTreeIter         iter;
983          gtk_list_store_append(appdata->gpxstore, &iter);
984      if(gpx == sel_gpx) {        gpxlist_set(appdata->gpxstore, &iter, gpx);
985        sel_iter = iter;  
986        sel_iter_valid = TRUE;        if(gpx == sel_gpx) {
987            sel_iter = iter;
988            sel_iter_valid = TRUE;
989          }
990      }      }
991    
992      gpx = gpx->next;      gpx = gpx->next;
# Line 1017  static void gpxlist_add(appdata_t *appda Line 1043  static void gpxlist_add(appdata_t *appda
1043    
1044  /******************** begin of menu *********************/  /******************** begin of menu *********************/
1045    
1046    typedef struct {
1047      appdata_t *appdata;
1048      GtkWidget *dialog;
1049    } about_context_t;
1050    
1051    #ifdef ENABLE_BROWSER_INTERFACE
1052    void on_paypal_button_clicked(GtkButton *button, about_context_t *context) {
1053      gtk_dialog_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_ACCEPT);
1054      browser_url(context->appdata,
1055                  "https://www.paypal.com/cgi-bin/webscr"
1056                  "?cmd=_s-xclick&hosted_button_id=7400558");
1057    }
1058    #endif
1059    
1060  static void  static void
1061  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1062    GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new());    about_context_t context;
1063    
1064    gtk_about_dialog_set_name(about, "GPXView");    context.appdata = (appdata_t *)data;
   gtk_about_dialog_set_version(about, VERSION);  
1065    
1066  #ifdef ENABLE_LIBLOCATION  #ifdef ENABLE_LIBLOCATION
1067    char *uses = "uses liblocation";    char *uses = "uses liblocation";
# Line 1032  cb_menu_about(GtkWidget *window, gpointe Line 1071  cb_menu_about(GtkWidget *window, gpointe
1071    char *uses = "uses gpsd";    char *uses = "uses gpsd";
1072  #endif  #endif
1073    
1074    char *str = g_strdup_printf("%s\n\n(%s)",    const gchar *authors[] = {
1075                        _("GPXView (c) 2008-2009 by\n"      "Till Harbaum <till@harbaum.org>",
1076                          "Till Harbaum <till@harbaum.org>\n"      "John Stowers <john.stowers@gmail.com>",
1077                          "Mailing list: gpxview-users@garage.maemo.org"),      NULL };
1078                        _(uses)  
1079                        );    context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,
1080                            "name", "GPXView",
1081    gtk_about_dialog_set_copyright(about, str);                          "version", VERSION,
1082    g_free(str);                          "copyright", _("Copyright 2008-2009"),
1083                            "authors", authors,
1084    gtk_about_dialog_set_website(about,                          "website", _("http://www.harbaum.org/till/maemo"),
1085         _("http://www.harbaum.org/till/maemo"));                          "comments", _(uses),
1086                            NULL);
1087    gtk_about_dialog_set_comments(about,  
1088         _("Geocaching.com GPX file viewer"));  #ifdef ENABLE_BROWSER_INTERFACE
1089      /* add a way to donate to the project */
1090    gtk_widget_show_all(GTK_WIDGET(about));    GtkWidget *alignment = gtk_alignment_new(0.5, 0, 0, 0);
1091    gtk_dialog_run(GTK_DIALOG(about));  
1092    gtk_widget_destroy(GTK_WIDGET(about));    GtkWidget *hbox = gtk_hbox_new(FALSE, 8);
1093      gtk_box_pack_start(GTK_BOX(hbox),
1094                         gtk_label_new(_("Do you like GPXView?")),
1095                         FALSE, FALSE, 0);
1096    
1097      GtkWidget *button = gtk_button_new();
1098      gtk_button_set_image(GTK_BUTTON(button),
1099                           icon_get_widget(ICON_MISC, 8));
1100      gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1101      g_signal_connect(button, "clicked",
1102                       G_CALLBACK(on_paypal_button_clicked), &context);
1103      gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1104    
1105      gtk_container_add(GTK_CONTAINER(alignment), hbox);
1106      gtk_box_pack_start_defaults(GTK_BOX((GTK_DIALOG(context.dialog))->vbox),
1107                                  alignment);
1108    
1109      gtk_widget_show_all(alignment);
1110    #endif
1111    
1112      gtk_dialog_run(GTK_DIALOG(context.dialog));
1113      gtk_widget_destroy(context.dialog);
1114  }  }
1115    
1116  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1637  void on_export_clicked(GtkButton *button Line 1697  void on_export_clicked(GtkButton *button
1697  }  }
1698    
1699  static const menu_entry_t submenu_tools_entries[] = {  static const menu_entry_t submenu_tools_entries[] = {
 #ifdef ENABLE_OSM_GPS_MAP  
   { "Map",              "Display an interactive world map",  
     G_CALLBACK(cb_menu_map) },  
 #endif  
1700    { "Geomath",          "Geocoordinate calculation",    { "Geomath",          "Geocoordinate calculation",
1701      G_CALLBACK(cb_menu_geomath) },      G_CALLBACK(cb_menu_geomath) },
1702    { "Geotext",          "Text analysis",    { "Geotext",          "Text analysis",
# Line 1688  HildonAppMenu *menu_create(appdata_t *ap Line 1744  HildonAppMenu *menu_create(appdata_t *ap
1744      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1745                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1746      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1747    
   if(mode == MENU_GPXLIST) {  
1748      button = gtk_button_new_with_label(_("Export"));      button = gtk_button_new_with_label(_("Export"));
1749      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1750                             G_CALLBACK(on_export_clicked), appdata);                             G_CALLBACK(on_export_clicked), appdata);
# Line 1707  HildonAppMenu *menu_create(appdata_t *ap Line 1761  HildonAppMenu *menu_create(appdata_t *ap
1761                           G_CALLBACK(on_tools_clicked), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1762    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1763    
1764    #ifdef ENABLE_OSM_GPS_MAP
1765      if((mode == MENU_GPXLIST) || (mode == MENU_CACHELIST)) {
1766        button = gtk_button_new_with_label(_("Map"));
1767        g_signal_connect_after(button, "clicked",
1768                               G_CALLBACK(cb_menu_map), appdata);
1769        hildon_app_menu_append(menu, GTK_BUTTON(button));
1770      }
1771    #endif
1772    
1773  #ifdef HILDON_HELP  #ifdef HILDON_HELP
1774    button = gtk_button_new_with_label(_("Help"));    button = gtk_button_new_with_label(_("Help"));
1775    g_signal_connect_after(button, "clicked",    g_signal_connect_after(button, "clicked",
# Line 1819  void menu_create(appdata_t *appdata) { Line 1882  void menu_create(appdata_t *appdata) {
1882    
1883    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1884    
   item = gtk_menu_item_new_with_label(_("Tools"));  
   gtk_menu_append(GTK_MENU_SHELL(menu), item);  
   submenu = gtk_menu_new();  
   gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);  
   
1885  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
1886    item = gtk_menu_item_new_with_label( _("Map") );    item = gtk_menu_item_new_with_label( _("Map") );
1887    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1888    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1889                     GTK_SIGNAL_FUNC(cb_menu_map), appdata);                     GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1890  #endif  #endif
1891    
1892      item = gtk_menu_item_new_with_label(_("Tools"));
1893      gtk_menu_append(GTK_MENU_SHELL(menu), item);
1894      submenu = gtk_menu_new();
1895      gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1896    
1897    item = gtk_menu_item_new_with_label( _("Geomath") );    item = gtk_menu_item_new_with_label( _("Geomath") );
1898    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1899    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
Legend:
Removed from v.40  
changed lines
  Added in v.107