Diff of /trunk/src/main.c

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

revision 188 by harbaum, Mon Jul 6 14:06:59 2009 UTC revision 241 by harbaum, Thu Jul 23 19:23:22 2009 UTC
# Line 27  Line 27 
27  #include <hildon/hildon-button.h>  #include <hildon/hildon-button.h>
28  #include <hildon/hildon-check-button.h>  #include <hildon/hildon-check-button.h>
29  #include <hildon/hildon-window-stack.h>  #include <hildon/hildon-window-stack.h>
30    #include <gdk/gdkx.h>
31    #include <X11/Xatom.h>
32  #endif  #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 49  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 - %s", 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->submenu_map, project_valid);    gtk_widget_set_sensitive(appdata->submenu_map, project_valid);
77    gtk_widget_set_sensitive(appdata->menu_item_map_upload, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_upload, osm_valid);
# Line 73  static void main_ui_enable(appdata_t *ap Line 84  static void main_ui_enable(appdata_t *ap
84    gtk_widget_set_sensitive(appdata->submenu_view, osm_valid);    gtk_widget_set_sensitive(appdata->submenu_view, osm_valid);
85    gtk_widget_set_sensitive(appdata->submenu_wms, osm_valid);    gtk_widget_set_sensitive(appdata->submenu_wms, osm_valid);
86    
87    #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);
94  }  }
# Line 99  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 268  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)
# Line 587  void menu_create(appdata_t *appdata) { Line 606  void menu_create(appdata_t *appdata) {
606    /* -------------------- Project submenu -------------------- */    /* -------------------- Project submenu -------------------- */
607    
608    GtkAccelGroup *accel_grp = gtk_accel_group_new();    GtkAccelGroup *accel_grp = gtk_accel_group_new();
609    
610    #ifndef USE_HILDON
611    item = gtk_menu_item_new_with_mnemonic( _("_Project") );    item = gtk_menu_item_new_with_mnemonic( _("_Project") );
612    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
613    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 607  void menu_create(appdata_t *appdata) { Line 628  void menu_create(appdata_t *appdata) {
628      GTK_STOCK_NEW, "<OSM2Go-Main>/Project/Wizard",      GTK_STOCK_NEW, "<OSM2Go-Main>/Project/Wizard",
629      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
630    );    );
631    #else
632      menu_append_new_item(
633        appdata, menu, GTK_SIGNAL_FUNC(cb_menu_project_open), _("_Project"),
634        GTK_STOCK_OPEN, "<OSM2Go-Main>/Project",
635        0, 0, TRUE, FALSE, FALSE
636      );
637    #endif
638    
639    /* --------------- view menu ------------------- */    /* --------------- view menu ------------------- */
640    
# Line 614  void menu_create(appdata_t *appdata) { Line 642  void menu_create(appdata_t *appdata) {
642    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());
643  #endif  #endif
644    
645    appdata->menu_view = item = gtk_menu_item_new_with_mnemonic( _("_View") );    appdata->submenu_view = item = gtk_menu_item_new_with_mnemonic( _("_View") );
646    gtk_menu_shell_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);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
# Line 628  void menu_create(appdata_t *appdata) { Line 656  void menu_create(appdata_t *appdata) {
656    );    );
657  #endif  #endif
658    
659    #if !defined(ZOOM_BUTTONS) || !defined(USE_HILDON)
660    menu_append_new_item(    menu_append_new_item(
661      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),
662      GTK_STOCK_ZOOM_IN, "<OSM2Go-Main>/View/ZoomIn",      GTK_STOCK_ZOOM_IN, "<OSM2Go-Main>/View/ZoomIn",
# Line 639  void menu_create(appdata_t *appdata) { Line 668  void menu_create(appdata_t *appdata) {
668      GTK_STOCK_ZOOM_OUT, "<OSM2Go-Main>/View/ZoomOut",      GTK_STOCK_ZOOM_OUT, "<OSM2Go-Main>/View/ZoomOut",
669      GDK_period, GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_period, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
670    );    );
671    #endif
672    
673    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());
674    
# Line 664  void menu_create(appdata_t *appdata) { Line 694  void menu_create(appdata_t *appdata) {
694    
695    appdata->menu_item_map_hide_sel = menu_append_new_item(    appdata->menu_item_map_hide_sel = menu_append_new_item(
696      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_hide_sel), _("_Hide selected"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_hide_sel), _("_Hide selected"),
697      GTK_STOCK_REMOVE, "<OSM2Go-Main>/Map/HideSelected",      GTK_STOCK_REMOVE, "<OSM2Go-Main>/View/HideSelected",
698      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
699    );    );
700    gtk_widget_set_sensitive(appdata->menu_item_map_hide_sel, FALSE);    gtk_widget_set_sensitive(appdata->menu_item_map_hide_sel, FALSE);
701    
702    appdata->menu_item_map_show_all = menu_append_new_item(    appdata->menu_item_map_show_all = menu_append_new_item(
703      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_show_all), _("_Show all"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_show_all), _("_Show all"),
704      GTK_STOCK_ADD, "<OSM2Go-Main>/Map/ShowAll",      GTK_STOCK_ADD, "<OSM2Go-Main>/View/ShowAll",
705      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
706    );    );
707    gtk_widget_set_sensitive(appdata->menu_item_map_show_all, FALSE);    gtk_widget_set_sensitive(appdata->menu_item_map_show_all, FALSE);
# Line 680  void menu_create(appdata_t *appdata) { Line 710  void menu_create(appdata_t *appdata) {
710    
711    menu_append_new_item(    menu_append_new_item(
712      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_style), _("St_yle"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_style), _("St_yle"),
713      GTK_STOCK_SELECT_COLOR, "<OSM2Go-Main>/Map/Style",      GTK_STOCK_SELECT_COLOR, "<OSM2Go-Main>/View/Style",
714      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
715    );    );
716    
# Line 688  void menu_create(appdata_t *appdata) { Line 718  void menu_create(appdata_t *appdata) {
718    
719    appdata->menu_item_map_no_icons = menu_append_new_item(    appdata->menu_item_map_no_icons = menu_append_new_item(
720      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_icons), _("No _icons"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_icons), _("No _icons"),
721      NULL, "<OSM2Go-Main>/Map/NoIcons",      NULL, "<OSM2Go-Main>/View/NoIcons",
722      0, 0, TRUE, TRUE, appdata->settings->no_icons      0, 0, TRUE, TRUE, appdata->settings->no_icons
723    );    );
724    
725    
726    /* -------------------- map submenu -------------------- */    /* -------------------- map submenu -------------------- */
727    
728    appdata->menu_map = item = gtk_menu_item_new_with_mnemonic( _("_Map") );    appdata->submenu_map = item = gtk_menu_item_new_with_mnemonic( _("_Map") );
729    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
730    submenu = gtk_menu_new();    submenu = gtk_menu_new();
731    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
732    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
733    
734    appdata->menu_item_osm_upload = menu_append_new_item(    appdata->menu_item_map_upload = menu_append_new_item(
735      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload"),
736      "upload.16", "<OSM2Go-Main>/OSM/Upload",      "upload.16", "<OSM2Go-Main>/Map/Upload",
737      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
738    );    );
739    
740    menu_append_new_item(    menu_append_new_item(
741      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download"),
742      "download.16", "<OSM2Go-Main>/OSM/Download",      "download.16", "<OSM2Go-Main>/Map/Download",
743      GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
744    );    );
745    
746    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());
747    
748    if(getenv("OSM2GO_UNDO_TEST")) {    if(getenv("OSM2GO_UNDO_TEST")) {
749      appdata->menu_item_osm_undo = menu_append_new_item(      appdata->menu_item_map_undo = menu_append_new_item(
750                 appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo), _("_Undo"),                 appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo), _("_Undo"),
751                 GTK_STOCK_UNDO, "<OSM2Go-Main>/OSM/Undo",                 GTK_STOCK_UNDO, "<OSM2Go-Main>/Map/Undo",
752                 GDK_z, GDK_CONTROL_MASK, TRUE, FALSE, FALSE                 GDK_z, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
753                 );                 );
754    } else    } else
755      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");
756    
757    appdata->menu_item_osm_save_changes = menu_append_new_item(    appdata->menu_item_map_save_changes = menu_append_new_item(
758      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),
759      GTK_STOCK_SAVE, "<OSM2Go-Main>/OSM/SaveChanges",      GTK_STOCK_SAVE, "<OSM2Go-Main>/Map/SaveChanges",
760      GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
761    );    );
762    
763    appdata->menu_item_osm_undo_changes = menu_append_new_item(    appdata->menu_item_map_undo_changes = menu_append_new_item(
764      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"),
765      GTK_STOCK_DELETE, "<OSM2Go-Main>/OSM/DiscardChanges",      GTK_STOCK_DELETE, "<OSM2Go-Main>/Map/DiscardChanges",
766      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
767    );    );
768    
769    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());
770    appdata->menu_item_osm_relations = menu_append_new_item(    appdata->menu_item_map_relations = menu_append_new_item(
771      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations"),
772      NULL, "<OSM2Go-Main>/OSM/Relations",      NULL, "<OSM2Go-Main>/Map/Relations",
773      GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
774    );    );
775    
776    /* -------------------- wms submenu -------------------- */    /* -------------------- wms submenu -------------------- */
777    
778    appdata->menu_wms = item = gtk_menu_item_new_with_mnemonic( _("_WMS") );    appdata->submenu_wms = item = gtk_menu_item_new_with_mnemonic( _("_WMS") );
779    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
780    submenu = gtk_menu_new();    submenu = gtk_menu_new();
781    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 803  void menu_create(appdata_t *appdata) {
803    
804    /* -------------------- track submenu -------------------- */    /* -------------------- track submenu -------------------- */
805    
806    appdata->track.menu_track = item = gtk_menu_item_new_with_mnemonic(_("_Track"));    appdata->track.submenu_track = item =
807        gtk_menu_item_new_with_mnemonic(_("_Track"));
808    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
809    submenu = gtk_menu_new();    submenu = gtk_menu_new();
810    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
811    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
812    
813    appdata->track.menu_item_import = menu_append_new_item(    appdata->track.menu_item_track_import = menu_append_new_item(
814      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import"),
815      NULL, "<OSM2Go-Main>/Track/Import",      NULL, "<OSM2Go-Main>/Track/Import",
816      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
817    );    );
818    
819    appdata->track.menu_item_export = menu_append_new_item(    appdata->track.menu_item_track_export = menu_append_new_item(
820      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export"),
821      NULL, "<OSM2Go-Main>/Track/Export",      NULL, "<OSM2Go-Main>/Track/Export",
822      0, 0, FALSE, FALSE, FALSE      0, 0, FALSE, FALSE, FALSE
823    );    );
824    
825    appdata->track.menu_item_clear = menu_append_new_item(    appdata->track.menu_item_track_clear = menu_append_new_item(
826      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_clear), _("_Clear"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_clear), _("_Clear"),
827      GTK_STOCK_CLEAR, "<OSM2Go-Main>/Track/Clear",      GTK_STOCK_CLEAR, "<OSM2Go-Main>/Track/Clear",
828      0, 0, FALSE, FALSE, FALSE      0, 0, FALSE, FALSE, FALSE
829    );    );
830    
831    
832    appdata->track.menu_item_enable_gps = menu_append_new_item(    appdata->track.menu_item_track_enable_gps = menu_append_new_item(
833      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_enable_gps),_("_GPS enable"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_enable_gps),_("_GPS enable"),
834      NULL, "<OSM2Go-Main>/Track/GPS",      NULL, "<OSM2Go-Main>/Track/GPS",
835      GDK_g, GDK_CONTROL_MASK|GDK_SHIFT_MASK, TRUE, TRUE,      GDK_g, GDK_CONTROL_MASK|GDK_SHIFT_MASK, TRUE, TRUE,
836      appdata->settings->enable_gps      appdata->settings->enable_gps
837    );    );
838    
839    appdata->track.menu_item_follow_gps = menu_append_new_item(    appdata->track.menu_item_track_follow_gps = menu_append_new_item(
840      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_follow_gps), _("GPS follow"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_follow_gps), _("GPS follow"),
841      NULL, "<OSM2Go-Main>/Track/Follow",      NULL, "<OSM2Go-Main>/Track/Follow",
842      0, 0, appdata->settings->enable_gps, TRUE,      0, 0, appdata->settings->enable_gps, TRUE,
# Line 877  static gboolean no_icon_get_toggle(appda Line 908  static gboolean no_icon_get_toggle(appda
908    return appdata->settings->no_icons;    return appdata->settings->no_icons;
909  }  }
910    
911    static gboolean enable_gps_get_toggle(appdata_t *appdata) {
912      if(!appdata)           return FALSE;
913      if(!appdata->settings) return FALSE;
914      return appdata->settings->enable_gps;
915    }
916    
917    static gboolean follow_gps_get_toggle(appdata_t *appdata) {
918      if(!appdata)           return FALSE;
919      if(!appdata->settings) return FALSE;
920      return appdata->settings->follow_gps;
921    }
922    
923  /* create a HildonAppMenu */  /* create a HildonAppMenu */
924  static GtkWidget *app_menu_create(appdata_t *appdata, const menu_entry_t *menu_entries) {  static GtkWidget *app_menu_create(appdata_t *appdata,
925                                      const menu_entry_t *menu_entries) {
926    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
927    
928    while(menu_entries->label) {    while(menu_entries->label) {
# Line 888  static GtkWidget *app_menu_create(appdat Line 932  static GtkWidget *app_menu_create(appdat
932        button = hildon_button_new_with_text(        button = hildon_button_new_with_text(
933              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
934              HILDON_BUTTON_ARRANGEMENT_VERTICAL,              HILDON_BUTTON_ARRANGEMENT_VERTICAL,
935              _(menu_entries->label), menu_entries->value);              _(menu_entries->label), _(menu_entries->value));
936        g_signal_connect_after(button, "clicked", menu_entries->activate_cb, appdata);        g_signal_connect_after(button, "clicked",
937                                 menu_entries->activate_cb, appdata);
938      } else {      } else {
939        button = hildon_check_button_new(HILDON_SIZE_AUTO);        button = hildon_check_button_new(HILDON_SIZE_AUTO);
940        gtk_button_set_label(GTK_BUTTON(button), _(menu_entries->label));        gtk_button_set_label(GTK_BUTTON(button), _(menu_entries->label));
941          printf("requesting check for %s: %p\n", menu_entries->label,
942                 menu_entries->toggle);
943        hildon_check_button_set_active(HILDON_CHECK_BUTTON(button),        hildon_check_button_set_active(HILDON_CHECK_BUTTON(button),
944                                       menu_entries->toggle(appdata));                                       menu_entries->toggle(appdata));
945        g_signal_connect_after(button, "toggled", menu_entries->activate_cb, appdata);        g_signal_connect_after(button, "toggled",
946                                 menu_entries->activate_cb, appdata);
947      }      }
948    
949      /* offset to GtkWidget pointer was given -> store pointer */      /* offset to GtkWidget pointer was given -> store pointer */
# Line 912  static GtkWidget *app_menu_create(appdat Line 960  static GtkWidget *app_menu_create(appdat
960    return GTK_WIDGET(menu);    return GTK_WIDGET(menu);
961  }  }
962    
963    static void submenu_popup(GtkWidget *menu) {
964      GtkWidget *top = hildon_window_stack_peek(hildon_window_stack_get_default());
965    
966    #if 1
967      int start, end;
968      GTimeVal tv;
969      g_get_current_time(&tv);
970      start = tv.tv_sec * 1000 + tv.tv_usec / 1000;
971      do {
972        if(gtk_events_pending())
973          while(gtk_events_pending()) {
974            putchar('.'); fflush(stdout);
975            gtk_main_iteration();
976          }
977        else
978          usleep(100);
979    
980        g_get_current_time(&tv);
981        end = tv.tv_sec * 1000 + tv.tv_usec / 1000;
982      } while(end-start < 500);
983    #endif
984    
985    
986    
987      hildon_app_menu_popup(HILDON_APP_MENU(menu), GTK_WINDOW(top));
988    }
989    
990  /* the view submenu */  /* the view submenu */
991  void on_submenu_view_clicked(GtkButton *button, appdata_t *appdata) {  void on_submenu_view_clicked(GtkButton *button, appdata_t *appdata) {
992    /* draw a popup menu. */    submenu_popup(appdata->app_menu_view);
993    hildon_app_menu_popup(HILDON_APP_MENU(appdata->submenu_view),  }
994                          GTK_WINDOW(appdata->window));  
995    void on_submenu_map_clicked(GtkButton *button, appdata_t *appdata) {
996      submenu_popup(appdata->app_menu_map);
997  }  }
998    
999  void on_submenu_wms_clicked(GtkButton *button, appdata_t *appdata) {  void on_submenu_wms_clicked(GtkButton *button, appdata_t *appdata) {
1000    /* draw a popup menu. */    submenu_popup(appdata->app_menu_wms);
1001    hildon_app_menu_popup(HILDON_APP_MENU(appdata->submenu_wms),  }
1002                          GTK_WINDOW(appdata->window));  
1003    void on_submenu_track_clicked(GtkButton *button, appdata_t *appdata) {
1004      submenu_popup(appdata->app_menu_track);
1005  }  }
1006    
 /* -- the view submenu -- */  
1007  #define APP_OFFSET(a)  offsetof(appdata_t, a)  #define APP_OFFSET(a)  offsetof(appdata_t, a)
1008  #define SIMPLE_ENTRY(a,b)     { a, NULL, TRUE,   NULL, 0, G_CALLBACK(b) }  #define SIMPLE_ENTRY(a,b)     { a, NULL, TRUE,   NULL, 0, G_CALLBACK(b) }
1009    #define ENABLED_ENTRY(a,b,c)  { a, NULL, TRUE,  NULL, APP_OFFSET(c), G_CALLBACK(b) }
1010  #define DISABLED_ENTRY(a,b,c) { a, NULL, FALSE,  NULL, APP_OFFSET(c), G_CALLBACK(b) }  #define DISABLED_ENTRY(a,b,c) { a, NULL, FALSE,  NULL, APP_OFFSET(c), G_CALLBACK(b) }
1011    #define TOGGLE_ENTRY(a,b,c)   { a, NULL, TRUE, c, 0, G_CALLBACK(b) }
1012    #define DISABLED_TOGGLE_ENTRY(a,b,c,d)  \
1013                                  { a, NULL, FALSE, c, APP_OFFSET(d), G_CALLBACK(b) }
1014    #define ENABLED_TOGGLE_ENTRY(a,b,c,d) \
1015                                  { a, NULL, TRUE, c, APP_OFFSET(d), G_CALLBACK(b) }
1016  #define LAST_ENTRY            { NULL, NULL, FALSE, NULL, 0, NULL }  #define LAST_ENTRY            { NULL, NULL, FALSE, NULL, 0, NULL }
1017    
1018    /* -- the view submenu -- */
1019  static const menu_entry_t submenu_view[] = {  static const menu_entry_t submenu_view[] = {
1020    #ifndef ZOOM_BUTTONS
1021    SIMPLE_ENTRY("Zoom in",         cb_menu_zoomin),    SIMPLE_ENTRY("Zoom in",         cb_menu_zoomin),
1022    SIMPLE_ENTRY("Zoom out",        cb_menu_zoomout),    SIMPLE_ENTRY("Zoom out",        cb_menu_zoomout),
1023    #endif
1024    /* --- */    /* --- */
1025    SIMPLE_ENTRY("Style",           cb_menu_style),    SIMPLE_ENTRY("Style",           cb_menu_style),
1026    /* --- */    /* --- */
# Line 944  static const menu_entry_t submenu_view[] Line 1031  static const menu_entry_t submenu_view[]
1031    DISABLED_ENTRY("Hide selected", cb_menu_map_hide_sel, menu_item_map_hide_sel),    DISABLED_ENTRY("Hide selected", cb_menu_map_hide_sel, menu_item_map_hide_sel),
1032    DISABLED_ENTRY("Show all",      cb_menu_map_show_all, menu_item_map_show_all),    DISABLED_ENTRY("Show all",      cb_menu_map_show_all, menu_item_map_show_all),
1033    /* --- */    /* --- */
1034    { "No icons",       NULL, TRUE,  no_icon_get_toggle, 0, G_CALLBACK(cb_menu_map_no_icons) },    TOGGLE_ENTRY("No icons",        cb_menu_map_no_icons, no_icon_get_toggle),
1035    
1036      LAST_ENTRY
1037    };
1038    
1039    /* -- the map submenu -- */
1040    static const menu_entry_t submenu_map[] = {
1041      ENABLED_ENTRY("Upload",                cb_menu_upload, menu_item_map_upload),
1042      SIMPLE_ENTRY("Download",               cb_menu_download),
1043      ENABLED_ENTRY("Save local changes",    cb_menu_save_changes,
1044                                               menu_item_map_save_changes),
1045      ENABLED_ENTRY("Discard local changes", cb_menu_undo_changes,
1046                                               menu_item_map_undo_changes),
1047      ENABLED_ENTRY("Relations",             cb_menu_osm_relations,
1048                                               menu_item_map_relations),
1049    
1050    LAST_ENTRY    LAST_ENTRY
1051  };  };
# Line 958  static const menu_entry_t submenu_wms[] Line 1059  static const menu_entry_t submenu_wms[]
1059    LAST_ENTRY    LAST_ENTRY
1060  };  };
1061    
1062  void menu_create(appdata_t *appdata) {  /* -- the track submenu -- */
1063    GtkWidget *button;  static const menu_entry_t submenu_track[] = {
1064    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    ENABLED_ENTRY("Import",  cb_menu_track_import, track.menu_item_track_import),
1065      DISABLED_ENTRY("Export", cb_menu_track_export, track.menu_item_track_export),
1066      DISABLED_ENTRY("Clear",  cb_menu_track_clear, track.menu_item_track_clear),
1067      ENABLED_TOGGLE_ENTRY("GPS enable", cb_menu_track_enable_gps,
1068                    enable_gps_get_toggle, track.menu_item_track_enable_gps),
1069      DISABLED_TOGGLE_ENTRY("GPS follow", cb_menu_track_follow_gps,
1070                    follow_gps_get_toggle, track.menu_item_track_follow_gps),
1071    
1072    /* build submenus */    LAST_ENTRY
1073    appdata->submenu_wms = app_menu_create(appdata, submenu_wms);  };
   appdata->submenu_view = app_menu_create(appdata, submenu_view);  
   
   /* ------- */  
   button = gtk_button_new_with_label(_("About"));  
   g_signal_connect_after(button, "clicked",  
                          G_CALLBACK(cb_menu_about), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
   
   button = gtk_button_new_with_label(_("View"));  
   g_signal_connect_after(button, "clicked",  
                          G_CALLBACK(on_submenu_view_clicked), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
   
   button = gtk_button_new_with_label(_("WMS"));  
   g_signal_connect_after(button, "clicked",  
                          G_CALLBACK(on_submenu_wms_clicked), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1074    
1075    
1076    /* -- the applications main menu -- */
1077    static const menu_entry_t main_menu[] = {
1078      SIMPLE_ENTRY("About",   cb_menu_about),
1079      SIMPLE_ENTRY("Project", cb_menu_project_open),
1080      ENABLED_ENTRY("View",   on_submenu_view_clicked,  submenu_view),
1081      ENABLED_ENTRY("Map",    on_submenu_map_clicked,   submenu_map),
1082      ENABLED_ENTRY("WMS",    on_submenu_wms_clicked,   submenu_wms),
1083      ENABLED_ENTRY("Track",  on_submenu_track_clicked, track.submenu_track),
1084    
1085    gtk_widget_show_all(GTK_WIDGET(menu));    LAST_ENTRY
1086    hildon_window_set_app_menu(HILDON_WINDOW(appdata->window), menu);  };
1087    
1088    void menu_create(appdata_t *appdata) {
1089      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1090    
1091      /* build menu/submenus */
1092      menu = HILDON_APP_MENU(app_menu_create(appdata, main_menu));
1093      appdata->app_menu_wms   = app_menu_create(appdata, submenu_wms);
1094      g_object_ref(appdata->app_menu_wms);
1095      appdata->app_menu_map   = app_menu_create(appdata, submenu_map);
1096      g_object_ref(appdata->app_menu_map);
1097      appdata->app_menu_view  = app_menu_create(appdata, submenu_view);
1098      g_object_ref(appdata->app_menu_view);
1099      appdata->app_menu_track = app_menu_create(appdata, submenu_track);
1100      g_object_ref(appdata->app_menu_track);
1101    
1102      /* enable/disable some entries according to settings */
1103      if(appdata && appdata->settings)
1104        gtk_widget_set_sensitive(appdata->track.menu_item_track_follow_gps,
1105                                 appdata->settings->enable_gps);
1106    
1107      hildon_window_set_app_menu(HILDON_WINDOW(appdata->window), menu);
1108  }  }
1109  #endif  #endif
1110    
# Line 1060  void cleanup(appdata_t *appdata) { Line 1179  void cleanup(appdata_t *appdata) {
1179    project_free(appdata->project);    project_free(appdata->project);
1180    
1181    if(appdata->menu_item_map_undo)    if(appdata->menu_item_map_undo)
1182      undo_free(appdata->undo.state);      undo_free(appdata->osm, appdata->undo.state);
1183    
1184    puts("everything is gone");    puts("everything is gone");
1185  }  }
# Line 1077  gboolean on_window_key_press(GtkWidget * Line 1196  gboolean on_window_key_press(GtkWidget *
1196    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1197    int handled = FALSE;    int handled = FALSE;
1198    
1199      //  printf("key event with keyval %x\n", event->keyval);
1200    
1201    // the map handles some keys on its own ...    // the map handles some keys on its own ...
1202    switch(event->keyval) {    switch(event->keyval) {
1203    
# Line 1148  int main(int argc, char *argv[]) { Line 1269  int main(int argc, char *argv[]) {
1269    g_set_application_name("OSM2Go");    g_set_application_name("OSM2Go");
1270    
1271    /* Create HildonWindow and set it to HildonProgram */    /* Create HildonWindow and set it to HildonProgram */
1272    #if MAEMO_VERSION_MAJOR < 5
1273    appdata.window = HILDON_WINDOW(hildon_window_new());    appdata.window = HILDON_WINDOW(hildon_window_new());
1274    #else
1275      appdata.window = HILDON_WINDOW(hildon_stackable_window_new());
1276    #endif
1277    hildon_program_add_window(appdata.program, appdata.window);    hildon_program_add_window(appdata.program, appdata.window);
1278    
1279    #if MAEMO_VERSION_MAJOR == 5
1280      unsigned long val = False;
1281      XChangeProperty(GDK_DISPLAY(),
1282                      GDK_WINDOW_XID(GTK_WIDGET(appdata.window)->window),
1283                      XInternAtom(GDK_DISPLAY(),
1284                                  "_HILDON_ZOOM_KEY_ATOM",
1285                                  False), XA_INTEGER, 32,
1286                      PropModeReplace, (unsigned char *) &val, 1);
1287    #endif
1288    
1289  #else  #else
1290    /* Create a Window. */    /* Create a Window. */
1291    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
# Line 1192  int main(int argc, char *argv[]) { Line 1328  int main(int argc, char *argv[]) {
1328      return -1;      return -1;
1329    }    }
1330    
1331  #if 0  // another test overlay    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);
   {  
     GtkWidget *fixed = gtk_fixed_new();  
1332    
1333      gtk_fixed_put(GTK_FIXED(fixed), gtk_label_new("Nase"), 0,0);  #ifdef ZOOM_BUTTONS
1334      gtk_fixed_put(GTK_FIXED(fixed), map, 0,0);    GtkWidget *zhbox = gtk_hbox_new(FALSE, 0);
1335    
1336      gtk_box_pack_start(GTK_BOX(vbox), fixed, TRUE, TRUE, 0);    gtk_box_pack_start_defaults(GTK_BOX(zhbox), statusbar_new(&appdata));
1337    }  
1338  #else    /* ---- add zoom out button right of statusbar ---- */
1339    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);    appdata.btn_zoom_out = gtk_button_new();
1340  #endif    gtk_button_set_image(GTK_BUTTON(appdata.btn_zoom_out),
1341            gtk_image_new_from_stock(GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU));
1342      g_signal_connect(appdata.btn_zoom_out, "clicked",
1343                       G_CALLBACK(cb_menu_zoomout), &appdata);
1344      gtk_box_pack_start(GTK_BOX(zhbox), appdata.btn_zoom_out, FALSE, FALSE, 0);
1345    
1346      /* ---- add zoom in button right of statusbar ---- */
1347      appdata.btn_zoom_in = gtk_button_new();
1348      gtk_button_set_image(GTK_BUTTON(appdata.btn_zoom_in),
1349            gtk_image_new_from_stock(GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU));
1350      g_signal_connect(appdata.btn_zoom_in, "clicked",
1351                       G_CALLBACK(cb_menu_zoomin), &appdata);
1352      gtk_box_pack_start(GTK_BOX(zhbox), appdata.btn_zoom_in, FALSE, FALSE, 0);
1353    
1354    
1355      gtk_box_pack_start(GTK_BOX(vbox), zhbox, FALSE, FALSE, 0);
1356    #else
1357    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);
1358    #endif
1359    
1360  #ifndef PORTRAIT  #ifndef PORTRAIT
1361    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);
# Line 1247  int main(int argc, char *argv[]) { Line 1397  int main(int argc, char *argv[]) {
1397      gtk_window_set_keep_above(GTK_WINDOW(overlay), TRUE);      gtk_window_set_keep_above(GTK_WINDOW(overlay), TRUE);
1398      gtk_window_set_destroy_with_parent(GTK_WINDOW(overlay), TRUE);      gtk_window_set_destroy_with_parent(GTK_WINDOW(overlay), TRUE);
1399      gtk_window_set_position(GTK_WINDOW(overlay), GTK_WIN_POS_CENTER_ON_PARENT);      gtk_window_set_position(GTK_WINDOW(overlay), GTK_WIN_POS_CENTER_ON_PARENT);
1400    
1401        gtk_window_set_gravity(GTK_WINDOW(overlay), GDK_GRAVITY_NORTH_EAST);
1402    
1403        printf("x = %d\n", gdk_screen_width() - overlay->allocation.width);
1404        gtk_window_move(GTK_WINDOW(overlay),
1405                        gdk_screen_width() - overlay->allocation.width, 60);
1406    
1407      gtk_window_set_decorated(GTK_WINDOW(overlay), TRUE);      gtk_window_set_decorated(GTK_WINDOW(overlay), TRUE);
1408    
1409      /* add some zoom buttons for testing */      /* add some zoom buttons for testing */
Legend:
Removed from v.188  
changed lines
  Added in v.241