Diff of /trunk/src/project.c

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

revision 282 by harbaum, Fri Sep 4 11:35:48 2009 UTC revision 299 by harbaum, Fri Sep 25 18:31:48 2009 UTC
# Line 549  project_t *project_new(select_context_t Line 549  project_t *project_new(select_context_t
549    
550    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox);    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox);
551    
552    /* don't all user to click ok until something useful has been entered */    /* don't allow user to click ok until a valid area has been specified */
553    gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),    gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
554                                      GTK_RESPONSE_ACCEPT, FALSE);                                      GTK_RESPONSE_ACCEPT, FALSE);
555    
# Line 945  static void on_edit_clicked(GtkButton *b Line 945  static void on_edit_clicked(GtkButton *b
945      pos_lon_label_set(context->maxlat, context->project->max.lat);      pos_lon_label_set(context->maxlat, context->project->max.lat);
946      pos_lon_label_set(context->maxlon, context->project->max.lon);      pos_lon_label_set(context->maxlon, context->project->max.lon);
947    
948      gtk_widget_set_sensitive(context->download,      gboolean pos_valid = project_pos_is_valid(context->project);
949                               project_pos_is_valid(context->project));      gtk_widget_set_sensitive(context->download, pos_valid);
950    
951      /* (re-) download area */      /* (re-) download area */
952      if(osm_download(GTK_WIDGET(context->dialog),      if (pos_valid)
953              context->area_edit.appdata->settings, context->project))      {
954         context->project->data_dirty = FALSE;        if(osm_download(GTK_WIDGET(context->dialog),
955                  context->area_edit.appdata->settings, context->project))
956             context->project->data_dirty = FALSE;
957        }
958      project_filesize(context);      project_filesize(context);
959    }    }
960  }  }
# Line 1028  project_edit(appdata_t *appdata, GtkWidg Line 1030  project_edit(appdata_t *appdata, GtkWidg
1030    context->area_edit.settings = context->settings = settings;    context->area_edit.settings = context->settings = settings;
1031    context->area_edit.appdata = appdata;    context->area_edit.appdata = appdata;
1032    context->is_new = is_new;    context->is_new = is_new;
   
1033    context->area_edit.min = &project->min;    context->area_edit.min = &project->min;
1034    context->area_edit.max = &project->max;    context->area_edit.max = &project->max;
1035    
# Line 1256  gboolean project_close(appdata_t *appdat Line 1257  gboolean project_close(appdata_t *appdat
1257      appdata->osm = NULL;      appdata->osm = NULL;
1258    }    }
1259    
1260      /* remember in settings that no project is open */
1261      if(appdata->settings->project)
1262      {
1263        g_free(appdata->settings->project);
1264        appdata->settings->project = NULL;
1265      }
1266    
1267    /* update project file on disk */    /* update project file on disk */
1268    project_save(GTK_WIDGET(appdata->window), appdata->project);    project_save(GTK_WIDGET(appdata->window), appdata->project);
1269    
Legend:
Removed from v.282  
changed lines
  Added in v.299