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 189 by harbaum, Mon Jul 6 15:51:30 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    #endif
31    
32  #include "appdata.h"  #include "appdata.h"
33  #include "banner.h"  #include "banner.h"
34    
# Line 56  static void main_ui_enable(appdata_t *ap Line 62  static void main_ui_enable(appdata_t *ap
62      gtk_widget_set_sensitive(appdata->iconbar->toolbar, osm_valid);      gtk_widget_set_sensitive(appdata->iconbar->toolbar, osm_valid);
63    
64    /* disable all menu entries related to map */    /* disable all menu entries related to map */
65    gtk_widget_set_sensitive(appdata->menu_osm, project_valid);    gtk_widget_set_sensitive(appdata->submenu_map, project_valid);
66    gtk_widget_set_sensitive(appdata->menu_item_osm_upload, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_upload, osm_valid);
67    if(appdata->menu_item_osm_undo)    if(appdata->menu_item_map_undo)
68      gtk_widget_set_sensitive(appdata->menu_item_osm_undo, osm_valid);      gtk_widget_set_sensitive(appdata->menu_item_map_undo, osm_valid);
69    gtk_widget_set_sensitive(appdata->menu_item_osm_save_changes, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_save_changes, osm_valid);
70    gtk_widget_set_sensitive(appdata->menu_item_osm_undo_changes, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_undo_changes, osm_valid);
71    gtk_widget_set_sensitive(appdata->menu_item_osm_relations, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_relations, osm_valid);
72    gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);    gtk_widget_set_sensitive(appdata->track.submenu_track, osm_valid);
73    gtk_widget_set_sensitive(appdata->menu_view, osm_valid);    gtk_widget_set_sensitive(appdata->submenu_view, osm_valid);
74    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);  
75    
76    if(!project_valid)    if(!project_valid)
77      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 87  cb_menu_project_open(GtkMenuItem *item,
87  }  }
88    
89  static void  static void
90  cb_menu_project_close(GtkMenuItem *item, gpointer data) {  cb_menu_project_wizard(GtkMenuItem *item, gpointer data) {
91    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
92    project_close(appdata);    project_wizard(appdata);
   main_ui_enable(appdata);  
93  }  }
94    
95  static void  static void
# Line 115  cb_menu_about(GtkMenuItem *item, gpointe Line 118  cb_menu_about(GtkMenuItem *item, gpointe
118    
119  void on_window_destroy (GtkWidget *widget, gpointer data);  void on_window_destroy (GtkWidget *widget, gpointer data);
120    
121    #ifndef USE_HILDON
122  static void  static void
123  cb_menu_quit(GtkMenuItem *item, gpointer data) {  cb_menu_quit(GtkMenuItem *item, gpointer data) {
124    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
125    gtk_widget_destroy(GTK_WIDGET(appdata->window));    gtk_widget_destroy(GTK_WIDGET(appdata->window));
126  }  }
127    #endif
128    
129  static void  static void
130  cb_menu_upload(GtkMenuItem *item, gpointer data) {  cb_menu_upload(GtkMenuItem *item, gpointer data) {
131    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
132    if(!appdata->osm || !appdata->project) return;    if(!appdata->osm || !appdata->project) return;
133    
134      if(project_check_demo(GTK_WIDGET(appdata->window), appdata->project))
135        return;
136    
137    osm_upload(appdata, appdata->osm, appdata->project);    osm_upload(appdata, appdata->osm, appdata->project);
138  }  }
139    
# Line 134  cb_menu_download(GtkMenuItem *item, gpoi Line 142  cb_menu_download(GtkMenuItem *item, gpoi
142    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
143    if(!appdata->project) return;    if(!appdata->project) return;
144    
145      if(project_check_demo(GTK_WIDGET(appdata->window), appdata->project))
146        return;
147    
148    /* if we have valid osm data loaded: save state first */    /* if we have valid osm data loaded: save state first */
149    if(appdata->osm) {    if(appdata->osm) {
150      /* 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 202  cb_menu_map_show_all(GtkMenuItem *item,
202    
203  /* ---------------------------------------------------------- */  /* ---------------------------------------------------------- */
204    
205  #if 1  // mainly for testing  #if defined(USE_HILDON) && (MAEMO_VERSION_MAJOR == 5)
206  static void  #define MENU_CHECK_ITEM HildonCheckButton
207  cb_menu_redraw(GtkMenuItem *item, gpointer data) {  #define MENU_CHECK_ITEM_ACTIVE(a) hildon_check_button_get_active(a)
208    appdata_t *appdata = (appdata_t*)data;  #else
209    #define MENU_CHECK_ITEM GtkCheckMenuItem
210    /* 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"  
 }  
211  #endif  #endif
212    
213  static void  static void
214  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;  
215    
216    banner_busy_start(appdata, 1, "Redrawing");    banner_busy_start(appdata, 1, "Redrawing");
217    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"  
 }  
218    
219  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;  
220    
   banner_busy_start(appdata, 1, "Redrawing");  
   map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);  
   appdata->settings->no_antialias = gtk_check_menu_item_get_active(item);  
221    map_paint(appdata);    map_paint(appdata);
222    banner_busy_stop(appdata); //"Redrawing"    banner_busy_stop(appdata); //"Redrawing"
223  }  }
# Line 290  cb_menu_osm_relations(GtkMenuItem *item, Line 274  cb_menu_osm_relations(GtkMenuItem *item,
274    
275  #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)  #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
276  static void  static void
277  cb_menu_fullscreen(GtkCheckMenuItem *item, gpointer data) {  cb_menu_fullscreen(MENU_CHECK_ITEM *item, gpointer data) {
278    appdata_t *appdata = (appdata_t *)data;    appdata_t *appdata = (appdata_t *)data;
279    
280    if(gtk_check_menu_item_get_active(item))    if(MENU_CHECK_ITEM_ACTIVE(item))
281      gtk_window_fullscreen(GTK_WINDOW(appdata->window));      gtk_window_fullscreen(GTK_WINDOW(appdata->window));
282    else    else
283      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));
# Line 396  cb_menu_track_import(GtkMenuItem *item, Line 380  cb_menu_track_import(GtkMenuItem *item,
380  }  }
381    
382  static void  static void
383  cb_menu_track_enable_gps(GtkMenuItem *item, gpointer data) {  cb_menu_track_enable_gps(MENU_CHECK_ITEM *item, appdata_t *appdata) {
384    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);  
385  }  }
386    
387    
388  static void  static void
389  cb_menu_track_follow_gps(GtkMenuItem *item, gpointer data) {  cb_menu_track_follow_gps(MENU_CHECK_ITEM *item, appdata_t *appdata) {
390    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;  
391  }  }
392    
393    
# Line 522  cb_menu_track_clear(GtkMenuItem *item, g Line 494  cb_menu_track_clear(GtkMenuItem *item, g
494  #endif  #endif
495    
496    
497    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
498  // Half-arsed slapdash common menu item constructor. Let's use GtkBuilder  // Half-arsed slapdash common menu item constructor. Let's use GtkBuilder
499  // instead so we have some flexibility.  // instead so we have some flexibility.
500    
# Line 601  menu_append_new_item(appdata_t *appdata, Line 573  menu_append_new_item(appdata_t *appdata,
573    return item;    return item;
574  }  }
575    
   
576  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
577    GtkWidget *menu, *item, *submenu;    GtkWidget *menu, *item, *submenu;
578    GtkWidget *about_quit_items_menu;    GtkWidget *about_quit_items_menu;
# Line 631  void menu_create(appdata_t *appdata) { Line 602  void menu_create(appdata_t *appdata) {
602      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
603    );    );
604    
605    appdata->menu_item_project_close = menu_append_new_item(    menu_append_new_item(
606      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_close), _("_Close"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_wizard), _("_Wizard"),
607      GTK_STOCK_CLOSE, "<OSM2Go-Main>/Project/Close",      GTK_STOCK_NEW, "<OSM2Go-Main>/Project/Wizard",
608      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
609    );    );
610    
# Line 643  void menu_create(appdata_t *appdata) { Line 614  void menu_create(appdata_t *appdata) {
614    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());
615  #endif  #endif
616    
617    appdata->menu_view = item = gtk_menu_item_new_with_mnemonic( _("_View") );    appdata->submenu_view = item = gtk_menu_item_new_with_mnemonic( _("_View") );
618    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
619    submenu = gtk_menu_new();    submenu = gtk_menu_new();
620    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 660  void menu_create(appdata_t *appdata) {
660      GDK_comma, GDK_MOD1_MASK, TRUE, FALSE, FALSE      GDK_comma, GDK_MOD1_MASK, TRUE, FALSE, FALSE
661    );    );
662    
663    /* -------------------- OSM submenu -------------------- */    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
664    
665      appdata->menu_item_map_hide_sel = menu_append_new_item(
666        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_hide_sel), _("_Hide selected"),
667        GTK_STOCK_REMOVE, "<OSM2Go-Main>/View/HideSelected",
668        0, 0, TRUE, FALSE, FALSE
669      );
670      gtk_widget_set_sensitive(appdata->menu_item_map_hide_sel, FALSE);
671    
672      appdata->menu_item_map_show_all = menu_append_new_item(
673        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_show_all), _("_Show all"),
674        GTK_STOCK_ADD, "<OSM2Go-Main>/View/ShowAll",
675        0, 0, TRUE, FALSE, FALSE
676      );
677      gtk_widget_set_sensitive(appdata->menu_item_map_show_all, FALSE);
678    
679      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
680    
681      menu_append_new_item(
682        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_style), _("St_yle"),
683        GTK_STOCK_SELECT_COLOR, "<OSM2Go-Main>/View/Style",
684        0, 0, TRUE, FALSE, FALSE
685      );
686    
687    appdata->menu_osm = item = gtk_menu_item_new_with_mnemonic( _("_OSM") );    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
688    
689      appdata->menu_item_map_no_icons = menu_append_new_item(
690        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_icons), _("No _icons"),
691        NULL, "<OSM2Go-Main>/View/NoIcons",
692        0, 0, TRUE, TRUE, appdata->settings->no_icons
693      );
694    
695    
696      /* -------------------- map submenu -------------------- */
697    
698      appdata->submenu_map = item = gtk_menu_item_new_with_mnemonic( _("_Map") );
699    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
700    submenu = gtk_menu_new();    submenu = gtk_menu_new();
701    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
702    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
703    
704    appdata->menu_item_osm_upload = menu_append_new_item(    appdata->menu_item_map_upload = menu_append_new_item(
705      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload"),
706      "upload.16", "<OSM2Go-Main>/OSM/Upload",      "upload.16", "<OSM2Go-Main>/Map/Upload",
707      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
708    );    );
709    
710    menu_append_new_item(    menu_append_new_item(
711      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download"),
712      "download.16", "<OSM2Go-Main>/OSM/Download",      "download.16", "<OSM2Go-Main>/Map/Download",
713      GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
714    );    );
715    
716    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());
717    
718    if(getenv("OSM2GO_UNDO_TEST")) {    if(getenv("OSM2GO_UNDO_TEST")) {
719      appdata->menu_item_osm_undo = menu_append_new_item(      appdata->menu_item_map_undo = menu_append_new_item(
720                 appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo), _("_Undo"),                 appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo), _("_Undo"),
721                 GTK_STOCK_UNDO, "<OSM2Go-Main>/OSM/Undo",                 GTK_STOCK_UNDO, "<OSM2Go-Main>/Map/Undo",
722                 GDK_z, GDK_CONTROL_MASK, TRUE, FALSE, FALSE                 GDK_z, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
723                 );                 );
724    } else    } else
725      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");
726    
727    appdata->menu_item_osm_save_changes = menu_append_new_item(    appdata->menu_item_map_save_changes = menu_append_new_item(
728      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),
729      GTK_STOCK_SAVE, "<OSM2Go-Main>/OSM/SaveChanges",      GTK_STOCK_SAVE, "<OSM2Go-Main>/Map/SaveChanges",
730      GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
731    );    );
732    
733    appdata->menu_item_osm_undo_changes = menu_append_new_item(    appdata->menu_item_map_undo_changes = menu_append_new_item(
734      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"),
735      GTK_STOCK_DELETE, "<OSM2Go-Main>/OSM/DiscardChanges",      GTK_STOCK_DELETE, "<OSM2Go-Main>/Map/DiscardChanges",
736      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
737    );    );
738    
739    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());
740    appdata->menu_item_osm_relations = menu_append_new_item(    appdata->menu_item_map_relations = menu_append_new_item(
741      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations"),
742      NULL, "<OSM2Go-Main>/OSM/Relations",      NULL, "<OSM2Go-Main>/Map/Relations",
743      GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
744    );    );
745    
746    /* -------------------- wms submenu -------------------- */    /* -------------------- wms submenu -------------------- */
747    
748    appdata->menu_wms = item = gtk_menu_item_new_with_mnemonic( _("_WMS") );    appdata->submenu_wms = item = gtk_menu_item_new_with_mnemonic( _("_WMS") );
749    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
750    submenu = gtk_menu_new();    submenu = gtk_menu_new();
751    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 771  void menu_create(appdata_t *appdata) {
771    );    );
772    gtk_widget_set_sensitive(appdata->menu_item_wms_adjust, FALSE);    gtk_widget_set_sensitive(appdata->menu_item_wms_adjust, FALSE);
773    
   /* -------------------- 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  
   );  
   
774    /* -------------------- track submenu -------------------- */    /* -------------------- track submenu -------------------- */
775    
776    appdata->track.menu_track = item = gtk_menu_item_new_with_mnemonic(_("_Track"));    appdata->track.submenu_track = item =
777        gtk_menu_item_new_with_mnemonic(_("_Track"));
778    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
779    submenu = gtk_menu_new();    submenu = gtk_menu_new();
780    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
781    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
782    
783    appdata->track.menu_item_import = menu_append_new_item(    appdata->track.menu_item_track_import = menu_append_new_item(
784      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import"),
785      NULL, "<OSM2Go-Main>/Track/Import",      NULL, "<OSM2Go-Main>/Track/Import",
786      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
787    );    );
788    
789    appdata->track.menu_item_export = menu_append_new_item(    appdata->track.menu_item_track_export = menu_append_new_item(
790      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export"),
791      NULL, "<OSM2Go-Main>/Track/Export",      NULL, "<OSM2Go-Main>/Track/Export",
792      0, 0, FALSE, FALSE, FALSE      0, 0, FALSE, FALSE, FALSE
793    );    );
794    
795    appdata->track.menu_item_clear = menu_append_new_item(    appdata->track.menu_item_track_clear = menu_append_new_item(
796      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_clear), _("_Clear"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_clear), _("_Clear"),
797      GTK_STOCK_CLEAR, "<OSM2Go-Main>/Track/Clear",      GTK_STOCK_CLEAR, "<OSM2Go-Main>/Track/Clear",
798      0, 0, FALSE, FALSE, FALSE      0, 0, FALSE, FALSE, FALSE
799    );    );
800    
801    
802    appdata->track.menu_item_enable_gps = menu_append_new_item(    appdata->track.menu_item_track_enable_gps = menu_append_new_item(
803      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_enable_gps),_("_GPS enable"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_enable_gps),_("_GPS enable"),
804      NULL, "<OSM2Go-Main>/Track/GPS",      NULL, "<OSM2Go-Main>/Track/GPS",
805      GDK_g, GDK_CONTROL_MASK|GDK_SHIFT_MASK, TRUE, TRUE,      GDK_g, GDK_CONTROL_MASK|GDK_SHIFT_MASK, TRUE, TRUE,
806      appdata->settings->enable_gps      appdata->settings->enable_gps
807    );    );
808    
809    appdata->track.menu_item_follow_gps = menu_append_new_item(    appdata->track.menu_item_track_follow_gps = menu_append_new_item(
810      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_follow_gps), _("GPS follow"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_follow_gps), _("GPS follow"),
811      NULL, "<OSM2Go-Main>/Track/Follow",      NULL, "<OSM2Go-Main>/Track/Follow",
812      0, 0, appdata->settings->enable_gps, TRUE,      0, 0, appdata->settings->enable_gps, TRUE,
# Line 871  void menu_create(appdata_t *appdata) { Line 824  void menu_create(appdata_t *appdata) {
824      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
825    );    );
826    
827    #ifndef USE_HILDON
828    menu_append_new_item(    menu_append_new_item(
829      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_quit), _("_Quit"),      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_quit), _("_Quit"),
830      GTK_STOCK_QUIT, "<OSM2Go-Main>/Quit",      GTK_STOCK_QUIT, "<OSM2Go-Main>/Quit",
831      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
832    );    );
833    #endif
834    
835    gtk_window_add_accel_group(GTK_WINDOW(appdata->window), accel_grp);    gtk_window_add_accel_group(GTK_WINDOW(appdata->window), accel_grp);
836    
# Line 901  void menu_create(appdata_t *appdata) { Line 856  void menu_create(appdata_t *appdata) {
856    
857  #endif //USE_HILDON  #endif //USE_HILDON
858  }  }
859    #else // !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
860    
861    void submenu_entry(appdata_t *appdata, HildonAppMenu *menu,
862                       const char *label, const char *value,
863                       GtkSignalFunc activate_cb) {
864    
865    }
866    
867    typedef struct {
868      const char *label, *value;
869      gboolean enabled;
870      gboolean (*toggle)(appdata_t *appdata);
871      gulong offset;
872      GtkSignalFunc activate_cb;
873    } menu_entry_t;
874    
875    static gboolean no_icon_get_toggle(appdata_t *appdata) {
876      if(!appdata)           return FALSE;
877      if(!appdata->settings) return FALSE;
878      return appdata->settings->no_icons;
879    }
880    
881    /* create a HildonAppMenu */
882    static GtkWidget *app_menu_create(appdata_t *appdata, const menu_entry_t *menu_entries) {
883      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
884    
885      while(menu_entries->label) {
886        GtkWidget *button = NULL;
887    
888        if(!menu_entries->toggle) {
889          button = hildon_button_new_with_text(
890                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
891                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
892                _(menu_entries->label), menu_entries->value);
893          g_signal_connect_after(button, "clicked", menu_entries->activate_cb, appdata);
894        } else {
895          button = hildon_check_button_new(HILDON_SIZE_AUTO);
896          gtk_button_set_label(GTK_BUTTON(button), _(menu_entries->label));
897          hildon_check_button_set_active(HILDON_CHECK_BUTTON(button),
898                                         menu_entries->toggle(appdata));
899          g_signal_connect_after(button, "toggled", menu_entries->activate_cb, appdata);
900        }
901    
902        /* offset to GtkWidget pointer was given -> store pointer */
903        if(menu_entries->offset)
904          *(GtkWidget**)(((void*)appdata)+menu_entries->offset) = button;
905    
906        gtk_widget_set_sensitive(button, menu_entries->enabled);
907    
908        hildon_app_menu_append(menu, GTK_BUTTON(button));
909        menu_entries++;
910      }
911    
912      gtk_widget_show_all(GTK_WIDGET(menu));
913      return GTK_WIDGET(menu);
914    }
915    
916    /* the view submenu */
917    void on_submenu_view_clicked(GtkButton *button, appdata_t *appdata) {
918      /* draw a popup menu. */
919      hildon_app_menu_popup(HILDON_APP_MENU(appdata->submenu_view),
920                            GTK_WINDOW(appdata->window));
921    }
922    
923    void on_submenu_wms_clicked(GtkButton *button, appdata_t *appdata) {
924      /* draw a popup menu. */
925      hildon_app_menu_popup(HILDON_APP_MENU(appdata->submenu_wms),
926                            GTK_WINDOW(appdata->window));
927    }
928    
929    /* -- the view submenu -- */
930    #define APP_OFFSET(a)  offsetof(appdata_t, a)
931    #define SIMPLE_ENTRY(a,b)     { a, NULL, TRUE,   NULL, 0, G_CALLBACK(b) }
932    #define DISABLED_ENTRY(a,b,c) { a, NULL, FALSE,  NULL, APP_OFFSET(c), G_CALLBACK(b) }
933    #define LAST_ENTRY            { NULL, NULL, FALSE, NULL, 0, NULL }
934    
935    static const menu_entry_t submenu_view[] = {
936      SIMPLE_ENTRY("Zoom in",         cb_menu_zoomin),
937      SIMPLE_ENTRY("Zoom out",        cb_menu_zoomout),
938      /* --- */
939      SIMPLE_ENTRY("Style",           cb_menu_style),
940      /* --- */
941      SIMPLE_ENTRY("Normal details",  cb_menu_view_detail_normal),
942      SIMPLE_ENTRY("More details",    cb_menu_view_detail_inc),
943      SIMPLE_ENTRY("Less details",    cb_menu_view_detail_dec),
944      /* --- */
945      DISABLED_ENTRY("Hide selected", cb_menu_map_hide_sel, menu_item_map_hide_sel),
946      DISABLED_ENTRY("Show all",      cb_menu_map_show_all, menu_item_map_show_all),
947      /* --- */
948      { "No icons",       NULL, TRUE,  no_icon_get_toggle, 0, G_CALLBACK(cb_menu_map_no_icons) },
949    
950      LAST_ENTRY
951    };
952    
953    /* -- the wms submenu -- */
954    static const menu_entry_t submenu_wms[] = {
955      SIMPLE_ENTRY("Import",   cb_menu_wms_import),
956      DISABLED_ENTRY("Clear",  cb_menu_wms_clear, menu_item_wms_clear),
957      DISABLED_ENTRY("Adjust", cb_menu_wms_adjust, menu_item_wms_adjust),
958    
959      LAST_ENTRY
960    };
961    
962    void menu_create(appdata_t *appdata) {
963      GtkWidget *button;
964      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
965    
966      /* build submenus */
967      appdata->submenu_wms = app_menu_create(appdata, submenu_wms);
968      appdata->submenu_view = app_menu_create(appdata, submenu_view);
969    
970      /* ------- */
971      button = gtk_button_new_with_label(_("About"));
972      g_signal_connect_after(button, "clicked",
973                             G_CALLBACK(cb_menu_about), appdata);
974      hildon_app_menu_append(menu, GTK_BUTTON(button));
975    
976      button = gtk_button_new_with_label(_("View"));
977      g_signal_connect_after(button, "clicked",
978                             G_CALLBACK(on_submenu_view_clicked), appdata);
979      hildon_app_menu_append(menu, GTK_BUTTON(button));
980    
981      button = gtk_button_new_with_label(_("WMS"));
982      g_signal_connect_after(button, "clicked",
983                             G_CALLBACK(on_submenu_wms_clicked), appdata);
984      hildon_app_menu_append(menu, GTK_BUTTON(button));
985    
986    
987    
988      gtk_widget_show_all(GTK_WIDGET(menu));
989      hildon_window_set_app_menu(HILDON_WINDOW(appdata->window), menu);
990    }
991    #endif
992    
993  /********************* end of menu **********************/  /********************* end of menu **********************/
994    
# Line 972  void cleanup(appdata_t *appdata) { Line 1060  void cleanup(appdata_t *appdata) {
1060    
1061    project_free(appdata->project);    project_free(appdata->project);
1062    
1063    if(appdata->menu_item_osm_undo)    if(appdata->menu_item_map_undo)
1064      undo_free(appdata->undo.state);      undo_free(appdata->undo.state);
1065    
1066    puts("everything is gone");    puts("everything is gone");
# Line 993  gboolean on_window_key_press(GtkWidget * Line 1081  gboolean on_window_key_press(GtkWidget *
1081    // the map handles some keys on its own ...    // the map handles some keys on its own ...
1082    switch(event->keyval) {    switch(event->keyval) {
1083    
1084    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
1085  #ifdef USE_HILDON  #ifdef USE_HILDON
1086      /* this is in fact a mapping to GDK_F6 */      /* this is in fact a mapping to GDK_F6 */
1087    case HILDON_HARDKEY_FULLSCREEN:    case HILDON_HARDKEY_FULLSCREEN:
# Line 1012  gboolean on_window_key_press(GtkWidget * Line 1101  gboolean on_window_key_press(GtkWidget *
1101    
1102      handled = TRUE;      handled = TRUE;
1103      break;      break;
1104    #endif
1105    }    }
1106    
1107    /* forward unprocessed key presses to map */    /* forward unprocessed key presses to map */
# Line 1103  int main(int argc, char *argv[]) { Line 1193  int main(int argc, char *argv[]) {
1193      return -1;      return -1;
1194    }    }
1195    
1196    #if 0  // another test overlay
1197      {
1198        GtkWidget *fixed = gtk_fixed_new();
1199    
1200        gtk_fixed_put(GTK_FIXED(fixed), gtk_label_new("Nase"), 0,0);
1201        gtk_fixed_put(GTK_FIXED(fixed), map, 0,0);
1202    
1203        gtk_box_pack_start(GTK_BOX(vbox), fixed, TRUE, TRUE, 0);
1204      }
1205    #else
1206    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);
1207    #endif
1208    
1209    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);
1210    
1211  #ifndef PORTRAIT  #ifndef PORTRAIT
1212    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);
1213  #endif  #endif
   //  gtk_box_pack_start(GTK_BOX(hbox), gtk_vseparator_new(), FALSE, FALSE, 0);  
1214    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
1215    
1216    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 1223  int main(int argc, char *argv[]) {
1223    
1224    /* let gtk do its thing before loading the data, */    /* let gtk do its thing before loading the data, */
1225    /* so the user sees something */    /* so the user sees something */
1226    while(gtk_events_pending()) {    while(gtk_events_pending())
     putchar('.');  
1227      gtk_main_iteration();      gtk_main_iteration();
   }  
1228    
1229    /* load project if one is specified in the settings */    /* load project if one is specified in the settings */
1230    if(appdata.settings->project)    if(appdata.settings->project)
# Line 1137  int main(int argc, char *argv[]) { Line 1236  int main(int argc, char *argv[]) {
1236    if(appdata.settings && appdata.settings->enable_gps)    if(appdata.settings && appdata.settings->enable_gps)
1237      track_enable_gps(&appdata, TRUE);      track_enable_gps(&appdata, TRUE);
1238    
1239    /* ------------ jump into main loop ---------------- */    /* again let the ui do its thing */
1240      while(gtk_events_pending())
1241        gtk_main_iteration();
1242    
1243    #if 0  // test overlay
1244      {
1245        GtkWidget *overlay = gtk_window_new(GTK_WINDOW_POPUP);
1246        gtk_window_set_default_size(GTK_WINDOW(overlay), 40, 20);
1247        gtk_window_set_transient_for(GTK_WINDOW(overlay), GTK_WINDOW(appdata.window));
1248        gtk_window_set_keep_above(GTK_WINDOW(overlay), TRUE);
1249        gtk_window_set_destroy_with_parent(GTK_WINDOW(overlay), TRUE);
1250        gtk_window_set_position(GTK_WINDOW(overlay), GTK_WIN_POS_CENTER_ON_PARENT);
1251        gtk_window_set_decorated(GTK_WINDOW(overlay), TRUE);
1252    
1253        /* add some zoom buttons for testing */
1254        GtkWidget *hbox = gtk_hbox_new(TRUE, 0);
1255        gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_button_new_with_label("+"));
1256        gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_button_new_with_label("-"));
1257        gtk_container_add(GTK_CONTAINER(overlay), hbox);
1258    
1259        gtk_widget_show_all(overlay);
1260      }
1261    #endif
1262    
1263      /* start to interact with the user now that the gui is running */
1264      if(appdata.settings->first_run_demo) {
1265        messagef(GTK_WIDGET(appdata.window), _("Welcome to OSM2Go"),
1266                 _("This is the first time you run OSM2Go. "
1267                   "A demo project has been loaded to get you "
1268                   "started. You can play around with this demo as much "
1269                   "as you like. However, you cannot upload or download "
1270                   "the demo project.\n\n"
1271                   "In order to start working on real data you'll have "
1272                   "to setup a new project and enter your OSM user name "
1273                   "and password. You'll then be able to download the "
1274                   "latest data from OSM and upload your changes into "
1275                   "the OSM main database."
1276                   ));
1277      }
1278    
1279      /* ------------ jump into main loop ---------------- */
1280    gtk_main();    gtk_main();
1281    
1282    puts("gtk_main() left");    puts("gtk_main() left");
Legend:
Removed from v.177  
changed lines
  Added in v.189