Diff of /trunk/src/info.c

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

src/info.c revision 1 by harbaum, Tue Dec 9 20:06:06 2008 UTC trunk/src/info.c revision 52 by harbaum, Fri Feb 6 08:14:09 2009 UTC
# Line 148  static gboolean tag_edit(tag_context_t * Line 148  static gboolean tag_edit(tag_context_t *
148            GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,            GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
149            NULL);            NULL);
150    
151    #ifdef USE_HILDON
152      gtk_window_set_default_size(GTK_WINDOW(dialog), 500, 100);
153    #else
154      gtk_window_set_default_size(GTK_WINDOW(dialog), 400, 100);
155    #endif
156    
157    gtk_dialog_set_default_response(GTK_DIALOG(dialog),    gtk_dialog_set_default_response(GTK_DIALOG(dialog),
158                                    GTK_RESPONSE_ACCEPT);                                    GTK_RESPONSE_ACCEPT);
159    
160    GtkWidget *label, *key, *value;    GtkWidget *label, *key, *value;
161    GtkWidget *table = gtk_table_new(2, 2, FALSE);    GtkWidget *table = gtk_table_new(2, 2, FALSE);
162    
163    gtk_table_attach_defaults(GTK_TABLE(table),    gtk_table_attach(GTK_TABLE(table), label = gtk_label_new(_("Key:")),
164                      label = gtk_label_new(_("Key:")), 0, 1, 0, 1);                     0, 1, 0, 1, 0, 0, 0, 0);
165    gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);    gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
166    gtk_table_attach_defaults(GTK_TABLE(table),    gtk_table_attach_defaults(GTK_TABLE(table),
167                      key = gtk_entry_new(), 1, 2, 0, 1);                              key = gtk_entry_new(), 1, 2, 0, 1);
168    gtk_entry_set_activates_default(GTK_ENTRY(key), TRUE);    gtk_entry_set_activates_default(GTK_ENTRY(key), TRUE);
169    HILDON_ENTRY_NO_AUTOCAP(key);    HILDON_ENTRY_NO_AUTOCAP(key);
170    
171    gtk_table_attach_defaults(GTK_TABLE(table),    gtk_table_attach(GTK_TABLE(table),  label = gtk_label_new(_("Value:")),
172                      label = gtk_label_new(_("Value:")), 0, 1, 1, 2);                     0, 1, 1, 2, 0, 0, 0, 0);
173    gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);    gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
174    gtk_table_attach_defaults(GTK_TABLE(table),    gtk_table_attach_defaults(GTK_TABLE(table),
175                      value = gtk_entry_new(), 1, 2, 1, 2);                      value = gtk_entry_new(), 1, 2, 1, 2);
# Line 413  void info_dialog(GtkWidget *parent, appd Line 419  void info_dialog(GtkWidget *parent, appd
419        work_copy = osm_tags_copy(appdata->map->selected.node->tag, FALSE);        work_copy = osm_tags_copy(appdata->map->selected.node->tag, FALSE);
420        stime = appdata->map->selected.node->time;        stime = appdata->map->selected.node->time;
421        context->type = NODE;        context->type = NODE;
422          context->presets_type = PRESETS_TYPE_NODE;
423        break;        break;
424      case MAP_TYPE_WAY:      case MAP_TYPE_WAY:
425        str = g_strdup_printf(_("Way #%ld"), appdata->map->selected.way->id);        str = g_strdup_printf(_("Way #%ld"), appdata->map->selected.way->id);
# Line 420  void info_dialog(GtkWidget *parent, appd Line 427  void info_dialog(GtkWidget *parent, appd
427        work_copy = osm_tags_copy(appdata->map->selected.way->tag, FALSE);        work_copy = osm_tags_copy(appdata->map->selected.way->tag, FALSE);
428        stime = appdata->map->selected.way->time;        stime = appdata->map->selected.way->time;
429        context->type = WAY;        context->type = WAY;
430          context->presets_type = PRESETS_TYPE_WAY;
431    
432          if(osm_way_get_last_node(appdata->map->selected.way) ==
433             osm_way_get_first_node(appdata->map->selected.way))
434            context->presets_type |= PRESETS_TYPE_CLOSEDWAY;
435    
436        break;        break;
437      default:      default:
438        g_assert((appdata->map->selected.type == MAP_TYPE_NODE) ||        g_assert((appdata->map->selected.type == MAP_TYPE_NODE) ||
# Line 432  void info_dialog(GtkWidget *parent, appd Line 445  void info_dialog(GtkWidget *parent, appd
445      work_copy = osm_tags_copy(relation->tag, FALSE);      work_copy = osm_tags_copy(relation->tag, FALSE);
446      stime = relation->time;      stime = relation->time;
447      context->type = RELATION;      context->type = RELATION;
448        context->presets_type = PRESETS_TYPE_RELATION;
449    }    }
450    
451    context->dialog = gtk_dialog_new_with_buttons(str,    context->dialog = gtk_dialog_new_with_buttons(str,
Legend:
Removed from v.1  
changed lines
  Added in v.52