Diff of /trunk/src/main.c

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

revision 156 by harbaum, Wed Apr 1 12:47:35 2009 UTC revision 190 by harbaum, Mon Jul 6 19:17:24 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    
66    /* disable all menu entries related to map */    /* disable all menu entries related to map */
67    gtk_widget_set_sensitive(appdata->menu_osm, project_valid);    gtk_widget_set_sensitive(appdata->submenu_map, project_valid);
68    gtk_widget_set_sensitive(appdata->menu_item_osm_upload, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_upload, osm_valid);
69    if(appdata->menu_item_osm_undo)    if(appdata->menu_item_map_undo)
70      gtk_widget_set_sensitive(appdata->menu_item_osm_undo, osm_valid);      gtk_widget_set_sensitive(appdata->menu_item_map_undo, osm_valid);
71    gtk_widget_set_sensitive(appdata->menu_item_osm_save_changes, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_save_changes, osm_valid);
72    gtk_widget_set_sensitive(appdata->menu_item_osm_undo_changes, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_undo_changes, osm_valid);
73    gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_relations, osm_valid);
74    gtk_widget_set_sensitive(appdata->menu_view, osm_valid);    gtk_widget_set_sensitive(appdata->track.submenu_track, osm_valid);
75    gtk_widget_set_sensitive(appdata->menu_wms, osm_valid);    gtk_widget_set_sensitive(appdata->submenu_view, osm_valid);
76    gtk_widget_set_sensitive(appdata->menu_map, osm_valid);    gtk_widget_set_sensitive(appdata->submenu_wms, osm_valid);
   gtk_widget_set_sensitive(appdata->menu_item_project_close, project_valid);  
77    
78    if(!project_valid)    if(!project_valid)
79      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 89  cb_menu_project_open(GtkMenuItem *item,
89  }  }
90    
91  static void  static void
92  cb_menu_project_close(GtkMenuItem *item, gpointer data) {  cb_menu_project_wizard(GtkMenuItem *item, gpointer data) {
93    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
94    project_close(appdata);    project_wizard(appdata);
   main_ui_enable(appdata);  
95  }  }
96    
97  static void  static void
# Line 114  cb_menu_about(GtkMenuItem *item, gpointe Line 120  cb_menu_about(GtkMenuItem *item, gpointe
120    
121  void on_window_destroy (GtkWidget *widget, gpointer data);  void on_window_destroy (GtkWidget *widget, gpointer data);
122    
123    #ifndef USE_HILDON
124  static void  static void
125  cb_menu_quit(GtkMenuItem *item, gpointer data) {  cb_menu_quit(GtkMenuItem *item, gpointer data) {
126    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
127    gtk_widget_destroy(GTK_WIDGET(appdata->window));    gtk_widget_destroy(GTK_WIDGET(appdata->window));
128  }  }
129    #endif
130    
131  static void  static void
132  cb_menu_upload(GtkMenuItem *item, gpointer data) {  cb_menu_upload(GtkMenuItem *item, gpointer data) {
133    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
134    if(!appdata->osm || !appdata->project) return;    if(!appdata->osm || !appdata->project) return;
135    
136      if(project_check_demo(GTK_WIDGET(appdata->window), appdata->project))
137        return;
138    
139    osm_upload(appdata, appdata->osm, appdata->project);    osm_upload(appdata, appdata->osm, appdata->project);
140  }  }
141    
# Line 133  cb_menu_download(GtkMenuItem *item, gpoi Line 144  cb_menu_download(GtkMenuItem *item, gpoi
144    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
145    if(!appdata->project) return;    if(!appdata->project) return;
146    
147      if(project_check_demo(GTK_WIDGET(appdata->window), appdata->project))
148        return;
149    
150    /* if we have valid osm data loaded: save state first */    /* if we have valid osm data loaded: save state first */
151    if(appdata->osm) {    if(appdata->osm) {
152      /* 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 158  cb_menu_download(GtkMenuItem *item, gpoi
158    }    }
159    
160    // download    // download
161    if(osm_download(GTK_WIDGET(appdata->window), appdata->project)) {    if(osm_download(GTK_WIDGET(appdata->window), appdata->settings,
162      banner_busy_start(appdata, 1, "Redrawing...");                    appdata->project)) {
163      appdata->osm = osm_parse(appdata->project->osm);      banner_busy_start(appdata, 1, "Redrawing");
164        appdata->osm = osm_parse(appdata->project->path, appdata->project->osm);
165      diff_restore(appdata, appdata->project, appdata->osm);      diff_restore(appdata, appdata->project, appdata->osm);
166      map_paint(appdata);      map_paint(appdata);
167      banner_busy_stop(appdata); //"Redrawing..."      banner_busy_stop(appdata); //"Redrawing"
168    }    }
169    
170    main_ui_enable(appdata);    main_ui_enable(appdata);
# Line 189  cb_menu_map_show_all(GtkMenuItem *item, Line 204  cb_menu_map_show_all(GtkMenuItem *item,
204    
205  /* ---------------------------------------------------------- */  /* ---------------------------------------------------------- */
206    
207  #if 1  // mainly for testing  #if defined(USE_HILDON) && (MAEMO_VERSION_MAJOR == 5)
208  static void  #define MENU_CHECK_ITEM HildonCheckButton
209  cb_menu_redraw(GtkMenuItem *item, gpointer data) {  #define MENU_CHECK_ITEM_ACTIVE(a) hildon_check_button_get_active(a)
210    appdata_t *appdata = (appdata_t*)data;  #else
211    #define MENU_CHECK_ITEM GtkCheckMenuItem
212    /* 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..."  
 }  
213  #endif  #endif
214    
215  static void  static void
216  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;  
217    
218    style_select(GTK_WIDGET(appdata->window), appdata);    banner_busy_start(appdata, 1, "Redrawing");
219  }    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
220    
221  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;  
222    
   banner_busy_start(appdata, 1, "Redrawing...");  
   map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);  
   appdata->settings->no_icons = gtk_check_menu_item_get_active(item);  
223    map_paint(appdata);    map_paint(appdata);
224    banner_busy_stop(appdata); //"Redrawing..."    banner_busy_stop(appdata); //"Redrawing"
225  }  }
226    
227  static void  static void
228  cb_menu_map_no_antialias(GtkCheckMenuItem *item, gpointer data) {  cb_menu_style(GtkMenuItem *item, gpointer data) {
229    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
230    
231    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..."  
232  }  }
233    
234  static void  static void
# Line 270  cb_menu_undo_changes(GtkMenuItem *item, Line 258  cb_menu_undo_changes(GtkMenuItem *item,
258                   "uploaded yet? This can't be undone.")))                   "uploaded yet? This can't be undone.")))
259      return;      return;
260    
261    banner_busy_start(appdata, 1, _("Redrawing..."));    banner_busy_start(appdata, 1, _("Redrawing"));
262    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
263    osm_free(&appdata->icon, appdata->osm);    osm_free(&appdata->icon, appdata->osm);
264    diff_remove(appdata->project);    diff_remove(appdata->project);
265    appdata->osm = osm_parse(appdata->project->osm);    appdata->osm = osm_parse(appdata->project->path, appdata->project->osm);
266    map_paint(appdata);    map_paint(appdata);
267    banner_busy_stop(appdata);  //"Redrawing..."    banner_busy_stop(appdata);  //"Redrawing"
268    
269    banner_show_info(appdata, _("Discarded local changes"));    banner_show_info(appdata, _("Discarded local changes"));
270  }  }
# Line 286  cb_menu_osm_relations(GtkMenuItem *item, Line 274  cb_menu_osm_relations(GtkMenuItem *item,
274    relation_list((appdata_t*)data);    relation_list((appdata_t*)data);
275  }  }
276    
277    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
278  static void  static void
279  cb_menu_fullscreen(GtkCheckMenuItem *item, gpointer data) {  cb_menu_fullscreen(MENU_CHECK_ITEM *item, gpointer data) {
280    appdata_t *appdata = (appdata_t *)data;    appdata_t *appdata = (appdata_t *)data;
281    
282    if(gtk_check_menu_item_get_active(item))    if(MENU_CHECK_ITEM_ACTIVE(item))
283      gtk_window_fullscreen(GTK_WINDOW(appdata->window));      gtk_window_fullscreen(GTK_WINDOW(appdata->window));
284    else    else
285      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));
286  }  }
287    #endif
288    
289  static void  static void
290  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 303  cb_menu_zoomout(GtkMenuItem *item, appda
303  }  }
304    
305  static void  static void
306    cb_menu_view_detail_inc(GtkMenuItem *item, gpointer data) {
307      appdata_t *appdata = (appdata_t*)data;
308    
309      printf("detail level increase\n");
310      map_detail_increase(appdata->map);
311    }
312    
313    static void
314    cb_menu_view_detail_normal(GtkMenuItem *item, gpointer data) {
315      appdata_t *appdata = (appdata_t*)data;
316    
317      printf("detail level normal\n");
318      map_detail_normal(appdata->map);
319    }
320    
321    static void
322    cb_menu_view_detail_dec(GtkMenuItem *item, gpointer data) {
323      appdata_t *appdata = (appdata_t*)data;
324    
325      printf("detail level decrease\n");
326      map_detail_decrease(appdata->map);
327    }
328    
329    static void
330  cb_menu_track_import(GtkMenuItem *item, appdata_t *appdata) {  cb_menu_track_import(GtkMenuItem *item, appdata_t *appdata) {
331    g_assert(appdata->settings);    g_assert(appdata->settings);
332    
# Line 368  cb_menu_track_import(GtkMenuItem *item, Line 382  cb_menu_track_import(GtkMenuItem *item,
382  }  }
383    
384  static void  static void
385  cb_menu_track_enable_gps(GtkMenuItem *item, gpointer data) {  cb_menu_track_enable_gps(MENU_CHECK_ITEM *item, appdata_t *appdata) {
386    appdata_t *appdata = (appdata_t*)data;    track_enable_gps(appdata, MENU_CHECK_ITEM_ACTIVE(item));
   
   if(gtk_check_menu_item_get_active(  
     GTK_CHECK_MENU_ITEM(appdata->track.menu_item_enable_gps))) {  
     track_enable_gps(appdata, TRUE);  
   } else  
     track_enable_gps(appdata, FALSE);  
387  }  }
388    
389    
390  static void  static void
391  cb_menu_track_follow_gps(GtkMenuItem *item, gpointer data) {  cb_menu_track_follow_gps(MENU_CHECK_ITEM *item, appdata_t *appdata) {
392    appdata_t *appdata = (appdata_t*)data;    appdata->settings->follow_gps = MENU_CHECK_ITEM_ACTIVE(item);
   
   if(gtk_check_menu_item_get_active(  
     GTK_CHECK_MENU_ITEM(appdata->track.menu_item_follow_gps))) {  
     appdata->settings->follow_gps = TRUE;  
   } else  
     appdata->settings->follow_gps = FALSE;  
393  }  }
394    
395    
# Line 494  cb_menu_track_clear(GtkMenuItem *item, g Line 496  cb_menu_track_clear(GtkMenuItem *item, g
496  #endif  #endif
497    
498    
499    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
500  // Half-arsed slapdash common menu item constructor. Let's use GtkBuilder  // Half-arsed slapdash common menu item constructor. Let's use GtkBuilder
501  // instead so we have some flexibility.  // instead so we have some flexibility.
502    
# Line 573  menu_append_new_item(appdata_t *appdata, Line 575  menu_append_new_item(appdata_t *appdata,
575    return item;    return item;
576  }  }
577    
   
578  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
579    GtkWidget *menu, *item, *submenu;    GtkWidget *menu, *item, *submenu;
580    GtkWidget *about_quit_items_menu;    GtkWidget *about_quit_items_menu;
# Line 598  void menu_create(appdata_t *appdata) { Line 599  void menu_create(appdata_t *appdata) {
599  #endif  #endif
600    
601    menu_append_new_item(    menu_append_new_item(
602      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_open), _("_Open..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_open), _("_Open"),
603      GTK_STOCK_OPEN, "<OSM2Go-Main>/Project/Open",      GTK_STOCK_OPEN, "<OSM2Go-Main>/Project/Open",
604      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
605    );    );
606    
607    appdata->menu_item_project_close = menu_append_new_item(    menu_append_new_item(
608      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_close), _("_Close"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_wizard), _("_Wizard"),
609      GTK_STOCK_CLOSE, "<OSM2Go-Main>/Project/Close",      GTK_STOCK_NEW, "<OSM2Go-Main>/Project/Wizard",
610      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
611    );    );
612    
# Line 615  void menu_create(appdata_t *appdata) { Line 616  void menu_create(appdata_t *appdata) {
616    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());
617  #endif  #endif
618    
619    appdata->menu_view = item = gtk_menu_item_new_with_mnemonic( _("_View") );    appdata->submenu_view = item = gtk_menu_item_new_with_mnemonic( _("_View") );
620    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
621    submenu = gtk_menu_new();    submenu = gtk_menu_new();
622    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
623    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
624    
625    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
626    appdata->menu_item_view_fullscreen = menu_append_new_item(    appdata->menu_item_view_fullscreen = menu_append_new_item(
627      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_fullscreen), _("_Fullscreen"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_fullscreen), _("_Fullscreen"),
628      GTK_STOCK_FULLSCREEN, "<OSM2Go-Main>/View/Fullscreen",      GTK_STOCK_FULLSCREEN, "<OSM2Go-Main>/View/Fullscreen",
629      0, 0, TRUE, TRUE, FALSE      0, 0, TRUE, TRUE, FALSE
630    );    );
631    #endif
632    
633    menu_append_new_item(    menu_append_new_item(
634      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),
# Line 639  void menu_create(appdata_t *appdata) { Line 642  void menu_create(appdata_t *appdata) {
642      GDK_period, GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_period, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
643    );    );
644    
645    /* -------------------- OSM submenu -------------------- */    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
646    
647      menu_append_new_item(
648        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_view_detail_inc), _("More details"),
649        NULL, "<OSM2Go-Main>/View/DetailInc",
650        GDK_period, GDK_MOD1_MASK, TRUE, FALSE, FALSE
651      );
652    
653      menu_append_new_item(
654        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_view_detail_normal), _("Normal details"),
655        NULL, "<OSM2Go-Main>/View/DetailNormal",
656        0, 0, TRUE, FALSE, FALSE
657      );
658    
659      menu_append_new_item(
660        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_view_detail_dec), _("Less details"),
661        NULL, "<OSM2Go-Main>/View/DetailDec",
662        GDK_comma, GDK_MOD1_MASK, TRUE, FALSE, FALSE
663      );
664    
665      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
666    
667      appdata->menu_item_map_hide_sel = menu_append_new_item(
668        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_hide_sel), _("_Hide selected"),
669        GTK_STOCK_REMOVE, "<OSM2Go-Main>/View/HideSelected",
670        0, 0, TRUE, FALSE, FALSE
671      );
672      gtk_widget_set_sensitive(appdata->menu_item_map_hide_sel, FALSE);
673    
674      appdata->menu_item_map_show_all = menu_append_new_item(
675        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_show_all), _("_Show all"),
676        GTK_STOCK_ADD, "<OSM2Go-Main>/View/ShowAll",
677        0, 0, TRUE, FALSE, FALSE
678      );
679      gtk_widget_set_sensitive(appdata->menu_item_map_show_all, FALSE);
680    
681      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
682    
683    appdata->menu_osm = item = gtk_menu_item_new_with_mnemonic( _("_OSM") );    menu_append_new_item(
684        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_style), _("St_yle"),
685        GTK_STOCK_SELECT_COLOR, "<OSM2Go-Main>/View/Style",
686        0, 0, TRUE, FALSE, FALSE
687      );
688    
689      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
690    
691      appdata->menu_item_map_no_icons = menu_append_new_item(
692        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_icons), _("No _icons"),
693        NULL, "<OSM2Go-Main>/View/NoIcons",
694        0, 0, TRUE, TRUE, appdata->settings->no_icons
695      );
696    
697    
698      /* -------------------- map submenu -------------------- */
699    
700      appdata->submenu_map = item = gtk_menu_item_new_with_mnemonic( _("_Map") );
701    gtk_menu_shell_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);    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->menu_item_osm_upload = menu_append_new_item(    appdata->menu_item_map_upload = menu_append_new_item(
707      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload"),
708      "upload.16", "<OSM2Go-Main>/OSM/Upload",      "upload.16", "<OSM2Go-Main>/Map/Upload",
709      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
710    );    );
711    
712    menu_append_new_item(    menu_append_new_item(
713      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download"),
714      "download.16", "<OSM2Go-Main>/OSM/Download",      "download.16", "<OSM2Go-Main>/Map/Download",
715      GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
716    );    );
717    
718    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());
719    
720    if(getenv("OSM2GO_UNDO_TEST")) {    if(getenv("OSM2GO_UNDO_TEST")) {
721      appdata->menu_item_osm_undo = menu_append_new_item(      appdata->menu_item_map_undo = menu_append_new_item(
722                 appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo), _("_Undo"),                 appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo), _("_Undo"),
723                 GTK_STOCK_UNDO, "<OSM2Go-Main>/OSM/Undo",                 GTK_STOCK_UNDO, "<OSM2Go-Main>/Map/Undo",
724                 GDK_z, GDK_CONTROL_MASK, TRUE, FALSE, FALSE                 GDK_z, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
725                 );                 );
726    } else    } else
727      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");
728    
729    appdata->menu_item_osm_save_changes = menu_append_new_item(    appdata->menu_item_map_save_changes = menu_append_new_item(
730      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),
731      GTK_STOCK_SAVE, "<OSM2Go-Main>/OSM/SaveChanges",      GTK_STOCK_SAVE, "<OSM2Go-Main>/Map/SaveChanges",
732      GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
733    );    );
734    
735    appdata->menu_item_osm_undo_changes = menu_append_new_item(    appdata->menu_item_map_undo_changes = menu_append_new_item(
736      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"),
737      GTK_STOCK_DELETE, "<OSM2Go-Main>/OSM/DiscardChanges",      GTK_STOCK_DELETE, "<OSM2Go-Main>/Map/DiscardChanges",
738      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
739    );    );
740    
741    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());
742    appdata->menu_item_osm_relations = menu_append_new_item(    appdata->menu_item_map_relations = menu_append_new_item(
743      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations"),
744      NULL, "<OSM2Go-Main>/OSM/Relations",      NULL, "<OSM2Go-Main>/Map/Relations",
745      GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
746    );    );
747    
748    /* -------------------- wms submenu -------------------- */    /* -------------------- wms submenu -------------------- */
749    
750    appdata->menu_wms = item = gtk_menu_item_new_with_mnemonic( _("_WMS") );    appdata->submenu_wms = item = gtk_menu_item_new_with_mnemonic( _("_WMS") );
751    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
752    submenu = gtk_menu_new();    submenu = gtk_menu_new();
753    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
754    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
755    
756    menu_append_new_item(    menu_append_new_item(
757      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_import), _("_Import..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_import), _("_Import"),
758      GTK_STOCK_INDEX, "<OSM2Go-Main>/WMS/Import",      GTK_STOCK_INDEX, "<OSM2Go-Main>/WMS/Import",
759      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
760    );    );
# Line 717  void menu_create(appdata_t *appdata) { Line 773  void menu_create(appdata_t *appdata) {
773    );    );
774    gtk_widget_set_sensitive(appdata->menu_item_wms_adjust, FALSE);    gtk_widget_set_sensitive(appdata->menu_item_wms_adjust, FALSE);
775    
   /* -------------------- 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, TRUE, 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, TRUE, 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, TRUE, 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, TRUE, 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, 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, TRUE, appdata->settings->no_antialias  
   );  
   
776    /* -------------------- track submenu -------------------- */    /* -------------------- track submenu -------------------- */
777    
778    appdata->track.menu_track = item = gtk_menu_item_new_with_mnemonic(_("_Track"));    appdata->track.submenu_track = item =
779        gtk_menu_item_new_with_mnemonic(_("_Track"));
780    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
781    submenu = gtk_menu_new();    submenu = gtk_menu_new();
782    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
783    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
784    
785    appdata->track.menu_item_import = menu_append_new_item(    appdata->track.menu_item_track_import = menu_append_new_item(
786      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import"),
787      NULL, "<OSM2Go-Main>/Track/Import",      NULL, "<OSM2Go-Main>/Track/Import",
788      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
789    );    );
790    
791    appdata->track.menu_item_export = menu_append_new_item(    appdata->track.menu_item_track_export = menu_append_new_item(
792      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export"),
793      NULL, "<OSM2Go-Main>/Track/Export",      NULL, "<OSM2Go-Main>/Track/Export",
794      0, 0, FALSE, FALSE, FALSE      0, 0, FALSE, FALSE, FALSE
795    );    );
796    
797    appdata->track.menu_item_clear = menu_append_new_item(    appdata->track.menu_item_track_clear = menu_append_new_item(
798      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_clear), _("_Clear"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_clear), _("_Clear"),
799      GTK_STOCK_CLEAR, "<OSM2Go-Main>/Track/Clear",      GTK_STOCK_CLEAR, "<OSM2Go-Main>/Track/Clear",
800      0, 0, FALSE, FALSE, FALSE      0, 0, FALSE, FALSE, FALSE
801    );    );
802    
803    
804    appdata->track.menu_item_enable_gps = menu_append_new_item(    appdata->track.menu_item_track_enable_gps = menu_append_new_item(
805      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_enable_gps),_("_GPS enable"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_enable_gps),_("_GPS enable"),
806      NULL, "<OSM2Go-Main>/Track/GPS",      NULL, "<OSM2Go-Main>/Track/GPS",
807      GDK_g, GDK_CONTROL_MASK|GDK_SHIFT_MASK, TRUE, TRUE,      GDK_g, GDK_CONTROL_MASK|GDK_SHIFT_MASK, TRUE, TRUE,
808      appdata->settings->enable_gps      appdata->settings->enable_gps
809    );    );
810    
811    appdata->track.menu_item_follow_gps = menu_append_new_item(    appdata->track.menu_item_track_follow_gps = menu_append_new_item(
812      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_follow_gps), _("GPS follow"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_follow_gps), _("GPS follow"),
813      NULL, "<OSM2Go-Main>/Track/Follow",      NULL, "<OSM2Go-Main>/Track/Follow",
814      0, 0, appdata->settings->enable_gps, TRUE,      0, 0, appdata->settings->enable_gps, TRUE,
# Line 816  void menu_create(appdata_t *appdata) { Line 821  void menu_create(appdata_t *appdata) {
821                          gtk_separator_menu_item_new());                          gtk_separator_menu_item_new());
822    
823    menu_append_new_item(    menu_append_new_item(
824      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_about), _("_About..."),      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_about), _("_About"),
825      GTK_STOCK_ABOUT, "<OSM2Go-Main>/About",      GTK_STOCK_ABOUT, "<OSM2Go-Main>/About",
826      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
827    );    );
828    
829    #ifndef USE_HILDON
830    menu_append_new_item(    menu_append_new_item(
831      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_quit), _("_Quit"),      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_quit), _("_Quit"),
832      GTK_STOCK_QUIT, "<OSM2Go-Main>/Quit",      GTK_STOCK_QUIT, "<OSM2Go-Main>/Quit",
833      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
834    );    );
835    #endif
836    
837    gtk_window_add_accel_group(GTK_WINDOW(appdata->window), accel_grp);    gtk_window_add_accel_group(GTK_WINDOW(appdata->window), accel_grp);
838    
# Line 851  void menu_create(appdata_t *appdata) { Line 858  void menu_create(appdata_t *appdata) {
858    
859  #endif //USE_HILDON  #endif //USE_HILDON
860  }  }
861    #else // !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
862    
863    void submenu_entry(appdata_t *appdata, HildonAppMenu *menu,
864                       const char *label, const char *value,
865                       GtkSignalFunc activate_cb) {
866    
867    }
868    
869    typedef struct {
870      const char *label, *value;
871      gboolean enabled;
872      gboolean (*toggle)(appdata_t *appdata);
873      gulong offset;
874      GtkSignalFunc activate_cb;
875    } menu_entry_t;
876    
877    static gboolean no_icon_get_toggle(appdata_t *appdata) {
878      if(!appdata)           return FALSE;
879      if(!appdata->settings) return FALSE;
880      return appdata->settings->no_icons;
881    }
882    
883    static gboolean enable_gps_get_toggle(appdata_t *appdata) {
884      if(!appdata)           return FALSE;
885      return appdata->gps_enabled;
886    }
887    
888    static gboolean follow_gps_get_toggle(appdata_t *appdata) {
889      if(!appdata)           return FALSE;
890      if(!appdata->settings) return FALSE;
891      return appdata->settings->follow_gps;
892    }
893    
894    /* create a HildonAppMenu */
895    static GtkWidget *app_menu_create(appdata_t *appdata,
896                                      const menu_entry_t *menu_entries) {
897      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
898    
899      while(menu_entries->label) {
900        GtkWidget *button = NULL;
901    
902        if(!menu_entries->toggle) {
903          button = hildon_button_new_with_text(
904                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
905                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
906                _(menu_entries->label), _(menu_entries->value));
907          g_signal_connect_after(button, "clicked",
908                                 menu_entries->activate_cb, appdata);
909        } else {
910          button = hildon_check_button_new(HILDON_SIZE_AUTO);
911          gtk_button_set_label(GTK_BUTTON(button), _(menu_entries->label));
912          hildon_check_button_set_active(HILDON_CHECK_BUTTON(button),
913                                         menu_entries->toggle(appdata));
914          g_signal_connect_after(button, "toggled",
915                                 menu_entries->activate_cb, appdata);
916        }
917    
918        /* offset to GtkWidget pointer was given -> store pointer */
919        if(menu_entries->offset)
920          *(GtkWidget**)(((void*)appdata)+menu_entries->offset) = button;
921    
922        gtk_widget_set_sensitive(button, menu_entries->enabled);
923    
924        hildon_app_menu_append(menu, GTK_BUTTON(button));
925        menu_entries++;
926      }
927    
928      gtk_widget_show_all(GTK_WIDGET(menu));
929      return GTK_WIDGET(menu);
930    }
931    
932    /* the view submenu */
933    void on_submenu_view_clicked(GtkButton *button, appdata_t *appdata) {
934      hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_view),
935                            GTK_WINDOW(appdata->window));
936    }
937    
938    void on_submenu_wms_clicked(GtkButton *button, appdata_t *appdata) {
939      hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_wms),
940                            GTK_WINDOW(appdata->window));
941    }
942    
943    void on_submenu_track_clicked(GtkButton *button, appdata_t *appdata) {
944      hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_track),
945                            GTK_WINDOW(appdata->window));
946    }
947    
948    /* -- the view submenu -- */
949    #define APP_OFFSET(a)  offsetof(appdata_t, a)
950    #define SIMPLE_ENTRY(a,b)     { a, NULL, TRUE,   NULL, 0, G_CALLBACK(b) }
951    #define ENABLED_ENTRY(a,b,c) { a, NULL, TRUE,  NULL, APP_OFFSET(c), G_CALLBACK(b) }
952    #define DISABLED_ENTRY(a,b,c) { a, NULL, FALSE,  NULL, APP_OFFSET(c), G_CALLBACK(b) }
953    #define TOGGLE_ENTRY(a,b,c)  { a, NULL, TRUE, c, 0, G_CALLBACK(b) }
954    #define DISABLED_TOGGLE_ENTRY(a,b,c,d)  { a, NULL, FALSE, c, APP_OFFSET(d), G_CALLBACK(b) }
955    #define ENABLED_TOGGLE_ENTRY(a,b,c,d)  { a, NULL, TRUE, c, APP_OFFSET(d), G_CALLBACK(b) }
956    #define LAST_ENTRY            { NULL, NULL, FALSE, NULL, 0, NULL }
957    
958    static const menu_entry_t submenu_view[] = {
959      SIMPLE_ENTRY("Zoom in",         cb_menu_zoomin),
960      SIMPLE_ENTRY("Zoom out",        cb_menu_zoomout),
961      /* --- */
962      SIMPLE_ENTRY("Style",           cb_menu_style),
963      /* --- */
964      SIMPLE_ENTRY("Normal details",  cb_menu_view_detail_normal),
965      SIMPLE_ENTRY("More details",    cb_menu_view_detail_inc),
966      SIMPLE_ENTRY("Less details",    cb_menu_view_detail_dec),
967      /* --- */
968      DISABLED_ENTRY("Hide selected", cb_menu_map_hide_sel, menu_item_map_hide_sel),
969      DISABLED_ENTRY("Show all",      cb_menu_map_show_all, menu_item_map_show_all),
970      /* --- */
971      TOGGLE_ENTRY("No icons",        cb_menu_map_no_icons, no_icon_get_toggle),
972    
973      LAST_ENTRY
974    };
975    
976    /* -- the wms submenu -- */
977    static const menu_entry_t submenu_wms[] = {
978      SIMPLE_ENTRY("Import",   cb_menu_wms_import),
979      DISABLED_ENTRY("Clear",  cb_menu_wms_clear, menu_item_wms_clear),
980      DISABLED_ENTRY("Adjust", cb_menu_wms_adjust, menu_item_wms_adjust),
981    
982      LAST_ENTRY
983    };
984    
985    /* -- the track submenu -- */
986    static const menu_entry_t submenu_track[] = {
987      ENABLED_ENTRY("Import",  cb_menu_track_import, track.menu_item_track_import),
988      DISABLED_ENTRY("Export", cb_menu_track_export, track.menu_item_track_export),
989      DISABLED_ENTRY("Clear",  cb_menu_track_clear, track.menu_item_track_clear),
990      ENABLED_TOGGLE_ENTRY("GPS enable", cb_menu_track_enable_gps,
991                    enable_gps_get_toggle, track.menu_item_track_enable_gps),
992      DISABLED_TOGGLE_ENTRY("GPS follow", cb_menu_track_follow_gps,
993                    follow_gps_get_toggle, track.menu_item_track_follow_gps),
994    
995      LAST_ENTRY
996    };
997    
998    
999    /* -- the applications main menu -- */
1000    static const menu_entry_t main_menu[] = {
1001      SIMPLE_ENTRY("About",  cb_menu_about),
1002      ENABLED_ENTRY("View",  on_submenu_view_clicked,  submenu_view),
1003      ENABLED_ENTRY("WMS",   on_submenu_wms_clicked,   submenu_wms),
1004      ENABLED_ENTRY("Track", on_submenu_track_clicked, track.submenu_track),
1005    
1006      LAST_ENTRY
1007    };
1008    
1009    void menu_create(appdata_t *appdata) {
1010      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1011    
1012      /* build menu/submenus */
1013      menu = HILDON_APP_MENU(app_menu_create(appdata, main_menu));
1014      appdata->app_menu_wms = app_menu_create(appdata, submenu_wms);
1015      appdata->app_menu_view = app_menu_create(appdata, submenu_view);
1016      appdata->app_menu_track = app_menu_create(appdata, submenu_track);
1017    
1018      hildon_window_set_app_menu(HILDON_WINDOW(appdata->window), menu);
1019    }
1020    #endif
1021    
1022  /********************* end of menu **********************/  /********************* end of menu **********************/
1023    
# Line 922  void cleanup(appdata_t *appdata) { Line 1089  void cleanup(appdata_t *appdata) {
1089    
1090    project_free(appdata->project);    project_free(appdata->project);
1091    
1092    if(appdata->menu_item_osm_undo)    if(appdata->menu_item_map_undo)
1093      undo_free(appdata->undo.state);      undo_free(appdata->undo.state);
1094    
1095    puts("everything is gone");    puts("everything is gone");
# Line 940  gboolean on_window_key_press(GtkWidget * Line 1107  gboolean on_window_key_press(GtkWidget *
1107    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1108    int handled = FALSE;    int handled = FALSE;
1109    
1110      //  printf("key event with keyval %x\n", event->keyval);
1111    
1112    // the map handles some keys on its own ...    // the map handles some keys on its own ...
1113    switch(event->keyval) {    switch(event->keyval) {
1114    
1115    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
1116  #ifdef USE_HILDON  #ifdef USE_HILDON
1117      /* this is in fact a mapping to GDK_F6 */      /* this is in fact a mapping to GDK_F6 */
1118    case HILDON_HARDKEY_FULLSCREEN:    case HILDON_HARDKEY_FULLSCREEN:
# Line 962  gboolean on_window_key_press(GtkWidget * Line 1132  gboolean on_window_key_press(GtkWidget *
1132    
1133      handled = TRUE;      handled = TRUE;
1134      break;      break;
1135    #endif
1136    }    }
1137    
1138    /* forward unprocessed key presses to map */    /* forward unprocessed key presses to map */
# Line 1011  int main(int argc, char *argv[]) { Line 1182  int main(int argc, char *argv[]) {
1182    /* Create HildonWindow and set it to HildonProgram */    /* Create HildonWindow and set it to HildonProgram */
1183    appdata.window = HILDON_WINDOW(hildon_window_new());    appdata.window = HILDON_WINDOW(hildon_window_new());
1184    hildon_program_add_window(appdata.program, appdata.window);    hildon_program_add_window(appdata.program, appdata.window);
1185    
1186    #if MAEMO_VERSION_MAJOR == 5
1187      unsigned long val;
1188      XChangeProperty(GDK_DISPLAY(),
1189                      GDK_WINDOW_XID(GTK_WIDGET(appdata.window)->window),
1190                      XInternAtom(GDK_DISPLAY(),
1191                                  "_HILDON_ZOOM_KEY_ATOM",
1192                                  False), XA_INTEGER, 32,
1193                      PropModeReplace, (unsigned char *) &val, 1);
1194    #endif
1195    
1196  #else  #else
1197    /* Create a Window. */    /* Create a Window. */
1198    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
# Line 1053  int main(int argc, char *argv[]) { Line 1235  int main(int argc, char *argv[]) {
1235      return -1;      return -1;
1236    }    }
1237    
1238    #if 0  // another test overlay
1239      {
1240        GtkWidget *fixed = gtk_fixed_new();
1241    
1242        gtk_fixed_put(GTK_FIXED(fixed), gtk_label_new("Nase"), 0,0);
1243        gtk_fixed_put(GTK_FIXED(fixed), map, 0,0);
1244    
1245        gtk_box_pack_start(GTK_BOX(vbox), fixed, TRUE, TRUE, 0);
1246      }
1247    #else
1248    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);
1249    #endif
1250    
1251    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);
1252    
1253  #ifndef PORTRAIT  #ifndef PORTRAIT
1254    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);
1255  #endif  #endif
   gtk_box_pack_start(GTK_BOX(hbox), gtk_vseparator_new(), FALSE, FALSE, 0);  
1256    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
1257    
1258    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 1072  int main(int argc, char *argv[]) { Line 1265  int main(int argc, char *argv[]) {
1265    
1266    /* let gtk do its thing before loading the data, */    /* let gtk do its thing before loading the data, */
1267    /* so the user sees something */    /* so the user sees something */
1268    while(gtk_events_pending()) {    while(gtk_events_pending())
     putchar('.');  
1269      gtk_main_iteration();      gtk_main_iteration();
   }  
1270    
1271    /* load project if one is specified in the settings */    /* load project if one is specified in the settings */
1272    if(appdata.settings->project)    if(appdata.settings->project)
# Line 1087  int main(int argc, char *argv[]) { Line 1278  int main(int argc, char *argv[]) {
1278    if(appdata.settings && appdata.settings->enable_gps)    if(appdata.settings && appdata.settings->enable_gps)
1279      track_enable_gps(&appdata, TRUE);      track_enable_gps(&appdata, TRUE);
1280    
1281    /* ------------ jump into main loop ---------------- */    /* again let the ui do its thing */
1282      while(gtk_events_pending())
1283        gtk_main_iteration();
1284    
1285    #if 0  // test overlay
1286      {
1287        GtkWidget *overlay = gtk_window_new(GTK_WINDOW_POPUP);
1288        gtk_window_set_default_size(GTK_WINDOW(overlay), 40, 20);
1289        gtk_window_set_transient_for(GTK_WINDOW(overlay), GTK_WINDOW(appdata.window));
1290        gtk_window_set_keep_above(GTK_WINDOW(overlay), TRUE);
1291        gtk_window_set_destroy_with_parent(GTK_WINDOW(overlay), TRUE);
1292        gtk_window_set_position(GTK_WINDOW(overlay), GTK_WIN_POS_CENTER_ON_PARENT);
1293        gtk_window_set_decorated(GTK_WINDOW(overlay), TRUE);
1294    
1295        /* add some zoom buttons for testing */
1296        GtkWidget *hbox = gtk_hbox_new(TRUE, 0);
1297        gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_button_new_with_label("+"));
1298        gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_button_new_with_label("-"));
1299        gtk_container_add(GTK_CONTAINER(overlay), hbox);
1300    
1301        gtk_widget_show_all(overlay);
1302      }
1303    #endif
1304    
1305      /* start to interact with the user now that the gui is running */
1306      if(appdata.settings->first_run_demo) {
1307        messagef(GTK_WIDGET(appdata.window), _("Welcome to OSM2Go"),
1308                 _("This is the first time you run OSM2Go. "
1309                   "A demo project has been loaded to get you "
1310                   "started. You can play around with this demo as much "
1311                   "as you like. However, you cannot upload or download "
1312                   "the demo project.\n\n"
1313                   "In order to start working on real data you'll have "
1314                   "to setup a new project and enter your OSM user name "
1315                   "and password. You'll then be able to download the "
1316                   "latest data from OSM and upload your changes into "
1317                   "the OSM main database."
1318                   ));
1319      }
1320    
1321      /* ------------ jump into main loop ---------------- */
1322    gtk_main();    gtk_main();
1323    
1324    puts("gtk_main() left");    puts("gtk_main() left");
Legend:
Removed from v.156  
changed lines
  Added in v.190