Diff of /trunk/src/project.c

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

revision 177 by harbaum, Wed Jun 10 12:07:11 2009 UTC revision 178 by harbaum, Tue Jun 16 15:27:37 2009 UTC
# Line 202  gboolean project_save(GtkWidget *parent, Line 202  gboolean project_save(GtkWidget *parent,
202    
203    xmlDocSetRootElement(doc, root_node);    xmlDocSetRootElement(doc, root_node);
204    
205    node = xmlNewChild(root_node, NULL, BAD_CAST "server",    if(project->server)
206                       BAD_CAST project->server);      node = xmlNewChild(root_node, NULL, BAD_CAST "server",
207                           BAD_CAST project->server);
208    
209    xmlNewChild(root_node, NULL, BAD_CAST "desc", BAD_CAST project->desc);    xmlNewChild(root_node, NULL, BAD_CAST "desc", BAD_CAST project->desc);
210    xmlNewChild(root_node, NULL, BAD_CAST "osm", BAD_CAST project->osm);    xmlNewChild(root_node, NULL, BAD_CAST "osm", BAD_CAST project->osm);
# Line 901  static void on_diff_remove_clicked(GtkBu Line 902  static void on_diff_remove_clicked(GtkBu
902    gtk_widget_destroy(dialog);    gtk_widget_destroy(dialog);
903  }  }
904    
905    gboolean project_check_demo(GtkWidget *parent, project_t *project) {
906      if(!project->server)
907        messagef(parent, "Demo project",
908                 "This is a preinstalled demo project. This means that the "
909                 "basic project parameters cannot be changed and no data can "
910                 "be up- or downloaded via the OSM servers.\n\n"
911                 "Please setup a new project to do these things.");
912    
913      return !project->server;
914    }
915    
916    
917  gboolean project_edit(GtkWidget *parent, settings_t *settings,  gboolean project_edit(GtkWidget *parent, settings_t *settings,
918                        project_t *project POS_PARM) {                        project_t *project POS_PARM) {
919    gboolean ok = FALSE;    gboolean ok = FALSE;
920    
921      if(project_check_demo(parent, project))
922        return ok;
923    
924    /* ------------ project edit dialog ------------- */    /* ------------ project edit dialog ------------- */
925    
926    project_context_t *context = g_new0(project_context_t, 1);    project_context_t *context = g_new0(project_context_t, 1);
# Line 1211  gboolean project_load(appdata_t *appdata Line 1227  gboolean project_load(appdata_t *appdata
1227      g_free(appdata->settings->project);      g_free(appdata->settings->project);
1228    appdata->settings->project = g_strdup(appdata->project->name);    appdata->settings->project = g_strdup(appdata->project->name);
1229    
1230    snprintf(banner_txt, _PROJECT_LOAD_BUF_SIZ, _("Loaded %s"), proj_name);    snprintf(banner_txt, _PROJECT_LOAD_BUF_SIZ, _("Loaded %s%s"),
1231               (appdata->project && appdata->project->server)?"":"demo project ",
1232               proj_name);
1233    
1234    banner_busy_stop(appdata);    banner_busy_stop(appdata);
1235    banner_show_info(appdata, banner_txt);    banner_show_info(appdata, banner_txt);
1236    statusbar_set(appdata, NULL, 0);    statusbar_set(appdata, NULL, 0);

Legend:
Removed from v.177  
changed lines
  Added in v.178