Diff of /trunk/src/main.c

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

revision 15 by harbaum, Tue Dec 16 17:00:20 2008 UTC revision 140 by harbaum, Sun Mar 22 20:25:14 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 19  Line 21 
21  #include <string.h>  #include <string.h>
22    
23  #include <curl/curl.h>  #include <curl/curl.h>
24    #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 54  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 68  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    #ifdef USE_HILDON
102    gtk_about_dialog_set_website(about,      /* cyrillic doesn't seem to work on hildon */
103         _("http://www.harbaum.org/till/maemo"));      "Andrew Zhilin <drew.zhilin@gmail.com>",
104    #else
105    gtk_about_dialog_set_comments(about,      "Андрей Жилин <drew.zhilin@gmail.com>",
106         _("Mobile OSM Editor"));  #endif
107        NULL };
108    
109    gtk_widget_show_all(GTK_WIDGET(about));    gtk_show_about_dialog(GTK_WINDOW(appdata->window),
110    gtk_dialog_run(GTK_DIALOG(about));                          "name", "OSM2Go",
111    gtk_widget_destroy(GTK_WIDGET(about));                          "version", VERSION,
112                            "copyright", _("Copyright 2008-2009"),
113                            "authors", authors,
114                            "artists", artists,
115                            "website", _("http://www.harbaum.org/till/maemo"),
116                            "comments", _("Mobile OSM Editor"),
117                            NULL);
118  }  }
119    
120  void on_window_destroy (GtkWidget *widget, gpointer data);  void on_window_destroy (GtkWidget *widget, gpointer data);
121    
122  static void  static void
123  cb_menu_quit(GtkWidget *window, gpointer data) {  cb_menu_quit(GtkMenuItem *item, gpointer data) {
124    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
125    gtk_widget_destroy(GTK_WIDGET(appdata->window));    gtk_widget_destroy(GTK_WIDGET(appdata->window));
126  }  }
127    
128  static void  static void
129  cb_menu_upload(GtkWidget *window, gpointer data) {  cb_menu_upload(GtkMenuItem *item, gpointer data) {
130    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
131    if(!appdata->osm || !appdata->project) return;    if(!appdata->osm || !appdata->project) return;
132    
# Line 138  cb_menu_upload(GtkWidget *window, gpoint Line 134  cb_menu_upload(GtkWidget *window, gpoint
134  }  }
135    
136  static void  static void
137  cb_menu_download(GtkWidget *window, gpointer data) {  cb_menu_download(GtkMenuItem *item, gpointer data) {
138    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
139    if(!appdata->project) return;    if(!appdata->project) return;
140    
# Line 154  cb_menu_download(GtkWidget *window, gpoi Line 150  cb_menu_download(GtkWidget *window, gpoi
150    
151    // download    // download
152    if(osm_download(GTK_WIDGET(appdata->window), appdata->project)) {    if(osm_download(GTK_WIDGET(appdata->window), appdata->project)) {
153        banner_busy_start(appdata, 1, "Redrawing...");
154      appdata->osm = osm_parse(appdata->project->osm);      appdata->osm = osm_parse(appdata->project->osm);
155      diff_restore(appdata, appdata->project, appdata->osm);      diff_restore(appdata, appdata->project, appdata->osm);
156      map_paint(appdata);      map_paint(appdata);
157        banner_busy_stop(appdata); //"Redrawing..."
158    }    }
159    
160    main_ui_enable(appdata);    main_ui_enable(appdata);
161  }  }
162    
163  static void  static void
164  cb_menu_wms_import(GtkWidget *window, gpointer data) {  cb_menu_wms_import(GtkMenuItem *item, gpointer data) {
165    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
166    wms_import(appdata);    wms_import(appdata);
167  }  }
168    
169  static void  static void
170  cb_menu_wms_clear(GtkWidget *window, gpointer data) {  cb_menu_wms_clear(GtkMenuItem *item, gpointer data) {
171    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
172    wms_remove(appdata);    wms_remove(appdata);
173  }  }
174    
175  static void  static void
176  cb_menu_wms_adjust(GtkWidget *window, gpointer data) {  cb_menu_wms_adjust(GtkMenuItem *item, gpointer data) {
177    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
178    map_action_set(appdata, MAP_ACTION_BG_ADJUST);    map_action_set(appdata, MAP_ACTION_BG_ADJUST);
179  }  }
# Line 183  cb_menu_wms_adjust(GtkWidget *window, gp Line 181  cb_menu_wms_adjust(GtkWidget *window, gp
181  /* ----------- hide objects for performance reasons ----------- */  /* ----------- hide objects for performance reasons ----------- */
182    
183  static void  static void
184  cb_menu_map_hide_sel(GtkWidget *window, gpointer data) {  cb_menu_map_hide_sel(GtkMenuItem *item, gpointer data) {
185    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
186    map_hide_selected(appdata);    map_hide_selected(appdata);
187  }  }
188    
189  static void  static void
190  cb_menu_map_show_all(GtkWidget *window, gpointer data) {  cb_menu_map_show_all(GtkMenuItem *item, gpointer data) {
191    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
192    map_show_all(appdata);    map_show_all(appdata);
193  }  }
# Line 198  cb_menu_map_show_all(GtkWidget *window, Line 196  cb_menu_map_show_all(GtkWidget *window,
196    
197  #if 1  // mainly for testing  #if 1  // mainly for testing
198  static void  static void
199  cb_menu_redraw(GtkWidget *window, gpointer data) {  cb_menu_redraw(GtkMenuItem *item, gpointer data) {
200    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
201    
202    /* redraw the entire map by destroying all map items and redrawing them */    /* redraw the entire map by destroying all map items and redrawing them */
203      banner_busy_start(appdata, 1, "Redrawing...");
204    track_save(appdata->project, appdata->track.track);    track_save(appdata->project, appdata->track.track);
205    diff_save(appdata->project, appdata->osm);    diff_save(appdata->project, appdata->osm);
206    map_clear(appdata, MAP_LAYER_ALL);    map_clear(appdata, MAP_LAYER_ALL);
# Line 216  cb_menu_redraw(GtkWidget *window, gpoint Line 215  cb_menu_redraw(GtkWidget *window, gpoint
215      map_track_draw(appdata->map, appdata->track.track);      map_track_draw(appdata->map, appdata->track.track);
216    
217    wms_load(appdata);    wms_load(appdata);
218      banner_busy_stop(appdata); //"Redrawing..."
219  }  }
220  #endif  #endif
221    
222  static void  static void
223  cb_menu_style(GtkWidget *widget, gpointer data) {  cb_menu_style(GtkMenuItem *item, gpointer data) {
224    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
225    
226    style_select(GTK_WIDGET(appdata->window), appdata);    style_select(GTK_WIDGET(appdata->window), appdata);
227  }  }
228    
229  static void  static void
230  cb_menu_map_no_icons(GtkWidget *widget, gpointer data) {  cb_menu_map_no_icons(GtkCheckMenuItem *item, gpointer data) {
231      appdata_t *appdata = (appdata_t*)data;
232    
233      banner_busy_start(appdata, 1, "Redrawing...");
234      map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
235      appdata->settings->no_icons = gtk_check_menu_item_get_active(item);
236      map_paint(appdata);
237      banner_busy_stop(appdata); //"Redrawing..."
238    }
239    
240    static void
241    cb_menu_map_no_antialias(GtkCheckMenuItem *item, gpointer data) {
242    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
243    
244      banner_busy_start(appdata, 1, "Redrawing...");
245    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
246    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));  
247    map_paint(appdata);    map_paint(appdata);
248      banner_busy_stop(appdata); //"Redrawing..."
249    }
250    
251    static void
252    cb_menu_undo(GtkMenuItem *item, gpointer data) {
253      appdata_t *appdata = (appdata_t*)data;
254    
255      undo(appdata);
256    
257      // the banner will be displayed from within undo with more details
258  }  }
259    
260  static void  static void
261  cb_menu_save_changes(GtkWidget *widget, gpointer data) {  cb_menu_save_changes(GtkMenuItem *item, gpointer data) {
262    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
263    
264    diff_save(appdata->project, appdata->osm);    diff_save(appdata->project, appdata->osm);
265    statusbar_set(appdata, _("Saved all changes made "    banner_show_info(appdata, _("Saved local changes"));
                            "to this project so far"), FALSE);  
266  }  }
267    
268  static void  static void
269  cb_menu_undo_changes(GtkWidget *widget, gpointer data) {  cb_menu_undo_changes(GtkMenuItem *item, gpointer data) {
270    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
271    
272    if(!yes_no_f(GTK_WIDGET(appdata->window), NULL, 0, 0,    if(!yes_no_f(GTK_WIDGET(appdata->window), NULL, 0, 0,
273                 _("Undo all changes?"),                 _("Discard local changes?"),
274                 _("Do you really want to undo all your changes "                 _("Throw away all the changes you've not "
275                   "not uploaded so far? This cannot be undone!")))                   "uploaded yet? This can't be undone.")))
276      return;      return;
277    
278      banner_busy_start(appdata, 1, _("Redrawing..."));
279    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
280    osm_free(&appdata->icon, appdata->osm);    osm_free(&appdata->icon, appdata->osm);
281    diff_remove(appdata->project);    diff_remove(appdata->project);
282    appdata->osm = osm_parse(appdata->project->osm);    appdata->osm = osm_parse(appdata->project->osm);
283    map_paint(appdata);    map_paint(appdata);
284      banner_busy_stop(appdata);  //"Redrawing..."
285    
286    statusbar_set(appdata, _("All changes made "    banner_show_info(appdata, _("Discarded local changes"));
                            "so far have been reset"), FALSE);  
287  }  }
288    
289    static void
290    cb_menu_osm_relations(GtkMenuItem *item, gpointer data) {
291      relation_list((appdata_t*)data);
292    }
293    
 #ifdef USE_HILDON  
294  static void  static void
295  cb_menu_fullscreen(GtkWidget *widget, gpointer data) {  cb_menu_fullscreen(GtkCheckMenuItem *item, gpointer data) {
296    appdata_t *appdata = (appdata_t *)data;    appdata_t *appdata = (appdata_t *)data;
297    
298    if(gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget)))    if(gtk_check_menu_item_get_active(item))
299      gtk_window_fullscreen(GTK_WINDOW(appdata->window));      gtk_window_fullscreen(GTK_WINDOW(appdata->window));
300    else    else
301      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));
302  }  }
 #endif  
303    
304  static void  static void
305  cb_menu_zoomin(GtkWidget *widget, appdata_t *appdata) {  cb_menu_zoomin(GtkMenuItem *item, appdata_t *appdata) {
306    if(!appdata || !appdata->map) return;    if(!appdata || !appdata->map) return;
307    
308    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 287  cb_menu_zoomin(GtkWidget *widget, appdat Line 310  cb_menu_zoomin(GtkWidget *widget, appdat
310  }  }
311    
312  static void  static void
313  cb_menu_zoomout(GtkWidget *widget, appdata_t *appdata) {  cb_menu_zoomout(GtkMenuItem *item, appdata_t *appdata) {
314    if(!appdata || !appdata->map) return;    if(!appdata || !appdata->map) return;
315    
316    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_zoomout(GtkWidget *widget, appda Line 318  cb_menu_zoomout(GtkWidget *widget, appda
318  }  }
319    
320  static void  static void
321  cb_menu_track_import(GtkWidget *window, appdata_t *appdata) {  cb_menu_track_import(GtkMenuItem *item, appdata_t *appdata) {
322    
323    /* open a file selector */    /* open a file selector */
324    GtkWidget *dialog;    GtkWidget *dialog;
# Line 344  cb_menu_track_import(GtkWidget *window, Line 367  cb_menu_track_import(GtkWidget *window,
367  }  }
368    
369  static void  static void
370  cb_menu_track_gps(GtkWidget *window, gpointer data) {  cb_menu_track_gps(GtkMenuItem *item, gpointer data) {
371    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
372    
373    if(gtk_check_menu_item_get_active(    if(gtk_check_menu_item_get_active(
# Line 356  cb_menu_track_gps(GtkWidget *window, gpo Line 379  cb_menu_track_gps(GtkWidget *window, gpo
379  }  }
380    
381  static void  static void
382  cb_menu_track_export(GtkWidget *window, gpointer data) {  cb_menu_track_export(GtkMenuItem *item, gpointer data) {
383    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
384    messagef(GTK_WIDGET(appdata->window), _("NIY"),    messagef(GTK_WIDGET(appdata->window), _("NIY"),
385             _("Track export is not yet supported."));             _("Track export is not yet supported."));
386  }  }
387    
388  static void  static void
389  cb_menu_track_clear(GtkWidget *window, gpointer data) {  cb_menu_track_clear(GtkMenuItem *item, gpointer data) {
390    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
391    track_do(appdata, TRACK_NONE, NULL);    track_do(appdata, TRACK_NONE, NULL);
392  }  }
393    
394    
395    
396    
397    /*
398     *  Platform-specific UI tweaks.
399     */
400    
401    
402    #ifndef USE_HILDON
403    #ifdef PORTRAIT
404    
405    // Portrait mode, for openmoko-like systems
406    #define uispecific_main_menu_new gtk_menu_new
407    
408    #else
409    
410    // Regular desktop builds
411    #define uispecific_main_menu_new gtk_menu_bar_new
412    #define UISPECIFIC_MAIN_MENU_IS_MENU_BAR
413    #define UISPECIFIC_MENU_HAS_ICONS
414    #define UISPECIFIC_MENU_HAS_ACCELS
415    
416    #endif //PORTRAIT
417    #else//USE_HILDON
418    
419    // Maemo/Hildon builds
420    #define uispecific_main_menu_new gtk_menu_new
421    
422    #endif
423    
424    
425    
426    // Half-arsed slapdash common menu item constructor. Let's use GtkBuilder
427    // instead so we have some flexibility.
428    
429    static GtkWidget *
430    menu_append_new_item(appdata_t *appdata,
431                         GtkWidget *menu_shell,
432                         GtkSignalFunc activate_cb,
433                         char *label,
434                         const gchar *icon_name, // stock id or name for icon_load
435                                        // overridden by label, accels, icon_name
436                         const gchar *accel_path,
437                         guint accel_key,      // from gdk/gdkkeysyms.h
438                         GdkModifierType accel_mods, // e.g. GDK_CONTROL_MASK
439                         gboolean is_check, gboolean check_status)
440    {
441      GtkWidget *item = NULL;
442      GtkWidget *image = NULL;
443    
444      gboolean stock_item_known = FALSE;
445      GtkStockItem stock_item;
446      if (icon_name != NULL) {
447        stock_item_known = gtk_stock_lookup(icon_name, &stock_item);
448      }
449    
450      // Icons
451    #ifndef UISPECIFIC_MENU_HAS_ICONS
452      item = is_check ? gtk_check_menu_item_new_with_mnemonic (label)
453                      : gtk_menu_item_new_with_mnemonic       (label);
454    #else
455      if (is_check) {
456        item = gtk_check_menu_item_new_with_mnemonic (label);
457      }
458      else if (!stock_item_known) {
459        GdkPixbuf *pbuf = icon_load(&appdata->icon, icon_name);
460        if (pbuf) {
461          image = gtk_image_new_from_pixbuf(pbuf);
462        }
463        if (image) {
464          item = gtk_image_menu_item_new_with_mnemonic(label);
465          gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
466        }
467        else {
468          item = gtk_menu_item_new_with_mnemonic(label);
469        }
470      }
471      else {
472        item = gtk_image_menu_item_new_with_mnemonic(label);
473        image = gtk_image_new_from_stock(icon_name, GTK_ICON_SIZE_MENU);
474        gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
475      }
476    #endif
477    
478    #ifdef UISPECIFIC_MENU_HAS_ACCELS
479      // Accelerators
480      // Default
481      if (accel_path != NULL) {
482        gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
483        if (accel_key != 0) {
484          gtk_accel_map_add_entry( accel_path, accel_key, accel_mods );
485        }
486        else if (stock_item_known) {
487          gtk_accel_map_add_entry( accel_path, stock_item.keyval,
488                                   stock_item.modifier );
489        }
490      }
491    #endif
492    
493      gtk_menu_shell_append(GTK_MENU_SHELL(menu_shell), GTK_WIDGET(item));
494      if (is_check) {
495        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), check_status);
496      }
497      g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(activate_cb),
498                       appdata);
499      return item;
500    }
501    
502    
503  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
504    GtkWidget *menu, *item, *submenu;    GtkWidget *menu, *item, *submenu;
505    menu = gtk_menu_new();    GtkWidget *about_quit_items_menu;
506    
507      if (g_module_supported()) {
508        printf("*** can use GModule: consider using GtkUIManager / GtkBuilder\n");
509      }
510    
511      menu = uispecific_main_menu_new();
512      about_quit_items_menu = menu;
513    
514    /* -------------------- Project submenu -------------------- */    /* -------------------- Project submenu -------------------- */
515    
516    item = gtk_menu_item_new_with_label( _("Project") );    GtkAccelGroup *accel_grp = gtk_accel_group_new();
517    gtk_menu_append(GTK_MENU_SHELL(menu), item);    item = gtk_menu_item_new_with_mnemonic( _("_Project") );
518      gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
519    submenu = gtk_menu_new();    submenu = gtk_menu_new();
520      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
521    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
522    #ifdef UISPECIFIC_MAIN_MENU_IS_MENU_BAR
523      about_quit_items_menu = submenu;
524    #endif
525    
526    item = gtk_menu_item_new_with_label( _("Open...") );    menu_append_new_item(
527    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_open), _("_Open..."),
528    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_project_open),      GTK_STOCK_OPEN, "<OSM2Go-Main>/Project/Open",
529                     appdata);      0, 0, FALSE, FALSE
530      );
531    appdata->menu_item_project_close = item =  
532      gtk_menu_item_new_with_label( _("Close") );    appdata->menu_item_project_close = menu_append_new_item(
533    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_close), _("_Close"),
534    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_project_close),      GTK_STOCK_CLOSE, "<OSM2Go-Main>/Project/Close",
535                     appdata);      0, 0, FALSE, FALSE
536      );
537    
538    /* --------------- view menu ------------------- */    /* --------------- view menu ------------------- */
539    
540    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());  #ifndef UISPECIFIC_MAIN_MENU_IS_MENU_BAR
541      gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
542    #endif
543    
544    appdata->menu_view = item =    appdata->menu_view = item = gtk_menu_item_new_with_mnemonic( _("_View") );
545      gtk_menu_item_new_with_label( _("View") );    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
   gtk_menu_append(GTK_MENU_SHELL(menu), item);  
546    submenu = gtk_menu_new();    submenu = gtk_menu_new();
547      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
548    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
549    
550  #ifdef USE_HILDON    appdata->menu_item_view_fullscreen = menu_append_new_item(
551    appdata->fullscreen_menu_item =      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_fullscreen), _("_Fullscreen"),
552      item = gtk_check_menu_item_new_with_label( _("Fullscreen") );      GTK_STOCK_FULLSCREEN, "<OSM2Go-Main>/View/Fullscreen",
553    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      0, 0, TRUE, FALSE
554    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_fullscreen),    );
555                     appdata);  
556  #endif    menu_append_new_item(
557        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),
558    item = gtk_menu_item_new_with_label( _("Zoom +" ));      GTK_STOCK_ZOOM_IN, "<OSM2Go-Main>/View/ZoomIn",
559    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      GDK_comma, GDK_CONTROL_MASK, FALSE, FALSE
560    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_zoomin), appdata);    );
561    
562    item = gtk_menu_item_new_with_label( _("Zoom -") );    menu_append_new_item(
563    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomout), _("Zoom _out"),
564    g_signal_connect(item, "activate",      GTK_STOCK_ZOOM_OUT, "<OSM2Go-Main>/View/ZoomOut",
565                     GTK_SIGNAL_FUNC(cb_menu_zoomout), appdata);      GDK_period, GDK_CONTROL_MASK, FALSE, FALSE
566      );
567    
568    /* -------------------- OSM submenu -------------------- */    /* -------------------- OSM submenu -------------------- */
569    
570    appdata->menu_osm = item = gtk_menu_item_new_with_label( _("OSM") );    appdata->menu_osm = item = gtk_menu_item_new_with_mnemonic( _("_OSM") );
571    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
572    submenu = gtk_menu_new();    submenu = gtk_menu_new();
573      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
574    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
575    
576    appdata->menu_item_osm_upload = item =    appdata->menu_item_osm_upload = menu_append_new_item(
577      gtk_menu_item_new_with_label( _("Upload...") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload..."),
578    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      "upload.16", "<OSM2Go-Main>/OSM/Upload",
579    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_upload), appdata);      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE
580      );
581    item = gtk_menu_item_new_with_label( _("Download...") );  
582    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    menu_append_new_item(
583    g_signal_connect(item, "activate",      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download..."),
584                     GTK_SIGNAL_FUNC(cb_menu_download), appdata);      "download.16", "<OSM2Go-Main>/OSM/Download",
585        GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE
586    gtk_menu_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());    );
587    
588    appdata->menu_item_osm_diff = item =    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
589      gtk_menu_item_new_with_label( _("Save diff file") );  
590    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    if(getenv("OSM2GO_UNDO_TEST")) {
591    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_save_changes),      appdata->menu_item_osm_undo = menu_append_new_item(
592                     appdata);                 appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo), _("_Undo"),
593                   GTK_STOCK_UNDO, "<OSM2Go-Main>/OSM/Undo",
594    appdata->menu_item_osm_undo_changes = item =                 GDK_z, GDK_CONTROL_MASK, FALSE, FALSE
595      gtk_menu_item_new_with_label( _("Undo all changes...") );                 );
596    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    } else
597    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");
598                     appdata);  
599      appdata->menu_item_osm_save_changes = menu_append_new_item(
600        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),
601        GTK_STOCK_SAVE, "<OSM2Go-Main>/OSM/SaveChanges",
602        GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE
603      );
604    
605      appdata->menu_item_osm_undo_changes = menu_append_new_item(
606        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo_changes), _("Disca_rd local changes..."),
607        GTK_STOCK_DELETE, "<OSM2Go-Main>/OSM/DiscardChanges",
608        0, 0, FALSE, FALSE
609      );
610    
611      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
612      appdata->menu_item_osm_relations = menu_append_new_item(
613        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations..."),
614        NULL, "<OSM2Go-Main>/OSM/Relations",
615        GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE
616      );
617    
618    /* -------------------- wms submenu -------------------- */    /* -------------------- wms submenu -------------------- */
619    
620    appdata->menu_wms = item = gtk_menu_item_new_with_label( _("WMS") );    appdata->menu_wms = item = gtk_menu_item_new_with_mnemonic( _("_WMS") );
621    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
622    submenu = gtk_menu_new();    submenu = gtk_menu_new();
623      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
624    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
625    
626    item = gtk_menu_item_new_with_label( _("Import...") );    menu_append_new_item(
627    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_import), _("_Import..."),
628    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_wms_import),      GTK_STOCK_INDEX, "<OSM2Go-Main>/WMS/Import",
629                     appdata);      0, 0, FALSE, FALSE
630      );
631    appdata->menu_item_wms_clear = item =  
632      gtk_menu_item_new_with_label( _("Clear") );    appdata->menu_item_wms_clear = menu_append_new_item(
633    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_clear), _("_Clear"),
634    gtk_widget_set_sensitive(item, FALSE);      GTK_STOCK_CLEAR, "<OSM2Go-Main>/WMS/Clear",
635    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_wms_clear),      0, 0, FALSE, FALSE
636                     appdata);    );
637      gtk_widget_set_sensitive(appdata->menu_item_wms_clear, FALSE);
638    appdata->menu_item_wms_adjust = item =  
639      gtk_menu_item_new_with_label( _("Adjust") );    appdata->menu_item_wms_adjust = menu_append_new_item(
640    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_adjust), _("_Adjust"),
641    gtk_widget_set_sensitive(item, FALSE);      NULL, "<OSM2Go-Main>/WMS/Adjust",
642    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_wms_adjust),      0, 0, FALSE, FALSE
643                     appdata);    );
644      gtk_widget_set_sensitive(appdata->menu_item_wms_adjust, FALSE);
645    
646    /* -------------------- map submenu -------------------- */    /* -------------------- map submenu -------------------- */
647    
648    appdata->menu_map = item = gtk_menu_item_new_with_label( _("Map") );    appdata->menu_map = item = gtk_menu_item_new_with_mnemonic( _("_Map") );
649    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
650    submenu = gtk_menu_new();    submenu = gtk_menu_new();
651      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
652    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
653    
654    appdata->menu_item_map_hide_sel = item =    appdata->menu_item_map_hide_sel = menu_append_new_item(
655      gtk_menu_item_new_with_label( _("Hide selected") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_hide_sel), _("_Hide selected"),
656    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      GTK_STOCK_REMOVE, "<OSM2Go-Main>/Map/HideSelected",
657    gtk_widget_set_sensitive(item, FALSE);      0, 0, FALSE, FALSE
658    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_map_hide_sel),    );
659                     appdata);    gtk_widget_set_sensitive(appdata->menu_item_map_hide_sel, FALSE);
660    
661    appdata->menu_item_map_show_all = item =    appdata->menu_item_map_show_all = menu_append_new_item(
662      gtk_menu_item_new_with_label( _("Show all") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_show_all), _("_Show all"),
663    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      GTK_STOCK_ADD, "<OSM2Go-Main>/Map/ShowAll",
664    gtk_widget_set_sensitive(item, FALSE);      0, 0, FALSE, FALSE
665    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_map_show_all),    );
666                     appdata);    gtk_widget_set_sensitive(appdata->menu_item_map_show_all, FALSE);
667    
668    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());
669    
670    item = gtk_menu_item_new_with_label( _("Redraw") );    menu_append_new_item(
671    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_style), _("St_yle..."),
672    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_redraw), appdata);      GTK_STOCK_SELECT_COLOR, "<OSM2Go-Main>/Map/Style",
673        0, 0, FALSE, FALSE
674    gtk_menu_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());    );
675    
676    item = gtk_menu_item_new_with_label( _("Style...") );    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
677    gtk_menu_append(GTK_MENU_SHELL(submenu), item);  
678    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_style), appdata);    /* switches mainly intended for testing/debugging */
679      menu_append_new_item(
680    gtk_menu_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_redraw), _("_Redraw"),
681        NULL, "<OSM2Go-Main>/Map/Redraw",
682    appdata->menu_item_map_no_icons =      GDK_r, GDK_CONTROL_MASK, FALSE, FALSE
683      item = gtk_check_menu_item_new_with_label( _("No Icons") );    );
684    gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item),  
685                                   appdata->settings->no_icons);    appdata->menu_item_map_no_icons = menu_append_new_item(
686    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_icons), _("No _icons"),
687    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_map_no_icons),      NULL, "<OSM2Go-Main>/Map/NoIcons",
688                     appdata);      0, 0, TRUE, appdata->settings->no_icons
689      );
690    
691      appdata->menu_item_map_no_antialias = menu_append_new_item(
692        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_antialias),
693        _("No _antialias"),
694        NULL, "<OSM2Go-Main>/Map/NoAntialias",
695        0, 0, TRUE, appdata->settings->no_antialias
696      );
697    
698    /* -------------------- track submenu -------------------- */    /* -------------------- track submenu -------------------- */
699    
700    appdata->track.menu_track = item = gtk_menu_item_new_with_label(_("Track"));    appdata->track.menu_track = item = gtk_menu_item_new_with_mnemonic(_("_Track"));
701    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
702    submenu = gtk_menu_new();    submenu = gtk_menu_new();
703      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
704    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
705    
706    appdata->track.menu_item_import =    appdata->track.menu_item_import = menu_append_new_item(
707      item = gtk_menu_item_new_with_label( _("Import...") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import..."),
708    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      NULL, "<OSM2Go-Main>/Track/Import",
709    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_track_import),      0, 0, FALSE, FALSE
710                     appdata);    );
711    
712    appdata->track.menu_item_export =    appdata->track.menu_item_export = menu_append_new_item(
713      item = gtk_menu_item_new_with_label( _("Export...") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export..."),
714    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      NULL, "<OSM2Go-Main>/Track/Export",
715    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_track_export),      0, 0, FALSE, FALSE
716                     appdata);    );
717    
718    appdata->track.menu_item_clear =    appdata->track.menu_item_clear = menu_append_new_item(
719      item = gtk_menu_item_new_with_label( _("Clear") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_clear), _("_Clear"),
720    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      GTK_STOCK_CLEAR, "<OSM2Go-Main>/Track/Clear",
721    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_track_clear),      0, 0, FALSE, FALSE
722                     appdata);    );
723    
724    appdata->track.menu_item_gps =  
725      item = gtk_check_menu_item_new_with_label( _("GPS") );    appdata->track.menu_item_gps = menu_append_new_item(
726    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_gps), _("_GPS"),
727    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_track_gps),      NULL, "<OSM2Go-Main>/Track/GPS",
728                     appdata);      GDK_g, GDK_CONTROL_MASK|GDK_SHIFT_MASK, TRUE, FALSE
729      );
730    
731    /* ------------------------------------------------------- */    /* ------------------------------------------------------- */
732    
733    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_shell_append(GTK_MENU_SHELL(about_quit_items_menu),
734                            gtk_separator_menu_item_new());
   
   item = gtk_menu_item_new_with_label( _("About...") );  
   gtk_menu_append(GTK_MENU_SHELL(menu), item);  
   g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);  
735    
736      menu_append_new_item(
737        appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_about), _("_About..."),
738        GTK_STOCK_ABOUT, "<OSM2Go-Main>/About",
739        0, 0, FALSE, FALSE
740      );
741    
742      menu_append_new_item(
743        appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_quit), _("_Quit"),
744        GTK_STOCK_QUIT, "<OSM2Go-Main>/Quit",
745        0, 0, FALSE, FALSE
746      );
747    
748    item = gtk_menu_item_new_with_label( _("Quit") );    gtk_window_add_accel_group(GTK_WINDOW(appdata->window), accel_grp);
   gtk_menu_append(GTK_MENU_SHELL(menu), item);  
   g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_quit), appdata);  
749    
750  #ifdef USE_HILDON  #ifdef USE_HILDON
751    hildon_window_set_menu(appdata->window, GTK_MENU(menu));    hildon_window_set_menu(appdata->window, GTK_MENU(menu));
752  #else  #else
753    /* attach ordinary gtk menu */    GtkWidget *menu_bar = menu;
754    GtkWidget *menu_bar = gtk_menu_bar_new();  
755    #ifndef UISPECIFIC_MAIN_MENU_IS_MENU_BAR
756      // we need to make one first
757      menu_bar = gtk_menu_bar_new();
758    
759    GtkWidget *root_menu = gtk_menu_item_new_with_label (_("Menu"));    GtkWidget *root_menu = gtk_menu_item_new_with_label (_("Menu"));
760    gtk_widget_show(root_menu);    gtk_widget_show(root_menu);
# Line 576  void menu_create(appdata_t *appdata) { Line 763  void menu_create(appdata_t *appdata) {
763    gtk_menu_item_set_submenu(GTK_MENU_ITEM (root_menu), menu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM (root_menu), menu);
764    
765    gtk_widget_show(menu_bar);    gtk_widget_show(menu_bar);
766    #endif //UISPECIFIC_MAIN_MENU_IS_MENU_BAR
767    
768    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);
769  #endif  
770    #endif //USE_HILDON
771  }  }
772    
773  /********************* end of menu **********************/  /********************* end of menu **********************/
774    
775    #ifdef UISPECIFIC_MENU_HAS_ACCELS
776    #define ACCELS_FILE "accels"
777    
778    static void menu_accels_load(appdata_t *appdata) {
779      char *accels_file = g_strdup_printf("%s/" ACCELS_FILE,
780                                          appdata->settings->base_path);
781      gtk_accel_map_load(accels_file);
782      g_free(accels_file);
783    }
784    
785    static void menu_accels_save(appdata_t *appdata) {
786      char *accels_file = g_strdup_printf("%s" ACCELS_FILE,
787                                          appdata->settings->base_path);
788      gtk_accel_map_save(accels_file);
789      g_free(accels_file);
790    }
791    
792    #endif
793    
794    
795  void cleanup(appdata_t *appdata) {  void cleanup(appdata_t *appdata) {
796    #ifdef UISPECIFIC_MENU_HAS_ACCELS
797      menu_accels_save(appdata);
798    #endif
799    
800    settings_save(appdata->settings);    settings_save(appdata->settings);
801    
802  #ifdef USE_HILDON  #ifdef USE_HILDON
# Line 627  void cleanup(appdata_t *appdata) { Line 840  void cleanup(appdata_t *appdata) {
840    
841    project_free(appdata->project);    project_free(appdata->project);
842    
843      if(appdata->menu_item_osm_undo)
844        undo_free(appdata->undo.state);
845    
846    puts("everything is gone");    puts("everything is gone");
847  }  }
848    
# Line 642  gboolean on_window_key_press(GtkWidget * Line 858  gboolean on_window_key_press(GtkWidget *
858    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
859    int handled = FALSE;    int handled = FALSE;
860    
   //  printf("key event %d\n", event->keyval);  
   
861    // the map handles some keys on its own ...    // the map handles some keys on its own ...
862    switch(event->keyval) {    switch(event->keyval) {
 #ifdef USE_HILDON  
863    
864  #if 0  #ifdef USE_HILDON
865    case HILDON_HARDKEY_SELECT:      /* this is in fact a mapping to GDK_F6 */
     handled = TRUE;  
     break;  
 #endif  
   
866    case HILDON_HARDKEY_FULLSCREEN:    case HILDON_HARDKEY_FULLSCREEN:
867      {  #else
868        gboolean fullscreen = !gtk_check_menu_item_get_active(    case GDK_F11:
869                 GTK_CHECK_MENU_ITEM(appdata->fullscreen_menu_item));  #endif
870        if(!gtk_check_menu_item_get_active(
871                 GTK_CHECK_MENU_ITEM(appdata->menu_item_view_fullscreen))) {
872          gtk_window_fullscreen(GTK_WINDOW(appdata->window));
873        gtk_check_menu_item_set_active(        gtk_check_menu_item_set_active(
874                 GTK_CHECK_MENU_ITEM(appdata->fullscreen_menu_item), fullscreen);               GTK_CHECK_MENU_ITEM(appdata->menu_item_view_fullscreen), TRUE);
875          } else {
       if(fullscreen)  
         gtk_window_fullscreen(GTK_WINDOW(appdata->window));  
       else  
876          gtk_window_unfullscreen(GTK_WINDOW(appdata->window));          gtk_window_unfullscreen(GTK_WINDOW(appdata->window));
877            gtk_check_menu_item_set_active(
878        handled = TRUE;               GTK_CHECK_MENU_ITEM(appdata->menu_item_view_fullscreen), FALSE);
879      }        }
880    
881        handled = TRUE;
882      break;      break;
 #endif  
883    }    }
884    
885    /* forward unprocessed key presses to map */    /* forward unprocessed key presses to map */
# Line 697  int main(int argc, char *argv[]) { Line 907  int main(int argc, char *argv[]) {
907    
908    g_thread_init(NULL);    g_thread_init(NULL);
909    
   gps_init(&appdata);  
   
910    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
911    
912      gps_init(&appdata);
913    
914  #ifdef USE_HILDON  #ifdef USE_HILDON
915    printf("Installing osso context for \"org.harbaum." PACKAGE "\"\n");    printf("Installing osso context for \"org.harbaum." PACKAGE "\"\n");
916    appdata.osso_context = osso_initialize("org.harbaum."PACKAGE,    appdata.osso_context = osso_initialize("org.harbaum."PACKAGE,
# Line 741  int main(int argc, char *argv[]) { Line 951  int main(int argc, char *argv[]) {
951    
952    appdata.vbox = gtk_vbox_new(FALSE,0);    appdata.vbox = gtk_vbox_new(FALSE,0);
953    menu_create(&appdata);    menu_create(&appdata);
954    #ifdef UISPECIFIC_MENU_HAS_ACCELS
955      menu_accels_load(&appdata);
956    #endif
957    
958    /* ----------------------- setup main window ---------------- */    /* ----------------------- setup main window ---------------- */
959    
# Line 750  int main(int argc, char *argv[]) { Line 963  int main(int argc, char *argv[]) {
963  #ifdef PORTRAIT  #ifdef PORTRAIT
964    gtk_box_pack_start(GTK_BOX(vbox), iconbar_new(&appdata), FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(vbox), iconbar_new(&appdata), FALSE, FALSE, 0);
965  #endif  #endif
966    gtk_box_pack_start(GTK_BOX(vbox), map_new(&appdata), TRUE, TRUE, 0);  
967      /* generate main map view */
968      GtkWidget *map = map_new(&appdata);
969      if(!map) {
970        cleanup(&appdata);
971        return -1;
972      }
973    
974      gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);
975    gtk_box_pack_start(GTK_BOX(vbox), statusbar_new(&appdata), FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(vbox), statusbar_new(&appdata), FALSE, FALSE, 0);
976    
977  #ifndef PORTRAIT  #ifndef PORTRAIT
# Line 787  int main(int argc, char *argv[]) { Line 1008  int main(int argc, char *argv[]) {
1008    puts("gtk_main() left");    puts("gtk_main() left");
1009    
1010    track_save(appdata.project, appdata.track.track);    track_save(appdata.project, appdata.track.track);
1011      track_clear(&appdata, appdata.track.track);
1012    
1013    /* save a diff if there are dirty entries */    /* save a diff if there are dirty entries */
1014    diff_save(appdata.project, appdata.osm);    diff_save(appdata.project, appdata.osm);
# Line 795  int main(int argc, char *argv[]) { Line 1017  int main(int argc, char *argv[]) {
1017    
1018    return 0;    return 0;
1019  }  }
1020    
1021    // vim:et:ts=8:sw=2:sts=2:ai
Legend:
Removed from v.15  
changed lines
  Added in v.140