Diff of /trunk/src/main.c

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

revision 179 by harbaum, Thu Jun 18 12:15:17 2009 UTC revision 225 by harbaum, Tue Jul 14 13:32:27 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 44  static void main_ui_enable(appdata_t *ap Line 52  static void main_ui_enable(appdata_t *ap
52  #else  #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_markup_printf_escaped("OSM2Go - <b>%s</b>",
56                                      appdata->project->name);
57    else    else
58      str = g_strdup_printf("OSM2Go");      str = g_markup_printf_escaped("OSM2Go");
59    
60    gtk_window_set_title(GTK_WINDOW(appdata->window), str);    hildon_window_set_markup(HILDON_WINDOW(appdata->window), str);
61    g_free(str);    g_free(str);
62  #endif  #endif
63    
64    if(appdata->iconbar && appdata->iconbar->toolbar)    if(appdata->iconbar && appdata->iconbar->toolbar)
65      gtk_widget_set_sensitive(appdata->iconbar->toolbar, osm_valid);      gtk_widget_set_sensitive(appdata->iconbar->toolbar, osm_valid);
   
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->menu_item_osm_relations, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_relations, osm_valid);
74    gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);    gtk_widget_set_sensitive(appdata->track.submenu_track, osm_valid);
75    gtk_widget_set_sensitive(appdata->menu_view, osm_valid);    gtk_widget_set_sensitive(appdata->submenu_view, osm_valid);
76    gtk_widget_set_sensitive(appdata->menu_wms, osm_valid);    gtk_widget_set_sensitive(appdata->submenu_wms, osm_valid);
77    gtk_widget_set_sensitive(appdata->menu_map, osm_valid);  
78    gtk_widget_set_sensitive(appdata->menu_item_project_close, project_valid);  #ifdef ZOOM_BUTTONS
79      gtk_widget_set_sensitive(appdata->btn_zoom_in, osm_valid);
80      gtk_widget_set_sensitive(appdata->btn_zoom_out, osm_valid);
81    #endif
82    
83    if(!project_valid)    if(!project_valid)
84      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 94  cb_menu_project_open(GtkMenuItem *item,
94  }  }
95    
96  static void  static void
97  cb_menu_project_close(GtkMenuItem *item, gpointer data) {  cb_menu_project_wizard(GtkMenuItem *item, gpointer data) {
98    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
99    project_close(appdata);    project_wizard(appdata);
   main_ui_enable(appdata);  
100  }  }
101    
102  static void  static void
# Line 96  cb_menu_about(GtkMenuItem *item, gpointe Line 106  cb_menu_about(GtkMenuItem *item, gpointe
106    const gchar *authors[] = {    const gchar *authors[] = {
107      "Till Harbaum <till@harbaum.org>",      "Till Harbaum <till@harbaum.org>",
108      "Andrew Chadwick <andrewc-osm2go@piffle.org>",      "Andrew Chadwick <andrewc-osm2go@piffle.org>",
109        "Marcus Bauer <marcus.bauer@gmail.com>",
110        "John Stowers <john.stowers@gmail.com>",
111      NULL };      NULL };
112    
113    const gchar *artists[] = {    const gchar *artists[] = {
# Line 115  cb_menu_about(GtkMenuItem *item, gpointe Line 127  cb_menu_about(GtkMenuItem *item, gpointe
127    
128  void on_window_destroy (GtkWidget *widget, gpointer data);  void on_window_destroy (GtkWidget *widget, gpointer data);
129    
130    #ifndef USE_HILDON
131  static void  static void
132  cb_menu_quit(GtkMenuItem *item, gpointer data) {  cb_menu_quit(GtkMenuItem *item, gpointer data) {
133    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
134    gtk_widget_destroy(GTK_WIDGET(appdata->window));    gtk_widget_destroy(GTK_WIDGET(appdata->window));
135  }  }
136    #endif
137    
138  static void  static void
139  cb_menu_upload(GtkMenuItem *item, gpointer data) {  cb_menu_upload(GtkMenuItem *item, gpointer data) {
# Line 197  cb_menu_map_show_all(GtkMenuItem *item, Line 211  cb_menu_map_show_all(GtkMenuItem *item,
211    
212  /* ---------------------------------------------------------- */  /* ---------------------------------------------------------- */
213    
214  #if 1  // mainly for testing  #if defined(USE_HILDON) && (MAEMO_VERSION_MAJOR == 5)
215  static void  #define MENU_CHECK_ITEM HildonCheckButton
216  cb_menu_redraw(GtkMenuItem *item, gpointer data) {  #define MENU_CHECK_ITEM_ACTIVE(a) hildon_check_button_get_active(a)
217    appdata_t *appdata = (appdata_t*)data;  #else
218    #define MENU_CHECK_ITEM GtkCheckMenuItem
219    /* 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"  
 }  
220  #endif  #endif
221    
222  static void  static void
223  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;  
224    
225    banner_busy_start(appdata, 1, "Redrawing");    banner_busy_start(appdata, 1, "Redrawing");
226    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"  
 }  
227    
228  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;  
229    
   banner_busy_start(appdata, 1, "Redrawing");  
   map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);  
   appdata->settings->no_antialias = gtk_check_menu_item_get_active(item);  
230    map_paint(appdata);    map_paint(appdata);
231    banner_busy_stop(appdata); //"Redrawing"    banner_busy_stop(appdata); //"Redrawing"
232  }  }
# Line 290  cb_menu_undo_changes(GtkMenuItem *item, Line 277  cb_menu_undo_changes(GtkMenuItem *item,
277  }  }
278    
279  static void  static void
280  cb_menu_osm_relations(GtkMenuItem *item, gpointer data) {  cb_menu_osm_relations(GtkMenuItem *item, appdata_t *appdata) {
281    relation_list((appdata_t*)data);    /* list relations of all objects */
282      relation_list(GTK_WIDGET(appdata->window), appdata, NULL);
283  }  }
284    
285  #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)  #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
286  static void  static void
287  cb_menu_fullscreen(GtkCheckMenuItem *item, gpointer data) {  cb_menu_fullscreen(MENU_CHECK_ITEM *item, gpointer data) {
288    appdata_t *appdata = (appdata_t *)data;    appdata_t *appdata = (appdata_t *)data;
289    
290    if(gtk_check_menu_item_get_active(item))    if(MENU_CHECK_ITEM_ACTIVE(item))
291      gtk_window_fullscreen(GTK_WINDOW(appdata->window));      gtk_window_fullscreen(GTK_WINDOW(appdata->window));
292    else    else
293      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));
# Line 402  cb_menu_track_import(GtkMenuItem *item, Line 390  cb_menu_track_import(GtkMenuItem *item,
390  }  }
391    
392  static void  static void
393  cb_menu_track_enable_gps(GtkMenuItem *item, gpointer data) {  cb_menu_track_enable_gps(MENU_CHECK_ITEM *item, appdata_t *appdata) {
394    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);  
395  }  }
396    
397    
398  static void  static void
399  cb_menu_track_follow_gps(GtkMenuItem *item, gpointer data) {  cb_menu_track_follow_gps(MENU_CHECK_ITEM *item, appdata_t *appdata) {
400    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;  
401  }  }
402    
403    
# Line 528  cb_menu_track_clear(GtkMenuItem *item, g Line 504  cb_menu_track_clear(GtkMenuItem *item, g
504  #endif  #endif
505    
506    
507    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
508  // Half-arsed slapdash common menu item constructor. Let's use GtkBuilder  // Half-arsed slapdash common menu item constructor. Let's use GtkBuilder
509  // instead so we have some flexibility.  // instead so we have some flexibility.
510    
# Line 607  menu_append_new_item(appdata_t *appdata, Line 583  menu_append_new_item(appdata_t *appdata,
583    return item;    return item;
584  }  }
585    
   
586  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
587    GtkWidget *menu, *item, *submenu;    GtkWidget *menu, *item, *submenu;
588    GtkWidget *about_quit_items_menu;    GtkWidget *about_quit_items_menu;
# Line 637  void menu_create(appdata_t *appdata) { Line 612  void menu_create(appdata_t *appdata) {
612      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
613    );    );
614    
615    appdata->menu_item_project_close = menu_append_new_item(  #ifndef USE_HILDON
616      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_close), _("_Close"),    menu_append_new_item(
617      GTK_STOCK_CLOSE, "<OSM2Go-Main>/Project/Close",      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_wizard), _("_Wizard"),
618        GTK_STOCK_NEW, "<OSM2Go-Main>/Project/Wizard",
619      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
620    );    );
621    #endif
622    
623    /* --------------- view menu ------------------- */    /* --------------- view menu ------------------- */
624    
# Line 649  void menu_create(appdata_t *appdata) { Line 626  void menu_create(appdata_t *appdata) {
626    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());
627  #endif  #endif
628    
629    appdata->menu_view = item = gtk_menu_item_new_with_mnemonic( _("_View") );    appdata->submenu_view = item = gtk_menu_item_new_with_mnemonic( _("_View") );
630    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
631    submenu = gtk_menu_new();    submenu = gtk_menu_new();
632    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
# Line 695  void menu_create(appdata_t *appdata) { Line 672  void menu_create(appdata_t *appdata) {
672      GDK_comma, GDK_MOD1_MASK, TRUE, FALSE, FALSE      GDK_comma, GDK_MOD1_MASK, TRUE, FALSE, FALSE
673    );    );
674    
675    /* -------------------- OSM submenu -------------------- */    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
676    
677      appdata->menu_item_map_hide_sel = menu_append_new_item(
678        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_hide_sel), _("_Hide selected"),
679        GTK_STOCK_REMOVE, "<OSM2Go-Main>/View/HideSelected",
680        0, 0, TRUE, FALSE, FALSE
681      );
682      gtk_widget_set_sensitive(appdata->menu_item_map_hide_sel, FALSE);
683    
684      appdata->menu_item_map_show_all = menu_append_new_item(
685        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_show_all), _("_Show all"),
686        GTK_STOCK_ADD, "<OSM2Go-Main>/View/ShowAll",
687        0, 0, TRUE, FALSE, FALSE
688      );
689      gtk_widget_set_sensitive(appdata->menu_item_map_show_all, FALSE);
690    
691      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
692    
693      menu_append_new_item(
694        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_style), _("St_yle"),
695        GTK_STOCK_SELECT_COLOR, "<OSM2Go-Main>/View/Style",
696        0, 0, TRUE, FALSE, FALSE
697      );
698    
699      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
700    
701    appdata->menu_osm = item = gtk_menu_item_new_with_mnemonic( _("_OSM") );    appdata->menu_item_map_no_icons = menu_append_new_item(
702        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_icons), _("No _icons"),
703        NULL, "<OSM2Go-Main>/View/NoIcons",
704        0, 0, TRUE, TRUE, appdata->settings->no_icons
705      );
706    
707    
708      /* -------------------- map submenu -------------------- */
709    
710      appdata->submenu_map = item = gtk_menu_item_new_with_mnemonic( _("_Map") );
711    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
712    submenu = gtk_menu_new();    submenu = gtk_menu_new();
713    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
714    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
715    
716    appdata->menu_item_osm_upload = menu_append_new_item(    appdata->menu_item_map_upload = menu_append_new_item(
717      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload"),
718      "upload.16", "<OSM2Go-Main>/OSM/Upload",      "upload.16", "<OSM2Go-Main>/Map/Upload",
719      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
720    );    );
721    
722    menu_append_new_item(    menu_append_new_item(
723      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download"),
724      "download.16", "<OSM2Go-Main>/OSM/Download",      "download.16", "<OSM2Go-Main>/Map/Download",
725      GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
726    );    );
727    
728    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());
729    
730    if(getenv("OSM2GO_UNDO_TEST")) {    if(getenv("OSM2GO_UNDO_TEST")) {
731      appdata->menu_item_osm_undo = menu_append_new_item(      appdata->menu_item_map_undo = menu_append_new_item(
732                 appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo), _("_Undo"),                 appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo), _("_Undo"),
733                 GTK_STOCK_UNDO, "<OSM2Go-Main>/OSM/Undo",                 GTK_STOCK_UNDO, "<OSM2Go-Main>/Map/Undo",
734                 GDK_z, GDK_CONTROL_MASK, TRUE, FALSE, FALSE                 GDK_z, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
735                 );                 );
736    } else    } else
737      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");
738    
739    appdata->menu_item_osm_save_changes = menu_append_new_item(    appdata->menu_item_map_save_changes = menu_append_new_item(
740      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),
741      GTK_STOCK_SAVE, "<OSM2Go-Main>/OSM/SaveChanges",      GTK_STOCK_SAVE, "<OSM2Go-Main>/Map/SaveChanges",
742      GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
743    );    );
744    
745    appdata->menu_item_osm_undo_changes = menu_append_new_item(    appdata->menu_item_map_undo_changes = menu_append_new_item(
746      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"),
747      GTK_STOCK_DELETE, "<OSM2Go-Main>/OSM/DiscardChanges",      GTK_STOCK_DELETE, "<OSM2Go-Main>/Map/DiscardChanges",
748      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
749    );    );
750    
751    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());
752    appdata->menu_item_osm_relations = menu_append_new_item(    appdata->menu_item_map_relations = menu_append_new_item(
753      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations"),
754      NULL, "<OSM2Go-Main>/OSM/Relations",      NULL, "<OSM2Go-Main>/Map/Relations",
755      GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
756    );    );
757    
758    /* -------------------- wms submenu -------------------- */    /* -------------------- wms submenu -------------------- */
759    
760    appdata->menu_wms = item = gtk_menu_item_new_with_mnemonic( _("_WMS") );    appdata->submenu_wms = item = gtk_menu_item_new_with_mnemonic( _("_WMS") );
761    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
762    submenu = gtk_menu_new();    submenu = gtk_menu_new();
763    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
# Line 773  void menu_create(appdata_t *appdata) { Line 783  void menu_create(appdata_t *appdata) {
783    );    );
784    gtk_widget_set_sensitive(appdata->menu_item_wms_adjust, FALSE);    gtk_widget_set_sensitive(appdata->menu_item_wms_adjust, FALSE);
785    
   /* -------------------- 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  
   );  
   
786    /* -------------------- track submenu -------------------- */    /* -------------------- track submenu -------------------- */
787    
788    appdata->track.menu_track = item = gtk_menu_item_new_with_mnemonic(_("_Track"));    appdata->track.submenu_track = item =
789        gtk_menu_item_new_with_mnemonic(_("_Track"));
790    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
791    submenu = gtk_menu_new();    submenu = gtk_menu_new();
792    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
793    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
794    
795    appdata->track.menu_item_import = menu_append_new_item(    appdata->track.menu_item_track_import = menu_append_new_item(
796      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import"),
797      NULL, "<OSM2Go-Main>/Track/Import",      NULL, "<OSM2Go-Main>/Track/Import",
798      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
799    );    );
800    
801    appdata->track.menu_item_export = menu_append_new_item(    appdata->track.menu_item_track_export = menu_append_new_item(
802      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export"),
803      NULL, "<OSM2Go-Main>/Track/Export",      NULL, "<OSM2Go-Main>/Track/Export",
804      0, 0, FALSE, FALSE, FALSE      0, 0, FALSE, FALSE, FALSE
805    );    );
806    
807    appdata->track.menu_item_clear = menu_append_new_item(    appdata->track.menu_item_track_clear = menu_append_new_item(
808      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_clear), _("_Clear"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_clear), _("_Clear"),
809      GTK_STOCK_CLEAR, "<OSM2Go-Main>/Track/Clear",      GTK_STOCK_CLEAR, "<OSM2Go-Main>/Track/Clear",
810      0, 0, FALSE, FALSE, FALSE      0, 0, FALSE, FALSE, FALSE
811    );    );
812    
813    
814    appdata->track.menu_item_enable_gps = menu_append_new_item(    appdata->track.menu_item_track_enable_gps = menu_append_new_item(
815      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_enable_gps),_("_GPS enable"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_enable_gps),_("_GPS enable"),
816      NULL, "<OSM2Go-Main>/Track/GPS",      NULL, "<OSM2Go-Main>/Track/GPS",
817      GDK_g, GDK_CONTROL_MASK|GDK_SHIFT_MASK, TRUE, TRUE,      GDK_g, GDK_CONTROL_MASK|GDK_SHIFT_MASK, TRUE, TRUE,
818      appdata->settings->enable_gps      appdata->settings->enable_gps
819    );    );
820    
821    appdata->track.menu_item_follow_gps = menu_append_new_item(    appdata->track.menu_item_track_follow_gps = menu_append_new_item(
822      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_follow_gps), _("GPS follow"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_follow_gps), _("GPS follow"),
823      NULL, "<OSM2Go-Main>/Track/Follow",      NULL, "<OSM2Go-Main>/Track/Follow",
824      0, 0, appdata->settings->enable_gps, TRUE,      0, 0, appdata->settings->enable_gps, TRUE,
# Line 877  void menu_create(appdata_t *appdata) { Line 836  void menu_create(appdata_t *appdata) {
836      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
837    );    );
838    
839    #ifndef USE_HILDON
840    menu_append_new_item(    menu_append_new_item(
841      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_quit), _("_Quit"),      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_quit), _("_Quit"),
842      GTK_STOCK_QUIT, "<OSM2Go-Main>/Quit",      GTK_STOCK_QUIT, "<OSM2Go-Main>/Quit",
843      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
844    );    );
845    #endif
846    
847    gtk_window_add_accel_group(GTK_WINDOW(appdata->window), accel_grp);    gtk_window_add_accel_group(GTK_WINDOW(appdata->window), accel_grp);
848    
# Line 907  void menu_create(appdata_t *appdata) { Line 868  void menu_create(appdata_t *appdata) {
868    
869  #endif //USE_HILDON  #endif //USE_HILDON
870  }  }
871    #else // !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
872    
873    void submenu_entry(appdata_t *appdata, HildonAppMenu *menu,
874                       const char *label, const char *value,
875                       GtkSignalFunc activate_cb) {
876    
877    }
878    
879    typedef struct {
880      const char *label, *value;
881      gboolean enabled;
882      gboolean (*toggle)(appdata_t *appdata);
883      gulong offset;
884      GtkSignalFunc activate_cb;
885    } menu_entry_t;
886    
887    static gboolean no_icon_get_toggle(appdata_t *appdata) {
888      if(!appdata)           return FALSE;
889      if(!appdata->settings) return FALSE;
890      return appdata->settings->no_icons;
891    }
892    
893    static gboolean enable_gps_get_toggle(appdata_t *appdata) {
894      if(!appdata)           return FALSE;
895      if(!appdata->settings) return FALSE;
896      return appdata->settings->enable_gps;
897    }
898    
899    static gboolean follow_gps_get_toggle(appdata_t *appdata) {
900      if(!appdata)           return FALSE;
901      if(!appdata->settings) return FALSE;
902      return appdata->settings->follow_gps;
903    }
904    
905    /* create a HildonAppMenu */
906    static GtkWidget *app_menu_create(appdata_t *appdata,
907                                      const menu_entry_t *menu_entries) {
908      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
909    
910      while(menu_entries->label) {
911        GtkWidget *button = NULL;
912    
913        if(!menu_entries->toggle) {
914          button = hildon_button_new_with_text(
915                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
916                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
917                _(menu_entries->label), _(menu_entries->value));
918          g_signal_connect_after(button, "clicked",
919                                 menu_entries->activate_cb, appdata);
920        } else {
921          button = hildon_check_button_new(HILDON_SIZE_AUTO);
922          gtk_button_set_label(GTK_BUTTON(button), _(menu_entries->label));
923          printf("requesting check for %s: %p\n", menu_entries->label,
924                 menu_entries->toggle);
925          hildon_check_button_set_active(HILDON_CHECK_BUTTON(button),
926                                         menu_entries->toggle(appdata));
927          g_signal_connect_after(button, "toggled",
928                                 menu_entries->activate_cb, appdata);
929        }
930    
931        /* offset to GtkWidget pointer was given -> store pointer */
932        if(menu_entries->offset)
933          *(GtkWidget**)(((void*)appdata)+menu_entries->offset) = button;
934    
935        gtk_widget_set_sensitive(button, menu_entries->enabled);
936    
937        hildon_app_menu_append(menu, GTK_BUTTON(button));
938        menu_entries++;
939      }
940    
941      gtk_widget_show_all(GTK_WIDGET(menu));
942      return GTK_WIDGET(menu);
943    }
944    
945    /* the view submenu */
946    void on_submenu_view_clicked(GtkButton *button, appdata_t *appdata) {
947      hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_view),
948                            GTK_WINDOW(appdata->window));
949    }
950    
951    void on_submenu_map_clicked(GtkButton *button, appdata_t *appdata) {
952      hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_map),
953                            GTK_WINDOW(appdata->window));
954    }
955    
956    void on_submenu_wms_clicked(GtkButton *button, appdata_t *appdata) {
957      hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_wms),
958                            GTK_WINDOW(appdata->window));
959    }
960    
961    void on_submenu_track_clicked(GtkButton *button, appdata_t *appdata) {
962      hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_track),
963                            GTK_WINDOW(appdata->window));
964    }
965    
966    #define APP_OFFSET(a)  offsetof(appdata_t, a)
967    #define SIMPLE_ENTRY(a,b)     { a, NULL, TRUE,   NULL, 0, G_CALLBACK(b) }
968    #define ENABLED_ENTRY(a,b,c)  { a, NULL, TRUE,  NULL, APP_OFFSET(c), G_CALLBACK(b) }
969    #define DISABLED_ENTRY(a,b,c) { a, NULL, FALSE,  NULL, APP_OFFSET(c), G_CALLBACK(b) }
970    #define TOGGLE_ENTRY(a,b,c)   { a, NULL, TRUE, c, 0, G_CALLBACK(b) }
971    #define DISABLED_TOGGLE_ENTRY(a,b,c,d)  \
972                                  { a, NULL, FALSE, c, APP_OFFSET(d), G_CALLBACK(b) }
973    #define ENABLED_TOGGLE_ENTRY(a,b,c,d) \
974                                  { a, NULL, TRUE, c, APP_OFFSET(d), G_CALLBACK(b) }
975    #define LAST_ENTRY            { NULL, NULL, FALSE, NULL, 0, NULL }
976    
977    /* -- the view submenu -- */
978    static const menu_entry_t submenu_view[] = {
979      SIMPLE_ENTRY("Zoom in",         cb_menu_zoomin),
980      SIMPLE_ENTRY("Zoom out",        cb_menu_zoomout),
981      /* --- */
982      SIMPLE_ENTRY("Style",           cb_menu_style),
983      /* --- */
984      SIMPLE_ENTRY("Normal details",  cb_menu_view_detail_normal),
985      SIMPLE_ENTRY("More details",    cb_menu_view_detail_inc),
986      SIMPLE_ENTRY("Less details",    cb_menu_view_detail_dec),
987      /* --- */
988      DISABLED_ENTRY("Hide selected", cb_menu_map_hide_sel, menu_item_map_hide_sel),
989      DISABLED_ENTRY("Show all",      cb_menu_map_show_all, menu_item_map_show_all),
990      /* --- */
991      TOGGLE_ENTRY("No icons",        cb_menu_map_no_icons, no_icon_get_toggle),
992    
993      LAST_ENTRY
994    };
995    
996    /* -- the map submenu -- */
997    static const menu_entry_t submenu_map[] = {
998      ENABLED_ENTRY("Upload",                cb_menu_upload, menu_item_map_upload),
999      SIMPLE_ENTRY("Download",               cb_menu_download),
1000      ENABLED_ENTRY("Save local changes",    cb_menu_save_changes,
1001                                               menu_item_map_save_changes),
1002      ENABLED_ENTRY("Discard local changes", cb_menu_undo_changes,
1003                                               menu_item_map_undo_changes),
1004      ENABLED_ENTRY("Relations",             cb_menu_osm_relations,
1005                                               menu_item_map_relations),
1006    
1007      LAST_ENTRY
1008    };
1009    
1010    /* -- the wms submenu -- */
1011    static const menu_entry_t submenu_wms[] = {
1012      SIMPLE_ENTRY("Import",   cb_menu_wms_import),
1013      DISABLED_ENTRY("Clear",  cb_menu_wms_clear, menu_item_wms_clear),
1014      DISABLED_ENTRY("Adjust", cb_menu_wms_adjust, menu_item_wms_adjust),
1015    
1016      LAST_ENTRY
1017    };
1018    
1019    /* -- the track submenu -- */
1020    static const menu_entry_t submenu_track[] = {
1021      ENABLED_ENTRY("Import",  cb_menu_track_import, track.menu_item_track_import),
1022      DISABLED_ENTRY("Export", cb_menu_track_export, track.menu_item_track_export),
1023      DISABLED_ENTRY("Clear",  cb_menu_track_clear, track.menu_item_track_clear),
1024      ENABLED_TOGGLE_ENTRY("GPS enable", cb_menu_track_enable_gps,
1025                    enable_gps_get_toggle, track.menu_item_track_enable_gps),
1026      DISABLED_TOGGLE_ENTRY("GPS follow", cb_menu_track_follow_gps,
1027                    follow_gps_get_toggle, track.menu_item_track_follow_gps),
1028    
1029      LAST_ENTRY
1030    };
1031    
1032    
1033    /* -- the applications main menu -- */
1034    static const menu_entry_t main_menu[] = {
1035      SIMPLE_ENTRY("About",   cb_menu_about),
1036      SIMPLE_ENTRY("Project", cb_menu_project_open),
1037      ENABLED_ENTRY("View",   on_submenu_view_clicked,  submenu_view),
1038      ENABLED_ENTRY("Map",    on_submenu_map_clicked,   submenu_map),
1039      ENABLED_ENTRY("WMS",    on_submenu_wms_clicked,   submenu_wms),
1040      ENABLED_ENTRY("Track",  on_submenu_track_clicked, track.submenu_track),
1041    
1042      LAST_ENTRY
1043    };
1044    
1045    void menu_create(appdata_t *appdata) {
1046      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1047    
1048      /* build menu/submenus */
1049      menu = HILDON_APP_MENU(app_menu_create(appdata, main_menu));
1050      appdata->app_menu_wms   = app_menu_create(appdata, submenu_wms);
1051      appdata->app_menu_map   = app_menu_create(appdata, submenu_map);
1052      appdata->app_menu_view  = app_menu_create(appdata, submenu_view);
1053      appdata->app_menu_track = app_menu_create(appdata, submenu_track);
1054    
1055      /* enable/disable some entries according to settings */
1056      if(appdata && appdata->settings)
1057        gtk_widget_set_sensitive(appdata->track.menu_item_track_follow_gps,
1058                                 appdata->settings->enable_gps);
1059    
1060      hildon_window_set_app_menu(HILDON_WINDOW(appdata->window), menu);
1061    }
1062    #endif
1063    
1064  /********************* end of menu **********************/  /********************* end of menu **********************/
1065    
# Line 978  void cleanup(appdata_t *appdata) { Line 1131  void cleanup(appdata_t *appdata) {
1131    
1132    project_free(appdata->project);    project_free(appdata->project);
1133    
1134    if(appdata->menu_item_osm_undo)    if(appdata->menu_item_map_undo)
1135      undo_free(appdata->undo.state);      undo_free(appdata->undo.state);
1136    
1137    puts("everything is gone");    puts("everything is gone");
# Line 996  gboolean on_window_key_press(GtkWidget * Line 1149  gboolean on_window_key_press(GtkWidget *
1149    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1150    int handled = FALSE;    int handled = FALSE;
1151    
1152      //  printf("key event with keyval %x\n", event->keyval);
1153    
1154    // the map handles some keys on its own ...    // the map handles some keys on its own ...
1155    switch(event->keyval) {    switch(event->keyval) {
1156    
1157    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
1158  #ifdef USE_HILDON  #ifdef USE_HILDON
1159      /* this is in fact a mapping to GDK_F6 */      /* this is in fact a mapping to GDK_F6 */
1160    case HILDON_HARDKEY_FULLSCREEN:    case HILDON_HARDKEY_FULLSCREEN:
# Line 1018  gboolean on_window_key_press(GtkWidget * Line 1174  gboolean on_window_key_press(GtkWidget *
1174    
1175      handled = TRUE;      handled = TRUE;
1176      break;      break;
1177    #endif
1178    }    }
1179    
1180    /* forward unprocessed key presses to map */    /* forward unprocessed key presses to map */
# Line 1065  int main(int argc, char *argv[]) { Line 1222  int main(int argc, char *argv[]) {
1222    g_set_application_name("OSM2Go");    g_set_application_name("OSM2Go");
1223    
1224    /* Create HildonWindow and set it to HildonProgram */    /* Create HildonWindow and set it to HildonProgram */
1225    #if MAEMO_VERSION_MAJOR < 5
1226    appdata.window = HILDON_WINDOW(hildon_window_new());    appdata.window = HILDON_WINDOW(hildon_window_new());
1227    #else
1228      appdata.window = HILDON_WINDOW(hildon_stackable_window_new());
1229    #endif
1230    hildon_program_add_window(appdata.program, appdata.window);    hildon_program_add_window(appdata.program, appdata.window);
1231    
1232    #if MAEMO_VERSION_MAJOR == 6
1233      unsigned long val;
1234      XChangeProperty(GDK_DISPLAY(),
1235                      GDK_WINDOW_XID(GTK_WIDGET(appdata.window)->window),
1236                      XInternAtom(GDK_DISPLAY(),
1237                                  "_HILDON_ZOOM_KEY_ATOM",
1238                                  False), XA_INTEGER, 32,
1239                      PropModeReplace, (unsigned char *) &val, 1);
1240    #endif
1241    
1242  #else  #else
1243    /* Create a Window. */    /* Create a Window. */
1244    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
# Line 1110  int main(int argc, char *argv[]) { Line 1282  int main(int argc, char *argv[]) {
1282    }    }
1283    
1284    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);
1285    
1286    #ifdef ZOOM_BUTTONS
1287      GtkWidget *zhbox = gtk_hbox_new(FALSE, 0);
1288    
1289      gtk_box_pack_start_defaults(GTK_BOX(zhbox), statusbar_new(&appdata));
1290    
1291      /* ---- add zoom out button right of statusbar ---- */
1292      appdata.btn_zoom_out = gtk_button_new();
1293      gtk_button_set_image(GTK_BUTTON(appdata.btn_zoom_out),
1294            gtk_image_new_from_stock(GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU));
1295      g_signal_connect(appdata.btn_zoom_out, "clicked",
1296                       G_CALLBACK(cb_menu_zoomout), &appdata);
1297      gtk_box_pack_start(GTK_BOX(zhbox), appdata.btn_zoom_out, FALSE, FALSE, 0);
1298    
1299      /* ---- add zoom in button right of statusbar ---- */
1300      appdata.btn_zoom_in = gtk_button_new();
1301      gtk_button_set_image(GTK_BUTTON(appdata.btn_zoom_in),
1302            gtk_image_new_from_stock(GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU));
1303      g_signal_connect(appdata.btn_zoom_in, "clicked",
1304                       G_CALLBACK(cb_menu_zoomin), &appdata);
1305      gtk_box_pack_start(GTK_BOX(zhbox), appdata.btn_zoom_in, FALSE, FALSE, 0);
1306    
1307    
1308      gtk_box_pack_start(GTK_BOX(vbox), zhbox, FALSE, FALSE, 0);
1309    #else
1310    gtk_box_pack_start(GTK_BOX(vbox), statusbar_new(&appdata), FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(vbox), statusbar_new(&appdata), FALSE, FALSE, 0);
1311    #endif
1312    
1313  #ifndef PORTRAIT  #ifndef PORTRAIT
1314    gtk_box_pack_start(GTK_BOX(hbox), iconbar_new(&appdata), FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(hbox), iconbar_new(&appdata), FALSE, FALSE, 0);
1315  #endif  #endif
   //  gtk_box_pack_start(GTK_BOX(hbox), gtk_vseparator_new(), FALSE, FALSE, 0);  
1316    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
1317    
1318    gtk_box_pack_start(GTK_BOX(appdata.vbox), hbox, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(appdata.vbox), hbox, TRUE, TRUE, 0);
# Line 1145  int main(int argc, char *argv[]) { Line 1342  int main(int argc, char *argv[]) {
1342    while(gtk_events_pending())    while(gtk_events_pending())
1343      gtk_main_iteration();      gtk_main_iteration();
1344    
1345    #if 0  // test overlay
1346      {
1347        GtkWidget *overlay = gtk_window_new(GTK_WINDOW_POPUP);
1348        gtk_window_set_default_size(GTK_WINDOW(overlay), 40, 20);
1349        gtk_window_set_transient_for(GTK_WINDOW(overlay), GTK_WINDOW(appdata.window));
1350        gtk_window_set_keep_above(GTK_WINDOW(overlay), TRUE);
1351        gtk_window_set_destroy_with_parent(GTK_WINDOW(overlay), TRUE);
1352        gtk_window_set_position(GTK_WINDOW(overlay), GTK_WIN_POS_CENTER_ON_PARENT);
1353    
1354        gtk_window_set_gravity(GTK_WINDOW(overlay), GDK_GRAVITY_NORTH_EAST);
1355    
1356        printf("x = %d\n", gdk_screen_width() - overlay->allocation.width);
1357        gtk_window_move(GTK_WINDOW(overlay),
1358                        gdk_screen_width() - overlay->allocation.width, 60);
1359    
1360        gtk_window_set_decorated(GTK_WINDOW(overlay), TRUE);
1361    
1362        /* add some zoom buttons for testing */
1363        GtkWidget *hbox = gtk_hbox_new(TRUE, 0);
1364        gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_button_new_with_label("+"));
1365        gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_button_new_with_label("-"));
1366        gtk_container_add(GTK_CONTAINER(overlay), hbox);
1367    
1368        gtk_widget_show_all(overlay);
1369      }
1370    #endif
1371    
1372    /* start to interact with the user now that the gui is running */    /* start to interact with the user now that the gui is running */
1373    if(appdata.settings->first_run_demo) {    if(appdata.settings->first_run_demo) {
1374      messagef(GTK_WIDGET(appdata.window), _("Welcome to OSM2Go"),      messagef(GTK_WIDGET(appdata.window), _("Welcome to OSM2Go"),
Legend:
Removed from v.179  
changed lines
  Added in v.225