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 192 by harbaum, Tue Jul 7 11:07:11 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 54  static void main_ui_enable(appdata_t *ap Line 62  static void main_ui_enable(appdata_t *ap
62    
63    if(appdata->iconbar && appdata->iconbar->toolbar)    if(appdata->iconbar && appdata->iconbar->toolbar)
64      gtk_widget_set_sensitive(appdata->iconbar->toolbar, osm_valid);      gtk_widget_set_sensitive(appdata->iconbar->toolbar, osm_valid);
   
65    /* disable all menu entries related to map */    /* disable all menu entries related to map */
66    gtk_widget_set_sensitive(appdata->menu_osm, project_valid);    gtk_widget_set_sensitive(appdata->submenu_map, project_valid);
67    gtk_widget_set_sensitive(appdata->menu_item_osm_upload, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_upload, osm_valid);
68    if(appdata->menu_item_osm_undo)    if(appdata->menu_item_map_undo)
69      gtk_widget_set_sensitive(appdata->menu_item_osm_undo, osm_valid);      gtk_widget_set_sensitive(appdata->menu_item_map_undo, osm_valid);
70    gtk_widget_set_sensitive(appdata->menu_item_osm_save_changes, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_save_changes, osm_valid);
71    gtk_widget_set_sensitive(appdata->menu_item_osm_undo_changes, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_undo_changes, osm_valid);
72    gtk_widget_set_sensitive(appdata->menu_item_osm_relations, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_relations, osm_valid);
73    gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);    gtk_widget_set_sensitive(appdata->track.submenu_track, osm_valid);
74    gtk_widget_set_sensitive(appdata->menu_view, osm_valid);    gtk_widget_set_sensitive(appdata->submenu_view, osm_valid);
75    gtk_widget_set_sensitive(appdata->menu_wms, osm_valid);    gtk_widget_set_sensitive(appdata->submenu_wms, osm_valid);
   gtk_widget_set_sensitive(appdata->menu_map, osm_valid);  
   gtk_widget_set_sensitive(appdata->menu_item_project_close, project_valid);  
76    
77    if(!project_valid)    if(!project_valid)
78      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 88  cb_menu_project_open(GtkMenuItem *item,
88  }  }
89    
90  static void  static void
91  cb_menu_project_close(GtkMenuItem *item, gpointer data) {  cb_menu_project_wizard(GtkMenuItem *item, gpointer data) {
92    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
93    project_close(appdata);    project_wizard(appdata);
   main_ui_enable(appdata);  
94  }  }
95    
96  static void  static void
# Line 115  cb_menu_about(GtkMenuItem *item, gpointe Line 119  cb_menu_about(GtkMenuItem *item, gpointe
119    
120  void on_window_destroy (GtkWidget *widget, gpointer data);  void on_window_destroy (GtkWidget *widget, gpointer data);
121    
122    #ifndef USE_HILDON
123  static void  static void
124  cb_menu_quit(GtkMenuItem *item, gpointer data) {  cb_menu_quit(GtkMenuItem *item, gpointer data) {
125    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
126    gtk_widget_destroy(GTK_WIDGET(appdata->window));    gtk_widget_destroy(GTK_WIDGET(appdata->window));
127  }  }
128    #endif
129    
130  static void  static void
131  cb_menu_upload(GtkMenuItem *item, gpointer data) {  cb_menu_upload(GtkMenuItem *item, gpointer data) {
132    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
133    if(!appdata->osm || !appdata->project) return;    if(!appdata->osm || !appdata->project) return;
134    
135      if(project_check_demo(GTK_WIDGET(appdata->window), appdata->project))
136        return;
137    
138    osm_upload(appdata, appdata->osm, appdata->project);    osm_upload(appdata, appdata->osm, appdata->project);
139  }  }
140    
# Line 134  cb_menu_download(GtkMenuItem *item, gpoi Line 143  cb_menu_download(GtkMenuItem *item, gpoi
143    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
144    if(!appdata->project) return;    if(!appdata->project) return;
145    
146      if(project_check_demo(GTK_WIDGET(appdata->window), appdata->project))
147        return;
148    
149    /* if we have valid osm data loaded: save state first */    /* if we have valid osm data loaded: save state first */
150    if(appdata->osm) {    if(appdata->osm) {
151      /* 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 203  cb_menu_map_show_all(GtkMenuItem *item,
203    
204  /* ---------------------------------------------------------- */  /* ---------------------------------------------------------- */
205    
206  #if 1  // mainly for testing  #if defined(USE_HILDON) && (MAEMO_VERSION_MAJOR == 5)
207  static void  #define MENU_CHECK_ITEM HildonCheckButton
208  cb_menu_redraw(GtkMenuItem *item, gpointer data) {  #define MENU_CHECK_ITEM_ACTIVE(a) hildon_check_button_get_active(a)
209    appdata_t *appdata = (appdata_t*)data;  #else
210    #define MENU_CHECK_ITEM GtkCheckMenuItem
211    /* 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"  
 }  
212  #endif  #endif
213    
214  static void  static void
215  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;  
216    
217    banner_busy_start(appdata, 1, "Redrawing");    banner_busy_start(appdata, 1, "Redrawing");
218    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"  
 }  
219    
220  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;  
221    
   banner_busy_start(appdata, 1, "Redrawing");  
   map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);  
   appdata->settings->no_antialias = gtk_check_menu_item_get_active(item);  
222    map_paint(appdata);    map_paint(appdata);
223    banner_busy_stop(appdata); //"Redrawing"    banner_busy_stop(appdata); //"Redrawing"
224  }  }
# Line 284  cb_menu_undo_changes(GtkMenuItem *item, Line 269  cb_menu_undo_changes(GtkMenuItem *item,
269  }  }
270    
271  static void  static void
272  cb_menu_osm_relations(GtkMenuItem *item, gpointer data) {  cb_menu_osm_relations(GtkMenuItem *item, appdata_t *appdata) {
273    relation_list((appdata_t*)data);    /* list relations of all objects */
274      relation_list(GTK_WIDGET(appdata->window), appdata, NULL);
275  }  }
276    
277  #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)  #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));
# Line 396  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 522  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 601  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 631  void menu_create(appdata_t *appdata) { Line 604  void menu_create(appdata_t *appdata) {
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 643  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);
# Line 689  void menu_create(appdata_t *appdata) { Line 662  void menu_create(appdata_t *appdata) {
662      GDK_comma, GDK_MOD1_MASK, TRUE, FALSE, FALSE      GDK_comma, GDK_MOD1_MASK, TRUE, FALSE, FALSE
663    );    );
664    
665    /* -------------------- OSM submenu -------------------- */    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);
# Line 767  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 871  void menu_create(appdata_t *appdata) { Line 826  void menu_create(appdata_t *appdata) {
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 901  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      if(!appdata->settings) return FALSE;
886      return appdata->settings->enable_gps;
887    }
888    
889    static gboolean follow_gps_get_toggle(appdata_t *appdata) {
890      if(!appdata)           return FALSE;
891      if(!appdata->settings) return FALSE;
892      return appdata->settings->follow_gps;
893    }
894    
895    /* create a HildonAppMenu */
896    static GtkWidget *app_menu_create(appdata_t *appdata,
897                                      const menu_entry_t *menu_entries) {
898      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
899    
900      while(menu_entries->label) {
901        GtkWidget *button = NULL;
902    
903        if(!menu_entries->toggle) {
904          button = hildon_button_new_with_text(
905                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
906                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
907                _(menu_entries->label), _(menu_entries->value));
908          g_signal_connect_after(button, "clicked",
909                                 menu_entries->activate_cb, appdata);
910        } else {
911          button = hildon_check_button_new(HILDON_SIZE_AUTO);
912          gtk_button_set_label(GTK_BUTTON(button), _(menu_entries->label));
913          printf("requesting check for %s: %p\n", menu_entries->label,
914                 menu_entries->toggle);
915          hildon_check_button_set_active(HILDON_CHECK_BUTTON(button),
916                                         menu_entries->toggle(appdata));
917          g_signal_connect_after(button, "toggled",
918                                 menu_entries->activate_cb, appdata);
919        }
920    
921        /* offset to GtkWidget pointer was given -> store pointer */
922        if(menu_entries->offset)
923          *(GtkWidget**)(((void*)appdata)+menu_entries->offset) = button;
924    
925        gtk_widget_set_sensitive(button, menu_entries->enabled);
926    
927        hildon_app_menu_append(menu, GTK_BUTTON(button));
928        menu_entries++;
929      }
930    
931      gtk_widget_show_all(GTK_WIDGET(menu));
932      return GTK_WIDGET(menu);
933    }
934    
935    /* the view submenu */
936    void on_submenu_view_clicked(GtkButton *button, appdata_t *appdata) {
937      hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_view),
938                            GTK_WINDOW(appdata->window));
939    }
940    
941    void on_submenu_map_clicked(GtkButton *button, appdata_t *appdata) {
942      hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_map),
943                            GTK_WINDOW(appdata->window));
944    }
945    
946    void on_submenu_wms_clicked(GtkButton *button, appdata_t *appdata) {
947      hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_wms),
948                            GTK_WINDOW(appdata->window));
949    }
950    
951    void on_submenu_track_clicked(GtkButton *button, appdata_t *appdata) {
952      hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_track),
953                            GTK_WINDOW(appdata->window));
954    }
955    
956    #define APP_OFFSET(a)  offsetof(appdata_t, a)
957    #define SIMPLE_ENTRY(a,b)     { a, NULL, TRUE,   NULL, 0, G_CALLBACK(b) }
958    #define ENABLED_ENTRY(a,b,c)  { a, NULL, TRUE,  NULL, APP_OFFSET(c), G_CALLBACK(b) }
959    #define DISABLED_ENTRY(a,b,c) { a, NULL, FALSE,  NULL, APP_OFFSET(c), G_CALLBACK(b) }
960    #define TOGGLE_ENTRY(a,b,c)   { a, NULL, TRUE, c, 0, G_CALLBACK(b) }
961    #define DISABLED_TOGGLE_ENTRY(a,b,c,d)  \
962                                  { a, NULL, FALSE, c, APP_OFFSET(d), G_CALLBACK(b) }
963    #define ENABLED_TOGGLE_ENTRY(a,b,c,d) \
964                                  { a, NULL, TRUE, c, APP_OFFSET(d), G_CALLBACK(b) }
965    #define LAST_ENTRY            { NULL, NULL, FALSE, NULL, 0, NULL }
966    
967    /* -- the view submenu -- */
968    static const menu_entry_t submenu_view[] = {
969      SIMPLE_ENTRY("Zoom in",         cb_menu_zoomin),
970      SIMPLE_ENTRY("Zoom out",        cb_menu_zoomout),
971      /* --- */
972      SIMPLE_ENTRY("Style",           cb_menu_style),
973      /* --- */
974      SIMPLE_ENTRY("Normal details",  cb_menu_view_detail_normal),
975      SIMPLE_ENTRY("More details",    cb_menu_view_detail_inc),
976      SIMPLE_ENTRY("Less details",    cb_menu_view_detail_dec),
977      /* --- */
978      DISABLED_ENTRY("Hide selected", cb_menu_map_hide_sel, menu_item_map_hide_sel),
979      DISABLED_ENTRY("Show all",      cb_menu_map_show_all, menu_item_map_show_all),
980      /* --- */
981      TOGGLE_ENTRY("No icons",        cb_menu_map_no_icons, no_icon_get_toggle),
982    
983      LAST_ENTRY
984    };
985    
986    /* -- the map submenu -- */
987    static const menu_entry_t submenu_map[] = {
988      ENABLED_ENTRY("Upload",                cb_menu_upload, menu_item_map_upload),
989      SIMPLE_ENTRY("Download",               cb_menu_download),
990      ENABLED_ENTRY("Save local changes",    cb_menu_save_changes,
991                                               menu_item_map_save_changes),
992      ENABLED_ENTRY("Discard local changes", cb_menu_undo_changes,
993                                               menu_item_map_undo_changes),
994      ENABLED_ENTRY("Relations",             cb_menu_osm_relations,
995                                               menu_item_map_relations),
996    
997      LAST_ENTRY
998    };
999    
1000    /* -- the wms submenu -- */
1001    static const menu_entry_t submenu_wms[] = {
1002      SIMPLE_ENTRY("Import",   cb_menu_wms_import),
1003      DISABLED_ENTRY("Clear",  cb_menu_wms_clear, menu_item_wms_clear),
1004      DISABLED_ENTRY("Adjust", cb_menu_wms_adjust, menu_item_wms_adjust),
1005    
1006      LAST_ENTRY
1007    };
1008    
1009    /* -- the track submenu -- */
1010    static const menu_entry_t submenu_track[] = {
1011      ENABLED_ENTRY("Import",  cb_menu_track_import, track.menu_item_track_import),
1012      DISABLED_ENTRY("Export", cb_menu_track_export, track.menu_item_track_export),
1013      DISABLED_ENTRY("Clear",  cb_menu_track_clear, track.menu_item_track_clear),
1014      ENABLED_TOGGLE_ENTRY("GPS enable", cb_menu_track_enable_gps,
1015                    enable_gps_get_toggle, track.menu_item_track_enable_gps),
1016      DISABLED_TOGGLE_ENTRY("GPS follow", cb_menu_track_follow_gps,
1017                    follow_gps_get_toggle, track.menu_item_track_follow_gps),
1018    
1019      LAST_ENTRY
1020    };
1021    
1022    
1023    /* -- the applications main menu -- */
1024    static const menu_entry_t main_menu[] = {
1025      SIMPLE_ENTRY("About",   cb_menu_about),
1026      SIMPLE_ENTRY("Project", cb_menu_project_open),
1027      ENABLED_ENTRY("View",   on_submenu_view_clicked,  submenu_view),
1028      ENABLED_ENTRY("Map",    on_submenu_map_clicked,   submenu_map),
1029      ENABLED_ENTRY("WMS",    on_submenu_wms_clicked,   submenu_wms),
1030      ENABLED_ENTRY("Track",  on_submenu_track_clicked, track.submenu_track),
1031    
1032      LAST_ENTRY
1033    };
1034    
1035    void menu_create(appdata_t *appdata) {
1036      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1037    
1038      /* build menu/submenus */
1039      menu = HILDON_APP_MENU(app_menu_create(appdata, main_menu));
1040      appdata->app_menu_wms   = app_menu_create(appdata, submenu_wms);
1041      appdata->app_menu_map   = app_menu_create(appdata, submenu_map);
1042      appdata->app_menu_view  = app_menu_create(appdata, submenu_view);
1043      appdata->app_menu_track = app_menu_create(appdata, submenu_track);
1044    
1045      /* enable/disable some entries according to settings */
1046      if(appdata && appdata->settings)
1047        gtk_widget_set_sensitive(appdata->track.menu_item_track_follow_gps,
1048                                 appdata->settings->enable_gps);
1049    
1050      hildon_window_set_app_menu(HILDON_WINDOW(appdata->window), menu);
1051    }
1052    #endif
1053    
1054  /********************* end of menu **********************/  /********************* end of menu **********************/
1055    
# Line 972  void cleanup(appdata_t *appdata) { Line 1121  void cleanup(appdata_t *appdata) {
1121    
1122    project_free(appdata->project);    project_free(appdata->project);
1123    
1124    if(appdata->menu_item_osm_undo)    if(appdata->menu_item_map_undo)
1125      undo_free(appdata->undo.state);      undo_free(appdata->undo.state);
1126    
1127    puts("everything is gone");    puts("everything is gone");
# Line 990  gboolean on_window_key_press(GtkWidget * Line 1139  gboolean on_window_key_press(GtkWidget *
1139    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1140    int handled = FALSE;    int handled = FALSE;
1141    
1142      //  printf("key event with keyval %x\n", event->keyval);
1143    
1144    // the map handles some keys on its own ...    // the map handles some keys on its own ...
1145    switch(event->keyval) {    switch(event->keyval) {
1146    
1147    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
1148  #ifdef USE_HILDON  #ifdef USE_HILDON
1149      /* this is in fact a mapping to GDK_F6 */      /* this is in fact a mapping to GDK_F6 */
1150    case HILDON_HARDKEY_FULLSCREEN:    case HILDON_HARDKEY_FULLSCREEN:
# Line 1012  gboolean on_window_key_press(GtkWidget * Line 1164  gboolean on_window_key_press(GtkWidget *
1164    
1165      handled = TRUE;      handled = TRUE;
1166      break;      break;
1167    #endif
1168    }    }
1169    
1170    /* forward unprocessed key presses to map */    /* forward unprocessed key presses to map */
# Line 1061  int main(int argc, char *argv[]) { Line 1214  int main(int argc, char *argv[]) {
1214    /* Create HildonWindow and set it to HildonProgram */    /* Create HildonWindow and set it to HildonProgram */
1215    appdata.window = HILDON_WINDOW(hildon_window_new());    appdata.window = HILDON_WINDOW(hildon_window_new());
1216    hildon_program_add_window(appdata.program, appdata.window);    hildon_program_add_window(appdata.program, appdata.window);
1217    
1218    #if MAEMO_VERSION_MAJOR == 5
1219      unsigned long val;
1220      XChangeProperty(GDK_DISPLAY(),
1221                      GDK_WINDOW_XID(GTK_WIDGET(appdata.window)->window),
1222                      XInternAtom(GDK_DISPLAY(),
1223                                  "_HILDON_ZOOM_KEY_ATOM",
1224                                  False), XA_INTEGER, 32,
1225                      PropModeReplace, (unsigned char *) &val, 1);
1226    #endif
1227    
1228  #else  #else
1229    /* Create a Window. */    /* Create a Window. */
1230    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
# Line 1103  int main(int argc, char *argv[]) { Line 1267  int main(int argc, char *argv[]) {
1267      return -1;      return -1;
1268    }    }
1269    
1270    #if 0  // another test overlay
1271      {
1272        GtkWidget *fixed = gtk_fixed_new();
1273    
1274        gtk_fixed_put(GTK_FIXED(fixed), gtk_label_new("Nase"), 0,0);
1275        gtk_fixed_put(GTK_FIXED(fixed), map, 0,0);
1276    
1277        gtk_box_pack_start(GTK_BOX(vbox), fixed, TRUE, TRUE, 0);
1278      }
1279    #else
1280    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);
1281    #endif
1282    
1283    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);
1284    
1285  #ifndef PORTRAIT  #ifndef PORTRAIT
1286    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);
1287  #endif  #endif
   //  gtk_box_pack_start(GTK_BOX(hbox), gtk_vseparator_new(), FALSE, FALSE, 0);  
1288    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
1289    
1290    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 1297  int main(int argc, char *argv[]) {
1297    
1298    /* let gtk do its thing before loading the data, */    /* let gtk do its thing before loading the data, */
1299    /* so the user sees something */    /* so the user sees something */
1300    while(gtk_events_pending()) {    while(gtk_events_pending())
     putchar('.');  
1301      gtk_main_iteration();      gtk_main_iteration();
   }  
1302    
1303    /* load project if one is specified in the settings */    /* load project if one is specified in the settings */
1304    if(appdata.settings->project)    if(appdata.settings->project)
# Line 1137  int main(int argc, char *argv[]) { Line 1310  int main(int argc, char *argv[]) {
1310    if(appdata.settings && appdata.settings->enable_gps)    if(appdata.settings && appdata.settings->enable_gps)
1311      track_enable_gps(&appdata, TRUE);      track_enable_gps(&appdata, TRUE);
1312    
1313    /* ------------ jump into main loop ---------------- */    /* again let the ui do its thing */
1314      while(gtk_events_pending())
1315        gtk_main_iteration();
1316    
1317    #if 0  // test overlay
1318      {
1319        GtkWidget *overlay = gtk_window_new(GTK_WINDOW_POPUP);
1320        gtk_window_set_default_size(GTK_WINDOW(overlay), 40, 20);
1321        gtk_window_set_transient_for(GTK_WINDOW(overlay), GTK_WINDOW(appdata.window));
1322        gtk_window_set_keep_above(GTK_WINDOW(overlay), TRUE);
1323        gtk_window_set_destroy_with_parent(GTK_WINDOW(overlay), TRUE);
1324        gtk_window_set_position(GTK_WINDOW(overlay), GTK_WIN_POS_CENTER_ON_PARENT);
1325        gtk_window_set_decorated(GTK_WINDOW(overlay), TRUE);
1326    
1327        /* add some zoom buttons for testing */
1328        GtkWidget *hbox = gtk_hbox_new(TRUE, 0);
1329        gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_button_new_with_label("+"));
1330        gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_button_new_with_label("-"));
1331        gtk_container_add(GTK_CONTAINER(overlay), hbox);
1332    
1333        gtk_widget_show_all(overlay);
1334      }
1335    #endif
1336    
1337      /* start to interact with the user now that the gui is running */
1338      if(appdata.settings->first_run_demo) {
1339        messagef(GTK_WIDGET(appdata.window), _("Welcome to OSM2Go"),
1340                 _("This is the first time you run OSM2Go. "
1341                   "A demo project has been loaded to get you "
1342                   "started. You can play around with this demo as much "
1343                   "as you like. However, you cannot upload or download "
1344                   "the demo project.\n\n"
1345                   "In order to start working on real data you'll have "
1346                   "to setup a new project and enter your OSM user name "
1347                   "and password. You'll then be able to download the "
1348                   "latest data from OSM and upload your changes into "
1349                   "the OSM main database."
1350                   ));
1351      }
1352    
1353      /* ------------ jump into main loop ---------------- */
1354    gtk_main();    gtk_main();
1355    
1356    puts("gtk_main() left");    puts("gtk_main() left");
Legend:
Removed from v.177  
changed lines
  Added in v.192