Diff of /trunk/src/main.c

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

revision 65 by achadwick, Mon Feb 9 13:42:19 2009 UTC revision 76 by harbaum, Fri Feb 13 12:02:26 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_undo, osm_valid);    if(appdata->menu_item_osm_undo)
60        gtk_widget_set_sensitive(appdata->menu_item_osm_undo, osm_valid);
61    gtk_widget_set_sensitive(appdata->menu_item_osm_save_changes, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_osm_save_changes, osm_valid);
62    gtk_widget_set_sensitive(appdata->menu_item_osm_undo_changes, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_osm_undo_changes, osm_valid);
63    gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);    gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);
# Line 267  cb_menu_undo_changes(GtkWidget *widget, Line 268  cb_menu_undo_changes(GtkWidget *widget,
268    
269    if(!yes_no_f(GTK_WIDGET(appdata->window), NULL, 0, 0,    if(!yes_no_f(GTK_WIDGET(appdata->window), NULL, 0, 0,
270                 _("Discard local changes?"),                 _("Discard local changes?"),
271                 _("Throw away all the changes you've not uploaded yet? This can't be undone.")))                 _("Throw away all the changes you've not "
272                     "uploaded yet? This can't be undone.")))
273      return;      return;
274    
275    banner_busy_start(appdata, 1, _("Redrawing..."));    banner_busy_start(appdata, 1, _("Redrawing..."));
# Line 282  cb_menu_undo_changes(GtkWidget *widget, Line 284  cb_menu_undo_changes(GtkWidget *widget,
284  }  }
285    
286  static void  static void
287    cb_menu_osm_relations(GtkWidget *widget, gpointer data) {
288      relation_list((appdata_t*)data);
289    }
290    
291    static void
292  cb_menu_fullscreen(GtkWidget *widget, gpointer data) {  cb_menu_fullscreen(GtkWidget *widget, gpointer data) {
293    appdata_t *appdata = (appdata_t *)data;    appdata_t *appdata = (appdata_t *)data;
294    
# Line 583  void menu_create(appdata_t *appdata) { Line 590  void menu_create(appdata_t *appdata) {
590      0, 0, FALSE, FALSE      0, 0, FALSE, FALSE
591    );    );
592    
593      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
594      appdata->menu_item_osm_relations = menu_append_new_item(
595        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations..."),
596        NULL, "<OSM2Go-Main>/OSM/Relations",
597        GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE
598      );
599    
600    /* -------------------- wms submenu -------------------- */    /* -------------------- wms submenu -------------------- */
601    
602    appdata->menu_wms = item = gtk_menu_item_new_with_mnemonic( _("_WMS") );    appdata->menu_wms = item = gtk_menu_item_new_with_mnemonic( _("_WMS") );
# Line 808  void cleanup(appdata_t *appdata) { Line 822  void cleanup(appdata_t *appdata) {
822    
823    project_free(appdata->project);    project_free(appdata->project);
824    
825    undo_free(appdata->undo_state);    if(appdata->menu_item_osm_undo)
826        undo_free(appdata->undo.state);
827    
828    puts("everything is gone");    puts("everything is gone");
829  }  }
Legend:
Removed from v.65  
changed lines
  Added in v.76