Diff of /trunk/src/main.c

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

revision 55 by achadwick, Sat Feb 7 01:14:09 2009 UTC revision 174 by harbaum, Sat May 9 19:01:38 2009 UTC
# Line 1  Line 1 
1  /*  /*
2     * Copyright (C) 2008 Till Harbaum <till@harbaum.org>.
3     *
4   * This file is part of OSM2Go.   * This file is part of OSM2Go.
5   *   *
6   * OSM2Go is free software: you can redistribute it and/or modify   * OSM2Go is free software: you can redistribute it and/or modify
# Line 56  static void main_ui_enable(appdata_t *ap Line 58  static void main_ui_enable(appdata_t *ap
58    /* disable all menu entries related to map */    /* disable all menu entries related to map */
59    gtk_widget_set_sensitive(appdata->menu_osm, project_valid);    gtk_widget_set_sensitive(appdata->menu_osm, project_valid);
60    gtk_widget_set_sensitive(appdata->menu_item_osm_upload, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_osm_upload, osm_valid);
61    gtk_widget_set_sensitive(appdata->menu_item_osm_diff, osm_valid);    if(appdata->menu_item_osm_undo)
62        gtk_widget_set_sensitive(appdata->menu_item_osm_undo, osm_valid);
63      gtk_widget_set_sensitive(appdata->menu_item_osm_save_changes, osm_valid);
64    gtk_widget_set_sensitive(appdata->menu_item_osm_undo_changes, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_osm_undo_changes, osm_valid);
65      gtk_widget_set_sensitive(appdata->menu_item_osm_relations, osm_valid);
66    gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);    gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);
67    gtk_widget_set_sensitive(appdata->menu_view, osm_valid);    gtk_widget_set_sensitive(appdata->menu_view, osm_valid);
68    gtk_widget_set_sensitive(appdata->menu_wms, osm_valid);    gtk_widget_set_sensitive(appdata->menu_wms, osm_valid);
# Line 70  static void main_ui_enable(appdata_t *ap Line 75  static void main_ui_enable(appdata_t *ap
75    
76  /******************** begin of menu *********************/  /******************** begin of menu *********************/
77    
 #if 0 // simplify menu  
 static struct {  
   enum { MENU_END, MENU_ITEM, MENU_SUB, MENU_SUB_END, MENU_SEP }  type;  
   
   char *title;  
   GCallback c_handler;  
 } menu[] = {  
   { MENU_SUB, "_OSM", NULL },  
   
   { MENU_END,  NULL, NULL },  
 };  
 #endif  
   
78  static void  static void
79  cb_menu_project_open(GtkWidget *window, gpointer data) {  cb_menu_project_open(GtkMenuItem *item, gpointer data) {
80    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
81    project_load(appdata, NULL);    project_load(appdata, NULL);
82    main_ui_enable(appdata);    main_ui_enable(appdata);
83  }  }
84    
85  static void  static void
86  cb_menu_project_close(GtkWidget *window, gpointer data) {  cb_menu_project_close(GtkMenuItem *item, gpointer data) {
87    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
88    project_close(appdata);    project_close(appdata);
89    main_ui_enable(appdata);    main_ui_enable(appdata);
90  }  }
91    
92  static void  static void
93  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkMenuItem *item, gpointer data) {
94    GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new());    appdata_t *appdata = (appdata_t*)data;
   
   gtk_about_dialog_set_name(about, "OSM2Go");  
   gtk_about_dialog_set_version(about, VERSION);  
   gtk_about_dialog_set_copyright(about, _("Copyright 2008"));  
95    
96    const gchar *authors[] = {    const gchar *authors[] = {
97      "Till Harbaum <till@harbaum.org>",      "Till Harbaum <till@harbaum.org>",
98      "Andrew Chadwick <andrewc-osm2go@piffle.org>",      "Andrew Chadwick <andrewc-osm2go@piffle.org>",
99      NULL };      NULL };
100    
101    gtk_about_dialog_set_authors(about, authors);    const gchar *artists[] = {
102        "Andrew Zhilin <drew.zhilin@gmail.com>",
103    gtk_about_dialog_set_website(about,      NULL };
        _("http://www.harbaum.org/till/maemo"));  
   
   gtk_about_dialog_set_comments(about,  
        _("Mobile OSM Editor"));  
104    
105    gtk_widget_show_all(GTK_WIDGET(about));    gtk_show_about_dialog(GTK_WINDOW(appdata->window),
106    gtk_dialog_run(GTK_DIALOG(about));                          "name", "OSM2Go",
107    gtk_widget_destroy(GTK_WIDGET(about));                          "version", VERSION,
108                            "copyright", _("Copyright 2008-2009"),
109                            "authors", authors,
110                            "artists", artists,
111                            "website", _("http://www.harbaum.org/till/maemo"),
112                            "comments", _("Mobile OSM Editor"),
113                            NULL);
114  }  }
115    
116  void on_window_destroy (GtkWidget *widget, gpointer data);  void on_window_destroy (GtkWidget *widget, gpointer data);
117    
118  static void  static void
119  cb_menu_quit(GtkWidget *window, gpointer data) {  cb_menu_quit(GtkMenuItem *item, gpointer data) {
120    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
121    gtk_widget_destroy(GTK_WIDGET(appdata->window));    gtk_widget_destroy(GTK_WIDGET(appdata->window));
122  }  }
123    
124  static void  static void
125  cb_menu_upload(GtkWidget *window, gpointer data) {  cb_menu_upload(GtkMenuItem *item, gpointer data) {
126    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
127    if(!appdata->osm || !appdata->project) return;    if(!appdata->osm || !appdata->project) return;
128    
# Line 140  cb_menu_upload(GtkWidget *window, gpoint Line 130  cb_menu_upload(GtkWidget *window, gpoint
130  }  }
131    
132  static void  static void
133  cb_menu_download(GtkWidget *window, gpointer data) {  cb_menu_download(GtkMenuItem *item, gpointer data) {
134    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
135    if(!appdata->project) return;    if(!appdata->project) return;
136    
# Line 155  cb_menu_download(GtkWidget *window, gpoi Line 145  cb_menu_download(GtkWidget *window, gpoi
145    }    }
146    
147    // download    // download
148    if(osm_download(GTK_WIDGET(appdata->window), appdata->project)) {    if(osm_download(GTK_WIDGET(appdata->window), appdata->settings,
149                      appdata->project)) {
150      banner_busy_start(appdata, 1, "Redrawing...");      banner_busy_start(appdata, 1, "Redrawing...");
151      appdata->osm = osm_parse(appdata->project->osm);      appdata->osm = osm_parse(appdata->project->osm);
152      diff_restore(appdata, appdata->project, appdata->osm);      diff_restore(appdata, appdata->project, appdata->osm);
# Line 167  cb_menu_download(GtkWidget *window, gpoi Line 158  cb_menu_download(GtkWidget *window, gpoi
158  }  }
159    
160  static void  static void
161  cb_menu_wms_import(GtkWidget *window, gpointer data) {  cb_menu_wms_import(GtkMenuItem *item, gpointer data) {
162    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
163    wms_import(appdata);    wms_import(appdata);
164  }  }
165    
166  static void  static void
167  cb_menu_wms_clear(GtkWidget *window, gpointer data) {  cb_menu_wms_clear(GtkMenuItem *item, gpointer data) {
168    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
169    wms_remove(appdata);    wms_remove(appdata);
170  }  }
171    
172  static void  static void
173  cb_menu_wms_adjust(GtkWidget *window, gpointer data) {  cb_menu_wms_adjust(GtkMenuItem *item, gpointer data) {
174    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
175    map_action_set(appdata, MAP_ACTION_BG_ADJUST);    map_action_set(appdata, MAP_ACTION_BG_ADJUST);
176  }  }
# Line 187  cb_menu_wms_adjust(GtkWidget *window, gp Line 178  cb_menu_wms_adjust(GtkWidget *window, gp
178  /* ----------- hide objects for performance reasons ----------- */  /* ----------- hide objects for performance reasons ----------- */
179    
180  static void  static void
181  cb_menu_map_hide_sel(GtkWidget *window, gpointer data) {  cb_menu_map_hide_sel(GtkMenuItem *item, gpointer data) {
182    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
183    map_hide_selected(appdata);    map_hide_selected(appdata);
184  }  }
185    
186  static void  static void
187  cb_menu_map_show_all(GtkWidget *window, gpointer data) {  cb_menu_map_show_all(GtkMenuItem *item, gpointer data) {
188    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
189    map_show_all(appdata);    map_show_all(appdata);
190  }  }
# Line 202  cb_menu_map_show_all(GtkWidget *window, Line 193  cb_menu_map_show_all(GtkWidget *window,
193    
194  #if 1  // mainly for testing  #if 1  // mainly for testing
195  static void  static void
196  cb_menu_redraw(GtkWidget *window, gpointer data) {  cb_menu_redraw(GtkMenuItem *item, gpointer data) {
197    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
198    
199    /* redraw the entire map by destroying all map items and redrawing them */    /* redraw the entire map by destroying all map items and redrawing them */
# Line 226  cb_menu_redraw(GtkWidget *window, gpoint Line 217  cb_menu_redraw(GtkWidget *window, gpoint
217  #endif  #endif
218    
219  static void  static void
220  cb_menu_style(GtkWidget *widget, gpointer data) {  cb_menu_map_no_icons(GtkCheckMenuItem *item, gpointer data) {
221    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
222    
223    style_select(GTK_WIDGET(appdata->window), appdata);    banner_busy_start(appdata, 1, "Redrawing...");
224      map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
225      appdata->settings->no_icons = gtk_check_menu_item_get_active(item);
226      map_paint(appdata);
227      banner_busy_stop(appdata); //"Redrawing..."
228  }  }
229    
230  static void  static void
231  cb_menu_map_no_icons(GtkWidget *widget, gpointer data) {  cb_menu_map_no_antialias(GtkCheckMenuItem *item, gpointer data) {
232    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
233    
234    banner_busy_start(appdata, 1, "Redrawing...");    banner_busy_start(appdata, 1, "Redrawing...");
235    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
236    appdata->settings->no_icons =    appdata->settings->no_antialias = gtk_check_menu_item_get_active(item);
     gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));  
237    map_paint(appdata);    map_paint(appdata);
238    banner_busy_stop(appdata); //"Redrawing..."    banner_busy_stop(appdata); //"Redrawing..."
239  }  }
240    
241  static void  static void
242  cb_menu_map_no_antialias(GtkWidget *widget, gpointer data) {  cb_menu_style(GtkMenuItem *item, gpointer data) {
243    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
244    
245    banner_busy_start(appdata, 1, "Redrawing...");    style_select(GTK_WIDGET(appdata->window), appdata);
246    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);  }
247    appdata->settings->no_antialias =  
248      gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));  static void
249    map_paint(appdata);  cb_menu_undo(GtkMenuItem *item, gpointer data) {
250    banner_busy_stop(appdata); //"Redrawing..."    appdata_t *appdata = (appdata_t*)data;
251    
252      undo(appdata);
253    
254      // the banner will be displayed from within undo with more details
255  }  }
256    
257  static void  static void
258  cb_menu_save_changes(GtkWidget *widget, gpointer data) {  cb_menu_save_changes(GtkMenuItem *item, gpointer data) {
259    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
260    
261    diff_save(appdata->project, appdata->osm);    diff_save(appdata->project, appdata->osm);
# Line 265  cb_menu_save_changes(GtkWidget *widget, Line 263  cb_menu_save_changes(GtkWidget *widget,
263  }  }
264    
265  static void  static void
266  cb_menu_undo_changes(GtkWidget *widget, gpointer data) {  cb_menu_undo_changes(GtkMenuItem *item, gpointer data) {
267    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
268    
269    if(!yes_no_f(GTK_WIDGET(appdata->window), NULL, 0, 0,    if(!yes_no_f(GTK_WIDGET(appdata->window), NULL, 0, 0,
270                 _("Discard local changes?"),                 _("Discard local changes?"),
271                 _("Throw away all the changes you've not uploaded yet? This can't be undone.")))                 _("Throw away all the changes you've not "
272                     "uploaded yet? This can't be undone.")))
273      return;      return;
274    
275    banner_busy_start(appdata, 1, _("Redrawing..."));    banner_busy_start(appdata, 1, _("Redrawing..."));
# Line 285  cb_menu_undo_changes(GtkWidget *widget, Line 284  cb_menu_undo_changes(GtkWidget *widget,
284  }  }
285    
286  static void  static void
287  cb_menu_fullscreen(GtkWidget *widget, gpointer data) {  cb_menu_osm_relations(GtkMenuItem *item, gpointer data) {
288      relation_list((appdata_t*)data);
289    }
290    
291    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
292    static void
293    cb_menu_fullscreen(GtkCheckMenuItem *item, gpointer data) {
294    appdata_t *appdata = (appdata_t *)data;    appdata_t *appdata = (appdata_t *)data;
295    
296    if(gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget)))    if(gtk_check_menu_item_get_active(item))
297      gtk_window_fullscreen(GTK_WINDOW(appdata->window));      gtk_window_fullscreen(GTK_WINDOW(appdata->window));
298    else    else
299      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));
300  }  }
301    #endif
302    
303  static void  static void
304  cb_menu_zoomin(GtkWidget *widget, appdata_t *appdata) {  cb_menu_zoomin(GtkMenuItem *item, appdata_t *appdata) {
305    if(!appdata || !appdata->map) return;    if(!appdata || !appdata->map) return;
306    
307    map_set_zoom(appdata->map, appdata->map->state->zoom*ZOOM_FACTOR_MENU, TRUE);    map_set_zoom(appdata->map, appdata->map->state->zoom*ZOOM_FACTOR_MENU, TRUE);
# Line 303  cb_menu_zoomin(GtkWidget *widget, appdat Line 309  cb_menu_zoomin(GtkWidget *widget, appdat
309  }  }
310    
311  static void  static void
312  cb_menu_zoomout(GtkWidget *widget, appdata_t *appdata) {  cb_menu_zoomout(GtkMenuItem *item, appdata_t *appdata) {
313    if(!appdata || !appdata->map) return;    if(!appdata || !appdata->map) return;
314    
315    map_set_zoom(appdata->map, appdata->map->state->zoom/ZOOM_FACTOR_MENU, TRUE);    map_set_zoom(appdata->map, appdata->map->state->zoom/ZOOM_FACTOR_MENU, TRUE);
# Line 311  cb_menu_zoomout(GtkWidget *widget, appda Line 317  cb_menu_zoomout(GtkWidget *widget, appda
317  }  }
318    
319  static void  static void
320  cb_menu_track_import(GtkWidget *window, appdata_t *appdata) {  cb_menu_view_detail_inc(GtkMenuItem *item, gpointer data) {
321      appdata_t *appdata = (appdata_t*)data;
322    
323      printf("detail level increase\n");
324      map_detail_increase(appdata->map);
325    }
326    
327    static void
328    cb_menu_view_detail_normal(GtkMenuItem *item, gpointer data) {
329      appdata_t *appdata = (appdata_t*)data;
330    
331      printf("detail level normal\n");
332      map_detail_normal(appdata->map);
333    }
334    
335    static void
336    cb_menu_view_detail_dec(GtkMenuItem *item, gpointer data) {
337      appdata_t *appdata = (appdata_t*)data;
338    
339      printf("detail level decrease\n");
340      map_detail_decrease(appdata->map);
341    }
342    
343    static void
344    cb_menu_track_import(GtkMenuItem *item, appdata_t *appdata) {
345      g_assert(appdata->settings);
346    
347    /* open a file selector */    /* open a file selector */
348    GtkWidget *dialog;    GtkWidget *dialog;
# Line 328  cb_menu_track_import(GtkWidget *window, Line 359  cb_menu_track_import(GtkWidget *window,
359                          NULL);                          NULL);
360  #endif  #endif
361    
362    /* use path if one is present */    if(appdata->settings->track_path) {
363    if(appdata->track.import_path)      if(!g_file_test(appdata->settings->track_path, G_FILE_TEST_EXISTS)) {
364      gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),        char *last_sep = strrchr(appdata->settings->track_path, '/');
365                                          appdata->track.import_path);        if(last_sep) {
366            *last_sep = 0;  // seperate path from file
367    
368            /* the user just created a new document */
369            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),
370                                        appdata->settings->track_path);
371            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog),
372                                              last_sep+1);
373    
374            /* restore full filename */
375            *last_sep = '/';
376          }
377        } else
378          gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),
379                                        appdata->settings->track_path);
380      }
381    
382    gtk_widget_show_all (GTK_WIDGET(dialog));    gtk_widget_show_all (GTK_WIDGET(dialog));
383    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {
384      char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));      char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
385    
386      /* load a track */      /* load a track */
387      track_do(appdata, TRACK_IMPORT, filename);      appdata->track.track = track_import(appdata, filename);
388      if(appdata->track.track) {      if(appdata->track.track) {
389          if(appdata->settings->track_path) g_free(appdata->settings->track_path);
390        /* save path if gpx was successfully loaded */        appdata->settings->track_path = g_strdup(filename);
       char *r = strrchr(filename, '/');  
   
       /* there is a delimiter, use everything left of it as path */  
       if(r) {  
         *r = 0;  
         if(appdata->track.import_path) g_free(appdata->track.import_path);  
         appdata->track.import_path = g_strdup(filename);  
         /* restore path ... just in case ... */  
         *r = '/';  
       }  
391      }      }
392      g_free (filename);      g_free (filename);
393    }    }
# Line 360  cb_menu_track_import(GtkWidget *window, Line 396  cb_menu_track_import(GtkWidget *window,
396  }  }
397    
398  static void  static void
399  cb_menu_track_gps(GtkWidget *window, gpointer data) {  cb_menu_track_enable_gps(GtkMenuItem *item, gpointer data) {
400    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
401    
402    if(gtk_check_menu_item_get_active(    if(gtk_check_menu_item_get_active(
403      GTK_CHECK_MENU_ITEM(appdata->track.menu_item_gps))) {      GTK_CHECK_MENU_ITEM(appdata->track.menu_item_enable_gps))) {
404      track_do(appdata, TRACK_GPS, NULL);      track_enable_gps(appdata, TRUE);
405    } else {    } else
406      track_do(appdata, TRACK_NONE, NULL);      track_enable_gps(appdata, FALSE);
   }  
407  }  }
408    
409    
410  static void  static void
411  cb_menu_track_export(GtkWidget *window, gpointer data) {  cb_menu_track_follow_gps(GtkMenuItem *item, gpointer data) {
412    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
413    messagef(GTK_WIDGET(appdata->window), _("NIY"),  
414             _("Track export is not yet supported."));    if(gtk_check_menu_item_get_active(
415        GTK_CHECK_MENU_ITEM(appdata->track.menu_item_follow_gps))) {
416        appdata->settings->follow_gps = TRUE;
417      } else
418        appdata->settings->follow_gps = FALSE;
419  }  }
420    
421    
422  static void  static void
423  cb_menu_track_clear(GtkWidget *window, gpointer data) {  cb_menu_track_export(GtkMenuItem *item, appdata_t *appdata) {
424      g_assert(appdata->settings);
425    
426      /* open a file selector */
427      GtkWidget *dialog;
428    
429    #ifdef USE_HILDON
430      dialog = hildon_file_chooser_dialog_new(GTK_WINDOW(appdata->window),
431                                              GTK_FILE_CHOOSER_ACTION_SAVE);
432    #else
433      dialog = gtk_file_chooser_dialog_new(_("Export track file"),
434                                           GTK_WINDOW(appdata->window),
435                                           GTK_FILE_CHOOSER_ACTION_SAVE,
436                                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
437                                           GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
438                                           NULL);
439    #endif
440    
441      printf("set filename <%s>\n", appdata->settings->track_path);
442    
443      if(appdata->settings->track_path) {
444        if(!g_file_test(appdata->settings->track_path, G_FILE_TEST_EXISTS)) {
445          char *last_sep = strrchr(appdata->settings->track_path, '/');
446          if(last_sep) {
447            *last_sep = 0;  // seperate path from file
448    
449            /* the user just created a new document */
450            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),
451                                                appdata->settings->track_path);
452            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog),
453                                              last_sep+1);
454    
455            /* restore full filename */
456            *last_sep = '/';
457          }
458        } else
459          gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),
460                                        appdata->settings->track_path);
461      }
462    
463      if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_FM_OK) {
464        gchar *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
465        if(filename) {
466          printf("export to %s\n", filename);
467    
468          if(!g_file_test(filename, G_FILE_TEST_EXISTS) ||
469             yes_no_f(dialog, appdata, MISC_AGAIN_ID_EXPORT_OVERWRITE,
470                      MISC_AGAIN_FLAG_DONT_SAVE_NO,
471                      "Overwrite existing file",
472                      "The file already exists. "
473                      "Do you really want to replace it?")) {
474            if(appdata->settings->track_path)
475              g_free(appdata->settings->track_path);
476            appdata->settings->track_path = g_strdup(filename);
477    
478            track_export(appdata, filename);
479          }
480        }
481      }
482    
483      gtk_widget_destroy (dialog);
484    }
485    
486    
487    static void
488    cb_menu_track_clear(GtkMenuItem *item, gpointer data) {
489    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
490    track_do(appdata, TRACK_NONE, NULL);    track_clear(appdata, appdata->track.track);
491      appdata->track.track = NULL;
492  }  }
493    
494    
# Line 424  menu_append_new_item(appdata_t *appdata, Line 531  menu_append_new_item(appdata_t *appdata,
531                       GtkWidget *menu_shell,                       GtkWidget *menu_shell,
532                       GtkSignalFunc activate_cb,                       GtkSignalFunc activate_cb,
533                       char *label,                       char *label,
534                       const gchar *stock_id, // overridden by label, accels                       const gchar *icon_name, // stock id or name for icon_load
535                                        // overridden by label, accels, icon_name
536                       const gchar *accel_path,                       const gchar *accel_path,
537                       guint accel_key,      // from gdk/gdkkeysyms.h                       guint accel_key,      // from gdk/gdkkeysyms.h
538                       GdkModifierType accel_mods, // e.g. GDK_CONTROL_MASK                       GdkModifierType accel_mods, // e.g. GDK_CONTROL_MASK
539                         gboolean enabled,
540                       gboolean is_check, gboolean check_status)                       gboolean is_check, gboolean check_status)
541  {  {
542    GtkWidget *item = NULL;    GtkWidget *item = NULL;
543    GtkStockItem stock_item;    GtkWidget *image = NULL;
544    
545    gboolean stock_item_known = FALSE;    gboolean stock_item_known = FALSE;
546    if (stock_id != NULL) {    GtkStockItem stock_item;
547      stock_item_known = gtk_stock_lookup(stock_id, &stock_item);    if (icon_name != NULL) {
548        stock_item_known = gtk_stock_lookup(icon_name, &stock_item);
549    }    }
550    
551    // Icons    // Icons
# Line 442  menu_append_new_item(appdata_t *appdata, Line 553  menu_append_new_item(appdata_t *appdata,
553    item = is_check ? gtk_check_menu_item_new_with_mnemonic (label)    item = is_check ? gtk_check_menu_item_new_with_mnemonic (label)
554                    : gtk_menu_item_new_with_mnemonic       (label);                    : gtk_menu_item_new_with_mnemonic       (label);
555  #else  #else
556    if (is_check || !stock_item_known) {    if (is_check) {
557      item = is_check ? gtk_check_menu_item_new_with_mnemonic (label)      item = gtk_check_menu_item_new_with_mnemonic (label);
558                      : gtk_menu_item_new_with_mnemonic       (label);    }
559      else if (!stock_item_known) {
560        GdkPixbuf *pbuf = icon_load(&appdata->icon, icon_name);
561        if (pbuf) {
562          image = gtk_image_new_from_pixbuf(pbuf);
563        }
564        if (image) {
565          item = gtk_image_menu_item_new_with_mnemonic(label);
566          gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
567        }
568        else {
569          item = gtk_menu_item_new_with_mnemonic(label);
570        }
571    }    }
572    else {    else {
573      item = gtk_image_menu_item_new_with_mnemonic(label);      item = gtk_image_menu_item_new_with_mnemonic(label);
574      GtkWidget *stock_image = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_MENU);      image = gtk_image_new_from_stock(icon_name, GTK_ICON_SIZE_MENU);
575      gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), stock_image);      gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
576    }    }
577  #endif  #endif
578    
# Line 469  menu_append_new_item(appdata_t *appdata, Line 592  menu_append_new_item(appdata_t *appdata,
592  #endif  #endif
593    
594    gtk_menu_shell_append(GTK_MENU_SHELL(menu_shell), GTK_WIDGET(item));    gtk_menu_shell_append(GTK_MENU_SHELL(menu_shell), GTK_WIDGET(item));
595    if (is_check) {    gtk_widget_set_sensitive(GTK_WIDGET(item), enabled);
596      if (is_check)
597      gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), check_status);      gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), check_status);
598    }  
599    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(activate_cb),    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(activate_cb),
600                     appdata);                     appdata);
601    return item;    return item;
# Line 504  void menu_create(appdata_t *appdata) { Line 628  void menu_create(appdata_t *appdata) {
628    menu_append_new_item(    menu_append_new_item(
629      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_open), _("_Open..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_open), _("_Open..."),
630      GTK_STOCK_OPEN, "<OSM2Go-Main>/Project/Open",      GTK_STOCK_OPEN, "<OSM2Go-Main>/Project/Open",
631      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
632    );    );
633    
634    appdata->menu_item_project_close = menu_append_new_item(    appdata->menu_item_project_close = menu_append_new_item(
635      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_close), _("_Close"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_close), _("_Close"),
636      GTK_STOCK_CLOSE, "<OSM2Go-Main>/Project/Close",      GTK_STOCK_CLOSE, "<OSM2Go-Main>/Project/Close",
637      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
638    );    );
639    
640    /* --------------- view menu ------------------- */    /* --------------- view menu ------------------- */
641    
642  #ifndef UISPECIFIC_MENU_IS_MENU_BAR  #ifndef UISPECIFIC_MAIN_MENU_IS_MENU_BAR
643    gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
644  #endif  #endif
645    
# Line 525  void menu_create(appdata_t *appdata) { Line 649  void menu_create(appdata_t *appdata) {
649    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
650    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
651    
652    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
653    appdata->menu_item_view_fullscreen = menu_append_new_item(    appdata->menu_item_view_fullscreen = menu_append_new_item(
654      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_fullscreen), _("_Fullscreen"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_fullscreen), _("_Fullscreen"),
655      GTK_STOCK_FULLSCREEN, "<OSM2Go-Main>/View/Fullscreen",      GTK_STOCK_FULLSCREEN, "<OSM2Go-Main>/View/Fullscreen",
656      0, 0, TRUE, FALSE      0, 0, TRUE, TRUE, FALSE
657    );    );
658    #endif
659    
660    menu_append_new_item(    menu_append_new_item(
661      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),
662      GTK_STOCK_ZOOM_IN, "<OSM2Go-Main>/View/ZoomIn",      GTK_STOCK_ZOOM_IN, "<OSM2Go-Main>/View/ZoomIn",
663      GDK_comma, GDK_CONTROL_MASK, FALSE, FALSE      GDK_comma, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
664    );    );
665    
666    menu_append_new_item(    menu_append_new_item(
667      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomout), _("Zoom _out"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomout), _("Zoom _out"),
668      GTK_STOCK_ZOOM_OUT, "<OSM2Go-Main>/View/ZoomOut",      GTK_STOCK_ZOOM_OUT, "<OSM2Go-Main>/View/ZoomOut",
669      GDK_period, GDK_CONTROL_MASK, FALSE, FALSE      GDK_period, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
670      );
671    
672      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
673    
674      menu_append_new_item(
675        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_view_detail_inc), _("More details"),
676        NULL, "<OSM2Go-Main>/View/DetailInc",
677        GDK_period, GDK_MOD1_MASK, TRUE, FALSE, FALSE
678      );
679    
680      menu_append_new_item(
681        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_view_detail_normal), _("Normal details"),
682        NULL, "<OSM2Go-Main>/View/DetailNormal",
683        0, 0, TRUE, FALSE, FALSE
684      );
685    
686      menu_append_new_item(
687        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_view_detail_dec), _("Less details"),
688        NULL, "<OSM2Go-Main>/View/DetailDec",
689        GDK_comma, GDK_MOD1_MASK, TRUE, FALSE, FALSE
690    );    );
691    
692    /* -------------------- OSM submenu -------------------- */    /* -------------------- OSM submenu -------------------- */
# Line 553  void menu_create(appdata_t *appdata) { Line 699  void menu_create(appdata_t *appdata) {
699    
700    appdata->menu_item_osm_upload = menu_append_new_item(    appdata->menu_item_osm_upload = menu_append_new_item(
701      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload..."),
702      NULL, "<OSM2Go-Main>/OSM/Upload",      "upload.16", "<OSM2Go-Main>/OSM/Upload",
703      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
704    );    );
705    
706    menu_append_new_item(    menu_append_new_item(
707      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download..."),
708      NULL, "<OSM2Go-Main>/OSM/Download",      "download.16", "<OSM2Go-Main>/OSM/Download",
709      GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE      GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
710    );    );
711    
712    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
713    
714      if(getenv("OSM2GO_UNDO_TEST")) {
715        appdata->menu_item_osm_undo = menu_append_new_item(
716                   appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo), _("_Undo"),
717                   GTK_STOCK_UNDO, "<OSM2Go-Main>/OSM/Undo",
718                   GDK_z, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
719                   );
720      } else
721        printf("set environment variable OSM2GO_UNDO_TEST to enable undo framework tests\n");
722    
723    appdata->menu_item_osm_diff = menu_append_new_item(    appdata->menu_item_osm_save_changes = menu_append_new_item(
724      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),
725      GTK_STOCK_SAVE, "<OSM2Go-Main>/OSM/SaveChanges",      GTK_STOCK_SAVE, "<OSM2Go-Main>/OSM/SaveChanges",
726      GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE      GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
727    );    );
728    
729    appdata->menu_item_osm_undo_changes = menu_append_new_item(    appdata->menu_item_osm_undo_changes = menu_append_new_item(
730      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo_changes), _("Disca_rd local changes..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo_changes), _("Disca_rd local changes..."),
731      GTK_STOCK_DELETE, "<OSM2Go-Main>/OSM/DiscardChanges",      GTK_STOCK_DELETE, "<OSM2Go-Main>/OSM/DiscardChanges",
732      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
733      );
734    
735      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
736      appdata->menu_item_osm_relations = menu_append_new_item(
737        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations..."),
738        NULL, "<OSM2Go-Main>/OSM/Relations",
739        GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
740    );    );
741    
742    /* -------------------- wms submenu -------------------- */    /* -------------------- wms submenu -------------------- */
# Line 589  void menu_create(appdata_t *appdata) { Line 750  void menu_create(appdata_t *appdata) {
750    menu_append_new_item(    menu_append_new_item(
751      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_import), _("_Import..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_import), _("_Import..."),
752      GTK_STOCK_INDEX, "<OSM2Go-Main>/WMS/Import",      GTK_STOCK_INDEX, "<OSM2Go-Main>/WMS/Import",
753      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
754    );    );
755    
756    appdata->menu_item_wms_clear = menu_append_new_item(    appdata->menu_item_wms_clear = menu_append_new_item(
757      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_clear), _("_Clear"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_clear), _("_Clear"),
758      GTK_STOCK_CLEAR, "<OSM2Go-Main>/WMS/Clear",      GTK_STOCK_CLEAR, "<OSM2Go-Main>/WMS/Clear",
759      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
760    );    );
761    gtk_widget_set_sensitive(appdata->menu_item_wms_clear, FALSE);    gtk_widget_set_sensitive(appdata->menu_item_wms_clear, FALSE);
762    
763    appdata->menu_item_wms_adjust = menu_append_new_item(    appdata->menu_item_wms_adjust = menu_append_new_item(
764      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_adjust), _("_Adjust"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_adjust), _("_Adjust"),
765      NULL, "<OSM2Go-Main>/WMS/Adjust",      NULL, "<OSM2Go-Main>/WMS/Adjust",
766      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
767    );    );
768    gtk_widget_set_sensitive(appdata->menu_item_wms_adjust, FALSE);    gtk_widget_set_sensitive(appdata->menu_item_wms_adjust, FALSE);
769    
# Line 617  void menu_create(appdata_t *appdata) { Line 778  void menu_create(appdata_t *appdata) {
778    appdata->menu_item_map_hide_sel = menu_append_new_item(    appdata->menu_item_map_hide_sel = menu_append_new_item(
779      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_hide_sel), _("_Hide selected"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_hide_sel), _("_Hide selected"),
780      GTK_STOCK_REMOVE, "<OSM2Go-Main>/Map/HideSelected",      GTK_STOCK_REMOVE, "<OSM2Go-Main>/Map/HideSelected",
781      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
782    );    );
783    gtk_widget_set_sensitive(appdata->menu_item_map_hide_sel, FALSE);    gtk_widget_set_sensitive(appdata->menu_item_map_hide_sel, FALSE);
784    
785    appdata->menu_item_map_show_all = menu_append_new_item(    appdata->menu_item_map_show_all = menu_append_new_item(
786      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_show_all), _("_Show all"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_show_all), _("_Show all"),
787      GTK_STOCK_ADD, "<OSM2Go-Main>/Map/ShowAll",      GTK_STOCK_ADD, "<OSM2Go-Main>/Map/ShowAll",
788      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
789    );    );
790    gtk_widget_set_sensitive(appdata->menu_item_map_show_all, FALSE);    gtk_widget_set_sensitive(appdata->menu_item_map_show_all, FALSE);
791    
# Line 633  void menu_create(appdata_t *appdata) { Line 794  void menu_create(appdata_t *appdata) {
794    menu_append_new_item(    menu_append_new_item(
795      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_style), _("St_yle..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_style), _("St_yle..."),
796      GTK_STOCK_SELECT_COLOR, "<OSM2Go-Main>/Map/Style",      GTK_STOCK_SELECT_COLOR, "<OSM2Go-Main>/Map/Style",
797      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
798    );    );
799    
800    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
# Line 642  void menu_create(appdata_t *appdata) { Line 803  void menu_create(appdata_t *appdata) {
803    menu_append_new_item(    menu_append_new_item(
804      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_redraw), _("_Redraw"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_redraw), _("_Redraw"),
805      NULL, "<OSM2Go-Main>/Map/Redraw",      NULL, "<OSM2Go-Main>/Map/Redraw",
806      GDK_r, GDK_CONTROL_MASK, FALSE, FALSE      GDK_r, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
807    );    );
808    
809    appdata->menu_item_map_no_icons = menu_append_new_item(    appdata->menu_item_map_no_icons = menu_append_new_item(
810      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_icons), _("No _icons"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_icons), _("No _icons"),
811      NULL, "<OSM2Go-Main>/Map/NoIcons",      NULL, "<OSM2Go-Main>/Map/NoIcons",
812      0, 0, TRUE, appdata->settings->no_icons      0, 0, TRUE, TRUE, appdata->settings->no_icons
813    );    );
814    
815    appdata->menu_item_map_no_antialias = menu_append_new_item(    appdata->menu_item_map_no_antialias = menu_append_new_item(
816      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_antialias),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_antialias),
817      _("No _antialias"),      _("No _antialias"),
818      NULL, "<OSM2Go-Main>/Map/NoAntialias",      NULL, "<OSM2Go-Main>/Map/NoAntialias",
819      0, 0, TRUE, appdata->settings->no_antialias      0, 0, TRUE, TRUE, appdata->settings->no_antialias
820    );    );
821    
822    /* -------------------- track submenu -------------------- */    /* -------------------- track submenu -------------------- */
# Line 669  void menu_create(appdata_t *appdata) { Line 830  void menu_create(appdata_t *appdata) {
830    appdata->track.menu_item_import = menu_append_new_item(    appdata->track.menu_item_import = menu_append_new_item(
831      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import..."),
832      NULL, "<OSM2Go-Main>/Track/Import",      NULL, "<OSM2Go-Main>/Track/Import",
833      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
834    );    );
835    
836    appdata->track.menu_item_export = menu_append_new_item(    appdata->track.menu_item_export = menu_append_new_item(
837      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export..."),
838      NULL, "<OSM2Go-Main>/Track/Export",      NULL, "<OSM2Go-Main>/Track/Export",
839      0, 0, FALSE, FALSE      0, 0, FALSE, FALSE, FALSE
840    );    );
841    
842    appdata->track.menu_item_clear = menu_append_new_item(    appdata->track.menu_item_clear = menu_append_new_item(
843      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_clear), _("_Clear"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_clear), _("_Clear"),
844      GTK_STOCK_CLEAR, "<OSM2Go-Main>/Track/Clear",      GTK_STOCK_CLEAR, "<OSM2Go-Main>/Track/Clear",
845      0, 0, FALSE, FALSE      0, 0, FALSE, FALSE, FALSE
846    );    );
847    
848    
849    appdata->track.menu_item_gps = menu_append_new_item(    appdata->track.menu_item_enable_gps = menu_append_new_item(
850      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_gps), _("_GPS"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_enable_gps),_("_GPS enable"),
851      NULL, "<OSM2Go-Main>/Track/GPS",      NULL, "<OSM2Go-Main>/Track/GPS",
852      GDK_g, GDK_CONTROL_MASK|GDK_SHIFT_MASK, TRUE, FALSE      GDK_g, GDK_CONTROL_MASK|GDK_SHIFT_MASK, TRUE, TRUE,
853        appdata->settings->enable_gps
854      );
855    
856      appdata->track.menu_item_follow_gps = menu_append_new_item(
857        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_follow_gps), _("GPS follow"),
858        NULL, "<OSM2Go-Main>/Track/Follow",
859        0, 0, appdata->settings->enable_gps, TRUE,
860        appdata->settings->follow_gps
861    );    );
862    
863    /* ------------------------------------------------------- */    /* ------------------------------------------------------- */
# Line 699  void menu_create(appdata_t *appdata) { Line 868  void menu_create(appdata_t *appdata) {
868    menu_append_new_item(    menu_append_new_item(
869      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_about), _("_About..."),      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_about), _("_About..."),
870      GTK_STOCK_ABOUT, "<OSM2Go-Main>/About",      GTK_STOCK_ABOUT, "<OSM2Go-Main>/About",
871      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
872    );    );
873    
874    menu_append_new_item(    menu_append_new_item(
875      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_quit), _("_Quit"),      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_quit), _("_Quit"),
876      GTK_STOCK_QUIT, "<OSM2Go-Main>/Quit",      GTK_STOCK_QUIT, "<OSM2Go-Main>/Quit",
877      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
878    );    );
879    
880    gtk_window_add_accel_group(GTK_WINDOW(appdata->window), accel_grp);    gtk_window_add_accel_group(GTK_WINDOW(appdata->window), accel_grp);
# Line 803  void cleanup(appdata_t *appdata) { Line 972  void cleanup(appdata_t *appdata) {
972    
973    project_free(appdata->project);    project_free(appdata->project);
974    
975    undo_free(appdata->undo_state);    if(appdata->menu_item_osm_undo)
976        undo_free(appdata->undo.state);
977    
978    puts("everything is gone");    puts("everything is gone");
979  }  }
# Line 869  int main(int argc, char *argv[]) { Line 1039  int main(int argc, char *argv[]) {
1039    
1040    g_thread_init(NULL);    g_thread_init(NULL);
1041    
   gps_init(&appdata);  
   
1042    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
1043    
1044      gps_init(&appdata);
1045    
1046  #ifdef USE_HILDON  #ifdef USE_HILDON
1047    printf("Installing osso context for \"org.harbaum." PACKAGE "\"\n");    printf("Installing osso context for \"org.harbaum." PACKAGE "\"\n");
1048    appdata.osso_context = osso_initialize("org.harbaum."PACKAGE,    appdata.osso_context = osso_initialize("org.harbaum."PACKAGE,
# Line 939  int main(int argc, char *argv[]) { Line 1109  int main(int argc, char *argv[]) {
1109  #ifndef PORTRAIT  #ifndef PORTRAIT
1110    gtk_box_pack_start(GTK_BOX(hbox), iconbar_new(&appdata), FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(hbox), iconbar_new(&appdata), FALSE, FALSE, 0);
1111  #endif  #endif
1112    gtk_box_pack_start(GTK_BOX(hbox), gtk_vseparator_new(), FALSE, FALSE, 0);    //  gtk_box_pack_start(GTK_BOX(hbox), gtk_vseparator_new(), FALSE, FALSE, 0);
1113    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
1114    
1115    gtk_box_pack_start(GTK_BOX(appdata.vbox), hbox, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(appdata.vbox), hbox, TRUE, TRUE, 0);
# Line 963  int main(int argc, char *argv[]) { Line 1133  int main(int argc, char *argv[]) {
1133    
1134    main_ui_enable(&appdata);    main_ui_enable(&appdata);
1135    
1136      /* start GPS if enabled by config */
1137      if(appdata.settings && appdata.settings->enable_gps)
1138        track_enable_gps(&appdata, TRUE);
1139    
1140    /* ------------ jump into main loop ---------------- */    /* ------------ jump into main loop ---------------- */
1141    
1142    gtk_main();    gtk_main();
# Line 970  int main(int argc, char *argv[]) { Line 1144  int main(int argc, char *argv[]) {
1144    puts("gtk_main() left");    puts("gtk_main() left");
1145    
1146    track_save(appdata.project, appdata.track.track);    track_save(appdata.project, appdata.track.track);
1147      track_clear(&appdata, appdata.track.track);
1148      appdata.track.track = NULL;
1149    
1150    /* save a diff if there are dirty entries */    /* save a diff if there are dirty entries */
1151    diff_save(appdata.project, appdata.osm);    diff_save(appdata.project, appdata.osm);
Legend:
Removed from v.55  
changed lines
  Added in v.174