Diff of /trunk/src/main.c

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

revision 32 by harbaum, Tue Jul 28 13:21:22 2009 UTC revision 122 by harbaum, Mon Sep 21 13:15:25 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 329  static gboolean cachelist_update(gpointe Line 346  static gboolean cachelist_update(gpointe
346    
347    if(appdata->cachelist_update)    if(appdata->cachelist_update)
348      cachelist_redraw(appdata);      cachelist_redraw(appdata);
349    
350  #endif  #endif
351    
352    return TRUE;    return TRUE;
# Line 587  void cachelist_dialog(appdata_t *appdata Line 605  void cachelist_dialog(appdata_t *appdata
605    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
606    
607    appdata->cur_gpx = gpx;    appdata->cur_gpx = gpx;
608    char *title = g_strdup_printf("GPXView - %s", gpx->name);    char *title = g_strdup_printf("%s - GPXView", gpx->name);
609    gtk_window_set_title(GTK_WINDOW(window), title);    gtk_window_set_title(GTK_WINDOW(window), title);
610    g_free(title);    g_free(title);
611    
# Line 713  static void gpxlist_view_onRowActivated( Line 731  static void gpxlist_view_onRowActivated(
731    GtkTreeIter   iter;    GtkTreeIter   iter;
732    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
733    
734    #ifdef USE_MAEMO
735      /* check if a cache is already selected and ignore click if yes */
736      /* (was probably a double click) */
737      if(appdata->cur_gpx) return;
738    #endif
739    
740    if (gtk_tree_model_get_iter(model, &iter, path)) {    if (gtk_tree_model_get_iter(model, &iter, path)) {
741      gpx_t *gpx;      gpx_t *gpx;
742      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);
# Line 957  static GtkWidget *gpxlist_create_view_an Line 981  static GtkWidget *gpxlist_create_view_an
981      GtkTreeIter         iter;      GtkTreeIter         iter;
982      gtk_list_store_append(appdata->gpxstore, &iter);      gtk_list_store_append(appdata->gpxstore, &iter);
983      gpxlist_set(appdata->gpxstore, &iter, gpx);      gpxlist_set(appdata->gpxstore, &iter, gpx);
984    
985      if(gpx == sel_gpx) {      if(gpx == sel_gpx) {
986        sel_iter = iter;        sel_iter = iter;
987        sel_iter_valid = TRUE;        sel_iter_valid = TRUE;
# Line 1017  static void gpxlist_add(appdata_t *appda Line 1041  static void gpxlist_add(appdata_t *appda
1041    
1042  /******************** begin of menu *********************/  /******************** begin of menu *********************/
1043    
1044    typedef struct {
1045      appdata_t *appdata;
1046      GtkWidget *dialog;
1047    } about_context_t;
1048    
1049    #ifdef ENABLE_BROWSER_INTERFACE
1050    void on_paypal_button_clicked(GtkButton *button, about_context_t *context) {
1051      gtk_dialog_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_ACCEPT);
1052      browser_url(context->appdata,
1053                  "https://www.paypal.com/cgi-bin/webscr"
1054                  "?cmd=_s-xclick&hosted_button_id=7400558");
1055    }
1056    #endif
1057    
1058  static void  static void
1059  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1060    GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new());    about_context_t context;
1061    
1062    gtk_about_dialog_set_name(about, "GPXView");    context.appdata = (appdata_t *)data;
   gtk_about_dialog_set_version(about, VERSION);  
1063    
1064  #ifdef ENABLE_LIBLOCATION  #ifdef ENABLE_LIBLOCATION
1065    char *uses = "uses liblocation";    char *uses = "uses liblocation";
# Line 1032  cb_menu_about(GtkWidget *window, gpointe Line 1069  cb_menu_about(GtkWidget *window, gpointe
1069    char *uses = "uses gpsd";    char *uses = "uses gpsd";
1070  #endif  #endif
1071    
1072    char *str = g_strdup_printf("%s\n\n(%s)",    const gchar *authors[] = {
1073                        _("GPXView (c) 2008-2009 by\n"      "Till Harbaum <till@harbaum.org>",
1074                          "Till Harbaum <till@harbaum.org>\n"      "John Stowers <john.stowers@gmail.com>",
1075                          "Mailing list: gpxview-users@garage.maemo.org"),      NULL };
1076                        _(uses)  
1077                        );    context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,
1078                            "name", "GPXView",
1079    gtk_about_dialog_set_copyright(about, str);                          "version", VERSION,
1080    g_free(str);                          "copyright", _("Copyright 2008-2009"),
1081                            "authors", authors,
1082    gtk_about_dialog_set_website(about,                          "website", _("http://www.harbaum.org/till/maemo"),
1083         _("http://www.harbaum.org/till/maemo"));                          "comments", _(uses),
1084                            NULL);
1085    gtk_about_dialog_set_comments(about,  
1086         _("Geocaching.com GPX file viewer"));  #ifdef ENABLE_BROWSER_INTERFACE
1087      /* add a way to donate to the project */
1088    gtk_widget_show_all(GTK_WIDGET(about));    GtkWidget *alignment = gtk_alignment_new(0.5, 0, 0, 0);
1089    gtk_dialog_run(GTK_DIALOG(about));  
1090    gtk_widget_destroy(GTK_WIDGET(about));    GtkWidget *hbox = gtk_hbox_new(FALSE, 8);
1091      gtk_box_pack_start(GTK_BOX(hbox),
1092                         gtk_label_new(_("Do you like GPXView?")),
1093                         FALSE, FALSE, 0);
1094    
1095      GtkWidget *button = gtk_button_new();
1096      gtk_button_set_image(GTK_BUTTON(button),
1097                           icon_get_widget(ICON_MISC, 8));
1098      gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1099      g_signal_connect(button, "clicked",
1100                       G_CALLBACK(on_paypal_button_clicked), &context);
1101      gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1102    
1103      gtk_container_add(GTK_CONTAINER(alignment), hbox);
1104      gtk_box_pack_start_defaults(GTK_BOX((GTK_DIALOG(context.dialog))->vbox),
1105                                  alignment);
1106    
1107      gtk_widget_show_all(alignment);
1108    #endif
1109    
1110      gtk_dialog_run(GTK_DIALOG(context.dialog));
1111      gtk_widget_destroy(context.dialog);
1112  }  }
1113    
1114  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1433  cb_menu_search(GtkWidget *window, gpoint Line 1491  cb_menu_search(GtkWidget *window, gpoint
1491      gtk_widget_destroy(dialog);      gtk_widget_destroy(dialog);
1492  }  }
1493    
1494  void on_window_destroy (GtkWidget *widget, gpointer data);  static void on_window_destroy (GtkWidget *widget, gpointer data);
1495    
1496  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1497  static void  static void
# Line 1495  cb_menu_export_log(GtkWidget *widget, gp Line 1553  cb_menu_export_log(GtkWidget *widget, gp
1553    notes_log_export(appdata);    notes_log_export(appdata);
1554  }  }
1555    
1556  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1557  static void  static void
1558  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1559    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1614  static void submenu_cleanup(GtkWidget *m Line 1672  static void submenu_cleanup(GtkWidget *m
1672  }  }
1673    
1674  static const menu_entry_t submenu_export_entries[] = {  static const menu_entry_t submenu_export_entries[] = {
1675    #ifdef ENABLE_MAEMO_MAPPER
1676    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1677      G_CALLBACK(cb_menu_export_mmpoi)  },      G_CALLBACK(cb_menu_export_mmpoi)  },
1678    #endif
1679    { "Export Field Notes",      "Save a Garmin Field Notes file",    { "Export Field Notes",      "Save a Garmin Field Notes file",
1680      G_CALLBACK(cb_menu_export_log)    },      G_CALLBACK(cb_menu_export_log)    },
1681    { "Export Garmin GPX",       "Save modified waypoints in GPX file",    { "Export Garmin GPX",       "Save modified waypoints in GPX file",
# 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        button = gtk_button_new_with_label(_("Map"));
1766        g_signal_connect_after(button, "clicked",
1767                               G_CALLBACK(cb_menu_map), appdata);
1768        hildon_app_menu_append(menu, GTK_BUTTON(button));
1769    #endif
1770    
1771  #ifdef HILDON_HELP  #ifdef HILDON_HELP
1772    button = gtk_button_new_with_label(_("Help"));    button = gtk_button_new_with_label(_("Help"));
1773    g_signal_connect_after(button, "clicked",    g_signal_connect_after(button, "clicked",
# Line 1762  void menu_create(appdata_t *appdata) { Line 1823  void menu_create(appdata_t *appdata) {
1823    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1824    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1825    
1826  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1827    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1828    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1829    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1819  void menu_create(appdata_t *appdata) { Line 1880  void menu_create(appdata_t *appdata) {
1880    
1881    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1882    
   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);  
   
1883  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
1884    item = gtk_menu_item_new_with_label( _("Map") );    item = gtk_menu_item_new_with_label( _("Map") );
1885    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1886    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1887                     GTK_SIGNAL_FUNC(cb_menu_map), appdata);                     GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1888  #endif  #endif
1889    
1890      item = gtk_menu_item_new_with_label(_("Tools"));
1891      gtk_menu_append(GTK_MENU_SHELL(menu), item);
1892      submenu = gtk_menu_new();
1893      gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1894    
1895    item = gtk_menu_item_new_with_label( _("Geomath") );    item = gtk_menu_item_new_with_label( _("Geomath") );
1896    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1897    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1923  void cleanup(appdata_t *appdata) { Line 1984  void cleanup(appdata_t *appdata) {
1984    puts("everything is gone");    puts("everything is gone");
1985  }  }
1986    
1987  void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
1988    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1989    
1990    gconf_save_state(appdata);    gconf_save_state(appdata);
# Line 2226  int main(int argc, char *argv[]) { Line 2287  int main(int argc, char *argv[]) {
2287      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2288    }    }
2289    
2290    #ifdef ENABLE_MAEMO_MAPPER
2291    dbus_register(&appdata);    dbus_register(&appdata);
2292  #endif  #endif
2293    #endif
2294    
2295    icons_init();    icons_init();
2296    
Legend:
Removed from v.32  
changed lines
  Added in v.122