Diff of /trunk/src/main.c

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

revision 14 by harbaum, Mon Dec 15 19:45:38 2008 UTC revision 15 by harbaum, Tue Dec 16 17:00:20 2008 UTC
# Line 55  static void main_ui_enable(appdata_t *ap Line 55  static void main_ui_enable(appdata_t *ap
55    gtk_widget_set_sensitive(appdata->menu_osm, project_valid);    gtk_widget_set_sensitive(appdata->menu_osm, project_valid);
56    gtk_widget_set_sensitive(appdata->menu_item_osm_upload, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_osm_upload, osm_valid);
57    gtk_widget_set_sensitive(appdata->menu_item_osm_diff, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_osm_diff, osm_valid);
58      gtk_widget_set_sensitive(appdata->menu_item_osm_undo_changes, osm_valid);
59    gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);    gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);
60    gtk_widget_set_sensitive(appdata->menu_view, osm_valid);    gtk_widget_set_sensitive(appdata->menu_view, osm_valid);
61    gtk_widget_set_sensitive(appdata->menu_wms, osm_valid);    gtk_widget_set_sensitive(appdata->menu_wms, osm_valid);
# Line 244  cb_menu_save_changes(GtkWidget *widget, Line 245  cb_menu_save_changes(GtkWidget *widget,
245                             "to this project so far"), FALSE);                             "to this project so far"), FALSE);
246  }  }
247    
248    static void
249    cb_menu_undo_changes(GtkWidget *widget, gpointer data) {
250      appdata_t *appdata = (appdata_t*)data;
251    
252      if(!yes_no_f(GTK_WIDGET(appdata->window), NULL, 0, 0,
253                   _("Undo all changes?"),
254                   _("Do you really want to undo all your changes "
255                     "not uploaded so far? This cannot be undone!")))
256        return;
257    
258      map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
259      osm_free(&appdata->icon, appdata->osm);
260      diff_remove(appdata->project);
261      appdata->osm = osm_parse(appdata->project->osm);
262      map_paint(appdata);
263    
264      statusbar_set(appdata, _("All changes made "
265                               "so far have been reset"), FALSE);
266    }
267    
268    
269  #ifdef USE_HILDON  #ifdef USE_HILDON
270  static void  static void
# Line 422  void menu_create(appdata_t *appdata) { Line 443  void menu_create(appdata_t *appdata) {
443    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_save_changes),    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_save_changes),
444                     appdata);                     appdata);
445    
446      appdata->menu_item_osm_undo_changes = item =
447        gtk_menu_item_new_with_label( _("Undo all changes...") );
448      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
449      g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_undo_changes),
450                       appdata);
451    
452    /* -------------------- wms submenu -------------------- */    /* -------------------- wms submenu -------------------- */
453    
454    appdata->menu_wms = item = gtk_menu_item_new_with_label( _("WMS") );    appdata->menu_wms = item = gtk_menu_item_new_with_label( _("WMS") );

Legend:
Removed from v.14  
changed lines
  Added in v.15