Changeset 221

Timestamp:

06/11/06 11:05:39 (2 years ago)

Author:

jordi

Message:

When a printer is selected, the presenter clears the page sizes and fills it with the available printer's page size.

Location:

trunk/src

Files:

• IPrintView.h (modified) (4 diffs)
• PrintPter.cxx (modified) (3 diffs)
• PrintPter.h (modified) (2 diffs)
• gtk/PrintView.cxx (modified) (14 diffs)
• gtk/PrintView.h (modified) (3 diffs)

trunk/src/IPrintView.h

@@ -62 +62 @@
 
             ///
+            /// @brief Adds a new page size to the list.
+            ///
+            /// @param name The possibly translated name of the page size.
+            /// @param value The value the ePDFView internally uses to know
+            ///              which page size is.
+            ///
+            virtual void addPageSize (const gchar *name, 
+                                      const gchar *value) = 0;
+
+            ///
             /// @brief Adds a new printer to the list of printer.
             ///
@@ -77 +87 @@
 
             ///
+            /// @brief Deletes all sizes from the list of page sizes.
+            ///
+            virtual void clearPageSizeList (void) = 0;
+
+            ///
             /// @brief Gets the number of copies to do.
             ///
@@ -85 +100 @@
 
             ///
+            /// @brief Gets the name of the currently selected printer.
+            ///
+            /// @return The name of the printer that is currently selected.
+            ///         The name returned is the same as the name passed
+            ///         to the view using the addPrinter() function.
+            ///
+            virtual gchar *getSelectedPrinterName (void) = 0;
+
+            ///
             /// @brief Check is the "All Pages" range option is selected.
             ///
@@ -91 +115 @@
             ///
             virtual gboolean isSelectedAllPagesRangeOption (void) = 0;
+
+            ///
+            /// @brief Selects a page size.
+            ///
+            /// @param pageSizeInde The index of the page size to select.
+            ///
+            virtual void selectPageSize (unsigned int pageSizeIndex) = 0;
 
             ///

trunk/src/PrintPter.cxx

@@ -19 +19 @@
 #include <cups/cups.h>
 #include <cups/ipp.h>
+#include <cups/ppd.h>
 #include <locale.h>
 #include "epdfview.h"
@@ -99 +100 @@
 
 void
-PrintPter::printActivated (void)
-{
-    // Once done, is the same as canceled :-)
+PrintPter::printActivated ()
+{
+    // Once done, it's the same as canceled :-)
     cancelActivated ();
+}
+
+void
+PrintPter::printerSelectionChanged ()
+{
+    IPrintView &view = getView ();
+
+    gchar *printerName = view.getSelectedPrinterName ();
+    if ( NULL != printerName )
+    {
+        const gchar *printerPPDName = cupsGetPPD (printerName);
+        if ( NULL != printerPPDName )
+        {
+            ppd_file_t *printerPPD = ppdOpenFile (printerPPDName);
+            if ( NULL != printerPPD )
+            {
+                view.clearPageSizeList ();
+                int pageSizeToSelect = 1;
+                for ( int currentSize = 0 ;
+                      currentSize < printerPPD->num_sizes ;
+                      ++currentSize )
+                {
+                    const gchar *sizeName = printerPPD->sizes[currentSize].name;
+                    view.addPageSize (_(sizeName), sizeName);
+                }
+                view.selectPageSize (pageSizeToSelect);
+                ppdClose (printerPPD);
+            }
+        }
+        g_free (printerName);
+    }
 }
 
@@ -244 +276 @@
             view.selectPrinter (printerToSelect);
         }
-    }
-}
+        // The selection has been changed before the
+        // view could connect the signals, so here we'll set the selected
+        // printer's page sizes "by hand".
+        printerSelectionChanged ();
+    }
+}

trunk/src/PrintPter.h

@@ -24 +24 @@
 namespace ePDFView
 {
+    ///
+    /// @enum PrintPageOrientation.
+    ///
+    enum PrintPageOrientation
+    {
+        PRINT_PAGE_ORIENTATION_PORTRAIT,
+        PRINT_PAGE_ORIENTATION_LANDSCAPE
+    };
+
+    ///
+    /// @enum PrintPageLayout
+    ///
+    enum PrintPageLayout
+    {
+        PRINT_PAGE_LAYOUT_PLAIN,
+        PRINT_PAGE_LAYOUT_2IN1,
+        PRINT_PAGE_LAYOUT_4IN1
+    };
 
     ///
@@ -42 +60 @@
             void pageRangeOptionChanged (void);
             void printActivated (void);
+            void printerSelectionChanged (void);
 
         protected:

trunk/src/gtk/PrintView.cxx

@@ -34 +34 @@
 } printerListColumns;
 
+static enum
+{
+    printOrientationLabelColumn,
+    printOrientationValueColumn,
+    printOrientationNumColumn
+} printOritentationColumns;
+
+static enum
+{
+    printLayoutLabelColumn,
+    printLayoutValueColumn,
+    printLayoutNumColumn
+} printLayoutColumns;
+
+static enum
+{
+    pageSizeNameColumn,
+    pageSizeValueColumn,
+    pageSizeNumColumn
+} pageSizeColumns;
+
 // Callbacks.
 static void print_view_number_of_copies_changed (GtkSpinButton *, gpointer);
 static void print_view_page_range_option_changed (GtkToggleButton *, gpointer);
+static void print_view_printer_selection_changed (GtkTreeSelection *, gpointer);
 
 PrintView::PrintView (GtkWindow *parent):
@@ -96 +118 @@
                       G_CALLBACK (print_view_page_range_option_changed),
                       pter);
+    GtkTreeSelection *selection =
+        gtk_tree_view_get_selection (GTK_TREE_VIEW (m_PrinterListView));
+    g_signal_connect (G_OBJECT (selection), "changed",
+                      G_CALLBACK (print_view_printer_selection_changed),
+                      pter);
 
     // Run the dialog.
@@ -109 +136 @@
 
 void
+PrintView::addPageSize (const gchar *name, const gchar *value)
+{
+    GtkTreeIter pageSizeIter;
+    gtk_list_store_append (m_PageSize, &pageSizeIter);
+    gtk_list_store_set (m_PageSize, &pageSizeIter,
+                        pageSizeNameColumn, name,
+                        pageSizeValueColumn, value,
+                        -1);
+}
+
+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,
+    gtk_list_store_append (m_PrinterList, &printerIter);
+    gtk_list_store_set (m_PrinterList, &printerIter,
                         printerListNameColumn, name,
                         printerListJobsColumn, jobs,
@@ -122 +160 @@
 }
 
+void
+PrintView::clearPageSizeList ()
+{
+    gtk_list_store_clear (m_PageSize);
+}
+
 unsigned int
 PrintView::getNumberOfCopies ()
@@ -128 +172 @@
 }
 
+gchar *
+PrintView::getSelectedPrinterName ()
+{
+    gchar *printerName = NULL;
+    GtkTreeSelection *selectedPrinter =
+        gtk_tree_view_get_selection (GTK_TREE_VIEW (m_PrinterListView));
+    GtkTreeIter selectedPrinterIter;
+    if ( gtk_tree_selection_get_selected (selectedPrinter, NULL,
+                                          &selectedPrinterIter) )
+    {
+        gtk_tree_model_get (GTK_TREE_MODEL (m_PrinterList),
+                            &selectedPrinterIter,
+                            printerListNameColumn, &printerName,
+                            -1);
+    }
+
+    return printerName;
+}
+
 gboolean
 PrintView::isSelectedAllPagesRangeOption ()
 {
     return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (m_AllPagesRangeOption));
+}
+
+void
+PrintView::selectPageSize (unsigned int pageSizeIndex)
+{
+    gtk_combo_box_set_active (GTK_COMBO_BOX (m_PageSizeView), pageSizeIndex);
 }
 
@@ -169 +238 @@
 
 ////////////////////////////////////////////////////////////////
-// TabCreators
+// Tab Creators
 ////////////////////////////////////////////////////////////////
 
@@ -305 +374 @@
     gtk_misc_set_alignment (GTK_MISC (paperSizeLabel), 1.0, 0.5);
     gtk_label_set_use_underline (GTK_LABEL (paperSizeLabel), TRUE);
-    GtkWidget *paperSizeCombo = gtk_combo_box_new ();
-    gtk_label_set_mnemonic_widget (GTK_LABEL (paperSizeLabel), paperSizeCombo);
+    createPageSizeListModel ();
+    m_PageSizeView = gtk_combo_box_new_with_model (GTK_TREE_MODEL (m_PageSize));
+    gtk_label_set_mnemonic_widget (GTK_LABEL (paperSizeLabel), m_PageSizeView);
+    {
+        GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
+        gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (m_PageSizeView),
+                                    renderer, TRUE);
+        gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (m_PageSizeView),
+                                        renderer,
+                                        "text",
+                                        printOrientationLabelColumn, NULL);
+    }
     gtk_table_attach (GTK_TABLE (paperTable), paperSizeLabel,
                       0, 1, 0, 1,
@@ -312 +391 @@
                       (GtkAttachOptions)(GTK_SHRINK),
                       0, 0);
-    gtk_table_attach (GTK_TABLE (paperTable), paperSizeCombo,
+    gtk_table_attach (GTK_TABLE (paperTable), m_PageSizeView,
                       1, 2, 0, 1,
                       (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
                       (GtkAttachOptions)(GTK_SHRINK),
                       0, 0);
-    // Page orientation and combobox
+    // Page orientation label and combobox
     GtkWidget *pageOrientationLabel = gtk_label_new (_("Page _orientation:"));
     gtk_misc_set_alignment (GTK_MISC (pageOrientationLabel), 1.0, 0.5);
     gtk_label_set_use_underline (GTK_LABEL (pageOrientationLabel), TRUE);
-    GtkWidget *pageOrientationCombo = gtk_combo_box_new ();
+
+    createOrientationListModel ();
+    m_OrientationView =
+        gtk_combo_box_new_with_model (GTK_TREE_MODEL (m_Orientation));
     gtk_label_set_mnemonic_widget (GTK_LABEL (pageOrientationLabel),
-                                   pageOrientationCombo);
+                                   m_OrientationView);
+    {
+        GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
+        gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (m_OrientationView),
+                                    renderer, TRUE);
+        gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (m_OrientationView),
+                                        renderer,
+                                        "text",
+                                        printOrientationLabelColumn, NULL);
+    }
+    gtk_combo_box_set_active (GTK_COMBO_BOX (m_OrientationView), 0);
+
     gtk_table_attach (GTK_TABLE (paperTable), pageOrientationLabel,
                       0, 1, 1, 2,
@@ -329 +422 @@
                       (GtkAttachOptions)(GTK_SHRINK),
                       0, 0);
-    gtk_table_attach (GTK_TABLE (paperTable), pageOrientationCombo,
+    gtk_table_attach (GTK_TABLE (paperTable), m_OrientationView,
                       1, 2, 1, 2,
                       (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
@@ -338 +431 @@
     gtk_misc_set_alignment (GTK_MISC (layoutLabel), 1.0, 0.5);
     gtk_label_set_use_underline (GTK_LABEL (layoutLabel), TRUE);
-    GtkWidget *layoutCombo = gtk_combo_box_new ();
-    gtk_label_set_mnemonic_widget (GTK_LABEL (layoutLabel), layoutCombo);
+
+    createLayoutListModel ();
+    m_LayoutView = gtk_combo_box_new_with_model (GTK_TREE_MODEL (m_Layout));
+    gtk_label_set_mnemonic_widget (GTK_LABEL (layoutLabel), m_LayoutView);
+    {
+        GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
+        gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (m_LayoutView),
+                                    renderer, TRUE);
+        gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (m_LayoutView),
+                                        renderer,
+                                        "text", printLayoutLabelColumn, NULL);
+    }
+    gtk_combo_box_set_active (GTK_COMBO_BOX (m_LayoutView), 0);
+
     gtk_table_attach (GTK_TABLE (paperTable), layoutLabel,
                       0, 1, 2, 3,
@@ -345 +450 @@
                       (GtkAttachOptions)(GTK_SHRINK),
                       0, 0);
-    gtk_table_attach (GTK_TABLE (paperTable), layoutCombo,
+    gtk_table_attach (GTK_TABLE (paperTable), m_LayoutView,
                       1, 2, 2, 3,
                       (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
@@ -360 +465 @@
     gtk_container_set_border_width (GTK_CONTAINER (mainBox), 3);
 
-    m_PrinterList = gtk_list_store_new (printerListNumColumn,
-                                        G_TYPE_STRING,
-                                        G_TYPE_STRING,
-                                        G_TYPE_INT,
-                                        G_TYPE_STRING);
+    createPrinterListModel ();
     m_PrinterListView =
         gtk_tree_view_new_with_model (GTK_TREE_MODEL (m_PrinterList));
@@ -409 +510 @@
 
 ////////////////////////////////////////////////////////////////
+// Model Creators
+////////////////////////////////////////////////////////////////
+
+void
+PrintView::createLayoutListModel ()
+{
+    m_Layout = gtk_list_store_new (printLayoutNumColumn,
+                                   G_TYPE_STRING,  // Label
+                                   G_TYPE_INT);    // Value
+
+    GtkTreeIter iter;
+    gtk_list_store_append (m_Layout, &iter);
+    gtk_list_store_set (m_Layout, &iter,
+                        printLayoutLabelColumn, _("Plain"),
+                        printLayoutValueColumn, PRINT_PAGE_LAYOUT_PLAIN,
+                        -1);
+
+    gtk_list_store_append (m_Layout, &iter);
+    gtk_list_store_set (m_Layout, &iter,
+                        printLayoutLabelColumn, _("2 pages in 1"),
+                        printLayoutValueColumn, PRINT_PAGE_LAYOUT_2IN1,
+                        -1);
+
+    gtk_list_store_append (m_Layout, &iter);
+    gtk_list_store_set (m_Layout, &iter,
+                        printLayoutLabelColumn, _("4 pages in 1"),
+                        printLayoutValueColumn, PRINT_PAGE_LAYOUT_4IN1,
+                        -1);
+}
+
+void
+PrintView::createOrientationListModel ()
+{
+    m_Orientation = gtk_list_store_new (printOrientationNumColumn,
+                                        G_TYPE_STRING,  // Label
+                                        G_TYPE_INT);    // Value
+
+    GtkTreeIter iter;
+    gtk_list_store_append (m_Orientation, &iter);
+    gtk_list_store_set (m_Orientation, &iter,
+                printOrientationLabelColumn, _("Portrait"),
+                printOrientationValueColumn, PRINT_PAGE_ORIENTATION_PORTRAIT,
+                -1);
+
+    gtk_list_store_append (m_Orientation, &iter);
+    gtk_list_store_set (m_Orientation, &iter,
+                printLayoutLabelColumn, _("Landscape"),
+                printOrientationValueColumn, PRINT_PAGE_ORIENTATION_LANDSCAPE,
+                -1);
+}
+
+void
+PrintView::createPageSizeListModel ()
+{
+    m_PageSize = gtk_list_store_new (pageSizeNumColumn,
+                                     G_TYPE_STRING,  // Label
+                                     G_TYPE_STRING); // Value
+}
+
+void
+PrintView::createPrinterListModel ()
+{
+    m_PrinterList =
+        gtk_list_store_new (printerListNumColumn,
+                            G_TYPE_STRING,  // Name
+                            G_TYPE_STRING,  // State
+                            G_TYPE_INT,     // Jobs
+                            G_TYPE_STRING); // Location
+
+}
+
+////////////////////////////////////////////////////////////////
 // Callbacks
 ////////////////////////////////////////////////////////////////
@@ -429 +602 @@
     pter->pageRangeOptionChanged ();
 }
+
+void
+print_view_printer_selection_changed (GtkTreeSelection *sel, gpointer data)
+{
+    g_assert (NULL != data && "The data parameter is NULL.");
+
+    PrintPter *pter = (PrintPter *)data;
+    pter->printerSelectionChanged ();
+}

trunk/src/gtk/PrintView.h

@@ -29 +29 @@
             virtual void setPresenter (PrintPter *pter);
 
+            virtual void addPageSize (const gchar *name,
+                                      const gchar *value);
             virtual void addPrinter (const gchar *name, int jobs,
                                      const gchar *state,
                                      const gchar *location);
+            virtual void clearPageSizeList (void);
             virtual unsigned int getNumberOfCopies (void);
+            virtual gchar *getSelectedPrinterName (void);
             virtual gboolean isSelectedAllPagesRangeOption (void);
-            virtual void selectPrinter (unsigned int printerInde);
+            virtual void selectPageSize (unsigned int pageSizeIndex);
+            virtual void selectPrinter (unsigned int printerIndex);
             virtual void sensitiveCollate (gboolean sensitive);
             virtual void sensitivePageRange (gboolean sensitive);
@@ -43 +48 @@
             GtkWidget *m_Collate;
             GtkWidget *m_CustomPagesRangeOption;
+            GtkListStore *m_Layout;
+            GtkWidget *m_LayoutView;
             GtkWidget *m_NumberOfCopies;
+            GtkListStore *m_Orientation;
+            GtkWidget *m_OrientationView;
             GtkWidget *m_PageRange;
+            GtkListStore *m_PageSize;
+            GtkWidget *m_PageSizeView;
             GtkWidget *m_PrintDialog;
             GtkListStore *m_PrinterList;
@@ -52 +63 @@
             GtkWidget *createPaperTab (void);
             GtkWidget *createPrinterTab (void);
+
+            void createLayoutListModel (void);
+            void createOrientationListModel (void);
+            void createPageSizeListModel (void);
+            void createPrinterListModel (void);
     };
 }