diff options
| author | JP Rosevear <jpr@novell.com> | 2005-01-22 05:05:13 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2005-01-22 05:05:13 +0800 |
| commit | ca1b5bd325a2054597548fda181de793aece23e3 (patch) | |
| tree | 8e33d33aa8a799774ff6f5c984c601559bc344ac /addressbook/printing | |
| parent | 1963958705b84314e2d2ba785bcadec8caa904e9 (diff) | |
| download | gsoc2013-evolution-ca1b5bd325a2054597548fda181de793aece23e3.tar.gz gsoc2013-evolution-ca1b5bd325a2054597548fda181de793aece23e3.tar.zst gsoc2013-evolution-ca1b5bd325a2054597548fda181de793aece23e3.zip | |
Fixes #46404
2005-01-21 JP Rosevear <jpr@novell.com>
Fixes #46404
* gui/widgets/e-addressbook-view.c (eab_view_print): just show the
dialog, not show all (margin settings aren't supposed to be used);
use e_print to get the dialog
(eab_view_print_preview): use e_print config for previewing
* printing/e-contact-print.c (e_contact_print_preview): get the
e_print config for previewing
(e_contact_print_contact_dialog_new): use e_print to get the
print dialog
* printing/e-contact-print-envelope.c
(e_contact_print_envelope_dialog_new): use e_print to get the
print dialog
svn path=/trunk/; revision=28496
Diffstat (limited to 'addressbook/printing')
| -rw-r--r-- | addressbook/printing/e-contact-print-envelope.c | 5 | ||||
| -rw-r--r-- | addressbook/printing/e-contact-print.c | 12 |
2 files changed, 9 insertions, 8 deletions
diff --git a/addressbook/printing/e-contact-print-envelope.c b/addressbook/printing/e-contact-print-envelope.c index c7bd68163f..38532720fa 100644 --- a/addressbook/printing/e-contact-print-envelope.c +++ b/addressbook/printing/e-contact-print-envelope.c @@ -29,6 +29,7 @@ #include <libgnomeprint/gnome-print.h> #include <libgnomeprint/gnome-print-job.h> #include <libgnomeprintui/gnome-print-job-preview.h> +#include <e-util/e-print.h> #define ENVELOPE_HEIGHT (72.0 * 4.0) #define ENVELOPE_WIDTH (72.0 * 9.5) @@ -209,7 +210,7 @@ e_contact_print_envelope_dialog_new(EContact *contact) { GtkWidget *dialog; - dialog = gnome_print_dialog_new(NULL, _("Print envelope"), GNOME_PRINT_DIALOG_COPIES); + dialog = e_print_get_dialog (_("Print envelope"), GNOME_PRINT_DIALOG_COPIES); contact = e_contact_duplicate(contact); g_object_set_data(G_OBJECT(dialog), "contact", contact); @@ -230,7 +231,7 @@ e_contact_print_envelope_list_dialog_new(GList *list) if (list == NULL) return NULL; - dialog = gnome_print_dialog_new(NULL, _("Print envelope"), GNOME_PRINT_DIALOG_COPIES); + dialog = e_print_get_dialog(_("Print envelope"), GNOME_PRINT_DIALOG_COPIES); contact = e_contact_duplicate(list->data); g_object_set_data(G_OBJECT(dialog), "contact", contact); diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c index e47f37f0da..f0a7eff6d6 100644 --- a/addressbook/printing/e-contact-print.c +++ b/addressbook/printing/e-contact-print.c @@ -41,6 +41,7 @@ #include <libebook/e-book.h> #include <libebook/e-contact.h> #include <gal/util/e-util.h> +#include <e-util/e-print.h> #define SCALE 5 #define HYPHEN_PIXELS 20 @@ -997,7 +998,7 @@ e_contact_print_dialog_new(EBook *book, char *query) GtkWidget *dialog; - dialog = gnome_print_dialog_new(NULL, _("Print contacts"), GNOME_PRINT_DIALOG_RANGE | GNOME_PRINT_DIALOG_COPIES); + dialog = e_print_get_dialog(_("Print contacts"), GNOME_PRINT_DIALOG_RANGE | GNOME_PRINT_DIALOG_COPIES); gnome_print_dialog_construct_range_any(GNOME_PRINT_DIALOG(dialog), GNOME_PRINT_RANGE_ALL | GNOME_PRINT_RANGE_SELECTION, NULL, NULL, NULL); @@ -1023,9 +1024,8 @@ e_contact_print_preview(EBook *book, char *query) GnomePrintConfig *config; gdouble font_size; - master = gnome_print_job_new(NULL); - config = gnome_print_job_get_config (master); - gnome_print_config_set_int (config, GNOME_PRINT_KEY_NUM_COPIES, 1); + config = e_print_load_config (); + master = gnome_print_job_new (config); pc = gnome_print_job_get_context (master); e_contact_build_style (style); @@ -1063,7 +1063,7 @@ e_contact_print_contact_dialog_new(EContact *contact) { GtkWidget *dialog; - dialog = gnome_print_dialog_new(NULL, _("Print contact"), GNOME_PRINT_DIALOG_COPIES); + dialog = e_print_get_dialog(_("Print contact"), GNOME_PRINT_DIALOG_COPIES); contact = e_contact_duplicate(contact); g_object_set_data(G_OBJECT(dialog), "contact", contact); @@ -1090,7 +1090,7 @@ e_contact_print_contact_list_dialog_new(GList *list) for (l = copied_list; l; l = l->next) l->data = e_contact_duplicate (E_CONTACT (l->data)); - dialog = gnome_print_dialog_new(NULL, _("Print contact"), GNOME_PRINT_DIALOG_COPIES); + dialog = e_print_get_dialog(_("Print contact"), GNOME_PRINT_DIALOG_COPIES); g_object_set_data(G_OBJECT(dialog), "contact_list", copied_list); g_object_set_data(G_OBJECT(dialog), "uses_list", GINT_TO_POINTER (TRUE)); |