Diff of /trunk/src/main.c

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

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