#include <gtk/gtk.h>
#include <libgnomevfs/gnome-vfs-utils.h>
#include <libgnomevfs/gnome-vfs-async-ops.h>
+#include <libgnomevfs/gnome-vfs-ops.h>
#include <gconf/gconf-client.h>
#include <errno.h>
#ifdef WITH_GTK_PRINT
EvJob *print_job;
+ gboolean print_preview;
GtkPrintJob *gtk_print_job;
GtkPrinter *printer;
GtkPrintSettings *print_settings;
EvLinkAction *action;
EvLinkDest *dest;
+ if (window->priv->history == NULL)
+ return;
+
if (link) {
action = g_object_ref (ev_link_get_action (link));
dest = ev_link_action_get_dest (action);
0, 0, 1.0,
&page_width, &page_height);
scale = (gdouble)128 / (gdouble)page_width;
-
+
rc = ev_render_context_new (0, 0, scale);
ev_window->priv->thumbnail_job = ev_job_thumbnail_new (document, rc);
g_signal_connect (ev_window->priv->thumbnail_job, "finished",
static void
ev_window_clear_local_uri (EvWindow *ev_window)
{
- char *filename;
-
if (ev_window->priv->local_uri) {
- filename = g_filename_from_uri (ev_window->priv->local_uri, NULL, NULL);
- if (filename != NULL) {
- g_unlink (filename);
- g_free (filename);
- }
+ ev_tmp_uri_unlink (ev_window->priv->local_uri);
g_free (ev_window->priv->local_uri);
ev_window->priv->local_uri = NULL;
}
}
static gint
-xfer_update_progress_callback (GnomeVFSAsyncHandle *handle,
- GnomeVFSXferProgressInfo *info,
- EvWindow *ev_window)
+open_xfer_update_progress_callback (GnomeVFSAsyncHandle *handle,
+ GnomeVFSXferProgressInfo *info,
+ EvWindow *ev_window)
{
switch (info->status) {
case GNOME_VFS_XFER_PROGRESS_STATUS_OK:
GNOME_VFS_XFER_ERROR_MODE_ABORT,
GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE,
GNOME_VFS_PRIORITY_DEFAULT,
- (GnomeVFSAsyncXferProgressCallback)xfer_update_progress_callback,
+ (GnomeVFSAsyncXferProgressCallback)
+ open_xfer_update_progress_callback,
ev_window,
NULL, NULL);
} else if (window->priv->uri != NULL) {
gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (chooser),
window->priv->uri);
- }
- else {
+ } else {
char *folder;
+
folder = xdg_user_dir_lookup ("DOCUMENTS");
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser),
folder);
#endif /* HAVE_GTK_RECENT */
}
+static gint
+save_xfer_update_progress_callback (GnomeVFSAsyncHandle *handle,
+ GnomeVFSXferProgressInfo *info,
+ GnomeVFSURI *tmp_uri)
+{
+ switch (info->status) {
+ case GNOME_VFS_XFER_PROGRESS_STATUS_OK:
+ if (info->phase == GNOME_VFS_XFER_PHASE_COMPLETED) {
+ gchar *uri;
+
+ uri = gnome_vfs_uri_to_string (tmp_uri, 0);
+ ev_tmp_uri_unlink (uri);
+ g_free (uri);
+ gnome_vfs_uri_unref (tmp_uri);
+ }
+ return 1;
+ case GNOME_VFS_XFER_PROGRESS_STATUS_VFSERROR:
+ if (info->vfs_status != GNOME_VFS_OK) {
+ GtkWidget *dialog;
+ gchar *uri;
+
+ dialog = gtk_message_dialog_new (NULL,
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_CLOSE,
+ _("The file could not be saved as “%s”."),
+ info->target_name);
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+ gnome_vfs_result_to_string (info->vfs_status));
+
+ g_signal_connect (dialog, "response",
+ G_CALLBACK (gtk_widget_destroy),
+ NULL);
+ gtk_widget_show (dialog);
+
+ uri = gnome_vfs_uri_to_string (tmp_uri, 0);
+ ev_tmp_uri_unlink (uri);
+ g_free (uri);
+ gnome_vfs_uri_unref (tmp_uri);
+ }
+ return 1;
+ case GNOME_VFS_XFER_PROGRESS_STATUS_OVERWRITE:
+ case GNOME_VFS_XFER_PROGRESS_STATUS_DUPLICATE:
+ return 1;
+ default:
+ g_assert_not_reached ();
+ }
+
+ return 0;
+}
+
+static void
+ev_window_save_remote (EvWindow *ev_window,
+ GnomeVFSURI *src,
+ GnomeVFSURI *dst)
+{
+ GnomeVFSAsyncHandle *handle;
+ GList *slist = NULL;
+ GList *tlist = NULL;
+
+ slist = g_list_prepend (slist, src);
+ tlist = g_list_prepend (tlist, dst);
+ gnome_vfs_async_xfer (&handle, slist, tlist,
+ GNOME_VFS_XFER_DEFAULT | GNOME_VFS_XFER_FOLLOW_LINKS,
+ GNOME_VFS_XFER_ERROR_MODE_ABORT,
+ GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE,
+ GNOME_VFS_PRIORITY_DEFAULT,
+ (GnomeVFSAsyncXferProgressCallback)
+ save_xfer_update_progress_callback,
+ gnome_vfs_uri_ref (src),
+ NULL, NULL);
+ g_list_free (slist);
+ g_list_free (tlist);
+}
+
static void
file_save_dialog_response_cb (GtkWidget *fc,
gint response_id,
EvWindow *ev_window)
{
- const gchar *uri_unc;
- gint fd;
- gchar *filename;
- gchar *tmp_filename;
- GError *error = NULL;
+ gchar *uri;
+ gchar *local_uri;
+ gint fd;
+ gchar *filename;
+ gchar *tmp_filename;
+ GError *error = NULL;
if (response_id != GTK_RESPONSE_OK) {
gtk_widget_destroy (fc);
return;
}
-
- filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (fc));
+ uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc));
+
+ filename = ev_tmp_filename ("saveacopy");
tmp_filename = g_strdup_printf ("%s.XXXXXX", filename);
+ g_free (filename);
fd = g_mkstemp (tmp_filename);
if (fd == -1) {
+ gchar *msg;
gchar *display_name;
gint save_errno = errno;
_("Failed to create file “%s”: %s"),
display_name, g_strerror (save_errno));
g_free (display_name);
- } else {
- gchar *uri;
-
- uri = g_filename_to_uri (tmp_filename, NULL, NULL);
-
- ev_document_doc_mutex_lock ();
- ev_document_save (ev_window->priv->document, uri, &error);
- ev_document_doc_mutex_unlock ();
-
+
+ msg = g_strdup_printf (_("The file could not be saved as “%s”."), uri);
+ ev_window_error_dialog (GTK_WINDOW (ev_window), msg, error);
+
+ g_free (tmp_filename);
g_free (uri);
- close (fd);
+ g_free (msg);
+ g_error_free (error);
+ gtk_widget_destroy (fc);
+
+ return;
}
+ /* Save document to temp filename */
+ local_uri = g_filename_to_uri (tmp_filename, NULL, NULL);
+
+ ev_document_doc_mutex_lock ();
+ ev_document_save (ev_window->priv->document, local_uri, &error);
+ ev_document_doc_mutex_unlock ();
+
+ close (fd);
+
if (!error) {
- uri_unc = g_object_get_data (G_OBJECT (ev_window->priv->document),
- "uri-uncompressed");
- if (uri_unc) {
- EvCompressionType ctype;
- gchar *uri_comp;
- gchar *uri;
+ /* If original document was compressed,
+ * compress it again before saving
+ */
+ if (g_object_get_data (G_OBJECT (ev_window->priv->document),
+ "uri-uncompressed")) {
+ EvCompressionType ctype = EV_COMPRESSION_NONE;
const gchar *ext;
+ gchar *uri_comp;
- ctype = EV_COMPRESSION_NONE;
-
ext = g_strrstr (ev_window->priv->uri, ".gz");
if (ext && g_ascii_strcasecmp (ext, ".gz") == 0)
ctype = EV_COMPRESSION_GZIP;
-
+
ext = g_strrstr (ev_window->priv->uri, ".bz2");
if (ext && g_ascii_strcasecmp (ext, ".bz2") == 0)
ctype = EV_COMPRESSION_BZIP2;
- uri = g_filename_to_uri (tmp_filename, NULL, NULL);
- uri_comp = ev_file_compress (uri, ctype, &error);
- g_free (uri);
- g_unlink (tmp_filename);
- g_free (tmp_filename);
-
+ uri_comp = ev_file_compress (local_uri, ctype, &error);
+ g_free (local_uri);
+ ev_tmp_filename_unlink (tmp_filename);
+
if (!uri_comp || error) {
- tmp_filename = NULL;
+ local_uri = NULL;
} else {
- tmp_filename = g_filename_from_uri (uri_comp,
- NULL, NULL);
+ local_uri = uri_comp;
}
-
- g_free (uri_comp);
}
}
- if (tmp_filename && g_rename (tmp_filename, filename) == -1) {
- g_unlink (tmp_filename);
- }
-
+ g_free (tmp_filename);
+
if (error) {
gchar *msg;
- gchar *uri;
-
- uri = g_filename_to_uri (filename, NULL, NULL);
+
msg = g_strdup_printf (_("The file could not be saved as “%s”."), uri);
ev_window_error_dialog (GTK_WINDOW (ev_window), msg, error);
- g_free (msg);
g_free (uri);
+ g_free (msg);
g_error_free (error);
+ g_free (local_uri);
+ gtk_widget_destroy (fc);
+
+ return;
}
-
- g_free (tmp_filename);
- g_free (filename);
+ if (local_uri) {
+ GnomeVFSURI *target_uri;
+
+ target_uri = gnome_vfs_uri_new (uri);
+ if (gnome_vfs_uri_is_local (target_uri)) {
+ /* If target uri is local, just rename local_uri */
+ if (gnome_vfs_move (local_uri, uri, TRUE) != GNOME_VFS_OK)
+ ev_tmp_uri_unlink (local_uri);
+ } else {
+ GnomeVFSURI *source_uri;
+
+ source_uri = gnome_vfs_uri_new (local_uri);
+ ev_window_save_remote (ev_window, source_uri, target_uri);
+ gnome_vfs_uri_unref (source_uri);
+ }
+
+ gnome_vfs_uri_unref (target_uri);
+ g_free (local_uri);
+ }
+
+ g_free (uri);
gtk_widget_destroy (fc);
}
ev_document_factory_add_filters (fc, ev_window->priv->document);
gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK);
- gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER (fc), TRUE);
+ gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (fc), FALSE);
+ gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (fc), TRUE);
file_name = gnome_vfs_format_uri_for_display (ev_window->priv->uri);
base_name = g_path_get_basename (file_name);
folder = xdg_user_dir_lookup ("DOCUMENTS");
g_object_unref (window->priv->print_job);
window->priv->print_job = NULL;
}
+
+ if (window->priv->gtk_print_job) {
+ g_object_unref (window->priv->gtk_print_job);
+ window->priv->gtk_print_job = NULL;
+ }
}
static void
ev_window_print_send (EvWindow *window,
const gchar *filename)
{
- GtkPrintJob *job;
GtkPrintSettings *settings;
- GError *error = NULL;
- if (window->priv->gtk_print_job)
- g_object_unref (window->priv->gtk_print_job);
-
/* Some printers take into account some print settings,
* and others don't. However we have exported the document
* to a ps or pdf file according to such print settings. So,
gtk_print_settings_set_scale (settings, 1.0);
gtk_print_settings_set_collate (settings, FALSE);
gtk_print_settings_set_reverse (settings, FALSE);
-
- job = gtk_print_job_new ("evince-print",
- window->priv->printer,
- settings,
- window->priv->print_page_setup);
- g_object_unref (settings);
-
- window->priv->gtk_print_job = job;
+ if (window->priv->print_preview) {
+ gchar *uri;
+ gchar *print_settings_file = NULL;
- if (gtk_print_job_set_source_file (job, filename, &error)) {
- gtk_print_job_send (job,
- (GtkPrintJobCompleteFunc)ev_window_print_finished,
- window, NULL);
+ ev_application_set_print_settings (EV_APP,
+ window->priv->print_settings);
+
+#if GTK_CHECK_VERSION (2, 11, 0)
+ print_settings_file = ev_tmp_filename ("print-settings");
+ gtk_print_settings_to_file (settings, print_settings_file, NULL);
+#endif
+ uri = g_filename_to_uri (filename, NULL, NULL);
+ ev_application_open_uri_at_dest (EV_APP,
+ uri,
+ gtk_window_get_screen (GTK_WINDOW (window)),
+ NULL,
+ EV_WINDOW_MODE_PREVIEW,
+ TRUE,
+ print_settings_file,
+ GDK_CURRENT_TIME);
+ g_free (print_settings_file);
+ g_free (uri);
} else {
- ev_window_clear_print_job (window);
- g_warning (error->message);
- g_error_free (error);
+ GtkPrintJob *job;
+ GError *error = NULL;
+
+ job = gtk_print_job_new ("evince-print",
+ window->priv->printer,
+ settings,
+ window->priv->print_page_setup);
+
+ if (window->priv->gtk_print_job)
+ g_object_unref (window->priv->gtk_print_job);
+ window->priv->gtk_print_job = job;
+
+ if (gtk_print_job_set_source_file (job, filename, &error)) {
+ gtk_print_job_send (job,
+ (GtkPrintJobCompleteFunc)ev_window_print_finished,
+ window, NULL);
+ } else {
+ ev_window_clear_print_job (window);
+ g_warning (error->message);
+ g_error_free (error);
+ }
}
+
+ g_object_unref (settings);
}
static void
GtkPrintPages print_pages;
const gchar *file_format;
- if (response != GTK_RESPONSE_OK) {
+ if (response == GTK_RESPONSE_CANCEL) {
gtk_widget_destroy (GTK_WIDGET (dialog));
window->priv->print_dialog = NULL;
return FALSE;
}
+ window->priv->print_preview = (response == GTK_RESPONSE_APPLY);
+
if (window->priv->printer)
g_object_unref (window->priv->printer);
if (window->priv->print_settings)
GTK_PRINT_CAPABILITY_COLLATE |
GTK_PRINT_CAPABILITY_REVERSE |
GTK_PRINT_CAPABILITY_SCALE |
- GTK_PRINT_CAPABILITY_GENERATE_PS;
+ GTK_PRINT_CAPABILITY_GENERATE_PS |
+ GTK_PRINT_CAPABILITY_PREVIEW;
if (EV_IS_FILE_EXPORTER (ev_window->priv->document) &&
ev_file_exporter_format_supported (EV_FILE_EXPORTER (ev_window->priv->document),
ev_window_cmd_help_contents (GtkAction *action, EvWindow *ev_window)
{
GError *error = NULL;
+ GdkScreen *screen;
char *command;
const char *lang;
char *uri = NULL;
command = g_strconcat ("gnome-help ghelp://", uri, NULL);
g_free (uri);
- g_spawn_command_line_async (command, &error);
+ screen = gtk_widget_get_screen (GTK_WIDGET (ev_window));
+ gdk_spawn_command_line_on_screen (screen, command, &error);
if (error != NULL) {
g_warning (error->message);
g_error_free (error);
static void
ev_window_view_sidebar_cb (GtkAction *action, EvWindow *ev_window)
{
+ if (ev_view_get_presentation (EV_VIEW (ev_window->priv->view)))
+ return;
+
update_chrome_flag (ev_window, EV_CHROME_SIDEBAR,
gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
}
{ "ViewDual", EV_STOCK_VIEW_DUAL, N_("_Dual"), NULL,
N_("Show two pages at once"),
G_CALLBACK (ev_window_cmd_dual), FALSE },
- { "ViewFullscreen", NULL, N_("_Fullscreen"), "F11",
+ { "ViewFullscreen", GTK_STOCK_FULLSCREEN, N_("_Fullscreen"), "F11",
N_("Expand the window to fill the screen"),
G_CALLBACK (ev_window_cmd_view_fullscreen) },
- { "ViewPresentation", NULL, N_("_Presentation"), "F5",
+ { "ViewPresentation", EV_STOCK_RUN_PRESENTATION, N_("_Presentation"), "F5",
N_("Run document as a presentation"),
G_CALLBACK (ev_window_cmd_view_presentation) },
{ "ViewBestFit", EV_STOCK_ZOOM_PAGE, N_("_Best Fit"), NULL,
"name", PAGE_SELECTOR_ACTION,
"label", _("Page"),
"tooltip", _("Select Page"),
+ "icon_name", "text-x-generic",
"visible_overflown", FALSE,
NULL);
g_signal_connect (action, "activate_link",
action = g_object_new (EPHY_TYPE_ZOOM_ACTION,
"name", ZOOM_CONTROL_ACTION,
"label", _("Zoom"),
- "stock_id", GTK_STOCK_ZOOM_IN,
+ "stock_id", EV_STOCK_ZOOM,
"tooltip", _("Adjust the zoom level"),
"zoom", 1.0,
NULL);
gint response_id,
EvWindow *ev_window)
{
- gchar *uri;
- gchar *filename;
- GError *error = NULL;
+ GnomeVFSURI *target_uri;
+ gchar *uri;
+ gchar *filename;
+ gboolean is_local;
+ GError *error = NULL;
if (response_id != GTK_RESPONSE_OK) {
gtk_widget_destroy (fc);
}
uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc));
- filename = g_filename_from_uri (uri, NULL, NULL);
+ target_uri = gnome_vfs_uri_new (uri);
+ is_local = gnome_vfs_uri_is_local (target_uri);
+
+ if (is_local) {
+ filename = g_filename_from_uri (uri, NULL, NULL);
+ } else {
+ filename = ev_tmp_filename ("saveimage");
+ }
+
g_free (uri);
/* FIXME: allow saving in other image formats than png */
_("The image could not be saved."),
error);
g_error_free (error);
+ g_free (filename);
+ gnome_vfs_uri_unref (target_uri);
+ gtk_widget_destroy (fc);
+
+ return;
}
- g_free (filename);
+ if (!is_local) {
+ GnomeVFSURI *source_uri;
+ gchar *local_uri;
+ local_uri = g_filename_to_uri (filename, NULL, NULL);
+ source_uri = gnome_vfs_uri_new (local_uri);
+ g_free (local_uri);
+ ev_window_save_remote (ev_window, source_uri, target_uri);
+ gnome_vfs_uri_unref (source_uri);
+ }
+
+ g_free (filename);
+ gnome_vfs_uri_unref (target_uri);
gtk_widget_destroy (fc);
}
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK);
+ gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (fc), FALSE);
gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (fc), TRUE);
filter = gtk_file_filter_new ();
gint response_id,
EvWindow *ev_window)
{
+ GnomeVFSURI *target_uri;
gchar *uri;
GList *l;
GtkFileChooserAction fc_action;
gboolean is_dir;
+ gboolean is_local;
if (response_id != GTK_RESPONSE_OK) {
gtk_widget_destroy (fc);
}
uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc));
-
+ target_uri = gnome_vfs_uri_new (uri);
g_object_get (G_OBJECT (fc), "action", &fc_action, NULL);
is_dir = (fc_action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+ is_local = gnome_vfs_uri_is_local (target_uri);
for (l = ev_window->priv->attach_list; l && l->data; l = g_list_next (l)) {
EvAttachment *attachment;
attachment = (EvAttachment *) l->data;
- if (is_dir) {
- filename = g_strjoin ("/", uri,
- ev_attachment_get_name (attachment),
- NULL);
+ if (is_local) {
+ if (is_dir) {
+ filename = g_strjoin ("/", uri,
+ ev_attachment_get_name (attachment),
+ NULL);
+ } else {
+ filename = g_strdup (uri);
+ }
} else {
- filename = g_strdup (uri);
+ filename = ev_tmp_filename ("saveattachment");
}
-
+
ev_attachment_save (attachment, filename, &error);
- g_free (filename);
if (error) {
ev_window_error_dialog (GTK_WINDOW (ev_window),
_("The attachment could not be saved."),
error);
g_error_free (error);
+ g_free (filename);
+
+ continue;
+ }
+
+ if (!is_local) {
+ GnomeVFSURI *src_uri;
+ GnomeVFSURI *dest_uri;
+ gchar *local_uri;
+
+ if (is_dir) {
+ const gchar *name = ev_attachment_get_name (attachment);
+
+ dest_uri = gnome_vfs_uri_append_file_name (target_uri,
+ name);
+ } else {
+ dest_uri = gnome_vfs_uri_ref (target_uri);
+ }
+
+ local_uri = g_filename_to_uri (filename, NULL, NULL);
+ src_uri = gnome_vfs_uri_new (local_uri);
+ g_free (local_uri);
+ ev_window_save_remote (ev_window, src_uri, dest_uri);
+ gnome_vfs_uri_unref (src_uri);
+ gnome_vfs_uri_unref (dest_uri);
}
+
+ g_free (filename);
}
g_free (uri);
+ gnome_vfs_uri_unref (target_uri);
gtk_widget_destroy (fc);
}
gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK);
gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (fc), TRUE);
+ gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (fc), FALSE);
if (attachment)
gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc),
/* Stub sidebar, for now */
+ sidebar_widget = ev_sidebar_thumbnails_new ();
+ ev_window->priv->sidebar_thumbs = sidebar_widget;
+ g_signal_connect (sidebar_widget,
+ "notify::main-widget",
+ G_CALLBACK (sidebar_page_main_widget_update_cb),
+ ev_window);
+ sidebar_page_main_widget_update_cb (G_OBJECT (sidebar_widget), NULL, ev_window);
+ gtk_widget_show (sidebar_widget);
+ ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
+ sidebar_widget);
+
sidebar_widget = ev_sidebar_links_new ();
ev_window->priv->sidebar_links = sidebar_widget;
g_signal_connect (sidebar_widget,
ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
sidebar_widget);
- sidebar_widget = ev_sidebar_thumbnails_new ();
- ev_window->priv->sidebar_thumbs = sidebar_widget;
- g_signal_connect (sidebar_widget,
- "notify::main-widget",
- G_CALLBACK (sidebar_page_main_widget_update_cb),
- ev_window);
- sidebar_page_main_widget_update_cb (G_OBJECT (sidebar_widget), NULL, ev_window);
- gtk_widget_show (sidebar_widget);
- ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
- sidebar_widget);
-
ev_window->priv->scrolled_window =
GTK_WIDGET (g_object_new (GTK_TYPE_SCROLLED_WINDOW,
"shadow-type", GTK_SHADOW_IN,
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff