Changeset 228

Timestamp:

06/12/06 17:10:08 (2 years ago)

Author:

jordi

Message:

The PrintPter? now gets and sets the default page size when a printer is selected.

Files:

• trunk/src/PrintPter.cxx (modified) (4 diffs)

trunk/src/PrintPter.cxx

@@ -163 +163 @@
 
     gchar *printerName = view.getSelectedPrinterName ();
+
     if ( NULL != printerName )
     {
+        cups_dest_t *destinations;
+        guint numDestinations = cupsGetDests (&destinations);
+        if ( NULL == destinations )
+        {
+            g_free (printerName);
+            return;
+        }
+        cups_dest_t *destination = cupsGetDest (printerName, NULL,
+                                                numDestinations, destinations);
+        if ( NULL == destinations )
+        {
+            g_free (printerName);
+            cupsFreeDests (numDestinations, destinations);
+            return;
+        }
+
         const gchar *printerPPDName = cupsGetPPD (printerName);
         if ( NULL != printerPPDName )
@@ -171 +188 @@
             if ( NULL != printerPPD )
             {
+                ppdMarkDefaults (printerPPD);
+                cupsMarkOptions (printerPPD, destination->num_options,
+                                 destination->options);
+
+                // Get the default page size.
+                ppd_option_t *pageSizeOption = ppdFindOption (printerPPD,
+                                                             "PageSize");
+                gchar *defaultPageSize = NULL;
+                if ( NULL != pageSizeOption )
+                {
+                    defaultPageSize = pageSizeOption->defchoice;
+                }
+
                 view.clearPageSizeList ();
-                int pageSizeToSelect = 1;
+                int pageSizeToSelect = 0;
                 for ( int currentSize = 0 ;
                       currentSize < printerPPD->num_sizes ;
@@ -179 +209 @@
                     const gchar *sizeName = printerPPD->sizes[currentSize].name;
                     view.addPageSize (_(sizeName), sizeName);
+                    if ( NULL != defaultPageSize &&
+                         0 == g_ascii_strcasecmp (defaultPageSize, sizeName) )
+                    {
+                        pageSizeToSelect = currentSize;
+                    }
                 }
                 view.selectPageSize (pageSizeToSelect);
@@ -184 +219 @@
             }
         }
+        cupsFreeDests (numDestinations, destinations);
         g_free (printerName);
     }