mirror of
https://gitlab.gnome.org/GNOME/eog
synced 2024-10-18 14:04:27 +00:00
Remove checks for libgnomeprint{ui} and add checks for gtk+-unix-print.
2006-11-14 Claudio Saavedra <csaavedra@alumnos.utalca.cl>
* configure.in: Remove checks for libgnomeprint{ui} and add checks for
gtk+-unix-print.
* libeog/eog-config-keys.h: Add lockdown printing macros.
* libeog/eog-image.c: remove unused eog_image_print ().
* libeog/eog-image.h: remove unused eog_image_print () definition.
* shell/eog-gtk-ui.xml: Add "FilePageSetup" action.
* shell/eog-window.c: (eog_window_page_setup),
(eog_window_print_draw_page), (eog_window_print_end_print),
(eog_window_print), (verb_PageSetup_cb), (verb_Print_cb),
(update_ui_visibility):
Add support for GtkPrint. Remove old libgnomeprint{ui} dependence.
This commit is contained in:
Claudio Saavedra
Claudio Saavedra
parent
261fbabb10
commit
b3326b81fc
15
ChangeLog
15
ChangeLog
|
|
@ -1,3 +1,18 @@
|
|||
2006-11-14 Claudio Saavedra <csaavedra@alumnos.utalca.cl>
|
||||
|
||||
* configure.in: Remove checks for libgnomeprint{ui} and add checks for
|
||||
gtk+-unix-print.
|
||||
* libeog/eog-config-keys.h: Add lockdown printing macros.
|
||||
* libeog/eog-image.c: remove unused eog_image_print ().
|
||||
* libeog/eog-image.h: remove unused eog_image_print () definition.
|
||||
* shell/eog-gtk-ui.xml: Add "FilePageSetup" action.
|
||||
* shell/eog-window.c: (eog_window_page_setup),
|
||||
(eog_window_print_draw_page), (eog_window_print_end_print),
|
||||
(eog_window_print), (verb_PageSetup_cb), (verb_Print_cb),
|
||||
(update_ui_visibility):
|
||||
|
||||
Add support for GtkPrint. Remove old libgnomeprint{ui} dependence.
|
||||
|
||||
2006-11-10 Claudio Saavedra <csaavedra@alumnos.utalca.cl>
|
||||
|
||||
* art/Makefile.am: Remove the icons.
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ GCONF_REQUIRED=2.5.90
|
|||
LIBART_REQUIRED=2.3.16
|
||||
GTK_REQUIRED=2.7.1
|
||||
GNOME_DESKTOP_REQUIRED=2.10.0
|
||||
GTK_PRINT_REQUIRED=2.10.0
|
||||
|
||||
dnl ===============================================================================
|
||||
|
||||
|
|
@ -53,7 +54,7 @@ AC_SUBST(LDFLAGS)
|
|||
|
||||
dnl ================= gnome libs check ====================================
|
||||
|
||||
EOG_MODULES="gtk+-2.0 >= $GTK_REQUIRED gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED libart-2.0 >= $LIBART_REQUIRED libgnomeprintui-2.2 libgnomeprint-2.2 gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED"
|
||||
EOG_MODULES="gtk+-2.0 >= $GTK_REQUIRED gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED libart-2.0 >= $LIBART_REQUIRED gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED gtk+-unix-print-2.0 >= $GTK_PRINT_REQUIRED"
|
||||
|
||||
dnl ============== optional exif support ====================
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@
|
|||
#define EOG_CONF_DIR "/apps/eog"
|
||||
|
||||
#define EOG_CONF_DESKTOP_CAN_SAVE "/desktop/gnome/lockdown/disable_save_to_disk"
|
||||
#define EOG_CONF_DESKTOP_CAN_PRINT "/desktop/gnome/lockdown/disable_printing"
|
||||
#define EOG_CONF_DESKTOP_CAN_SETUP_PAGE "/desktop/gnome/lockdown/disable_print_setup"
|
||||
|
||||
#define EOG_CONF_VIEW_DIR "/apps/eog/view"
|
||||
#define EOG_CONF_VIEW_INTERPOLATE "/apps/eog/view/interpolate"
|
||||
|
|
|
|||
|
|
@ -1782,61 +1782,3 @@ eog_image_data_unref (EogImage *img)
|
|||
|
||||
return img;
|
||||
}
|
||||
|
||||
/* Print API */
|
||||
|
||||
void
|
||||
eog_image_print (EogImage *img, GnomePrintContext *context, gdouble paper_width, gdouble paper_height)
|
||||
{
|
||||
EogImagePrivate *priv = NULL;
|
||||
GdkPixbuf *printed_image = NULL;
|
||||
gint pix_width;
|
||||
gint pix_height;
|
||||
gdouble width, height;
|
||||
|
||||
g_return_if_fail (EOG_IS_IMAGE (img));
|
||||
|
||||
priv = img->priv;
|
||||
|
||||
g_return_if_fail (GDK_IS_PIXBUF (priv->image));
|
||||
|
||||
if (gdk_pixbuf_get_width (priv->image) > gdk_pixbuf_get_height (priv->image)) {
|
||||
printed_image = gdk_pixbuf_rotate_simple (priv->image,
|
||||
GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE);
|
||||
} else {
|
||||
g_object_ref (priv->image);
|
||||
printed_image = priv->image;
|
||||
}
|
||||
|
||||
pix_width = gdk_pixbuf_get_width (printed_image);
|
||||
pix_height = gdk_pixbuf_get_height (printed_image);
|
||||
|
||||
width = (gint)paper_width;
|
||||
height = (gint)paper_height;
|
||||
|
||||
if (((gdouble) pix_height/pix_width) >
|
||||
((gdouble)width/height)) {
|
||||
/* We scale to the top */
|
||||
width = height * (gdouble)pix_width/pix_height;
|
||||
} else {
|
||||
/* We scale to the sides of the page */
|
||||
height = width * (gdouble)pix_height/pix_width;
|
||||
}
|
||||
|
||||
width -= 40;
|
||||
height -= 40;
|
||||
|
||||
gnome_print_translate (context, (paper_width - width)/2.0, (paper_height - height)/2.0);
|
||||
gnome_print_scale (context, width, height);
|
||||
|
||||
if (gdk_pixbuf_get_has_alpha (printed_image)) {
|
||||
gnome_print_rgbaimage (context, gdk_pixbuf_get_pixels (printed_image),
|
||||
pix_width, pix_height, gdk_pixbuf_get_rowstride (printed_image));
|
||||
} else {
|
||||
gnome_print_rgbimage (context, gdk_pixbuf_get_pixels (printed_image),
|
||||
pix_width, pix_height, gdk_pixbuf_get_rowstride (printed_image));
|
||||
}
|
||||
|
||||
g_object_unref (G_OBJECT (printed_image));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
#include <glib-object.h>
|
||||
#include <libgnomevfs/gnome-vfs-uri.h>
|
||||
#include <libgnomevfs/gnome-vfs-file-size.h>
|
||||
#include <libgnomeprint/gnome-print.h>
|
||||
#include <gdk-pixbuf/gdk-pixbuf.h>
|
||||
#include "eog-transform.h"
|
||||
#include "eog-image-save-info.h"
|
||||
|
|
@ -131,10 +130,6 @@ void eog_image_apply_display_profile (EogImage *img, cmsHPROFILE profile);
|
|||
void eog_image_transform (EogImage *img, EogTransform *trans, EogJob *job);
|
||||
void eog_image_undo (EogImage *img);
|
||||
|
||||
|
||||
/* print API */
|
||||
void eog_image_print (EogImage *img, GnomePrintContext *pc, gdouble width, gdouble height);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* _IMAGE_H_ */
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
<menuitem action="FileSave"/>
|
||||
<menuitem action="FileSaveAs"/>
|
||||
<separator/>
|
||||
<menuitem action="FilePageSetup"/>
|
||||
<menuitem action="FilePrint"/>
|
||||
<separator/>
|
||||
<placeholder name="EggRecentDocuments"/>
|
||||
|
|
|
|||
|
|
@ -65,10 +65,7 @@
|
|||
#include <lcms.h>
|
||||
#endif
|
||||
|
||||
#include <libgnomeprint/gnome-print.h>
|
||||
#include <libgnomeprint/gnome-print-job.h>
|
||||
#include <libgnomeprintui/gnome-print-dialog.h>
|
||||
#include <libgnomeprintui/gnome-print-job-preview.h>
|
||||
#include <gtk/gtkprintunixdialog.h>
|
||||
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
|
|
@ -116,6 +113,10 @@ struct _EogWindowPrivate {
|
|||
GtkWidget *statusbar;
|
||||
GtkWidget *n_img_label;
|
||||
|
||||
/* printing stuff */
|
||||
GtkPrintSettings *print_settings;
|
||||
GtkPageSetup *print_page_setup;
|
||||
|
||||
/* context ids for the statusbar */
|
||||
guint image_info_message_cid;
|
||||
guint tip_message_cid;
|
||||
|
|
@ -408,6 +409,140 @@ eog_window_save_geometry (EogWindow *window)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
eog_window_page_setup (EogWindow *window)
|
||||
{
|
||||
GtkPageSetup *new_page_setup;
|
||||
|
||||
if (window->priv->print_settings == NULL) {
|
||||
window->priv->print_settings = gtk_print_settings_new ();
|
||||
}
|
||||
|
||||
new_page_setup = gtk_print_run_page_setup_dialog (GTK_WINDOW (window),
|
||||
window->priv->print_page_setup,
|
||||
window->priv->print_settings);
|
||||
if (window->priv->print_page_setup) {
|
||||
g_object_unref (window->priv->print_page_setup);
|
||||
}
|
||||
|
||||
window->priv->print_page_setup = new_page_setup;
|
||||
}
|
||||
|
||||
static void
|
||||
eog_window_print_draw_page (GtkPrintOperation *operation,
|
||||
GtkPrintContext *context,
|
||||
gint page_nr,
|
||||
gpointer user_data)
|
||||
{
|
||||
EogImage *image;
|
||||
cairo_t *cr;
|
||||
gint width, height;
|
||||
gint p_width, p_height;
|
||||
gdouble scale_factor;
|
||||
GdkPixbuf *pixbuf;
|
||||
|
||||
image = EOG_IMAGE (user_data);
|
||||
|
||||
pixbuf = eog_image_get_pixbuf (image);
|
||||
width = gdk_pixbuf_get_width (pixbuf);
|
||||
height = gdk_pixbuf_get_height (pixbuf);
|
||||
|
||||
cr = gtk_print_context_get_cairo_context (context);
|
||||
p_width = gtk_print_context_get_width (context);
|
||||
p_height = gtk_print_context_get_height (context);
|
||||
|
||||
cairo_push_group (cr);
|
||||
if (p_width > width && p_height > height) {
|
||||
cairo_translate (cr, (p_width - width)/2,
|
||||
(p_height - height)/2);
|
||||
} else if (width > height && width > p_width) {
|
||||
scale_factor = ((gdouble)p_width)/width;
|
||||
cairo_scale (cr, scale_factor, scale_factor);
|
||||
cairo_translate (cr, 0, (p_height/scale_factor - height)/2);
|
||||
} else {
|
||||
scale_factor = ((gdouble)p_height)/height;
|
||||
cairo_scale (cr, scale_factor, scale_factor);
|
||||
cairo_translate (cr, (p_width/scale_factor - width)/2, 0);
|
||||
}
|
||||
gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
|
||||
cairo_paint (cr);
|
||||
|
||||
cairo_pop_group_to_source (cr);
|
||||
cairo_paint (cr);
|
||||
|
||||
g_object_unref (pixbuf);
|
||||
}
|
||||
|
||||
static void
|
||||
eog_window_print_end_print (GtkPrintOperation *operation,
|
||||
GtkPrintContext *context,
|
||||
gpointer user_data)
|
||||
{
|
||||
EogImage *image = EOG_IMAGE (user_data);
|
||||
|
||||
g_object_unref (image);
|
||||
}
|
||||
|
||||
static void
|
||||
eog_window_print (EogWindow *window)
|
||||
{
|
||||
GtkWidget *dialog;
|
||||
GError *error = NULL;
|
||||
GtkPrintOperation *print;
|
||||
GtkPrintOperationResult res;
|
||||
EogImage *image;
|
||||
|
||||
if (!window->priv->print_settings)
|
||||
window->priv->print_settings = gtk_print_settings_new ();
|
||||
if (!window->priv->print_page_setup)
|
||||
window->priv->print_page_setup = gtk_page_setup_new ();
|
||||
|
||||
image = eog_wrap_list_get_first_selected_image (EOG_WRAP_LIST (window->priv->wraplist));
|
||||
|
||||
print = gtk_print_operation_new ();
|
||||
|
||||
gtk_print_operation_set_print_settings (print, window->priv->print_settings);
|
||||
gtk_print_operation_set_default_page_setup (print,
|
||||
window->priv->print_page_setup);
|
||||
gtk_print_operation_set_n_pages (print, 1);
|
||||
gtk_print_operation_set_job_name (print,
|
||||
eog_image_get_caption (image));
|
||||
|
||||
g_signal_connect (print, "draw_page",
|
||||
G_CALLBACK (eog_window_print_draw_page),
|
||||
g_object_ref (image));
|
||||
g_signal_connect (print, "end-print",
|
||||
G_CALLBACK (eog_window_print_end_print),
|
||||
g_object_ref (image));
|
||||
|
||||
gtk_print_operation_set_custom_tab_label (print, _("Image Settings"));
|
||||
|
||||
res = gtk_print_operation_run (print,
|
||||
GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG,
|
||||
GTK_WINDOW (window), &error);
|
||||
|
||||
if (res == GTK_PRINT_OPERATION_RESULT_ERROR)
|
||||
{
|
||||
dialog = gtk_message_dialog_new (GTK_WINDOW (window),
|
||||
GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||
GTK_MESSAGE_ERROR,
|
||||
GTK_BUTTONS_CLOSE,
|
||||
"Error printing file:\n%s",
|
||||
error->message);
|
||||
g_signal_connect (dialog, "response",
|
||||
G_CALLBACK (gtk_widget_destroy), NULL);
|
||||
gtk_widget_show (dialog);
|
||||
g_error_free (error);
|
||||
}
|
||||
else if (res == GTK_PRINT_OPERATION_RESULT_APPLY)
|
||||
{
|
||||
if (window->priv->print_settings != NULL)
|
||||
g_object_unref (window->priv->print_settings);
|
||||
window->priv->print_settings = g_object_ref (gtk_print_operation_get_print_settings (print));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
static void
|
||||
verb_FileOpen_cb (GtkAction *action, gpointer user_data)
|
||||
{
|
||||
|
|
@ -1776,67 +1911,20 @@ save_as_multiple_images (EogWindow *window, GList *images)
|
|||
g_object_unref (G_OBJECT (job));
|
||||
}
|
||||
|
||||
static void
|
||||
verb_PageSetup_cb (GtkAction *action, gpointer data)
|
||||
{
|
||||
EogWindow *window = EOG_WINDOW (data);
|
||||
|
||||
eog_window_page_setup (window);
|
||||
}
|
||||
|
||||
static void
|
||||
verb_Print_cb (GtkAction *action, gpointer data)
|
||||
{
|
||||
EogWindow *window = EOG_WINDOW (data);
|
||||
EogWindowPrivate *priv = window->priv;
|
||||
EogImage *image = eog_wrap_list_get_first_selected_image (EOG_WRAP_LIST (priv->wraplist));
|
||||
|
||||
GnomePrintConfig* config = gnome_print_config_default();
|
||||
GnomePrintContext *pc;
|
||||
|
||||
gnome_print_config_set_boolean (config, GNOME_PRINT_KEY_DUPLEX, FALSE);
|
||||
|
||||
GnomePrintJob *gpj = gnome_print_job_new(config);
|
||||
gint do_preview = 0 /*, copies = 1, collate = 0*/;
|
||||
gdouble width, height;
|
||||
GnomePrintDialog *gpd = GNOME_PRINT_DIALOG (gnome_print_dialog_new(gpj,
|
||||
(const guchar*)_("Print"), GNOME_PRINT_DIALOG_COPIES));
|
||||
|
||||
switch (gtk_dialog_run(GTK_DIALOG(gpd)))
|
||||
{
|
||||
case GNOME_PRINT_DIALOG_RESPONSE_PRINT:
|
||||
do_preview = 0;
|
||||
break;
|
||||
case GNOME_PRINT_DIALOG_RESPONSE_PREVIEW:
|
||||
do_preview = 1;
|
||||
break;
|
||||
case GNOME_PRINT_DIALOG_RESPONSE_CANCEL:
|
||||
gnome_print_config_unref(config);
|
||||
gnome_print_job_close (gpj);
|
||||
gtk_widget_destroy (GTK_WIDGET(gpd));
|
||||
return;
|
||||
}
|
||||
|
||||
gtk_widget_destroy(GTK_WIDGET(gpd));
|
||||
|
||||
pc = gnome_print_job_get_context (gpj);
|
||||
|
||||
gnome_print_beginpage(pc, (const guchar*)"1");
|
||||
gnome_print_config_get_page_size(config, &width, &height);
|
||||
|
||||
gnome_print_gsave (pc);
|
||||
eog_image_print (image, pc, width, height);
|
||||
gnome_print_grestore (pc);
|
||||
|
||||
gnome_print_showpage(pc);
|
||||
gnome_print_job_close (gpj);
|
||||
|
||||
if (do_preview)
|
||||
{
|
||||
gtk_widget_show (gnome_print_job_preview_new
|
||||
(gpj, (const guchar*)_("Print Preview")));
|
||||
}
|
||||
else
|
||||
{
|
||||
gnome_print_job_print(gpj);
|
||||
}
|
||||
|
||||
gnome_print_context_close (pc);
|
||||
gnome_print_config_unref(config);
|
||||
|
||||
|
||||
eog_window_print (window);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -2702,10 +2790,14 @@ update_ui_visibility (EogWindow *window)
|
|||
gboolean show_info_pane = TRUE;
|
||||
gboolean show_image_collection = FALSE;
|
||||
gboolean save_disabled = FALSE;
|
||||
gboolean print_disabled = FALSE;
|
||||
gboolean page_setup_disabled = FALSE;
|
||||
GtkAction *action_fscreen;
|
||||
GtkAction *action_sshow;
|
||||
GtkAction *action_save;
|
||||
GtkAction *action_save_as;
|
||||
GtkAction *action_print;
|
||||
GtkAction *action_page_setup;
|
||||
|
||||
g_return_if_fail (EOG_IS_WINDOW (window));
|
||||
|
||||
|
|
@ -2719,10 +2811,15 @@ update_ui_visibility (EogWindow *window)
|
|||
action_sshow = gtk_action_group_get_action (priv->actions_image, "ViewSlideshow");
|
||||
action_save = gtk_action_group_get_action (priv->actions_image, "FileSave");
|
||||
action_save_as = gtk_action_group_get_action (priv->actions_image, "FileSaveAs");
|
||||
action_print = gtk_action_group_get_action (priv->actions_image, "FilePrint");
|
||||
action_page_setup = gtk_action_group_get_action (priv->actions_image, "FilePageSetup");
|
||||
|
||||
g_assert (action_fscreen != NULL);
|
||||
g_assert (action_sshow != NULL);
|
||||
g_assert (action_save != NULL);
|
||||
g_assert (action_save_as != NULL);
|
||||
g_assert (action_print != NULL);
|
||||
g_assert (action_page_setup != NULL);
|
||||
|
||||
if (n_images == 0) {
|
||||
/* update window content */
|
||||
|
|
@ -2796,6 +2893,18 @@ update_ui_visibility (EogWindow *window)
|
|||
gtk_action_set_sensitive (action_save, FALSE);
|
||||
gtk_action_set_sensitive (action_save_as, FALSE);
|
||||
}
|
||||
|
||||
print_disabled = gconf_client_get_bool (priv->client, EOG_CONF_DESKTOP_CAN_PRINT, NULL);
|
||||
|
||||
if (print_disabled) {
|
||||
gtk_action_set_sensitive (action_print, FALSE);
|
||||
}
|
||||
|
||||
page_setup_disabled = gconf_client_get_bool (priv->client, EOG_CONF_DESKTOP_CAN_SETUP_PAGE, NULL);
|
||||
|
||||
if (page_setup_disabled) {
|
||||
gtk_action_set_sensitive (action_page_setup, FALSE);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -3361,6 +3470,7 @@ static const GtkToggleActionEntry toggle_entries_window[] = {
|
|||
static const GtkActionEntry action_entries_image[] = {
|
||||
{ "FileSave", GTK_STOCK_SAVE, N_("_Save"), "<control>s", NULL, G_CALLBACK (verb_Save_cb) },
|
||||
{ "FileSaveAs", GTK_STOCK_SAVE_AS, N_("Save _As..."), "<control><shift>s", NULL, G_CALLBACK (verb_SaveAs_cb) },
|
||||
{ "FilePageSetup", NULL, N_("Page Set_up"), NULL, NULL, G_CALLBACK (verb_PageSetup_cb) },
|
||||
{ "FilePrint", GTK_STOCK_PRINT, N_("Print..."), "<control>p", NULL, G_CALLBACK (verb_Print_cb) },
|
||||
|
||||
{ "EditUndo", GTK_STOCK_UNDO, N_("_Undo"), "<control>z", NULL, G_CALLBACK (verb_Undo_cb) },
|
||||
|
|
|
|||
Loading…
Reference in a new issue