Changeset 232

Timestamp:

06/13/06 15:50:59 (2 years ago)

Author:

jordi

Message:

Added the Color Model options to the print view.

Location:

trunk/src

Files:

• IPrintView.h (modified) (3 diffs)
• PrintPter.cxx (modified) (1 diff)
• gtk/PrintView.cxx (modified) (6 diffs)
• gtk/PrintView.h (modified) (5 diffs)

trunk/src/IPrintView.h

@@ -62 +62 @@
 
             ///
+            /// @brief Adds a new color model to the list.
+            ///
+            /// @param name The possibly translated name of the color model.
+            /// @param value The value the ePDFView internally uses to know
+            ///              which colorModel is.
+            ///
+            virtual void addColorModel (const gchar *name,
+                                        const gchar *value) = 0;
+ 
+
+            ///
             /// @brief Adds a new page size to the list.
             ///
@@ -97 +108 @@
 
             ///
+            /// @brief Deletes all color models from the list of color modes.
+            ///
+            virtual void clearColorModelList (void) = 0;
+
+            ///
             /// @brief Deletes all sizes from the list of page sizes.
             ///
@@ -186 +202 @@
 
             ///
+            /// @brief Select a color model.
+            ///
+            /// @param colorModelIndex The index of the color model to select.
+            ///
+            virtual void selectColorModel (guint colorModelIndex) = 0;
+
+            ///
             /// @brief Selects a page size.
             ///

trunk/src/PrintPter.cxx

@@ -233 +233 @@
                 }
                 view.selectResolution (resolutionToSelect);
+
+                // Get the color models.
+                ppd_option_t *colorModelOption =
+                    ppdFindOption (printerPPD, "ColorModel");
+                view.clearColorModelList ();
+                if ( NULL != colorModelOption )
+                {
+                    int colorModelToSelect = 0;
+                    ppd_choice_t *colorModelChoice = colorModelOption->choices;
+                    for ( int currentColor = 0 ;
+                          currentColor < colorModelOption->num_choices ;
+                          ++currentColor, ++colorModelChoice )
+                    {
+                        const gchar *colorName = colorModelChoice->text;
+                        const gchar *colorValue = colorModelChoice->choice;
+
+                        view.addColorModel (_(colorName), colorValue);
+                        if ( colorModelChoice->marked )
+                        {
+                            colorModelToSelect = currentColor;
+                        }
+                    }
+                    view.selectColorModel (colorModelToSelect);
+                }
+                else
+                {
+                    view.addColorModel (_("Grayscale"), "Gray");
+                }
                 ppdClose (printerPPD);
             }

trunk/src/gtk/PrintView.cxx

@@ -122 +122 @@
 
 void
+PrintView::addColorModel (const gchar *name, const gchar *value)
+{
+    addOptionToList (m_ColorModel, name, value);
+}
+
+void
 PrintView::addPageSize (const gchar *name, const gchar *value)
 {
@@ -148 +154 @@
 
 void
+PrintView::clearColorModelList ()
+{
+    gtk_list_store_clear (m_ColorModel);
+}
+
+void
 PrintView::clearPageSizeList ()
 {
@@ -236 +248 @@
 {
     return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (m_OddPageSet));
+}
+
+void
+PrintView::selectColorModel (guint colorModelIndex)
+{
+    gtk_combo_box_set_active (GTK_COMBO_BOX (m_ColorModelView),
+                              colorModelIndex);
 }
 
@@ -551 +570 @@
     gtk_misc_set_alignment (GTK_MISC (colorModeLabel), 1.0, 0.5);
     gtk_label_set_use_underline (GTK_LABEL (colorModeLabel), TRUE);
-//    createColorModeListModel ();
-    GtkWidget *colorModeView = gtk_combo_box_new (); //_with_model (GTK_TREE_MODEL (m_ColorMode));
-    gtk_label_set_mnemonic_widget (GTK_LABEL (colorModeLabel), colorModeView);
-    {
-        GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
-        gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (colorModeView),
+    createColorModelListModel ();
+    m_ColorModelView =
+        gtk_combo_box_new_with_model (GTK_TREE_MODEL (m_ColorModel));
+    gtk_label_set_mnemonic_widget (GTK_LABEL (colorModeLabel),
+                                   m_ColorModelView);
+    {
+        GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
+        gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (m_ColorModelView),
                                     renderer, TRUE);
-        gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (colorModeView),
+        gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (m_ColorModelView),
                                         renderer,
                                         "text",
@@ -568 +589 @@
                       (GtkAttachOptions)(GTK_SHRINK),
                       0, 0);
-    gtk_table_attach (GTK_TABLE (outputTable), colorModeView,
+    gtk_table_attach (GTK_TABLE (outputTable), m_ColorModelView,
                       1, 2, 0, 1,
                       (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
@@ -661 +682 @@
 
 void
+PrintView::createColorModelListModel ()
+{
+    m_ColorModel = gtk_list_store_new (printOptionNumColumn,
+                                       G_TYPE_STRING,  // Label
+                                       G_TYPE_INT);    // Value
+}
+
+void
 PrintView::createLayoutListModel ()
 {

trunk/src/gtk/PrintView.h

@@ -29 +29 @@
             virtual void setPresenter (PrintPter *pter);
 
+            virtual void addColorModel (const gchar *name,
+                                        const gchar *value);
             virtual void addPageSize (const gchar *name,
                                       const gchar *value);
@@ -36 +38 @@
             virtual void addResolution (const gchar *name,
                                         const gchar *value);
+            virtual void clearColorModelList (void);
             virtual void clearPageSizeList (void);
             virtual void clearResolutionList (void);
@@ -48 +51 @@
             virtual gboolean isSelectedEvenPageSet (void);
             virtual gboolean isSelectedOddPageSet (void);
+            virtual void selectColorModel (guint colorModeIndex);
             virtual void selectPageSize (guint pageSizeIndex);
             virtual void selectPrinter (guint printerIndex);
@@ -58 +62 @@
             GtkWidget *m_AllPagesRangeOption;
             GtkWidget *m_Collate;
+            GtkListStore *m_ColorModel;
+            GtkWidget *m_ColorModelView;
             GtkWidget *m_CustomPagesRangeOption;
             GtkWidget *m_EvenPageSet;
@@ -83 +89 @@
             GtkWidget *createPrinterTab (void);
 
+            void createColorModelListModel (void);
             void createLayoutListModel (void);
             void createOrientationListModel (void);