Diff of /trunk/src/main.c

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

revision 22 by harbaum, Wed Dec 17 16:43:46 2008 UTC revision 139 by harbaum, Sun Mar 22 20:08:20 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        "Андрей Жилин <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));                          "program-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;
227    
228      banner_busy_start(appdata, 1, "Redrawing...");
229      map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
230      appdata->settings->no_icons = gtk_check_menu_item_get_active(item);
231      map_paint(appdata);
232      banner_busy_stop(appdata); //"Redrawing..."
233    }
234    
235    static void
236    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_icons =    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    statusbar_set(appdata, _("All changes made "    banner_show_info(appdata, _("Discarded local changes"));
                            "so far have been reset"), FALSE);  
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 285  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 293  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 342  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 354  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  }  }
388    
389    
390    
391    
392    /*
393     *  Platform-specific UI tweaks.
394     */
395    
396    
397    #ifndef USE_HILDON
398    #ifdef PORTRAIT
399    
400    // Portrait mode, for openmoko-like systems
401    #define uispecific_main_menu_new gtk_menu_new
402    
403    #else
404    
405    // Regular desktop builds
406    #define uispecific_main_menu_new gtk_menu_bar_new
407    #define UISPECIFIC_MAIN_MENU_IS_MENU_BAR
408    #define UISPECIFIC_MENU_HAS_ICONS
409    #define UISPECIFIC_MENU_HAS_ACCELS
410    
411    #endif //PORTRAIT
412    #else//USE_HILDON
413    
414    // Maemo/Hildon builds
415    #define uispecific_main_menu_new gtk_menu_new
416    
417    #endif
418    
419    
420    
421    // Half-arsed slapdash common menu item constructor. Let's use GtkBuilder
422    // instead so we have some flexibility.
423    
424    static GtkWidget *
425    menu_append_new_item(appdata_t *appdata,
426                         GtkWidget *menu_shell,
427                         GtkSignalFunc activate_cb,
428                         char *label,
429                         const gchar *icon_name, // stock id or name for icon_load
430                                        // overridden by label, accels, icon_name
431                         const gchar *accel_path,
432                         guint accel_key,      // from gdk/gdkkeysyms.h
433                         GdkModifierType accel_mods, // e.g. GDK_CONTROL_MASK
434                         gboolean is_check, gboolean check_status)
435    {
436      GtkWidget *item = NULL;
437      GtkWidget *image = NULL;
438    
439      gboolean stock_item_known = FALSE;
440      GtkStockItem stock_item;
441      if (icon_name != NULL) {
442        stock_item_known = gtk_stock_lookup(icon_name, &stock_item);
443      }
444    
445      // Icons
446    #ifndef UISPECIFIC_MENU_HAS_ICONS
447      item = is_check ? gtk_check_menu_item_new_with_mnemonic (label)
448                      : gtk_menu_item_new_with_mnemonic       (label);
449    #else
450      if (is_check) {
451        item = gtk_check_menu_item_new_with_mnemonic (label);
452      }
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 {
467        item = gtk_image_menu_item_new_with_mnemonic(label);
468        image = gtk_image_new_from_stock(icon_name, GTK_ICON_SIZE_MENU);
469        gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
470      }
471    #endif
472    
473    #ifdef UISPECIFIC_MENU_HAS_ACCELS
474      // Accelerators
475      // Default
476      if (accel_path != NULL) {
477        gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
478        if (accel_key != 0) {
479          gtk_accel_map_add_entry( accel_path, accel_key, accel_mods );
480        }
481        else if (stock_item_known) {
482          gtk_accel_map_add_entry( accel_path, stock_item.keyval,
483                                   stock_item.modifier );
484        }
485      }
486    #endif
487    
488      gtk_menu_shell_append(GTK_MENU_SHELL(menu_shell), GTK_WIDGET(item));
489      if (is_check) {
490        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), check_status);
491      }
492      g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(activate_cb),
493                       appdata);
494      return item;
495    }
496    
497    
498  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
499    GtkWidget *menu, *item, *submenu;    GtkWidget *menu, *item, *submenu;
500    menu = gtk_menu_new();    GtkWidget *about_quit_items_menu;
501    
502      if (g_module_supported()) {
503        printf("*** can use GModule: consider using GtkUIManager / GtkBuilder\n");
504      }
505    
506      menu = uispecific_main_menu_new();
507      about_quit_items_menu = menu;
508    
509    /* -------------------- Project submenu -------------------- */    /* -------------------- Project submenu -------------------- */
510    
511    item = gtk_menu_item_new_with_label( _("Project") );    GtkAccelGroup *accel_grp = gtk_accel_group_new();
512    gtk_menu_append(GTK_MENU_SHELL(menu), item);    item = gtk_menu_item_new_with_mnemonic( _("_Project") );
513      gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
514    submenu = gtk_menu_new();    submenu = gtk_menu_new();
515      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
516    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
517    #ifdef UISPECIFIC_MAIN_MENU_IS_MENU_BAR
518      about_quit_items_menu = submenu;
519    #endif
520    
521    item = gtk_menu_item_new_with_label( _("Open...") );    menu_append_new_item(
522    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_open), _("_Open..."),
523    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_project_open),      GTK_STOCK_OPEN, "<OSM2Go-Main>/Project/Open",
524                     appdata);      0, 0, FALSE, FALSE
525      );
526    appdata->menu_item_project_close = item =  
527      gtk_menu_item_new_with_label( _("Close") );    appdata->menu_item_project_close = menu_append_new_item(
528    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_close), _("_Close"),
529    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_project_close),      GTK_STOCK_CLOSE, "<OSM2Go-Main>/Project/Close",
530                     appdata);      0, 0, FALSE, FALSE
531      );
532    
533    /* --------------- view menu ------------------- */    /* --------------- view menu ------------------- */
534    
535    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());  #ifndef UISPECIFIC_MAIN_MENU_IS_MENU_BAR
536      gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
537    #endif
538    
539    appdata->menu_view = item =    appdata->menu_view = item = gtk_menu_item_new_with_mnemonic( _("_View") );
540      gtk_menu_item_new_with_label( _("View") );    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
   gtk_menu_append(GTK_MENU_SHELL(menu), item);  
541    submenu = gtk_menu_new();    submenu = gtk_menu_new();
542      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
543    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
544    
545    appdata->menu_item_view_fullscreen =    appdata->menu_item_view_fullscreen = menu_append_new_item(
546      item = gtk_check_menu_item_new_with_label( _("Fullscreen") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_fullscreen), _("_Fullscreen"),
547    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      GTK_STOCK_FULLSCREEN, "<OSM2Go-Main>/View/Fullscreen",
548    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_fullscreen),      0, 0, TRUE, FALSE
549                     appdata);    );
550    
551    item = gtk_menu_item_new_with_label( _("Zoom +" ));    menu_append_new_item(
552    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),
553    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_zoomin), appdata);      GTK_STOCK_ZOOM_IN, "<OSM2Go-Main>/View/ZoomIn",
554        GDK_comma, GDK_CONTROL_MASK, FALSE, FALSE
555    item = gtk_menu_item_new_with_label( _("Zoom -") );    );
556    gtk_menu_append(GTK_MENU_SHELL(submenu), item);  
557    g_signal_connect(item, "activate",    menu_append_new_item(
558                     GTK_SIGNAL_FUNC(cb_menu_zoomout), appdata);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomout), _("Zoom _out"),
559        GTK_STOCK_ZOOM_OUT, "<OSM2Go-Main>/View/ZoomOut",
560        GDK_period, GDK_CONTROL_MASK, FALSE, FALSE
561      );
562    
563    /* -------------------- OSM submenu -------------------- */    /* -------------------- OSM submenu -------------------- */
564    
565    appdata->menu_osm = item = gtk_menu_item_new_with_label( _("OSM") );    appdata->menu_osm = item = gtk_menu_item_new_with_mnemonic( _("_OSM") );
566    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
567    submenu = gtk_menu_new();    submenu = gtk_menu_new();
568      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
569    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
570    
571    appdata->menu_item_osm_upload = item =    appdata->menu_item_osm_upload = menu_append_new_item(
572      gtk_menu_item_new_with_label( _("Upload...") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload..."),
573    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      "upload.16", "<OSM2Go-Main>/OSM/Upload",
574    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_upload), appdata);      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE
575      );
576    item = gtk_menu_item_new_with_label( _("Download...") );  
577    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    menu_append_new_item(
578    g_signal_connect(item, "activate",      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download..."),
579                     GTK_SIGNAL_FUNC(cb_menu_download), appdata);      "download.16", "<OSM2Go-Main>/OSM/Download",
580        GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE
581    gtk_menu_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());    );
582    
583    appdata->menu_item_osm_diff = item =    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
584      gtk_menu_item_new_with_label( _("Save diff file") );  
585    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    if(getenv("OSM2GO_UNDO_TEST")) {
586    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_save_changes),      appdata->menu_item_osm_undo = menu_append_new_item(
587                     appdata);                 appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo), _("_Undo"),
588                   GTK_STOCK_UNDO, "<OSM2Go-Main>/OSM/Undo",
589    appdata->menu_item_osm_undo_changes = item =                 GDK_z, GDK_CONTROL_MASK, FALSE, FALSE
590      gtk_menu_item_new_with_label( _("Undo all changes...") );                 );
591    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    } else
592    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");
593                     appdata);  
594      appdata->menu_item_osm_save_changes = menu_append_new_item(
595        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),
596        GTK_STOCK_SAVE, "<OSM2Go-Main>/OSM/SaveChanges",
597        GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE
598      );
599    
600      appdata->menu_item_osm_undo_changes = menu_append_new_item(
601        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo_changes), _("Disca_rd local changes..."),
602        GTK_STOCK_DELETE, "<OSM2Go-Main>/OSM/DiscardChanges",
603        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_label( _("WMS") );    appdata->menu_wms = item = gtk_menu_item_new_with_mnemonic( _("_WMS") );
616    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
617    submenu = gtk_menu_new();    submenu = gtk_menu_new();
618      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
619    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
620    
621    item = gtk_menu_item_new_with_label( _("Import...") );    menu_append_new_item(
622    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_import), _("_Import..."),
623    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_wms_import),      GTK_STOCK_INDEX, "<OSM2Go-Main>/WMS/Import",
624                     appdata);      0, 0, FALSE, FALSE
625      );
626    appdata->menu_item_wms_clear = item =  
627      gtk_menu_item_new_with_label( _("Clear") );    appdata->menu_item_wms_clear = menu_append_new_item(
628    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_clear), _("_Clear"),
629    gtk_widget_set_sensitive(item, FALSE);      GTK_STOCK_CLEAR, "<OSM2Go-Main>/WMS/Clear",
630    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_wms_clear),      0, 0, FALSE, FALSE
631                     appdata);    );
632      gtk_widget_set_sensitive(appdata->menu_item_wms_clear, FALSE);
633    appdata->menu_item_wms_adjust = item =  
634      gtk_menu_item_new_with_label( _("Adjust") );    appdata->menu_item_wms_adjust = menu_append_new_item(
635    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_adjust), _("_Adjust"),
636    gtk_widget_set_sensitive(item, FALSE);      NULL, "<OSM2Go-Main>/WMS/Adjust",
637    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_wms_adjust),      0, 0, FALSE, FALSE
638                     appdata);    );
639      gtk_widget_set_sensitive(appdata->menu_item_wms_adjust, FALSE);
640    
641    /* -------------------- map submenu -------------------- */    /* -------------------- map submenu -------------------- */
642    
643    appdata->menu_map = item = gtk_menu_item_new_with_label( _("Map") );    appdata->menu_map = item = gtk_menu_item_new_with_mnemonic( _("_Map") );
644    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
645    submenu = gtk_menu_new();    submenu = gtk_menu_new();
646      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
647    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
648    
649    appdata->menu_item_map_hide_sel = item =    appdata->menu_item_map_hide_sel = menu_append_new_item(
650      gtk_menu_item_new_with_label( _("Hide selected") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_hide_sel), _("_Hide selected"),
651    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      GTK_STOCK_REMOVE, "<OSM2Go-Main>/Map/HideSelected",
652    gtk_widget_set_sensitive(item, FALSE);      0, 0, FALSE, FALSE
653    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_map_hide_sel),    );
654                     appdata);    gtk_widget_set_sensitive(appdata->menu_item_map_hide_sel, FALSE);
655    
656    appdata->menu_item_map_show_all = item =    appdata->menu_item_map_show_all = menu_append_new_item(
657      gtk_menu_item_new_with_label( _("Show all") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_show_all), _("_Show all"),
658    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      GTK_STOCK_ADD, "<OSM2Go-Main>/Map/ShowAll",
659    gtk_widget_set_sensitive(item, FALSE);      0, 0, FALSE, FALSE
660    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_map_show_all),    );
661                     appdata);    gtk_widget_set_sensitive(appdata->menu_item_map_show_all, FALSE);
662    
663    gtk_menu_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
664    
665    item = gtk_menu_item_new_with_label( _("Redraw") );    menu_append_new_item(
666    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_style), _("St_yle..."),
667    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_redraw), appdata);      GTK_STOCK_SELECT_COLOR, "<OSM2Go-Main>/Map/Style",
668        0, 0, FALSE, FALSE
669    gtk_menu_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());    );
670    
671    item = gtk_menu_item_new_with_label( _("Style...") );    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
672    gtk_menu_append(GTK_MENU_SHELL(submenu), item);  
673    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_style), appdata);    /* switches mainly intended for testing/debugging */
674      menu_append_new_item(
675    appdata->menu_item_map_no_icons =      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_redraw), _("_Redraw"),
676      item = gtk_check_menu_item_new_with_label( _("No Icons") );      NULL, "<OSM2Go-Main>/Map/Redraw",
677    gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item),      GDK_r, GDK_CONTROL_MASK, FALSE, FALSE
678                                   appdata->settings->no_icons);    );
679    gtk_menu_append(GTK_MENU_SHELL(submenu), item);  
680    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_map_no_icons),    appdata->menu_item_map_no_icons = menu_append_new_item(
681                     appdata);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_icons), _("No _icons"),
682        NULL, "<OSM2Go-Main>/Map/NoIcons",
683        0, 0, TRUE, appdata->settings->no_icons
684      );
685    
686      appdata->menu_item_map_no_antialias = menu_append_new_item(
687        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_antialias),
688        _("No _antialias"),
689        NULL, "<OSM2Go-Main>/Map/NoAntialias",
690        0, 0, TRUE, appdata->settings->no_antialias
691      );
692    
693    /* -------------------- track submenu -------------------- */    /* -------------------- track submenu -------------------- */
694    
695    appdata->track.menu_track = item = gtk_menu_item_new_with_label(_("Track"));    appdata->track.menu_track = item = gtk_menu_item_new_with_mnemonic(_("_Track"));
696    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
697    submenu = gtk_menu_new();    submenu = gtk_menu_new();
698      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
699    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
700    
701    appdata->track.menu_item_import =    appdata->track.menu_item_import = menu_append_new_item(
702      item = gtk_menu_item_new_with_label( _("Import...") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import..."),
703    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      NULL, "<OSM2Go-Main>/Track/Import",
704    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_track_import),      0, 0, FALSE, FALSE
705                     appdata);    );
706    
707    appdata->track.menu_item_export =    appdata->track.menu_item_export = menu_append_new_item(
708      item = gtk_menu_item_new_with_label( _("Export...") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export..."),
709    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      NULL, "<OSM2Go-Main>/Track/Export",
710    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_track_export),      0, 0, FALSE, FALSE
711                     appdata);    );
712    
713    appdata->track.menu_item_clear =    appdata->track.menu_item_clear = menu_append_new_item(
714      item = gtk_menu_item_new_with_label( _("Clear") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_clear), _("_Clear"),
715    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      GTK_STOCK_CLEAR, "<OSM2Go-Main>/Track/Clear",
716    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_track_clear),      0, 0, FALSE, FALSE
717                     appdata);    );
718    
719    appdata->track.menu_item_gps =  
720      item = gtk_check_menu_item_new_with_label( _("GPS") );    appdata->track.menu_item_gps = menu_append_new_item(
721    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_gps), _("_GPS"),
722    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_track_gps),      NULL, "<OSM2Go-Main>/Track/GPS",
723                     appdata);      GDK_g, GDK_CONTROL_MASK|GDK_SHIFT_MASK, TRUE, FALSE
724      );
725    
726    /* ------------------------------------------------------- */    /* ------------------------------------------------------- */
727    
728    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_shell_append(GTK_MENU_SHELL(about_quit_items_menu),
729                            gtk_separator_menu_item_new());
730    
731    item = gtk_menu_item_new_with_label( _("About...") );    menu_append_new_item(
732    gtk_menu_append(GTK_MENU_SHELL(menu), item);      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_about), _("_About..."),
733    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);      GTK_STOCK_ABOUT, "<OSM2Go-Main>/About",
734        0, 0, FALSE, FALSE
735      );
736    
737      menu_append_new_item(
738        appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_quit), _("_Quit"),
739        GTK_STOCK_QUIT, "<OSM2Go-Main>/Quit",
740        0, 0, FALSE, FALSE
741      );
742    
743      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);  
744    
745  #ifdef USE_HILDON  #ifdef USE_HILDON
746    hildon_window_set_menu(appdata->window, GTK_MENU(menu));    hildon_window_set_menu(appdata->window, GTK_MENU(menu));
747  #else  #else
748    /* attach ordinary gtk menu */    GtkWidget *menu_bar = menu;
749    GtkWidget *menu_bar = gtk_menu_bar_new();  
750    #ifndef UISPECIFIC_MAIN_MENU_IS_MENU_BAR
751      // we need to make one first
752      menu_bar = gtk_menu_bar_new();
753    
754    GtkWidget *root_menu = gtk_menu_item_new_with_label (_("Menu"));    GtkWidget *root_menu = gtk_menu_item_new_with_label (_("Menu"));
755    gtk_widget_show(root_menu);    gtk_widget_show(root_menu);
# Line 570  void menu_create(appdata_t *appdata) { Line 758  void menu_create(appdata_t *appdata) {
758    gtk_menu_item_set_submenu(GTK_MENU_ITEM (root_menu), menu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM (root_menu), menu);
759    
760    gtk_widget_show(menu_bar);    gtk_widget_show(menu_bar);
761    #endif //UISPECIFIC_MAIN_MENU_IS_MENU_BAR
762    
763    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);
764  #endif  
765    #endif //USE_HILDON
766  }  }
767    
768  /********************* end of menu **********************/  /********************* end of menu **********************/
769    
770    #ifdef UISPECIFIC_MENU_HAS_ACCELS
771    #define ACCELS_FILE "accels"
772    
773    static void menu_accels_load(appdata_t *appdata) {
774      char *accels_file = g_strdup_printf("%s/" ACCELS_FILE,
775                                          appdata->settings->base_path);
776      gtk_accel_map_load(accels_file);
777      g_free(accels_file);
778    }
779    
780    static void menu_accels_save(appdata_t *appdata) {
781      char *accels_file = g_strdup_printf("%s" ACCELS_FILE,
782                                          appdata->settings->base_path);
783      gtk_accel_map_save(accels_file);
784      g_free(accels_file);
785    }
786    
787    #endif
788    
789    
790  void cleanup(appdata_t *appdata) {  void cleanup(appdata_t *appdata) {
791    #ifdef UISPECIFIC_MENU_HAS_ACCELS
792      menu_accels_save(appdata);
793    #endif
794    
795    settings_save(appdata->settings);    settings_save(appdata->settings);
796    
797  #ifdef USE_HILDON  #ifdef USE_HILDON
# Line 621  void cleanup(appdata_t *appdata) { Line 835  void cleanup(appdata_t *appdata) {
835    
836    project_free(appdata->project);    project_free(appdata->project);
837    
838      if(appdata->menu_item_osm_undo)
839        undo_free(appdata->undo.state);
840    
841    puts("everything is gone");    puts("everything is gone");
842  }  }
843    
# Line 685  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 729  int main(int argc, char *argv[]) { Line 946  int main(int argc, char *argv[]) {
946    
947    appdata.vbox = gtk_vbox_new(FALSE,0);    appdata.vbox = gtk_vbox_new(FALSE,0);
948    menu_create(&appdata);    menu_create(&appdata);
949    #ifdef UISPECIFIC_MENU_HAS_ACCELS
950      menu_accels_load(&appdata);
951    #endif
952    
953    /* ----------------------- setup main window ---------------- */    /* ----------------------- setup main window ---------------- */
954    
# Line 783  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);
# Line 791  int main(int argc, char *argv[]) { Line 1012  int main(int argc, char *argv[]) {
1012    
1013    return 0;    return 0;
1014  }  }
1015    
1016    // vim:et:ts=8:sw=2:sts=2:ai
Legend:
Removed from v.22  
changed lines
  Added in v.139