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 120 by harbaum, Sat Sep 19 19:19:42 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 587  void cachelist_dialog(appdata_t *appdata Line 604  void cachelist_dialog(appdata_t *appdata
604    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
605    
606    appdata->cur_gpx = gpx;    appdata->cur_gpx = gpx;
607    char *title = g_strdup_printf("GPXView - %s", gpx->name);    char *title = g_strdup_printf("%s - GPXView", gpx->name);
608    gtk_window_set_title(GTK_WINDOW(window), title);    gtk_window_set_title(GTK_WINDOW(window), title);
609    g_free(title);    g_free(title);
610    
# 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 957  static GtkWidget *gpxlist_create_view_an Line 980  static GtkWidget *gpxlist_create_view_an
980      GtkTreeIter         iter;      GtkTreeIter         iter;
981      gtk_list_store_append(appdata->gpxstore, &iter);      gtk_list_store_append(appdata->gpxstore, &iter);
982      gpxlist_set(appdata->gpxstore, &iter, gpx);      gpxlist_set(appdata->gpxstore, &iter, gpx);
983    
984      if(gpx == sel_gpx) {      if(gpx == sel_gpx) {
985        sel_iter = iter;        sel_iter = iter;
986        sel_iter_valid = TRUE;        sel_iter_valid = TRUE;
# Line 1017  static void gpxlist_add(appdata_t *appda Line 1040  static void gpxlist_add(appdata_t *appda
1040    
1041  /******************** begin of menu *********************/  /******************** begin of menu *********************/
1042    
1043    typedef struct {
1044      appdata_t *appdata;
1045      GtkWidget *dialog;
1046    } about_context_t;
1047    
1048    #ifdef ENABLE_BROWSER_INTERFACE
1049    void on_paypal_button_clicked(GtkButton *button, about_context_t *context) {
1050      gtk_dialog_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_ACCEPT);
1051      browser_url(context->appdata,
1052                  "https://www.paypal.com/cgi-bin/webscr"
1053                  "?cmd=_s-xclick&hosted_button_id=7400558");
1054    }
1055    #endif
1056    
1057  static void  static void
1058  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1059    GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new());    about_context_t context;
1060    
1061    gtk_about_dialog_set_name(about, "GPXView");    context.appdata = (appdata_t *)data;
   gtk_about_dialog_set_version(about, VERSION);  
1062    
1063  #ifdef ENABLE_LIBLOCATION  #ifdef ENABLE_LIBLOCATION
1064    char *uses = "uses liblocation";    char *uses = "uses liblocation";
# Line 1032  cb_menu_about(GtkWidget *window, gpointe Line 1068  cb_menu_about(GtkWidget *window, gpointe
1068    char *uses = "uses gpsd";    char *uses = "uses gpsd";
1069  #endif  #endif
1070    
1071    char *str = g_strdup_printf("%s\n\n(%s)",    const gchar *authors[] = {
1072                        _("GPXView (c) 2008-2009 by\n"      "Till Harbaum <till@harbaum.org>",
1073                          "Till Harbaum <till@harbaum.org>\n"      "John Stowers <john.stowers@gmail.com>",
1074                          "Mailing list: gpxview-users@garage.maemo.org"),      NULL };
1075                        _(uses)  
1076                        );    context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,
1077                            "name", "GPXView",
1078    gtk_about_dialog_set_copyright(about, str);                          "version", VERSION,
1079    g_free(str);                          "copyright", _("Copyright 2008-2009"),
1080                            "authors", authors,
1081    gtk_about_dialog_set_website(about,                          "website", _("http://www.harbaum.org/till/maemo"),
1082         _("http://www.harbaum.org/till/maemo"));                          "comments", _(uses),
1083                            NULL);
1084    gtk_about_dialog_set_comments(about,  
1085         _("Geocaching.com GPX file viewer"));  #ifdef ENABLE_BROWSER_INTERFACE
1086      /* add a way to donate to the project */
1087    gtk_widget_show_all(GTK_WIDGET(about));    GtkWidget *alignment = gtk_alignment_new(0.5, 0, 0, 0);
1088    gtk_dialog_run(GTK_DIALOG(about));  
1089    gtk_widget_destroy(GTK_WIDGET(about));    GtkWidget *hbox = gtk_hbox_new(FALSE, 8);
1090      gtk_box_pack_start(GTK_BOX(hbox),
1091                         gtk_label_new(_("Do you like GPXView?")),
1092                         FALSE, FALSE, 0);
1093    
1094      GtkWidget *button = gtk_button_new();
1095      gtk_button_set_image(GTK_BUTTON(button),
1096                           icon_get_widget(ICON_MISC, 8));
1097      gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1098      g_signal_connect(button, "clicked",
1099                       G_CALLBACK(on_paypal_button_clicked), &context);
1100      gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1101    
1102      gtk_container_add(GTK_CONTAINER(alignment), hbox);
1103      gtk_box_pack_start_defaults(GTK_BOX((GTK_DIALOG(context.dialog))->vbox),
1104                                  alignment);
1105    
1106      gtk_widget_show_all(alignment);
1107    #endif
1108    
1109      gtk_dialog_run(GTK_DIALOG(context.dialog));
1110      gtk_widget_destroy(context.dialog);
1111  }  }
1112    
1113  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1433  cb_menu_search(GtkWidget *window, gpoint Line 1490  cb_menu_search(GtkWidget *window, gpoint
1490      gtk_widget_destroy(dialog);      gtk_widget_destroy(dialog);
1491  }  }
1492    
1493  void on_window_destroy (GtkWidget *widget, gpointer data);  static void on_window_destroy (GtkWidget *widget, gpointer data);
1494    
1495  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1496  static void  static void
# Line 1509  cb_menu_export_garmin(GtkWidget *widget, Line 1566  cb_menu_export_garmin(GtkWidget *widget,
1566    garmin_export(appdata);    garmin_export(appdata);
1567  }  }
1568    
1569    #ifdef ENABLE_OSM_GPS_MAP
1570    static void
1571    cb_menu_map(GtkWidget *window, gpointer data) {
1572      map((appdata_t *)data);
1573    }
1574    #endif
1575    
1576  static void  static void
1577  cb_menu_geomath(GtkWidget *window, gpointer data) {  cb_menu_geomath(GtkWidget *window, gpointer data) {
1578    geomath_dialog((appdata_t *)data);    geomath_dialog((appdata_t *)data);
# Line 1677  HildonAppMenu *menu_create(appdata_t *ap Line 1741  HildonAppMenu *menu_create(appdata_t *ap
1741      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1742                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1743      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1744    
   if(mode == MENU_GPXLIST) {  
1745      button = gtk_button_new_with_label(_("Export"));      button = gtk_button_new_with_label(_("Export"));
1746      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1747                             G_CALLBACK(on_export_clicked), appdata);                             G_CALLBACK(on_export_clicked), appdata);
# Line 1696  HildonAppMenu *menu_create(appdata_t *ap Line 1758  HildonAppMenu *menu_create(appdata_t *ap
1758                           G_CALLBACK(on_tools_clicked), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1759    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1760    
1761    #ifdef ENABLE_OSM_GPS_MAP
1762        button = gtk_button_new_with_label(_("Map"));
1763        g_signal_connect_after(button, "clicked",
1764                               G_CALLBACK(cb_menu_map), appdata);
1765        hildon_app_menu_append(menu, GTK_BUTTON(button));
1766    #endif
1767    
1768  #ifdef HILDON_HELP  #ifdef HILDON_HELP
1769    button = gtk_button_new_with_label(_("Help"));    button = gtk_button_new_with_label(_("Help"));
1770    g_signal_connect_after(button, "clicked",    g_signal_connect_after(button, "clicked",
# Line 1808  void menu_create(appdata_t *appdata) { Line 1877  void menu_create(appdata_t *appdata) {
1877    
1878    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1879    
1880    #ifdef ENABLE_OSM_GPS_MAP
1881      item = gtk_menu_item_new_with_label( _("Map") );
1882      gtk_menu_append(GTK_MENU_SHELL(menu), item);
1883      g_signal_connect(item, "activate",
1884                       GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1885    #endif
1886    
1887    item = gtk_menu_item_new_with_label(_("Tools"));    item = gtk_menu_item_new_with_label(_("Tools"));
1888    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1889    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1905  void cleanup(appdata_t *appdata) { Line 1981  void cleanup(appdata_t *appdata) {
1981    puts("everything is gone");    puts("everything is gone");
1982  }  }
1983    
1984  void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
1985    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1986    
1987    gconf_save_state(appdata);    gconf_save_state(appdata);
Legend:
Removed from v.31  
changed lines
  Added in v.120