Diff of /trunk/src/main.c

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

revision 156 by harbaum, Wed Apr 1 12:47:35 2009 UTC revision 188 by harbaum, Mon Jul 6 14:06:59 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 36  static void main_ui_enable(appdata_t *ap Line 42  static void main_ui_enable(appdata_t *ap
42      map_action_cancel(appdata);      map_action_cancel(appdata);
43    
44    /* ---- set project name as window title ----- */    /* ---- set project name as window title ----- */
45  #ifndef USE_HILDON  #if defined(USE_HILDON) && MAEMO_VERSION_MAJOR < 5
46      if(project_valid)
47        gtk_window_set_title(GTK_WINDOW(appdata->window), appdata->project->name);
48      else
49        gtk_window_set_title(GTK_WINDOW(appdata->window), "");
50    #else
51    char *str = NULL;    char *str = NULL;
52    if(project_valid)    if(project_valid)
53      str = g_strdup_printf("OSM2Go - %s", appdata->project->name);      str = g_strdup_printf("OSM2Go - %s", appdata->project->name);
# Line 45  static void main_ui_enable(appdata_t *ap Line 56  static void main_ui_enable(appdata_t *ap
56    
57    gtk_window_set_title(GTK_WINDOW(appdata->window), str);    gtk_window_set_title(GTK_WINDOW(appdata->window), str);
58    g_free(str);    g_free(str);
 #else  
   if(project_valid)  
     gtk_window_set_title(GTK_WINDOW(appdata->window), appdata->project->name);  
   else  
     gtk_window_set_title(GTK_WINDOW(appdata->window), "");  
59  #endif  #endif
60    
61    if(appdata->iconbar && appdata->iconbar->toolbar)    if(appdata->iconbar && appdata->iconbar->toolbar)
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->track.menu_track, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_relations, osm_valid);
72    gtk_widget_set_sensitive(appdata->menu_view, osm_valid);    gtk_widget_set_sensitive(appdata->track.submenu_track, osm_valid);
73    gtk_widget_set_sensitive(appdata->menu_wms, osm_valid);    gtk_widget_set_sensitive(appdata->submenu_view, osm_valid);
74    gtk_widget_set_sensitive(appdata->menu_map, osm_valid);    gtk_widget_set_sensitive(appdata->submenu_wms, osm_valid);
   gtk_widget_set_sensitive(appdata->menu_item_project_close, project_valid);  
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 82  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 114  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 133  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 144  cb_menu_download(GtkMenuItem *item, gpoi Line 156  cb_menu_download(GtkMenuItem *item, gpoi
156    }    }
157    
158    // download    // download
159    if(osm_download(GTK_WIDGET(appdata->window), appdata->project)) {    if(osm_download(GTK_WIDGET(appdata->window), appdata->settings,
160      banner_busy_start(appdata, 1, "Redrawing...");                    appdata->project)) {
161      appdata->osm = osm_parse(appdata->project->osm);      banner_busy_start(appdata, 1, "Redrawing");
162        appdata->osm = osm_parse(appdata->project->path, appdata->project->osm);
163      diff_restore(appdata, appdata->project, appdata->osm);      diff_restore(appdata, appdata->project, appdata->osm);
164      map_paint(appdata);      map_paint(appdata);
165      banner_busy_stop(appdata); //"Redrawing..."      banner_busy_stop(appdata); //"Redrawing"
166    }    }
167    
168    main_ui_enable(appdata);    main_ui_enable(appdata);
# Line 189  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->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_style(GtkMenuItem *item, gpointer data) {  cb_menu_map_no_icons(MENU_CHECK_ITEM *item, appdata_t *appdata) {
   appdata_t *appdata = (appdata_t*)data;  
215    
216    style_select(GTK_WIDGET(appdata->window), appdata);    banner_busy_start(appdata, 1, "Redrawing");
217  }    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
218    
219  static void    appdata->settings->no_icons = MENU_CHECK_ITEM_ACTIVE(item);
 cb_menu_map_no_icons(GtkCheckMenuItem *item, gpointer data) {  
   appdata_t *appdata = (appdata_t*)data;  
220    
   banner_busy_start(appdata, 1, "Redrawing...");  
   map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);  
   appdata->settings->no_icons = 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  }  }
224    
225  static void  static void
226  cb_menu_map_no_antialias(GtkCheckMenuItem *item, gpointer data) {  cb_menu_style(GtkMenuItem *item, gpointer data) {
227    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
228    
229    banner_busy_start(appdata, 1, "Redrawing...");    style_select(GTK_WIDGET(appdata->window), appdata);
   map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);  
   appdata->settings->no_antialias = gtk_check_menu_item_get_active(item);  
   map_paint(appdata);  
   banner_busy_stop(appdata); //"Redrawing..."  
230  }  }
231    
232  static void  static void
# Line 270  cb_menu_undo_changes(GtkMenuItem *item, Line 256  cb_menu_undo_changes(GtkMenuItem *item,
256                   "uploaded yet? This can't be undone.")))                   "uploaded yet? This can't be undone.")))
257      return;      return;
258    
259    banner_busy_start(appdata, 1, _("Redrawing..."));    banner_busy_start(appdata, 1, _("Redrawing"));
260    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
261    osm_free(&appdata->icon, appdata->osm);    osm_free(&appdata->icon, appdata->osm);
262    diff_remove(appdata->project);    diff_remove(appdata->project);
263    appdata->osm = osm_parse(appdata->project->osm);    appdata->osm = osm_parse(appdata->project->path, appdata->project->osm);
264    map_paint(appdata);    map_paint(appdata);
265    banner_busy_stop(appdata);  //"Redrawing..."    banner_busy_stop(appdata);  //"Redrawing"
266    
267    banner_show_info(appdata, _("Discarded local changes"));    banner_show_info(appdata, _("Discarded local changes"));
268  }  }
# Line 286  cb_menu_osm_relations(GtkMenuItem *item, Line 272  cb_menu_osm_relations(GtkMenuItem *item,
272    relation_list((appdata_t*)data);    relation_list((appdata_t*)data);
273  }  }
274    
275    #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));
284  }  }
285    #endif
286    
287  static void  static void
288  cb_menu_zoomin(GtkMenuItem *item, appdata_t *appdata) {  cb_menu_zoomin(GtkMenuItem *item, appdata_t *appdata) {
# Line 313  cb_menu_zoomout(GtkMenuItem *item, appda Line 301  cb_menu_zoomout(GtkMenuItem *item, appda
301  }  }
302    
303  static void  static void
304    cb_menu_view_detail_inc(GtkMenuItem *item, gpointer data) {
305      appdata_t *appdata = (appdata_t*)data;
306    
307      printf("detail level increase\n");
308      map_detail_increase(appdata->map);
309    }
310    
311    static void
312    cb_menu_view_detail_normal(GtkMenuItem *item, gpointer data) {
313      appdata_t *appdata = (appdata_t*)data;
314    
315      printf("detail level normal\n");
316      map_detail_normal(appdata->map);
317    }
318    
319    static void
320    cb_menu_view_detail_dec(GtkMenuItem *item, gpointer data) {
321      appdata_t *appdata = (appdata_t*)data;
322    
323      printf("detail level decrease\n");
324      map_detail_decrease(appdata->map);
325    }
326    
327    static void
328  cb_menu_track_import(GtkMenuItem *item, appdata_t *appdata) {  cb_menu_track_import(GtkMenuItem *item, appdata_t *appdata) {
329    g_assert(appdata->settings);    g_assert(appdata->settings);
330    
# Line 368  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 494  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 573  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 598  void menu_create(appdata_t *appdata) { Line 597  void menu_create(appdata_t *appdata) {
597  #endif  #endif
598    
599    menu_append_new_item(    menu_append_new_item(
600      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_open), _("_Open..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_open), _("_Open"),
601      GTK_STOCK_OPEN, "<OSM2Go-Main>/Project/Open",      GTK_STOCK_OPEN, "<OSM2Go-Main>/Project/Open",
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 621  void menu_create(appdata_t *appdata) { Line 620  void menu_create(appdata_t *appdata) {
620    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
621    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
622    
623    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
624    appdata->menu_item_view_fullscreen = menu_append_new_item(    appdata->menu_item_view_fullscreen = menu_append_new_item(
625      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_fullscreen), _("_Fullscreen"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_fullscreen), _("_Fullscreen"),
626      GTK_STOCK_FULLSCREEN, "<OSM2Go-Main>/View/Fullscreen",      GTK_STOCK_FULLSCREEN, "<OSM2Go-Main>/View/Fullscreen",
627      0, 0, TRUE, TRUE, FALSE      0, 0, TRUE, TRUE, FALSE
628    );    );
629    #endif
630    
631    menu_append_new_item(    menu_append_new_item(
632      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),
# Line 639  void menu_create(appdata_t *appdata) { Line 640  void menu_create(appdata_t *appdata) {
640      GDK_period, GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_period, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
641    );    );
642    
643    /* -------------------- OSM submenu -------------------- */    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
644    
645      menu_append_new_item(
646        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_view_detail_inc), _("More details"),
647        NULL, "<OSM2Go-Main>/View/DetailInc",
648        GDK_period, GDK_MOD1_MASK, TRUE, FALSE, FALSE
649      );
650    
651      menu_append_new_item(
652        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_view_detail_normal), _("Normal details"),
653        NULL, "<OSM2Go-Main>/View/DetailNormal",
654        0, 0, TRUE, FALSE, FALSE
655      );
656    
657      menu_append_new_item(
658        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_view_detail_dec), _("Less details"),
659        NULL, "<OSM2Go-Main>/View/DetailDec",
660        GDK_comma, GDK_MOD1_MASK, TRUE, FALSE, FALSE
661      );
662    
663      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>/Map/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>/Map/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>/Map/Style",
684        0, 0, TRUE, FALSE, FALSE
685      );
686    
687      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
688    
689    appdata->menu_osm = item = gtk_menu_item_new_with_mnemonic( _("_OSM") );    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>/Map/NoIcons",
692        0, 0, TRUE, TRUE, appdata->settings->no_icons
693      );
694    
695    
696      /* -------------------- map submenu -------------------- */
697    
698      appdata->menu_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_osm_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>/OSM/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>/OSM/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    );    );
# Line 677  void menu_create(appdata_t *appdata) { Line 731  void menu_create(appdata_t *appdata) {
731    );    );
732    
733    appdata->menu_item_osm_undo_changes = menu_append_new_item(    appdata->menu_item_osm_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>/OSM/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_osm_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>/OSM/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    );    );
# Line 698  void menu_create(appdata_t *appdata) { Line 752  void menu_create(appdata_t *appdata) {
752    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
753    
754    menu_append_new_item(    menu_append_new_item(
755      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_import), _("_Import..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_import), _("_Import"),
756      GTK_STOCK_INDEX, "<OSM2Go-Main>/WMS/Import",      GTK_STOCK_INDEX, "<OSM2Go-Main>/WMS/Import",
757      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
758    );    );
# Line 717  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.menu_track = item = gtk_menu_item_new_with_mnemonic(_("_Track"));
# Line 778  void menu_create(appdata_t *appdata) { Line 780  void menu_create(appdata_t *appdata) {
780    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
781    
782    appdata->track.menu_item_import = menu_append_new_item(    appdata->track.menu_item_import = menu_append_new_item(
783      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import"),
784      NULL, "<OSM2Go-Main>/Track/Import",      NULL, "<OSM2Go-Main>/Track/Import",
785      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
786    );    );
787    
788    appdata->track.menu_item_export = menu_append_new_item(    appdata->track.menu_item_export = menu_append_new_item(
789      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export"),
790      NULL, "<OSM2Go-Main>/Track/Export",      NULL, "<OSM2Go-Main>/Track/Export",
791      0, 0, FALSE, FALSE, FALSE      0, 0, FALSE, FALSE, FALSE
792    );    );
# Line 816  void menu_create(appdata_t *appdata) { Line 818  void menu_create(appdata_t *appdata) {
818                          gtk_separator_menu_item_new());                          gtk_separator_menu_item_new());
819    
820    menu_append_new_item(    menu_append_new_item(
821      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_about), _("_About..."),      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_about), _("_About"),
822      GTK_STOCK_ABOUT, "<OSM2Go-Main>/About",      GTK_STOCK_ABOUT, "<OSM2Go-Main>/About",
823      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
824    );    );
825    
826    #ifndef USE_HILDON
827    menu_append_new_item(    menu_append_new_item(
828      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_quit), _("_Quit"),      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_quit), _("_Quit"),
829      GTK_STOCK_QUIT, "<OSM2Go-Main>/Quit",      GTK_STOCK_QUIT, "<OSM2Go-Main>/Quit",
830      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
831    );    );
832    #endif
833    
834    gtk_window_add_accel_group(GTK_WINDOW(appdata->window), accel_grp);    gtk_window_add_accel_group(GTK_WINDOW(appdata->window), accel_grp);
835    
# Line 851  void menu_create(appdata_t *appdata) { Line 855  void menu_create(appdata_t *appdata) {
855    
856  #endif //USE_HILDON  #endif //USE_HILDON
857  }  }
858    #else // !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
859    
860    void submenu_entry(appdata_t *appdata, HildonAppMenu *menu,
861                       const char *label, const char *value,
862                       GtkSignalFunc activate_cb) {
863    
864    }
865    
866    typedef struct {
867      const char *label, *value;
868      gboolean enabled;
869      gboolean (*toggle)(appdata_t *appdata);
870      gulong offset;
871      GtkSignalFunc activate_cb;
872    } menu_entry_t;
873    
874    static gboolean no_icon_get_toggle(appdata_t *appdata) {
875      if(!appdata)           return FALSE;
876      if(!appdata->settings) return FALSE;
877      return appdata->settings->no_icons;
878    }
879    
880    /* create a HildonAppMenu */
881    static GtkWidget *app_menu_create(appdata_t *appdata, const menu_entry_t *menu_entries) {
882      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
883    
884      while(menu_entries->label) {
885        GtkWidget *button = NULL;
886    
887        if(!menu_entries->toggle) {
888          button = hildon_button_new_with_text(
889                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
890                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
891                _(menu_entries->label), menu_entries->value);
892          g_signal_connect_after(button, "clicked", menu_entries->activate_cb, appdata);
893        } else {
894          button = hildon_check_button_new(HILDON_SIZE_AUTO);
895          gtk_button_set_label(GTK_BUTTON(button), _(menu_entries->label));
896          hildon_check_button_set_active(HILDON_CHECK_BUTTON(button),
897                                         menu_entries->toggle(appdata));
898          g_signal_connect_after(button, "toggled", menu_entries->activate_cb, appdata);
899        }
900    
901        /* offset to GtkWidget pointer was given -> store pointer */
902        if(menu_entries->offset)
903          *(GtkWidget**)(((void*)appdata)+menu_entries->offset) = button;
904    
905        gtk_widget_set_sensitive(button, menu_entries->enabled);
906    
907        hildon_app_menu_append(menu, GTK_BUTTON(button));
908        menu_entries++;
909      }
910    
911      gtk_widget_show_all(GTK_WIDGET(menu));
912      return GTK_WIDGET(menu);
913    }
914    
915    /* the view submenu */
916    void on_submenu_view_clicked(GtkButton *button, appdata_t *appdata) {
917      /* draw a popup menu. */
918      hildon_app_menu_popup(HILDON_APP_MENU(appdata->submenu_view),
919                            GTK_WINDOW(appdata->window));
920    }
921    
922    void on_submenu_wms_clicked(GtkButton *button, appdata_t *appdata) {
923      /* draw a popup menu. */
924      hildon_app_menu_popup(HILDON_APP_MENU(appdata->submenu_wms),
925                            GTK_WINDOW(appdata->window));
926    }
927    
928    /* -- the view submenu -- */
929    #define APP_OFFSET(a)  offsetof(appdata_t, a)
930    #define SIMPLE_ENTRY(a,b)     { a, NULL, TRUE,   NULL, 0, G_CALLBACK(b) }
931    #define DISABLED_ENTRY(a,b,c) { a, NULL, FALSE,  NULL, APP_OFFSET(c), G_CALLBACK(b) }
932    #define LAST_ENTRY            { NULL, NULL, FALSE, NULL, 0, NULL }
933    
934    static const menu_entry_t submenu_view[] = {
935      SIMPLE_ENTRY("Zoom in",         cb_menu_zoomin),
936      SIMPLE_ENTRY("Zoom out",        cb_menu_zoomout),
937      /* --- */
938      SIMPLE_ENTRY("Style",           cb_menu_style),
939      /* --- */
940      SIMPLE_ENTRY("Normal details",  cb_menu_view_detail_normal),
941      SIMPLE_ENTRY("More details",    cb_menu_view_detail_inc),
942      SIMPLE_ENTRY("Less details",    cb_menu_view_detail_dec),
943      /* --- */
944      DISABLED_ENTRY("Hide selected", cb_menu_map_hide_sel, menu_item_map_hide_sel),
945      DISABLED_ENTRY("Show all",      cb_menu_map_show_all, menu_item_map_show_all),
946      /* --- */
947      { "No icons",       NULL, TRUE,  no_icon_get_toggle, 0, G_CALLBACK(cb_menu_map_no_icons) },
948    
949      LAST_ENTRY
950    };
951    
952    /* -- the wms submenu -- */
953    static const menu_entry_t submenu_wms[] = {
954      SIMPLE_ENTRY("Import",   cb_menu_wms_import),
955      DISABLED_ENTRY("Clear",  cb_menu_wms_clear, menu_item_wms_clear),
956      DISABLED_ENTRY("Adjust", cb_menu_wms_adjust, menu_item_wms_adjust),
957    
958      LAST_ENTRY
959    };
960    
961    void menu_create(appdata_t *appdata) {
962      GtkWidget *button;
963      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
964    
965      /* build submenus */
966      appdata->submenu_wms = app_menu_create(appdata, submenu_wms);
967      appdata->submenu_view = app_menu_create(appdata, submenu_view);
968    
969      /* ------- */
970      button = gtk_button_new_with_label(_("About"));
971      g_signal_connect_after(button, "clicked",
972                             G_CALLBACK(cb_menu_about), appdata);
973      hildon_app_menu_append(menu, GTK_BUTTON(button));
974    
975      button = gtk_button_new_with_label(_("View"));
976      g_signal_connect_after(button, "clicked",
977                             G_CALLBACK(on_submenu_view_clicked), appdata);
978      hildon_app_menu_append(menu, GTK_BUTTON(button));
979    
980      button = gtk_button_new_with_label(_("WMS"));
981      g_signal_connect_after(button, "clicked",
982                             G_CALLBACK(on_submenu_wms_clicked), appdata);
983      hildon_app_menu_append(menu, GTK_BUTTON(button));
984    
985    
986    
987      gtk_widget_show_all(GTK_WIDGET(menu));
988      hildon_window_set_app_menu(HILDON_WINDOW(appdata->window), menu);
989    }
990    #endif
991    
992  /********************* end of menu **********************/  /********************* end of menu **********************/
993    
# Line 922  void cleanup(appdata_t *appdata) { Line 1059  void cleanup(appdata_t *appdata) {
1059    
1060    project_free(appdata->project);    project_free(appdata->project);
1061    
1062    if(appdata->menu_item_osm_undo)    if(appdata->menu_item_map_undo)
1063      undo_free(appdata->undo.state);      undo_free(appdata->undo.state);
1064    
1065    puts("everything is gone");    puts("everything is gone");
# Line 943  gboolean on_window_key_press(GtkWidget * Line 1080  gboolean on_window_key_press(GtkWidget *
1080    // the map handles some keys on its own ...    // the map handles some keys on its own ...
1081    switch(event->keyval) {    switch(event->keyval) {
1082    
1083    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
1084  #ifdef USE_HILDON  #ifdef USE_HILDON
1085      /* this is in fact a mapping to GDK_F6 */      /* this is in fact a mapping to GDK_F6 */
1086    case HILDON_HARDKEY_FULLSCREEN:    case HILDON_HARDKEY_FULLSCREEN:
# Line 962  gboolean on_window_key_press(GtkWidget * Line 1100  gboolean on_window_key_press(GtkWidget *
1100    
1101      handled = TRUE;      handled = TRUE;
1102      break;      break;
1103    #endif
1104    }    }
1105    
1106    /* forward unprocessed key presses to map */    /* forward unprocessed key presses to map */
# Line 1053  int main(int argc, char *argv[]) { Line 1192  int main(int argc, char *argv[]) {
1192      return -1;      return -1;
1193    }    }
1194    
1195    #if 0  // another test overlay
1196      {
1197        GtkWidget *fixed = gtk_fixed_new();
1198    
1199        gtk_fixed_put(GTK_FIXED(fixed), gtk_label_new("Nase"), 0,0);
1200        gtk_fixed_put(GTK_FIXED(fixed), map, 0,0);
1201    
1202        gtk_box_pack_start(GTK_BOX(vbox), fixed, TRUE, TRUE, 0);
1203      }
1204    #else
1205    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);
1206    #endif
1207    
1208    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);
1209    
1210  #ifndef PORTRAIT  #ifndef PORTRAIT
1211    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);
1212  #endif  #endif
   gtk_box_pack_start(GTK_BOX(hbox), gtk_vseparator_new(), FALSE, FALSE, 0);  
1213    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
1214    
1215    gtk_box_pack_start(GTK_BOX(appdata.vbox), hbox, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(appdata.vbox), hbox, TRUE, TRUE, 0);
# Line 1072  int main(int argc, char *argv[]) { Line 1222  int main(int argc, char *argv[]) {
1222    
1223    /* let gtk do its thing before loading the data, */    /* let gtk do its thing before loading the data, */
1224    /* so the user sees something */    /* so the user sees something */
1225    while(gtk_events_pending()) {    while(gtk_events_pending())
     putchar('.');  
1226      gtk_main_iteration();      gtk_main_iteration();
   }  
1227    
1228    /* load project if one is specified in the settings */    /* load project if one is specified in the settings */
1229    if(appdata.settings->project)    if(appdata.settings->project)
# Line 1087  int main(int argc, char *argv[]) { Line 1235  int main(int argc, char *argv[]) {
1235    if(appdata.settings && appdata.settings->enable_gps)    if(appdata.settings && appdata.settings->enable_gps)
1236      track_enable_gps(&appdata, TRUE);      track_enable_gps(&appdata, TRUE);
1237    
1238    /* ------------ jump into main loop ---------------- */    /* again let the ui do its thing */
1239      while(gtk_events_pending())
1240        gtk_main_iteration();
1241    
1242    #if 0  // test overlay
1243      {
1244        GtkWidget *overlay = gtk_window_new(GTK_WINDOW_POPUP);
1245        gtk_window_set_default_size(GTK_WINDOW(overlay), 40, 20);
1246        gtk_window_set_transient_for(GTK_WINDOW(overlay), GTK_WINDOW(appdata.window));
1247        gtk_window_set_keep_above(GTK_WINDOW(overlay), TRUE);
1248        gtk_window_set_destroy_with_parent(GTK_WINDOW(overlay), TRUE);
1249        gtk_window_set_position(GTK_WINDOW(overlay), GTK_WIN_POS_CENTER_ON_PARENT);
1250        gtk_window_set_decorated(GTK_WINDOW(overlay), TRUE);
1251    
1252        /* add some zoom buttons for testing */
1253        GtkWidget *hbox = gtk_hbox_new(TRUE, 0);
1254        gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_button_new_with_label("+"));
1255        gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_button_new_with_label("-"));
1256        gtk_container_add(GTK_CONTAINER(overlay), hbox);
1257    
1258        gtk_widget_show_all(overlay);
1259      }
1260    #endif
1261    
1262      /* start to interact with the user now that the gui is running */
1263      if(appdata.settings->first_run_demo) {
1264        messagef(GTK_WIDGET(appdata.window), _("Welcome to OSM2Go"),
1265                 _("This is the first time you run OSM2Go. "
1266                   "A demo project has been loaded to get you "
1267                   "started. You can play around with this demo as much "
1268                   "as you like. However, you cannot upload or download "
1269                   "the demo project.\n\n"
1270                   "In order to start working on real data you'll have "
1271                   "to setup a new project and enter your OSM user name "
1272                   "and password. You'll then be able to download the "
1273                   "latest data from OSM and upload your changes into "
1274                   "the OSM main database."
1275                   ));
1276      }
1277    
1278      /* ------------ jump into main loop ---------------- */
1279    gtk_main();    gtk_main();
1280    
1281    puts("gtk_main() left");    puts("gtk_main() left");
Legend:
Removed from v.156  
changed lines
  Added in v.188