Diff of /trunk/src/main.c

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

revision 179 by harbaum, Thu Jun 18 12:15:17 2009 UTC revision 231 by harbaum, Thu Jul 16 19:56:39 2009 UTC
# Line 23  Line 23 
23  #include <curl/curl.h>  #include <curl/curl.h>
24  #include <gdk/gdkkeysyms.h>  #include <gdk/gdkkeysyms.h>
25    
26    #if defined(USE_HILDON) && (MAEMO_VERSION_MAJOR == 5)
27    #include <hildon/hildon-button.h>
28    #include <hildon/hildon-check-button.h>
29    #include <hildon/hildon-window-stack.h>
30    #include <gdk/gdkx.h>
31    #include <X11/Xatom.h>
32    #endif
33    
34  #include "appdata.h"  #include "appdata.h"
35  #include "banner.h"  #include "banner.h"
36    
37  /* disable/enable main screen control dependant on presence of open project */  /* disable/enable main screen control dependant on presence of open project */
38  static void main_ui_enable(appdata_t *appdata) {  void main_ui_enable(appdata_t *appdata) {
39    gboolean project_valid = (appdata->project != NULL);    gboolean project_valid = (appdata->project != NULL);
40    gboolean osm_valid = (appdata->osm != NULL);    gboolean osm_valid = (appdata->osm != NULL);
41    
# Line 43  static void main_ui_enable(appdata_t *ap Line 51  static void main_ui_enable(appdata_t *ap
51      gtk_window_set_title(GTK_WINDOW(appdata->window), "");      gtk_window_set_title(GTK_WINDOW(appdata->window), "");
52  #else  #else
53    char *str = NULL;    char *str = NULL;
54    #ifdef USE_HILDON
55      if(project_valid)
56        str = g_markup_printf_escaped("OSM2Go - <b>%s</b>",
57                                      appdata->project->name);
58      else
59        str = g_markup_printf_escaped("OSM2Go");
60    
61      hildon_window_set_markup(HILDON_WINDOW(appdata->window), str);
62    #else
63    if(project_valid)    if(project_valid)
64      str = g_strdup_printf("OSM2Go - %s", appdata->project->name);      str = g_strdup_printf("OSM2Go - <b>%s</b>", appdata->project->name);
65    else    else
66      str = g_strdup_printf("OSM2Go");      str = g_strdup_printf("OSM2Go");
67    
68    gtk_window_set_title(GTK_WINDOW(appdata->window), str);    gtk_window_set_title(GTK_WINDOW(appdata->window), str);
69    #endif
70    g_free(str);    g_free(str);
71  #endif  #endif
72    
73    if(appdata->iconbar && appdata->iconbar->toolbar)    if(appdata->iconbar && appdata->iconbar->toolbar)
74      gtk_widget_set_sensitive(appdata->iconbar->toolbar, osm_valid);      gtk_widget_set_sensitive(appdata->iconbar->toolbar, osm_valid);
   
75    /* disable all menu entries related to map */    /* disable all menu entries related to map */
76    gtk_widget_set_sensitive(appdata->menu_osm, project_valid);    gtk_widget_set_sensitive(appdata->submenu_map, project_valid);
77    gtk_widget_set_sensitive(appdata->menu_item_osm_upload, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_upload, osm_valid);
78    if(appdata->menu_item_osm_undo)    if(appdata->menu_item_map_undo)
79      gtk_widget_set_sensitive(appdata->menu_item_osm_undo, osm_valid);      gtk_widget_set_sensitive(appdata->menu_item_map_undo, osm_valid);
80    gtk_widget_set_sensitive(appdata->menu_item_osm_save_changes, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_save_changes, osm_valid);
81    gtk_widget_set_sensitive(appdata->menu_item_osm_undo_changes, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_undo_changes, osm_valid);
82    gtk_widget_set_sensitive(appdata->menu_item_osm_relations, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_relations, osm_valid);
83    gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);    gtk_widget_set_sensitive(appdata->track.submenu_track, osm_valid);
84    gtk_widget_set_sensitive(appdata->menu_view, osm_valid);    gtk_widget_set_sensitive(appdata->submenu_view, osm_valid);
85    gtk_widget_set_sensitive(appdata->menu_wms, osm_valid);    gtk_widget_set_sensitive(appdata->submenu_wms, osm_valid);
86    gtk_widget_set_sensitive(appdata->menu_map, osm_valid);  
87    gtk_widget_set_sensitive(appdata->menu_item_project_close, project_valid);  #ifdef ZOOM_BUTTONS
88      gtk_widget_set_sensitive(appdata->btn_zoom_in, osm_valid);
89      gtk_widget_set_sensitive(appdata->btn_zoom_out, osm_valid);
90    #endif
91    
92    if(!project_valid)    if(!project_valid)
93      statusbar_set(appdata, _("Please load or create a project"), FALSE);      statusbar_set(appdata, _("Please load or create a project"), FALSE);
# Line 83  cb_menu_project_open(GtkMenuItem *item, Line 103  cb_menu_project_open(GtkMenuItem *item,
103  }  }
104    
105  static void  static void
106  cb_menu_project_close(GtkMenuItem *item, gpointer data) {  cb_menu_project_wizard(GtkMenuItem *item, gpointer data) {
107    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
108    project_close(appdata);    project_wizard(appdata);
   main_ui_enable(appdata);  
109  }  }
110    
111  static void  static void
# Line 96  cb_menu_about(GtkMenuItem *item, gpointe Line 115  cb_menu_about(GtkMenuItem *item, gpointe
115    const gchar *authors[] = {    const gchar *authors[] = {
116      "Till Harbaum <till@harbaum.org>",      "Till Harbaum <till@harbaum.org>",
117      "Andrew Chadwick <andrewc-osm2go@piffle.org>",      "Andrew Chadwick <andrewc-osm2go@piffle.org>",
118        "Marcus Bauer <marcus.bauer@gmail.com>",
119        "John Stowers <john.stowers@gmail.com>",
120      NULL };      NULL };
121    
122    const gchar *artists[] = {    const gchar *artists[] = {
# Line 115  cb_menu_about(GtkMenuItem *item, gpointe Line 136  cb_menu_about(GtkMenuItem *item, gpointe
136    
137  void on_window_destroy (GtkWidget *widget, gpointer data);  void on_window_destroy (GtkWidget *widget, gpointer data);
138    
139    #ifndef USE_HILDON
140  static void  static void
141  cb_menu_quit(GtkMenuItem *item, gpointer data) {  cb_menu_quit(GtkMenuItem *item, gpointer data) {
142    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
143    gtk_widget_destroy(GTK_WIDGET(appdata->window));    gtk_widget_destroy(GTK_WIDGET(appdata->window));
144  }  }
145    #endif
146    
147  static void  static void
148  cb_menu_upload(GtkMenuItem *item, gpointer data) {  cb_menu_upload(GtkMenuItem *item, gpointer data) {
# Line 197  cb_menu_map_show_all(GtkMenuItem *item, Line 220  cb_menu_map_show_all(GtkMenuItem *item,
220    
221  /* ---------------------------------------------------------- */  /* ---------------------------------------------------------- */
222    
223  #if 1  // mainly for testing  #if defined(USE_HILDON) && (MAEMO_VERSION_MAJOR == 5)
224  static void  #define MENU_CHECK_ITEM HildonCheckButton
225  cb_menu_redraw(GtkMenuItem *item, gpointer data) {  #define MENU_CHECK_ITEM_ACTIVE(a) hildon_check_button_get_active(a)
226    appdata_t *appdata = (appdata_t*)data;  #else
227    #define MENU_CHECK_ITEM GtkCheckMenuItem
228    /* redraw the entire map by destroying all map items and redrawing them */  #define MENU_CHECK_ITEM_ACTIVE(a) gtk_check_menu_item_get_active(a)
   banner_busy_start(appdata, 1, "Redrawing");  
   track_save(appdata->project, appdata->track.track);  
   diff_save(appdata->project, appdata->osm);  
   map_clear(appdata, MAP_LAYER_ALL);  
   osm_free(&appdata->icon, appdata->osm);  
   
   appdata->osm = osm_parse(appdata->project->path, appdata->project->osm);  
   diff_restore(appdata, appdata->project, appdata->osm);  
   map_paint(appdata);  
   
   appdata->track.track = track_restore(appdata, appdata->project);  
   if(appdata->track.track)  
     map_track_draw(appdata->map, appdata->track.track);  
   
   wms_load(appdata);  
   banner_busy_stop(appdata); //"Redrawing"  
 }  
229  #endif  #endif
230    
231  static void  static void
232  cb_menu_map_no_icons(GtkCheckMenuItem *item, gpointer data) {  cb_menu_map_no_icons(MENU_CHECK_ITEM *item, appdata_t *appdata) {
   appdata_t *appdata = (appdata_t*)data;  
233    
234    banner_busy_start(appdata, 1, "Redrawing");    banner_busy_start(appdata, 1, "Redrawing");
235    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
   appdata->settings->no_icons = gtk_check_menu_item_get_active(item);  
   map_paint(appdata);  
   banner_busy_stop(appdata); //"Redrawing"  
 }  
236    
237  static void    appdata->settings->no_icons = MENU_CHECK_ITEM_ACTIVE(item);
 cb_menu_map_no_antialias(GtkCheckMenuItem *item, gpointer data) {  
   appdata_t *appdata = (appdata_t*)data;  
238    
   banner_busy_start(appdata, 1, "Redrawing");  
   map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);  
   appdata->settings->no_antialias = gtk_check_menu_item_get_active(item);  
239    map_paint(appdata);    map_paint(appdata);
240    banner_busy_stop(appdata); //"Redrawing"    banner_busy_stop(appdata); //"Redrawing"
241  }  }
# Line 290  cb_menu_undo_changes(GtkMenuItem *item, Line 286  cb_menu_undo_changes(GtkMenuItem *item,
286  }  }
287    
288  static void  static void
289  cb_menu_osm_relations(GtkMenuItem *item, gpointer data) {  cb_menu_osm_relations(GtkMenuItem *item, appdata_t *appdata) {
290    relation_list((appdata_t*)data);    /* list relations of all objects */
291      relation_list(GTK_WIDGET(appdata->window), appdata, NULL);
292  }  }
293    
294  #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)  #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
295  static void  static void
296  cb_menu_fullscreen(GtkCheckMenuItem *item, gpointer data) {  cb_menu_fullscreen(MENU_CHECK_ITEM *item, gpointer data) {
297    appdata_t *appdata = (appdata_t *)data;    appdata_t *appdata = (appdata_t *)data;
298    
299    if(gtk_check_menu_item_get_active(item))    if(MENU_CHECK_ITEM_ACTIVE(item))
300      gtk_window_fullscreen(GTK_WINDOW(appdata->window));      gtk_window_fullscreen(GTK_WINDOW(appdata->window));
301    else    else
302      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));
# Line 402  cb_menu_track_import(GtkMenuItem *item, Line 399  cb_menu_track_import(GtkMenuItem *item,
399  }  }
400    
401  static void  static void
402  cb_menu_track_enable_gps(GtkMenuItem *item, gpointer data) {  cb_menu_track_enable_gps(MENU_CHECK_ITEM *item, appdata_t *appdata) {
403    appdata_t *appdata = (appdata_t*)data;    track_enable_gps(appdata, MENU_CHECK_ITEM_ACTIVE(item));
   
   if(gtk_check_menu_item_get_active(  
     GTK_CHECK_MENU_ITEM(appdata->track.menu_item_enable_gps))) {  
     track_enable_gps(appdata, TRUE);  
   } else  
     track_enable_gps(appdata, FALSE);  
404  }  }
405    
406    
407  static void  static void
408  cb_menu_track_follow_gps(GtkMenuItem *item, gpointer data) {  cb_menu_track_follow_gps(MENU_CHECK_ITEM *item, appdata_t *appdata) {
409    appdata_t *appdata = (appdata_t*)data;    appdata->settings->follow_gps = MENU_CHECK_ITEM_ACTIVE(item);
   
   if(gtk_check_menu_item_get_active(  
     GTK_CHECK_MENU_ITEM(appdata->track.menu_item_follow_gps))) {  
     appdata->settings->follow_gps = TRUE;  
   } else  
     appdata->settings->follow_gps = FALSE;  
410  }  }
411    
412    
# Line 528  cb_menu_track_clear(GtkMenuItem *item, g Line 513  cb_menu_track_clear(GtkMenuItem *item, g
513  #endif  #endif
514    
515    
516    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
517  // Half-arsed slapdash common menu item constructor. Let's use GtkBuilder  // Half-arsed slapdash common menu item constructor. Let's use GtkBuilder
518  // instead so we have some flexibility.  // instead so we have some flexibility.
519    
# Line 607  menu_append_new_item(appdata_t *appdata, Line 592  menu_append_new_item(appdata_t *appdata,
592    return item;    return item;
593  }  }
594    
   
595  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
596    GtkWidget *menu, *item, *submenu;    GtkWidget *menu, *item, *submenu;
597    GtkWidget *about_quit_items_menu;    GtkWidget *about_quit_items_menu;
# Line 637  void menu_create(appdata_t *appdata) { Line 621  void menu_create(appdata_t *appdata) {
621      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
622    );    );
623    
624    appdata->menu_item_project_close = menu_append_new_item(  #ifndef USE_HILDON
625      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_close), _("_Close"),    menu_append_new_item(
626      GTK_STOCK_CLOSE, "<OSM2Go-Main>/Project/Close",      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_wizard), _("_Wizard"),
627        GTK_STOCK_NEW, "<OSM2Go-Main>/Project/Wizard",
628      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
629    );    );
630    #endif
631    
632    /* --------------- view menu ------------------- */    /* --------------- view menu ------------------- */
633    
# Line 649  void menu_create(appdata_t *appdata) { Line 635  void menu_create(appdata_t *appdata) {
635    gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
636  #endif  #endif
637    
638    appdata->menu_view = item = gtk_menu_item_new_with_mnemonic( _("_View") );    appdata->submenu_view = item = gtk_menu_item_new_with_mnemonic( _("_View") );
639    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
640    submenu = gtk_menu_new();    submenu = gtk_menu_new();
641    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
# Line 663  void menu_create(appdata_t *appdata) { Line 649  void menu_create(appdata_t *appdata) {
649    );    );
650  #endif  #endif
651    
652    #if !defined(ZOOM_BUTTONS) || !defined(USE_HILDON)
653    menu_append_new_item(    menu_append_new_item(
654      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),
655      GTK_STOCK_ZOOM_IN, "<OSM2Go-Main>/View/ZoomIn",      GTK_STOCK_ZOOM_IN, "<OSM2Go-Main>/View/ZoomIn",
# Line 674  void menu_create(appdata_t *appdata) { Line 661  void menu_create(appdata_t *appdata) {
661      GTK_STOCK_ZOOM_OUT, "<OSM2Go-Main>/View/ZoomOut",      GTK_STOCK_ZOOM_OUT, "<OSM2Go-Main>/View/ZoomOut",
662      GDK_period, GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_period, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
663    );    );
664    #endif
665    
666    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
667    
# Line 695  void menu_create(appdata_t *appdata) { Line 683  void menu_create(appdata_t *appdata) {
683      GDK_comma, GDK_MOD1_MASK, TRUE, FALSE, FALSE      GDK_comma, GDK_MOD1_MASK, TRUE, FALSE, FALSE
684    );    );
685    
686    /* -------------------- OSM submenu -------------------- */    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
687    
688      appdata->menu_item_map_hide_sel = menu_append_new_item(
689        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_hide_sel), _("_Hide selected"),
690        GTK_STOCK_REMOVE, "<OSM2Go-Main>/View/HideSelected",
691        0, 0, TRUE, FALSE, FALSE
692      );
693      gtk_widget_set_sensitive(appdata->menu_item_map_hide_sel, FALSE);
694    
695      appdata->menu_item_map_show_all = menu_append_new_item(
696        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_show_all), _("_Show all"),
697        GTK_STOCK_ADD, "<OSM2Go-Main>/View/ShowAll",
698        0, 0, TRUE, FALSE, FALSE
699      );
700      gtk_widget_set_sensitive(appdata->menu_item_map_show_all, FALSE);
701    
702      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
703    
704      menu_append_new_item(
705        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_style), _("St_yle"),
706        GTK_STOCK_SELECT_COLOR, "<OSM2Go-Main>/View/Style",
707        0, 0, TRUE, FALSE, FALSE
708      );
709    
710      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
711    
712      appdata->menu_item_map_no_icons = menu_append_new_item(
713        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_icons), _("No _icons"),
714        NULL, "<OSM2Go-Main>/View/NoIcons",
715        0, 0, TRUE, TRUE, appdata->settings->no_icons
716      );
717    
718    
719      /* -------------------- map submenu -------------------- */
720    
721    appdata->menu_osm = item = gtk_menu_item_new_with_mnemonic( _("_OSM") );    appdata->submenu_map = item = gtk_menu_item_new_with_mnemonic( _("_Map") );
722    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
723    submenu = gtk_menu_new();    submenu = gtk_menu_new();
724    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
725    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
726    
727    appdata->menu_item_osm_upload = menu_append_new_item(    appdata->menu_item_map_upload = menu_append_new_item(
728      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload"),
729      "upload.16", "<OSM2Go-Main>/OSM/Upload",      "upload.16", "<OSM2Go-Main>/Map/Upload",
730      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
731    );    );
732    
733    menu_append_new_item(    menu_append_new_item(
734      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download"),
735      "download.16", "<OSM2Go-Main>/OSM/Download",      "download.16", "<OSM2Go-Main>/Map/Download",
736      GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
737    );    );
738    
739    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
740    
741    if(getenv("OSM2GO_UNDO_TEST")) {    if(getenv("OSM2GO_UNDO_TEST")) {
742      appdata->menu_item_osm_undo = menu_append_new_item(      appdata->menu_item_map_undo = menu_append_new_item(
743                 appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo), _("_Undo"),                 appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo), _("_Undo"),
744                 GTK_STOCK_UNDO, "<OSM2Go-Main>/OSM/Undo",                 GTK_STOCK_UNDO, "<OSM2Go-Main>/Map/Undo",
745                 GDK_z, GDK_CONTROL_MASK, TRUE, FALSE, FALSE                 GDK_z, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
746                 );                 );
747    } else    } else
748      printf("set environment variable OSM2GO_UNDO_TEST to enable undo framework tests\n");      printf("set environment variable OSM2GO_UNDO_TEST to enable undo framework tests\n");
749    
750    appdata->menu_item_osm_save_changes = menu_append_new_item(    appdata->menu_item_map_save_changes = menu_append_new_item(
751      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),
752      GTK_STOCK_SAVE, "<OSM2Go-Main>/OSM/SaveChanges",      GTK_STOCK_SAVE, "<OSM2Go-Main>/Map/SaveChanges",
753      GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
754    );    );
755    
756    appdata->menu_item_osm_undo_changes = menu_append_new_item(    appdata->menu_item_map_undo_changes = menu_append_new_item(
757      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo_changes), _("Disca_rd local changes"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo_changes), _("Disca_rd local changes"),
758      GTK_STOCK_DELETE, "<OSM2Go-Main>/OSM/DiscardChanges",      GTK_STOCK_DELETE, "<OSM2Go-Main>/Map/DiscardChanges",
759      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
760    );    );
761    
762    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
763    appdata->menu_item_osm_relations = menu_append_new_item(    appdata->menu_item_map_relations = menu_append_new_item(
764      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations"),
765      NULL, "<OSM2Go-Main>/OSM/Relations",      NULL, "<OSM2Go-Main>/Map/Relations",
766      GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
767    );    );
768    
769    /* -------------------- wms submenu -------------------- */    /* -------------------- wms submenu -------------------- */
770    
771    appdata->menu_wms = item = gtk_menu_item_new_with_mnemonic( _("_WMS") );    appdata->submenu_wms = item = gtk_menu_item_new_with_mnemonic( _("_WMS") );
772    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
773    submenu = gtk_menu_new();    submenu = gtk_menu_new();
774    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
# Line 773  void menu_create(appdata_t *appdata) { Line 794  void menu_create(appdata_t *appdata) {
794    );    );
795    gtk_widget_set_sensitive(appdata->menu_item_wms_adjust, FALSE);    gtk_widget_set_sensitive(appdata->menu_item_wms_adjust, FALSE);
796    
   /* -------------------- map submenu -------------------- */  
   
   appdata->menu_map = item = gtk_menu_item_new_with_mnemonic( _("_Map") );  
   gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);  
   submenu = gtk_menu_new();  
   gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);  
   gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);  
   
   appdata->menu_item_map_hide_sel = menu_append_new_item(  
     appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_hide_sel), _("_Hide selected"),  
     GTK_STOCK_REMOVE, "<OSM2Go-Main>/Map/HideSelected",  
     0, 0, TRUE, FALSE, FALSE  
   );  
   gtk_widget_set_sensitive(appdata->menu_item_map_hide_sel, FALSE);  
   
   appdata->menu_item_map_show_all = menu_append_new_item(  
     appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_show_all), _("_Show all"),  
     GTK_STOCK_ADD, "<OSM2Go-Main>/Map/ShowAll",  
     0, 0, TRUE, FALSE, FALSE  
   );  
   gtk_widget_set_sensitive(appdata->menu_item_map_show_all, FALSE);  
   
   gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());  
   
   menu_append_new_item(  
     appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_style), _("St_yle"),  
     GTK_STOCK_SELECT_COLOR, "<OSM2Go-Main>/Map/Style",  
     0, 0, TRUE, FALSE, FALSE  
   );  
   
   gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());  
   
   /* switches mainly intended for testing/debugging */  
   menu_append_new_item(  
     appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_redraw), _("_Redraw"),  
     NULL, "<OSM2Go-Main>/Map/Redraw",  
     GDK_r, GDK_CONTROL_MASK, TRUE, FALSE, FALSE  
   );  
   
   appdata->menu_item_map_no_icons = menu_append_new_item(  
     appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_icons), _("No _icons"),  
     NULL, "<OSM2Go-Main>/Map/NoIcons",  
     0, 0, TRUE, TRUE, appdata->settings->no_icons  
   );  
   
   appdata->menu_item_map_no_antialias = menu_append_new_item(  
     appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_antialias),  
     _("No _antialias"),  
     NULL, "<OSM2Go-Main>/Map/NoAntialias",  
     0, 0, TRUE, TRUE, appdata->settings->no_antialias  
   );  
   
797    /* -------------------- track submenu -------------------- */    /* -------------------- track submenu -------------------- */
798    
799    appdata->track.menu_track = item = gtk_menu_item_new_with_mnemonic(_("_Track"));    appdata->track.submenu_track = item =
800        gtk_menu_item_new_with_mnemonic(_("_Track"));
801    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
802    submenu = gtk_menu_new();    submenu = gtk_menu_new();
803    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
804    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
805    
806    appdata->track.menu_item_import = menu_append_new_item(    appdata->track.menu_item_track_import = menu_append_new_item(
807      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import"),
808      NULL, "<OSM2Go-Main>/Track/Import",      NULL, "<OSM2Go-Main>/Track/Import",
809      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
810    );    );
811    
812    appdata->track.menu_item_export = menu_append_new_item(    appdata->track.menu_item_track_export = menu_append_new_item(
813      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export"),
814      NULL, "<OSM2Go-Main>/Track/Export",      NULL, "<OSM2Go-Main>/Track/Export",
815      0, 0, FALSE, FALSE, FALSE      0, 0, FALSE, FALSE, FALSE
816    );    );
817    
818    appdata->track.menu_item_clear = menu_append_new_item(    appdata->track.menu_item_track_clear = menu_append_new_item(
819      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_clear), _("_Clear"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_clear), _("_Clear"),
820      GTK_STOCK_CLEAR, "<OSM2Go-Main>/Track/Clear",      GTK_STOCK_CLEAR, "<OSM2Go-Main>/Track/Clear",
821      0, 0, FALSE, FALSE, FALSE      0, 0, FALSE, FALSE, FALSE
822    );    );
823    
824    
825    appdata->track.menu_item_enable_gps = menu_append_new_item(    appdata->track.menu_item_track_enable_gps = menu_append_new_item(
826      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_enable_gps),_("_GPS enable"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_enable_gps),_("_GPS enable"),
827      NULL, "<OSM2Go-Main>/Track/GPS",      NULL, "<OSM2Go-Main>/Track/GPS",
828      GDK_g, GDK_CONTROL_MASK|GDK_SHIFT_MASK, TRUE, TRUE,      GDK_g, GDK_CONTROL_MASK|GDK_SHIFT_MASK, TRUE, TRUE,
829      appdata->settings->enable_gps      appdata->settings->enable_gps
830    );    );
831    
832    appdata->track.menu_item_follow_gps = menu_append_new_item(    appdata->track.menu_item_track_follow_gps = menu_append_new_item(
833      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_follow_gps), _("GPS follow"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_follow_gps), _("GPS follow"),
834      NULL, "<OSM2Go-Main>/Track/Follow",      NULL, "<OSM2Go-Main>/Track/Follow",
835      0, 0, appdata->settings->enable_gps, TRUE,      0, 0, appdata->settings->enable_gps, TRUE,
# Line 877  void menu_create(appdata_t *appdata) { Line 847  void menu_create(appdata_t *appdata) {
847      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
848    );    );
849    
850    #ifndef USE_HILDON
851    menu_append_new_item(    menu_append_new_item(
852      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_quit), _("_Quit"),      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_quit), _("_Quit"),
853      GTK_STOCK_QUIT, "<OSM2Go-Main>/Quit",      GTK_STOCK_QUIT, "<OSM2Go-Main>/Quit",
854      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
855    );    );
856    #endif
857    
858    gtk_window_add_accel_group(GTK_WINDOW(appdata->window), accel_grp);    gtk_window_add_accel_group(GTK_WINDOW(appdata->window), accel_grp);
859    
# Line 907  void menu_create(appdata_t *appdata) { Line 879  void menu_create(appdata_t *appdata) {
879    
880  #endif //USE_HILDON  #endif //USE_HILDON
881  }  }
882    #else // !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
883    
884    void submenu_entry(appdata_t *appdata, HildonAppMenu *menu,
885                       const char *label, const char *value,
886                       GtkSignalFunc activate_cb) {
887    
888    }
889    
890    typedef struct {
891      const char *label, *value;
892      gboolean enabled;
893      gboolean (*toggle)(appdata_t *appdata);
894      gulong offset;
895      GtkSignalFunc activate_cb;
896    } menu_entry_t;
897    
898    static gboolean no_icon_get_toggle(appdata_t *appdata) {
899      if(!appdata)           return FALSE;
900      if(!appdata->settings) return FALSE;
901      return appdata->settings->no_icons;
902    }
903    
904    static gboolean enable_gps_get_toggle(appdata_t *appdata) {
905      if(!appdata)           return FALSE;
906      if(!appdata->settings) return FALSE;
907      return appdata->settings->enable_gps;
908    }
909    
910    static gboolean follow_gps_get_toggle(appdata_t *appdata) {
911      if(!appdata)           return FALSE;
912      if(!appdata->settings) return FALSE;
913      return appdata->settings->follow_gps;
914    }
915    
916    /* create a HildonAppMenu */
917    static GtkWidget *app_menu_create(appdata_t *appdata,
918                                      const menu_entry_t *menu_entries) {
919      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
920    
921      while(menu_entries->label) {
922        GtkWidget *button = NULL;
923    
924        if(!menu_entries->toggle) {
925          button = hildon_button_new_with_text(
926                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
927                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
928                _(menu_entries->label), _(menu_entries->value));
929          g_signal_connect_after(button, "clicked",
930                                 menu_entries->activate_cb, appdata);
931        } else {
932          button = hildon_check_button_new(HILDON_SIZE_AUTO);
933          gtk_button_set_label(GTK_BUTTON(button), _(menu_entries->label));
934          printf("requesting check for %s: %p\n", menu_entries->label,
935                 menu_entries->toggle);
936          hildon_check_button_set_active(HILDON_CHECK_BUTTON(button),
937                                         menu_entries->toggle(appdata));
938          g_signal_connect_after(button, "toggled",
939                                 menu_entries->activate_cb, appdata);
940        }
941    
942        /* offset to GtkWidget pointer was given -> store pointer */
943        if(menu_entries->offset)
944          *(GtkWidget**)(((void*)appdata)+menu_entries->offset) = button;
945    
946        gtk_widget_set_sensitive(button, menu_entries->enabled);
947    
948        hildon_app_menu_append(menu, GTK_BUTTON(button));
949        menu_entries++;
950      }
951    
952      gtk_widget_show_all(GTK_WIDGET(menu));
953      return GTK_WIDGET(menu);
954    }
955    
956    static void submenu_popup(GtkWidget *menu) {
957      GtkWidget *top = hildon_window_stack_peek(hildon_window_stack_get_default());
958    
959    #if 1
960      int start, end;
961      GTimeVal tv;
962      g_get_current_time(&tv);
963      start = tv.tv_sec * 1000 + tv.tv_usec / 1000;
964      do {
965        if(gtk_events_pending())
966          while(gtk_events_pending()) {
967            putchar('.'); fflush(stdout);
968            gtk_main_iteration();
969          }
970        else
971          usleep(100);
972    
973        g_get_current_time(&tv);
974        end = tv.tv_sec * 1000 + tv.tv_usec / 1000;
975      } while(end-start < 500);
976    #endif
977    
978    
979    
980      hildon_app_menu_popup(HILDON_APP_MENU(menu), GTK_WINDOW(top));
981    }
982    
983    /* the view submenu */
984    void on_submenu_view_clicked(GtkButton *button, appdata_t *appdata) {
985      submenu_popup(appdata->app_menu_view);
986    }
987    
988    void on_submenu_map_clicked(GtkButton *button, appdata_t *appdata) {
989      submenu_popup(appdata->app_menu_map);
990    }
991    
992    void on_submenu_wms_clicked(GtkButton *button, appdata_t *appdata) {
993      submenu_popup(appdata->app_menu_wms);
994    }
995    
996    void on_submenu_track_clicked(GtkButton *button, appdata_t *appdata) {
997      submenu_popup(appdata->app_menu_track);
998    }
999    
1000    #define APP_OFFSET(a)  offsetof(appdata_t, a)
1001    #define SIMPLE_ENTRY(a,b)     { a, NULL, TRUE,   NULL, 0, G_CALLBACK(b) }
1002    #define ENABLED_ENTRY(a,b,c)  { a, NULL, TRUE,  NULL, APP_OFFSET(c), G_CALLBACK(b) }
1003    #define DISABLED_ENTRY(a,b,c) { a, NULL, FALSE,  NULL, APP_OFFSET(c), G_CALLBACK(b) }
1004    #define TOGGLE_ENTRY(a,b,c)   { a, NULL, TRUE, c, 0, G_CALLBACK(b) }
1005    #define DISABLED_TOGGLE_ENTRY(a,b,c,d)  \
1006                                  { a, NULL, FALSE, c, APP_OFFSET(d), G_CALLBACK(b) }
1007    #define ENABLED_TOGGLE_ENTRY(a,b,c,d) \
1008                                  { a, NULL, TRUE, c, APP_OFFSET(d), G_CALLBACK(b) }
1009    #define LAST_ENTRY            { NULL, NULL, FALSE, NULL, 0, NULL }
1010    
1011    /* -- the view submenu -- */
1012    static const menu_entry_t submenu_view[] = {
1013    #ifndef ZOOM_BUTTONS
1014      SIMPLE_ENTRY("Zoom in",         cb_menu_zoomin),
1015      SIMPLE_ENTRY("Zoom out",        cb_menu_zoomout),
1016    #endif
1017      /* --- */
1018      SIMPLE_ENTRY("Style",           cb_menu_style),
1019      /* --- */
1020      SIMPLE_ENTRY("Normal details",  cb_menu_view_detail_normal),
1021      SIMPLE_ENTRY("More details",    cb_menu_view_detail_inc),
1022      SIMPLE_ENTRY("Less details",    cb_menu_view_detail_dec),
1023      /* --- */
1024      DISABLED_ENTRY("Hide selected", cb_menu_map_hide_sel, menu_item_map_hide_sel),
1025      DISABLED_ENTRY("Show all",      cb_menu_map_show_all, menu_item_map_show_all),
1026      /* --- */
1027      TOGGLE_ENTRY("No icons",        cb_menu_map_no_icons, no_icon_get_toggle),
1028    
1029      LAST_ENTRY
1030    };
1031    
1032    /* -- the map submenu -- */
1033    static const menu_entry_t submenu_map[] = {
1034      ENABLED_ENTRY("Upload",                cb_menu_upload, menu_item_map_upload),
1035      SIMPLE_ENTRY("Download",               cb_menu_download),
1036      ENABLED_ENTRY("Save local changes",    cb_menu_save_changes,
1037                                               menu_item_map_save_changes),
1038      ENABLED_ENTRY("Discard local changes", cb_menu_undo_changes,
1039                                               menu_item_map_undo_changes),
1040      ENABLED_ENTRY("Relations",             cb_menu_osm_relations,
1041                                               menu_item_map_relations),
1042    
1043      LAST_ENTRY
1044    };
1045    
1046    /* -- the wms submenu -- */
1047    static const menu_entry_t submenu_wms[] = {
1048      SIMPLE_ENTRY("Import",   cb_menu_wms_import),
1049      DISABLED_ENTRY("Clear",  cb_menu_wms_clear, menu_item_wms_clear),
1050      DISABLED_ENTRY("Adjust", cb_menu_wms_adjust, menu_item_wms_adjust),
1051    
1052      LAST_ENTRY
1053    };
1054    
1055    /* -- the track submenu -- */
1056    static const menu_entry_t submenu_track[] = {
1057      ENABLED_ENTRY("Import",  cb_menu_track_import, track.menu_item_track_import),
1058      DISABLED_ENTRY("Export", cb_menu_track_export, track.menu_item_track_export),
1059      DISABLED_ENTRY("Clear",  cb_menu_track_clear, track.menu_item_track_clear),
1060      ENABLED_TOGGLE_ENTRY("GPS enable", cb_menu_track_enable_gps,
1061                    enable_gps_get_toggle, track.menu_item_track_enable_gps),
1062      DISABLED_TOGGLE_ENTRY("GPS follow", cb_menu_track_follow_gps,
1063                    follow_gps_get_toggle, track.menu_item_track_follow_gps),
1064    
1065      LAST_ENTRY
1066    };
1067    
1068    
1069    /* -- the applications main menu -- */
1070    static const menu_entry_t main_menu[] = {
1071      SIMPLE_ENTRY("About",   cb_menu_about),
1072      SIMPLE_ENTRY("Project", cb_menu_project_open),
1073      ENABLED_ENTRY("View",   on_submenu_view_clicked,  submenu_view),
1074      ENABLED_ENTRY("Map",    on_submenu_map_clicked,   submenu_map),
1075      ENABLED_ENTRY("WMS",    on_submenu_wms_clicked,   submenu_wms),
1076      ENABLED_ENTRY("Track",  on_submenu_track_clicked, track.submenu_track),
1077    
1078      LAST_ENTRY
1079    };
1080    
1081    void menu_create(appdata_t *appdata) {
1082      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1083    
1084      /* build menu/submenus */
1085      menu = HILDON_APP_MENU(app_menu_create(appdata, main_menu));
1086      appdata->app_menu_wms   = app_menu_create(appdata, submenu_wms);
1087      g_object_ref(appdata->app_menu_wms);
1088      appdata->app_menu_map   = app_menu_create(appdata, submenu_map);
1089      g_object_ref(appdata->app_menu_map);
1090      appdata->app_menu_view  = app_menu_create(appdata, submenu_view);
1091      g_object_ref(appdata->app_menu_view);
1092      appdata->app_menu_track = app_menu_create(appdata, submenu_track);
1093      g_object_ref(appdata->app_menu_track);
1094    
1095      /* enable/disable some entries according to settings */
1096      if(appdata && appdata->settings)
1097        gtk_widget_set_sensitive(appdata->track.menu_item_track_follow_gps,
1098                                 appdata->settings->enable_gps);
1099    
1100      hildon_window_set_app_menu(HILDON_WINDOW(appdata->window), menu);
1101    }
1102    #endif
1103    
1104  /********************* end of menu **********************/  /********************* end of menu **********************/
1105    
# Line 978  void cleanup(appdata_t *appdata) { Line 1171  void cleanup(appdata_t *appdata) {
1171    
1172    project_free(appdata->project);    project_free(appdata->project);
1173    
1174    if(appdata->menu_item_osm_undo)    if(appdata->menu_item_map_undo)
1175      undo_free(appdata->undo.state);      undo_free(appdata->undo.state);
1176    
1177    puts("everything is gone");    puts("everything is gone");
# Line 996  gboolean on_window_key_press(GtkWidget * Line 1189  gboolean on_window_key_press(GtkWidget *
1189    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1190    int handled = FALSE;    int handled = FALSE;
1191    
1192      //  printf("key event with keyval %x\n", event->keyval);
1193    
1194    // the map handles some keys on its own ...    // the map handles some keys on its own ...
1195    switch(event->keyval) {    switch(event->keyval) {
1196    
1197    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
1198  #ifdef USE_HILDON  #ifdef USE_HILDON
1199      /* this is in fact a mapping to GDK_F6 */      /* this is in fact a mapping to GDK_F6 */
1200    case HILDON_HARDKEY_FULLSCREEN:    case HILDON_HARDKEY_FULLSCREEN:
# Line 1018  gboolean on_window_key_press(GtkWidget * Line 1214  gboolean on_window_key_press(GtkWidget *
1214    
1215      handled = TRUE;      handled = TRUE;
1216      break;      break;
1217    #endif
1218    }    }
1219    
1220    /* forward unprocessed key presses to map */    /* forward unprocessed key presses to map */
# Line 1065  int main(int argc, char *argv[]) { Line 1262  int main(int argc, char *argv[]) {
1262    g_set_application_name("OSM2Go");    g_set_application_name("OSM2Go");
1263    
1264    /* Create HildonWindow and set it to HildonProgram */    /* Create HildonWindow and set it to HildonProgram */
1265    #if MAEMO_VERSION_MAJOR < 5
1266    appdata.window = HILDON_WINDOW(hildon_window_new());    appdata.window = HILDON_WINDOW(hildon_window_new());
1267    #else
1268      appdata.window = HILDON_WINDOW(hildon_stackable_window_new());
1269    #endif
1270    hildon_program_add_window(appdata.program, appdata.window);    hildon_program_add_window(appdata.program, appdata.window);
1271    
1272    #if MAEMO_VERSION_MAJOR == 5
1273      unsigned long val;
1274      XChangeProperty(GDK_DISPLAY(),
1275                      GDK_WINDOW_XID(GTK_WIDGET(appdata.window)->window),
1276                      XInternAtom(GDK_DISPLAY(),
1277                                  "_HILDON_ZOOM_KEY_ATOM",
1278                                  False), XA_INTEGER, 32,
1279                      PropModeReplace, (unsigned char *) &val, 1);
1280    #endif
1281    
1282  #else  #else
1283    /* Create a Window. */    /* Create a Window. */
1284    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
# Line 1110  int main(int argc, char *argv[]) { Line 1322  int main(int argc, char *argv[]) {
1322    }    }
1323    
1324    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);
1325    
1326    #ifdef ZOOM_BUTTONS
1327      GtkWidget *zhbox = gtk_hbox_new(FALSE, 0);
1328    
1329      gtk_box_pack_start_defaults(GTK_BOX(zhbox), statusbar_new(&appdata));
1330    
1331      /* ---- add zoom out button right of statusbar ---- */
1332      appdata.btn_zoom_out = gtk_button_new();
1333      gtk_button_set_image(GTK_BUTTON(appdata.btn_zoom_out),
1334            gtk_image_new_from_stock(GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU));
1335      g_signal_connect(appdata.btn_zoom_out, "clicked",
1336                       G_CALLBACK(cb_menu_zoomout), &appdata);
1337      gtk_box_pack_start(GTK_BOX(zhbox), appdata.btn_zoom_out, FALSE, FALSE, 0);
1338    
1339      /* ---- add zoom in button right of statusbar ---- */
1340      appdata.btn_zoom_in = gtk_button_new();
1341      gtk_button_set_image(GTK_BUTTON(appdata.btn_zoom_in),
1342            gtk_image_new_from_stock(GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU));
1343      g_signal_connect(appdata.btn_zoom_in, "clicked",
1344                       G_CALLBACK(cb_menu_zoomin), &appdata);
1345      gtk_box_pack_start(GTK_BOX(zhbox), appdata.btn_zoom_in, FALSE, FALSE, 0);
1346    
1347    
1348      gtk_box_pack_start(GTK_BOX(vbox), zhbox, FALSE, FALSE, 0);
1349    #else
1350    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);
1351    #endif
1352    
1353  #ifndef PORTRAIT  #ifndef PORTRAIT
1354    gtk_box_pack_start(GTK_BOX(hbox), iconbar_new(&appdata), FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(hbox), iconbar_new(&appdata), FALSE, FALSE, 0);
1355  #endif  #endif
   //  gtk_box_pack_start(GTK_BOX(hbox), gtk_vseparator_new(), FALSE, FALSE, 0);  
1356    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
1357    
1358    gtk_box_pack_start(GTK_BOX(appdata.vbox), hbox, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(appdata.vbox), hbox, TRUE, TRUE, 0);
# Line 1145  int main(int argc, char *argv[]) { Line 1382  int main(int argc, char *argv[]) {
1382    while(gtk_events_pending())    while(gtk_events_pending())
1383      gtk_main_iteration();      gtk_main_iteration();
1384    
1385    #if 0  // test overlay
1386      {
1387        GtkWidget *overlay = gtk_window_new(GTK_WINDOW_POPUP);
1388        gtk_window_set_default_size(GTK_WINDOW(overlay), 40, 20);
1389        gtk_window_set_transient_for(GTK_WINDOW(overlay), GTK_WINDOW(appdata.window));
1390        gtk_window_set_keep_above(GTK_WINDOW(overlay), TRUE);
1391        gtk_window_set_destroy_with_parent(GTK_WINDOW(overlay), TRUE);
1392        gtk_window_set_position(GTK_WINDOW(overlay), GTK_WIN_POS_CENTER_ON_PARENT);
1393    
1394        gtk_window_set_gravity(GTK_WINDOW(overlay), GDK_GRAVITY_NORTH_EAST);
1395    
1396        printf("x = %d\n", gdk_screen_width() - overlay->allocation.width);
1397        gtk_window_move(GTK_WINDOW(overlay),
1398                        gdk_screen_width() - overlay->allocation.width, 60);
1399    
1400        gtk_window_set_decorated(GTK_WINDOW(overlay), TRUE);
1401    
1402        /* add some zoom buttons for testing */
1403        GtkWidget *hbox = gtk_hbox_new(TRUE, 0);
1404        gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_button_new_with_label("+"));
1405        gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_button_new_with_label("-"));
1406        gtk_container_add(GTK_CONTAINER(overlay), hbox);
1407    
1408        gtk_widget_show_all(overlay);
1409      }
1410    #endif
1411    
1412    /* start to interact with the user now that the gui is running */    /* start to interact with the user now that the gui is running */
1413    if(appdata.settings->first_run_demo) {    if(appdata.settings->first_run_demo) {
1414      messagef(GTK_WIDGET(appdata.window), _("Welcome to OSM2Go"),      messagef(GTK_WIDGET(appdata.window), _("Welcome to OSM2Go"),
Legend:
Removed from v.179  
changed lines
  Added in v.231