Changeset 229 for trunk/src/PrintPter.cxx

Timestamp:

06/12/06 17:33:31 (2 years ago)

Author:

jordi

Message:

The page size's name are now "human readable" instead of the name to give when used as options.

Files:

• trunk/src/PrintPter.cxx (modified) (1 diff)

trunk/src/PrintPter.cxx

@@ -192 +192 @@
                                  destination->options);
 
-                // Get the default page size.
-                ppd_option_t *pageSizeOption = ppdFindOption (printerPPD,
-                                                             "PageSize");
-                gchar *defaultPageSize = NULL;
-                if ( NULL != pageSizeOption )
-                {
-                    defaultPageSize = pageSizeOption->defchoice;
-                }
-
+                // Get the page sizes.
+                ppd_option_t *pageSizeOption =
+                    ppdFindOption (printerPPD, "PageSize");
                 view.clearPageSizeList ();
                 int pageSizeToSelect = 0;
+                ppd_choice_t *pageSizeChoice = pageSizeOption->choices;
                 for ( int currentSize = 0 ;
-                      currentSize < printerPPD->num_sizes ;
-                      ++currentSize )
+                      currentSize < pageSizeOption->num_choices ;
+                      ++currentSize, ++pageSizeChoice )
                 {
-                    const gchar *sizeName = printerPPD->sizes[currentSize].name;
-                    view.addPageSize (_(sizeName), sizeName);
-                    if ( NULL != defaultPageSize &&
-                         0 == g_ascii_strcasecmp (defaultPageSize, sizeName) )
+                    const gchar *sizeName = pageSizeChoice->text;
+                    const gchar *sizeValue = pageSizeChoice->choice;
+
+                    view.addPageSize (_(sizeName), sizeValue);
+                    if ( pageSizeChoice->marked )
                     {
                         pageSizeToSelect = currentSize;