Diff of /trunk/src/main.c

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

revision 2 by achadwick, Wed Dec 10 00:00:05 2008 UTC revision 101 by achadwick, Sat Feb 28 22:31:10 2009 UTC
# Line 1  Line 1 
1  /*  /*
2     * Copyright (C) 2008 Till Harbaum <till@harbaum.org>.
3     *
4   * This file is part of OSM2Go.   * This file is part of OSM2Go.
5   *   *
6   * OSM2Go is free software: you can redistribute it and/or modify   * OSM2Go is free software: you can redistribute it and/or modify
# Line 19  Line 21 
21  #include <string.h>  #include <string.h>
22    
23  #include <curl/curl.h>  #include <curl/curl.h>
24    #include <gdk/gdkkeysyms.h>
25    
26  #include "appdata.h"  #include "appdata.h"
27    #include "banner.h"
28    
29  /* disable/enable main screen control dependant on presence of open project */  /* disable/enable main screen control dependant on presence of open project */
30  static void main_project_loaded(appdata_t *appdata) {  static void main_ui_enable(appdata_t *appdata) {
31    gboolean loaded = (appdata->project != NULL);    gboolean project_valid = (appdata->project != NULL);
32      gboolean osm_valid = (appdata->osm != NULL);
33    
34    /* cancel any action in progress */    /* cancel any action in progress */
35    if(GTK_WIDGET_FLAGS(appdata->iconbar->cancel) & GTK_SENSITIVE)    if(GTK_WIDGET_FLAGS(appdata->iconbar->cancel) & GTK_SENSITIVE)
# Line 33  static void main_project_loaded(appdata_ Line 38  static void main_project_loaded(appdata_
38    /* ---- set project name as window title ----- */    /* ---- set project name as window title ----- */
39  #ifndef USE_HILDON  #ifndef USE_HILDON
40    char *str = NULL;    char *str = NULL;
41    if(loaded)    if(project_valid)
42      str = g_strdup_printf("OSM2Go - %s", appdata->project->name);      str = g_strdup_printf("OSM2Go - %s", appdata->project->name);
43    else    else
44      str = g_strdup_printf("OSM2Go");      str = g_strdup_printf("OSM2Go");
# Line 41  static void main_project_loaded(appdata_ Line 46  static void main_project_loaded(appdata_
46    gtk_window_set_title(GTK_WINDOW(appdata->window), str);    gtk_window_set_title(GTK_WINDOW(appdata->window), str);
47    g_free(str);    g_free(str);
48  #else  #else
49    if(loaded)    if(project_valid)
50      gtk_window_set_title(GTK_WINDOW(appdata->window), appdata->project->name);      gtk_window_set_title(GTK_WINDOW(appdata->window), appdata->project->name);
51    else    else
52      gtk_window_set_title(GTK_WINDOW(appdata->window), "");      gtk_window_set_title(GTK_WINDOW(appdata->window), "");
53  #endif  #endif
54    
55    if(appdata->iconbar && appdata->iconbar->toolbar)    if(appdata->iconbar && appdata->iconbar->toolbar)
56      gtk_widget_set_sensitive(appdata->iconbar->toolbar, loaded);      gtk_widget_set_sensitive(appdata->iconbar->toolbar, osm_valid);
57    
58    /* disable all menu entries related to map */    /* disable all menu entries related to map */
59    gtk_widget_set_sensitive(appdata->track.menu_track, loaded);    gtk_widget_set_sensitive(appdata->menu_osm, project_valid);
60    gtk_widget_set_sensitive(appdata->menu_view, loaded);    gtk_widget_set_sensitive(appdata->menu_item_osm_upload, osm_valid);
61    gtk_widget_set_sensitive(appdata->menu_osm, loaded);    if(appdata->menu_item_osm_undo)
62    gtk_widget_set_sensitive(appdata->menu_wms, loaded);      gtk_widget_set_sensitive(appdata->menu_item_osm_undo, osm_valid);
63    gtk_widget_set_sensitive(appdata->menu_map, loaded);    gtk_widget_set_sensitive(appdata->menu_item_osm_save_changes, osm_valid);
64    gtk_widget_set_sensitive(appdata->menu_item_project_close, loaded);    gtk_widget_set_sensitive(appdata->menu_item_osm_undo_changes, osm_valid);
65      gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);
66      gtk_widget_set_sensitive(appdata->menu_view, osm_valid);
67      gtk_widget_set_sensitive(appdata->menu_wms, osm_valid);
68      gtk_widget_set_sensitive(appdata->menu_map, osm_valid);
69      gtk_widget_set_sensitive(appdata->menu_item_project_close, project_valid);
70    
71    if(!loaded)    if(!project_valid)
72      statusbar_set(appdata, _("Plase load or create a project"), FALSE);      statusbar_set(appdata, _("Please load or create a project"), FALSE);
73  }  }
74    
75  /******************** begin of menu *********************/  /******************** begin of menu *********************/
76    
 #if 0 // simplify menu  
 static struct {  
   enum { MENU_END, MENU_ITEM, MENU_SUB, MENU_SUB_END, MENU_SEP }  type;  
   
   char *title;  
   GCallback c_handler;  
 } menu[] = {  
   { MENU_SUB, "OSM", NULL },  
   
   { MENU_END,  NULL, NULL },  
 };  
 #endif  
   
77  static void  static void
78  cb_menu_project_open(GtkWidget *window, gpointer data) {  cb_menu_project_open(GtkWidget *window, gpointer data) {
79    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
80    project_load(appdata, NULL);    project_load(appdata, NULL);
81    main_project_loaded(appdata);    main_ui_enable(appdata);
82  }  }
83    
84  static void  static void
85  cb_menu_project_close(GtkWidget *window, gpointer data) {  cb_menu_project_close(GtkWidget *window, gpointer data) {
86    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
87    project_close(appdata);    project_close(appdata);
88    main_project_loaded(appdata);    main_ui_enable(appdata);
89  }  }
90    
91  static void  static void
# Line 101  cb_menu_about(GtkWidget *window, gpointe Line 98  cb_menu_about(GtkWidget *window, gpointe
98    
99    const gchar *authors[] = {    const gchar *authors[] = {
100      "Till Harbaum <till@harbaum.org>",      "Till Harbaum <till@harbaum.org>",
101      "Andrew Chadwick",      "Andrew Chadwick <andrewc-osm2go@piffle.org>",
102      NULL };      NULL };
103    
104    gtk_about_dialog_set_authors(about, authors);    gtk_about_dialog_set_authors(about, authors);
# Line 136  cb_menu_upload(GtkWidget *window, gpoint Line 133  cb_menu_upload(GtkWidget *window, gpoint
133  static void  static void
134  cb_menu_download(GtkWidget *window, gpointer data) {  cb_menu_download(GtkWidget *window, gpointer data) {
135    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
136    if(!appdata->osm || !appdata->project) return;    if(!appdata->project) return;
137    
138    /* redraw the entire map by destroying all map items and redrawing them */    /* if we have valid osm data loaded: save state first */
139    diff_save(appdata->project, appdata->osm);    if(appdata->osm) {
140    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);      /* redraw the entire map by destroying all map items and redrawing them */
141    osm_free(&appdata->icon, appdata->osm);      diff_save(appdata->project, appdata->osm);
142        map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
143        osm_free(&appdata->icon, appdata->osm);
144    
145        appdata->osm = NULL;
146      }
147    
148    // download    // download
149    osm_download(GTK_WIDGET(appdata->window), appdata->project);    if(osm_download(GTK_WIDGET(appdata->window), appdata->project)) {
150        banner_busy_start(appdata, 1, "Redrawing...");
151        appdata->osm = osm_parse(appdata->project->osm);
152        diff_restore(appdata, appdata->project, appdata->osm);
153        map_paint(appdata);
154        banner_busy_stop(appdata); //"Redrawing..."
155      }
156    
157    appdata->osm = osm_parse(appdata->project->osm);    main_ui_enable(appdata);
   diff_restore(appdata, appdata->project, appdata->osm);  
   map_paint(appdata);  
158  }  }
159    
160  static void  static void
# Line 183  cb_menu_map_show_all(GtkWidget *window, Line 189  cb_menu_map_show_all(GtkWidget *window,
189    map_show_all(appdata);    map_show_all(appdata);
190  }  }
191    
192  /* ----------------------------------------------- ----------- */  /* ---------------------------------------------------------- */
193    
194  #if 1  // mainly for testing  #if 1  // mainly for testing
195  static void  static void
# Line 191  cb_menu_redraw(GtkWidget *window, gpoint Line 197  cb_menu_redraw(GtkWidget *window, gpoint
197    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
198    
199    /* redraw the entire map by destroying all map items and redrawing them */    /* redraw the entire map by destroying all map items and redrawing them */
200      banner_busy_start(appdata, 1, "Redrawing...");
201    track_save(appdata->project, appdata->track.track);    track_save(appdata->project, appdata->track.track);
202    diff_save(appdata->project, appdata->osm);    diff_save(appdata->project, appdata->osm);
203    map_clear(appdata, MAP_LAYER_ALL);    map_clear(appdata, MAP_LAYER_ALL);
# Line 205  cb_menu_redraw(GtkWidget *window, gpoint Line 212  cb_menu_redraw(GtkWidget *window, gpoint
212      map_track_draw(appdata->map, appdata->track.track);      map_track_draw(appdata->map, appdata->track.track);
213    
214    wms_load(appdata);    wms_load(appdata);
215      banner_busy_stop(appdata); //"Redrawing..."
216  }  }
217  #endif  #endif
218    
219  static void  static void
220  cb_menu_style(GtkWidget *window, gpointer data) {  cb_menu_style(GtkWidget *widget, gpointer data) {
221    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
222    
223    style_select(GTK_WIDGET(appdata->window), appdata);    style_select(GTK_WIDGET(appdata->window), appdata);
224  }  }
225    
226  static void  static void
227  cb_menu_save_changes(GtkWidget *window, gpointer data) {  cb_menu_map_no_icons(GtkWidget *widget, gpointer data) {
228      appdata_t *appdata = (appdata_t*)data;
229    
230      banner_busy_start(appdata, 1, "Redrawing...");
231      map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
232      appdata->settings->no_icons =
233        gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
234      map_paint(appdata);
235      banner_busy_stop(appdata); //"Redrawing..."
236    }
237    
238    static void
239    cb_menu_map_no_antialias(GtkWidget *widget, gpointer data) {
240      appdata_t *appdata = (appdata_t*)data;
241    
242      banner_busy_start(appdata, 1, "Redrawing...");
243      map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
244      appdata->settings->no_antialias =
245        gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
246      map_paint(appdata);
247      banner_busy_stop(appdata); //"Redrawing..."
248    }
249    
250    static void
251    cb_menu_undo(GtkWidget *widget, gpointer data) {
252      appdata_t *appdata = (appdata_t*)data;
253    
254      undo(appdata);
255    
256      // the banner will be displayed from within undo with more details
257    }
258    
259    static void
260    cb_menu_save_changes(GtkWidget *widget, gpointer data) {
261    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
262    
263    diff_save(appdata->project, appdata->osm);    diff_save(appdata->project, appdata->osm);
264    statusbar_set(appdata, _("Saved all changes in projects diff file"), FALSE);    banner_show_info(appdata, _("Saved local changes"));
265  }  }
266    
267    static void
268    cb_menu_undo_changes(GtkWidget *widget, gpointer data) {
269      appdata_t *appdata = (appdata_t*)data;
270    
271      if(!yes_no_f(GTK_WIDGET(appdata->window), NULL, 0, 0,
272                   _("Discard local changes?"),
273                   _("Throw away all the changes you've not "
274                     "uploaded yet? This can't be undone.")))
275        return;
276    
277      banner_busy_start(appdata, 1, _("Redrawing..."));
278      map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
279      osm_free(&appdata->icon, appdata->osm);
280      diff_remove(appdata->project);
281      appdata->osm = osm_parse(appdata->project->osm);
282      map_paint(appdata);
283      banner_busy_stop(appdata);  //"Redrawing..."
284    
285      banner_show_info(appdata, _("Discarded local changes"));
286    }
287    
288    static void
289    cb_menu_osm_relations(GtkWidget *widget, gpointer data) {
290      relation_list((appdata_t*)data);
291    }
292    
 #ifdef USE_HILDON  
293  static void  static void
294  cb_menu_fullscreen(GtkWidget *widget, gpointer data) {  cb_menu_fullscreen(GtkWidget *widget, gpointer data) {
295    appdata_t *appdata = (appdata_t *)data;    appdata_t *appdata = (appdata_t *)data;
# Line 234  cb_menu_fullscreen(GtkWidget *widget, gp Line 299  cb_menu_fullscreen(GtkWidget *widget, gp
299    else    else
300      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));
301  }  }
 #endif  
302    
303  static void  static void
304  cb_menu_zoomin(GtkWidget *widget, appdata_t *appdata) {  cb_menu_zoomin(GtkWidget *widget, appdata_t *appdata) {
# Line 326  cb_menu_track_clear(GtkWidget *window, g Line 390  cb_menu_track_clear(GtkWidget *window, g
390    track_do(appdata, TRACK_NONE, NULL);    track_do(appdata, TRACK_NONE, NULL);
391  }  }
392    
393    
394    
395    
396    /*
397     *  Platform-specific UI tweaks.
398     */
399    
400    
401    #ifndef USE_HILDON
402    #ifdef PORTRAIT
403    
404    // Portrait mode, for openmoko-like systems
405    #define uispecific_main_menu_new gtk_menu_new
406    
407    #else
408    
409    // Regular desktop builds
410    #define uispecific_main_menu_new gtk_menu_bar_new
411    #define UISPECIFIC_MAIN_MENU_IS_MENU_BAR
412    #define UISPECIFIC_MENU_HAS_ICONS
413    #define UISPECIFIC_MENU_HAS_ACCELS
414    
415    #endif //PORTRAIT
416    #else//USE_HILDON
417    
418    // Maemo/Hildon builds
419    #define uispecific_main_menu_new gtk_menu_new
420    
421    #endif
422    
423    
424    
425    // Half-arsed slapdash common menu item constructor. Let's use GtkBuilder
426    // instead so we have some flexibility.
427    
428    static GtkWidget *
429    menu_append_new_item(appdata_t *appdata,
430                         GtkWidget *menu_shell,
431                         GtkSignalFunc activate_cb,
432                         char *label,
433                         const gchar *icon_name, // stock id or name for icon_load
434                                        // overridden by label, accels, icon_name
435                         const gchar *accel_path,
436                         guint accel_key,      // from gdk/gdkkeysyms.h
437                         GdkModifierType accel_mods, // e.g. GDK_CONTROL_MASK
438                         gboolean is_check, gboolean check_status)
439    {
440      GtkWidget *item = NULL;
441      GtkWidget *image = NULL;
442    
443      gboolean stock_item_known = FALSE;
444      GtkStockItem stock_item;
445      if (icon_name != NULL) {
446        stock_item_known = gtk_stock_lookup(icon_name, &stock_item);
447      }
448    
449      // Icons
450    #ifndef UISPECIFIC_MENU_HAS_ICONS
451      item = is_check ? gtk_check_menu_item_new_with_mnemonic (label)
452                      : gtk_menu_item_new_with_mnemonic       (label);
453    #else
454      if (is_check) {
455        item = gtk_check_menu_item_new_with_mnemonic (label);
456      }
457      else if (!stock_item_known) {
458        GdkPixbuf *pbuf = icon_load(&appdata->icon, icon_name);
459        if (pbuf) {
460          image = gtk_image_new_from_pixbuf(pbuf);
461        }
462        if (image) {
463          item = gtk_image_menu_item_new_with_mnemonic(label);
464          gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
465        }
466        else {
467          item = gtk_menu_item_new_with_mnemonic(label);
468        }
469      }
470      else {
471        item = gtk_image_menu_item_new_with_mnemonic(label);
472        image = gtk_image_new_from_stock(icon_name, GTK_ICON_SIZE_MENU);
473        gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
474      }
475    #endif
476    
477    #ifdef UISPECIFIC_MENU_HAS_ACCELS
478      // Accelerators
479      // Default
480      if (accel_path != NULL) {
481        gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
482        if (accel_key != 0) {
483          gtk_accel_map_add_entry( accel_path, accel_key, accel_mods );
484        }
485        else if (stock_item_known) {
486          gtk_accel_map_add_entry( accel_path, stock_item.keyval,
487                                   stock_item.modifier );
488        }
489      }
490    #endif
491    
492      gtk_menu_shell_append(GTK_MENU_SHELL(menu_shell), GTK_WIDGET(item));
493      if (is_check) {
494        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), check_status);
495      }
496      g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(activate_cb),
497                       appdata);
498      return item;
499    }
500    
501    
502  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
503    GtkWidget *menu, *item, *submenu;    GtkWidget *menu, *item, *submenu;
504    menu = gtk_menu_new();    GtkWidget *about_quit_items_menu;
505    
506      if (g_module_supported()) {
507        printf("*** can use GModule: consider using GtkUIManager / GtkBuilder\n");
508      }
509    
510      menu = uispecific_main_menu_new();
511      about_quit_items_menu = menu;
512    
513    /* -------------------- Project submenu -------------------- */    /* -------------------- Project submenu -------------------- */
514    
515    item = gtk_menu_item_new_with_label( _("Project") );    GtkAccelGroup *accel_grp = gtk_accel_group_new();
516    gtk_menu_append(GTK_MENU_SHELL(menu), item);    item = gtk_menu_item_new_with_mnemonic( _("_Project") );
517      gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
518    submenu = gtk_menu_new();    submenu = gtk_menu_new();
519      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
520    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
521    #ifdef UISPECIFIC_MAIN_MENU_IS_MENU_BAR
522      about_quit_items_menu = submenu;
523    #endif
524    
525    item = gtk_menu_item_new_with_label( _("Open...") );    menu_append_new_item(
526    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_open), _("_Open..."),
527    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_project_open),      GTK_STOCK_OPEN, "<OSM2Go-Main>/Project/Open",
528                     appdata);      0, 0, FALSE, FALSE
529      );
530    appdata->menu_item_project_close = item =  
531      gtk_menu_item_new_with_label( _("Close") );    appdata->menu_item_project_close = menu_append_new_item(
532    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_close), _("_Close"),
533    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_project_close),      GTK_STOCK_CLOSE, "<OSM2Go-Main>/Project/Close",
534                     appdata);      0, 0, FALSE, FALSE
535      );
536    
537    /* --------------- view menu ------------------- */    /* --------------- view menu ------------------- */
538    
539    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());  #ifndef UISPECIFIC_MAIN_MENU_IS_MENU_BAR
540      gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
541    #endif
542    
543    appdata->menu_view = item =    appdata->menu_view = item = gtk_menu_item_new_with_mnemonic( _("_View") );
544      gtk_menu_item_new_with_label( _("View") );    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
   gtk_menu_append(GTK_MENU_SHELL(menu), item);  
545    submenu = gtk_menu_new();    submenu = gtk_menu_new();
546      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
547    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
548    
549  #ifdef USE_HILDON    appdata->menu_item_view_fullscreen = menu_append_new_item(
550    appdata->fullscreen_menu_item =      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_fullscreen), _("_Fullscreen"),
551      item = gtk_check_menu_item_new_with_label( _("Fullscreen") );      GTK_STOCK_FULLSCREEN, "<OSM2Go-Main>/View/Fullscreen",
552    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      0, 0, TRUE, FALSE
553    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_fullscreen),    );
554                     appdata);  
555  #endif    menu_append_new_item(
556        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),
557    item = gtk_menu_item_new_with_label( _("Zoom +" ));      GTK_STOCK_ZOOM_IN, "<OSM2Go-Main>/View/ZoomIn",
558    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      GDK_comma, GDK_CONTROL_MASK, FALSE, FALSE
559    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_zoomin), appdata);    );
560    
561    item = gtk_menu_item_new_with_label( _("Zoom -") );    menu_append_new_item(
562    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomout), _("Zoom _out"),
563    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_zoomout), appdata);      GTK_STOCK_ZOOM_OUT, "<OSM2Go-Main>/View/ZoomOut",
564        GDK_period, GDK_CONTROL_MASK, FALSE, FALSE
565      );
566    
567    /* -------------------- OSM submenu -------------------- */    /* -------------------- OSM submenu -------------------- */
568    
569    appdata->menu_osm = item = gtk_menu_item_new_with_label( _("OSM") );    appdata->menu_osm = item = gtk_menu_item_new_with_mnemonic( _("_OSM") );
570    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
571    submenu = gtk_menu_new();    submenu = gtk_menu_new();
572      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
573    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
574    
575    item = gtk_menu_item_new_with_label( _("Upload...") );    appdata->menu_item_osm_upload = menu_append_new_item(
576    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload..."),
577    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_upload), appdata);      "upload.16", "<OSM2Go-Main>/OSM/Upload",
578        GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE
579    item = gtk_menu_item_new_with_label( _("Download...") );    );
580    gtk_menu_append(GTK_MENU_SHELL(submenu), item);  
581    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_download), appdata);    menu_append_new_item(
582        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download..."),
583    gtk_menu_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());      "download.16", "<OSM2Go-Main>/OSM/Download",
584        GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE
585    item = gtk_menu_item_new_with_label( _("Save diff file") );    );
586    gtk_menu_append(GTK_MENU_SHELL(submenu), item);  
587    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_save_changes),    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
588                     appdata);  
589      if(getenv("OSM2GO_UNDO_TEST")) {
590        appdata->menu_item_osm_undo = menu_append_new_item(
591                   appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo), _("_Undo"),
592                   GTK_STOCK_UNDO, "<OSM2Go-Main>/OSM/Undo",
593                   GDK_z, GDK_CONTROL_MASK, FALSE, FALSE
594                   );
595      } else
596        printf("set environment variable OSM2GO_UNDO_TEST to enable undo framework tests\n");
597    
598      appdata->menu_item_osm_save_changes = menu_append_new_item(
599        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),
600        GTK_STOCK_SAVE, "<OSM2Go-Main>/OSM/SaveChanges",
601        GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE
602      );
603    
604      appdata->menu_item_osm_undo_changes = menu_append_new_item(
605        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo_changes), _("Disca_rd local changes..."),
606        GTK_STOCK_DELETE, "<OSM2Go-Main>/OSM/DiscardChanges",
607        0, 0, FALSE, FALSE
608      );
609    
610      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
611      appdata->menu_item_osm_relations = menu_append_new_item(
612        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations..."),
613        NULL, "<OSM2Go-Main>/OSM/Relations",
614        GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE
615      );
616    
617    /* -------------------- wms submenu -------------------- */    /* -------------------- wms submenu -------------------- */
618    
619    appdata->menu_wms = item = gtk_menu_item_new_with_label( _("WMS") );    appdata->menu_wms = item = gtk_menu_item_new_with_mnemonic( _("_WMS") );
620    gtk_menu_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);
623    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
624    
625    item = gtk_menu_item_new_with_label( _("Import...") );    menu_append_new_item(
626    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_import), _("_Import..."),
627    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_wms_import),      GTK_STOCK_INDEX, "<OSM2Go-Main>/WMS/Import",
628                     appdata);      0, 0, FALSE, FALSE
629      );
630    appdata->menu_item_wms_clear = item =  
631      gtk_menu_item_new_with_label( _("Clear") );    appdata->menu_item_wms_clear = menu_append_new_item(
632    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_clear), _("_Clear"),
633    gtk_widget_set_sensitive(item, FALSE);      GTK_STOCK_CLEAR, "<OSM2Go-Main>/WMS/Clear",
634    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_wms_clear),      0, 0, FALSE, FALSE
635                     appdata);    );
636      gtk_widget_set_sensitive(appdata->menu_item_wms_clear, FALSE);
637    appdata->menu_item_wms_adjust = item =  
638      gtk_menu_item_new_with_label( _("Adjust") );    appdata->menu_item_wms_adjust = menu_append_new_item(
639    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_adjust), _("_Adjust"),
640    gtk_widget_set_sensitive(item, FALSE);      NULL, "<OSM2Go-Main>/WMS/Adjust",
641    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_wms_adjust),      0, 0, FALSE, FALSE
642                     appdata);    );
643      gtk_widget_set_sensitive(appdata->menu_item_wms_adjust, FALSE);
644    
645    /* -------------------- map submenu -------------------- */    /* -------------------- map submenu -------------------- */
646    
647    appdata->menu_map = item = gtk_menu_item_new_with_label( _("Map") );    appdata->menu_map = item = gtk_menu_item_new_with_mnemonic( _("_Map") );
648    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
649    submenu = gtk_menu_new();    submenu = gtk_menu_new();
650      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
651    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
652    
653    appdata->menu_item_map_hide_sel = item =    appdata->menu_item_map_hide_sel = menu_append_new_item(
654      gtk_menu_item_new_with_label( _("Hide selected") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_hide_sel), _("_Hide selected"),
655    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      GTK_STOCK_REMOVE, "<OSM2Go-Main>/Map/HideSelected",
656    gtk_widget_set_sensitive(item, FALSE);      0, 0, FALSE, FALSE
657    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_map_hide_sel),    );
658                     appdata);    gtk_widget_set_sensitive(appdata->menu_item_map_hide_sel, FALSE);
659    
660    appdata->menu_item_map_show_all = item =    appdata->menu_item_map_show_all = menu_append_new_item(
661      gtk_menu_item_new_with_label( _("Show all") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_show_all), _("_Show all"),
662    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      GTK_STOCK_ADD, "<OSM2Go-Main>/Map/ShowAll",
663    gtk_widget_set_sensitive(item, FALSE);      0, 0, FALSE, FALSE
664    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_map_show_all),    );
665                     appdata);    gtk_widget_set_sensitive(appdata->menu_item_map_show_all, FALSE);
666    
667    gtk_menu_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
668    
669    item = gtk_menu_item_new_with_label( _("Redraw") );    menu_append_new_item(
670    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_style), _("St_yle..."),
671    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_redraw), appdata);      GTK_STOCK_SELECT_COLOR, "<OSM2Go-Main>/Map/Style",
672        0, 0, FALSE, FALSE
673    gtk_menu_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());    );
674    
675    item = gtk_menu_item_new_with_label( _("Style...") );    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
676    gtk_menu_append(GTK_MENU_SHELL(submenu), item);  
677    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_style), appdata);    /* switches mainly intended for testing/debugging */
678      menu_append_new_item(
679        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_redraw), _("_Redraw"),
680        NULL, "<OSM2Go-Main>/Map/Redraw",
681        GDK_r, GDK_CONTROL_MASK, FALSE, FALSE
682      );
683    
684      appdata->menu_item_map_no_icons = menu_append_new_item(
685        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_icons), _("No _icons"),
686        NULL, "<OSM2Go-Main>/Map/NoIcons",
687        0, 0, TRUE, appdata->settings->no_icons
688      );
689    
690      appdata->menu_item_map_no_antialias = menu_append_new_item(
691        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_antialias),
692        _("No _antialias"),
693        NULL, "<OSM2Go-Main>/Map/NoAntialias",
694        0, 0, TRUE, appdata->settings->no_antialias
695      );
696    
697    /* -------------------- track submenu -------------------- */    /* -------------------- track submenu -------------------- */
698    
699    appdata->track.menu_track = item = gtk_menu_item_new_with_label(_("Track"));    appdata->track.menu_track = item = gtk_menu_item_new_with_mnemonic(_("_Track"));
700    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
701    submenu = gtk_menu_new();    submenu = gtk_menu_new();
702      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
703    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
704    
705    appdata->track.menu_item_import =    appdata->track.menu_item_import = menu_append_new_item(
706      item = gtk_menu_item_new_with_label( _("Import...") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import..."),
707    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      NULL, "<OSM2Go-Main>/Track/Import",
708    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_track_import),      0, 0, FALSE, FALSE
709                     appdata);    );
710    
711    appdata->track.menu_item_export =    appdata->track.menu_item_export = menu_append_new_item(
712      item = gtk_menu_item_new_with_label( _("Export...") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export..."),
713    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      NULL, "<OSM2Go-Main>/Track/Export",
714    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_track_export),      0, 0, FALSE, FALSE
715                     appdata);    );
716    
717    appdata->track.menu_item_clear =    appdata->track.menu_item_clear = menu_append_new_item(
718      item = gtk_menu_item_new_with_label( _("Clear") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_clear), _("_Clear"),
719    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      GTK_STOCK_CLEAR, "<OSM2Go-Main>/Track/Clear",
720    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_track_clear),      0, 0, FALSE, FALSE
721                     appdata);    );
722    
723    appdata->track.menu_item_gps =  
724      item = gtk_check_menu_item_new_with_label( _("GPS") );    appdata->track.menu_item_gps = menu_append_new_item(
725    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_gps), _("_GPS"),
726    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_track_gps),      NULL, "<OSM2Go-Main>/Track/GPS",
727                     appdata);      GDK_g, GDK_CONTROL_MASK|GDK_SHIFT_MASK, TRUE, FALSE
728      );
729    
730    /* ------------------------------------------------------- */    /* ------------------------------------------------------- */
731    
732    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_shell_append(GTK_MENU_SHELL(about_quit_items_menu),
733                            gtk_separator_menu_item_new());
   
   item = gtk_menu_item_new_with_label( _("About...") );  
   gtk_menu_append(GTK_MENU_SHELL(menu), item);  
   g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);  
734    
735      menu_append_new_item(
736        appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_about), _("_About..."),
737        GTK_STOCK_ABOUT, "<OSM2Go-Main>/About",
738        0, 0, FALSE, FALSE
739      );
740    
741      menu_append_new_item(
742        appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_quit), _("_Quit"),
743        GTK_STOCK_QUIT, "<OSM2Go-Main>/Quit",
744        0, 0, FALSE, FALSE
745      );
746    
747    item = gtk_menu_item_new_with_label( _("Quit") );    gtk_window_add_accel_group(GTK_WINDOW(appdata->window), accel_grp);
   gtk_menu_append(GTK_MENU_SHELL(menu), item);  
   g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_quit), appdata);  
748    
749  #ifdef USE_HILDON  #ifdef USE_HILDON
750    hildon_window_set_menu(appdata->window, GTK_MENU(menu));    hildon_window_set_menu(appdata->window, GTK_MENU(menu));
751  #else  #else
752    /* attach ordinary gtk menu */    GtkWidget *menu_bar = menu;
753    GtkWidget *menu_bar = gtk_menu_bar_new();  
754    #ifndef UISPECIFIC_MAIN_MENU_IS_MENU_BAR
755      // we need to make one first
756      menu_bar = gtk_menu_bar_new();
757    
758    GtkWidget *root_menu = gtk_menu_item_new_with_label (_("Menu"));    GtkWidget *root_menu = gtk_menu_item_new_with_label (_("Menu"));
759    gtk_widget_show(root_menu);    gtk_widget_show(root_menu);
# Line 514  void menu_create(appdata_t *appdata) { Line 762  void menu_create(appdata_t *appdata) {
762    gtk_menu_item_set_submenu(GTK_MENU_ITEM (root_menu), menu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM (root_menu), menu);
763    
764    gtk_widget_show(menu_bar);    gtk_widget_show(menu_bar);
765    #endif //UISPECIFIC_MAIN_MENU_IS_MENU_BAR
766    
767    gtk_box_pack_start(GTK_BOX(appdata->vbox), menu_bar, 0, 0, 0);    gtk_box_pack_start(GTK_BOX(appdata->vbox), menu_bar, 0, 0, 0);
768  #endif  
769    #endif //USE_HILDON
770  }  }
771    
772  /********************* end of menu **********************/  /********************* end of menu **********************/
773    
774    #ifdef UISPECIFIC_MENU_HAS_ACCELS
775    #define ACCELS_FILE "accels"
776    
777    static void menu_accels_load(appdata_t *appdata) {
778      char *accels_file = g_strdup_printf("%s/" ACCELS_FILE,
779                                          appdata->settings->base_path);
780      gtk_accel_map_load(accels_file);
781      g_free(accels_file);
782    }
783    
784    static void menu_accels_save(appdata_t *appdata) {
785      char *accels_file = g_strdup_printf("%s" ACCELS_FILE,
786                                          appdata->settings->base_path);
787      gtk_accel_map_save(accels_file);
788      g_free(accels_file);
789    }
790    
791    #endif
792    
793    
794  void cleanup(appdata_t *appdata) {  void cleanup(appdata_t *appdata) {
795    #ifdef UISPECIFIC_MENU_HAS_ACCELS
796      menu_accels_save(appdata);
797    #endif
798    
799    settings_save(appdata->settings);    settings_save(appdata->settings);
800    
801  #ifdef USE_HILDON  #ifdef USE_HILDON
# Line 565  void cleanup(appdata_t *appdata) { Line 839  void cleanup(appdata_t *appdata) {
839    
840    project_free(appdata->project);    project_free(appdata->project);
841    
842      if(appdata->menu_item_osm_undo)
843        undo_free(appdata->undo.state);
844    
845    puts("everything is gone");    puts("everything is gone");
846  }  }
847    
# Line 580  gboolean on_window_key_press(GtkWidget * Line 857  gboolean on_window_key_press(GtkWidget *
857    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
858    int handled = FALSE;    int handled = FALSE;
859    
   //  printf("key event %d\n", event->keyval);  
   
860    // the map handles some keys on its own ...    // the map handles some keys on its own ...
861    switch(event->keyval) {    switch(event->keyval) {
 #ifdef USE_HILDON  
862    
863  #if 0  #ifdef USE_HILDON
864    case HILDON_HARDKEY_SELECT:      /* this is in fact a mapping to GDK_F6 */
     handled = TRUE;  
     break;  
 #endif  
   
865    case HILDON_HARDKEY_FULLSCREEN:    case HILDON_HARDKEY_FULLSCREEN:
866      {  #else
867        gboolean fullscreen = !gtk_check_menu_item_get_active(    case GDK_F11:
868                 GTK_CHECK_MENU_ITEM(appdata->fullscreen_menu_item));  #endif
869        if(!gtk_check_menu_item_get_active(
870                 GTK_CHECK_MENU_ITEM(appdata->menu_item_view_fullscreen))) {
871          gtk_window_fullscreen(GTK_WINDOW(appdata->window));
872        gtk_check_menu_item_set_active(        gtk_check_menu_item_set_active(
873                 GTK_CHECK_MENU_ITEM(appdata->fullscreen_menu_item), fullscreen);               GTK_CHECK_MENU_ITEM(appdata->menu_item_view_fullscreen), TRUE);
874          } else {
       if(fullscreen)  
         gtk_window_fullscreen(GTK_WINDOW(appdata->window));  
       else  
875          gtk_window_unfullscreen(GTK_WINDOW(appdata->window));          gtk_window_unfullscreen(GTK_WINDOW(appdata->window));
876            gtk_check_menu_item_set_active(
877        handled = TRUE;               GTK_CHECK_MENU_ITEM(appdata->menu_item_view_fullscreen), FALSE);
878      }        }
879    
880        handled = TRUE;
881      break;      break;
 #endif  
882    }    }
883    
884    /* forward unprocessed key presses to map */    /* forward unprocessed key presses to map */
# Line 674  int main(int argc, char *argv[]) { Line 945  int main(int argc, char *argv[]) {
945    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",
946                     G_CALLBACK(on_window_key_press), &appdata);                     G_CALLBACK(on_window_key_press), &appdata);
947    
   appdata.vbox = gtk_vbox_new(FALSE,0);  
   menu_create(&appdata);  
   
948    /* user specific init */    /* user specific init */
949    appdata.settings = settings_load();    appdata.settings = settings_load();
950    
951      appdata.vbox = gtk_vbox_new(FALSE,0);
952      menu_create(&appdata);
953    #ifdef UISPECIFIC_MENU_HAS_ACCELS
954      menu_accels_load(&appdata);
955    #endif
956    
957    /* ----------------------- setup main window ---------------- */    /* ----------------------- setup main window ---------------- */
958    
959    GtkWidget *hbox = gtk_hbox_new(FALSE,0);    GtkWidget *hbox = gtk_hbox_new(FALSE,0);
# Line 688  int main(int argc, char *argv[]) { Line 962  int main(int argc, char *argv[]) {
962  #ifdef PORTRAIT  #ifdef PORTRAIT
963    gtk_box_pack_start(GTK_BOX(vbox), iconbar_new(&appdata), FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(vbox), iconbar_new(&appdata), FALSE, FALSE, 0);
964  #endif  #endif
965    gtk_box_pack_start(GTK_BOX(vbox), map_new(&appdata), TRUE, TRUE, 0);  
966      /* generate main map view */
967      GtkWidget *map = map_new(&appdata);
968      if(!map) {
969        cleanup(&appdata);
970        return -1;
971      }
972    
973      gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);
974    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);
975    
976  #ifndef PORTRAIT  #ifndef PORTRAIT
# Line 716  int main(int argc, char *argv[]) { Line 998  int main(int argc, char *argv[]) {
998    if(appdata.settings->project)    if(appdata.settings->project)
999      project_load(&appdata, appdata.settings->project);      project_load(&appdata, appdata.settings->project);
1000    
1001    main_project_loaded(&appdata);    main_ui_enable(&appdata);
1002    
1003    /* ------------ jump into main loop ---------------- */    /* ------------ jump into main loop ---------------- */
1004    
1005    gtk_main();    gtk_main();
1006    
1007      puts("gtk_main() left");
1008    
1009    track_save(appdata.project, appdata.track.track);    track_save(appdata.project, appdata.track.track);
1010    
1011    /* save a diff if there are dirty entries */    /* save a diff if there are dirty entries */
# Line 731  int main(int argc, char *argv[]) { Line 1015  int main(int argc, char *argv[]) {
1015    
1016    return 0;    return 0;
1017  }  }
1018    
1019    // vim:et:ts=8:sw=2:sts=2:ai
Legend:
Removed from v.2  
changed lines
  Added in v.101