Diff of /trunk/src/main.c

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

revision 242 by harbaum, Fri Jul 24 09:48:42 2009 UTC revision 244 by harbaum, Fri Jul 24 19:24:07 2009 UTC
# Line 77  void main_ui_enable(appdata_t *appdata) Line 77  void main_ui_enable(appdata_t *appdata)
77    gtk_widget_set_sensitive(appdata->menu_item_map_upload, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_upload, osm_valid);
78    if(appdata->menu_item_map_undo)    if(appdata->menu_item_map_undo)
79      gtk_widget_set_sensitive(appdata->menu_item_map_undo, osm_valid);      gtk_widget_set_sensitive(appdata->menu_item_map_undo, osm_valid);
80    gtk_widget_set_sensitive(appdata->menu_item_map_save_changes, osm_valid);    if(appdata->menu_item_map_save_changes)
81        gtk_widget_set_sensitive(appdata->menu_item_map_save_changes, osm_valid);
82    gtk_widget_set_sensitive(appdata->menu_item_map_undo_changes, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_undo_changes, osm_valid);
83    gtk_widget_set_sensitive(appdata->menu_item_map_relations, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_relations, osm_valid);
84    gtk_widget_set_sensitive(appdata->track.submenu_track, osm_valid);    gtk_widget_set_sensitive(appdata->track.submenu_track, osm_valid);
# Line 754  void menu_create(appdata_t *appdata) { Line 755  void menu_create(appdata_t *appdata) {
755    } else    } else
756      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");
757    
758    #ifndef USE_HILDON
759    appdata->menu_item_map_save_changes = menu_append_new_item(    appdata->menu_item_map_save_changes = menu_append_new_item(
760      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),
761      GTK_STOCK_SAVE, "<OSM2Go-Main>/Map/SaveChanges",      GTK_STOCK_SAVE, "<OSM2Go-Main>/Map/SaveChanges",
762      GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
763    );    );
764    #endif
765    
766    appdata->menu_item_map_undo_changes = menu_append_new_item(    appdata->menu_item_map_undo_changes = menu_append_new_item(
767      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo_changes), _("Undo _all"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo_changes), _("Undo _all"),
# Line 1139  static const menu_entry_t submenu_view_e Line 1142  static const menu_entry_t submenu_view_e
1142  };  };
1143    
1144  static const submenu_t submenu_view = {  static const submenu_t submenu_view = {
1145    "View", submenu_view_entries, sizeof(submenu_view_entries)/sizeof(menu_entry_t)    "View", submenu_view_entries,
1146      sizeof(submenu_view_entries)/sizeof(menu_entry_t)-1
1147  };  };
1148    
1149  /* -- the map submenu -- */  /* -- the map submenu -- */
1150  static const menu_entry_t submenu_map_entries[] = {  static const menu_entry_t submenu_map_entries[] = {
1151    ENABLED_ENTRY("Upload",                cb_menu_upload, menu_item_map_upload),    ENABLED_ENTRY("Upload",                cb_menu_upload, menu_item_map_upload),
1152    SIMPLE_ENTRY("Download",               cb_menu_download),    SIMPLE_ENTRY("Download",               cb_menu_download),
1153    ENABLED_ENTRY("Save changes",          cb_menu_save_changes,    //  ENABLED_ENTRY("Save changes",          cb_menu_save_changes,
1154                  menu_item_map_save_changes),    //            menu_item_map_save_changes),
1155    ENABLED_ENTRY("Undo all",              cb_menu_undo_changes,    ENABLED_ENTRY("Undo all",              cb_menu_undo_changes,
1156                  menu_item_map_undo_changes),                  menu_item_map_undo_changes),
1157    ENABLED_ENTRY("Relations",             cb_menu_osm_relations,    ENABLED_ENTRY("Relations",             cb_menu_osm_relations,
# Line 1157  static const menu_entry_t submenu_map_en Line 1161  static const menu_entry_t submenu_map_en
1161  };  };
1162    
1163  static const submenu_t submenu_map = {  static const submenu_t submenu_map = {
1164    "Map", submenu_map_entries, sizeof(submenu_map_entries)/sizeof(menu_entry_t)    "Map", submenu_map_entries,
1165      sizeof(submenu_map_entries)/sizeof(menu_entry_t)-1
1166  };  };
1167    
1168  /* -- the wms submenu -- */  /* -- the wms submenu -- */
# Line 1170  static const menu_entry_t submenu_wms_en Line 1175  static const menu_entry_t submenu_wms_en
1175  };  };
1176    
1177  static const submenu_t submenu_wms = {  static const submenu_t submenu_wms = {
1178    "WMS", submenu_wms_entries, sizeof(submenu_wms_entries)/sizeof(menu_entry_t)    "WMS", submenu_wms_entries,
1179      sizeof(submenu_wms_entries)/sizeof(menu_entry_t)-1
1180  };  };
1181    
1182  /* -- the track submenu -- */  /* -- the track submenu -- */
# Line 1187  static const menu_entry_t submenu_track_ Line 1193  static const menu_entry_t submenu_track_
1193  };  };
1194    
1195  static const submenu_t submenu_track = {  static const submenu_t submenu_track = {
1196    "Track", submenu_track_entries, sizeof(submenu_track_entries)/sizeof(menu_entry_t)    "Track", submenu_track_entries,
1197      sizeof(submenu_track_entries)/sizeof(menu_entry_t)-1
1198  };  };
1199    
1200    
# Line 1403  int main(int argc, char *argv[]) { Line 1410  int main(int argc, char *argv[]) {
1410  #endif  #endif
1411    hildon_program_add_window(appdata.program, appdata.window);    hildon_program_add_window(appdata.program, appdata.window);
1412    
1413  #if MAEMO_VERSION_MAJOR == 6  #if MAEMO_VERSION_MAJOR == 5
1414    unsigned long val = False;    unsigned long val = True;
1415    XChangeProperty(GDK_DISPLAY(),    XChangeProperty(GDK_DISPLAY(),
1416                    GDK_WINDOW_XID(GTK_WIDGET(appdata.window)->window),                    GDK_WINDOW_XID(GTK_WIDGET(appdata.window)->window),
1417                    XInternAtom(GDK_DISPLAY(),                    XInternAtom(GDK_DISPLAY(),
Legend:
Removed from v.242  
changed lines
  Added in v.244