Diff of /trunk/src/project.c

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

revision 13 by harbaum, Wed Dec 10 19:50:17 2008 UTC revision 14 by harbaum, Mon Dec 15 19:45:38 2008 UTC
# Line 154  static gboolean project_read(appdata_t * Line 154  static gboolean project_read(appdata_t *
154    xmlFreeDoc(doc);    xmlFreeDoc(doc);
155    xmlCleanupParser();    xmlCleanupParser();
156    
   /* ------------ set some default that may be missing ----------- */  
   /* ------- e.g. from project files saved by old versions ------- */  
   if(!project->wms_server)  
     project->wms_server = g_strdup(appdata->settings->wms_server);  
   
   if(!project->wms_path)  
     project->wms_path = g_strdup(appdata->settings->wms_path);  
   
157    return TRUE;    return TRUE;
158  }  }
159    
# Line 221  gboolean project_save(GtkWidget *parent, Line 213  gboolean project_save(GtkWidget *parent,
213    }    }
214    
215    node = xmlNewChild(root_node, NULL, BAD_CAST "wms", NULL);    node = xmlNewChild(root_node, NULL, BAD_CAST "wms", NULL);
216    xmlNewProp(node, BAD_CAST "server", BAD_CAST project->wms_server);    if(project->wms_server)
217    xmlNewProp(node, BAD_CAST "path", BAD_CAST project->wms_path);      xmlNewProp(node, BAD_CAST "server", BAD_CAST project->wms_server);
218      if(project->wms_path)
219        xmlNewProp(node, BAD_CAST "path", BAD_CAST project->wms_path);
220    snprintf(str, sizeof(str), "%d", project->wms_offset.x);    snprintf(str, sizeof(str), "%d", project->wms_offset.x);
221    xmlNewProp(node, BAD_CAST "x-offset", BAD_CAST str);    xmlNewProp(node, BAD_CAST "x-offset", BAD_CAST str);
222    snprintf(str, sizeof(str), "%d", project->wms_offset.y);    snprintf(str, sizeof(str), "%d", project->wms_offset.y);
# Line 519  project_t *project_new(select_context_t Line 513  project_t *project_new(select_context_t
513    /* use global server/access settings */    /* use global server/access settings */
514    project->server   = g_strdup(context->settings->server);    project->server   = g_strdup(context->settings->server);
515    
   /* dito for wms settings */  
   project->wms_server = g_strdup(context->settings->wms_server);  
   project->wms_path   = g_strdup(context->settings->wms_path);  
   
516    /* build project osm file name */    /* build project osm file name */
517    project->osm = g_strdup_printf("%s%s.osm", project->path, project->name);    project->osm = g_strdup_printf("%s%s.osm", project->path, project->name);
518    
# Line 547  project_t *project_new(select_context_t Line 537  project_t *project_new(select_context_t
537      project = NULL;      project = NULL;
538    }    }
539    
540      /* enable/disable edit/remove buttons */
541      view_selected(context, project);
542    
543    return project;    return project;
544  }  }
545    
# Line 626  static void on_project_edit(GtkButton *b Line 619  static void on_project_edit(GtkButton *b
619    
620    
621    }    }
622    
623      /* enable/disable edit/remove buttons */
624      view_selected(context, project);
625  }  }
626    
627  static GtkWidget *project_list_widget(select_context_t *context) {  static GtkWidget *project_list_widget(select_context_t *context) {
Legend:
Removed from v.13  
changed lines
  Added in v.14