Diff of /trunk/src/main.c

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

revision 139 by harbaum, Sun Mar 22 20:08:20 2009 UTC revision 195 by harbaum, Wed Jul 8 08:51:02 2009 UTC
# Line 23  Line 23 
23  #include <curl/curl.h>  #include <curl/curl.h>
24  #include <gdk/gdkkeysyms.h>  #include <gdk/gdkkeysyms.h>
25    
26    #if defined(USE_HILDON) && (MAEMO_VERSION_MAJOR == 5)
27    #include <hildon/hildon-button.h>
28    #include <hildon/hildon-check-button.h>
29    #include <hildon/hildon-window-stack.h>
30    #include <gdk/gdkx.h>
31    #include <X11/Xatom.h>
32    #endif
33    
34  #include "appdata.h"  #include "appdata.h"
35  #include "banner.h"  #include "banner.h"
36    
# Line 36  static void main_ui_enable(appdata_t *ap Line 44  static void main_ui_enable(appdata_t *ap
44      map_action_cancel(appdata);      map_action_cancel(appdata);
45    
46    /* ---- set project name as window title ----- */    /* ---- set project name as window title ----- */
47  #ifndef USE_HILDON  #if defined(USE_HILDON) && MAEMO_VERSION_MAJOR < 5
48      if(project_valid)
49        gtk_window_set_title(GTK_WINDOW(appdata->window), appdata->project->name);
50      else
51        gtk_window_set_title(GTK_WINDOW(appdata->window), "");
52    #else
53    char *str = NULL;    char *str = NULL;
54    if(project_valid)    if(project_valid)
55      str = g_strdup_printf("OSM2Go - %s", appdata->project->name);      str = g_strdup_printf("OSM2Go - %s", appdata->project->name);
# Line 45  static void main_ui_enable(appdata_t *ap Line 58  static void main_ui_enable(appdata_t *ap
58    
59    gtk_window_set_title(GTK_WINDOW(appdata->window), str);    gtk_window_set_title(GTK_WINDOW(appdata->window), str);
60    g_free(str);    g_free(str);
 #else  
   if(project_valid)  
     gtk_window_set_title(GTK_WINDOW(appdata->window), appdata->project->name);  
   else  
     gtk_window_set_title(GTK_WINDOW(appdata->window), "");  
61  #endif  #endif
62    
63    if(appdata->iconbar && appdata->iconbar->toolbar)    if(appdata->iconbar && appdata->iconbar->toolbar)
64      gtk_widget_set_sensitive(appdata->iconbar->toolbar, osm_valid);      gtk_widget_set_sensitive(appdata->iconbar->toolbar, osm_valid);
   
65    /* disable all menu entries related to map */    /* disable all menu entries related to map */
66    gtk_widget_set_sensitive(appdata->menu_osm, project_valid);    gtk_widget_set_sensitive(appdata->submenu_map, project_valid);
67    gtk_widget_set_sensitive(appdata->menu_item_osm_upload, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_upload, osm_valid);
68    if(appdata->menu_item_osm_undo)    if(appdata->menu_item_map_undo)
69      gtk_widget_set_sensitive(appdata->menu_item_osm_undo, osm_valid);      gtk_widget_set_sensitive(appdata->menu_item_map_undo, osm_valid);
70    gtk_widget_set_sensitive(appdata->menu_item_osm_save_changes, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_save_changes, osm_valid);
71    gtk_widget_set_sensitive(appdata->menu_item_osm_undo_changes, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_undo_changes, osm_valid);
72    gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_relations, osm_valid);
73    gtk_widget_set_sensitive(appdata->menu_view, osm_valid);    gtk_widget_set_sensitive(appdata->track.submenu_track, osm_valid);
74    gtk_widget_set_sensitive(appdata->menu_wms, osm_valid);    gtk_widget_set_sensitive(appdata->submenu_view, osm_valid);
75    gtk_widget_set_sensitive(appdata->menu_map, osm_valid);    gtk_widget_set_sensitive(appdata->submenu_wms, osm_valid);
76    gtk_widget_set_sensitive(appdata->menu_item_project_close, project_valid);  
77    #ifdef ZOOM_BUTTONS
78      gtk_widget_set_sensitive(appdata->btn_zoom_in, osm_valid);
79      gtk_widget_set_sensitive(appdata->btn_zoom_out, osm_valid);
80    #endif
81    
82    if(!project_valid)    if(!project_valid)
83      statusbar_set(appdata, _("Please load or create a project"), FALSE);      statusbar_set(appdata, _("Please load or create a project"), FALSE);
# Line 82  cb_menu_project_open(GtkMenuItem *item, Line 93  cb_menu_project_open(GtkMenuItem *item,
93  }  }
94    
95  static void  static void
96  cb_menu_project_close(GtkMenuItem *item, gpointer data) {  cb_menu_project_wizard(GtkMenuItem *item, gpointer data) {
97    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
98    project_close(appdata);    project_wizard(appdata);
   main_ui_enable(appdata);  
99  }  }
100    
101  static void  static void
# Line 98  cb_menu_about(GtkMenuItem *item, gpointe Line 108  cb_menu_about(GtkMenuItem *item, gpointe
108      NULL };      NULL };
109    
110    const gchar *artists[] = {    const gchar *artists[] = {
111      "Андрей Жилин <drew.zhilin@gmail.com>",      "Andrew Zhilin <drew.zhilin@gmail.com>",
112      NULL };      NULL };
113    
114    gtk_show_about_dialog(GTK_WINDOW(appdata->window),    gtk_show_about_dialog(GTK_WINDOW(appdata->window),
115                          "program-name", "OSM2Go",                          "name", "OSM2Go",
116                          "version", VERSION,                          "version", VERSION,
117                          "copyright", _("Copyright 2008-2009"),                          "copyright", _("Copyright 2008-2009"),
118                          "authors", authors,                          "authors", authors,
# Line 114  cb_menu_about(GtkMenuItem *item, gpointe Line 124  cb_menu_about(GtkMenuItem *item, gpointe
124    
125  void on_window_destroy (GtkWidget *widget, gpointer data);  void on_window_destroy (GtkWidget *widget, gpointer data);
126    
127    #ifndef USE_HILDON
128  static void  static void
129  cb_menu_quit(GtkMenuItem *item, gpointer data) {  cb_menu_quit(GtkMenuItem *item, gpointer data) {
130    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
131    gtk_widget_destroy(GTK_WIDGET(appdata->window));    gtk_widget_destroy(GTK_WIDGET(appdata->window));
132  }  }
133    #endif
134    
135  static void  static void
136  cb_menu_upload(GtkMenuItem *item, gpointer data) {  cb_menu_upload(GtkMenuItem *item, gpointer data) {
137    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
138    if(!appdata->osm || !appdata->project) return;    if(!appdata->osm || !appdata->project) return;
139    
140      if(project_check_demo(GTK_WIDGET(appdata->window), appdata->project))
141        return;
142    
143    osm_upload(appdata, appdata->osm, appdata->project);    osm_upload(appdata, appdata->osm, appdata->project);
144  }  }
145    
# Line 133  cb_menu_download(GtkMenuItem *item, gpoi Line 148  cb_menu_download(GtkMenuItem *item, gpoi
148    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
149    if(!appdata->project) return;    if(!appdata->project) return;
150    
151      if(project_check_demo(GTK_WIDGET(appdata->window), appdata->project))
152        return;
153    
154    /* if we have valid osm data loaded: save state first */    /* if we have valid osm data loaded: save state first */
155    if(appdata->osm) {    if(appdata->osm) {
156      /* 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 144  cb_menu_download(GtkMenuItem *item, gpoi Line 162  cb_menu_download(GtkMenuItem *item, gpoi
162    }    }
163    
164    // download    // download
165    if(osm_download(GTK_WIDGET(appdata->window), appdata->project)) {    if(osm_download(GTK_WIDGET(appdata->window), appdata->settings,
166      banner_busy_start(appdata, 1, "Redrawing...");                    appdata->project)) {
167      appdata->osm = osm_parse(appdata->project->osm);      banner_busy_start(appdata, 1, "Redrawing");
168        appdata->osm = osm_parse(appdata->project->path, appdata->project->osm);
169      diff_restore(appdata, appdata->project, appdata->osm);      diff_restore(appdata, appdata->project, appdata->osm);
170      map_paint(appdata);      map_paint(appdata);
171      banner_busy_stop(appdata); //"Redrawing..."      banner_busy_stop(appdata); //"Redrawing"
172    }    }
173    
174    main_ui_enable(appdata);    main_ui_enable(appdata);
# Line 189  cb_menu_map_show_all(GtkMenuItem *item, Line 208  cb_menu_map_show_all(GtkMenuItem *item,
208    
209  /* ---------------------------------------------------------- */  /* ---------------------------------------------------------- */
210    
211  #if 1  // mainly for testing  #if defined(USE_HILDON) && (MAEMO_VERSION_MAJOR == 5)
212  static void  #define MENU_CHECK_ITEM HildonCheckButton
213  cb_menu_redraw(GtkMenuItem *item, gpointer data) {  #define MENU_CHECK_ITEM_ACTIVE(a) hildon_check_button_get_active(a)
214    appdata_t *appdata = (appdata_t*)data;  #else
215    #define MENU_CHECK_ITEM GtkCheckMenuItem
216    /* redraw the entire map by destroying all map items and redrawing them */  #define MENU_CHECK_ITEM_ACTIVE(a) gtk_check_menu_item_get_active(a)
   banner_busy_start(appdata, 1, "Redrawing...");  
   track_save(appdata->project, appdata->track.track);  
   diff_save(appdata->project, appdata->osm);  
   map_clear(appdata, MAP_LAYER_ALL);  
   osm_free(&appdata->icon, appdata->osm);  
   
   appdata->osm = osm_parse(appdata->project->osm);  
   diff_restore(appdata, appdata->project, appdata->osm);  
   map_paint(appdata);  
   
   appdata->track.track = track_restore(appdata, appdata->project);  
   if(appdata->track.track)  
     map_track_draw(appdata->map, appdata->track.track);  
   
   wms_load(appdata);  
   banner_busy_stop(appdata); //"Redrawing..."  
 }  
217  #endif  #endif
218    
219  static void  static void
220  cb_menu_style(GtkMenuItem *item, gpointer data) {  cb_menu_map_no_icons(MENU_CHECK_ITEM *item, appdata_t *appdata) {
   appdata_t *appdata = (appdata_t*)data;  
221    
222    style_select(GTK_WIDGET(appdata->window), appdata);    banner_busy_start(appdata, 1, "Redrawing");
223  }    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
224    
225  static void    appdata->settings->no_icons = MENU_CHECK_ITEM_ACTIVE(item);
 cb_menu_map_no_icons(GtkCheckMenuItem *item, gpointer data) {  
   appdata_t *appdata = (appdata_t*)data;  
226    
   banner_busy_start(appdata, 1, "Redrawing...");  
   map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);  
   appdata->settings->no_icons = gtk_check_menu_item_get_active(item);  
227    map_paint(appdata);    map_paint(appdata);
228    banner_busy_stop(appdata); //"Redrawing..."    banner_busy_stop(appdata); //"Redrawing"
229  }  }
230    
231  static void  static void
232  cb_menu_map_no_antialias(GtkCheckMenuItem *item, gpointer data) {  cb_menu_style(GtkMenuItem *item, gpointer data) {
233    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
234    
235    banner_busy_start(appdata, 1, "Redrawing...");    style_select(GTK_WIDGET(appdata->window), appdata);
   map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);  
   appdata->settings->no_antialias = gtk_check_menu_item_get_active(item);  
   map_paint(appdata);  
   banner_busy_stop(appdata); //"Redrawing..."  
236  }  }
237    
238  static void  static void
# Line 270  cb_menu_undo_changes(GtkMenuItem *item, Line 262  cb_menu_undo_changes(GtkMenuItem *item,
262                   "uploaded yet? This can't be undone.")))                   "uploaded yet? This can't be undone.")))
263      return;      return;
264    
265    banner_busy_start(appdata, 1, _("Redrawing..."));    banner_busy_start(appdata, 1, _("Redrawing"));
266    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
267    osm_free(&appdata->icon, appdata->osm);    osm_free(&appdata->icon, appdata->osm);
268    diff_remove(appdata->project);    diff_remove(appdata->project);
269    appdata->osm = osm_parse(appdata->project->osm);    appdata->osm = osm_parse(appdata->project->path, appdata->project->osm);
270    map_paint(appdata);    map_paint(appdata);
271    banner_busy_stop(appdata);  //"Redrawing..."    banner_busy_stop(appdata);  //"Redrawing"
272    
273    banner_show_info(appdata, _("Discarded local changes"));    banner_show_info(appdata, _("Discarded local changes"));
274  }  }
275    
276  static void  static void
277  cb_menu_osm_relations(GtkMenuItem *item, gpointer data) {  cb_menu_osm_relations(GtkMenuItem *item, appdata_t *appdata) {
278    relation_list((appdata_t*)data);    /* list relations of all objects */
279      relation_list(GTK_WIDGET(appdata->window), appdata, NULL);
280  }  }
281    
282    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
283  static void  static void
284  cb_menu_fullscreen(GtkCheckMenuItem *item, gpointer data) {  cb_menu_fullscreen(MENU_CHECK_ITEM *item, gpointer data) {
285    appdata_t *appdata = (appdata_t *)data;    appdata_t *appdata = (appdata_t *)data;
286    
287    if(gtk_check_menu_item_get_active(item))    if(MENU_CHECK_ITEM_ACTIVE(item))
288      gtk_window_fullscreen(GTK_WINDOW(appdata->window));      gtk_window_fullscreen(GTK_WINDOW(appdata->window));
289    else    else
290      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));
291  }  }
292    #endif
293    
294  static void  static void
295  cb_menu_zoomin(GtkMenuItem *item, appdata_t *appdata) {  cb_menu_zoomin(GtkMenuItem *item, appdata_t *appdata) {
# Line 313  cb_menu_zoomout(GtkMenuItem *item, appda Line 308  cb_menu_zoomout(GtkMenuItem *item, appda
308  }  }
309    
310  static void  static void
311    cb_menu_view_detail_inc(GtkMenuItem *item, gpointer data) {
312      appdata_t *appdata = (appdata_t*)data;
313    
314      printf("detail level increase\n");
315      map_detail_increase(appdata->map);
316    }
317    
318    static void
319    cb_menu_view_detail_normal(GtkMenuItem *item, gpointer data) {
320      appdata_t *appdata = (appdata_t*)data;
321    
322      printf("detail level normal\n");
323      map_detail_normal(appdata->map);
324    }
325    
326    static void
327    cb_menu_view_detail_dec(GtkMenuItem *item, gpointer data) {
328      appdata_t *appdata = (appdata_t*)data;
329    
330      printf("detail level decrease\n");
331      map_detail_decrease(appdata->map);
332    }
333    
334    static void
335  cb_menu_track_import(GtkMenuItem *item, appdata_t *appdata) {  cb_menu_track_import(GtkMenuItem *item, appdata_t *appdata) {
336      g_assert(appdata->settings);
337    
338    /* open a file selector */    /* open a file selector */
339    GtkWidget *dialog;    GtkWidget *dialog;
# Line 330  cb_menu_track_import(GtkMenuItem *item, Line 350  cb_menu_track_import(GtkMenuItem *item,
350                          NULL);                          NULL);
351  #endif  #endif
352    
353    /* use path if one is present */    if(appdata->settings->track_path) {
354    if(appdata->track.import_path)      if(!g_file_test(appdata->settings->track_path, G_FILE_TEST_EXISTS)) {
355      gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),        char *last_sep = strrchr(appdata->settings->track_path, '/');
356                                          appdata->track.import_path);        if(last_sep) {
357            *last_sep = 0;  // seperate path from file
358    
359            /* the user just created a new document */
360            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),
361                                        appdata->settings->track_path);
362            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog),
363                                              last_sep+1);
364    
365            /* restore full filename */
366            *last_sep = '/';
367          }
368        } else
369          gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),
370                                        appdata->settings->track_path);
371      }
372    
373    gtk_widget_show_all (GTK_WIDGET(dialog));    gtk_widget_show_all (GTK_WIDGET(dialog));
374    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {
375      char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));      char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
376    
377      /* load a track */      /* load a track */
378      track_do(appdata, TRACK_IMPORT, filename);      appdata->track.track = track_import(appdata, filename);
379      if(appdata->track.track) {      if(appdata->track.track) {
380          if(appdata->settings->track_path) g_free(appdata->settings->track_path);
381        /* save path if gpx was successfully loaded */        appdata->settings->track_path = g_strdup(filename);
       char *r = strrchr(filename, '/');  
   
       /* there is a delimiter, use everything left of it as path */  
       if(r) {  
         *r = 0;  
         if(appdata->track.import_path) g_free(appdata->track.import_path);  
         appdata->track.import_path = g_strdup(filename);  
         /* restore path ... just in case ... */  
         *r = '/';  
       }  
382      }      }
383      g_free (filename);      g_free (filename);
384    }    }
# Line 362  cb_menu_track_import(GtkMenuItem *item, Line 387  cb_menu_track_import(GtkMenuItem *item,
387  }  }
388    
389  static void  static void
390  cb_menu_track_gps(GtkMenuItem *item, gpointer data) {  cb_menu_track_enable_gps(MENU_CHECK_ITEM *item, appdata_t *appdata) {
391    appdata_t *appdata = (appdata_t*)data;    track_enable_gps(appdata, MENU_CHECK_ITEM_ACTIVE(item));
392    }
393    
394    if(gtk_check_menu_item_get_active(  
395      GTK_CHECK_MENU_ITEM(appdata->track.menu_item_gps))) {  static void
396      track_do(appdata, TRACK_GPS, NULL);  cb_menu_track_follow_gps(MENU_CHECK_ITEM *item, appdata_t *appdata) {
397    } else {    appdata->settings->follow_gps = MENU_CHECK_ITEM_ACTIVE(item);
     track_do(appdata, TRACK_NONE, NULL);  
   }  
398  }  }
399    
400    
401  static void  static void
402  cb_menu_track_export(GtkMenuItem *item, gpointer data) {  cb_menu_track_export(GtkMenuItem *item, appdata_t *appdata) {
403    appdata_t *appdata = (appdata_t*)data;    g_assert(appdata->settings);
404    messagef(GTK_WIDGET(appdata->window), _("NIY"),  
405             _("Track export is not yet supported."));    /* open a file selector */
406      GtkWidget *dialog;
407    
408    #ifdef USE_HILDON
409      dialog = hildon_file_chooser_dialog_new(GTK_WINDOW(appdata->window),
410                                              GTK_FILE_CHOOSER_ACTION_SAVE);
411    #else
412      dialog = gtk_file_chooser_dialog_new(_("Export track file"),
413                                           GTK_WINDOW(appdata->window),
414                                           GTK_FILE_CHOOSER_ACTION_SAVE,
415                                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
416                                           GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
417                                           NULL);
418    #endif
419    
420      printf("set filename <%s>\n", appdata->settings->track_path);
421    
422      if(appdata->settings->track_path) {
423        if(!g_file_test(appdata->settings->track_path, G_FILE_TEST_EXISTS)) {
424          char *last_sep = strrchr(appdata->settings->track_path, '/');
425          if(last_sep) {
426            *last_sep = 0;  // seperate path from file
427    
428            /* the user just created a new document */
429            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),
430                                                appdata->settings->track_path);
431            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog),
432                                              last_sep+1);
433    
434            /* restore full filename */
435            *last_sep = '/';
436          }
437        } else
438          gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),
439                                        appdata->settings->track_path);
440      }
441    
442      if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_FM_OK) {
443        gchar *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
444        if(filename) {
445          printf("export to %s\n", filename);
446    
447          if(!g_file_test(filename, G_FILE_TEST_EXISTS) ||
448             yes_no_f(dialog, appdata, MISC_AGAIN_ID_EXPORT_OVERWRITE,
449                      MISC_AGAIN_FLAG_DONT_SAVE_NO,
450                      "Overwrite existing file",
451                      "The file already exists. "
452                      "Do you really want to replace it?")) {
453            if(appdata->settings->track_path)
454              g_free(appdata->settings->track_path);
455            appdata->settings->track_path = g_strdup(filename);
456    
457            track_export(appdata, filename);
458          }
459        }
460      }
461    
462      gtk_widget_destroy (dialog);
463  }  }
464    
465    
466  static void  static void
467  cb_menu_track_clear(GtkMenuItem *item, gpointer data) {  cb_menu_track_clear(GtkMenuItem *item, gpointer data) {
468    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
469    track_do(appdata, TRACK_NONE, NULL);    track_clear(appdata, appdata->track.track);
470      appdata->track.track = NULL;
471  }  }
472    
473    
# Line 417  cb_menu_track_clear(GtkMenuItem *item, g Line 501  cb_menu_track_clear(GtkMenuItem *item, g
501  #endif  #endif
502    
503    
504    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
505  // Half-arsed slapdash common menu item constructor. Let's use GtkBuilder  // Half-arsed slapdash common menu item constructor. Let's use GtkBuilder
506  // instead so we have some flexibility.  // instead so we have some flexibility.
507    
# Line 431  menu_append_new_item(appdata_t *appdata, Line 515  menu_append_new_item(appdata_t *appdata,
515                       const gchar *accel_path,                       const gchar *accel_path,
516                       guint accel_key,      // from gdk/gdkkeysyms.h                       guint accel_key,      // from gdk/gdkkeysyms.h
517                       GdkModifierType accel_mods, // e.g. GDK_CONTROL_MASK                       GdkModifierType accel_mods, // e.g. GDK_CONTROL_MASK
518                         gboolean enabled,
519                       gboolean is_check, gboolean check_status)                       gboolean is_check, gboolean check_status)
520  {  {
521    GtkWidget *item = NULL;    GtkWidget *item = NULL;
# Line 486  menu_append_new_item(appdata_t *appdata, Line 571  menu_append_new_item(appdata_t *appdata,
571  #endif  #endif
572    
573    gtk_menu_shell_append(GTK_MENU_SHELL(menu_shell), GTK_WIDGET(item));    gtk_menu_shell_append(GTK_MENU_SHELL(menu_shell), GTK_WIDGET(item));
574    if (is_check) {    gtk_widget_set_sensitive(GTK_WIDGET(item), enabled);
575      if (is_check)
576      gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), check_status);      gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), check_status);
577    }  
578    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(activate_cb),    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(activate_cb),
579                     appdata);                     appdata);
580    return item;    return item;
581  }  }
582    
   
583  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
584    GtkWidget *menu, *item, *submenu;    GtkWidget *menu, *item, *submenu;
585    GtkWidget *about_quit_items_menu;    GtkWidget *about_quit_items_menu;
# Line 519  void menu_create(appdata_t *appdata) { Line 604  void menu_create(appdata_t *appdata) {
604  #endif  #endif
605    
606    menu_append_new_item(    menu_append_new_item(
607      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_open), _("_Open..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_open), _("_Open"),
608      GTK_STOCK_OPEN, "<OSM2Go-Main>/Project/Open",      GTK_STOCK_OPEN, "<OSM2Go-Main>/Project/Open",
609      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
610    );    );
611    
612    appdata->menu_item_project_close = menu_append_new_item(    menu_append_new_item(
613      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_close), _("_Close"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_wizard), _("_Wizard"),
614      GTK_STOCK_CLOSE, "<OSM2Go-Main>/Project/Close",      GTK_STOCK_NEW, "<OSM2Go-Main>/Project/Wizard",
615      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
616    );    );
617    
618    /* --------------- view menu ------------------- */    /* --------------- view menu ------------------- */
# Line 536  void menu_create(appdata_t *appdata) { Line 621  void menu_create(appdata_t *appdata) {
621    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());
622  #endif  #endif
623    
624    appdata->menu_view = item = gtk_menu_item_new_with_mnemonic( _("_View") );    appdata->submenu_view = item = gtk_menu_item_new_with_mnemonic( _("_View") );
625    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
626    submenu = gtk_menu_new();    submenu = gtk_menu_new();
627    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
628    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
629    
630    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
631    appdata->menu_item_view_fullscreen = menu_append_new_item(    appdata->menu_item_view_fullscreen = menu_append_new_item(
632      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_fullscreen), _("_Fullscreen"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_fullscreen), _("_Fullscreen"),
633      GTK_STOCK_FULLSCREEN, "<OSM2Go-Main>/View/Fullscreen",      GTK_STOCK_FULLSCREEN, "<OSM2Go-Main>/View/Fullscreen",
634      0, 0, TRUE, FALSE      0, 0, TRUE, TRUE, FALSE
635    );    );
636    #endif
637    
638    menu_append_new_item(    menu_append_new_item(
639      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),
640      GTK_STOCK_ZOOM_IN, "<OSM2Go-Main>/View/ZoomIn",      GTK_STOCK_ZOOM_IN, "<OSM2Go-Main>/View/ZoomIn",
641      GDK_comma, GDK_CONTROL_MASK, FALSE, FALSE      GDK_comma, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
642    );    );
643    
644    menu_append_new_item(    menu_append_new_item(
645      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomout), _("Zoom _out"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomout), _("Zoom _out"),
646      GTK_STOCK_ZOOM_OUT, "<OSM2Go-Main>/View/ZoomOut",      GTK_STOCK_ZOOM_OUT, "<OSM2Go-Main>/View/ZoomOut",
647      GDK_period, GDK_CONTROL_MASK, FALSE, FALSE      GDK_period, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
648      );
649    
650      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
651    
652      menu_append_new_item(
653        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_view_detail_inc), _("More details"),
654        NULL, "<OSM2Go-Main>/View/DetailInc",
655        GDK_period, GDK_MOD1_MASK, TRUE, FALSE, FALSE
656    );    );
657    
658    /* -------------------- OSM submenu -------------------- */    menu_append_new_item(
659        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_view_detail_normal), _("Normal details"),
660        NULL, "<OSM2Go-Main>/View/DetailNormal",
661        0, 0, TRUE, FALSE, FALSE
662      );
663    
664      menu_append_new_item(
665        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_view_detail_dec), _("Less details"),
666        NULL, "<OSM2Go-Main>/View/DetailDec",
667        GDK_comma, GDK_MOD1_MASK, TRUE, FALSE, FALSE
668      );
669    
670      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
671    
672    appdata->menu_osm = item = gtk_menu_item_new_with_mnemonic( _("_OSM") );    appdata->menu_item_map_hide_sel = menu_append_new_item(
673        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_hide_sel), _("_Hide selected"),
674        GTK_STOCK_REMOVE, "<OSM2Go-Main>/View/HideSelected",
675        0, 0, TRUE, FALSE, FALSE
676      );
677      gtk_widget_set_sensitive(appdata->menu_item_map_hide_sel, FALSE);
678    
679      appdata->menu_item_map_show_all = menu_append_new_item(
680        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_show_all), _("_Show all"),
681        GTK_STOCK_ADD, "<OSM2Go-Main>/View/ShowAll",
682        0, 0, TRUE, FALSE, FALSE
683      );
684      gtk_widget_set_sensitive(appdata->menu_item_map_show_all, FALSE);
685    
686      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
687    
688      menu_append_new_item(
689        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_style), _("St_yle"),
690        GTK_STOCK_SELECT_COLOR, "<OSM2Go-Main>/View/Style",
691        0, 0, TRUE, FALSE, FALSE
692      );
693    
694      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
695    
696      appdata->menu_item_map_no_icons = menu_append_new_item(
697        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_icons), _("No _icons"),
698        NULL, "<OSM2Go-Main>/View/NoIcons",
699        0, 0, TRUE, TRUE, appdata->settings->no_icons
700      );
701    
702    
703      /* -------------------- map submenu -------------------- */
704    
705      appdata->submenu_map = item = gtk_menu_item_new_with_mnemonic( _("_Map") );
706    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
707    submenu = gtk_menu_new();    submenu = gtk_menu_new();
708    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
709    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
710    
711    appdata->menu_item_osm_upload = menu_append_new_item(    appdata->menu_item_map_upload = menu_append_new_item(
712      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload"),
713      "upload.16", "<OSM2Go-Main>/OSM/Upload",      "upload.16", "<OSM2Go-Main>/Map/Upload",
714      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
715    );    );
716    
717    menu_append_new_item(    menu_append_new_item(
718      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download"),
719      "download.16", "<OSM2Go-Main>/OSM/Download",      "download.16", "<OSM2Go-Main>/Map/Download",
720      GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE      GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
721    );    );
722    
723    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());
724    
725    if(getenv("OSM2GO_UNDO_TEST")) {    if(getenv("OSM2GO_UNDO_TEST")) {
726      appdata->menu_item_osm_undo = menu_append_new_item(      appdata->menu_item_map_undo = menu_append_new_item(
727                 appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo), _("_Undo"),                 appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo), _("_Undo"),
728                 GTK_STOCK_UNDO, "<OSM2Go-Main>/OSM/Undo",                 GTK_STOCK_UNDO, "<OSM2Go-Main>/Map/Undo",
729                 GDK_z, GDK_CONTROL_MASK, FALSE, FALSE                 GDK_z, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
730                 );                 );
731    } else    } else
732      printf("set environment variable OSM2GO_UNDO_TEST to enable undo framework tests\n");      printf("set environment variable OSM2GO_UNDO_TEST to enable undo framework tests\n");
733    
734    appdata->menu_item_osm_save_changes = menu_append_new_item(    appdata->menu_item_map_save_changes = menu_append_new_item(
735      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),
736      GTK_STOCK_SAVE, "<OSM2Go-Main>/OSM/SaveChanges",      GTK_STOCK_SAVE, "<OSM2Go-Main>/Map/SaveChanges",
737      GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE      GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
738    );    );
739    
740    appdata->menu_item_osm_undo_changes = menu_append_new_item(    appdata->menu_item_map_undo_changes = menu_append_new_item(
741      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo_changes), _("Disca_rd local changes..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo_changes), _("Disca_rd local changes"),
742      GTK_STOCK_DELETE, "<OSM2Go-Main>/OSM/DiscardChanges",      GTK_STOCK_DELETE, "<OSM2Go-Main>/Map/DiscardChanges",
743      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
744    );    );
745    
746    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());
747    appdata->menu_item_osm_relations = menu_append_new_item(    appdata->menu_item_map_relations = menu_append_new_item(
748      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations"),
749      NULL, "<OSM2Go-Main>/OSM/Relations",      NULL, "<OSM2Go-Main>/Map/Relations",
750      GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE      GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
751    );    );
752    
753    /* -------------------- wms submenu -------------------- */    /* -------------------- wms submenu -------------------- */
754    
755    appdata->menu_wms = item = gtk_menu_item_new_with_mnemonic( _("_WMS") );    appdata->submenu_wms = item = gtk_menu_item_new_with_mnemonic( _("_WMS") );
756    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
757    submenu = gtk_menu_new();    submenu = gtk_menu_new();
758    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
759    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
760    
761    menu_append_new_item(    menu_append_new_item(
762      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_import), _("_Import..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_import), _("_Import"),
763      GTK_STOCK_INDEX, "<OSM2Go-Main>/WMS/Import",      GTK_STOCK_INDEX, "<OSM2Go-Main>/WMS/Import",
764      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
765    );    );
766    
767    appdata->menu_item_wms_clear = menu_append_new_item(    appdata->menu_item_wms_clear = menu_append_new_item(
768      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_clear), _("_Clear"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_clear), _("_Clear"),
769      GTK_STOCK_CLEAR, "<OSM2Go-Main>/WMS/Clear",      GTK_STOCK_CLEAR, "<OSM2Go-Main>/WMS/Clear",
770      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
771    );    );
772    gtk_widget_set_sensitive(appdata->menu_item_wms_clear, FALSE);    gtk_widget_set_sensitive(appdata->menu_item_wms_clear, FALSE);
773    
774    appdata->menu_item_wms_adjust = menu_append_new_item(    appdata->menu_item_wms_adjust = menu_append_new_item(
775      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_adjust), _("_Adjust"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_adjust), _("_Adjust"),
776      NULL, "<OSM2Go-Main>/WMS/Adjust",      NULL, "<OSM2Go-Main>/WMS/Adjust",
777      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
778    );    );
779    gtk_widget_set_sensitive(appdata->menu_item_wms_adjust, FALSE);    gtk_widget_set_sensitive(appdata->menu_item_wms_adjust, FALSE);
780    
   /* -------------------- map submenu -------------------- */  
   
   appdata->menu_map = item = gtk_menu_item_new_with_mnemonic( _("_Map") );  
   gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);  
   submenu = gtk_menu_new();  
   gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);  
   gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);  
   
   appdata->menu_item_map_hide_sel = menu_append_new_item(  
     appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_hide_sel), _("_Hide selected"),  
     GTK_STOCK_REMOVE, "<OSM2Go-Main>/Map/HideSelected",  
     0, 0, FALSE, FALSE  
   );  
   gtk_widget_set_sensitive(appdata->menu_item_map_hide_sel, FALSE);  
   
   appdata->menu_item_map_show_all = menu_append_new_item(  
     appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_show_all), _("_Show all"),  
     GTK_STOCK_ADD, "<OSM2Go-Main>/Map/ShowAll",  
     0, 0, FALSE, FALSE  
   );  
   gtk_widget_set_sensitive(appdata->menu_item_map_show_all, FALSE);  
   
   gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());  
   
   menu_append_new_item(  
     appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_style), _("St_yle..."),  
     GTK_STOCK_SELECT_COLOR, "<OSM2Go-Main>/Map/Style",  
     0, 0, FALSE, FALSE  
   );  
   
   gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());  
   
   /* switches mainly intended for testing/debugging */  
   menu_append_new_item(  
     appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_redraw), _("_Redraw"),  
     NULL, "<OSM2Go-Main>/Map/Redraw",  
     GDK_r, GDK_CONTROL_MASK, FALSE, FALSE  
   );  
   
   appdata->menu_item_map_no_icons = menu_append_new_item(  
     appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_icons), _("No _icons"),  
     NULL, "<OSM2Go-Main>/Map/NoIcons",  
     0, 0, TRUE, appdata->settings->no_icons  
   );  
   
   appdata->menu_item_map_no_antialias = menu_append_new_item(  
     appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_antialias),  
     _("No _antialias"),  
     NULL, "<OSM2Go-Main>/Map/NoAntialias",  
     0, 0, TRUE, appdata->settings->no_antialias  
   );  
   
781    /* -------------------- track submenu -------------------- */    /* -------------------- track submenu -------------------- */
782    
783    appdata->track.menu_track = item = gtk_menu_item_new_with_mnemonic(_("_Track"));    appdata->track.submenu_track = item =
784        gtk_menu_item_new_with_mnemonic(_("_Track"));
785    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
786    submenu = gtk_menu_new();    submenu = gtk_menu_new();
787    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
788    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
789    
790    appdata->track.menu_item_import = menu_append_new_item(    appdata->track.menu_item_track_import = menu_append_new_item(
791      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import"),
792      NULL, "<OSM2Go-Main>/Track/Import",      NULL, "<OSM2Go-Main>/Track/Import",
793      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
794    );    );
795    
796    appdata->track.menu_item_export = menu_append_new_item(    appdata->track.menu_item_track_export = menu_append_new_item(
797      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export"),
798      NULL, "<OSM2Go-Main>/Track/Export",      NULL, "<OSM2Go-Main>/Track/Export",
799      0, 0, FALSE, FALSE      0, 0, FALSE, FALSE, FALSE
800    );    );
801    
802    appdata->track.menu_item_clear = menu_append_new_item(    appdata->track.menu_item_track_clear = menu_append_new_item(
803      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_clear), _("_Clear"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_clear), _("_Clear"),
804      GTK_STOCK_CLEAR, "<OSM2Go-Main>/Track/Clear",      GTK_STOCK_CLEAR, "<OSM2Go-Main>/Track/Clear",
805      0, 0, FALSE, FALSE      0, 0, FALSE, FALSE, FALSE
806    );    );
807    
808    
809    appdata->track.menu_item_gps = menu_append_new_item(    appdata->track.menu_item_track_enable_gps = menu_append_new_item(
810      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_gps), _("_GPS"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_enable_gps),_("_GPS enable"),
811      NULL, "<OSM2Go-Main>/Track/GPS",      NULL, "<OSM2Go-Main>/Track/GPS",
812      GDK_g, GDK_CONTROL_MASK|GDK_SHIFT_MASK, TRUE, FALSE      GDK_g, GDK_CONTROL_MASK|GDK_SHIFT_MASK, TRUE, TRUE,
813        appdata->settings->enable_gps
814      );
815    
816      appdata->track.menu_item_track_follow_gps = menu_append_new_item(
817        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_follow_gps), _("GPS follow"),
818        NULL, "<OSM2Go-Main>/Track/Follow",
819        0, 0, appdata->settings->enable_gps, TRUE,
820        appdata->settings->follow_gps
821    );    );
822    
823    /* ------------------------------------------------------- */    /* ------------------------------------------------------- */
# Line 729  void menu_create(appdata_t *appdata) { Line 826  void menu_create(appdata_t *appdata) {
826                          gtk_separator_menu_item_new());                          gtk_separator_menu_item_new());
827    
828    menu_append_new_item(    menu_append_new_item(
829      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_about), _("_About..."),      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_about), _("_About"),
830      GTK_STOCK_ABOUT, "<OSM2Go-Main>/About",      GTK_STOCK_ABOUT, "<OSM2Go-Main>/About",
831      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
832    );    );
833    
834    #ifndef USE_HILDON
835    menu_append_new_item(    menu_append_new_item(
836      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_quit), _("_Quit"),      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_quit), _("_Quit"),
837      GTK_STOCK_QUIT, "<OSM2Go-Main>/Quit",      GTK_STOCK_QUIT, "<OSM2Go-Main>/Quit",
838      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
839    );    );
840    #endif
841    
842    gtk_window_add_accel_group(GTK_WINDOW(appdata->window), accel_grp);    gtk_window_add_accel_group(GTK_WINDOW(appdata->window), accel_grp);
843    
# Line 764  void menu_create(appdata_t *appdata) { Line 863  void menu_create(appdata_t *appdata) {
863    
864  #endif //USE_HILDON  #endif //USE_HILDON
865  }  }
866    #else // !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
867    
868    void submenu_entry(appdata_t *appdata, HildonAppMenu *menu,
869                       const char *label, const char *value,
870                       GtkSignalFunc activate_cb) {
871    
872    }
873    
874    typedef struct {
875      const char *label, *value;
876      gboolean enabled;
877      gboolean (*toggle)(appdata_t *appdata);
878      gulong offset;
879      GtkSignalFunc activate_cb;
880    } menu_entry_t;
881    
882    static gboolean no_icon_get_toggle(appdata_t *appdata) {
883      if(!appdata)           return FALSE;
884      if(!appdata->settings) return FALSE;
885      return appdata->settings->no_icons;
886    }
887    
888    static gboolean enable_gps_get_toggle(appdata_t *appdata) {
889      if(!appdata)           return FALSE;
890      if(!appdata->settings) return FALSE;
891      return appdata->settings->enable_gps;
892    }
893    
894    static gboolean follow_gps_get_toggle(appdata_t *appdata) {
895      if(!appdata)           return FALSE;
896      if(!appdata->settings) return FALSE;
897      return appdata->settings->follow_gps;
898    }
899    
900    /* create a HildonAppMenu */
901    static GtkWidget *app_menu_create(appdata_t *appdata,
902                                      const menu_entry_t *menu_entries) {
903      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
904    
905      while(menu_entries->label) {
906        GtkWidget *button = NULL;
907    
908        if(!menu_entries->toggle) {
909          button = hildon_button_new_with_text(
910                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
911                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
912                _(menu_entries->label), _(menu_entries->value));
913          g_signal_connect_after(button, "clicked",
914                                 menu_entries->activate_cb, appdata);
915        } else {
916          button = hildon_check_button_new(HILDON_SIZE_AUTO);
917          gtk_button_set_label(GTK_BUTTON(button), _(menu_entries->label));
918          printf("requesting check for %s: %p\n", menu_entries->label,
919                 menu_entries->toggle);
920          hildon_check_button_set_active(HILDON_CHECK_BUTTON(button),
921                                         menu_entries->toggle(appdata));
922          g_signal_connect_after(button, "toggled",
923                                 menu_entries->activate_cb, appdata);
924        }
925    
926        /* offset to GtkWidget pointer was given -> store pointer */
927        if(menu_entries->offset)
928          *(GtkWidget**)(((void*)appdata)+menu_entries->offset) = button;
929    
930        gtk_widget_set_sensitive(button, menu_entries->enabled);
931    
932        hildon_app_menu_append(menu, GTK_BUTTON(button));
933        menu_entries++;
934      }
935    
936      gtk_widget_show_all(GTK_WIDGET(menu));
937      return GTK_WIDGET(menu);
938    }
939    
940    /* the view submenu */
941    void on_submenu_view_clicked(GtkButton *button, appdata_t *appdata) {
942      hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_view),
943                            GTK_WINDOW(appdata->window));
944    }
945    
946    void on_submenu_map_clicked(GtkButton *button, appdata_t *appdata) {
947      hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_map),
948                            GTK_WINDOW(appdata->window));
949    }
950    
951    void on_submenu_wms_clicked(GtkButton *button, appdata_t *appdata) {
952      hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_wms),
953                            GTK_WINDOW(appdata->window));
954    }
955    
956    void on_submenu_track_clicked(GtkButton *button, appdata_t *appdata) {
957      hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_track),
958                            GTK_WINDOW(appdata->window));
959    }
960    
961    #define APP_OFFSET(a)  offsetof(appdata_t, a)
962    #define SIMPLE_ENTRY(a,b)     { a, NULL, TRUE,   NULL, 0, G_CALLBACK(b) }
963    #define ENABLED_ENTRY(a,b,c)  { a, NULL, TRUE,  NULL, APP_OFFSET(c), G_CALLBACK(b) }
964    #define DISABLED_ENTRY(a,b,c) { a, NULL, FALSE,  NULL, APP_OFFSET(c), G_CALLBACK(b) }
965    #define TOGGLE_ENTRY(a,b,c)   { a, NULL, TRUE, c, 0, G_CALLBACK(b) }
966    #define DISABLED_TOGGLE_ENTRY(a,b,c,d)  \
967                                  { a, NULL, FALSE, c, APP_OFFSET(d), G_CALLBACK(b) }
968    #define ENABLED_TOGGLE_ENTRY(a,b,c,d) \
969                                  { a, NULL, TRUE, c, APP_OFFSET(d), G_CALLBACK(b) }
970    #define LAST_ENTRY            { NULL, NULL, FALSE, NULL, 0, NULL }
971    
972    /* -- the view submenu -- */
973    static const menu_entry_t submenu_view[] = {
974      SIMPLE_ENTRY("Zoom in",         cb_menu_zoomin),
975      SIMPLE_ENTRY("Zoom out",        cb_menu_zoomout),
976      /* --- */
977      SIMPLE_ENTRY("Style",           cb_menu_style),
978      /* --- */
979      SIMPLE_ENTRY("Normal details",  cb_menu_view_detail_normal),
980      SIMPLE_ENTRY("More details",    cb_menu_view_detail_inc),
981      SIMPLE_ENTRY("Less details",    cb_menu_view_detail_dec),
982      /* --- */
983      DISABLED_ENTRY("Hide selected", cb_menu_map_hide_sel, menu_item_map_hide_sel),
984      DISABLED_ENTRY("Show all",      cb_menu_map_show_all, menu_item_map_show_all),
985      /* --- */
986      TOGGLE_ENTRY("No icons",        cb_menu_map_no_icons, no_icon_get_toggle),
987    
988      LAST_ENTRY
989    };
990    
991    /* -- the map submenu -- */
992    static const menu_entry_t submenu_map[] = {
993      ENABLED_ENTRY("Upload",                cb_menu_upload, menu_item_map_upload),
994      SIMPLE_ENTRY("Download",               cb_menu_download),
995      ENABLED_ENTRY("Save local changes",    cb_menu_save_changes,
996                                               menu_item_map_save_changes),
997      ENABLED_ENTRY("Discard local changes", cb_menu_undo_changes,
998                                               menu_item_map_undo_changes),
999      ENABLED_ENTRY("Relations",             cb_menu_osm_relations,
1000                                               menu_item_map_relations),
1001    
1002      LAST_ENTRY
1003    };
1004    
1005    /* -- the wms submenu -- */
1006    static const menu_entry_t submenu_wms[] = {
1007      SIMPLE_ENTRY("Import",   cb_menu_wms_import),
1008      DISABLED_ENTRY("Clear",  cb_menu_wms_clear, menu_item_wms_clear),
1009      DISABLED_ENTRY("Adjust", cb_menu_wms_adjust, menu_item_wms_adjust),
1010    
1011      LAST_ENTRY
1012    };
1013    
1014    /* -- the track submenu -- */
1015    static const menu_entry_t submenu_track[] = {
1016      ENABLED_ENTRY("Import",  cb_menu_track_import, track.menu_item_track_import),
1017      DISABLED_ENTRY("Export", cb_menu_track_export, track.menu_item_track_export),
1018      DISABLED_ENTRY("Clear",  cb_menu_track_clear, track.menu_item_track_clear),
1019      ENABLED_TOGGLE_ENTRY("GPS enable", cb_menu_track_enable_gps,
1020                    enable_gps_get_toggle, track.menu_item_track_enable_gps),
1021      DISABLED_TOGGLE_ENTRY("GPS follow", cb_menu_track_follow_gps,
1022                    follow_gps_get_toggle, track.menu_item_track_follow_gps),
1023    
1024      LAST_ENTRY
1025    };
1026    
1027    
1028    /* -- the applications main menu -- */
1029    static const menu_entry_t main_menu[] = {
1030      SIMPLE_ENTRY("About",   cb_menu_about),
1031      SIMPLE_ENTRY("Project", cb_menu_project_open),
1032      ENABLED_ENTRY("View",   on_submenu_view_clicked,  submenu_view),
1033      ENABLED_ENTRY("Map",    on_submenu_map_clicked,   submenu_map),
1034      ENABLED_ENTRY("WMS",    on_submenu_wms_clicked,   submenu_wms),
1035      ENABLED_ENTRY("Track",  on_submenu_track_clicked, track.submenu_track),
1036    
1037      LAST_ENTRY
1038    };
1039    
1040    void menu_create(appdata_t *appdata) {
1041      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1042    
1043      /* build menu/submenus */
1044      menu = HILDON_APP_MENU(app_menu_create(appdata, main_menu));
1045      appdata->app_menu_wms   = app_menu_create(appdata, submenu_wms);
1046      appdata->app_menu_map   = app_menu_create(appdata, submenu_map);
1047      appdata->app_menu_view  = app_menu_create(appdata, submenu_view);
1048      appdata->app_menu_track = app_menu_create(appdata, submenu_track);
1049    
1050      /* enable/disable some entries according to settings */
1051      if(appdata && appdata->settings)
1052        gtk_widget_set_sensitive(appdata->track.menu_item_track_follow_gps,
1053                                 appdata->settings->enable_gps);
1054    
1055      hildon_window_set_app_menu(HILDON_WINDOW(appdata->window), menu);
1056    }
1057    #endif
1058    
1059  /********************* end of menu **********************/  /********************* end of menu **********************/
1060    
# Line 835  void cleanup(appdata_t *appdata) { Line 1126  void cleanup(appdata_t *appdata) {
1126    
1127    project_free(appdata->project);    project_free(appdata->project);
1128    
1129    if(appdata->menu_item_osm_undo)    if(appdata->menu_item_map_undo)
1130      undo_free(appdata->undo.state);      undo_free(appdata->undo.state);
1131    
1132    puts("everything is gone");    puts("everything is gone");
# Line 853  gboolean on_window_key_press(GtkWidget * Line 1144  gboolean on_window_key_press(GtkWidget *
1144    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1145    int handled = FALSE;    int handled = FALSE;
1146    
1147      //  printf("key event with keyval %x\n", event->keyval);
1148    
1149    // the map handles some keys on its own ...    // the map handles some keys on its own ...
1150    switch(event->keyval) {    switch(event->keyval) {
1151    
1152    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
1153  #ifdef USE_HILDON  #ifdef USE_HILDON
1154      /* this is in fact a mapping to GDK_F6 */      /* this is in fact a mapping to GDK_F6 */
1155    case HILDON_HARDKEY_FULLSCREEN:    case HILDON_HARDKEY_FULLSCREEN:
# Line 875  gboolean on_window_key_press(GtkWidget * Line 1169  gboolean on_window_key_press(GtkWidget *
1169    
1170      handled = TRUE;      handled = TRUE;
1171      break;      break;
1172    #endif
1173    }    }
1174    
1175    /* forward unprocessed key presses to map */    /* forward unprocessed key presses to map */
# Line 924  int main(int argc, char *argv[]) { Line 1219  int main(int argc, char *argv[]) {
1219    /* Create HildonWindow and set it to HildonProgram */    /* Create HildonWindow and set it to HildonProgram */
1220    appdata.window = HILDON_WINDOW(hildon_window_new());    appdata.window = HILDON_WINDOW(hildon_window_new());
1221    hildon_program_add_window(appdata.program, appdata.window);    hildon_program_add_window(appdata.program, appdata.window);
1222    
1223    #if MAEMO_VERSION_MAJOR == 5
1224      unsigned long val;
1225      XChangeProperty(GDK_DISPLAY(),
1226                      GDK_WINDOW_XID(GTK_WIDGET(appdata.window)->window),
1227                      XInternAtom(GDK_DISPLAY(),
1228                                  "_HILDON_ZOOM_KEY_ATOM",
1229                                  False), XA_INTEGER, 32,
1230                      PropModeReplace, (unsigned char *) &val, 1);
1231    #endif
1232    
1233  #else  #else
1234    /* Create a Window. */    /* Create a Window. */
1235    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
# Line 966  int main(int argc, char *argv[]) { Line 1272  int main(int argc, char *argv[]) {
1272      return -1;      return -1;
1273    }    }
1274    
1275    #if 0  // another test overlay
1276      {
1277        GtkWidget *fixed = gtk_fixed_new();
1278    
1279        gtk_fixed_put(GTK_FIXED(fixed), gtk_label_new("Nase"), 0,0);
1280        gtk_fixed_put(GTK_FIXED(fixed), map, 0,0);
1281    
1282        gtk_box_pack_start(GTK_BOX(vbox), fixed, TRUE, TRUE, 0);
1283      }
1284    #else
1285    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);
1286    #endif
1287    
1288    #ifdef ZOOM_BUTTONS
1289      GtkWidget *zhbox = gtk_hbox_new(FALSE, 0);
1290    
1291      gtk_box_pack_start_defaults(GTK_BOX(zhbox), statusbar_new(&appdata));
1292    
1293      /* ---- add zoom in button right of statusbar ---- */
1294      appdata.btn_zoom_in = gtk_button_new();
1295      gtk_button_set_image(GTK_BUTTON(appdata.btn_zoom_in),
1296                           gtk_image_new_from_stock(GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU));
1297      g_signal_connect(appdata.btn_zoom_in, "clicked", G_CALLBACK(cb_menu_zoomin), &appdata);
1298      gtk_box_pack_start(GTK_BOX(zhbox), appdata.btn_zoom_in, FALSE, FALSE, 0);
1299    
1300      /* ---- add zoom out button right of statusbar ---- */
1301      appdata.btn_zoom_out = gtk_button_new();
1302      gtk_button_set_image(GTK_BUTTON(appdata.btn_zoom_out),
1303                           gtk_image_new_from_stock(GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU));
1304      g_signal_connect(appdata.btn_zoom_out, "clicked", G_CALLBACK(cb_menu_zoomout), &appdata);
1305      gtk_box_pack_start(GTK_BOX(zhbox), appdata.btn_zoom_out, FALSE, FALSE, 0);
1306    
1307    
1308      gtk_box_pack_start(GTK_BOX(vbox), zhbox, FALSE, FALSE, 0);
1309    #else
1310    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);
1311    #endif
1312    
1313  #ifndef PORTRAIT  #ifndef PORTRAIT
1314    gtk_box_pack_start(GTK_BOX(hbox), iconbar_new(&appdata), FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(hbox), iconbar_new(&appdata), FALSE, FALSE, 0);
1315  #endif  #endif
   gtk_box_pack_start(GTK_BOX(hbox), gtk_vseparator_new(), FALSE, FALSE, 0);  
1316    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
1317    
1318    gtk_box_pack_start(GTK_BOX(appdata.vbox), hbox, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(appdata.vbox), hbox, TRUE, TRUE, 0);
# Line 985  int main(int argc, char *argv[]) { Line 1325  int main(int argc, char *argv[]) {
1325    
1326    /* let gtk do its thing before loading the data, */    /* let gtk do its thing before loading the data, */
1327    /* so the user sees something */    /* so the user sees something */
1328    while(gtk_events_pending()) {    while(gtk_events_pending())
     putchar('.');  
1329      gtk_main_iteration();      gtk_main_iteration();
   }  
1330    
1331    /* load project if one is specified in the settings */    /* load project if one is specified in the settings */
1332    if(appdata.settings->project)    if(appdata.settings->project)
# Line 996  int main(int argc, char *argv[]) { Line 1334  int main(int argc, char *argv[]) {
1334    
1335    main_ui_enable(&appdata);    main_ui_enable(&appdata);
1336    
1337    /* ------------ jump into main loop ---------------- */    /* start GPS if enabled by config */
1338      if(appdata.settings && appdata.settings->enable_gps)
1339        track_enable_gps(&appdata, TRUE);
1340    
1341      /* again let the ui do its thing */
1342      while(gtk_events_pending())
1343        gtk_main_iteration();
1344    
1345    #if 0  // test overlay
1346      {
1347        GtkWidget *overlay = gtk_window_new(GTK_WINDOW_POPUP);
1348        gtk_window_set_default_size(GTK_WINDOW(overlay), 40, 20);
1349        gtk_window_set_transient_for(GTK_WINDOW(overlay), GTK_WINDOW(appdata.window));
1350        gtk_window_set_keep_above(GTK_WINDOW(overlay), TRUE);
1351        gtk_window_set_destroy_with_parent(GTK_WINDOW(overlay), TRUE);
1352        gtk_window_set_position(GTK_WINDOW(overlay), GTK_WIN_POS_CENTER_ON_PARENT);
1353        gtk_window_set_decorated(GTK_WINDOW(overlay), TRUE);
1354    
1355        /* add some zoom buttons for testing */
1356        GtkWidget *hbox = gtk_hbox_new(TRUE, 0);
1357        gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_button_new_with_label("+"));
1358        gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_button_new_with_label("-"));
1359        gtk_container_add(GTK_CONTAINER(overlay), hbox);
1360    
1361        gtk_widget_show_all(overlay);
1362      }
1363    #endif
1364    
1365      /* start to interact with the user now that the gui is running */
1366      if(appdata.settings->first_run_demo) {
1367        messagef(GTK_WIDGET(appdata.window), _("Welcome to OSM2Go"),
1368                 _("This is the first time you run OSM2Go. "
1369                   "A demo project has been loaded to get you "
1370                   "started. You can play around with this demo as much "
1371                   "as you like. However, you cannot upload or download "
1372                   "the demo project.\n\n"
1373                   "In order to start working on real data you'll have "
1374                   "to setup a new project and enter your OSM user name "
1375                   "and password. You'll then be able to download the "
1376                   "latest data from OSM and upload your changes into "
1377                   "the OSM main database."
1378                   ));
1379      }
1380    
1381      /* ------------ jump into main loop ---------------- */
1382    gtk_main();    gtk_main();
1383    
1384    puts("gtk_main() left");    puts("gtk_main() left");
1385    
1386    track_save(appdata.project, appdata.track.track);    track_save(appdata.project, appdata.track.track);
1387    track_clear(&appdata, appdata.track.track);    track_clear(&appdata, appdata.track.track);
1388      appdata.track.track = NULL;
1389    
1390    /* save a diff if there are dirty entries */    /* save a diff if there are dirty entries */
1391    diff_save(appdata.project, appdata.osm);    diff_save(appdata.project, appdata.osm);
Legend:
Removed from v.139  
changed lines
  Added in v.195