Changeset 231

Timestamp:

06/13/06 15:16:36 (2 years ago)

Author:

jordi

Message:

Refactorized a little the printer options, so only one function adds data and one retrieved data.

Added the resolution list and also the setter function in the view.

Location:

trunk/src

Files:

• IPrintView.h (modified) (4 diffs)
• PrintPter.cxx (modified) (1 diff)
• gtk/PrintView.cxx (modified) (23 diffs)
• gtk/PrintView.h (modified) (4 diffs)

trunk/src/IPrintView.h

@@ -82 +82 @@
             /// @param location The printer's location.
             ///
-            virtual void addPrinter (const gchar *name, int jobs,
+            virtual void addPrinter (const gchar *name, gint jobs,
                                      const gchar *state,
                                      const gchar *location) = 0;
 
             ///
+            /// @brief Adds a new resolution to the list.
+            ///
+            /// @param name The possibly translated name of the resolution.
+            /// @param value The value the ePDFView internally uses to know
+            ///              which resolution is.
+            ///
+            virtual void addResolution (const gchar *name,
+                                        const gchar *value) = 0;
+
+            ///
             /// @brief Deletes all sizes from the list of page sizes.
             ///
             virtual void clearPageSizeList (void) = 0;
+
+            ///
+            /// @brief Deletes all resolutions from the list of resolutions.
+            ///
+            virtual void clearResolutionList (void) = 0;
 
             ///
@@ -97 +112 @@
             ///         range is between 1 and 999.
             ///
-            virtual unsigned int getNumberOfCopies (void) = 0;
+            virtual guint getNumberOfCopies (void) = 0;
 
             ///
@@ -173 +188 @@
             /// @brief Selects a page size.
             ///
-            /// @param pageSizeInde The index of the page size to select.
+            /// @param pageSizeIndex The index of the page size to select.
             ///
             virtual void selectPageSize (guint pageSizeIndex) = 0;
@@ -183 +198 @@
             ///
             virtual void selectPrinter (guint printerIndex) = 0;
+
+            ///
+            /// @brief Selects a page size.
+            ///
+            /// @param resolutionIndex The index of the resolution to select.
+            ///
+            virtual void selectResolution (guint resolutionIndex) = 0;
 
             ///

trunk/src/PrintPter.cxx

@@ -212 +212 @@
                 }
                 view.selectPageSize (pageSizeToSelect);
+
+                // Get the resolutions.
+                ppd_option_t *resolutionOption =
+                    ppdFindOption (printerPPD, "Resolution");
+                view.clearResolutionList ();
+                int resolutionToSelect = 0;
+                ppd_choice_t *resolutionChoice = resolutionOption->choices;
+                for ( int currentRes = 0 ;
+                      currentRes < resolutionOption->num_choices ;
+                      ++currentRes, ++resolutionChoice )
+                {
+                    const gchar *resName = resolutionChoice->text;
+                    const gchar *resValue = resolutionChoice->choice;
+
+                    view.addResolution (_(resName), resValue);
+                    if ( resolutionChoice->marked )
+                    {
+                        resolutionToSelect = currentRes;
+                    }
+                }
+                view.selectResolution (resolutionToSelect);
                 ppdClose (printerPPD);
             }

trunk/src/gtk/PrintView.cxx

@@ -25 +25 @@
 
 // Enumerations.
-static enum
+enum printerListColumns
 {
     printerListNameColumn,
@@ -32 +32 @@
     printerListLocationColumn,
     printerListNumColumn
-} printerListColumns;
-
-static enum
-{
-    printOrientationLabelColumn,
-    printOrientationValueColumn,
-    printOrientationNumColumn
-} printOritentationColumns;
-
-static enum
-{
-    printLayoutLabelColumn,
-    printLayoutValueColumn,
-    printLayoutNumColumn
-} printLayoutColumns;
-
-static enum
-{
-    pageSizeNameColumn,
-    pageSizeValueColumn,
-    pageSizeNumColumn
-} pageSizeColumns;
+};
+
+enum printOptionsColumn
+{
+    printOptionLabelColumn,
+    printOptionValueColumn,
+    printOptionNumColumn
+};
 
 // Callbacks.
@@ -138 +124 @@
 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);
+    addOptionToList (m_PageSize, name, value);
 }
 
@@ -161 +142 @@
 
 void
+PrintView::addResolution (const gchar *name, const gchar *value)
+{
+    addOptionToList (m_Resolution, name, value);
+}
+
+void
 PrintView::clearPageSizeList ()
 {
     gtk_list_store_clear (m_PageSize);
+}
+
+void
+PrintView::clearResolutionList ()
+{
+    gtk_list_store_clear (m_Resolution);
 }
 
@@ -176 +169 @@
 {
     PrintPageLayout layout = PRINT_PAGE_LAYOUT_PLAIN;
-    GtkTreeIter layoutIter;
-    if ( gtk_combo_box_get_active_iter (GTK_COMBO_BOX (m_LayoutView),
-                                        &layoutIter) )
-    {
-        gtk_tree_model_get (GTK_TREE_MODEL (m_Layout), &layoutIter,
-                            printLayoutValueColumn, &layout,
-                            -1);
-    }
-
+    getOptionFromComboBox (m_LayoutView, &layout);
     return layout;
 }
@@ -192 +177 @@
 {
     PrintPageOrientation orientation = PRINT_PAGE_ORIENTATION_PORTRAIT;
-    GtkTreeIter orientationIter;
-    if ( gtk_combo_box_get_active_iter (GTK_COMBO_BOX (m_OrientationView),
-                                        &orientationIter) )
-    {
-        gtk_tree_model_get (GTK_TREE_MODEL (m_Orientation), &orientationIter,
-                            printOrientationValueColumn, &orientation,
-                            -1);
-    }
+    getOptionFromComboBox (m_OrientationView, &orientation);
     return orientation;
 }
@@ -213 +191 @@
 {
     gchar *pageSize = NULL;
-    GtkTreeIter pageSizeIter;
-    if ( gtk_combo_box_get_active_iter (GTK_COMBO_BOX (m_PageSizeView),
-                                        &pageSizeIter) )
-    {
-        gtk_tree_model_get (GTK_TREE_MODEL (m_PageSize), &pageSizeIter,
-                            pageSizeValueColumn, &pageSize,
-                            -1);
-    }
+    getOptionFromComboBox (m_PageSizeView, &pageSize);
     return pageSize;
 }
@@ -268 +239 @@
 
 void
-PrintView::selectPageSize (unsigned int pageSizeIndex)
+PrintView::selectPageSize (guint pageSizeIndex)
 {
     gtk_combo_box_set_active (GTK_COMBO_BOX (m_PageSizeView), pageSizeIndex);
@@ -274 +245 @@
 
 void
-PrintView::selectPrinter (unsigned int printerIndex)
+PrintView::selectPrinter (guint printerIndex)
 {
     gchar *pathString = g_strdup_printf ("%d", printerIndex);
@@ -289 +260 @@
 
 void
+PrintView::selectResolution (guint resolutionIndex)
+{
+    gtk_combo_box_set_active (GTK_COMBO_BOX (m_ResolutionView),
+                              resolutionIndex);
+}
+
+void
 PrintView::sensitiveCollate (gboolean sensitive)
 {
@@ -305 +283 @@
     gtk_dialog_set_response_sensitive (GTK_DIALOG (m_PrintDialog),
                                        GTK_RESPONSE_ACCEPT, sensitive);
+}
+
+void
+PrintView::addOptionToList (GtkListStore *optionList, const gchar *name,
+                            const gchar *value)
+{
+    GtkTreeIter newOptionIter;
+    gtk_list_store_append (optionList, &newOptionIter);
+    gtk_list_store_set (optionList, &newOptionIter,
+                        printOptionLabelColumn, name,
+                        printOptionValueColumn, value,
+                        -1);
+}
+
+void
+PrintView::getOptionFromComboBox (GtkWidget *comboBox, gpointer value)
+{
+    GtkTreeIter optionIter;
+    if ( gtk_combo_box_get_active_iter (GTK_COMBO_BOX (comboBox), &optionIter) )
+    {
+        GtkTreeModel *model =
+            gtk_combo_box_get_model (GTK_COMBO_BOX (comboBox));
+        gtk_tree_model_get (model, &optionIter,
+                            printOptionValueColumn, value,
+                            -1);
+    }
 }
 
@@ -454 +458 @@
                                         renderer,
                                         "text",
-                                        printOrientationLabelColumn, NULL);
+                                        printOptionLabelColumn, NULL);
     }
     gtk_table_attach (GTK_TABLE (paperTable), paperSizeLabel,
@@ -483 +487 @@
                                         renderer,
                                         "text",
-                                        printOrientationLabelColumn, NULL);
+                                        printOptionLabelColumn, NULL);
     }
     gtk_combo_box_set_active (GTK_COMBO_BOX (m_OrientationView), 0);
@@ -511 +515 @@
         gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (m_LayoutView),
                                         renderer,
-                                        "text", printLayoutLabelColumn, NULL);
+                                        "text", printOptionLabelColumn, NULL);
     }
     gtk_combo_box_set_active (GTK_COMBO_BOX (m_LayoutView), 0);
@@ -557 +561 @@
                                         renderer,
                                         "text",
-                                        // XXX: Change with the final column
-                                        0, NULL);
+                                        printOptionLabelColumn, NULL);
     }
     gtk_table_attach (GTK_TABLE (outputTable), colorModeLabel,
@@ -575 +578 @@
     gtk_label_set_use_underline (GTK_LABEL (resolutionLabel), TRUE);
 
-//    createResolutionListModel ();
-    GtkWidget *resolutionView = gtk_combo_box_new (); //_with_model (GTK_TREE_MODEL (m_Resolution));
+    createResolutionListModel ();
+    m_ResolutionView =
+        gtk_combo_box_new_with_model (GTK_TREE_MODEL (m_Resolution));
     gtk_label_set_mnemonic_widget (GTK_LABEL (resolutionLabel),
-                                   resolutionView);
-    {
-        GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
-        gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (resolutionView),
+                                   m_ResolutionView);
+    {
+        GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
+        gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (m_ResolutionView),
                                     renderer, TRUE);
-        gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (resolutionView),
+        gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (m_ResolutionView),
                                         renderer,
                                         "text",
-                                        // XXX Change with the final column
-                                        0, NULL);
+                                        printOptionLabelColumn, NULL);
     }
     gtk_table_attach (GTK_TABLE (outputTable), resolutionLabel,
@@ -594 +597 @@
                       (GtkAttachOptions)(GTK_SHRINK),
                       0, 0);
-    gtk_table_attach (GTK_TABLE (outputTable), resolutionView,
+    gtk_table_attach (GTK_TABLE (outputTable), m_ResolutionView,
                       1, 2, 1, 2,
                       (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
@@ -660 +663 @@
 PrintView::createLayoutListModel ()
 {
-    m_Layout = gtk_list_store_new (printLayoutNumColumn,
+    m_Layout = gtk_list_store_new (printOptionNumColumn,
                                    G_TYPE_STRING,  // Label
                                    G_TYPE_INT);    // Value
@@ -667 +670 @@
     gtk_list_store_append (m_Layout, &iter);
     gtk_list_store_set (m_Layout, &iter,
-                        printLayoutLabelColumn, _("Plain"),
-                        printLayoutValueColumn, PRINT_PAGE_LAYOUT_PLAIN,
+                        printOptionLabelColumn, _("Plain"),
+                        printOptionValueColumn, 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,
+                        printOptionLabelColumn, _("2 pages in 1"),
+                        printOptionValueColumn, 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,
+                        printOptionLabelColumn, _("4 pages in 1"),
+                        printOptionValueColumn, PRINT_PAGE_LAYOUT_4IN1,
                         -1);
 }
@@ -687 +690 @@
 PrintView::createOrientationListModel ()
 {
-    m_Orientation = gtk_list_store_new (printOrientationNumColumn,
+    m_Orientation = gtk_list_store_new (printOptionNumColumn,
                                         G_TYPE_STRING,  // Label
                                         G_TYPE_INT);    // Value
@@ -694 +697 @@
     gtk_list_store_append (m_Orientation, &iter);
     gtk_list_store_set (m_Orientation, &iter,
-                printOrientationLabelColumn, _("Portrait"),
-                printOrientationValueColumn, PRINT_PAGE_ORIENTATION_PORTRAIT,
+                printOptionLabelColumn, _("Portrait"),
+                printOptionValueColumn, 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,
+                printOptionLabelColumn, _("Landscape"),
+                printOptionValueColumn, PRINT_PAGE_ORIENTATION_LANDSCAPE,
                 -1);
 }
@@ -708 +711 @@
 PrintView::createPageSizeListModel ()
 {
-    m_PageSize = gtk_list_store_new (pageSizeNumColumn,
+    m_PageSize = gtk_list_store_new (printOptionNumColumn,
                                      G_TYPE_STRING,  // Label
                                      G_TYPE_STRING); // Value
@@ -725 +728 @@
 }
 
+void
+PrintView::createResolutionListModel ()
+{
+    m_Resolution = gtk_list_store_new (printOptionNumColumn,
+                                       G_TYPE_STRING,  // Label
+                                       G_TYPE_STRING); // Value
+}
+
+
+
 ////////////////////////////////////////////////////////////////
 // Callbacks

trunk/src/gtk/PrintView.h

@@ -31 +31 @@
             virtual void addPageSize (const gchar *name,
                                       const gchar *value);
-            virtual void addPrinter (const gchar *name, int jobs,
+            virtual void addPrinter (const gchar *name, gint jobs,
                                      const gchar *state,
                                      const gchar *location);
+            virtual void addResolution (const gchar *name,
+                                        const gchar *value);
             virtual void clearPageSizeList (void);
-            virtual unsigned int getNumberOfCopies (void);
+            virtual void clearResolutionList (void);
+            virtual guint getNumberOfCopies (void);
             virtual PrintPageLayout getPageLayout (void);
             virtual PrintPageOrientation getPageOrientation (void);
@@ -45 +48 @@
             virtual gboolean isSelectedEvenPageSet (void);
             virtual gboolean isSelectedOddPageSet (void);
-            virtual void selectPageSize (unsigned int pageSizeIndex);
-            virtual void selectPrinter (unsigned int printerIndex);
+            virtual void selectPageSize (guint pageSizeIndex);
+            virtual void selectPrinter (guint printerIndex);
+            virtual void selectResolution (guint resolutionIndex);
             virtual void sensitiveCollate (gboolean sensitive);
             virtual void sensitivePageRange (gboolean sensitive);
@@ -68 +72 @@
             GtkListStore *m_PrinterList;
             GtkWidget *m_PrinterListView;
+            GtkListStore *m_Resolution;
+            GtkWidget *m_ResolutionView;
+
+            void addOptionToList (GtkListStore *optionList,
+                                  const gchar *name, const gchar *value);
+            void getOptionFromComboBox (GtkWidget *comboBox, gpointer value);
 
             GtkWidget *createJobTab (void);
@@ -77 +87 @@
             void createPageSizeListModel (void);
             void createPrinterListModel (void);
+            void createResolutionListModel (void);
     };
 }