Diff of /trunk/src/main.c

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

revision 24 by harbaum, Sun Dec 21 11:49:35 2008 UTC revision 156 by harbaum, Wed Apr 1 12:47:35 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 22  Line 24 
24  #include <gdk/gdkkeysyms.h>  #include <gdk/gdkkeysyms.h>
25    
26  #include "appdata.h"  #include "appdata.h"
27    #include "banner.h"
28    
29  /* disable/enable main screen control dependant on presence of open project */  /* disable/enable main screen control dependant on presence of open project */
30  static void main_ui_enable(appdata_t *appdata) {  static void main_ui_enable(appdata_t *appdata) {
# Line 55  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->track.menu_track, osm_valid);    gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);
66    gtk_widget_set_sensitive(appdata->menu_view, osm_valid);    gtk_widget_set_sensitive(appdata->menu_view, osm_valid);
# Line 69  static void main_ui_enable(appdata_t *ap Line 74  static void main_ui_enable(appdata_t *ap
74    
75  /******************** begin of menu *********************/  /******************** begin of menu *********************/
76    
 #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  
   
77  static void  static void
78  cb_menu_project_open(GtkWidget *window, gpointer data) {  cb_menu_project_open(GtkMenuItem *item, gpointer data) {
79    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
80    project_load(appdata, NULL);    project_load(appdata, NULL);
81    main_ui_enable(appdata);    main_ui_enable(appdata);
82  }  }
83    
84  static void  static void
85  cb_menu_project_close(GtkWidget *window, gpointer data) {  cb_menu_project_close(GtkMenuItem *item, gpointer data) {
86    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
87    project_close(appdata);    project_close(appdata);
88    main_ui_enable(appdata);    main_ui_enable(appdata);
89  }  }
90    
91  static void  static void
92  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkMenuItem *item, gpointer data) {
93    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"));  
94    
95    const gchar *authors[] = {    const gchar *authors[] = {
96      "Till Harbaum <till@harbaum.org>",      "Till Harbaum <till@harbaum.org>",
97      "Andrew Chadwick",      "Andrew Chadwick <andrewc-osm2go@piffle.org>",
98      NULL };      NULL };
99    
100    gtk_about_dialog_set_authors(about, authors);    const gchar *artists[] = {
101        "Andrew Zhilin <drew.zhilin@gmail.com>",
102    gtk_about_dialog_set_website(about,      NULL };
        _("http://www.harbaum.org/till/maemo"));  
   
   gtk_about_dialog_set_comments(about,  
        _("Mobile OSM Editor"));  
103    
104    gtk_widget_show_all(GTK_WIDGET(about));    gtk_show_about_dialog(GTK_WINDOW(appdata->window),
105    gtk_dialog_run(GTK_DIALOG(about));                          "name", "OSM2Go",
106    gtk_widget_destroy(GTK_WIDGET(about));                          "version", VERSION,
107                            "copyright", _("Copyright 2008-2009"),
108                            "authors", authors,
109                            "artists", artists,
110                            "website", _("http://www.harbaum.org/till/maemo"),
111                            "comments", _("Mobile OSM Editor"),
112                            NULL);
113  }  }
114    
115  void on_window_destroy (GtkWidget *widget, gpointer data);  void on_window_destroy (GtkWidget *widget, gpointer data);
116    
117  static void  static void
118  cb_menu_quit(GtkWidget *window, gpointer data) {  cb_menu_quit(GtkMenuItem *item, gpointer data) {
119    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
120    gtk_widget_destroy(GTK_WIDGET(appdata->window));    gtk_widget_destroy(GTK_WIDGET(appdata->window));
121  }  }
122    
123  static void  static void
124  cb_menu_upload(GtkWidget *window, gpointer data) {  cb_menu_upload(GtkMenuItem *item, gpointer data) {
125    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
126    if(!appdata->osm || !appdata->project) return;    if(!appdata->osm || !appdata->project) return;
127    
# Line 139  cb_menu_upload(GtkWidget *window, gpoint Line 129  cb_menu_upload(GtkWidget *window, gpoint
129  }  }
130    
131  static void  static void
132  cb_menu_download(GtkWidget *window, gpointer data) {  cb_menu_download(GtkMenuItem *item, gpointer data) {
133    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
134    if(!appdata->project) return;    if(!appdata->project) return;
135    
# Line 155  cb_menu_download(GtkWidget *window, gpoi Line 145  cb_menu_download(GtkWidget *window, gpoi
145    
146    // download    // download
147    if(osm_download(GTK_WIDGET(appdata->window), appdata->project)) {    if(osm_download(GTK_WIDGET(appdata->window), appdata->project)) {
148        banner_busy_start(appdata, 1, "Redrawing...");
149      appdata->osm = osm_parse(appdata->project->osm);      appdata->osm = osm_parse(appdata->project->osm);
150      diff_restore(appdata, appdata->project, appdata->osm);      diff_restore(appdata, appdata->project, appdata->osm);
151      map_paint(appdata);      map_paint(appdata);
152        banner_busy_stop(appdata); //"Redrawing..."
153    }    }
154    
155    main_ui_enable(appdata);    main_ui_enable(appdata);
156  }  }
157    
158  static void  static void
159  cb_menu_wms_import(GtkWidget *window, gpointer data) {  cb_menu_wms_import(GtkMenuItem *item, gpointer data) {
160    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
161    wms_import(appdata);    wms_import(appdata);
162  }  }
163    
164  static void  static void
165  cb_menu_wms_clear(GtkWidget *window, gpointer data) {  cb_menu_wms_clear(GtkMenuItem *item, gpointer data) {
166    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
167    wms_remove(appdata);    wms_remove(appdata);
168  }  }
169    
170  static void  static void
171  cb_menu_wms_adjust(GtkWidget *window, gpointer data) {  cb_menu_wms_adjust(GtkMenuItem *item, gpointer data) {
172    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
173    map_action_set(appdata, MAP_ACTION_BG_ADJUST);    map_action_set(appdata, MAP_ACTION_BG_ADJUST);
174  }  }
# Line 184  cb_menu_wms_adjust(GtkWidget *window, gp Line 176  cb_menu_wms_adjust(GtkWidget *window, gp
176  /* ----------- hide objects for performance reasons ----------- */  /* ----------- hide objects for performance reasons ----------- */
177    
178  static void  static void
179  cb_menu_map_hide_sel(GtkWidget *window, gpointer data) {  cb_menu_map_hide_sel(GtkMenuItem *item, gpointer data) {
180    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
181    map_hide_selected(appdata);    map_hide_selected(appdata);
182  }  }
183    
184  static void  static void
185  cb_menu_map_show_all(GtkWidget *window, gpointer data) {  cb_menu_map_show_all(GtkMenuItem *item, gpointer data) {
186    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
187    map_show_all(appdata);    map_show_all(appdata);
188  }  }
# Line 199  cb_menu_map_show_all(GtkWidget *window, Line 191  cb_menu_map_show_all(GtkWidget *window,
191    
192  #if 1  // mainly for testing  #if 1  // mainly for testing
193  static void  static void
194  cb_menu_redraw(GtkWidget *window, gpointer data) {  cb_menu_redraw(GtkMenuItem *item, gpointer data) {
195    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
196    
197    /* redraw the entire map by destroying all map items and redrawing them */    /* redraw the entire map by destroying all map items and redrawing them */
198      banner_busy_start(appdata, 1, "Redrawing...");
199    track_save(appdata->project, appdata->track.track);    track_save(appdata->project, appdata->track.track);
200    diff_save(appdata->project, appdata->osm);    diff_save(appdata->project, appdata->osm);
201    map_clear(appdata, MAP_LAYER_ALL);    map_clear(appdata, MAP_LAYER_ALL);
# Line 217  cb_menu_redraw(GtkWidget *window, gpoint Line 210  cb_menu_redraw(GtkWidget *window, gpoint
210      map_track_draw(appdata->map, appdata->track.track);      map_track_draw(appdata->map, appdata->track.track);
211    
212    wms_load(appdata);    wms_load(appdata);
213      banner_busy_stop(appdata); //"Redrawing..."
214  }  }
215  #endif  #endif
216    
217  static void  static void
218  cb_menu_style(GtkWidget *widget, gpointer data) {  cb_menu_style(GtkMenuItem *item, gpointer data) {
219    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
220    
221    style_select(GTK_WIDGET(appdata->window), appdata);    style_select(GTK_WIDGET(appdata->window), appdata);
222  }  }
223    
224  static void  static void
225  cb_menu_map_no_icons(GtkWidget *widget, gpointer data) {  cb_menu_map_no_icons(GtkCheckMenuItem *item, gpointer data) {
226    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
227    
228      banner_busy_start(appdata, 1, "Redrawing...");
229    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
230    appdata->settings->no_icons =    appdata->settings->no_icons = gtk_check_menu_item_get_active(item);
     gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));  
231    map_paint(appdata);    map_paint(appdata);
232      banner_busy_stop(appdata); //"Redrawing..."
233  }  }
234    
235  static void  static void
236  cb_menu_map_no_antialias(GtkWidget *widget, gpointer data) {  cb_menu_map_no_antialias(GtkCheckMenuItem *item, gpointer data) {
237    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
238    
239      banner_busy_start(appdata, 1, "Redrawing...");
240    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
241    appdata->settings->no_antialias =    appdata->settings->no_antialias = gtk_check_menu_item_get_active(item);
     gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));  
242    map_paint(appdata);    map_paint(appdata);
243      banner_busy_stop(appdata); //"Redrawing..."
244  }  }
245    
246  static void  static void
247  cb_menu_save_changes(GtkWidget *widget, gpointer data) {  cb_menu_undo(GtkMenuItem *item, gpointer data) {
248      appdata_t *appdata = (appdata_t*)data;
249    
250      undo(appdata);
251    
252      // the banner will be displayed from within undo with more details
253    }
254    
255    static void
256    cb_menu_save_changes(GtkMenuItem *item, gpointer data) {
257    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
258    
259    diff_save(appdata->project, appdata->osm);    diff_save(appdata->project, appdata->osm);
260    statusbar_set(appdata, _("Saved all changes made "    banner_show_info(appdata, _("Saved local changes"));
                            "to this project so far"), FALSE);  
261  }  }
262    
263  static void  static void
264  cb_menu_undo_changes(GtkWidget *widget, gpointer data) {  cb_menu_undo_changes(GtkMenuItem *item, gpointer data) {
265    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
266    
267    if(!yes_no_f(GTK_WIDGET(appdata->window), NULL, 0, 0,    if(!yes_no_f(GTK_WIDGET(appdata->window), NULL, 0, 0,
268                 _("Undo all changes?"),                 _("Discard local changes?"),
269                 _("Do you really want to undo all your changes "                 _("Throw away all the changes you've not "
270                   "not uploaded so far? This cannot be undone!")))                   "uploaded yet? This can't be undone.")))
271      return;      return;
272    
273      banner_busy_start(appdata, 1, _("Redrawing..."));
274    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
275    osm_free(&appdata->icon, appdata->osm);    osm_free(&appdata->icon, appdata->osm);
276    diff_remove(appdata->project);    diff_remove(appdata->project);
277    appdata->osm = osm_parse(appdata->project->osm);    appdata->osm = osm_parse(appdata->project->osm);
278    map_paint(appdata);    map_paint(appdata);
279      banner_busy_stop(appdata);  //"Redrawing..."
280    
281      banner_show_info(appdata, _("Discarded local changes"));
282    }
283    
284    statusbar_set(appdata, _("All changes made "  static void
285                             "so far have been reset"), FALSE);  cb_menu_osm_relations(GtkMenuItem *item, gpointer data) {
286      relation_list((appdata_t*)data);
287  }  }
288    
289  static void  static void
290  cb_menu_fullscreen(GtkWidget *widget, gpointer data) {  cb_menu_fullscreen(GtkCheckMenuItem *item, gpointer data) {
291    appdata_t *appdata = (appdata_t *)data;    appdata_t *appdata = (appdata_t *)data;
292    
293    if(gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget)))    if(gtk_check_menu_item_get_active(item))
294      gtk_window_fullscreen(GTK_WINDOW(appdata->window));      gtk_window_fullscreen(GTK_WINDOW(appdata->window));
295    else    else
296      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));
297  }  }
298    
299  static void  static void
300  cb_menu_zoomin(GtkWidget *widget, appdata_t *appdata) {  cb_menu_zoomin(GtkMenuItem *item, appdata_t *appdata) {
301    if(!appdata || !appdata->map) return;    if(!appdata || !appdata->map) return;
302    
303    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 295  cb_menu_zoomin(GtkWidget *widget, appdat Line 305  cb_menu_zoomin(GtkWidget *widget, appdat
305  }  }
306    
307  static void  static void
308  cb_menu_zoomout(GtkWidget *widget, appdata_t *appdata) {  cb_menu_zoomout(GtkMenuItem *item, appdata_t *appdata) {
309    if(!appdata || !appdata->map) return;    if(!appdata || !appdata->map) return;
310    
311    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_zoomout(GtkWidget *widget, appda Line 313  cb_menu_zoomout(GtkWidget *widget, appda
313  }  }
314    
315  static void  static void
316  cb_menu_track_import(GtkWidget *window, appdata_t *appdata) {  cb_menu_track_import(GtkMenuItem *item, appdata_t *appdata) {
317      g_assert(appdata->settings);
318    
319    /* open a file selector */    /* open a file selector */
320    GtkWidget *dialog;    GtkWidget *dialog;
# Line 320  cb_menu_track_import(GtkWidget *window, Line 331  cb_menu_track_import(GtkWidget *window,
331                          NULL);                          NULL);
332  #endif  #endif
333    
334    /* use path if one is present */    if(appdata->settings->track_path) {
335    if(appdata->track.import_path)      if(!g_file_test(appdata->settings->track_path, G_FILE_TEST_EXISTS)) {
336      gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),        char *last_sep = strrchr(appdata->settings->track_path, '/');
337                                          appdata->track.import_path);        if(last_sep) {
338            *last_sep = 0;  // seperate path from file
339    
340            /* the user just created a new document */
341            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),
342                                        appdata->settings->track_path);
343            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog),
344                                              last_sep+1);
345    
346            /* restore full filename */
347            *last_sep = '/';
348          }
349        } else
350          gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),
351                                        appdata->settings->track_path);
352      }
353    
354    gtk_widget_show_all (GTK_WIDGET(dialog));    gtk_widget_show_all (GTK_WIDGET(dialog));
355    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {
356      char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));      char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
357    
358      /* load a track */      /* load a track */
359      track_do(appdata, TRACK_IMPORT, filename);      appdata->track.track = track_import(appdata, filename);
360      if(appdata->track.track) {      if(appdata->track.track) {
361          if(appdata->settings->track_path) g_free(appdata->settings->track_path);
362        /* 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 = '/';  
       }  
363      }      }
364      g_free (filename);      g_free (filename);
365    }    }
# Line 352  cb_menu_track_import(GtkWidget *window, Line 368  cb_menu_track_import(GtkWidget *window,
368  }  }
369    
370  static void  static void
371  cb_menu_track_gps(GtkWidget *window, gpointer data) {  cb_menu_track_enable_gps(GtkMenuItem *item, gpointer data) {
372    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
373    
374    if(gtk_check_menu_item_get_active(    if(gtk_check_menu_item_get_active(
375      GTK_CHECK_MENU_ITEM(appdata->track.menu_item_gps))) {      GTK_CHECK_MENU_ITEM(appdata->track.menu_item_enable_gps))) {
376      track_do(appdata, TRACK_GPS, NULL);      track_enable_gps(appdata, TRUE);
377    } else {    } else
378      track_do(appdata, TRACK_NONE, NULL);      track_enable_gps(appdata, FALSE);
   }  
379  }  }
380    
381    
382  static void  static void
383  cb_menu_track_export(GtkWidget *window, gpointer data) {  cb_menu_track_follow_gps(GtkMenuItem *item, gpointer data) {
384    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
385    messagef(GTK_WIDGET(appdata->window), _("NIY"),  
386             _("Track export is not yet supported."));    if(gtk_check_menu_item_get_active(
387        GTK_CHECK_MENU_ITEM(appdata->track.menu_item_follow_gps))) {
388        appdata->settings->follow_gps = TRUE;
389      } else
390        appdata->settings->follow_gps = FALSE;
391    }
392    
393    
394    static void
395    cb_menu_track_export(GtkMenuItem *item, appdata_t *appdata) {
396      g_assert(appdata->settings);
397    
398      /* open a file selector */
399      GtkWidget *dialog;
400    
401    #ifdef USE_HILDON
402      dialog = hildon_file_chooser_dialog_new(GTK_WINDOW(appdata->window),
403                                              GTK_FILE_CHOOSER_ACTION_SAVE);
404    #else
405      dialog = gtk_file_chooser_dialog_new(_("Export track file"),
406                                           GTK_WINDOW(appdata->window),
407                                           GTK_FILE_CHOOSER_ACTION_SAVE,
408                                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
409                                           GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
410                                           NULL);
411    #endif
412    
413      printf("set filename <%s>\n", appdata->settings->track_path);
414    
415      if(appdata->settings->track_path) {
416        if(!g_file_test(appdata->settings->track_path, G_FILE_TEST_EXISTS)) {
417          char *last_sep = strrchr(appdata->settings->track_path, '/');
418          if(last_sep) {
419            *last_sep = 0;  // seperate path from file
420    
421            /* the user just created a new document */
422            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),
423                                                appdata->settings->track_path);
424            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog),
425                                              last_sep+1);
426    
427            /* restore full filename */
428            *last_sep = '/';
429          }
430        } else
431          gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),
432                                        appdata->settings->track_path);
433      }
434    
435      if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_FM_OK) {
436        gchar *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
437        if(filename) {
438          printf("export to %s\n", filename);
439    
440          if(!g_file_test(filename, G_FILE_TEST_EXISTS) ||
441             yes_no_f(dialog, appdata, MISC_AGAIN_ID_EXPORT_OVERWRITE,
442                      MISC_AGAIN_FLAG_DONT_SAVE_NO,
443                      "Overwrite existing file",
444                      "The file already exists. "
445                      "Do you really want to replace it?")) {
446            if(appdata->settings->track_path)
447              g_free(appdata->settings->track_path);
448            appdata->settings->track_path = g_strdup(filename);
449    
450            track_export(appdata, filename);
451          }
452        }
453      }
454    
455      gtk_widget_destroy (dialog);
456  }  }
457    
458    
459  static void  static void
460  cb_menu_track_clear(GtkWidget *window, gpointer data) {  cb_menu_track_clear(GtkMenuItem *item, gpointer data) {
461    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
462    track_do(appdata, TRACK_NONE, NULL);    track_clear(appdata, appdata->track.track);
463      appdata->track.track = NULL;
464  }  }
465    
466    
467    
468    
469    /*
470     *  Platform-specific UI tweaks.
471     */
472    
473    
474    #ifndef USE_HILDON
475    #ifdef PORTRAIT
476    
477    // Portrait mode, for openmoko-like systems
478    #define uispecific_main_menu_new gtk_menu_new
479    
480    #else
481    
482    // Regular desktop builds
483    #define uispecific_main_menu_new gtk_menu_bar_new
484    #define UISPECIFIC_MAIN_MENU_IS_MENU_BAR
485    #define UISPECIFIC_MENU_HAS_ICONS
486    #define UISPECIFIC_MENU_HAS_ACCELS
487    
488    #endif //PORTRAIT
489    #else//USE_HILDON
490    
491    // Maemo/Hildon builds
492    #define uispecific_main_menu_new gtk_menu_new
493    
494    #endif
495    
496    
497    
498    // Half-arsed slapdash common menu item constructor. Let's use GtkBuilder
499    // instead so we have some flexibility.
500    
501    static GtkWidget *
502    menu_append_new_item(appdata_t *appdata,
503                         GtkWidget *menu_shell,
504                         GtkSignalFunc activate_cb,
505                         char *label,
506                         const gchar *icon_name, // stock id or name for icon_load
507                                        // overridden by label, accels, icon_name
508                         const gchar *accel_path,
509                         guint accel_key,      // from gdk/gdkkeysyms.h
510                         GdkModifierType accel_mods, // e.g. GDK_CONTROL_MASK
511                         gboolean enabled,
512                         gboolean is_check, gboolean check_status)
513    {
514      GtkWidget *item = NULL;
515      GtkWidget *image = NULL;
516    
517      gboolean stock_item_known = FALSE;
518      GtkStockItem stock_item;
519      if (icon_name != NULL) {
520        stock_item_known = gtk_stock_lookup(icon_name, &stock_item);
521      }
522    
523      // Icons
524    #ifndef UISPECIFIC_MENU_HAS_ICONS
525      item = is_check ? gtk_check_menu_item_new_with_mnemonic (label)
526                      : gtk_menu_item_new_with_mnemonic       (label);
527    #else
528      if (is_check) {
529        item = gtk_check_menu_item_new_with_mnemonic (label);
530      }
531      else if (!stock_item_known) {
532        GdkPixbuf *pbuf = icon_load(&appdata->icon, icon_name);
533        if (pbuf) {
534          image = gtk_image_new_from_pixbuf(pbuf);
535        }
536        if (image) {
537          item = gtk_image_menu_item_new_with_mnemonic(label);
538          gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
539        }
540        else {
541          item = gtk_menu_item_new_with_mnemonic(label);
542        }
543      }
544      else {
545        item = gtk_image_menu_item_new_with_mnemonic(label);
546        image = gtk_image_new_from_stock(icon_name, GTK_ICON_SIZE_MENU);
547        gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
548      }
549    #endif
550    
551    #ifdef UISPECIFIC_MENU_HAS_ACCELS
552      // Accelerators
553      // Default
554      if (accel_path != NULL) {
555        gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
556        if (accel_key != 0) {
557          gtk_accel_map_add_entry( accel_path, accel_key, accel_mods );
558        }
559        else if (stock_item_known) {
560          gtk_accel_map_add_entry( accel_path, stock_item.keyval,
561                                   stock_item.modifier );
562        }
563      }
564    #endif
565    
566      gtk_menu_shell_append(GTK_MENU_SHELL(menu_shell), GTK_WIDGET(item));
567      gtk_widget_set_sensitive(GTK_WIDGET(item), enabled);
568      if (is_check)
569        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), check_status);
570    
571      g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(activate_cb),
572                       appdata);
573      return item;
574    }
575    
576    
577  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
578    GtkWidget *menu, *item, *submenu;    GtkWidget *menu, *item, *submenu;
579    menu = gtk_menu_new();    GtkWidget *about_quit_items_menu;
580    
581      if (g_module_supported()) {
582        printf("*** can use GModule: consider using GtkUIManager / GtkBuilder\n");
583      }
584    
585      menu = uispecific_main_menu_new();
586      about_quit_items_menu = menu;
587    
588    /* -------------------- Project submenu -------------------- */    /* -------------------- Project submenu -------------------- */
589    
590    item = gtk_menu_item_new_with_label( _("Project") );    GtkAccelGroup *accel_grp = gtk_accel_group_new();
591    gtk_menu_append(GTK_MENU_SHELL(menu), item);    item = gtk_menu_item_new_with_mnemonic( _("_Project") );
592      gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
593    submenu = gtk_menu_new();    submenu = gtk_menu_new();
594      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
595    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
596    #ifdef UISPECIFIC_MAIN_MENU_IS_MENU_BAR
597      about_quit_items_menu = submenu;
598    #endif
599    
600    item = gtk_menu_item_new_with_label( _("Open...") );    menu_append_new_item(
601    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_open), _("_Open..."),
602    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_project_open),      GTK_STOCK_OPEN, "<OSM2Go-Main>/Project/Open",
603                     appdata);      0, 0, TRUE, FALSE, FALSE
604      );
605    appdata->menu_item_project_close = item =  
606      gtk_menu_item_new_with_label( _("Close") );    appdata->menu_item_project_close = menu_append_new_item(
607    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_close), _("_Close"),
608    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_project_close),      GTK_STOCK_CLOSE, "<OSM2Go-Main>/Project/Close",
609                     appdata);      0, 0, TRUE, FALSE, FALSE
610      );
611    
612    /* --------------- view menu ------------------- */    /* --------------- view menu ------------------- */
613    
614    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());  #ifndef UISPECIFIC_MAIN_MENU_IS_MENU_BAR
615      gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
616    #endif
617    
618    appdata->menu_view = item =    appdata->menu_view = item = gtk_menu_item_new_with_mnemonic( _("_View") );
619      gtk_menu_item_new_with_label( _("View") );    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
   gtk_menu_append(GTK_MENU_SHELL(menu), item);  
620    submenu = gtk_menu_new();    submenu = gtk_menu_new();
621      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
622    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
623    
624    appdata->menu_item_view_fullscreen =    appdata->menu_item_view_fullscreen = menu_append_new_item(
625      item = gtk_check_menu_item_new_with_label( _("Fullscreen") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_fullscreen), _("_Fullscreen"),
626    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      GTK_STOCK_FULLSCREEN, "<OSM2Go-Main>/View/Fullscreen",
627    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_fullscreen),      0, 0, TRUE, TRUE, FALSE
628                     appdata);    );
629    
630    item = gtk_menu_item_new_with_label( _("Zoom +" ));    menu_append_new_item(
631    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),
632    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_zoomin), appdata);      GTK_STOCK_ZOOM_IN, "<OSM2Go-Main>/View/ZoomIn",
633        GDK_comma, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
634    item = gtk_menu_item_new_with_label( _("Zoom -") );    );
635    gtk_menu_append(GTK_MENU_SHELL(submenu), item);  
636    g_signal_connect(item, "activate",    menu_append_new_item(
637                     GTK_SIGNAL_FUNC(cb_menu_zoomout), appdata);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomout), _("Zoom _out"),
638        GTK_STOCK_ZOOM_OUT, "<OSM2Go-Main>/View/ZoomOut",
639        GDK_period, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
640      );
641    
642    /* -------------------- OSM submenu -------------------- */    /* -------------------- OSM submenu -------------------- */
643    
644    appdata->menu_osm = item = gtk_menu_item_new_with_label( _("OSM") );    appdata->menu_osm = item = gtk_menu_item_new_with_mnemonic( _("_OSM") );
645    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
646    submenu = gtk_menu_new();    submenu = gtk_menu_new();
647      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
648    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
649    
650    appdata->menu_item_osm_upload = item =    appdata->menu_item_osm_upload = menu_append_new_item(
651      gtk_menu_item_new_with_label( _("Upload...") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload..."),
652    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      "upload.16", "<OSM2Go-Main>/OSM/Upload",
653    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_upload), appdata);      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
654      );
655    item = gtk_menu_item_new_with_label( _("Download...") );  
656    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    menu_append_new_item(
657    g_signal_connect(item, "activate",      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download..."),
658                     GTK_SIGNAL_FUNC(cb_menu_download), appdata);      "download.16", "<OSM2Go-Main>/OSM/Download",
659        GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
660    gtk_menu_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());    );
661    
662    appdata->menu_item_osm_diff = item =    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
663      gtk_menu_item_new_with_label( _("Save diff file") );  
664    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    if(getenv("OSM2GO_UNDO_TEST")) {
665    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_save_changes),      appdata->menu_item_osm_undo = menu_append_new_item(
666                     appdata);                 appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo), _("_Undo"),
667                   GTK_STOCK_UNDO, "<OSM2Go-Main>/OSM/Undo",
668    appdata->menu_item_osm_undo_changes = item =                 GDK_z, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
669      gtk_menu_item_new_with_label( _("Undo all changes...") );                 );
670    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    } else
671    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_undo_changes),      printf("set environment variable OSM2GO_UNDO_TEST to enable undo framework tests\n");
672                     appdata);  
673      appdata->menu_item_osm_save_changes = menu_append_new_item(
674        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),
675        GTK_STOCK_SAVE, "<OSM2Go-Main>/OSM/SaveChanges",
676        GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
677      );
678    
679      appdata->menu_item_osm_undo_changes = menu_append_new_item(
680        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo_changes), _("Disca_rd local changes..."),
681        GTK_STOCK_DELETE, "<OSM2Go-Main>/OSM/DiscardChanges",
682        0, 0, TRUE, FALSE, FALSE
683      );
684    
685      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
686      appdata->menu_item_osm_relations = menu_append_new_item(
687        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations..."),
688        NULL, "<OSM2Go-Main>/OSM/Relations",
689        GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
690      );
691    
692    /* -------------------- wms submenu -------------------- */    /* -------------------- wms submenu -------------------- */
693    
694    appdata->menu_wms = item = gtk_menu_item_new_with_label( _("WMS") );    appdata->menu_wms = item = gtk_menu_item_new_with_mnemonic( _("_WMS") );
695    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
696    submenu = gtk_menu_new();    submenu = gtk_menu_new();
697      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
698    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
699    
700    item = gtk_menu_item_new_with_label( _("Import...") );    menu_append_new_item(
701    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_import), _("_Import..."),
702    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_wms_import),      GTK_STOCK_INDEX, "<OSM2Go-Main>/WMS/Import",
703                     appdata);      0, 0, TRUE, FALSE, FALSE
704      );
705    appdata->menu_item_wms_clear = item =  
706      gtk_menu_item_new_with_label( _("Clear") );    appdata->menu_item_wms_clear = menu_append_new_item(
707    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_clear), _("_Clear"),
708    gtk_widget_set_sensitive(item, FALSE);      GTK_STOCK_CLEAR, "<OSM2Go-Main>/WMS/Clear",
709    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_wms_clear),      0, 0, TRUE, FALSE, FALSE
710                     appdata);    );
711      gtk_widget_set_sensitive(appdata->menu_item_wms_clear, FALSE);
712    appdata->menu_item_wms_adjust = item =  
713      gtk_menu_item_new_with_label( _("Adjust") );    appdata->menu_item_wms_adjust = menu_append_new_item(
714    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_adjust), _("_Adjust"),
715    gtk_widget_set_sensitive(item, FALSE);      NULL, "<OSM2Go-Main>/WMS/Adjust",
716    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_wms_adjust),      0, 0, TRUE, FALSE, FALSE
717                     appdata);    );
718      gtk_widget_set_sensitive(appdata->menu_item_wms_adjust, FALSE);
719    
720    /* -------------------- map submenu -------------------- */    /* -------------------- map submenu -------------------- */
721    
722    appdata->menu_map = item = gtk_menu_item_new_with_label( _("Map") );    appdata->menu_map = item = gtk_menu_item_new_with_mnemonic( _("_Map") );
723    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
724    submenu = gtk_menu_new();    submenu = gtk_menu_new();
725      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
726    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
727    
728    appdata->menu_item_map_hide_sel = item =    appdata->menu_item_map_hide_sel = menu_append_new_item(
729      gtk_menu_item_new_with_label( _("Hide selected") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_hide_sel), _("_Hide selected"),
730    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      GTK_STOCK_REMOVE, "<OSM2Go-Main>/Map/HideSelected",
731    gtk_widget_set_sensitive(item, FALSE);      0, 0, TRUE, FALSE, FALSE
732    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_map_hide_sel),    );
733                     appdata);    gtk_widget_set_sensitive(appdata->menu_item_map_hide_sel, FALSE);
734    
735      appdata->menu_item_map_show_all = menu_append_new_item(
736        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_show_all), _("_Show all"),
737        GTK_STOCK_ADD, "<OSM2Go-Main>/Map/ShowAll",
738        0, 0, TRUE, FALSE, FALSE
739      );
740      gtk_widget_set_sensitive(appdata->menu_item_map_show_all, FALSE);
741    
742      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
743    
744      menu_append_new_item(
745        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_style), _("St_yle..."),
746        GTK_STOCK_SELECT_COLOR, "<OSM2Go-Main>/Map/Style",
747        0, 0, TRUE, FALSE, FALSE
748      );
749    
750    appdata->menu_item_map_show_all = item =    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
     gtk_menu_item_new_with_label( _("Show all") );  
   gtk_menu_append(GTK_MENU_SHELL(submenu), item);  
   gtk_widget_set_sensitive(item, FALSE);  
   g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_map_show_all),  
                    appdata);  
   
   gtk_menu_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());  
   
   item = gtk_menu_item_new_with_label( _("Style...") );  
   gtk_menu_append(GTK_MENU_SHELL(submenu), item);  
   g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_style), appdata);  
   
   gtk_menu_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());  
751    
752    /* switches mainly intended for testing/debugging */    /* switches mainly intended for testing/debugging */
753    item = gtk_menu_item_new_with_label( _("Redraw") );    menu_append_new_item(
754    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_redraw), _("_Redraw"),
755    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_redraw), appdata);      NULL, "<OSM2Go-Main>/Map/Redraw",
756        GDK_r, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
757    appdata->menu_item_map_no_icons =    );
758      item = gtk_check_menu_item_new_with_label( _("No Icons") );  
759    gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item),    appdata->menu_item_map_no_icons = menu_append_new_item(
760                                   appdata->settings->no_icons);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_icons), _("No _icons"),
761    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      NULL, "<OSM2Go-Main>/Map/NoIcons",
762    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_map_no_icons),      0, 0, TRUE, TRUE, appdata->settings->no_icons
763                     appdata);    );
764    
765    appdata->menu_item_map_no_antialias =    appdata->menu_item_map_no_antialias = menu_append_new_item(
766      item = gtk_check_menu_item_new_with_label( _("No Antialias") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_antialias),
767    gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item),      _("No _antialias"),
768                                   appdata->settings->no_antialias);      NULL, "<OSM2Go-Main>/Map/NoAntialias",
769    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      0, 0, TRUE, TRUE, appdata->settings->no_antialias
770    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_map_no_antialias),    );
                    appdata);  
771    
772    /* -------------------- track submenu -------------------- */    /* -------------------- track submenu -------------------- */
773    
774    appdata->track.menu_track = item = gtk_menu_item_new_with_label(_("Track"));    appdata->track.menu_track = item = gtk_menu_item_new_with_mnemonic(_("_Track"));
775    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
776    submenu = gtk_menu_new();    submenu = gtk_menu_new();
777      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
778    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
779    
780    appdata->track.menu_item_import =    appdata->track.menu_item_import = menu_append_new_item(
781      item = gtk_menu_item_new_with_label( _("Import...") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import..."),
782    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      NULL, "<OSM2Go-Main>/Track/Import",
783    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_track_import),      0, 0, TRUE, FALSE, FALSE
784                     appdata);    );
785    
786    appdata->track.menu_item_export =    appdata->track.menu_item_export = menu_append_new_item(
787      item = gtk_menu_item_new_with_label( _("Export...") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export..."),
788    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      NULL, "<OSM2Go-Main>/Track/Export",
789    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_track_export),      0, 0, FALSE, FALSE, FALSE
790                     appdata);    );
791    
792    appdata->track.menu_item_clear =    appdata->track.menu_item_clear = menu_append_new_item(
793      item = gtk_menu_item_new_with_label( _("Clear") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_clear), _("_Clear"),
794    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      GTK_STOCK_CLEAR, "<OSM2Go-Main>/Track/Clear",
795    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_track_clear),      0, 0, FALSE, FALSE, FALSE
796                     appdata);    );
797    
798    appdata->track.menu_item_gps =  
799      item = gtk_check_menu_item_new_with_label( _("GPS") );    appdata->track.menu_item_enable_gps = menu_append_new_item(
800    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_enable_gps),_("_GPS enable"),
801    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_track_gps),      NULL, "<OSM2Go-Main>/Track/GPS",
802                     appdata);      GDK_g, GDK_CONTROL_MASK|GDK_SHIFT_MASK, TRUE, TRUE,
803        appdata->settings->enable_gps
804      );
805    
806      appdata->track.menu_item_follow_gps = menu_append_new_item(
807        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_follow_gps), _("GPS follow"),
808        NULL, "<OSM2Go-Main>/Track/Follow",
809        0, 0, appdata->settings->enable_gps, TRUE,
810        appdata->settings->follow_gps
811      );
812    
813    /* ------------------------------------------------------- */    /* ------------------------------------------------------- */
814    
815    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_shell_append(GTK_MENU_SHELL(about_quit_items_menu),
816                            gtk_separator_menu_item_new());
817    
818    item = gtk_menu_item_new_with_label( _("About...") );    menu_append_new_item(
819    gtk_menu_append(GTK_MENU_SHELL(menu), item);      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_about), _("_About..."),
820    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);      GTK_STOCK_ABOUT, "<OSM2Go-Main>/About",
821        0, 0, TRUE, FALSE, FALSE
822      );
823    
824      menu_append_new_item(
825        appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_quit), _("_Quit"),
826        GTK_STOCK_QUIT, "<OSM2Go-Main>/Quit",
827        0, 0, TRUE, FALSE, FALSE
828      );
829    
830      gtk_window_add_accel_group(GTK_WINDOW(appdata->window), accel_grp);
   item = gtk_menu_item_new_with_label( _("Quit") );  
   gtk_menu_append(GTK_MENU_SHELL(menu), item);  
   g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_quit), appdata);  
831    
832  #ifdef USE_HILDON  #ifdef USE_HILDON
833    hildon_window_set_menu(appdata->window, GTK_MENU(menu));    hildon_window_set_menu(appdata->window, GTK_MENU(menu));
834  #else  #else
835    /* attach ordinary gtk menu */    GtkWidget *menu_bar = menu;
836    GtkWidget *menu_bar = gtk_menu_bar_new();  
837    #ifndef UISPECIFIC_MAIN_MENU_IS_MENU_BAR
838      // we need to make one first
839      menu_bar = gtk_menu_bar_new();
840    
841    GtkWidget *root_menu = gtk_menu_item_new_with_label (_("Menu"));    GtkWidget *root_menu = gtk_menu_item_new_with_label (_("Menu"));
842    gtk_widget_show(root_menu);    gtk_widget_show(root_menu);
# Line 589  void menu_create(appdata_t *appdata) { Line 845  void menu_create(appdata_t *appdata) {
845    gtk_menu_item_set_submenu(GTK_MENU_ITEM (root_menu), menu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM (root_menu), menu);
846    
847    gtk_widget_show(menu_bar);    gtk_widget_show(menu_bar);
848    #endif //UISPECIFIC_MAIN_MENU_IS_MENU_BAR
849    
850    gtk_box_pack_start(GTK_BOX(appdata->vbox), menu_bar, 0, 0, 0);    gtk_box_pack_start(GTK_BOX(appdata->vbox), menu_bar, 0, 0, 0);
851  #endif  
852    #endif //USE_HILDON
853  }  }
854    
855  /********************* end of menu **********************/  /********************* end of menu **********************/
856    
857    #ifdef UISPECIFIC_MENU_HAS_ACCELS
858    #define ACCELS_FILE "accels"
859    
860    static void menu_accels_load(appdata_t *appdata) {
861      char *accels_file = g_strdup_printf("%s/" ACCELS_FILE,
862                                          appdata->settings->base_path);
863      gtk_accel_map_load(accels_file);
864      g_free(accels_file);
865    }
866    
867    static void menu_accels_save(appdata_t *appdata) {
868      char *accels_file = g_strdup_printf("%s" ACCELS_FILE,
869                                          appdata->settings->base_path);
870      gtk_accel_map_save(accels_file);
871      g_free(accels_file);
872    }
873    
874    #endif
875    
876    
877  void cleanup(appdata_t *appdata) {  void cleanup(appdata_t *appdata) {
878    #ifdef UISPECIFIC_MENU_HAS_ACCELS
879      menu_accels_save(appdata);
880    #endif
881    
882    settings_save(appdata->settings);    settings_save(appdata->settings);
883    
884  #ifdef USE_HILDON  #ifdef USE_HILDON
# Line 640  void cleanup(appdata_t *appdata) { Line 922  void cleanup(appdata_t *appdata) {
922    
923    project_free(appdata->project);    project_free(appdata->project);
924    
925      if(appdata->menu_item_osm_undo)
926        undo_free(appdata->undo.state);
927    
928    puts("everything is gone");    puts("everything is gone");
929  }  }
930    
# Line 704  int main(int argc, char *argv[]) { Line 989  int main(int argc, char *argv[]) {
989    
990    g_thread_init(NULL);    g_thread_init(NULL);
991    
   gps_init(&appdata);  
   
992    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
993    
994      gps_init(&appdata);
995    
996  #ifdef USE_HILDON  #ifdef USE_HILDON
997    printf("Installing osso context for \"org.harbaum." PACKAGE "\"\n");    printf("Installing osso context for \"org.harbaum." PACKAGE "\"\n");
998    appdata.osso_context = osso_initialize("org.harbaum."PACKAGE,    appdata.osso_context = osso_initialize("org.harbaum."PACKAGE,
# Line 748  int main(int argc, char *argv[]) { Line 1033  int main(int argc, char *argv[]) {
1033    
1034    appdata.vbox = gtk_vbox_new(FALSE,0);    appdata.vbox = gtk_vbox_new(FALSE,0);
1035    menu_create(&appdata);    menu_create(&appdata);
1036    #ifdef UISPECIFIC_MENU_HAS_ACCELS
1037      menu_accels_load(&appdata);
1038    #endif
1039    
1040    /* ----------------------- setup main window ---------------- */    /* ----------------------- setup main window ---------------- */
1041    
# Line 795  int main(int argc, char *argv[]) { Line 1083  int main(int argc, char *argv[]) {
1083    
1084    main_ui_enable(&appdata);    main_ui_enable(&appdata);
1085    
1086      /* start GPS if enabled by config */
1087      if(appdata.settings && appdata.settings->enable_gps)
1088        track_enable_gps(&appdata, TRUE);
1089    
1090    /* ------------ jump into main loop ---------------- */    /* ------------ jump into main loop ---------------- */
1091    
1092    gtk_main();    gtk_main();
# Line 802  int main(int argc, char *argv[]) { Line 1094  int main(int argc, char *argv[]) {
1094    puts("gtk_main() left");    puts("gtk_main() left");
1095    
1096    track_save(appdata.project, appdata.track.track);    track_save(appdata.project, appdata.track.track);
1097      track_clear(&appdata, appdata.track.track);
1098      appdata.track.track = NULL;
1099    
1100    /* save a diff if there are dirty entries */    /* save a diff if there are dirty entries */
1101    diff_save(appdata.project, appdata.osm);    diff_save(appdata.project, appdata.osm);
# Line 810  int main(int argc, char *argv[]) { Line 1104  int main(int argc, char *argv[]) {
1104    
1105    return 0;    return 0;
1106  }  }
1107    
1108    // vim:et:ts=8:sw=2:sts=2:ai
Legend:
Removed from v.24  
changed lines
  Added in v.156