]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkprinteroptionwidget.c
gtk: remove "gboolean homogeneous" from gtk_box_new()
[~andy/gtk] / gtk / gtkprinteroptionwidget.c
index 688f5c90f06c2eeba541cfe29bb3033df04fdad1..89891a4d1bce172b87412918b307cece8977635b 100644 (file)
@@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#include <ctype.h>
 
 #include "gtkintl.h"
 #include "gtkalignment.h"
 #include "gtkimage.h"
 #include "gtklabel.h"
 #include "gtkliststore.h"
+#include "gtkradiobutton.h"
 #include "gtkstock.h"
 #include "gtktable.h"
 #include "gtktogglebutton.h"
 #include "gtkprivate.h"
 
 #include "gtkprinteroptionwidget.h"
-#include "gtkalias.h"
 
 #define GTK_PRINTER_OPTION_WIDGET_GET_PRIVATE(o)  \
    (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_PRINTER_OPTION_WIDGET, GtkPrinterOptionWidgetPrivate))
@@ -60,6 +61,7 @@ struct GtkPrinterOptionWidgetPrivate
   GtkWidget *image;
   GtkWidget *label;
   GtkWidget *filechooser;
+  GtkWidget *box;
 };
 
 enum {
@@ -69,12 +71,12 @@ enum {
 
 enum {
   PROP_0,
-  PROP_SOURCE,
+  PROP_SOURCE
 };
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE (GtkPrinterOptionWidget, gtk_printer_option_widget, GTK_TYPE_HBOX);
+G_DEFINE_TYPE (GtkPrinterOptionWidget, gtk_printer_option_widget, GTK_TYPE_HBOX)
 
 static void gtk_printer_option_widget_set_property (GObject      *object,
                                                    guint         prop_id,
@@ -85,7 +87,7 @@ static void gtk_printer_option_widget_get_property (GObject      *object,
                                                    GValue       *value,
                                                    GParamSpec   *pspec);
 static gboolean gtk_printer_option_widget_mnemonic_activate (GtkWidget *widget,
-                                                             gboolean   group_cycling);
+                                                             gboolean  group_cycling);
 
 static void
 gtk_printer_option_widget_class_init (GtkPrinterOptionWidgetClass *class)
@@ -134,18 +136,16 @@ gtk_printer_option_widget_init (GtkPrinterOptionWidget *widget)
 static void
 gtk_printer_option_widget_finalize (GObject *object)
 {
-  GtkPrinterOptionWidget *widget;
+  GtkPrinterOptionWidget *widget = GTK_PRINTER_OPTION_WIDGET (object);
+  GtkPrinterOptionWidgetPrivate *priv = widget->priv;
   
-  widget = GTK_PRINTER_OPTION_WIDGET (object);
-
-  if (widget->priv->source)
+  if (priv->source)
     {
-      g_object_unref (widget->priv->source);
-      widget->priv->source = NULL;
+      g_object_unref (priv->source);
+      priv->source = NULL;
     }
   
-  if (G_OBJECT_CLASS (gtk_printer_option_widget_parent_class)->finalize)
-    G_OBJECT_CLASS (gtk_printer_option_widget_parent_class)->finalize (object);
+  G_OBJECT_CLASS (gtk_printer_option_widget_parent_class)->finalize (object);
 }
 
 static void
@@ -175,14 +175,13 @@ gtk_printer_option_widget_get_property (GObject    *object,
                                        GValue     *value,
                                        GParamSpec *pspec)
 {
-  GtkPrinterOptionWidget *widget;
-  
-  widget = GTK_PRINTER_OPTION_WIDGET (object);
+  GtkPrinterOptionWidget *widget = GTK_PRINTER_OPTION_WIDGET (object);
+  GtkPrinterOptionWidgetPrivate *priv = widget->priv;
 
   switch (prop_id)
     {
     case PROP_SOURCE:
-      g_value_set_object (value, widget->priv->source);
+      g_value_set_object (value, priv->source);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -228,23 +227,25 @@ source_changed_cb (GtkPrinterOption *source,
 }
 
 void
-gtk_printer_option_widget_set_source (GtkPrinterOptionWidget  *widget,
-                                     GtkPrinterOption *source)
+gtk_printer_option_widget_set_source (GtkPrinterOptionWidget *widget,
+                                     GtkPrinterOption       *source)
 {
+  GtkPrinterOptionWidgetPrivate *priv = widget->priv;
+
   if (source)
     g_object_ref (source);
   
-  if (widget->priv->source)
+  if (priv->source)
     {
-      g_signal_handler_disconnect (widget->priv->source,
-                                  widget->priv->source_changed_handler);
-      g_object_unref (widget->priv->source);
+      g_signal_handler_disconnect (priv->source,
+                                  priv->source_changed_handler);
+      g_object_unref (priv->source);
     }
 
-  widget->priv->source = source;
+  priv->source = source;
 
   if (source)
-    widget->priv->source_changed_handler =
+    priv->source_changed_handler =
       g_signal_connect (source, "changed", G_CALLBACK (source_changed_cb), widget);
 
   construct_widgets (widget);
@@ -253,30 +254,63 @@ gtk_printer_option_widget_set_source (GtkPrinterOptionWidget  *widget,
   g_object_notify (G_OBJECT (widget), "source");
 }
 
-static GtkWidget *
-combo_box_new (void)
+enum {
+  NAME_COLUMN,
+  VALUE_COLUMN,
+  N_COLUMNS
+};
+
+static void
+combo_box_set_model (GtkWidget *combo_box)
 {
-  GtkWidget *combo_box;
-  GtkCellRenderer *cell;
   GtkListStore *store;
 
-  store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
-  combo_box = gtk_combo_box_new_with_model (GTK_TREE_MODEL (store));
+  store = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING);
+  gtk_combo_box_set_model (GTK_COMBO_BOX (combo_box), GTK_TREE_MODEL (store));
   g_object_unref (store);
+}
+
+static void
+combo_box_set_view (GtkWidget *combo_box)
+{
+  GtkCellRenderer *cell;
 
   cell = gtk_cell_renderer_text_new ();
   gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), cell, TRUE);
   gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), cell,
-                                  "text", 0,
-                                  NULL);
+                                  "text", NAME_COLUMN,
+                                   NULL);
+}
+
+static GtkWidget *
+combo_box_entry_new (void)
+{
+  GtkWidget *combo_box;
+  combo_box = g_object_new (GTK_TYPE_COMBO_BOX, "has-entry", TRUE, NULL);
+
+  combo_box_set_model (combo_box);
+
+  gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (combo_box), NAME_COLUMN);
+
+  return combo_box;
+}
+
+static GtkWidget *
+combo_box_new (void)
+{
+  GtkWidget *combo_box;
+  combo_box = gtk_combo_box_new ();
+
+  combo_box_set_model (combo_box);
+  combo_box_set_view (combo_box);
 
   return combo_box;
 }
   
 static void
-combo_box_append (GtkWidget *combo,
-                 const char *display_text,
-                 const char *value)
+combo_box_append (GtkWidget   *combo,
+                 const gchar *display_text,
+                 const gchar *value)
 {
   GtkTreeModel *model;
   GtkListStore *store;
@@ -287,24 +321,27 @@ combo_box_append (GtkWidget *combo,
 
   gtk_list_store_append (store, &iter);
   gtk_list_store_set (store, &iter,
-                     0, display_text,
-                     1, value,
+                     NAME_COLUMN, display_text,
+                     VALUE_COLUMN, value,
                      -1);
 }
 
 struct ComboSet {
   GtkComboBox *combo;
-  const char *value;
+  const gchar *value;
 };
 
 static gboolean
-set_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
+set_cb (GtkTreeModel *model, 
+       GtkTreePath  *path, 
+       GtkTreeIter  *iter, 
+       gpointer      data)
 {
   struct ComboSet *set_data = data;
   gboolean found;
   char *value;
   
-  gtk_tree_model_get (model, iter, 1, &value, -1);
+  gtk_tree_model_get (model, iter, VALUE_COLUMN, &value, -1);
   found = (strcmp (value, set_data->value) == 0);
   g_free (value);
   
@@ -315,15 +352,13 @@ set_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data
 }
 
 static void
-combo_box_set (GtkWidget *combo,
-              const char *value)
+combo_box_set (GtkWidget   *combo,
+              const gchar *value)
 {
   GtkTreeModel *model;
-  GtkListStore *store;
   struct ComboSet set_data;
   
   model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
-  store = GTK_LIST_STORE (model);
 
   set_data.combo = GTK_COMBO_BOX (combo);
   set_data.value = value;
@@ -334,183 +369,407 @@ static char *
 combo_box_get (GtkWidget *combo)
 {
   GtkTreeModel *model;
-  char *val;
+  gchar *value;
   GtkTreeIter iter;
-  
+
   model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
 
-  val = NULL;
+  value = NULL;
   if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter))
-    gtk_tree_model_get (model, &iter,
-                       1, &val,
-                       -1);
-  return val;
+     gtk_tree_model_get (model, &iter, VALUE_COLUMN, &value, -1);
+
+  return value;
 }
 
 
 static void
 deconstruct_widgets (GtkPrinterOptionWidget *widget)
 {
-  if (widget->priv->check)
+  GtkPrinterOptionWidgetPrivate *priv = widget->priv;
+
+  if (priv->check)
     {
-      gtk_widget_destroy (widget->priv->check);
-      widget->priv->check = NULL;
+      gtk_widget_destroy (priv->check);
+      priv->check = NULL;
     }
   
-  if (widget->priv->combo)
+  if (priv->combo)
     {
-      gtk_widget_destroy (widget->priv->combo);
-      widget->priv->combo = NULL;
+      gtk_widget_destroy (priv->combo);
+      priv->combo = NULL;
     }
   
-  if (widget->priv->entry)
+  if (priv->entry)
     {
-      gtk_widget_destroy (widget->priv->entry);
-      widget->priv->entry = NULL;
+      gtk_widget_destroy (priv->entry);
+      priv->entry = NULL;
     }
 
   /* make sure entry and combo are destroyed first */
   /* as we use the two of them to create the filechooser */
-  if (widget->priv->filechooser)
+  if (priv->filechooser)
     {
-      gtk_widget_destroy (widget->priv->filechooser);
-      widget->priv->filechooser = NULL;
+      gtk_widget_destroy (priv->filechooser);
+      priv->filechooser = NULL;
     }
 
-  if (widget->priv->image)
+  if (priv->image)
     {
-      gtk_widget_destroy (widget->priv->image);
-      widget->priv->image = NULL;
+      gtk_widget_destroy (priv->image);
+      priv->image = NULL;
     }
 
-  if (widget->priv->label)
+  if (priv->label)
     {
-      gtk_widget_destroy (widget->priv->label);
-      widget->priv->label = NULL;
+      gtk_widget_destroy (priv->label);
+      priv->label = NULL;
     }
 }
 
 static void
-check_toggled_cb (GtkToggleButton *toggle_button,
+check_toggled_cb (GtkToggleButton        *toggle_button,
                  GtkPrinterOptionWidget *widget)
 {
-  g_signal_handler_block (widget->priv->source, widget->priv->source_changed_handler);
-  gtk_printer_option_set_boolean (widget->priv->source,
+  GtkPrinterOptionWidgetPrivate *priv = widget->priv;
+
+  g_signal_handler_block (priv->source, priv->source_changed_handler);
+  gtk_printer_option_set_boolean (priv->source,
                                  gtk_toggle_button_get_active (toggle_button));
-  g_signal_handler_unblock (widget->priv->source, widget->priv->source_changed_handler);
+  g_signal_handler_unblock (priv->source, priv->source_changed_handler);
   emit_changed (widget);
 }
 
 static void
-filesave_changed_cb (GtkWidget *w,
+filesave_changed_cb (GtkWidget              *button,
                      GtkPrinterOptionWidget *widget)
 {
-  char *value;
-  char *directory;
-  const char *file;
+  GtkPrinterOptionWidgetPrivate *priv = widget->priv;
+  gchar *uri, *file;
+  gchar *directory;
+
+  file = g_filename_from_utf8 (gtk_entry_get_text (GTK_ENTRY (priv->entry)),
+                              -1, NULL, NULL, NULL);
+  if (file == NULL)
+    return;
 
   /* combine the value of the chooser with the value of the entry */
-  g_signal_handler_block (widget->priv->source, widget->priv->source_changed_handler);  
-  
-  /* TODO: how do we support nonlocal file systems? */
-  directory = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (widget->priv->combo));
-  file =  gtk_entry_get_text (GTK_ENTRY (widget->priv->entry));
+  g_signal_handler_block (priv->source, priv->source_changed_handler);  
 
-  value = g_build_filename (directory, file, NULL);
+  directory = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (priv->combo));
 
-  if (value)
-    gtk_printer_option_set (widget->priv->source, value);
+  if ((g_uri_parse_scheme (file) == NULL) && (directory != NULL))
+    {
+      if (g_path_is_absolute (file))
+        uri = g_filename_to_uri (file, NULL, NULL);
+      else
+        {
+          gchar *path;
+
+#ifdef G_OS_UNIX
+          if (file[0] == '~' && file[1] == '/')
+            {
+              path = g_build_filename (g_get_home_dir (), file + 2, NULL);
+            }
+          else
+#endif
+            {
+              path = g_build_filename (directory, file, NULL);
+            }
+
+          uri = g_filename_to_uri (path, NULL, NULL);
+
+          g_free (path);
+        }
+    }
+  else
+    {
+      if (g_uri_parse_scheme (file) != NULL)
+        uri = g_strdup (file);
+      else
+        uri = g_build_path ("/", gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (priv->combo)), file, NULL);
+    }
+  if (uri)
+    gtk_printer_option_set (priv->source, uri);
 
+  g_free (uri);
+  g_free (file);
   g_free (directory);
-  g_free (value);
 
-  g_signal_handler_unblock (widget->priv->source, widget->priv->source_changed_handler);
+  g_signal_handler_unblock (priv->source, priv->source_changed_handler);
   emit_changed (widget);
 }
 
+static gchar *
+filter_numeric (const gchar *val,
+                gboolean     allow_neg,
+               gboolean     allow_dec,
+                gboolean    *changed_out)
+{
+  gchar *filtered_val;
+  int i, j;
+  int len = strlen (val);
+  gboolean dec_set = FALSE;
+
+  filtered_val = g_malloc (len + 1);
+
+  for (i = 0, j = 0; i < len; i++)
+    {
+      if (isdigit (val[i]))
+        {
+          filtered_val[j] = val[i];
+         j++;
+       }
+      else if (allow_dec && !dec_set && 
+               (val[i] == '.' || val[i] == ','))
+        {
+         /* allow one period or comma
+          * we should be checking locals
+          * but this is good enough for now
+          */
+          filtered_val[j] = val[i];
+         dec_set = TRUE;
+         j++;
+       }
+      else if (allow_neg && i == 0 && val[0] == '-')
+        {
+          filtered_val[0] = val[0];
+         j++;
+       }
+    }
+
+  filtered_val[j] = '\0';
+  *changed_out = !(i == j);
+
+  return filtered_val;
+}
+
 static void
-combo_changed_cb (GtkWidget *combo,
+combo_changed_cb (GtkWidget              *combo,
                  GtkPrinterOptionWidget *widget)
 {
-  char *value;
+  GtkPrinterOptionWidgetPrivate *priv = widget->priv;
+  gchar *value;
+  gchar *filtered_val = NULL;
+  gboolean changed;
+
+  g_signal_handler_block (priv->source, priv->source_changed_handler);
   
-  g_signal_handler_block (widget->priv->source, widget->priv->source_changed_handler);
   value = combo_box_get (combo);
+
+  /* handle some constraints */
+  switch (priv->source->type)
+    {
+    case GTK_PRINTER_OPTION_TYPE_PICKONE_PASSCODE:
+      filtered_val = filter_numeric (value, FALSE, FALSE, &changed);
+      break;   
+    case GTK_PRINTER_OPTION_TYPE_PICKONE_INT:
+      filtered_val = filter_numeric (value, TRUE, FALSE, &changed);
+      break;
+    case GTK_PRINTER_OPTION_TYPE_PICKONE_REAL:
+      filtered_val = filter_numeric (value, TRUE, TRUE, &changed);
+      break;
+    default:
+      break;
+    }
+
+  if (filtered_val)
+    {
+      g_free (value);
+
+      if (changed)
+        {
+          GtkEntry *entry;
+         
+         entry = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (combo)));
+
+          gtk_entry_set_text (entry, filtered_val);
+       }
+      value = filtered_val;
+    }
+
   if (value)
-    gtk_printer_option_set (widget->priv->source, value);
+    gtk_printer_option_set (priv->source, value);
   g_free (value);
-  g_signal_handler_unblock (widget->priv->source, widget->priv->source_changed_handler);
+  g_signal_handler_unblock (priv->source, priv->source_changed_handler);
   emit_changed (widget);
 }
 
 static void
-entry_changed_cb (GtkWidget *entry,
+entry_changed_cb (GtkWidget              *entry,
                  GtkPrinterOptionWidget *widget)
 {
-  const char *value;
+  GtkPrinterOptionWidgetPrivate *priv = widget->priv;
+  const gchar *value;
   
-  g_signal_handler_block (widget->priv->source, widget->priv->source_changed_handler);
+  g_signal_handler_block (priv->source, priv->source_changed_handler);
   value = gtk_entry_get_text (GTK_ENTRY (entry));
   if (value)
-    gtk_printer_option_set (widget->priv->source, value);
-  g_signal_handler_unblock (widget->priv->source, widget->priv->source_changed_handler);
+    gtk_printer_option_set (priv->source, value);
+  g_signal_handler_unblock (priv->source, priv->source_changed_handler);
   emit_changed (widget);
 }
 
 
+static void
+radio_changed_cb (GtkWidget              *button,
+                 GtkPrinterOptionWidget *widget)
+{
+  GtkPrinterOptionWidgetPrivate *priv = widget->priv;
+  gchar *value;
+  
+  g_signal_handler_block (priv->source, priv->source_changed_handler);
+  value = g_object_get_data (G_OBJECT (button), "value");
+  if (value)
+    gtk_printer_option_set (priv->source, value);
+  g_signal_handler_unblock (priv->source, priv->source_changed_handler);
+  emit_changed (widget);
+}
+
+static void
+select_maybe (GtkWidget   *widget, 
+             const gchar *value)
+{
+  gchar *v = g_object_get_data (G_OBJECT (widget), "value");
+      
+  if (strcmp (value, v) == 0)
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
+}
+
+static void
+alternative_set (GtkWidget   *box,
+                const gchar *value)
+{
+  gtk_container_foreach (GTK_CONTAINER (box), 
+                        (GtkCallback) select_maybe,
+                        (gpointer) value);
+}
+
+static GSList *
+alternative_append (GtkWidget              *box,
+                   const gchar            *label,
+                    const gchar            *value,
+                   GtkPrinterOptionWidget *widget,
+                   GSList                 *group)
+{
+  GtkWidget *button;
+
+  button = gtk_radio_button_new_with_label (group, label);
+  gtk_widget_show (button);
+  gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
+
+  g_object_set_data (G_OBJECT (button), "value", (gpointer)value);
+  g_signal_connect (button, "toggled", 
+                   G_CALLBACK (radio_changed_cb), widget);
+
+  return gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
+}
+
 static void
 construct_widgets (GtkPrinterOptionWidget *widget)
 {
+  GtkPrinterOptionWidgetPrivate *priv = widget->priv;
   GtkPrinterOption *source;
   char *text;
   int i;
+  GSList *group;
 
-  source = widget->priv->source;
+  source = priv->source;
   
   deconstruct_widgets (widget);
   
+  gtk_widget_set_sensitive (GTK_WIDGET (widget), TRUE);
+
   if (source == NULL)
     {
-      widget->priv->combo = combo_box_new ();
-      combo_box_append (widget->priv->combo,_("Not available"), "None");
-      gtk_combo_box_set_active (GTK_COMBO_BOX (widget->priv->combo), 0);
-      gtk_widget_set_sensitive (widget->priv->combo, FALSE);
-      gtk_widget_show (widget->priv->combo);
-      gtk_box_pack_start (GTK_BOX (widget), widget->priv->combo, TRUE, TRUE, 0);
+      priv->combo = combo_box_new ();
+      combo_box_append (priv->combo,_("Not available"), "None");
+      gtk_combo_box_set_active (GTK_COMBO_BOX (priv->combo), 0);
+      gtk_widget_set_sensitive (GTK_WIDGET (widget), FALSE);
+      gtk_widget_show (priv->combo);
+      gtk_box_pack_start (GTK_BOX (widget), priv->combo, TRUE, TRUE, 0);
     }
   else switch (source->type)
     {
     case GTK_PRINTER_OPTION_TYPE_BOOLEAN:
-      widget->priv->check = gtk_check_button_new_with_mnemonic (source->display_text);
-      g_signal_connect (widget->priv->check, "toggled", G_CALLBACK (check_toggled_cb), widget);
-      gtk_widget_show (widget->priv->check);
-      gtk_box_pack_start (GTK_BOX (widget), widget->priv->check, TRUE, TRUE, 0);
+      priv->check = gtk_check_button_new_with_mnemonic (source->display_text);
+      g_signal_connect (priv->check, "toggled", G_CALLBACK (check_toggled_cb), widget);
+      gtk_widget_show (priv->check);
+      gtk_box_pack_start (GTK_BOX (widget), priv->check, TRUE, TRUE, 0);
       break;
     case GTK_PRINTER_OPTION_TYPE_PICKONE:
-      widget->priv->combo = combo_box_new ();
+    case GTK_PRINTER_OPTION_TYPE_PICKONE_PASSWORD:
+    case GTK_PRINTER_OPTION_TYPE_PICKONE_PASSCODE:
+    case GTK_PRINTER_OPTION_TYPE_PICKONE_REAL:
+    case GTK_PRINTER_OPTION_TYPE_PICKONE_INT:
+    case GTK_PRINTER_OPTION_TYPE_PICKONE_STRING:
+      if (source->type == GTK_PRINTER_OPTION_TYPE_PICKONE)
+        {
+          priv->combo = combo_box_new ();
+       }
+      else
+        {
+          priv->combo = combo_box_entry_new ();
+
+          if (source->type == GTK_PRINTER_OPTION_TYPE_PICKONE_PASSWORD ||
+             source->type == GTK_PRINTER_OPTION_TYPE_PICKONE_PASSCODE)
+           {
+              GtkEntry *entry;
+
+             entry = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (priv->combo)));
+
+              gtk_entry_set_visibility (entry, FALSE); 
+           }
+        }
+       
+
       for (i = 0; i < source->num_choices; i++)
-         combo_box_append (widget->priv->combo,
+         combo_box_append (priv->combo,
                            source->choices_display[i],
                            source->choices[i]);
-      gtk_widget_show (widget->priv->combo);
-      gtk_box_pack_start (GTK_BOX (widget), widget->priv->combo, TRUE, TRUE, 0);
-      g_signal_connect (widget->priv->combo, "changed", G_CALLBACK (combo_changed_cb), widget);
+      gtk_widget_show (priv->combo);
+      gtk_box_pack_start (GTK_BOX (widget), priv->combo, TRUE, TRUE, 0);
+      g_signal_connect (priv->combo, "changed", G_CALLBACK (combo_changed_cb), widget);
 
       text = g_strdup_printf ("%s:", source->display_text);
-      widget->priv->label = gtk_label_new_with_mnemonic (text);
+      priv->label = gtk_label_new_with_mnemonic (text);
       g_free (text);
-      gtk_widget_show (widget->priv->label);
+      gtk_widget_show (priv->label);
+      break;
+
+    case GTK_PRINTER_OPTION_TYPE_ALTERNATIVE:
+      group = NULL;
+      priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+      gtk_widget_show (priv->box);
+      gtk_box_pack_start (GTK_BOX (widget), priv->box, TRUE, TRUE, 0);
+      for (i = 0; i < source->num_choices; i++)
+       group = alternative_append (priv->box,
+                                   source->choices_display[i],
+                                   source->choices[i],
+                                   widget,
+                                   group);
+
+      if (source->display_text)
+       {
+         text = g_strdup_printf ("%s:", source->display_text);
+         priv->label = gtk_label_new_with_mnemonic (text);
+         g_free (text);
+         gtk_widget_show (priv->label);
+       }
       break;
+
     case GTK_PRINTER_OPTION_TYPE_STRING:
-      widget->priv->entry = gtk_entry_new ();
-      gtk_widget_show (widget->priv->entry);
-      gtk_box_pack_start (GTK_BOX (widget), widget->priv->entry, TRUE, TRUE, 0);
-      g_signal_connect (widget->priv->entry, "changed", G_CALLBACK (entry_changed_cb), widget);
+      priv->entry = gtk_entry_new ();
+      gtk_entry_set_activates_default (GTK_ENTRY (priv->entry),
+                                       gtk_printer_option_get_activates_default (source));
+      gtk_widget_show (priv->entry);
+      gtk_box_pack_start (GTK_BOX (widget), priv->entry, TRUE, TRUE, 0);
+      g_signal_connect (priv->entry, "changed", G_CALLBACK (entry_changed_cb), widget);
 
       text = g_strdup_printf ("%s:", source->display_text);
-      widget->priv->label = gtk_label_new_with_mnemonic (text);
+      priv->label = gtk_label_new_with_mnemonic (text);
       g_free (text);
-      gtk_widget_show (widget->priv->label);
+      gtk_widget_show (priv->label);
 
       break;
 
@@ -518,92 +777,113 @@ construct_widgets (GtkPrinterOptionWidget *widget)
       {
         GtkWidget *label;
         
-        widget->priv->filechooser = gtk_table_new (2, 2, FALSE);
-        gtk_table_set_row_spacings (GTK_TABLE (widget->priv->filechooser), 6);
-        gtk_table_set_col_spacings (GTK_TABLE (widget->priv->filechooser), 12);
+        priv->filechooser = gtk_table_new (2, 2, FALSE);
+        gtk_table_set_row_spacings (GTK_TABLE (priv->filechooser), 6);
+        gtk_table_set_col_spacings (GTK_TABLE (priv->filechooser), 12);
 
         /* TODO: make this a gtkfilechooserentry once we move to GTK */
-        widget->priv->entry = gtk_entry_new ();
-        widget->priv->combo = gtk_file_chooser_button_new (_("Print to PDF"),
-                                                           GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+        priv->entry = gtk_entry_new ();
+        priv->combo = gtk_file_chooser_button_new (_("Select a folder"),
+                                                   GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+
+        g_object_set (priv->combo, "local-only", FALSE, NULL);
+        gtk_entry_set_activates_default (GTK_ENTRY (priv->entry),
+                                         gtk_printer_option_get_activates_default (source));
 
         label = gtk_label_new_with_mnemonic (_("_Name:"));
         gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-        gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget->priv->entry);
+        gtk_label_set_mnemonic_widget (GTK_LABEL (label), priv->entry);
 
-        gtk_table_attach (GTK_TABLE (widget->priv->filechooser), label,
+        gtk_table_attach (GTK_TABLE (priv->filechooser), label,
                           0, 1, 0, 1, GTK_FILL, 0,
                           0, 0);
 
-        gtk_table_attach (GTK_TABLE (widget->priv->filechooser), widget->priv->entry,
+        gtk_table_attach (GTK_TABLE (priv->filechooser), priv->entry,
                           1, 2, 0, 1, GTK_FILL, 0,
                           0, 0);
 
         label = gtk_label_new_with_mnemonic (_("_Save in folder:"));
         gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-        gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget->priv->combo);
+        gtk_label_set_mnemonic_widget (GTK_LABEL (label), priv->combo);
 
-        gtk_table_attach (GTK_TABLE (widget->priv->filechooser), label,
+        gtk_table_attach (GTK_TABLE (priv->filechooser), label,
                           0, 1, 1, 2, GTK_FILL, 0,
                           0, 0);
 
-        gtk_table_attach (GTK_TABLE (widget->priv->filechooser), widget->priv->combo,
+        gtk_table_attach (GTK_TABLE (priv->filechooser), priv->combo,
                           1, 2, 1, 2, GTK_FILL, 0,
                           0, 0);
 
-        gtk_widget_show_all (widget->priv->filechooser);
-        gtk_box_pack_start (GTK_BOX (widget), widget->priv->filechooser, TRUE, TRUE, 0);
+        gtk_widget_show_all (priv->filechooser);
+        gtk_box_pack_start (GTK_BOX (widget), priv->filechooser, TRUE, TRUE, 0);
 
-        g_signal_connect (widget->priv->entry, "changed", G_CALLBACK (filesave_changed_cb), widget);
+        g_signal_connect (priv->entry, "changed", G_CALLBACK (filesave_changed_cb), widget);
 
-        g_signal_connect (widget->priv->combo, "current-folder-changed", G_CALLBACK (filesave_changed_cb), widget);
+        g_signal_connect (priv->combo, "selection-changed", G_CALLBACK (filesave_changed_cb), widget);
       }
       break;
     default:
       break;
     }
 
-  widget->priv->image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_MENU);
-  gtk_box_pack_start (GTK_BOX (widget), widget->priv->image, FALSE, FALSE, 0);
+  priv->image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_MENU);
+  gtk_box_pack_start (GTK_BOX (widget), priv->image, FALSE, FALSE, 0);
 }
 
 static void
 update_widgets (GtkPrinterOptionWidget *widget)
 {
+  GtkPrinterOptionWidgetPrivate *priv = widget->priv;
   GtkPrinterOption *source;
 
-  source = widget->priv->source;
+  source = priv->source;
   
   if (source == NULL)
     {
-      gtk_widget_hide (widget->priv->image);
+      gtk_widget_hide (priv->image);
       return;
     }
 
   switch (source->type)
     {
     case GTK_PRINTER_OPTION_TYPE_BOOLEAN:
-      if (strcmp (source->value, "True") == 0)
-       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget->priv->check), TRUE);
+      if (g_ascii_strcasecmp (source->value, "True") == 0)
+       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->check), TRUE);
       else
-       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget->priv->check), FALSE);
+       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->check), FALSE);
       break;
     case GTK_PRINTER_OPTION_TYPE_PICKONE:
-      combo_box_set (widget->priv->combo, source->value);
+      combo_box_set (priv->combo, source->value);
+      break;
+    case GTK_PRINTER_OPTION_TYPE_ALTERNATIVE:
+      alternative_set (priv->box, source->value);
       break;
     case GTK_PRINTER_OPTION_TYPE_STRING:
-      gtk_entry_set_text (GTK_ENTRY (widget->priv->entry), source->value);
+      gtk_entry_set_text (GTK_ENTRY (priv->entry), source->value);
       break;
     case GTK_PRINTER_OPTION_TYPE_FILESAVE:
       {
-       char *basename = g_path_get_basename (source->value);
-       char *dirname = g_path_get_dirname (source->value);
-       gtk_entry_set_text (GTK_ENTRY (widget->priv->entry), basename);
-       if (g_path_is_absolute (dirname))
-         gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (widget->priv->combo),
-                                              dirname);
-       g_free (basename);
-       g_free (dirname);
+        gchar *filename = g_filename_from_uri (source->value, NULL, NULL);
+        if (filename != NULL)
+          {
+            gchar *basename, *dirname, *text;
+
+            basename = g_path_get_basename (filename);
+            dirname = g_path_get_dirname (filename);
+            text = g_filename_to_utf8 (basename, -1, NULL, NULL, NULL);
+
+            if (text != NULL)
+              gtk_entry_set_text (GTK_ENTRY (priv->entry), text);
+            if (g_path_is_absolute (dirname))
+              gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (priv->combo),
+                                                   dirname);
+            g_free (text);
+            g_free (basename);
+            g_free (dirname);
+            g_free (filename);
+          }
+       else
+         gtk_entry_set_text (GTK_ENTRY (priv->entry), source->value);
        break;
       }
     default:
@@ -611,13 +891,13 @@ update_widgets (GtkPrinterOptionWidget *widget)
     }
 
   if (source->has_conflict)
-    gtk_widget_show (widget->priv->image);
+    gtk_widget_show (priv->image);
   else
-    gtk_widget_hide (widget->priv->image);
+    gtk_widget_hide (priv->image);
 }
 
 gboolean
-gtk_printer_option_widget_has_external_label (GtkPrinterOptionWidget  *widget)
+gtk_printer_option_widget_has_external_label (GtkPrinterOptionWidget *widget)
 {
   return widget->priv->label != NULL;
 }
@@ -628,14 +908,13 @@ gtk_printer_option_widget_get_external_label (GtkPrinterOptionWidget  *widget)
   return widget->priv->label;
 }
 
-const char *
-gtk_printer_option_widget_get_value (GtkPrinterOptionWidget  *widget)
+const gchar *
+gtk_printer_option_widget_get_value (GtkPrinterOptionWidget *widget)
 {
-  if (widget->priv->source)
-    return widget->priv->source->value;
+  GtkPrinterOptionWidgetPrivate *priv = widget->priv;
+
+  if (priv->source)
+    return priv->source->value;
   
   return "";
 }
-
-#define __GTK_PRINTER_OPTION_WIDGET_C__
-#include "gtkaliasdef.c"