libcupsfilters: Use text choice names for the "cupsPrintQuality" option.

Author: tillkamppeter

NEWS

@@ -3,6 +3,9 @@ NEWS - OpenPrinting CUPS Filters v1.25.11 - 2019-10-10
 
 CHANGES IN V1.25.12
 
+	- libcupsfilters: Use the text names "Draft", "Normal", and
+	  "High" instead of 3, 4, and 5 as choice names for the
+	  "cupsPrintQuality" option as CUPS does (Issue #171).
 	- libcupsfilters: If a printer supports both Apple Raster and
 	  PWG Raster let the generated PPD use Apple Raster as there
 	  are several printers which report PWG Raster support but do

cupsfilters/ppdgenerator.c

@@ -3461,31 +3461,27 @@ ppdCreateFromIPP2(char         *buffer,          /* I - Filename buffer */
 				   printer_opt_strings_catalog);
     cupsFilePrintf(fp, "*OpenUI *cupsPrintQuality/%s: PickOne\n"
 		   "*OrderDependency: 10 AnySetup *cupsPrintQuality\n"
-		   "*DefaultcupsPrintQuality: %d\n",
+		   "*DefaultcupsPrintQuality: Normal\n",
 		   (human_readable ? human_readable :
-		    _cupsLangString(lang, _("Print Quality"))),
-		   IPP_QUALITY_NORMAL);
+		    _cupsLangString(lang, _("Print Quality"))));
     if (ippContainsInteger(quality, IPP_QUALITY_DRAFT)) {
       human_readable = lookup_choice("3", "print-quality", opt_strings_catalog,
 				     printer_opt_strings_catalog);
-      cupsFilePrintf(fp, "*cupsPrintQuality %d/%s: \"<</HWResolution[%d %d]>>setpagedevice\"\n",
-		     IPP_QUALITY_DRAFT,
+      cupsFilePrintf(fp, "*cupsPrintQuality Draft/%s: \"<</HWResolution[%d %d]>>setpagedevice\"\n",
 		     (human_readable ? human_readable :
 		      _cupsLangString(lang, _("Draft"))),
 		     min_res->x, min_res->y);
     }
     human_readable = lookup_choice("4", "print-quality", opt_strings_catalog,
 				   printer_opt_strings_catalog);
-    cupsFilePrintf(fp, "*cupsPrintQuality %d/%s: \"<</HWResolution[%d %d]>>setpagedevice\"\n",
-		   IPP_QUALITY_NORMAL,
+    cupsFilePrintf(fp, "*cupsPrintQuality Normal/%s: \"<</HWResolution[%d %d]>>setpagedevice\"\n",
 		   (human_readable ? human_readable :
 		    _cupsLangString(lang, _("Normal"))),
 		   common_def->x, common_def->y);
     if (ippContainsInteger(quality, IPP_QUALITY_HIGH)) {
       human_readable = lookup_choice("5", "print-quality", opt_strings_catalog,
 				     printer_opt_strings_catalog);
-      cupsFilePrintf(fp, "*cupsPrintQuality %d/%s: \"<</HWResolution[%d %d]>>setpagedevice\"\n",
-		     IPP_QUALITY_HIGH,
+      cupsFilePrintf(fp, "*cupsPrintQuality High/%s: \"<</HWResolution[%d %d]>>setpagedevice\"\n",
 		     (human_readable ? human_readable :
 		      _cupsLangString(lang, _("High"))),
 		     max_res->x, max_res->y);