Diff of /trunk/src/main.c

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

revision 4 by harbaum, Wed Dec 10 19:50:17 2008 UTC revision 55 by achadwick, Sat Feb 7 01:14:09 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_ui_enable(appdata_t *appdata) {  static void main_ui_enable(appdata_t *appdata) {
# Line 55  static void main_ui_enable(appdata_t *ap Line 57  static void main_ui_enable(appdata_t *ap
57    gtk_widget_set_sensitive(appdata->menu_osm, project_valid);    gtk_widget_set_sensitive(appdata->menu_osm, project_valid);
58    gtk_widget_set_sensitive(appdata->menu_item_osm_upload, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_osm_upload, osm_valid);
59    gtk_widget_set_sensitive(appdata->menu_item_osm_diff, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_osm_diff, osm_valid);
60      gtk_widget_set_sensitive(appdata->menu_item_osm_undo_changes, osm_valid);
61    gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);    gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);
62    gtk_widget_set_sensitive(appdata->menu_view, osm_valid);    gtk_widget_set_sensitive(appdata->menu_view, osm_valid);
63    gtk_widget_set_sensitive(appdata->menu_wms, osm_valid);    gtk_widget_set_sensitive(appdata->menu_wms, osm_valid);
# Line 62  static void main_ui_enable(appdata_t *ap Line 65  static void main_ui_enable(appdata_t *ap
65    gtk_widget_set_sensitive(appdata->menu_item_project_close, project_valid);    gtk_widget_set_sensitive(appdata->menu_item_project_close, project_valid);
66    
67    if(!project_valid)    if(!project_valid)
68      statusbar_set(appdata, _("Plase load or create a project"), FALSE);      statusbar_set(appdata, _("Please load or create a project"), FALSE);
69  }  }
70    
71  /******************** begin of menu *********************/  /******************** begin of menu *********************/
# Line 74  static struct { Line 77  static struct {
77    char *title;    char *title;
78    GCallback c_handler;    GCallback c_handler;
79  } menu[] = {  } menu[] = {
80    { MENU_SUB, "OSM", NULL },    { MENU_SUB, "_OSM", NULL },
81    
82    { MENU_END,  NULL, NULL },    { MENU_END,  NULL, NULL },
83  };  };
84  #endif  #endif
# Line 104  cb_menu_about(GtkWidget *window, gpointe Line 107  cb_menu_about(GtkWidget *window, gpointe
107    
108    const gchar *authors[] = {    const gchar *authors[] = {
109      "Till Harbaum <till@harbaum.org>",      "Till Harbaum <till@harbaum.org>",
110      "Andrew Chadwick",      "Andrew Chadwick <andrewc-osm2go@piffle.org>",
111      NULL };      NULL };
112    
113    gtk_about_dialog_set_authors(about, authors);    gtk_about_dialog_set_authors(about, authors);
# Line 153  cb_menu_download(GtkWidget *window, gpoi Line 156  cb_menu_download(GtkWidget *window, gpoi
156    
157    // download    // download
158    if(osm_download(GTK_WIDGET(appdata->window), appdata->project)) {    if(osm_download(GTK_WIDGET(appdata->window), appdata->project)) {
159        banner_busy_start(appdata, 1, "Redrawing...");
160      appdata->osm = osm_parse(appdata->project->osm);      appdata->osm = osm_parse(appdata->project->osm);
161      diff_restore(appdata, appdata->project, appdata->osm);      diff_restore(appdata, appdata->project, appdata->osm);
162      map_paint(appdata);      map_paint(appdata);
163        banner_busy_stop(appdata); //"Redrawing..."
164    }    }
165    
166    main_ui_enable(appdata);    main_ui_enable(appdata);
# Line 193  cb_menu_map_show_all(GtkWidget *window, Line 198  cb_menu_map_show_all(GtkWidget *window,
198    map_show_all(appdata);    map_show_all(appdata);
199  }  }
200    
201  /* ----------------------------------------------- ----------- */  /* ---------------------------------------------------------- */
202    
203  #if 1  // mainly for testing  #if 1  // mainly for testing
204  static void  static void
# Line 201  cb_menu_redraw(GtkWidget *window, gpoint Line 206  cb_menu_redraw(GtkWidget *window, gpoint
206    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
207    
208    /* redraw the entire map by destroying all map items and redrawing them */    /* redraw the entire map by destroying all map items and redrawing them */
209      banner_busy_start(appdata, 1, "Redrawing...");
210    track_save(appdata->project, appdata->track.track);    track_save(appdata->project, appdata->track.track);
211    diff_save(appdata->project, appdata->osm);    diff_save(appdata->project, appdata->osm);
212    map_clear(appdata, MAP_LAYER_ALL);    map_clear(appdata, MAP_LAYER_ALL);
# Line 215  cb_menu_redraw(GtkWidget *window, gpoint Line 221  cb_menu_redraw(GtkWidget *window, gpoint
221      map_track_draw(appdata->map, appdata->track.track);      map_track_draw(appdata->map, appdata->track.track);
222    
223    wms_load(appdata);    wms_load(appdata);
224      banner_busy_stop(appdata); //"Redrawing..."
225  }  }
226  #endif  #endif
227    
228  static void  static void
229  cb_menu_style(GtkWidget *window, gpointer data) {  cb_menu_style(GtkWidget *widget, gpointer data) {
230    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
231    
232    style_select(GTK_WIDGET(appdata->window), appdata);    style_select(GTK_WIDGET(appdata->window), appdata);
233  }  }
234    
235  static void  static void
236  cb_menu_save_changes(GtkWidget *window, gpointer data) {  cb_menu_map_no_icons(GtkWidget *widget, gpointer data) {
237      appdata_t *appdata = (appdata_t*)data;
238    
239      banner_busy_start(appdata, 1, "Redrawing...");
240      map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
241      appdata->settings->no_icons =
242        gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
243      map_paint(appdata);
244      banner_busy_stop(appdata); //"Redrawing..."
245    }
246    
247    static void
248    cb_menu_map_no_antialias(GtkWidget *widget, gpointer data) {
249      appdata_t *appdata = (appdata_t*)data;
250    
251      banner_busy_start(appdata, 1, "Redrawing...");
252      map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
253      appdata->settings->no_antialias =
254        gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
255      map_paint(appdata);
256      banner_busy_stop(appdata); //"Redrawing..."
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 uploaded yet? This can't be undone.")))
274        return;
275    
276      banner_busy_start(appdata, 1, _("Redrawing..."));
277      map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
278      osm_free(&appdata->icon, appdata->osm);
279      diff_remove(appdata->project);
280      appdata->osm = osm_parse(appdata->project->osm);
281      map_paint(appdata);
282      banner_busy_stop(appdata);  //"Redrawing..."
283    
284      banner_show_info(appdata, _("Discarded local changes"));
285    }
286    
 #ifdef USE_HILDON  
287  static void  static void
288  cb_menu_fullscreen(GtkWidget *widget, gpointer data) {  cb_menu_fullscreen(GtkWidget *widget, gpointer data) {
289    appdata_t *appdata = (appdata_t *)data;    appdata_t *appdata = (appdata_t *)data;
# Line 244  cb_menu_fullscreen(GtkWidget *widget, gp Line 293  cb_menu_fullscreen(GtkWidget *widget, gp
293    else    else
294      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));
295  }  }
 #endif  
296    
297  static void  static void
298  cb_menu_zoomin(GtkWidget *widget, appdata_t *appdata) {  cb_menu_zoomin(GtkWidget *widget, appdata_t *appdata) {
# Line 336  cb_menu_track_clear(GtkWidget *window, g Line 384  cb_menu_track_clear(GtkWidget *window, g
384    track_do(appdata, TRACK_NONE, NULL);    track_do(appdata, TRACK_NONE, NULL);
385  }  }
386    
387    
388    
389    
390    /*
391     *  Platform-specific UI tweaks.
392     */
393    
394    
395    #ifndef USE_HILDON
396    #ifdef PORTRAIT
397    
398    // Portrait mode, for openmoko-like systems
399    #define uispecific_main_menu_new gtk_menu_new
400    
401    #else
402    
403    // Regular desktop builds
404    #define uispecific_main_menu_new gtk_menu_bar_new
405    #define UISPECIFIC_MAIN_MENU_IS_MENU_BAR
406    #define UISPECIFIC_MENU_HAS_ICONS
407    #define UISPECIFIC_MENU_HAS_ACCELS
408    
409    #endif //PORTRAIT
410    #else//USE_HILDON
411    
412    // Maemo/Hildon builds
413    #define uispecific_main_menu_new gtk_menu_new
414    
415    #endif
416    
417    
418    
419    // Half-arsed slapdash common menu item constructor. Let's use GtkBuilder
420    // instead so we have some flexibility.
421    
422    static GtkWidget *
423    menu_append_new_item(appdata_t *appdata,
424                         GtkWidget *menu_shell,
425                         GtkSignalFunc activate_cb,
426                         char *label,
427                         const gchar *stock_id, // overridden by label, accels
428                         const gchar *accel_path,
429                         guint accel_key,      // from gdk/gdkkeysyms.h
430                         GdkModifierType accel_mods, // e.g. GDK_CONTROL_MASK
431                         gboolean is_check, gboolean check_status)
432    {
433      GtkWidget *item = NULL;
434      GtkStockItem stock_item;
435      gboolean stock_item_known = FALSE;
436      if (stock_id != NULL) {
437        stock_item_known = gtk_stock_lookup(stock_id, &stock_item);
438      }
439    
440      // Icons
441    #ifndef UISPECIFIC_MENU_HAS_ICONS
442      item = is_check ? gtk_check_menu_item_new_with_mnemonic (label)
443                      : gtk_menu_item_new_with_mnemonic       (label);
444    #else
445      if (is_check || !stock_item_known) {
446        item = is_check ? gtk_check_menu_item_new_with_mnemonic (label)
447                        : gtk_menu_item_new_with_mnemonic       (label);
448      }
449      else {
450        item = gtk_image_menu_item_new_with_mnemonic(label);
451        GtkWidget *stock_image = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_MENU);
452        gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), stock_image);
453      }
454    #endif
455    
456    #ifdef UISPECIFIC_MENU_HAS_ACCELS
457      // Accelerators
458      // Default
459      if (accel_path != NULL) {
460        gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
461        if (accel_key != 0) {
462          gtk_accel_map_add_entry( accel_path, accel_key, accel_mods );
463        }
464        else if (stock_item_known) {
465          gtk_accel_map_add_entry( accel_path, stock_item.keyval,
466                                   stock_item.modifier );
467        }
468      }
469    #endif
470    
471      gtk_menu_shell_append(GTK_MENU_SHELL(menu_shell), GTK_WIDGET(item));
472      if (is_check) {
473        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), check_status);
474      }
475      g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(activate_cb),
476                       appdata);
477      return item;
478    }
479    
480    
481  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
482    GtkWidget *menu, *item, *submenu;    GtkWidget *menu, *item, *submenu;
483    menu = gtk_menu_new();    GtkWidget *about_quit_items_menu;
484    
485      if (g_module_supported()) {
486        printf("*** can use GModule: consider using GtkUIManager / GtkBuilder\n");
487      }
488    
489      menu = uispecific_main_menu_new();
490      about_quit_items_menu = menu;
491    
492    /* -------------------- Project submenu -------------------- */    /* -------------------- Project submenu -------------------- */
493    
494    item = gtk_menu_item_new_with_label( _("Project") );    GtkAccelGroup *accel_grp = gtk_accel_group_new();
495    gtk_menu_append(GTK_MENU_SHELL(menu), item);    item = gtk_menu_item_new_with_mnemonic( _("_Project") );
496      gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
497    submenu = gtk_menu_new();    submenu = gtk_menu_new();
498      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
499    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
500    #ifdef UISPECIFIC_MAIN_MENU_IS_MENU_BAR
501      about_quit_items_menu = submenu;
502    #endif
503    
504    item = gtk_menu_item_new_with_label( _("Open...") );    menu_append_new_item(
505    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_open), _("_Open..."),
506    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_project_open),      GTK_STOCK_OPEN, "<OSM2Go-Main>/Project/Open",
507                     appdata);      0, 0, FALSE, FALSE
508      );
509    appdata->menu_item_project_close = item =  
510      gtk_menu_item_new_with_label( _("Close") );    appdata->menu_item_project_close = menu_append_new_item(
511    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_close), _("_Close"),
512    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_project_close),      GTK_STOCK_CLOSE, "<OSM2Go-Main>/Project/Close",
513                     appdata);      0, 0, FALSE, FALSE
514      );
515    
516    /* --------------- view menu ------------------- */    /* --------------- view menu ------------------- */
517    
518    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());  #ifndef UISPECIFIC_MENU_IS_MENU_BAR
519      gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
520    #endif
521    
522    appdata->menu_view = item =    appdata->menu_view = item = gtk_menu_item_new_with_mnemonic( _("_View") );
523      gtk_menu_item_new_with_label( _("View") );    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
   gtk_menu_append(GTK_MENU_SHELL(menu), item);  
524    submenu = gtk_menu_new();    submenu = gtk_menu_new();
525      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
526    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
527    
528  #ifdef USE_HILDON    appdata->menu_item_view_fullscreen = menu_append_new_item(
529    appdata->fullscreen_menu_item =      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_fullscreen), _("_Fullscreen"),
530      item = gtk_check_menu_item_new_with_label( _("Fullscreen") );      GTK_STOCK_FULLSCREEN, "<OSM2Go-Main>/View/Fullscreen",
531    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      0, 0, TRUE, FALSE
532    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_fullscreen),    );
533                     appdata);  
534  #endif    menu_append_new_item(
535        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),
536    item = gtk_menu_item_new_with_label( _("Zoom +" ));      GTK_STOCK_ZOOM_IN, "<OSM2Go-Main>/View/ZoomIn",
537    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      GDK_comma, GDK_CONTROL_MASK, FALSE, FALSE
538    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_zoomin), appdata);    );
539    
540    item = gtk_menu_item_new_with_label( _("Zoom -") );    menu_append_new_item(
541    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomout), _("Zoom _out"),
542    g_signal_connect(item, "activate",      GTK_STOCK_ZOOM_OUT, "<OSM2Go-Main>/View/ZoomOut",
543                     GTK_SIGNAL_FUNC(cb_menu_zoomout), appdata);      GDK_period, GDK_CONTROL_MASK, FALSE, FALSE
544      );
545    
546    /* -------------------- OSM submenu -------------------- */    /* -------------------- OSM submenu -------------------- */
547    
548    appdata->menu_osm = item = gtk_menu_item_new_with_label( _("OSM") );    appdata->menu_osm = item = gtk_menu_item_new_with_mnemonic( _("_OSM") );
549    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
550    submenu = gtk_menu_new();    submenu = gtk_menu_new();
551      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
552    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
553    
554    appdata->menu_item_osm_upload = item =    appdata->menu_item_osm_upload = menu_append_new_item(
555      gtk_menu_item_new_with_label( _("Upload...") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload..."),
556    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      NULL, "<OSM2Go-Main>/OSM/Upload",
557    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_upload), appdata);      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE
558      );
559    item = gtk_menu_item_new_with_label( _("Download...") );  
560    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    menu_append_new_item(
561    g_signal_connect(item, "activate",      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download..."),
562                     GTK_SIGNAL_FUNC(cb_menu_download), appdata);      NULL, "<OSM2Go-Main>/OSM/Download",
563        GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE
564    gtk_menu_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());    );
565    
566    appdata->menu_item_osm_diff = item =    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
567      gtk_menu_item_new_with_label( _("Save diff file") );  
568    gtk_menu_append(GTK_MENU_SHELL(submenu), item);  
569    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_save_changes),    appdata->menu_item_osm_diff = menu_append_new_item(
570                     appdata);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),
571        GTK_STOCK_SAVE, "<OSM2Go-Main>/OSM/SaveChanges",
572        GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE
573      );
574    
575      appdata->menu_item_osm_undo_changes = menu_append_new_item(
576        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo_changes), _("Disca_rd local changes..."),
577        GTK_STOCK_DELETE, "<OSM2Go-Main>/OSM/DiscardChanges",
578        0, 0, FALSE, FALSE
579      );
580    
581    /* -------------------- wms submenu -------------------- */    /* -------------------- wms submenu -------------------- */
582    
583    appdata->menu_wms = item = gtk_menu_item_new_with_label( _("WMS") );    appdata->menu_wms = item = gtk_menu_item_new_with_mnemonic( _("_WMS") );
584    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
585    submenu = gtk_menu_new();    submenu = gtk_menu_new();
586      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
587    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
588    
589    item = gtk_menu_item_new_with_label( _("Import...") );    menu_append_new_item(
590    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_import), _("_Import..."),
591    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_wms_import),      GTK_STOCK_INDEX, "<OSM2Go-Main>/WMS/Import",
592                     appdata);      0, 0, FALSE, FALSE
593      );
594    appdata->menu_item_wms_clear = item =  
595      gtk_menu_item_new_with_label( _("Clear") );    appdata->menu_item_wms_clear = menu_append_new_item(
596    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_clear), _("_Clear"),
597    gtk_widget_set_sensitive(item, FALSE);      GTK_STOCK_CLEAR, "<OSM2Go-Main>/WMS/Clear",
598    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_wms_clear),      0, 0, FALSE, FALSE
599                     appdata);    );
600      gtk_widget_set_sensitive(appdata->menu_item_wms_clear, FALSE);
601    appdata->menu_item_wms_adjust = item =  
602      gtk_menu_item_new_with_label( _("Adjust") );    appdata->menu_item_wms_adjust = menu_append_new_item(
603    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_adjust), _("_Adjust"),
604    gtk_widget_set_sensitive(item, FALSE);      NULL, "<OSM2Go-Main>/WMS/Adjust",
605    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_wms_adjust),      0, 0, FALSE, FALSE
606                     appdata);    );
607      gtk_widget_set_sensitive(appdata->menu_item_wms_adjust, FALSE);
608    
609    /* -------------------- map submenu -------------------- */    /* -------------------- map submenu -------------------- */
610    
611    appdata->menu_map = item = gtk_menu_item_new_with_label( _("Map") );    appdata->menu_map = item = gtk_menu_item_new_with_mnemonic( _("_Map") );
612    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
613    submenu = gtk_menu_new();    submenu = gtk_menu_new();
614      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
615    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
616    
617    appdata->menu_item_map_hide_sel = item =    appdata->menu_item_map_hide_sel = menu_append_new_item(
618      gtk_menu_item_new_with_label( _("Hide selected") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_hide_sel), _("_Hide selected"),
619    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      GTK_STOCK_REMOVE, "<OSM2Go-Main>/Map/HideSelected",
620    gtk_widget_set_sensitive(item, FALSE);      0, 0, FALSE, FALSE
621    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_map_hide_sel),    );
622                     appdata);    gtk_widget_set_sensitive(appdata->menu_item_map_hide_sel, FALSE);
623    
624    appdata->menu_item_map_show_all = item =    appdata->menu_item_map_show_all = menu_append_new_item(
625      gtk_menu_item_new_with_label( _("Show all") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_show_all), _("_Show all"),
626    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      GTK_STOCK_ADD, "<OSM2Go-Main>/Map/ShowAll",
627    gtk_widget_set_sensitive(item, FALSE);      0, 0, FALSE, FALSE
628    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_map_show_all),    );
629                     appdata);    gtk_widget_set_sensitive(appdata->menu_item_map_show_all, FALSE);
630    
631    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());
632    
633    item = gtk_menu_item_new_with_label( _("Redraw") );    menu_append_new_item(
634    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_style), _("St_yle..."),
635    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_redraw), appdata);      GTK_STOCK_SELECT_COLOR, "<OSM2Go-Main>/Map/Style",
636        0, 0, FALSE, FALSE
637    gtk_menu_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());    );
638    
639    item = gtk_menu_item_new_with_label( _("Style...") );    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
640    gtk_menu_append(GTK_MENU_SHELL(submenu), item);  
641    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_style), appdata);    /* switches mainly intended for testing/debugging */
642      menu_append_new_item(
643        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_redraw), _("_Redraw"),
644        NULL, "<OSM2Go-Main>/Map/Redraw",
645        GDK_r, GDK_CONTROL_MASK, FALSE, FALSE
646      );
647    
648      appdata->menu_item_map_no_icons = menu_append_new_item(
649        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_icons), _("No _icons"),
650        NULL, "<OSM2Go-Main>/Map/NoIcons",
651        0, 0, TRUE, appdata->settings->no_icons
652      );
653    
654      appdata->menu_item_map_no_antialias = menu_append_new_item(
655        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_antialias),
656        _("No _antialias"),
657        NULL, "<OSM2Go-Main>/Map/NoAntialias",
658        0, 0, TRUE, appdata->settings->no_antialias
659      );
660    
661    /* -------------------- track submenu -------------------- */    /* -------------------- track submenu -------------------- */
662    
663    appdata->track.menu_track = item = gtk_menu_item_new_with_label(_("Track"));    appdata->track.menu_track = item = gtk_menu_item_new_with_mnemonic(_("_Track"));
664    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
665    submenu = gtk_menu_new();    submenu = gtk_menu_new();
666      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
667    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
668    
669    appdata->track.menu_item_import =    appdata->track.menu_item_import = menu_append_new_item(
670      item = gtk_menu_item_new_with_label( _("Import...") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import..."),
671    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      NULL, "<OSM2Go-Main>/Track/Import",
672    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_track_import),      0, 0, FALSE, FALSE
673                     appdata);    );
674    
675    appdata->track.menu_item_export =    appdata->track.menu_item_export = menu_append_new_item(
676      item = gtk_menu_item_new_with_label( _("Export...") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export..."),
677    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      NULL, "<OSM2Go-Main>/Track/Export",
678    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_track_export),      0, 0, FALSE, FALSE
679                     appdata);    );
680    
681    appdata->track.menu_item_clear =    appdata->track.menu_item_clear = menu_append_new_item(
682      item = gtk_menu_item_new_with_label( _("Clear") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_clear), _("_Clear"),
683    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      GTK_STOCK_CLEAR, "<OSM2Go-Main>/Track/Clear",
684    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_track_clear),      0, 0, FALSE, FALSE
685                     appdata);    );
686    
687    appdata->track.menu_item_gps =  
688      item = gtk_check_menu_item_new_with_label( _("GPS") );    appdata->track.menu_item_gps = menu_append_new_item(
689    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_gps), _("_GPS"),
690    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_track_gps),      NULL, "<OSM2Go-Main>/Track/GPS",
691                     appdata);      GDK_g, GDK_CONTROL_MASK|GDK_SHIFT_MASK, TRUE, FALSE
692      );
693    
694    /* ------------------------------------------------------- */    /* ------------------------------------------------------- */
695    
696    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_shell_append(GTK_MENU_SHELL(about_quit_items_menu),
697                            gtk_separator_menu_item_new());
698    
699    item = gtk_menu_item_new_with_label( _("About...") );    menu_append_new_item(
700    gtk_menu_append(GTK_MENU_SHELL(menu), item);      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_about), _("_About..."),
701    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);      GTK_STOCK_ABOUT, "<OSM2Go-Main>/About",
702        0, 0, FALSE, FALSE
703      );
704    
705      menu_append_new_item(
706        appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_quit), _("_Quit"),
707        GTK_STOCK_QUIT, "<OSM2Go-Main>/Quit",
708        0, 0, FALSE, FALSE
709      );
710    
711      gtk_window_add_accel_group(GTK_WINDOW(appdata->window), accel_grp);
   item = gtk_menu_item_new_with_label( _("Quit") );  
   gtk_menu_append(GTK_MENU_SHELL(menu), item);  
   g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_quit), appdata);  
712    
713  #ifdef USE_HILDON  #ifdef USE_HILDON
714    hildon_window_set_menu(appdata->window, GTK_MENU(menu));    hildon_window_set_menu(appdata->window, GTK_MENU(menu));
715  #else  #else
716    /* attach ordinary gtk menu */    GtkWidget *menu_bar = menu;
717    GtkWidget *menu_bar = gtk_menu_bar_new();  
718    #ifndef UISPECIFIC_MAIN_MENU_IS_MENU_BAR
719      // we need to make one first
720      menu_bar = gtk_menu_bar_new();
721    
722    GtkWidget *root_menu = gtk_menu_item_new_with_label (_("Menu"));    GtkWidget *root_menu = gtk_menu_item_new_with_label (_("Menu"));
723    gtk_widget_show(root_menu);    gtk_widget_show(root_menu);
# Line 528  void menu_create(appdata_t *appdata) { Line 726  void menu_create(appdata_t *appdata) {
726    gtk_menu_item_set_submenu(GTK_MENU_ITEM (root_menu), menu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM (root_menu), menu);
727    
728    gtk_widget_show(menu_bar);    gtk_widget_show(menu_bar);
729    #endif //UISPECIFIC_MAIN_MENU_IS_MENU_BAR
730    
731    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);
732  #endif  
733    #endif //USE_HILDON
734  }  }
735    
736  /********************* end of menu **********************/  /********************* end of menu **********************/
737    
738    #ifdef UISPECIFIC_MENU_HAS_ACCELS
739    #define ACCELS_FILE "accels"
740    
741    static void menu_accels_load(appdata_t *appdata) {
742      char *accels_file = g_strdup_printf("%s/" ACCELS_FILE,
743                                          appdata->settings->base_path);
744      gtk_accel_map_load(accels_file);
745      g_free(accels_file);
746    }
747    
748    static void menu_accels_save(appdata_t *appdata) {
749      char *accels_file = g_strdup_printf("%s" ACCELS_FILE,
750                                          appdata->settings->base_path);
751      gtk_accel_map_save(accels_file);
752      g_free(accels_file);
753    }
754    
755    #endif
756    
757    
758  void cleanup(appdata_t *appdata) {  void cleanup(appdata_t *appdata) {
759    #ifdef UISPECIFIC_MENU_HAS_ACCELS
760      menu_accels_save(appdata);
761    #endif
762    
763    settings_save(appdata->settings);    settings_save(appdata->settings);
764    
765  #ifdef USE_HILDON  #ifdef USE_HILDON
# Line 579  void cleanup(appdata_t *appdata) { Line 803  void cleanup(appdata_t *appdata) {
803    
804    project_free(appdata->project);    project_free(appdata->project);
805    
806      undo_free(appdata->undo_state);
807    
808    puts("everything is gone");    puts("everything is gone");
809  }  }
810    
# Line 594  gboolean on_window_key_press(GtkWidget * Line 820  gboolean on_window_key_press(GtkWidget *
820    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
821    int handled = FALSE;    int handled = FALSE;
822    
   //  printf("key event %d\n", event->keyval);  
   
823    // the map handles some keys on its own ...    // the map handles some keys on its own ...
824    switch(event->keyval) {    switch(event->keyval) {
 #ifdef USE_HILDON  
825    
826  #if 0  #ifdef USE_HILDON
827    case HILDON_HARDKEY_SELECT:      /* this is in fact a mapping to GDK_F6 */
     handled = TRUE;  
     break;  
 #endif  
   
828    case HILDON_HARDKEY_FULLSCREEN:    case HILDON_HARDKEY_FULLSCREEN:
829      {  #else
830        gboolean fullscreen = !gtk_check_menu_item_get_active(    case GDK_F11:
831                 GTK_CHECK_MENU_ITEM(appdata->fullscreen_menu_item));  #endif
832        if(!gtk_check_menu_item_get_active(
833                 GTK_CHECK_MENU_ITEM(appdata->menu_item_view_fullscreen))) {
834          gtk_window_fullscreen(GTK_WINDOW(appdata->window));
835        gtk_check_menu_item_set_active(        gtk_check_menu_item_set_active(
836                 GTK_CHECK_MENU_ITEM(appdata->fullscreen_menu_item), fullscreen);               GTK_CHECK_MENU_ITEM(appdata->menu_item_view_fullscreen), TRUE);
837          } else {
       if(fullscreen)  
         gtk_window_fullscreen(GTK_WINDOW(appdata->window));  
       else  
838          gtk_window_unfullscreen(GTK_WINDOW(appdata->window));          gtk_window_unfullscreen(GTK_WINDOW(appdata->window));
839            gtk_check_menu_item_set_active(
840        handled = TRUE;               GTK_CHECK_MENU_ITEM(appdata->menu_item_view_fullscreen), FALSE);
841      }        }
842    
843        handled = TRUE;
844      break;      break;
 #endif  
845    }    }
846    
847    /* forward unprocessed key presses to map */    /* forward unprocessed key presses to map */
# Line 688  int main(int argc, char *argv[]) { Line 908  int main(int argc, char *argv[]) {
908    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",
909                     G_CALLBACK(on_window_key_press), &appdata);                     G_CALLBACK(on_window_key_press), &appdata);
910    
   appdata.vbox = gtk_vbox_new(FALSE,0);  
   menu_create(&appdata);  
   
911    /* user specific init */    /* user specific init */
912    appdata.settings = settings_load();    appdata.settings = settings_load();
913    
914      appdata.vbox = gtk_vbox_new(FALSE,0);
915      menu_create(&appdata);
916    #ifdef UISPECIFIC_MENU_HAS_ACCELS
917      menu_accels_load(&appdata);
918    #endif
919    
920    /* ----------------------- setup main window ---------------- */    /* ----------------------- setup main window ---------------- */
921    
922    GtkWidget *hbox = gtk_hbox_new(FALSE,0);    GtkWidget *hbox = gtk_hbox_new(FALSE,0);
# Line 702  int main(int argc, char *argv[]) { Line 925  int main(int argc, char *argv[]) {
925  #ifdef PORTRAIT  #ifdef PORTRAIT
926    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);
927  #endif  #endif
928    gtk_box_pack_start(GTK_BOX(vbox), map_new(&appdata), TRUE, TRUE, 0);  
929      /* generate main map view */
930      GtkWidget *map = map_new(&appdata);
931      if(!map) {
932        cleanup(&appdata);
933        return -1;
934      }
935    
936      gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);
937    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);
938    
939  #ifndef PORTRAIT  #ifndef PORTRAIT
# Line 747  int main(int argc, char *argv[]) { Line 978  int main(int argc, char *argv[]) {
978    
979    return 0;    return 0;
980  }  }
981    
982    // vim:et:ts=8:sw=2:sts=2:ai
Legend:
Removed from v.4  
changed lines
  Added in v.55