Diff of /trunk/src/main.c

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

revision 55 by achadwick, Sat Feb 7 01:14:09 2009 UTC revision 64 by harbaum, Mon Feb 9 13:23:17 2009 UTC
# Line 56  static void main_ui_enable(appdata_t *ap Line 56  static void main_ui_enable(appdata_t *ap
56    /* disable all menu entries related to map */    /* disable all menu entries related to map */
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_undo, osm_valid);
60      gtk_widget_set_sensitive(appdata->menu_item_osm_save_changes, osm_valid);
61    gtk_widget_set_sensitive(appdata->menu_item_osm_undo_changes, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_osm_undo_changes, osm_valid);
62    gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);    gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);
63    gtk_widget_set_sensitive(appdata->menu_view, osm_valid);    gtk_widget_set_sensitive(appdata->menu_view, osm_valid);
# Line 70  static void main_ui_enable(appdata_t *ap Line 71  static void main_ui_enable(appdata_t *ap
71    
72  /******************** begin of menu *********************/  /******************** begin of menu *********************/
73    
 #if 0 // simplify menu  
 static struct {  
   enum { MENU_END, MENU_ITEM, MENU_SUB, MENU_SUB_END, MENU_SEP }  type;  
   
   char *title;  
   GCallback c_handler;  
 } menu[] = {  
   { MENU_SUB, "_OSM", NULL },  
   
   { MENU_END,  NULL, NULL },  
 };  
 #endif  
   
74  static void  static void
75  cb_menu_project_open(GtkWidget *window, gpointer data) {  cb_menu_project_open(GtkWidget *window, gpointer data) {
76    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 257  cb_menu_map_no_antialias(GtkWidget *widg Line 245  cb_menu_map_no_antialias(GtkWidget *widg
245  }  }
246    
247  static void  static void
248    cb_menu_undo(GtkWidget *widget, gpointer data) {
249      appdata_t *appdata = (appdata_t*)data;
250    
251      undo(appdata);
252    
253      // the banner will be displayed from within undo with more details
254    }
255    
256    static void
257  cb_menu_save_changes(GtkWidget *widget, gpointer data) {  cb_menu_save_changes(GtkWidget *widget, gpointer data) {
258    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
259    
# Line 565  void menu_create(appdata_t *appdata) { Line 562  void menu_create(appdata_t *appdata) {
562    
563    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());
564    
565      if(getenv("OSM2GO_UNDO_TEST")) {
566        appdata->menu_item_osm_undo = menu_append_new_item(
567                   appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo), _("_Undo"),
568                   GTK_STOCK_UNDO, "<OSM2Go-Main>/OSM/Undo",
569                   GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE
570                   );
571      } else
572        printf("set environment variable OSM2GO_UNDO_TEST to enable undo framework tests\n");
573    
574    appdata->menu_item_osm_diff = menu_append_new_item(    appdata->menu_item_osm_save_changes = menu_append_new_item(
575      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),
576      GTK_STOCK_SAVE, "<OSM2Go-Main>/OSM/SaveChanges",      GTK_STOCK_SAVE, "<OSM2Go-Main>/OSM/SaveChanges",
577      GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE      GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE
Legend:
Removed from v.55  
changed lines
  Added in v.64