Index: ppdc/ppdpo.cxx =================================================================== --- ppdc/ppdpo.cxx (revision 353) +++ ppdc/ppdpo.cxx (working copy) @@ -143,23 +143,23 @@ add_ui_strings(ppdcDriver *d, // I - Driver data ppdcCatalog *catalog) // I - Message catalog { - ppdcGroup *g; // Current group - ppdcOption *o; // Current option - ppdcChoice *c; // Current choice - ppdcMediaSize *m; // Current media size - - // Add the make/model/language strings... catalog->add_message(d->manufacturer->value); catalog->add_message(d->model_name->value); // Add the media size strings... + ppdcMediaSize *m; // Current media size + for (m = (ppdcMediaSize *)d->sizes->first(); m; m = (ppdcMediaSize *)d->sizes->next()) catalog->add_message(m->text->value); // Add the group/option/choice strings... + ppdcGroup *g; // Current group + ppdcOption *o; // Current option + ppdcChoice *c; // Current choice + for (g = (ppdcGroup *)d->groups->first(); g; g = (ppdcGroup *)d->groups->next()) @@ -191,6 +191,19 @@ catalog->add_message(c->name->value); } } + + // Add profile and preset strings... + ppdcAttr *a; // Current attribute + for (a = (ppdcAttr *)d->attrs->first(); + a; + a = (ppdcAttr *)d->attrs->next()) + if (a->text->value && a->text->value[0] && + (!strncmp(a->name->value, "ParamCustom", 11) || + !strcmp(a->name->value, "APCustomColorMatchingName") || + !strcmp(a->name->value, "APPrinterPreset") || + !strcmp(a->name->value, "cupsICCProfile") || + !strcmp(a->name->value, "cupsIPPReason"))) + catalog->add_message(a->text->value); }