Changeset 219

Timestamp:

06/11/06 07:51:00 (2 years ago)

Author:

jordi

Message:

The PrintPter? class now retrieves the list of printers from cups and sends them to the view. I also added the PrintPter?.cxx function in the POTFILES file.

Location:

trunk

Files:

• po/POTFILES.in (modified) (1 diff)
• src/IPrintView.h (modified) (1 diff)
• src/PrintPter.cxx (modified) (3 diffs)
• src/PrintPter.h (modified) (2 diffs)
• src/gtk/PrintView.cxx (modified) (2 diffs)
• src/gtk/PrintView.h (modified) (2 diffs)

trunk/po/POTFILES.in

@@ -6 +6 @@
 src/MainPter.cxx
 src/PagePter.cxx
+src/PrintPter.cxx
 src/PDFDocument.cxx
 # GTK+ Shell

trunk/src/IPrintView.h

@@ -62 +62 @@
 
             ///
+            /// @brief Adds a new printer to the list of printer.
+            ///
+            /// The presenter will get the list of printers from the
+            /// system and call this function for each one it finds.
+            ///
+            /// @param name The name of the printer.
+            /// @param job The number of jobs the printer currently has active.
+            /// @param state The current printer's state.
+            /// @param location The printer's location.
+            ///
+            virtual void addPrinter (const gchar *name, int jobs,
+                                     const gchar *state,
+                                     const gchar *location) = 0;
+
+            ///
             /// @brief Gets the number of copies to do.
             ///

trunk/src/PrintPter.cxx

@@ -17 +17 @@
 
 #include <config.h>
+#include <cups/cups.h>
+#include <cups/ipp.h>
+#include <locale.h>
 #include "epdfview.h"
 
 using namespace ePDFView;
+
+// Structures
+struct _printerAttributes
+{
+    gchar *location;
+    gchar *state;
+};
 
 PrintPter::PrintPter ()
@@ -48 +58 @@
     view->sensitivePageRange (FALSE);
 
+    // Retrieve and set the list of printer.
+    listPrinters ();
+
     getView ().setPresenter (this);
 }
@@ -91 +104 @@
     cancelActivated ();
 }
+
+printerAttributes *
+PrintPter::getPrinterAttributes (const gchar *printerName)
+{
+    // Create and empty attributes structure.
+    printerAttributes *attributes = new printerAttributes ();
+    attributes->state = NULL;
+    attributes->location = NULL;
+
+    // The attributes to request from the server.
+    const gchar *attributesToRequest[] =
+    {
+        "printer-state",
+        "printer-location"
+    };
+
+    http_t *http = httpConnect (cupsServer (), ippPort ());
+    if ( NULL == http )
+    {
+        printf ("No http!\n");
+        return attributes;
+    }
+
+    ipp_t *request = ippNew ();
+
+    request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
+    request->request.op.request_id = 1;
+
+    ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+                  "attributes-charset", NULL, "utf-8");
+    ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+                  "attributes-natural-language", NULL,
+                  setlocale (LC_MESSAGES, NULL));
+    ippAddStrings (request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
+                   "requested-attributes", G_N_ELEMENTS (attributesToRequest),
+                   NULL, attributesToRequest);
+    gchar *uri = g_strdup_printf ("ipp://localhost/printers/%s", printerName);
+    ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_URI,
+                  "printer-uri", NULL, uri);
+
+    ipp_t *answer = cupsDoRequest (http, request, "/");
+    if ( NULL != answer )
+    {
+        // Get the state.
+        ipp_attribute_t *state =
+            ippFindAttribute (answer, "printer-state", IPP_TAG_ZERO);
+        if ( NULL != state )
+        {
+            switch (state->values[0].integer)
+            {
+                case IPP_PRINTER_IDLE:
+                    attributes->state = g_strdup (_("Idle"));
+                    break;
+                case IPP_PRINTER_STOPPED:
+                    attributes->state = g_strdup (_("Stopped"));
+                    break;
+                case IPP_PRINTER_PROCESSING:
+                    attributes->state = g_strdup (_("Processing"));
+                    break;
+                default:
+                    attributes->state = g_strdup (_("Unknown"));
+                    break;
+            }
+        }
+
+        // Get the location.
+        ipp_attribute_t *location =
+            ippFindAttribute (answer, "printer-location", IPP_TAG_ZERO);
+        if ( NULL != location )
+        {
+            attributes->location = g_strdup (location->values[0].string.text);
+        }
+
+        ippDelete (answer);
+    }
+    else
+    {
+        printf ("No answer!\n");
+    }
+
+    httpClose (http);
+    g_free (uri);
+    return attributes;
+}
+
+void
+PrintPter::listPrinters (void)
+{
+    cups_dest_t *destinations;
+    int numDestinations = cupsGetDests (&destinations);
+
+    for ( int currentDestination = 0 ; currentDestination < numDestinations ;
+          ++currentDestination )
+    {
+        // Get the printer name.
+        gchar *printerName = destinations[currentDestination].name;
+        // Get the number of jobs the printer currently has.
+        cups_job_t *destinationJobs;
+        int numJobs = cupsGetJobs (&destinationJobs, printerName, 1, 0);
+        cupsFreeJobs (numJobs, destinationJobs);
+        // Get the state and location.
+        printerAttributes *attributes = getPrinterAttributes (printerName);
+        // Set all this data to the view.
+        getView ().addPrinter (printerName, numJobs,
+                               attributes->state, attributes->location);
+        g_free (attributes->location);
+        g_free (attributes->state);
+        delete attributes;
+    }
+
+    cupsFreeDests (numDestinations, destinations);
+}

trunk/src/PrintPter.h

@@ -19 +19 @@
 #define __PRINT_PTER_H__
 
+// Forward declarations.
+typedef struct _printerAttributes printerAttributes;
+
 namespace ePDFView
 {
+
     ///
     /// @class PrintPter
@@ -41 +45 @@
         protected:
             IPrintView *m_View;
+
+            printerAttributes *getPrinterAttributes (const gchar *printerName);
+            void listPrinters (void);
     };
 }

trunk/src/gtk/PrintView.cxx

@@ -106 +106 @@
         pter->cancelActivated ();
     }
+}
+
+void
+PrintView::addPrinter (const gchar *name, int jobs, const gchar *state,
+                       const gchar *location)
+{
+    GtkTreeIter printerIter;
+    gtk_list_store_append (GTK_LIST_STORE (m_PrinterList), &printerIter);
+    gtk_list_store_set (GTK_LIST_STORE (m_PrinterList), &printerIter,
+                        printerListNameColumn, name,
+                        printerListJobsColumn, jobs,
+                        printerListStateColumn, state,
+                        printerListLocationColumn, location,
+                        -1);
 }
 
@@ -324 +338 @@
     gtk_container_set_border_width (GTK_CONTAINER (mainBox), 3);
 
-    m_PrinterList = gtk_tree_store_new (printerListNumColumn,
+    m_PrinterList = gtk_list_store_new (printerListNumColumn,
                                         G_TYPE_STRING,
                                         G_TYPE_STRING,

trunk/src/gtk/PrintView.h

@@ -29 +29 @@
             virtual void setPresenter (PrintPter *pter);
 
+            virtual void addPrinter (const gchar *name, int jobs,
+                                     const gchar *state,
+                                     const gchar *location);
             virtual unsigned int getNumberOfCopies (void);
             virtual gboolean isSelectedAllPagesRangeOption (void);
@@ -41 +44 @@
             GtkWidget *m_PageRange;
             GtkWidget *m_PrintDialog;
-            GtkTreeStore *m_PrinterList;
+            GtkListStore *m_PrinterList;
             GtkWidget *m_PrinterListView;