Changeset 220

Timestamp:

06/11/06 09:47:12 (2 years ago)

Author:

jordi

Message:

The Print Dialog now selects a printer (default printer or the first, if there's no default.) Also, when there's no printers available the Print button is insensitived.

Location:

trunk/src

Files:

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

trunk/src/IPrintView.h

@@ -93 +93 @@
 
             ///
+            /// @brief Selects a printer from the list.
+            ///
+            /// @param printerIndex The index of the printer to select.
+            ///
+            virtual void selectPrinter (unsigned int printerIndex) = 0;
+
+            ///
             /// @brief Changes the sensitivity of the "Collate" option.
             ///
@@ -114 +121 @@
             virtual void sensitivePageRange (gboolean sensitive) = 0;
 
+            ///
+            /// @brief Changes the sensitivity of the "Print" button.
+            ///
+            /// The view must change the sensitivity (it's called enabled or
+            /// disabled on some toolkits) of the "Print" button.
+            ///
+            /// @param sensitive Set to TRUE if need to sensitive (enable) the
+            ///                  button or FALSE to insensitive (disable) it.
+            ///
+            virtual void sensitivePrintButton (gboolean sensitive) = 0;
+
+
         protected:
             /// The presenter that controls the view.

trunk/src/PrintPter.cxx

@@ -192 +192 @@
 PrintPter::listPrinters (void)
 {
+    IPrintView &view = getView ();
+
     cups_dest_t *destinations;
     int numDestinations = cupsGetDests (&destinations);
+    // For now we don't have any printer selected.
+    int printerToSelect = -1;
 
     for ( int currentDestination = 0 ; currentDestination < numDestinations ;
@@ -207 +211 @@
         printerAttributes *attributes = getPrinterAttributes (printerName);
         // Set all this data to the view.
-        getView ().addPrinter (printerName, numJobs,
+        view.addPrinter (printerName, numJobs,
                                attributes->state, attributes->location);
         g_free (attributes->location);
         g_free (attributes->state);
         delete attributes;
-    }
-
+
+        // If the printer is the default and we don't have any printer
+        // selected, then we should select it.
+        if ( -1 == printerToSelect &&
+             destinations[currentDestination].is_default )
+        {
+            printerToSelect = currentDestination;
+        }
+    }
     cupsFreeDests (numDestinations, destinations);
-}
+
+    // If not printer is available, insensitive the print button.
+    if ( 0 == numDestinations )
+    {
+        view.sensitivePrintButton (FALSE);
+    }
+    // Otherwise select a printer: the previously used, the default or 
+    // the first.
+    else
+    {
+        if ( -1 == printerToSelect )
+        {
+            view.selectPrinter (0);
+        }
+        else
+        {
+            view.selectPrinter (printerToSelect);
+        }
+    }
+}

trunk/src/gtk/PrintView.cxx

@@ -135 +135 @@
 
 void
+PrintView::selectPrinter (unsigned int printerIndex)
+{
+    gchar *pathString = g_strdup_printf ("%d", printerIndex);
+    GtkTreeIter printerIter;
+    if ( gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (m_PrinterList),
+                                              &printerIter, pathString) )
+    {
+        GtkTreeSelection *selection =
+            gtk_tree_view_get_selection (GTK_TREE_VIEW (m_PrinterListView));
+        gtk_tree_selection_select_iter (selection, &printerIter);
+    }
+    g_free (pathString);
+}
+
+void
 PrintView::sensitiveCollate (gboolean sensitive)
 {
@@ -144 +159 @@
 {
     gtk_widget_set_sensitive (m_PageRange, sensitive);
+}
+
+void
+PrintView::sensitivePrintButton (gboolean sensitive)
+{
+    gtk_dialog_set_response_sensitive (GTK_DIALOG (m_PrintDialog),
+                                       GTK_RESPONSE_ACCEPT, sensitive);
 }
 

trunk/src/gtk/PrintView.h

@@ -34 +34 @@
             virtual unsigned int getNumberOfCopies (void);
             virtual gboolean isSelectedAllPagesRangeOption (void);
+            virtual void selectPrinter (unsigned int printerInde);
             virtual void sensitiveCollate (gboolean sensitive);
             virtual void sensitivePageRange (gboolean sensitive);
+            virtual void sensitivePrintButton (gboolean sensitive);
 
         protected: