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 143 by harbaum, Tue Mar 24 13:22:57 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->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 70  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 <andrewc-osm2go@piffle.org>",      "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 140  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 167  cb_menu_download(GtkWidget *window, gpoi Line 156  cb_menu_download(GtkWidget *window, gpoi
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 187  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 202  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 */
# Line 226  cb_menu_redraw(GtkWidget *window, gpoint Line 215  cb_menu_redraw(GtkWidget *window, gpoint
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...");    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..."    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...");    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..."    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);
# Line 265  cb_menu_save_changes(GtkWidget *widget, Line 261  cb_menu_save_changes(GtkWidget *widget,
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                 _("Discard local changes?"),                 _("Discard local changes?"),
269                 _("Throw away all the changes you've not uploaded yet? This can't be undone.")))                 _("Throw away all the changes you've not "
270                     "uploaded yet? This can't be undone.")))
271      return;      return;
272    
273    banner_busy_start(appdata, 1, _("Redrawing..."));    banner_busy_start(appdata, 1, _("Redrawing..."));
# Line 285  cb_menu_undo_changes(GtkWidget *widget, Line 282  cb_menu_undo_changes(GtkWidget *widget,
282  }  }
283    
284  static void  static void
285  cb_menu_fullscreen(GtkWidget *widget, gpointer data) {  cb_menu_osm_relations(GtkMenuItem *item, gpointer data) {
286      relation_list((appdata_t*)data);
287    }
288    
289    static void
290    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 303  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 311  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    
318    /* open a file selector */    /* open a file selector */
319    GtkWidget *dialog;    GtkWidget *dialog;
# Line 360  cb_menu_track_import(GtkWidget *window, Line 362  cb_menu_track_import(GtkWidget *window,
362  }  }
363    
364  static void  static void
365  cb_menu_track_gps(GtkWidget *window, gpointer data) {  cb_menu_track_gps(GtkMenuItem *item, gpointer data) {
366    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
367    
368    if(gtk_check_menu_item_get_active(    if(gtk_check_menu_item_get_active(
# Line 372  cb_menu_track_gps(GtkWidget *window, gpo Line 374  cb_menu_track_gps(GtkWidget *window, gpo
374  }  }
375    
376  static void  static void
377  cb_menu_track_export(GtkWidget *window, gpointer data) {  cb_menu_track_export(GtkMenuItem *item, gpointer data) {
378    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
379    messagef(GTK_WIDGET(appdata->window), _("NIY"),    messagef(GTK_WIDGET(appdata->window), _("NIY"),
380             _("Track export is not yet supported."));             _("Track export is not yet supported."));
381  }  }
382    
383  static void  static void
384  cb_menu_track_clear(GtkWidget *window, gpointer data) {  cb_menu_track_clear(GtkMenuItem *item, gpointer data) {
385    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
386    track_do(appdata, TRACK_NONE, NULL);    track_do(appdata, TRACK_NONE, NULL);
387  }  }
# Line 424  menu_append_new_item(appdata_t *appdata, Line 426  menu_append_new_item(appdata_t *appdata,
426                       GtkWidget *menu_shell,                       GtkWidget *menu_shell,
427                       GtkSignalFunc activate_cb,                       GtkSignalFunc activate_cb,
428                       char *label,                       char *label,
429                       const gchar *stock_id, // overridden by label, accels                       const gchar *icon_name, // stock id or name for icon_load
430                                        // overridden by label, accels, icon_name
431                       const gchar *accel_path,                       const gchar *accel_path,
432                       guint accel_key,      // from gdk/gdkkeysyms.h                       guint accel_key,      // from gdk/gdkkeysyms.h
433                       GdkModifierType accel_mods, // e.g. GDK_CONTROL_MASK                       GdkModifierType accel_mods, // e.g. GDK_CONTROL_MASK
434                       gboolean is_check, gboolean check_status)                       gboolean is_check, gboolean check_status)
435  {  {
436    GtkWidget *item = NULL;    GtkWidget *item = NULL;
437    GtkStockItem stock_item;    GtkWidget *image = NULL;
438    
439    gboolean stock_item_known = FALSE;    gboolean stock_item_known = FALSE;
440    if (stock_id != NULL) {    GtkStockItem stock_item;
441      stock_item_known = gtk_stock_lookup(stock_id, &stock_item);    if (icon_name != NULL) {
442        stock_item_known = gtk_stock_lookup(icon_name, &stock_item);
443    }    }
444    
445    // Icons    // Icons
# Line 442  menu_append_new_item(appdata_t *appdata, Line 447  menu_append_new_item(appdata_t *appdata,
447    item = is_check ? gtk_check_menu_item_new_with_mnemonic (label)    item = is_check ? gtk_check_menu_item_new_with_mnemonic (label)
448                    : gtk_menu_item_new_with_mnemonic       (label);                    : gtk_menu_item_new_with_mnemonic       (label);
449  #else  #else
450    if (is_check || !stock_item_known) {    if (is_check) {
451      item = is_check ? gtk_check_menu_item_new_with_mnemonic (label)      item = gtk_check_menu_item_new_with_mnemonic (label);
452                      : gtk_menu_item_new_with_mnemonic       (label);    }
453      else if (!stock_item_known) {
454        GdkPixbuf *pbuf = icon_load(&appdata->icon, icon_name);
455        if (pbuf) {
456          image = gtk_image_new_from_pixbuf(pbuf);
457        }
458        if (image) {
459          item = gtk_image_menu_item_new_with_mnemonic(label);
460          gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
461        }
462        else {
463          item = gtk_menu_item_new_with_mnemonic(label);
464        }
465    }    }
466    else {    else {
467      item = gtk_image_menu_item_new_with_mnemonic(label);      item = gtk_image_menu_item_new_with_mnemonic(label);
468      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);
469      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);
470    }    }
471  #endif  #endif
472    
# Line 515  void menu_create(appdata_t *appdata) { Line 532  void menu_create(appdata_t *appdata) {
532    
533    /* --------------- view menu ------------------- */    /* --------------- view menu ------------------- */
534    
535  #ifndef UISPECIFIC_MENU_IS_MENU_BAR  #ifndef UISPECIFIC_MAIN_MENU_IS_MENU_BAR
536    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());
537  #endif  #endif
538    
# Line 553  void menu_create(appdata_t *appdata) { Line 570  void menu_create(appdata_t *appdata) {
570    
571    appdata->menu_item_osm_upload = menu_append_new_item(    appdata->menu_item_osm_upload = menu_append_new_item(
572      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload..."),
573      NULL, "<OSM2Go-Main>/OSM/Upload",      "upload.16", "<OSM2Go-Main>/OSM/Upload",
574      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE
575    );    );
576    
577    menu_append_new_item(    menu_append_new_item(
578      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download..."),
579      NULL, "<OSM2Go-Main>/OSM/Download",      "download.16", "<OSM2Go-Main>/OSM/Download",
580      GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE      GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE
581    );    );
582    
583    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());
584    
585      if(getenv("OSM2GO_UNDO_TEST")) {
586        appdata->menu_item_osm_undo = menu_append_new_item(
587                   appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo), _("_Undo"),
588                   GTK_STOCK_UNDO, "<OSM2Go-Main>/OSM/Undo",
589                   GDK_z, GDK_CONTROL_MASK, FALSE, FALSE
590                   );
591      } else
592        printf("set environment variable OSM2GO_UNDO_TEST to enable undo framework tests\n");
593    
594    appdata->menu_item_osm_diff = menu_append_new_item(    appdata->menu_item_osm_save_changes = menu_append_new_item(
595      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),
596      GTK_STOCK_SAVE, "<OSM2Go-Main>/OSM/SaveChanges",      GTK_STOCK_SAVE, "<OSM2Go-Main>/OSM/SaveChanges",
597      GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE      GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE
# Line 578  void menu_create(appdata_t *appdata) { Line 603  void menu_create(appdata_t *appdata) {
603      0, 0, FALSE, FALSE      0, 0, FALSE, FALSE
604    );    );
605    
606      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
607      appdata->menu_item_osm_relations = menu_append_new_item(
608        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations..."),
609        NULL, "<OSM2Go-Main>/OSM/Relations",
610        GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE
611      );
612    
613    /* -------------------- wms submenu -------------------- */    /* -------------------- wms submenu -------------------- */
614    
615    appdata->menu_wms = item = gtk_menu_item_new_with_mnemonic( _("_WMS") );    appdata->menu_wms = item = gtk_menu_item_new_with_mnemonic( _("_WMS") );
# Line 803  void cleanup(appdata_t *appdata) { Line 835  void cleanup(appdata_t *appdata) {
835    
836    project_free(appdata->project);    project_free(appdata->project);
837    
838    undo_free(appdata->undo_state);    if(appdata->menu_item_osm_undo)
839        undo_free(appdata->undo.state);
840    
841    puts("everything is gone");    puts("everything is gone");
842  }  }
# Line 869  int main(int argc, char *argv[]) { Line 902  int main(int argc, char *argv[]) {
902    
903    g_thread_init(NULL);    g_thread_init(NULL);
904    
   gps_init(&appdata);  
   
905    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
906    
907      gps_init(&appdata);
908    
909  #ifdef USE_HILDON  #ifdef USE_HILDON
910    printf("Installing osso context for \"org.harbaum." PACKAGE "\"\n");    printf("Installing osso context for \"org.harbaum." PACKAGE "\"\n");
911    appdata.osso_context = osso_initialize("org.harbaum."PACKAGE,    appdata.osso_context = osso_initialize("org.harbaum."PACKAGE,
# Line 970  int main(int argc, char *argv[]) { Line 1003  int main(int argc, char *argv[]) {
1003    puts("gtk_main() left");    puts("gtk_main() left");
1004    
1005    track_save(appdata.project, appdata.track.track);    track_save(appdata.project, appdata.track.track);
1006      track_clear(&appdata, appdata.track.track);
1007    
1008    /* save a diff if there are dirty entries */    /* save a diff if there are dirty entries */
1009    diff_save(appdata.project, appdata.osm);    diff_save(appdata.project, appdata.osm);
Legend:
Removed from v.55  
changed lines
  Added in v.143