Diff of /trunk/src/main.c

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

revision 177 by harbaum, Wed Jun 10 12:07:11 2009 UTC revision 241 by harbaum, Thu Jul 23 19:23:22 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    
37  /* disable/enable main screen control dependant on presence of open project */  /* disable/enable main screen control dependant on presence of open project */
38  static void main_ui_enable(appdata_t *appdata) {  void main_ui_enable(appdata_t *appdata) {
39    gboolean project_valid = (appdata->project != NULL);    gboolean project_valid = (appdata->project != NULL);
40    gboolean osm_valid = (appdata->osm != NULL);    gboolean osm_valid = (appdata->osm != NULL);
41    
# Line 43  static void main_ui_enable(appdata_t *ap Line 51  static void main_ui_enable(appdata_t *ap
51      gtk_window_set_title(GTK_WINDOW(appdata->window), "");      gtk_window_set_title(GTK_WINDOW(appdata->window), "");
52  #else  #else
53    char *str = NULL;    char *str = NULL;
54    #ifdef USE_HILDON
55      if(project_valid)
56        str = g_markup_printf_escaped("OSM2Go - <b>%s</b>",
57                                      appdata->project->name);
58      else
59        str = g_markup_printf_escaped("OSM2Go");
60    
61      hildon_window_set_markup(HILDON_WINDOW(appdata->window), str);
62    #else
63    if(project_valid)    if(project_valid)
64      str = g_strdup_printf("OSM2Go - %s", appdata->project->name);      str = g_strdup_printf("OSM2Go - %s", appdata->project->name);
65    else    else
66      str = g_strdup_printf("OSM2Go");      str = g_strdup_printf("OSM2Go");
67    
68    gtk_window_set_title(GTK_WINDOW(appdata->window), str);    gtk_window_set_title(GTK_WINDOW(appdata->window), str);
69    #endif
70    g_free(str);    g_free(str);
71  #endif  #endif
72    
73    if(appdata->iconbar && appdata->iconbar->toolbar)    if(appdata->iconbar && appdata->iconbar->toolbar)
74      gtk_widget_set_sensitive(appdata->iconbar->toolbar, osm_valid);      gtk_widget_set_sensitive(appdata->iconbar->toolbar, osm_valid);
   
75    /* disable all menu entries related to map */    /* disable all menu entries related to map */
76    gtk_widget_set_sensitive(appdata->menu_osm, project_valid);    gtk_widget_set_sensitive(appdata->submenu_map, project_valid);
77    gtk_widget_set_sensitive(appdata->menu_item_osm_upload, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_upload, osm_valid);
78    if(appdata->menu_item_osm_undo)    if(appdata->menu_item_map_undo)
79      gtk_widget_set_sensitive(appdata->menu_item_osm_undo, osm_valid);      gtk_widget_set_sensitive(appdata->menu_item_map_undo, osm_valid);
80    gtk_widget_set_sensitive(appdata->menu_item_osm_save_changes, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_save_changes, osm_valid);
81    gtk_widget_set_sensitive(appdata->menu_item_osm_undo_changes, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_undo_changes, osm_valid);
82    gtk_widget_set_sensitive(appdata->menu_item_osm_relations, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_relations, osm_valid);
83    gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);    gtk_widget_set_sensitive(appdata->track.submenu_track, osm_valid);
84    gtk_widget_set_sensitive(appdata->menu_view, osm_valid);    gtk_widget_set_sensitive(appdata->submenu_view, osm_valid);
85    gtk_widget_set_sensitive(appdata->menu_wms, osm_valid);    gtk_widget_set_sensitive(appdata->submenu_wms, osm_valid);
86    gtk_widget_set_sensitive(appdata->menu_map, osm_valid);  
87    gtk_widget_set_sensitive(appdata->menu_item_project_close, project_valid);  #ifdef ZOOM_BUTTONS
88      gtk_widget_set_sensitive(appdata->btn_zoom_in, osm_valid);
89      gtk_widget_set_sensitive(appdata->btn_zoom_out, osm_valid);
90    #endif
91    
92    if(!project_valid)    if(!project_valid)
93      statusbar_set(appdata, _("Please load or create a project"), FALSE);      statusbar_set(appdata, _("Please load or create a project"), FALSE);
# Line 83  cb_menu_project_open(GtkMenuItem *item, Line 103  cb_menu_project_open(GtkMenuItem *item,
103  }  }
104    
105  static void  static void
106  cb_menu_project_close(GtkMenuItem *item, gpointer data) {  cb_menu_project_wizard(GtkMenuItem *item, gpointer data) {
107    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
108    project_close(appdata);    project_wizard(appdata);
   main_ui_enable(appdata);  
109  }  }
110    
111  static void  static void
# Line 96  cb_menu_about(GtkMenuItem *item, gpointe Line 115  cb_menu_about(GtkMenuItem *item, gpointe
115    const gchar *authors[] = {    const gchar *authors[] = {
116      "Till Harbaum <till@harbaum.org>",      "Till Harbaum <till@harbaum.org>",
117      "Andrew Chadwick <andrewc-osm2go@piffle.org>",      "Andrew Chadwick <andrewc-osm2go@piffle.org>",
118        "Marcus Bauer <marcus.bauer@gmail.com>",
119        "John Stowers <john.stowers@gmail.com>",
120      NULL };      NULL };
121    
122    const gchar *artists[] = {    const gchar *artists[] = {
# Line 115  cb_menu_about(GtkMenuItem *item, gpointe Line 136  cb_menu_about(GtkMenuItem *item, gpointe
136    
137  void on_window_destroy (GtkWidget *widget, gpointer data);  void on_window_destroy (GtkWidget *widget, gpointer data);
138    
139    #ifndef USE_HILDON
140  static void  static void
141  cb_menu_quit(GtkMenuItem *item, gpointer data) {  cb_menu_quit(GtkMenuItem *item, gpointer data) {
142    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
143    gtk_widget_destroy(GTK_WIDGET(appdata->window));    gtk_widget_destroy(GTK_WIDGET(appdata->window));
144  }  }
145    #endif
146    
147  static void  static void
148  cb_menu_upload(GtkMenuItem *item, gpointer data) {  cb_menu_upload(GtkMenuItem *item, gpointer data) {
149    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
150    if(!appdata->osm || !appdata->project) return;    if(!appdata->osm || !appdata->project) return;
151    
152      if(project_check_demo(GTK_WIDGET(appdata->window), appdata->project))
153        return;
154    
155    osm_upload(appdata, appdata->osm, appdata->project);    osm_upload(appdata, appdata->osm, appdata->project);
156  }  }
157    
# Line 134  cb_menu_download(GtkMenuItem *item, gpoi Line 160  cb_menu_download(GtkMenuItem *item, gpoi
160    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
161    if(!appdata->project) return;    if(!appdata->project) return;
162    
163      if(project_check_demo(GTK_WIDGET(appdata->window), appdata->project))
164        return;
165    
166    /* if we have valid osm data loaded: save state first */    /* if we have valid osm data loaded: save state first */
167    if(appdata->osm) {    if(appdata->osm) {
168      /* 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 191  cb_menu_map_show_all(GtkMenuItem *item, Line 220  cb_menu_map_show_all(GtkMenuItem *item,
220    
221  /* ---------------------------------------------------------- */  /* ---------------------------------------------------------- */
222    
223  #if 1  // mainly for testing  #if defined(USE_HILDON) && (MAEMO_VERSION_MAJOR == 5)
224  static void  #define MENU_CHECK_ITEM HildonCheckButton
225  cb_menu_redraw(GtkMenuItem *item, gpointer data) {  #define MENU_CHECK_ITEM_ACTIVE(a) hildon_check_button_get_active(a)
226    appdata_t *appdata = (appdata_t*)data;  #else
227    #define MENU_CHECK_ITEM GtkCheckMenuItem
228    /* 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->path, 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"  
 }  
229  #endif  #endif
230    
231  static void  static void
232  cb_menu_map_no_icons(GtkCheckMenuItem *item, gpointer data) {  cb_menu_map_no_icons(MENU_CHECK_ITEM *item, appdata_t *appdata) {
   appdata_t *appdata = (appdata_t*)data;  
233    
234    banner_busy_start(appdata, 1, "Redrawing");    banner_busy_start(appdata, 1, "Redrawing");
235    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
   appdata->settings->no_icons = gtk_check_menu_item_get_active(item);  
   map_paint(appdata);  
   banner_busy_stop(appdata); //"Redrawing"  
 }  
236    
237  static void    appdata->settings->no_icons = MENU_CHECK_ITEM_ACTIVE(item);
 cb_menu_map_no_antialias(GtkCheckMenuItem *item, gpointer data) {  
   appdata_t *appdata = (appdata_t*)data;  
238    
   banner_busy_start(appdata, 1, "Redrawing");  
   map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);  
   appdata->settings->no_antialias = gtk_check_menu_item_get_active(item);  
239    map_paint(appdata);    map_paint(appdata);
240    banner_busy_stop(appdata); //"Redrawing"    banner_busy_stop(appdata); //"Redrawing"
241  }  }
# Line 284  cb_menu_undo_changes(GtkMenuItem *item, Line 286  cb_menu_undo_changes(GtkMenuItem *item,
286  }  }
287    
288  static void  static void
289  cb_menu_osm_relations(GtkMenuItem *item, gpointer data) {  cb_menu_osm_relations(GtkMenuItem *item, appdata_t *appdata) {
290    relation_list((appdata_t*)data);    /* list relations of all objects */
291      relation_list(GTK_WIDGET(appdata->window), appdata, NULL);
292  }  }
293    
294  #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)  #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
295  static void  static void
296  cb_menu_fullscreen(GtkCheckMenuItem *item, gpointer data) {  cb_menu_fullscreen(MENU_CHECK_ITEM *item, gpointer data) {
297    appdata_t *appdata = (appdata_t *)data;    appdata_t *appdata = (appdata_t *)data;
298    
299    if(gtk_check_menu_item_get_active(item))    if(MENU_CHECK_ITEM_ACTIVE(item))
300      gtk_window_fullscreen(GTK_WINDOW(appdata->window));      gtk_window_fullscreen(GTK_WINDOW(appdata->window));
301    else    else
302      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));
# Line 396  cb_menu_track_import(GtkMenuItem *item, Line 399  cb_menu_track_import(GtkMenuItem *item,
399  }  }
400    
401  static void  static void
402  cb_menu_track_enable_gps(GtkMenuItem *item, gpointer data) {  cb_menu_track_enable_gps(MENU_CHECK_ITEM *item, appdata_t *appdata) {
403    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);  
404  }  }
405    
406    
407  static void  static void
408  cb_menu_track_follow_gps(GtkMenuItem *item, gpointer data) {  cb_menu_track_follow_gps(MENU_CHECK_ITEM *item, appdata_t *appdata) {
409    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;  
410  }  }
411    
412    
# Line 522  cb_menu_track_clear(GtkMenuItem *item, g Line 513  cb_menu_track_clear(GtkMenuItem *item, g
513  #endif  #endif
514    
515    
516    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
517  // Half-arsed slapdash common menu item constructor. Let's use GtkBuilder  // Half-arsed slapdash common menu item constructor. Let's use GtkBuilder
518  // instead so we have some flexibility.  // instead so we have some flexibility.
519    
# Line 601  menu_append_new_item(appdata_t *appdata, Line 592  menu_append_new_item(appdata_t *appdata,
592    return item;    return item;
593  }  }
594    
   
595  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
596    GtkWidget *menu, *item, *submenu;    GtkWidget *menu, *item, *submenu;
597    GtkWidget *about_quit_items_menu;    GtkWidget *about_quit_items_menu;
# Line 616  void menu_create(appdata_t *appdata) { Line 606  void menu_create(appdata_t *appdata) {
606    /* -------------------- Project submenu -------------------- */    /* -------------------- Project submenu -------------------- */
607    
608    GtkAccelGroup *accel_grp = gtk_accel_group_new();    GtkAccelGroup *accel_grp = gtk_accel_group_new();
609    
610    #ifndef USE_HILDON
611    item = gtk_menu_item_new_with_mnemonic( _("_Project") );    item = gtk_menu_item_new_with_mnemonic( _("_Project") );
612    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
613    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 631  void menu_create(appdata_t *appdata) { Line 623  void menu_create(appdata_t *appdata) {
623      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
624    );    );
625    
626    appdata->menu_item_project_close = menu_append_new_item(    menu_append_new_item(
627      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_close), _("_Close"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_wizard), _("_Wizard"),
628      GTK_STOCK_CLOSE, "<OSM2Go-Main>/Project/Close",      GTK_STOCK_NEW, "<OSM2Go-Main>/Project/Wizard",
629        0, 0, TRUE, FALSE, FALSE
630      );
631    #else
632      menu_append_new_item(
633        appdata, menu, GTK_SIGNAL_FUNC(cb_menu_project_open), _("_Project"),
634        GTK_STOCK_OPEN, "<OSM2Go-Main>/Project",
635      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
636    );    );
637    #endif
638    
639    /* --------------- view menu ------------------- */    /* --------------- view menu ------------------- */
640    
# Line 643  void menu_create(appdata_t *appdata) { Line 642  void menu_create(appdata_t *appdata) {
642    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());
643  #endif  #endif
644    
645    appdata->menu_view = item = gtk_menu_item_new_with_mnemonic( _("_View") );    appdata->submenu_view = item = gtk_menu_item_new_with_mnemonic( _("_View") );
646    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
647    submenu = gtk_menu_new();    submenu = gtk_menu_new();
648    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
# Line 657  void menu_create(appdata_t *appdata) { Line 656  void menu_create(appdata_t *appdata) {
656    );    );
657  #endif  #endif
658    
659    #if !defined(ZOOM_BUTTONS) || !defined(USE_HILDON)
660    menu_append_new_item(    menu_append_new_item(
661      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),
662      GTK_STOCK_ZOOM_IN, "<OSM2Go-Main>/View/ZoomIn",      GTK_STOCK_ZOOM_IN, "<OSM2Go-Main>/View/ZoomIn",
# Line 668  void menu_create(appdata_t *appdata) { Line 668  void menu_create(appdata_t *appdata) {
668      GTK_STOCK_ZOOM_OUT, "<OSM2Go-Main>/View/ZoomOut",      GTK_STOCK_ZOOM_OUT, "<OSM2Go-Main>/View/ZoomOut",
669      GDK_period, GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_period, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
670    );    );
671    #endif
672    
673    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());
674    
# Line 689  void menu_create(appdata_t *appdata) { Line 690  void menu_create(appdata_t *appdata) {
690      GDK_comma, GDK_MOD1_MASK, TRUE, FALSE, FALSE      GDK_comma, GDK_MOD1_MASK, TRUE, FALSE, FALSE
691    );    );
692    
693    /* -------------------- OSM submenu -------------------- */    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
694    
695      appdata->menu_item_map_hide_sel = menu_append_new_item(
696        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_hide_sel), _("_Hide selected"),
697        GTK_STOCK_REMOVE, "<OSM2Go-Main>/View/HideSelected",
698        0, 0, TRUE, FALSE, FALSE
699      );
700      gtk_widget_set_sensitive(appdata->menu_item_map_hide_sel, FALSE);
701    
702      appdata->menu_item_map_show_all = menu_append_new_item(
703        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_show_all), _("_Show all"),
704        GTK_STOCK_ADD, "<OSM2Go-Main>/View/ShowAll",
705        0, 0, TRUE, FALSE, FALSE
706      );
707      gtk_widget_set_sensitive(appdata->menu_item_map_show_all, FALSE);
708    
709      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
710    
711      menu_append_new_item(
712        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_style), _("St_yle"),
713        GTK_STOCK_SELECT_COLOR, "<OSM2Go-Main>/View/Style",
714        0, 0, TRUE, FALSE, FALSE
715      );
716    
717      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
718    
719      appdata->menu_item_map_no_icons = menu_append_new_item(
720        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_icons), _("No _icons"),
721        NULL, "<OSM2Go-Main>/View/NoIcons",
722        0, 0, TRUE, TRUE, appdata->settings->no_icons
723      );
724    
725    
726    appdata->menu_osm = item = gtk_menu_item_new_with_mnemonic( _("_OSM") );    /* -------------------- map submenu -------------------- */
727    
728      appdata->submenu_map = item = gtk_menu_item_new_with_mnemonic( _("_Map") );
729    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
730    submenu = gtk_menu_new();    submenu = gtk_menu_new();
731    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
732    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
733    
734    appdata->menu_item_osm_upload = menu_append_new_item(    appdata->menu_item_map_upload = menu_append_new_item(
735      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload"),
736      "upload.16", "<OSM2Go-Main>/OSM/Upload",      "upload.16", "<OSM2Go-Main>/Map/Upload",
737      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
738    );    );
739    
740    menu_append_new_item(    menu_append_new_item(
741      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download"),
742      "download.16", "<OSM2Go-Main>/OSM/Download",      "download.16", "<OSM2Go-Main>/Map/Download",
743      GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, 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    
748    if(getenv("OSM2GO_UNDO_TEST")) {    if(getenv("OSM2GO_UNDO_TEST")) {
749      appdata->menu_item_osm_undo = menu_append_new_item(      appdata->menu_item_map_undo = menu_append_new_item(
750                 appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo), _("_Undo"),                 appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo), _("_Undo"),
751                 GTK_STOCK_UNDO, "<OSM2Go-Main>/OSM/Undo",                 GTK_STOCK_UNDO, "<OSM2Go-Main>/Map/Undo",
752                 GDK_z, GDK_CONTROL_MASK, TRUE, FALSE, FALSE                 GDK_z, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
753                 );                 );
754    } else    } else
755      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");
756    
757    appdata->menu_item_osm_save_changes = menu_append_new_item(    appdata->menu_item_map_save_changes = menu_append_new_item(
758      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),
759      GTK_STOCK_SAVE, "<OSM2Go-Main>/OSM/SaveChanges",      GTK_STOCK_SAVE, "<OSM2Go-Main>/Map/SaveChanges",
760      GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
761    );    );
762    
763    appdata->menu_item_osm_undo_changes = menu_append_new_item(    appdata->menu_item_map_undo_changes = menu_append_new_item(
764      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"),
765      GTK_STOCK_DELETE, "<OSM2Go-Main>/OSM/DiscardChanges",      GTK_STOCK_DELETE, "<OSM2Go-Main>/Map/DiscardChanges",
766      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
767    );    );
768    
769    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());
770    appdata->menu_item_osm_relations = menu_append_new_item(    appdata->menu_item_map_relations = menu_append_new_item(
771      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations"),
772      NULL, "<OSM2Go-Main>/OSM/Relations",      NULL, "<OSM2Go-Main>/Map/Relations",
773      GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
774    );    );
775    
776    /* -------------------- wms submenu -------------------- */    /* -------------------- wms submenu -------------------- */
777    
778    appdata->menu_wms = item = gtk_menu_item_new_with_mnemonic( _("_WMS") );    appdata->submenu_wms = item = gtk_menu_item_new_with_mnemonic( _("_WMS") );
779    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
780    submenu = gtk_menu_new();    submenu = gtk_menu_new();
781    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
# Line 767  void menu_create(appdata_t *appdata) { Line 801  void menu_create(appdata_t *appdata) {
801    );    );
802    gtk_widget_set_sensitive(appdata->menu_item_wms_adjust, FALSE);    gtk_widget_set_sensitive(appdata->menu_item_wms_adjust, FALSE);
803    
   /* -------------------- 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  
   );  
   
804    /* -------------------- track submenu -------------------- */    /* -------------------- track submenu -------------------- */
805    
806    appdata->track.menu_track = item = gtk_menu_item_new_with_mnemonic(_("_Track"));    appdata->track.submenu_track = item =
807        gtk_menu_item_new_with_mnemonic(_("_Track"));
808    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
809    submenu = gtk_menu_new();    submenu = gtk_menu_new();
810    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
811    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
812    
813    appdata->track.menu_item_import = menu_append_new_item(    appdata->track.menu_item_track_import = menu_append_new_item(
814      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import"),
815      NULL, "<OSM2Go-Main>/Track/Import",      NULL, "<OSM2Go-Main>/Track/Import",
816      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
817    );    );
818    
819    appdata->track.menu_item_export = menu_append_new_item(    appdata->track.menu_item_track_export = menu_append_new_item(
820      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export"),
821      NULL, "<OSM2Go-Main>/Track/Export",      NULL, "<OSM2Go-Main>/Track/Export",
822      0, 0, FALSE, FALSE, FALSE      0, 0, FALSE, FALSE, FALSE
823    );    );
824    
825    appdata->track.menu_item_clear = menu_append_new_item(    appdata->track.menu_item_track_clear = menu_append_new_item(
826      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_clear), _("_Clear"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_clear), _("_Clear"),
827      GTK_STOCK_CLEAR, "<OSM2Go-Main>/Track/Clear",      GTK_STOCK_CLEAR, "<OSM2Go-Main>/Track/Clear",
828      0, 0, FALSE, FALSE, FALSE      0, 0, FALSE, FALSE, FALSE
829    );    );
830    
831    
832    appdata->track.menu_item_enable_gps = menu_append_new_item(    appdata->track.menu_item_track_enable_gps = menu_append_new_item(
833      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_enable_gps),_("_GPS enable"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_enable_gps),_("_GPS enable"),
834      NULL, "<OSM2Go-Main>/Track/GPS",      NULL, "<OSM2Go-Main>/Track/GPS",
835      GDK_g, GDK_CONTROL_MASK|GDK_SHIFT_MASK, TRUE, TRUE,      GDK_g, GDK_CONTROL_MASK|GDK_SHIFT_MASK, TRUE, TRUE,
836      appdata->settings->enable_gps      appdata->settings->enable_gps
837    );    );
838    
839    appdata->track.menu_item_follow_gps = menu_append_new_item(    appdata->track.menu_item_track_follow_gps = menu_append_new_item(
840      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_follow_gps), _("GPS follow"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_follow_gps), _("GPS follow"),
841      NULL, "<OSM2Go-Main>/Track/Follow",      NULL, "<OSM2Go-Main>/Track/Follow",
842      0, 0, appdata->settings->enable_gps, TRUE,      0, 0, appdata->settings->enable_gps, TRUE,
# Line 871  void menu_create(appdata_t *appdata) { Line 854  void menu_create(appdata_t *appdata) {
854      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
855    );    );
856    
857    #ifndef USE_HILDON
858    menu_append_new_item(    menu_append_new_item(
859      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_quit), _("_Quit"),      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_quit), _("_Quit"),
860      GTK_STOCK_QUIT, "<OSM2Go-Main>/Quit",      GTK_STOCK_QUIT, "<OSM2Go-Main>/Quit",
861      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
862    );    );
863    #endif
864    
865    gtk_window_add_accel_group(GTK_WINDOW(appdata->window), accel_grp);    gtk_window_add_accel_group(GTK_WINDOW(appdata->window), accel_grp);
866    
# Line 901  void menu_create(appdata_t *appdata) { Line 886  void menu_create(appdata_t *appdata) {
886    
887  #endif //USE_HILDON  #endif //USE_HILDON
888  }  }
889    #else // !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
890    
891    void submenu_entry(appdata_t *appdata, HildonAppMenu *menu,
892                       const char *label, const char *value,
893                       GtkSignalFunc activate_cb) {
894    
895    }
896    
897    typedef struct {
898      const char *label, *value;
899      gboolean enabled;
900      gboolean (*toggle)(appdata_t *appdata);
901      gulong offset;
902      GtkSignalFunc activate_cb;
903    } menu_entry_t;
904    
905    static gboolean no_icon_get_toggle(appdata_t *appdata) {
906      if(!appdata)           return FALSE;
907      if(!appdata->settings) return FALSE;
908      return appdata->settings->no_icons;
909    }
910    
911    static gboolean enable_gps_get_toggle(appdata_t *appdata) {
912      if(!appdata)           return FALSE;
913      if(!appdata->settings) return FALSE;
914      return appdata->settings->enable_gps;
915    }
916    
917    static gboolean follow_gps_get_toggle(appdata_t *appdata) {
918      if(!appdata)           return FALSE;
919      if(!appdata->settings) return FALSE;
920      return appdata->settings->follow_gps;
921    }
922    
923    /* create a HildonAppMenu */
924    static GtkWidget *app_menu_create(appdata_t *appdata,
925                                      const menu_entry_t *menu_entries) {
926      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
927    
928      while(menu_entries->label) {
929        GtkWidget *button = NULL;
930    
931        if(!menu_entries->toggle) {
932          button = hildon_button_new_with_text(
933                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
934                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
935                _(menu_entries->label), _(menu_entries->value));
936          g_signal_connect_after(button, "clicked",
937                                 menu_entries->activate_cb, appdata);
938        } else {
939          button = hildon_check_button_new(HILDON_SIZE_AUTO);
940          gtk_button_set_label(GTK_BUTTON(button), _(menu_entries->label));
941          printf("requesting check for %s: %p\n", menu_entries->label,
942                 menu_entries->toggle);
943          hildon_check_button_set_active(HILDON_CHECK_BUTTON(button),
944                                         menu_entries->toggle(appdata));
945          g_signal_connect_after(button, "toggled",
946                                 menu_entries->activate_cb, appdata);
947        }
948    
949        /* offset to GtkWidget pointer was given -> store pointer */
950        if(menu_entries->offset)
951          *(GtkWidget**)(((void*)appdata)+menu_entries->offset) = button;
952    
953        gtk_widget_set_sensitive(button, menu_entries->enabled);
954    
955        hildon_app_menu_append(menu, GTK_BUTTON(button));
956        menu_entries++;
957      }
958    
959      gtk_widget_show_all(GTK_WIDGET(menu));
960      return GTK_WIDGET(menu);
961    }
962    
963    static void submenu_popup(GtkWidget *menu) {
964      GtkWidget *top = hildon_window_stack_peek(hildon_window_stack_get_default());
965    
966    #if 1
967      int start, end;
968      GTimeVal tv;
969      g_get_current_time(&tv);
970      start = tv.tv_sec * 1000 + tv.tv_usec / 1000;
971      do {
972        if(gtk_events_pending())
973          while(gtk_events_pending()) {
974            putchar('.'); fflush(stdout);
975            gtk_main_iteration();
976          }
977        else
978          usleep(100);
979    
980        g_get_current_time(&tv);
981        end = tv.tv_sec * 1000 + tv.tv_usec / 1000;
982      } while(end-start < 500);
983    #endif
984    
985    
986    
987      hildon_app_menu_popup(HILDON_APP_MENU(menu), GTK_WINDOW(top));
988    }
989    
990    /* the view submenu */
991    void on_submenu_view_clicked(GtkButton *button, appdata_t *appdata) {
992      submenu_popup(appdata->app_menu_view);
993    }
994    
995    void on_submenu_map_clicked(GtkButton *button, appdata_t *appdata) {
996      submenu_popup(appdata->app_menu_map);
997    }
998    
999    void on_submenu_wms_clicked(GtkButton *button, appdata_t *appdata) {
1000      submenu_popup(appdata->app_menu_wms);
1001    }
1002    
1003    void on_submenu_track_clicked(GtkButton *button, appdata_t *appdata) {
1004      submenu_popup(appdata->app_menu_track);
1005    }
1006    
1007    #define APP_OFFSET(a)  offsetof(appdata_t, a)
1008    #define SIMPLE_ENTRY(a,b)     { a, NULL, TRUE,   NULL, 0, G_CALLBACK(b) }
1009    #define ENABLED_ENTRY(a,b,c)  { a, NULL, TRUE,  NULL, APP_OFFSET(c), G_CALLBACK(b) }
1010    #define DISABLED_ENTRY(a,b,c) { a, NULL, FALSE,  NULL, APP_OFFSET(c), G_CALLBACK(b) }
1011    #define TOGGLE_ENTRY(a,b,c)   { a, NULL, TRUE, c, 0, G_CALLBACK(b) }
1012    #define DISABLED_TOGGLE_ENTRY(a,b,c,d)  \
1013                                  { a, NULL, FALSE, c, APP_OFFSET(d), G_CALLBACK(b) }
1014    #define ENABLED_TOGGLE_ENTRY(a,b,c,d) \
1015                                  { a, NULL, TRUE, c, APP_OFFSET(d), G_CALLBACK(b) }
1016    #define LAST_ENTRY            { NULL, NULL, FALSE, NULL, 0, NULL }
1017    
1018    /* -- the view submenu -- */
1019    static const menu_entry_t submenu_view[] = {
1020    #ifndef ZOOM_BUTTONS
1021      SIMPLE_ENTRY("Zoom in",         cb_menu_zoomin),
1022      SIMPLE_ENTRY("Zoom out",        cb_menu_zoomout),
1023    #endif
1024      /* --- */
1025      SIMPLE_ENTRY("Style",           cb_menu_style),
1026      /* --- */
1027      SIMPLE_ENTRY("Normal details",  cb_menu_view_detail_normal),
1028      SIMPLE_ENTRY("More details",    cb_menu_view_detail_inc),
1029      SIMPLE_ENTRY("Less details",    cb_menu_view_detail_dec),
1030      /* --- */
1031      DISABLED_ENTRY("Hide selected", cb_menu_map_hide_sel, menu_item_map_hide_sel),
1032      DISABLED_ENTRY("Show all",      cb_menu_map_show_all, menu_item_map_show_all),
1033      /* --- */
1034      TOGGLE_ENTRY("No icons",        cb_menu_map_no_icons, no_icon_get_toggle),
1035    
1036      LAST_ENTRY
1037    };
1038    
1039    /* -- the map submenu -- */
1040    static const menu_entry_t submenu_map[] = {
1041      ENABLED_ENTRY("Upload",                cb_menu_upload, menu_item_map_upload),
1042      SIMPLE_ENTRY("Download",               cb_menu_download),
1043      ENABLED_ENTRY("Save local changes",    cb_menu_save_changes,
1044                                               menu_item_map_save_changes),
1045      ENABLED_ENTRY("Discard local changes", cb_menu_undo_changes,
1046                                               menu_item_map_undo_changes),
1047      ENABLED_ENTRY("Relations",             cb_menu_osm_relations,
1048                                               menu_item_map_relations),
1049    
1050      LAST_ENTRY
1051    };
1052    
1053    /* -- the wms submenu -- */
1054    static const menu_entry_t submenu_wms[] = {
1055      SIMPLE_ENTRY("Import",   cb_menu_wms_import),
1056      DISABLED_ENTRY("Clear",  cb_menu_wms_clear, menu_item_wms_clear),
1057      DISABLED_ENTRY("Adjust", cb_menu_wms_adjust, menu_item_wms_adjust),
1058    
1059      LAST_ENTRY
1060    };
1061    
1062    /* -- the track submenu -- */
1063    static const menu_entry_t submenu_track[] = {
1064      ENABLED_ENTRY("Import",  cb_menu_track_import, track.menu_item_track_import),
1065      DISABLED_ENTRY("Export", cb_menu_track_export, track.menu_item_track_export),
1066      DISABLED_ENTRY("Clear",  cb_menu_track_clear, track.menu_item_track_clear),
1067      ENABLED_TOGGLE_ENTRY("GPS enable", cb_menu_track_enable_gps,
1068                    enable_gps_get_toggle, track.menu_item_track_enable_gps),
1069      DISABLED_TOGGLE_ENTRY("GPS follow", cb_menu_track_follow_gps,
1070                    follow_gps_get_toggle, track.menu_item_track_follow_gps),
1071    
1072      LAST_ENTRY
1073    };
1074    
1075    
1076    /* -- the applications main menu -- */
1077    static const menu_entry_t main_menu[] = {
1078      SIMPLE_ENTRY("About",   cb_menu_about),
1079      SIMPLE_ENTRY("Project", cb_menu_project_open),
1080      ENABLED_ENTRY("View",   on_submenu_view_clicked,  submenu_view),
1081      ENABLED_ENTRY("Map",    on_submenu_map_clicked,   submenu_map),
1082      ENABLED_ENTRY("WMS",    on_submenu_wms_clicked,   submenu_wms),
1083      ENABLED_ENTRY("Track",  on_submenu_track_clicked, track.submenu_track),
1084    
1085      LAST_ENTRY
1086    };
1087    
1088    void menu_create(appdata_t *appdata) {
1089      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1090    
1091      /* build menu/submenus */
1092      menu = HILDON_APP_MENU(app_menu_create(appdata, main_menu));
1093      appdata->app_menu_wms   = app_menu_create(appdata, submenu_wms);
1094      g_object_ref(appdata->app_menu_wms);
1095      appdata->app_menu_map   = app_menu_create(appdata, submenu_map);
1096      g_object_ref(appdata->app_menu_map);
1097      appdata->app_menu_view  = app_menu_create(appdata, submenu_view);
1098      g_object_ref(appdata->app_menu_view);
1099      appdata->app_menu_track = app_menu_create(appdata, submenu_track);
1100      g_object_ref(appdata->app_menu_track);
1101    
1102      /* enable/disable some entries according to settings */
1103      if(appdata && appdata->settings)
1104        gtk_widget_set_sensitive(appdata->track.menu_item_track_follow_gps,
1105                                 appdata->settings->enable_gps);
1106    
1107      hildon_window_set_app_menu(HILDON_WINDOW(appdata->window), menu);
1108    }
1109    #endif
1110    
1111  /********************* end of menu **********************/  /********************* end of menu **********************/
1112    
# Line 972  void cleanup(appdata_t *appdata) { Line 1178  void cleanup(appdata_t *appdata) {
1178    
1179    project_free(appdata->project);    project_free(appdata->project);
1180    
1181    if(appdata->menu_item_osm_undo)    if(appdata->menu_item_map_undo)
1182      undo_free(appdata->undo.state);      undo_free(appdata->osm, appdata->undo.state);
1183    
1184    puts("everything is gone");    puts("everything is gone");
1185  }  }
# Line 990  gboolean on_window_key_press(GtkWidget * Line 1196  gboolean on_window_key_press(GtkWidget *
1196    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1197    int handled = FALSE;    int handled = FALSE;
1198    
1199      //  printf("key event with keyval %x\n", event->keyval);
1200    
1201    // the map handles some keys on its own ...    // the map handles some keys on its own ...
1202    switch(event->keyval) {    switch(event->keyval) {
1203    
1204    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
1205  #ifdef USE_HILDON  #ifdef USE_HILDON
1206      /* this is in fact a mapping to GDK_F6 */      /* this is in fact a mapping to GDK_F6 */
1207    case HILDON_HARDKEY_FULLSCREEN:    case HILDON_HARDKEY_FULLSCREEN:
# Line 1012  gboolean on_window_key_press(GtkWidget * Line 1221  gboolean on_window_key_press(GtkWidget *
1221    
1222      handled = TRUE;      handled = TRUE;
1223      break;      break;
1224    #endif
1225    }    }
1226    
1227    /* forward unprocessed key presses to map */    /* forward unprocessed key presses to map */
# Line 1059  int main(int argc, char *argv[]) { Line 1269  int main(int argc, char *argv[]) {
1269    g_set_application_name("OSM2Go");    g_set_application_name("OSM2Go");
1270    
1271    /* Create HildonWindow and set it to HildonProgram */    /* Create HildonWindow and set it to HildonProgram */
1272    #if MAEMO_VERSION_MAJOR < 5
1273    appdata.window = HILDON_WINDOW(hildon_window_new());    appdata.window = HILDON_WINDOW(hildon_window_new());
1274    #else
1275      appdata.window = HILDON_WINDOW(hildon_stackable_window_new());
1276    #endif
1277    hildon_program_add_window(appdata.program, appdata.window);    hildon_program_add_window(appdata.program, appdata.window);
1278    
1279    #if MAEMO_VERSION_MAJOR == 5
1280      unsigned long val = False;
1281      XChangeProperty(GDK_DISPLAY(),
1282                      GDK_WINDOW_XID(GTK_WIDGET(appdata.window)->window),
1283                      XInternAtom(GDK_DISPLAY(),
1284                                  "_HILDON_ZOOM_KEY_ATOM",
1285                                  False), XA_INTEGER, 32,
1286                      PropModeReplace, (unsigned char *) &val, 1);
1287    #endif
1288    
1289  #else  #else
1290    /* Create a Window. */    /* Create a Window. */
1291    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
# Line 1104  int main(int argc, char *argv[]) { Line 1329  int main(int argc, char *argv[]) {
1329    }    }
1330    
1331    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);
1332    
1333    #ifdef ZOOM_BUTTONS
1334      GtkWidget *zhbox = gtk_hbox_new(FALSE, 0);
1335    
1336      gtk_box_pack_start_defaults(GTK_BOX(zhbox), statusbar_new(&appdata));
1337    
1338      /* ---- add zoom out button right of statusbar ---- */
1339      appdata.btn_zoom_out = gtk_button_new();
1340      gtk_button_set_image(GTK_BUTTON(appdata.btn_zoom_out),
1341            gtk_image_new_from_stock(GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU));
1342      g_signal_connect(appdata.btn_zoom_out, "clicked",
1343                       G_CALLBACK(cb_menu_zoomout), &appdata);
1344      gtk_box_pack_start(GTK_BOX(zhbox), appdata.btn_zoom_out, FALSE, FALSE, 0);
1345    
1346      /* ---- add zoom in button right of statusbar ---- */
1347      appdata.btn_zoom_in = gtk_button_new();
1348      gtk_button_set_image(GTK_BUTTON(appdata.btn_zoom_in),
1349            gtk_image_new_from_stock(GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU));
1350      g_signal_connect(appdata.btn_zoom_in, "clicked",
1351                       G_CALLBACK(cb_menu_zoomin), &appdata);
1352      gtk_box_pack_start(GTK_BOX(zhbox), appdata.btn_zoom_in, FALSE, FALSE, 0);
1353    
1354    
1355      gtk_box_pack_start(GTK_BOX(vbox), zhbox, FALSE, FALSE, 0);
1356    #else
1357    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);
1358    #endif
1359    
1360  #ifndef PORTRAIT  #ifndef PORTRAIT
1361    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);
1362  #endif  #endif
   //  gtk_box_pack_start(GTK_BOX(hbox), gtk_vseparator_new(), FALSE, FALSE, 0);  
1363    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
1364    
1365    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 1122  int main(int argc, char *argv[]) { Line 1372  int main(int argc, char *argv[]) {
1372    
1373    /* let gtk do its thing before loading the data, */    /* let gtk do its thing before loading the data, */
1374    /* so the user sees something */    /* so the user sees something */
1375    while(gtk_events_pending()) {    while(gtk_events_pending())
     putchar('.');  
1376      gtk_main_iteration();      gtk_main_iteration();
   }  
1377    
1378    /* load project if one is specified in the settings */    /* load project if one is specified in the settings */
1379    if(appdata.settings->project)    if(appdata.settings->project)
# Line 1137  int main(int argc, char *argv[]) { Line 1385  int main(int argc, char *argv[]) {
1385    if(appdata.settings && appdata.settings->enable_gps)    if(appdata.settings && appdata.settings->enable_gps)
1386      track_enable_gps(&appdata, TRUE);      track_enable_gps(&appdata, TRUE);
1387    
1388    /* ------------ jump into main loop ---------------- */    /* again let the ui do its thing */
1389      while(gtk_events_pending())
1390        gtk_main_iteration();
1391    
1392    #if 0  // test overlay
1393      {
1394        GtkWidget *overlay = gtk_window_new(GTK_WINDOW_POPUP);
1395        gtk_window_set_default_size(GTK_WINDOW(overlay), 40, 20);
1396        gtk_window_set_transient_for(GTK_WINDOW(overlay), GTK_WINDOW(appdata.window));
1397        gtk_window_set_keep_above(GTK_WINDOW(overlay), TRUE);
1398        gtk_window_set_destroy_with_parent(GTK_WINDOW(overlay), TRUE);
1399        gtk_window_set_position(GTK_WINDOW(overlay), GTK_WIN_POS_CENTER_ON_PARENT);
1400    
1401        gtk_window_set_gravity(GTK_WINDOW(overlay), GDK_GRAVITY_NORTH_EAST);
1402    
1403        printf("x = %d\n", gdk_screen_width() - overlay->allocation.width);
1404        gtk_window_move(GTK_WINDOW(overlay),
1405                        gdk_screen_width() - overlay->allocation.width, 60);
1406    
1407        gtk_window_set_decorated(GTK_WINDOW(overlay), TRUE);
1408    
1409        /* add some zoom buttons for testing */
1410        GtkWidget *hbox = gtk_hbox_new(TRUE, 0);
1411        gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_button_new_with_label("+"));
1412        gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_button_new_with_label("-"));
1413        gtk_container_add(GTK_CONTAINER(overlay), hbox);
1414    
1415        gtk_widget_show_all(overlay);
1416      }
1417    #endif
1418    
1419      /* start to interact with the user now that the gui is running */
1420      if(appdata.settings->first_run_demo) {
1421        messagef(GTK_WIDGET(appdata.window), _("Welcome to OSM2Go"),
1422                 _("This is the first time you run OSM2Go. "
1423                   "A demo project has been loaded to get you "
1424                   "started. You can play around with this demo as much "
1425                   "as you like. However, you cannot upload or download "
1426                   "the demo project.\n\n"
1427                   "In order to start working on real data you'll have "
1428                   "to setup a new project and enter your OSM user name "
1429                   "and password. You'll then be able to download the "
1430                   "latest data from OSM and upload your changes into "
1431                   "the OSM main database."
1432                   ));
1433      }
1434    
1435      /* ------------ jump into main loop ---------------- */
1436    gtk_main();    gtk_main();
1437    
1438    puts("gtk_main() left");    puts("gtk_main() left");
Legend:
Removed from v.177  
changed lines
  Added in v.241