X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-window.c;h=7f3a520311d4324724476999cf0ddf93e8a26338;hb=217797d63b2d3b1c9a7a0511af1bbf3d99f0d482;hp=b938eb80ae6570e4f9343cefe18153e7e72d675f;hpb=01252ea37a0ea367bfd8e82d9cf6f7af8360f4e3;p=evince.git diff --git a/shell/ev-window.c b/shell/ev-window.c index b938eb80..7f3a5203 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -30,6 +30,7 @@ #include "ev-window.h" #include "ev-window-title.h" +#include "ev-navigation-action.h" #include "ev-page-action.h" #include "ev-sidebar.h" #include "ev-sidebar-links.h" @@ -39,7 +40,7 @@ #include "ev-password.h" #include "ev-password-view.h" #include "ev-properties-dialog.h" -#include "ev-ps-exporter.h" +#include "ev-file-exporter.h" #include "ev-document-thumbnails.h" #include "ev-document-links.h" #include "ev-document-fonts.h" @@ -67,7 +68,8 @@ #include "ev-metadata-manager.h" #include "ev-file-helpers.h" #include "ev-utils.h" -#include "ev-debug.h" +#include "ev-history.h" +#include "ev-image.h" #ifdef WITH_GNOME_PRINT #include "ev-print-job.h" @@ -78,15 +80,24 @@ #include #endif +#ifdef ENABLE_PDF #include +#endif +#include #include #include -#include #include +#include +#include #include +#include +#include #include +#include + +char *xdg_user_dir_lookup (char *type); typedef enum { PAGE_MODE_DOCUMENT, @@ -100,6 +111,7 @@ typedef enum { EV_CHROME_RAISE_TOOLBAR = 1 << 3, EV_CHROME_FULLSCREEN_TOOLBAR = 1 << 4, EV_CHROME_SIDEBAR = 1 << 5, + EV_CHROME_PREVIEW_TOOLBAR = 1 << 6, EV_CHROME_NORMAL = EV_CHROME_MENUBAR | EV_CHROME_TOOLBAR | EV_CHROME_SIDEBAR } EvChrome; @@ -109,7 +121,6 @@ struct _EvWindowPrivate { GtkWidget *main_box; GtkWidget *menubar; - GtkWidget *toolbar_dock; GtkWidget *toolbar; GtkWidget *hpaned; GtkWidget *sidebar; @@ -141,12 +152,18 @@ struct _EvWindowPrivate { /* Fullscreen mode */ GtkWidget *fullscreen_toolbar; - GtkWidget *fullscreen_popup; - guint fullscreen_timeout_id; - - /* Popup link */ + + /* Presentation mode */ + guint presentation_timeout_id; + + /* Preview mode */ + GtkWidget *preview_toolbar; + gchar *print_settings_file; + + /* Popup view */ GtkWidget *view_popup; EvLink *link; + EvImage *image; /* Popup attachment */ GtkWidget *attachment_popup; @@ -156,9 +173,10 @@ struct _EvWindowPrivate { char *uri; char *local_uri; EvLinkDest *dest; + gboolean unlink_temp_file; EvDocument *document; - + EvHistory *history; EvPageCache *page_cache; EvWindowPageMode page_mode; EvWindowTitle *title; @@ -166,7 +184,8 @@ struct _EvWindowPrivate { EggRecentViewUIManager *recent_view; #endif - EvJob *xfer_job; + EvJob *load_job; + EvJob *thumbnail_job; #ifdef WITH_GNOME_PRINT GnomePrintJob *print_job; #endif @@ -180,22 +199,18 @@ struct _EvWindowPrivate { #endif }; -static const GtkTargetEntry ev_drop_types[] = { - { "text/uri-list", 0, 0 } -}; - - #define EV_WINDOW_GET_PRIVATE(object) \ (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_WINDOW, EvWindowPrivate)) #define PAGE_SELECTOR_ACTION "PageSelector" #define ZOOM_CONTROL_ACTION "ViewZoom" +#define NAVIGATION_ACTION "Navigation" #define GCONF_OVERRIDE_RESTRICTIONS "/apps/evince/override_restrictions" #define GCONF_LOCKDOWN_SAVE "/desktop/gnome/lockdown/disable_save_to_disk" #define GCONF_LOCKDOWN_PRINT "/desktop/gnome/lockdown/disable_printing" -#define FULLSCREEN_TIMEOUT 5 * 1000 +#define PRESENTATION_TIMEOUT 5 * 1000 #define SIDEBAR_DEFAULT_SIZE 132 #define LINKS_SIDEBAR_ID "links" @@ -203,14 +218,15 @@ static const GtkTargetEntry ev_drop_types[] = { #define ATTACHMENTS_SIDEBAR_ID "attachments" static void ev_window_update_actions (EvWindow *ev_window); -static void ev_window_update_fullscreen_popup (EvWindow *window); static void ev_window_sidebar_visibility_changed_cb (EvSidebar *ev_sidebar, GParamSpec *pspec, EvWindow *ev_window); static void ev_window_set_page_mode (EvWindow *window, EvWindowPageMode page_mode); -static void ev_window_xfer_job_cb (EvJobXfer *job, +static void ev_window_load_job_cb (EvJobLoad *job, gpointer data); +static void ev_window_set_icon_from_thumbnail (EvJobThumbnail *job, + EvWindow *ev_window); #ifdef WITH_GTK_PRINT static void ev_window_print_job_cb (EvJobPrint *job, EvWindow *window); @@ -234,8 +250,14 @@ static void ev_window_cmd_view_presentation (GtkAction *actio static void ev_window_run_preview (EvWindow *window); static void ev_view_popup_cmd_open_link (GtkAction *action, EvWindow *window); +static void ev_view_popup_cmd_open_link_new_window (GtkAction *action, + EvWindow *window); static void ev_view_popup_cmd_copy_link_address (GtkAction *action, EvWindow *window); +static void ev_view_popup_cmd_save_image_as (GtkAction *action, + EvWindow *window); +static void ev_view_popup_cmd_copy_image (GtkAction *action, + EvWindow *window); static void ev_attachment_popup_cmd_open_attachment (GtkAction *action, EvWindow *window); static void ev_attachment_popup_cmd_save_attachment_as (GtkAction *action, @@ -244,16 +266,26 @@ static void ev_window_cmd_view_best_fit (GtkAction *action, EvWindow *ev_window); static void ev_window_cmd_view_page_width (GtkAction *action, EvWindow *ev_window); -static void fullscreen_set_timeout (EvWindow *window); -static gboolean fullscreen_motion_notify_cb (GtkWidget *widget, - GdkEventMotion *event, - gpointer user_data); -static gboolean fullscreen_leave_notify_cb (GtkWidget *widget, - GdkEventCrossing *event, - gpointer user_data); +static void view_handle_link_cb (EvView *view, + EvLink *link, + EvWindow *window); G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW) +static gdouble +ev_window_get_screen_dpi (EvWindow *ev_window) +{ + GdkScreen *screen; + gdouble xdpi, ydpi; + + screen = gtk_window_get_screen (GTK_WINDOW (ev_window)); + + xdpi = 25.4 * gdk_screen_get_width (screen) / gdk_screen_get_width_mm (screen); + ydpi = 25.4 * gdk_screen_get_height (screen) / gdk_screen_get_height_mm (screen); + + return (xdpi + ydpi) / 2.0; +} + static void ev_window_set_action_sensitive (EvWindow *ev_window, const char *name, @@ -312,7 +344,7 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window) ok_to_copy = (info->permissions & EV_DOCUMENT_PERMISSIONS_OK_TO_COPY); } - if (has_document && !EV_IS_PS_EXPORTER(document)) + if (has_document && !EV_IS_FILE_EXPORTER(document)) ok_to_print = FALSE; @@ -330,7 +362,17 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window) /* File menu */ + ev_window_set_action_sensitive (ev_window, "FileOpenCopy", has_document); ev_window_set_action_sensitive (ev_window, "FileSaveAs", has_document && ok_to_copy); + +#ifdef WITH_GTK_PRINT + ev_window_set_action_sensitive (ev_window, "FilePrintSetup", has_pages && ok_to_print); +#endif + +#ifdef WITH_GNOME_PRINT + ev_window_set_action_sensitive (ev_window, "FilePrintSetup", FALSE); +#endif + ev_window_set_action_sensitive (ev_window, "FilePrint", has_pages && ok_to_print); ev_window_set_action_sensitive (ev_window, "FileProperties", has_document && has_properties); @@ -351,6 +393,8 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window) /* Toolbar-specific actions: */ ev_window_set_action_sensitive (ev_window, PAGE_SELECTOR_ACTION, has_pages); ev_window_set_action_sensitive (ev_window, ZOOM_CONTROL_ACTION, has_pages); + ev_window_set_action_sensitive (ev_window, NAVIGATION_ACTION, FALSE); + ev_window_set_action_sensitive (ev_window, "PreviewPrint", has_pages && ok_to_print); ev_window_update_actions (ev_window); } @@ -361,6 +405,7 @@ ev_window_update_actions (EvWindow *ev_window) EvView *view = EV_VIEW (ev_window->priv->view); int n_pages = 0, page = -1; gboolean has_pages = FALSE; + gboolean presentation_mode; if (ev_window->priv->document && ev_window->priv->page_cache) { page = ev_page_cache_get_current_page (ev_window->priv->page_cache); @@ -368,17 +413,25 @@ ev_window_update_actions (EvWindow *ev_window) has_pages = n_pages > 0; } - ev_window_set_action_sensitive (ev_window, "EditCopy", has_pages && ev_view_get_has_selection (view)); + ev_window_set_action_sensitive (ev_window, "EditCopy", + has_pages && + ev_view_get_has_selection (view)); ev_window_set_action_sensitive (ev_window, "EditFindNext", - ev_view_can_find_next (view)); + ev_view_can_find_next (view)); ev_window_set_action_sensitive (ev_window, "EditFindPrevious", - ev_view_can_find_previous (view)); + ev_view_can_find_previous (view)); + presentation_mode = ev_view_get_presentation (view); + ev_window_set_action_sensitive (ev_window, "ViewZoomIn", - has_pages && ev_view_can_zoom_in (view)); + has_pages && + ev_view_can_zoom_in (view) && + !presentation_mode); ev_window_set_action_sensitive (ev_window, "ViewZoomOut", - has_pages && ev_view_can_zoom_out (view)); - + has_pages && + ev_view_can_zoom_out (view) && + !presentation_mode); + /* Go menu */ if (has_pages) { ev_window_set_action_sensitive (ev_window, "GoPreviousPage", page > 0); @@ -403,6 +456,7 @@ ev_window_update_actions (EvWindow *ev_window) ZOOM_CONTROL_ACTION); real_zoom = ev_view_get_zoom (EV_VIEW (ev_window->priv->view)); + real_zoom *= 72.0 / ev_window_get_screen_dpi (ev_window); zoom = ephy_zoom_get_nearest_zoom_level (real_zoom); ephy_zoom_action_set_zoom_level (EPHY_ZOOM_ACTION (action), zoom); @@ -413,7 +467,7 @@ static void ev_window_set_view_accels_sensitivity (EvWindow *window, gboolean sensitive) { gboolean can_find; - + can_find = window->priv->document && EV_IS_DOCUMENT_FIND (window->priv->document); @@ -453,6 +507,7 @@ update_chrome_visibility (EvWindow *window) EvWindowPrivate *priv = window->priv; gboolean menubar, toolbar, findbar, fullscreen_toolbar, sidebar; gboolean fullscreen_mode, presentation, fullscreen; + gboolean preview_toolbar; presentation = ev_view_get_presentation (EV_VIEW (priv->view)); fullscreen = ev_view_get_fullscreen (EV_VIEW (priv->view)); @@ -465,18 +520,21 @@ update_chrome_visibility (EvWindow *window) (priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0) && fullscreen; findbar = (priv->chrome & EV_CHROME_FINDBAR) != 0; sidebar = (priv->chrome & EV_CHROME_SIDEBAR) != 0 && !fullscreen_mode; + preview_toolbar = (priv->chrome& EV_CHROME_PREVIEW_TOOLBAR); set_widget_visibility (priv->menubar, menubar); - set_widget_visibility (priv->toolbar_dock, toolbar); + set_widget_visibility (priv->toolbar, toolbar); set_widget_visibility (priv->find_bar, findbar); set_widget_visibility (priv->sidebar, sidebar); + + if (priv->preview_toolbar) + set_widget_visibility (priv->preview_toolbar, preview_toolbar); ev_window_set_action_sensitive (window, "EditToolbar", toolbar); gtk_widget_set_sensitive (priv->menubar, menubar); - if (priv->fullscreen_popup != NULL) { + if (priv->fullscreen_toolbar != NULL) { set_widget_visibility (priv->fullscreen_toolbar, fullscreen_toolbar); - set_widget_visibility (priv->fullscreen_popup, fullscreen_toolbar); } } @@ -548,13 +606,23 @@ update_sizing_buttons (EvWindow *window) } } +/** + * ev_window_is_empty: + * @ev_window: The instance of the #EvWindow. + * + * It does look if there is any document loaded or if there is any job to load + * a document. + * + * Returns: %TRUE if there isn't any document loaded or any any documente to be + * loaded, %FALSE in other case. + */ gboolean ev_window_is_empty (const EvWindow *ev_window) { g_return_val_if_fail (EV_IS_WINDOW (ev_window), FALSE); return (ev_window->priv->document == NULL) && - (ev_window->priv->xfer_job == NULL); + (ev_window->priv->load_job == NULL); } static void @@ -595,11 +663,126 @@ page_changed_cb (EvPageCache *page_cache, EvWindow *ev_window) { ev_window_update_actions (ev_window); - + if (!ev_window_is_empty (ev_window)) ev_metadata_manager_set_int (ev_window->priv->uri, "page", page); } +typedef struct _FindTask { + const gchar *page_label; + gchar *chapter; +} FindTask; + +static gboolean +ev_window_find_chapter (GtkTreeModel *tree_model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer data) +{ + FindTask *task = (FindTask *)data; + gchar *page_string; + + gtk_tree_model_get (tree_model, iter, + EV_DOCUMENT_LINKS_COLUMN_PAGE_LABEL, &page_string, + -1); + + if (!page_string) + return FALSE; + + if (!strcmp (page_string, task->page_label)) { + gtk_tree_model_get (tree_model, iter, + EV_DOCUMENT_LINKS_COLUMN_MARKUP, &task->chapter, + -1); + g_free (page_string); + return TRUE; + } + + g_free (page_string); + return FALSE; +} + +static void +ev_window_add_history (EvWindow *window, gint page, EvLink *link) +{ + gchar *page_label = NULL; + gchar *link_title; + FindTask find_task; + EvLink *real_link; + 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); + page = ev_link_dest_get_page (dest); + page_label = ev_view_page_label_from_dest (EV_VIEW (window->priv->view), dest); + } else { + dest = ev_link_dest_new_page (page); + action = ev_link_action_new_dest (dest); + page_label = ev_page_cache_get_page_label (window->priv->page_cache, page); + } + + if (!page_label) + return; + + find_task.page_label = page_label; + find_task.chapter = NULL; + + if (EV_IS_DOCUMENT_LINKS (window->priv->document) && + ev_document_links_has_document_links (EV_DOCUMENT_LINKS (window->priv->document))) { + GtkTreeModel *model; + + g_object_get (G_OBJECT (window->priv->sidebar_links), "model", &model, NULL); + + if (model) { + gtk_tree_model_foreach (model, + ev_window_find_chapter, + &find_task); + + g_object_unref (model); + } + } + + if (find_task.chapter) + link_title = g_strdup_printf (_("Page %s - %s"), page_label, find_task.chapter); + else + link_title = g_strdup_printf (_("Page %s"), page_label); + + real_link = ev_link_new (link_title, action); + + ev_history_add_link (window->priv->history, real_link); + + g_free (find_task.chapter); + g_free (link_title); + g_free (page_label); + g_object_unref (real_link); +} + +static void +view_handle_link_cb (EvView *view, EvLink *link, EvWindow *window) +{ + int current_page = ev_page_cache_get_current_page (window->priv->page_cache); + + ev_window_add_history (window, 0, link); + ev_window_add_history (window, current_page, NULL); +} + +static void +history_changed_cb (EvPageCache *page_cache, + gint page, + EvWindow *window) +{ + int current_page = ev_page_cache_get_current_page (window->priv->page_cache); + + ev_window_add_history (window, page, NULL); + ev_window_add_history (window, current_page, NULL); + + return; +} + static void update_document_mode (EvWindow *window, EvDocumentMode mode) { @@ -616,10 +799,18 @@ setup_document_from_metadata (EvWindow *window) { char *uri = window->priv->uri; GValue page = { 0, }; + gint n_pages; gint new_page; + /* View the previously shown page, but make sure to not open a document on + * the last page, since closing it on the last page most likely means the + * user was finished reading the document. In that case, reopening should + * show the first page. */ if (uri && ev_metadata_manager_get (uri, "page", &page, TRUE)) { - new_page = CLAMP (g_value_get_int (&page), 0, ev_page_cache_get_n_pages (window->priv->page_cache) - 1); + n_pages = ev_page_cache_get_n_pages (window->priv->page_cache); + new_page = CLAMP (g_value_get_int (&page), 0, n_pages - 1); + if (new_page == n_pages - 1) + new_page = 0; ev_page_cache_set_current_page (window->priv->page_cache, new_page); g_value_unset (&page); @@ -666,7 +857,7 @@ setup_sidebar_from_metadata (EvWindow *window, EvDocument *document) } else if (strcmp (page_id, THUMBNAILS_SIDEBAR_ID) && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (thumbs), document)) { ev_sidebar_set_page (EV_SIDEBAR (sidebar), thumbs); } else if (strcmp (page_id, ATTACHMENTS_SIDEBAR_ID) && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (attachments), document)) { - ev_sidebar_set_page (EV_SIDEBAR (sidebar), thumbs); + ev_sidebar_set_page (EV_SIDEBAR (sidebar), attachments); } g_value_unset (&sidebar_page); } else if (document && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (links), document)) { @@ -680,48 +871,28 @@ setup_sidebar_from_metadata (EvWindow *window, EvDocument *document) } static void -setup_view_from_metadata (EvWindow *window) +setup_size_from_metadata (EvWindow *window) { - EvView *view = EV_VIEW (window->priv->view); char *uri = window->priv->uri; - GEnumValue *enum_value; GValue width = { 0, }; GValue height = { 0, }; + GValue width_ratio = { 0, }; + GValue height_ratio = { 0, }; GValue maximized = { 0, }; GValue x = { 0, }; GValue y = { 0, }; - GValue sizing_mode = { 0, }; - GValue zoom = { 0, }; - GValue continuous = { 0, }; - GValue dual_page = { 0, }; - GValue presentation = { 0, }; - GValue fullscreen = { 0, }; - GValue rotation = { 0, }; - gboolean restore_size = TRUE; - - /* Window size */ if (ev_metadata_manager_get (uri, "window_maximized", &maximized, FALSE)) { if (g_value_get_boolean (&maximized)) { gtk_window_maximize (GTK_WINDOW (window)); - restore_size = FALSE; + return; } else { gtk_window_unmaximize (GTK_WINDOW (window)); } g_value_unset (&maximized); } - if (restore_size && - ev_metadata_manager_get (uri, "window_width", &width, FALSE) && - ev_metadata_manager_get (uri, "window_height", &height, FALSE)) { - gtk_window_resize (GTK_WINDOW (window), - g_value_get_int (&width), - g_value_get_int (&height)); - g_value_unset (&width); - g_value_unset (&height); - } - if (restore_size && - ev_metadata_manager_get (uri, "window_x", &x, TRUE) && + if (ev_metadata_manager_get (uri, "window_x", &x, TRUE) && ev_metadata_manager_get (uri, "window_y", &y, TRUE)) { gtk_window_move (GTK_WINDOW (window), g_value_get_int (&x), g_value_get_int (&y)); @@ -729,6 +900,78 @@ setup_view_from_metadata (EvWindow *window) g_value_unset (&y); } + if (ev_metadata_manager_get (uri, "window_width", &width, TRUE) && + ev_metadata_manager_get (uri, "window_height", &height, TRUE)) { + gtk_window_resize (GTK_WINDOW (window), + g_value_get_int (&width), + g_value_get_int (&height)); + g_value_unset (&width); + g_value_unset (&height); + return; + } + + if (window->priv->page_cache && + ev_metadata_manager_get (uri, "window_width_ratio", &width_ratio, FALSE) && + ev_metadata_manager_get (uri, "window_height_ratio", &height_ratio, FALSE)) { + + gint document_width; + gint document_height; + + GdkScreen *screen; + + gint request_width; + gint request_height; + + ev_page_cache_get_max_width (window->priv->page_cache, + 0, 1.0, + &document_width); + ev_page_cache_get_max_height (window->priv->page_cache, + 0, 1.0, + &document_height); + + request_width = g_value_get_double (&width_ratio) * document_width; + request_height = g_value_get_double (&height_ratio) * document_height; + + screen = gtk_window_get_screen (GTK_WINDOW (window)); + + if (screen) { + request_width = MIN (request_width, gdk_screen_get_width (screen)); + request_height = MIN (request_width, gdk_screen_get_height (screen)); + } + + gtk_window_resize (GTK_WINDOW (window), + request_width, + request_height); + g_value_unset (&width_ratio); + g_value_unset (&height_ratio); + } +} + +static void +setup_view_from_metadata (EvWindow *window) +{ + EvView *view = EV_VIEW (window->priv->view); + char *uri = window->priv->uri; + GEnumValue *enum_value; + GValue sizing_mode = { 0, }; + GValue zoom = { 0, }; + GValue continuous = { 0, }; + GValue dual_page = { 0, }; + GValue presentation = { 0, }; + GValue fullscreen = { 0, }; + GValue rotation = { 0, }; + GValue maximized = { 0, }; + + /* Maximized */ + if (ev_metadata_manager_get (uri, "window_maximized", &maximized, FALSE)) { + if (g_value_get_boolean (&maximized)) { + gtk_window_maximize (GTK_WINDOW (window)); + } else { + gtk_window_unmaximize (GTK_WINDOW (window)); + } + g_value_unset (&maximized); + } + /* Sizing mode */ if (ev_metadata_manager_get (uri, "sizing_mode", &sizing_mode, FALSE)) { enum_value = g_enum_get_value_by_nick @@ -740,7 +983,11 @@ setup_view_from_metadata (EvWindow *window) /* Zoom */ if (ev_metadata_manager_get (uri, "zoom", &zoom, FALSE) && ev_view_get_sizing_mode (view) == EV_SIZING_FREE) { - ev_view_set_zoom (view, g_value_get_double (&zoom), FALSE); + gdouble zoom_value; + + zoom_value = g_value_get_double (&zoom); + zoom_value *= ev_window_get_screen_dpi (window) / 72.0; + ev_view_set_zoom (view, zoom_value, FALSE); g_value_unset (&zoom); } @@ -794,18 +1041,39 @@ setup_view_from_metadata (EvWindow *window) } static void +ev_window_clear_thumbnail_job (EvWindow *ev_window) +{ + if (ev_window->priv->thumbnail_job != NULL) { + ev_job_queue_remove_job (ev_window->priv->thumbnail_job); + + g_signal_handlers_disconnect_by_func (ev_window->priv->thumbnail_job, + ev_window_set_icon_from_thumbnail, + ev_window); + g_object_unref (ev_window->priv->thumbnail_job); + ev_window->priv->thumbnail_job = NULL; + } +} + +static void +ev_window_set_icon_from_thumbnail (EvJobThumbnail *job, + EvWindow *ev_window) +{ + if (job->thumbnail) { + gtk_window_set_icon (GTK_WINDOW (ev_window), + job->thumbnail); + } + + ev_window_clear_thumbnail_job (ev_window); +} + +static gboolean ev_window_setup_document (EvWindow *ev_window) { const EvDocumentInfo *info; - EvDocument *document; - EvView *view = EV_VIEW (ev_window->priv->view); + EvDocument *document = ev_window->priv->document; EvSidebar *sidebar = EV_SIDEBAR (ev_window->priv->sidebar); GtkAction *action; - - document = ev_window->priv->document; - ev_window->priv->page_cache = ev_page_cache_get (ev_window->priv->document); - g_signal_connect (ev_window->priv->page_cache, "page-changed", G_CALLBACK (page_changed_cb), ev_window); - + if (EV_IS_DOCUMENT_FIND (document)) { g_signal_connect_object (G_OBJECT (document), "find_changed", @@ -813,30 +1081,78 @@ ev_window_setup_document (EvWindow *ev_window) ev_window, 0); } - ev_sidebar_set_document (sidebar, document); + if (EV_IS_DOCUMENT_THUMBNAILS (document)) { + EvRenderContext *rc; + gint page_width, page_height; + gdouble scale; - if (ev_page_cache_get_n_pages (ev_window->priv->page_cache) > 0) { - ev_view_set_document (view, document); + ev_window_clear_thumbnail_job (ev_window); + + ev_page_cache_get_size (ev_window->priv->page_cache, + 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", + G_CALLBACK (ev_window_set_icon_from_thumbnail), + ev_window); + ev_job_queue_add_job (EV_JOB (ev_window->priv->thumbnail_job), EV_JOB_PRIORITY_LOW); + g_object_unref (rc); } - ev_window_set_page_mode (ev_window, PAGE_MODE_DOCUMENT); + ev_window_set_page_mode (ev_window, PAGE_MODE_DOCUMENT); ev_window_title_set_document (ev_window->priv->title, document); ev_window_title_set_uri (ev_window->priv->title, ev_window->priv->uri); + ev_sidebar_set_document (sidebar, document); + action = gtk_action_group_get_action (ev_window->priv->action_group, PAGE_SELECTOR_ACTION); ev_page_action_set_document (EV_PAGE_ACTION (action), document); ev_window_setup_action_sensitivity (ev_window); + if (ev_window->priv->history) + g_object_unref (ev_window->priv->history); + ev_window->priv->history = ev_history_new (); + action = gtk_action_group_get_action (ev_window->priv->action_group, NAVIGATION_ACTION); + ev_navigation_action_set_history (EV_NAVIGATION_ACTION (action), ev_window->priv->history); + if (ev_window->priv->properties) { ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties), ev_window->priv->document); } - setup_document_from_metadata (ev_window); - setup_sidebar_from_metadata (ev_window, document); - info = ev_page_cache_get_info (ev_window->priv->page_cache); update_document_mode (ev_window, info->mode); + + return FALSE; +} + +static void +ev_window_set_document (EvWindow *ev_window, EvDocument *document) +{ + EvView *view = EV_VIEW (ev_window->priv->view); + + if (ev_window->priv->document) + g_object_unref (ev_window->priv->document); + ev_window->priv->document = g_object_ref (document); + + ev_window->priv->page_cache = ev_page_cache_get (ev_window->priv->document); + g_signal_connect (ev_window->priv->page_cache, "page-changed", + G_CALLBACK (page_changed_cb), ev_window); + g_signal_connect (ev_window->priv->page_cache, "history-changed", + G_CALLBACK (history_changed_cb), ev_window); + + setup_size_from_metadata (ev_window); + setup_sidebar_from_metadata (ev_window, document); + setup_document_from_metadata (ev_window); + + if (ev_page_cache_get_n_pages (ev_window->priv->page_cache) > 0) { + ev_view_set_document (view, document); + } + + g_idle_add ((GSourceFunc)ev_window_setup_document, ev_window); } static void @@ -851,7 +1167,7 @@ password_dialog_response (GtkWidget *password_dialog, password = ev_password_dialog_get_password (EV_PASSWORD_DIALOG (password_dialog)); if (password) { ev_document_doc_mutex_lock (); - ev_document_security_set_password (EV_DOCUMENT_SECURITY (ev_window->priv->xfer_job->document), + ev_document_security_set_password (EV_DOCUMENT_SECURITY (ev_window->priv->load_job->document), password); ev_document_doc_mutex_unlock (); } @@ -860,9 +1176,9 @@ password_dialog_response (GtkWidget *password_dialog, ev_password_dialog_save_password (EV_PASSWORD_DIALOG (password_dialog)); ev_window_title_set_type (ev_window->priv->title, EV_WINDOW_TITLE_DOCUMENT); - ev_job_queue_add_job (ev_window->priv->xfer_job, EV_JOB_PRIORITY_HIGH); + ev_job_queue_add_job (ev_window->priv->load_job, EV_JOB_PRIORITY_HIGH); - gtk_widget_destroy (password_dialog); + gtk_widget_destroy (password_dialog); return; } @@ -871,14 +1187,14 @@ password_dialog_response (GtkWidget *password_dialog, gtk_widget_destroy (password_dialog); } -/* Called either by ev_window_xfer_job_cb or by the "unlock" callback on the +/* Called either by ev_window_load_job_cb or by the "unlock" callback on the * password_view page. It assumes that ev_window->priv->password_* has been set * correctly. These are cleared by password_dialog_response() */ static void ev_window_popup_password_dialog (EvWindow *ev_window) { - g_assert (ev_window->priv->xfer_job); + g_assert (ev_window->priv->load_job); gtk_widget_set_sensitive (ev_window->priv->password_view, FALSE); @@ -891,7 +1207,7 @@ ev_window_popup_password_dialog (EvWindow *ev_window) gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->password_dialog), GTK_WINDOW (ev_window)); g_object_add_weak_pointer (G_OBJECT (ev_window->priv->password_dialog), - (gpointer *) &(ev_window->priv->password_dialog)); + (gpointer) &(ev_window->priv->password_dialog)); g_signal_connect (ev_window->priv->password_dialog, "response", G_CALLBACK (password_dialog_response), @@ -903,35 +1219,68 @@ ev_window_popup_password_dialog (EvWindow *ev_window) } static void -ev_window_clear_xfer_job (EvWindow *ev_window) +ev_window_clear_load_job (EvWindow *ev_window) { - if (ev_window->priv->xfer_job != NULL) { + if (ev_window->priv->load_job != NULL) { - if (!ev_window->priv->xfer_job->finished) - ev_job_queue_remove_job (ev_window->priv->xfer_job); + if (!ev_window->priv->load_job->finished) + ev_job_queue_remove_job (ev_window->priv->load_job); - g_signal_handlers_disconnect_by_func (ev_window->priv->xfer_job, ev_window_xfer_job_cb, ev_window); - g_object_unref (ev_window->priv->xfer_job); - ev_window->priv->xfer_job = NULL; + g_signal_handlers_disconnect_by_func (ev_window->priv->load_job, ev_window_load_job_cb, ev_window); + g_object_unref (ev_window->priv->load_job); + ev_window->priv->load_job = NULL; } } 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) { - 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 void +ev_window_clear_print_settings_file (EvWindow *ev_window) +{ + if (ev_window->priv->print_settings_file) { + g_unlink (ev_window->priv->print_settings_file); + g_free (ev_window->priv->print_settings_file); + ev_window->priv->print_settings_file = NULL; + } +} + +static void +ev_window_clear_temp_file (EvWindow *ev_window) +{ + GnomeVFSURI *uri; + gchar *filename; + const gchar *tempdir; + + if (!ev_window->priv->uri) + return; + + uri = gnome_vfs_uri_new (ev_window->priv->uri); + if (!gnome_vfs_uri_is_local (uri)) { + gnome_vfs_uri_unref (uri); + return; + } + gnome_vfs_uri_unref (uri); + + filename = g_filename_from_uri (ev_window->priv->uri, NULL, NULL); + if (!filename) + return; + + tempdir = g_get_tmp_dir (); + if (g_ascii_strncasecmp (filename, tempdir, strlen (tempdir)) == 0) { + g_unlink (filename); + } + + g_free (filename); +} + /* This callback will executed when load job will be finished. * * Since the flow of the error dialog is very confusing, we assume that both @@ -941,7 +1290,7 @@ ev_window_clear_local_uri (EvWindow *ev_window) * function should _not_ necessarily expect those to exist after being * called. */ static void -ev_window_xfer_job_cb (EvJobXfer *job, +ev_window_load_job_cb (EvJobLoad *job, gpointer data) { EvWindow *ev_window = EV_WINDOW (data); @@ -953,26 +1302,25 @@ ev_window_xfer_job_cb (EvJobXfer *job, /* Success! */ if (job->error == NULL) { - - g_free (ev_window->priv->uri); - ev_window->priv->uri = g_strdup (job->uri); - setup_view_from_metadata (ev_window); - - if (job->local_uri) { - ev_window->priv->local_uri = g_strdup (job->local_uri); - } else { - ev_window->priv->local_uri = NULL; - } + ev_window_set_document (ev_window, document); - if (ev_window->priv->document) - g_object_unref (ev_window->priv->document); - ev_window->priv->document = g_object_ref (document); + if (job->mode != EV_WINDOW_MODE_PREVIEW) { + setup_view_from_metadata (ev_window); + } - ev_window_setup_document (ev_window); - ev_window_add_recent (ev_window, ev_window->priv->uri); + if (!ev_window->priv->unlink_temp_file) { + ev_window_add_recent (ev_window, ev_window->priv->uri); + } - if (job->dest) - ev_window_goto_dest (ev_window, job->dest); + if (job->dest) { + EvLink *link; + EvLinkAction *link_action; + + link_action = ev_link_action_new_dest (g_object_ref (job->dest)); + link = ev_link_new (NULL, link_action); + ev_view_handle_link (EV_VIEW (ev_window->priv->view), link); + g_object_unref (link); + } switch (job->mode) { case EV_WINDOW_MODE_FULLSCREEN: @@ -988,7 +1336,7 @@ ev_window_xfer_job_cb (EvJobXfer *job, break; } - ev_window_clear_xfer_job (ev_window); + ev_window_clear_load_job (ev_window); return; } @@ -996,11 +1344,8 @@ ev_window_xfer_job_cb (EvJobXfer *job, job->error->code == EV_DOCUMENT_ERROR_ENCRYPTED) { gchar *base_name, *file_name; - g_free (ev_window->priv->uri); - ev_window->priv->uri = g_strdup (job->uri); setup_view_from_metadata (ev_window); - file_name = gnome_vfs_format_uri_for_display (job->uri); base_name = g_path_get_basename (file_name); ev_password_view_set_file_name (EV_PASSWORD_VIEW (ev_window->priv->password_view), @@ -1008,24 +1353,39 @@ ev_window_xfer_job_cb (EvJobXfer *job, g_free (file_name); g_free (base_name); ev_window_set_page_mode (ev_window, PAGE_MODE_PASSWORD); - + ev_window_popup_password_dialog (ev_window); } else { ev_window_error_dialog (GTK_WINDOW (ev_window), _("Unable to open document"), job->error); - ev_window_clear_xfer_job (ev_window); + ev_window_clear_load_job (ev_window); } return; } +/** + * ev_window_get_uri: + * @ev_window: The instance of the #EvWindow. + * + * It returns the uri of the document showed in the #EvWindow. + * + * Returns: the uri of the document showed in the #EvWindow. + */ const char * ev_window_get_uri (EvWindow *ev_window) { return ev_window->priv->uri; } +/** + * ev_window_close_dialogs: + * @ev_window: The window where dialogs will be closed. + * + * It looks for password, print and properties dialogs and closes them and + * frees them from memory. If there is any print job it does free it too. + */ static void ev_window_close_dialogs (EvWindow *ev_window) { @@ -1050,29 +1410,108 @@ ev_window_close_dialogs (EvWindow *ev_window) ev_window->priv->properties = NULL; } +static gint +open_xfer_update_progress_callback (GnomeVFSAsyncHandle *handle, + GnomeVFSXferProgressInfo *info, + EvWindow *ev_window) +{ + switch (info->status) { + case GNOME_VFS_XFER_PROGRESS_STATUS_OK: + if (info->phase == GNOME_VFS_XFER_PHASE_COMPLETED) { + ev_job_queue_add_job (ev_window->priv->load_job, EV_JOB_PRIORITY_HIGH); + } + + return 1; + case GNOME_VFS_XFER_PROGRESS_STATUS_VFSERROR: + case GNOME_VFS_XFER_PROGRESS_STATUS_OVERWRITE: + case GNOME_VFS_XFER_PROGRESS_STATUS_DUPLICATE: + return 1; + default: + g_assert_not_reached (); + } + + return 0; +} + void ev_window_open_uri (EvWindow *ev_window, const char *uri, EvLinkDest *dest, - EvWindowRunMode mode) + EvWindowRunMode mode, + gboolean unlink_temp_file, + const gchar *print_settings) { + GnomeVFSURI *source_uri; + GnomeVFSURI *target_uri; + ev_window_close_dialogs (ev_window); - ev_window_clear_xfer_job (ev_window); + ev_window_clear_load_job (ev_window); ev_window_clear_local_uri (ev_window); + ev_window_clear_print_settings_file (ev_window); ev_view_set_loading (EV_VIEW (ev_window->priv->view), TRUE); - ev_window->priv->xfer_job = ev_job_xfer_new (uri, dest, mode); - g_signal_connect (ev_window->priv->xfer_job, + ev_window->priv->unlink_temp_file = unlink_temp_file; + + if (mode == EV_WINDOW_MODE_PREVIEW) { + ev_window->priv->print_settings_file = print_settings ? + g_strdup (print_settings) : NULL; + } + + if (ev_window->priv->uri) + g_free (ev_window->priv->uri); + ev_window->priv->uri = g_strdup (uri); + + setup_size_from_metadata (ev_window); + + ev_window->priv->load_job = ev_job_load_new (uri, dest, mode); + g_signal_connect (ev_window->priv->load_job, "finished", - G_CALLBACK (ev_window_xfer_job_cb), + G_CALLBACK (ev_window_load_job_cb), ev_window); - ev_job_queue_add_job (ev_window->priv->xfer_job, EV_JOB_PRIORITY_HIGH); -} -void -ev_window_goto_dest (EvWindow *ev_window, EvLinkDest *dest) -{ - ev_view_goto_dest (EV_VIEW (ev_window->priv->view), dest); + source_uri = gnome_vfs_uri_new (uri); + if (!gnome_vfs_uri_is_local (source_uri) && !ev_window->priv->local_uri) { + GnomeVFSAsyncHandle *handle; + GList *slist = NULL; + GList *tlist = NULL; + char *tmp_name; + char *base_name; + + /* We'd like to keep extension of source uri since + * it helps to resolve some mime types, say cbz */ + + tmp_name = ev_tmp_filename (NULL); + base_name = gnome_vfs_uri_extract_short_name (source_uri); + ev_window->priv->local_uri = g_strconcat ("file:", tmp_name, "-", base_name, NULL); + ev_job_load_set_uri (EV_JOB_LOAD (ev_window->priv->load_job), + ev_window->priv->local_uri); + g_free (base_name); + g_free (tmp_name); + + target_uri = gnome_vfs_uri_new (ev_window->priv->local_uri); + + slist = g_list_prepend (slist, source_uri); + tlist = g_list_prepend (tlist, target_uri); + 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) + open_xfer_update_progress_callback, + ev_window, + NULL, NULL); + + g_list_free (slist); + g_list_free (tlist); + gnome_vfs_uri_unref (target_uri); + gnome_vfs_uri_unref (source_uri); + + return; + } + + gnome_vfs_uri_unref (source_uri); + ev_job_queue_add_job (ev_window->priv->load_job, EV_JOB_PRIORITY_HIGH); } static void @@ -1085,7 +1524,9 @@ file_open_dialog_response_cb (GtkWidget *chooser, uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (chooser)); - ev_application_open_uri_list (EV_APP, uris, GDK_CURRENT_TIME); + ev_application_open_uri_list (EV_APP, uris, + gtk_window_get_screen (GTK_WINDOW (ev_window)), + GDK_CURRENT_TIME); g_slist_foreach (uris, (GFunc)g_free, NULL); g_slist_free (uris); @@ -1118,6 +1559,13 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window) } else if (window->priv->uri != NULL) { gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (chooser), window->priv->uri); + } else { + char *folder; + + folder = xdg_user_dir_lookup ("DOCUMENTS"); + gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser), + folder); + free (folder); } g_signal_connect (chooser, "response", @@ -1127,17 +1575,122 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window) gtk_widget_show (chooser); } +static gchar * +ev_window_create_tmp_symlink (const gchar *filename, GError **error) +{ + gchar *tmp_filename = NULL; + gchar *name; + gint res; + guint i = 0; + + name = g_path_get_basename (filename); + + do { + gchar *basename; + + if (tmp_filename) + g_free (tmp_filename); + + basename = g_strdup_printf ("%s-%d", name, i++); + tmp_filename = g_build_filename (ev_tmp_dir (), + basename, NULL); + + g_free (basename); + } while ((res = symlink (filename, tmp_filename)) != 0 && errno == EEXIST); + + g_free (name); + + if (res != 0 && errno != EEXIST) { + if (error) { + *error = g_error_new (G_FILE_ERROR, + g_file_error_from_errno (errno), + _("Couldn't create symlink “%s”: %s"), + tmp_filename, strerror (errno)); + } + + g_free (tmp_filename); + + return NULL; + } + + return tmp_filename; +} + +static void +ev_window_cmd_file_open_copy_at_dest (EvWindow *window, EvLinkDest *dest) +{ + GError *error = NULL; + gchar *symlink_uri; + gchar *old_filename; + gchar *new_filename; + const gchar *uri_unc; + + uri_unc = g_object_get_data (G_OBJECT (window->priv->document), + "uri-uncompressed"); + old_filename = g_filename_from_uri (uri_unc ? uri_unc : window->priv->uri, + NULL, NULL); + new_filename = ev_window_create_tmp_symlink (old_filename, &error); + + if (error) { + ev_window_error_dialog (GTK_WINDOW (window), + _("Cannot open a copy."), + error); + + g_error_free (error); + g_free (old_filename); + g_free (new_filename); + + return; + } + + g_free (old_filename); + + symlink_uri = g_filename_to_uri (new_filename, NULL, NULL); + g_free (new_filename); + + ev_application_open_uri_at_dest (EV_APP, + symlink_uri, + gtk_window_get_screen (GTK_WINDOW (window)), + dest, + 0, + TRUE, + NULL, + GDK_CURRENT_TIME); + g_free (symlink_uri); +} + +static void +ev_window_cmd_file_open_copy (GtkAction *action, EvWindow *window) +{ + EvPageCache *page_cache; + EvLinkDest *dest; + gint current_page; + + page_cache = ev_page_cache_get (window->priv->document); + current_page = ev_page_cache_get_current_page (page_cache); + + dest = ev_link_dest_new_page (current_page); + ev_window_cmd_file_open_copy_at_dest (window, dest); + g_object_unref (dest); +} + #ifdef HAVE_GTK_RECENT static void ev_window_cmd_recent_file_activate (GtkAction *action, - GtkRecentInfo *info) + EvWindow *window) { - const gchar *uri; + GtkRecentInfo *info; + const gchar *uri; + info = g_object_get_data (G_OBJECT (action), "gtk-recent-info"); + g_assert (info != NULL); + uri = gtk_recent_info_get_uri (info); - ev_application_open_uri (EV_APP, uri, NULL, - GDK_CURRENT_TIME, NULL); + ev_application_open_uri_at_dest (EV_APP, uri, + gtk_window_get_screen (GTK_WINDOW (window)), + NULL, 0, FALSE, NULL, + GDK_CURRENT_TIME); } #else static void @@ -1152,8 +1705,10 @@ ev_window_cmd_recent_file_activate (GtkAction *action, uri = egg_recent_item_get_uri (item); - ev_application_open_uri (EV_APP, uri, NULL, - GDK_CURRENT_TIME, NULL); + ev_application_open_uri_at_dest (EV_APP, uri, + gtk_window_get_screen (GTK_WINDOW (ev_window)), + NULL, 0, FALSE, NULL, + GDK_CURRENT_TIME); g_free (uri); } @@ -1220,13 +1775,11 @@ ev_window_get_recent_file_label (gint index, const gchar *filename) p = filename; end = filename + length; - while (p != end) - { + while (p != end) { const gchar *next; next = g_utf8_next_char (p); - switch (*p) - { + switch (*p) { case '_': g_string_append (str, "__"); break; @@ -1277,7 +1830,8 @@ ev_window_setup_recent (EvWindow *ev_window) info = (GtkRecentInfo *) l->data; - if (!gtk_recent_info_has_application (info, evince)) + if (!gtk_recent_info_has_application (info, evince) || + (gtk_recent_info_is_local (info) && !gtk_recent_info_exists (info))) continue; action_name = g_strdup_printf ("RecentFile%u", i++); @@ -1289,12 +1843,14 @@ ev_window_setup_recent (EvWindow *ev_window) "label", label, NULL); - g_object_weak_ref (G_OBJECT (action), - (GWeakNotify) gtk_recent_info_unref, - gtk_recent_info_ref (info)); + g_object_set_data_full (G_OBJECT (action), + "gtk-recent-info", + gtk_recent_info_ref (info), + (GDestroyNotify) gtk_recent_info_unref); + g_signal_connect (G_OBJECT (action), "activate", G_CALLBACK (ev_window_cmd_recent_file_activate), - (gpointer) info); + (gpointer) ev_window); gtk_action_group_add_action (ev_window->priv->recent_action_group, action); @@ -1334,33 +1890,206 @@ ev_window_setup_recent (EvWindow *ev_window) #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) { - gboolean success; + gchar *uri; + gchar *local_uri; + gint fd; + gchar *filename; + gchar *tmp_filename; + GError *error = NULL; - if (response_id == GTK_RESPONSE_OK) { - gchar *uri; - GError *err = NULL; + if (response_id != GTK_RESPONSE_OK) { + gtk_widget_destroy (fc); + return; + } - uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc)); + uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc)); - ev_document_doc_mutex_lock (); - success = ev_document_save (ev_window->priv->document, uri, &err); - ev_document_doc_mutex_unlock (); + 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; + + display_name = g_filename_display_name (tmp_filename); + g_set_error (&error, + G_FILE_ERROR, + g_file_error_from_errno (save_errno), + _("Failed to create file “%s”: %s"), + display_name, g_strerror (save_errno)); + g_free (display_name); + + 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); + g_free (msg); + g_error_free (error); + gtk_widget_destroy (fc); + + return; + } - if (err) { - gchar *msg; - msg = g_strdup_printf (_("The file could not be saved as “%s”."), uri); - ev_window_error_dialog (GTK_WINDOW (fc), msg, err); - g_free (msg); + /* 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) { + /* 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; + + 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_comp = ev_file_compress (local_uri, ctype, &error); + g_free (local_uri); + ev_tmp_filename_unlink (tmp_filename); + + if (!uri_comp || error) { + local_uri = NULL; + } else { + local_uri = uri_comp; + } } + } + g_free (tmp_filename); + + if (error) { + gchar *msg; + + 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 (uri); + g_free (msg); + g_error_free (error); + g_free (local_uri); + gtk_widget_destroy (fc); + + return; } + 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); } @@ -1370,6 +2099,7 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window) GtkWidget *fc; gchar *base_name; gchar *file_name; + gchar *folder; fc = gtk_file_chooser_dialog_new ( _("Save a Copy"), @@ -1381,13 +2111,17 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window) 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"); gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), base_name); + gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (fc), folder); g_free (file_name); g_free (base_name); - + free (folder); + g_signal_connect (fc, "response", G_CALLBACK (file_save_dialog_response_cb), ev_window); @@ -1395,6 +2129,34 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window) gtk_widget_show (fc); } +#ifdef WITH_GTK_PRINT +static void +ev_window_print_page_setup_done_cb (GtkPageSetup *page_setup, + EvWindow *window) +{ + /* Dialog was canceled */ + if (!page_setup) + return; + + if (window->priv->print_page_setup) + g_object_unref (window->priv->print_page_setup); + window->priv->print_page_setup = g_object_ref (page_setup); +} +#endif /* WITH_GTK_PRINT */ + +static void +ev_window_cmd_file_print_setup (GtkAction *action, EvWindow *ev_window) +{ +#ifdef WITH_GTK_PRINT + gtk_print_run_page_setup_dialog_async ( + GTK_WINDOW (ev_window), + ev_window->priv->print_page_setup, + ev_window->priv->print_settings, + (GtkPageSetupDoneFunc) ev_window_print_page_setup_done_cb, + ev_window); +#endif /* WITH_GTK_PRINT */ +} + #ifdef WITH_GTK_PRINT static void ev_window_clear_print_job (EvWindow *window) @@ -1431,6 +2193,10 @@ ev_window_print_finished (GtkPrintJob *print_job, gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); + } else { + /* If printed successfully, save print settings */ + ev_application_set_print_settings (EV_APP, + window->priv->print_settings); } } @@ -1439,15 +2205,33 @@ 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, + * we want to send the exported file to printer with those + * settings set to default values. + */ + settings = gtk_print_settings_copy (window->priv->print_settings); + gtk_print_settings_set_n_copies (settings, 1); + gtk_print_settings_set_page_ranges (settings, NULL, 0); + gtk_print_settings_set_page_set (settings, GTK_PAGE_SET_ALL); + gtk_print_settings_set_print_pages (settings, GTK_PRINT_PAGES_ALL); + 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, - window->priv->print_settings, + settings, window->priv->print_page_setup); + + g_object_unref (settings); window->priv->gtk_print_job = job; @@ -1482,9 +2266,18 @@ ev_window_print_dialog_response_cb (GtkDialog *dialog, gint response, EvWindow *window) { - EvBackend document_type; - gboolean export_to_ps = TRUE; - GtkPrintPages print_pages; + EvPrintRange *ranges = NULL; + EvPrintPageSet page_set; + gint n_ranges = 0; + gint copies; + gboolean collate; + gboolean reverse; + gdouble scale; + gint current_page; + gdouble width; + gdouble height; + GtkPrintPages print_pages; + const gchar *file_format; if (response != GTK_RESPONSE_OK) { gtk_widget_destroy (GTK_WIDGET (dialog)); @@ -1507,32 +2300,10 @@ ev_window_print_dialog_response_cb (GtkDialog *dialog, window->priv->print_page_setup = g_object_ref ( gtk_print_unix_dialog_get_page_setup (GTK_PRINT_UNIX_DIALOG (dialog))); - document_type = ev_document_factory_get_backend (window->priv->document); - print_pages = gtk_print_settings_get_print_pages (window->priv->print_settings); + file_format = gtk_print_settings_get (window->priv->print_settings, + GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT); - if (print_pages == GTK_PRINT_PAGES_ALL) { - switch (document_type) { - case EV_BACKEND_PDF: - /* Export to ps when printing to file */ - if (gtk_print_settings_has_key (window->priv->print_settings, - GTK_PRINT_SETTINGS_OUTPUT_URI)) { - export_to_ps = TRUE; - } else { - export_to_ps = !gtk_printer_accepts_pdf (window->priv->printer); - } - - break; - case EV_BACKEND_PS: - export_to_ps = FALSE; - break; - default: - export_to_ps = TRUE; - break; - } - } - - if ((export_to_ps || document_type == EV_BACKEND_PS) && - !gtk_printer_accepts_ps (window->priv->printer)) { + if (!gtk_printer_accepts_ps (window->priv->printer)) { GtkWidget *msgdialog; msgdialog = gtk_message_dialog_new (GTK_WINDOW (dialog), @@ -1547,65 +2318,64 @@ ev_window_print_dialog_response_cb (GtkDialog *dialog, return FALSE; } - if (export_to_ps) { - EvPrintRange *ranges = NULL; - EvPageCache *page_cache; - gint n_ranges = 0; - gint current_page; - gint width; - gint height; - - ev_window_clear_print_job (window); - - current_page = - gtk_print_unix_dialog_get_current_page (GTK_PRINT_UNIX_DIALOG (dialog)); - - switch (print_pages) { - case GTK_PRINT_PAGES_CURRENT: - ranges = g_new0 (EvPrintRange, 1); - - ranges->start = current_page; - ranges->end = current_page; - n_ranges = 1; - - break; - case GTK_PRINT_PAGES_RANGES: { - GtkPageRange *page_range; - - page_range = gtk_print_settings_get_page_ranges (window->priv->print_settings, - &n_ranges); - if (n_ranges > 0) - ranges = g_memdup (page_range, n_ranges * sizeof (GtkPageRange)); - } - break; - default: - break; - } + ev_window_clear_print_job (window); + + current_page = gtk_print_unix_dialog_get_current_page (GTK_PRINT_UNIX_DIALOG (dialog)); + print_pages = gtk_print_settings_get_print_pages (window->priv->print_settings); + + switch (print_pages) { + case GTK_PRINT_PAGES_CURRENT: + ranges = g_new0 (EvPrintRange, 1); + + ranges->start = current_page; + ranges->end = current_page; + n_ranges = 1; - page_cache = ev_page_cache_get (window->priv->document); - ev_page_cache_get_size (page_cache, - current_page, - 0, 1.0, - &width, &height); - - window->priv->print_job = - ev_job_print_new (window->priv->document, - ranges, n_ranges, - (gdouble)width, - (gdouble)height); + break; + case GTK_PRINT_PAGES_RANGES: { + GtkPageRange *page_range; - g_signal_connect (window->priv->print_job, "finished", - G_CALLBACK (ev_window_print_job_cb), - window); - /* The priority doesn't matter for this job */ - ev_job_queue_add_job (window->priv->print_job, EV_JOB_PRIORITY_LOW); - } else { - gchar *filename; + page_range = gtk_print_settings_get_page_ranges (window->priv->print_settings, + &n_ranges); + if (n_ranges > 0) + ranges = g_memdup (page_range, n_ranges * sizeof (GtkPageRange)); + } + break; + default: + break; + } - filename = g_filename_from_uri (window->priv->uri, NULL, NULL); - ev_window_print_send (window, filename); - g_free (filename); + page_set = (EvPrintPageSet)gtk_print_settings_get_page_set (window->priv->print_settings); + + scale = gtk_print_settings_get_scale (window->priv->print_settings) * 0.01; + + width = gtk_page_setup_get_paper_width (window->priv->print_page_setup, + GTK_UNIT_PIXEL); + height = gtk_page_setup_get_paper_height (window->priv->print_page_setup, + GTK_UNIT_PIXEL); + + if (scale != 1.0) { + width *= scale; + height *= scale; } + + copies = gtk_print_settings_get_n_copies (window->priv->print_settings); + collate = gtk_print_settings_get_collate (window->priv->print_settings); + reverse = gtk_print_settings_get_reverse (window->priv->print_settings); + + window->priv->print_job = ev_job_print_new (window->priv->document, + file_format ? file_format : "ps", + width, height, + ranges, n_ranges, + page_set, + copies, collate, + reverse); + + g_signal_connect (window->priv->print_job, "finished", + G_CALLBACK (ev_window_print_job_cb), + window); + /* The priority doesn't matter for this job */ + ev_job_queue_add_job (window->priv->print_job, EV_JOB_PRIORITY_LOW); gtk_widget_destroy (GTK_WIDGET (dialog)); window->priv->print_dialog = NULL; @@ -1616,10 +2386,11 @@ ev_window_print_dialog_response_cb (GtkDialog *dialog, void ev_window_print_range (EvWindow *ev_window, int first_page, int last_page) { - GtkWidget *dialog; - EvPageCache *page_cache; - gint current_page; - gint document_last_page; + GtkWidget *dialog; + EvPageCache *page_cache; + gint current_page; + gint document_last_page; + GtkPrintCapabilities capabilities; g_return_if_fail (EV_IS_WINDOW (ev_window)); g_return_if_fail (ev_window->priv->document != NULL); @@ -1633,8 +2404,10 @@ ev_window_print_range (EvWindow *ev_window, int first_page, int last_page) current_page = ev_page_cache_get_current_page (page_cache); document_last_page = ev_page_cache_get_n_pages (page_cache); - if (!ev_window->priv->print_settings) - ev_window->priv->print_settings = gtk_print_settings_new (); + if (!ev_window->priv->print_settings) { + ev_window->priv->print_settings = g_object_ref ( + ev_application_get_print_settings (EV_APP)); + } if (first_page != 1 || last_page != document_last_page) { GtkPageRange range; @@ -1651,13 +2424,23 @@ ev_window_print_range (EvWindow *ev_window, int first_page, int last_page) dialog = gtk_print_unix_dialog_new (_("Print"), GTK_WINDOW (ev_window)); ev_window->priv->print_dialog = dialog; + + capabilities = GTK_PRINT_CAPABILITY_PAGE_SET | + GTK_PRINT_CAPABILITY_COPIES | + GTK_PRINT_CAPABILITY_COLLATE | + GTK_PRINT_CAPABILITY_REVERSE | + GTK_PRINT_CAPABILITY_SCALE | + GTK_PRINT_CAPABILITY_GENERATE_PS; + + if (EV_IS_FILE_EXPORTER (ev_window->priv->document) && + ev_file_exporter_format_supported (EV_FILE_EXPORTER (ev_window->priv->document), + EV_FILE_FORMAT_PDF)) { + capabilities |= GTK_PRINT_CAPABILITY_GENERATE_PDF; + } + gtk_print_unix_dialog_set_manual_capabilities (GTK_PRINT_UNIX_DIALOG (dialog), - GTK_PRINT_CAPABILITY_PAGE_SET | - GTK_PRINT_CAPABILITY_COPIES | - GTK_PRINT_CAPABILITY_COLLATE | - GTK_PRINT_CAPABILITY_REVERSE | - GTK_PRINT_CAPABILITY_SCALE | - GTK_PRINT_CAPABILITY_GENERATE_PS); + capabilities); + gtk_print_unix_dialog_set_current_page (GTK_PRINT_UNIX_DIALOG (dialog), current_page); @@ -1821,12 +2604,14 @@ ev_window_cmd_file_properties (GtkAction *action, EvWindow *ev_window) ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties), ev_window->priv->document); g_object_add_weak_pointer (G_OBJECT (ev_window->priv->properties), - (gpointer *) &(ev_window->priv->properties)); + (gpointer) &(ev_window->priv->properties)); gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->properties), GTK_WINDOW (ev_window)); } + ev_document_fc_mutex_lock (); gtk_widget_show (ev_window->priv->properties); + ev_document_fc_mutex_unlock (); } static void @@ -1961,60 +2746,6 @@ ev_window_cmd_edit_copy (GtkAction *action, EvWindow *ev_window) ev_view_copy (EV_VIEW (ev_window->priv->view)); } -static void -ev_window_update_fullscreen_popup (EvWindow *window) -{ - GtkWidget *popup = window->priv->fullscreen_popup; - int popup_width, popup_height; - GdkScreen *screen; - GdkRectangle screen_rect; - gboolean toolbar; - - g_return_if_fail (popup != NULL); - - if (GTK_WIDGET (window)->window == NULL) - return; - - toolbar = (window->priv->chrome & EV_CHROME_FULLSCREEN_TOOLBAR) != 0 || - (window->priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0; - popup_width = popup->requisition.width; - popup_height = popup->requisition.height; - - screen = gtk_widget_get_screen (GTK_WIDGET (window)); - gdk_screen_get_monitor_geometry (screen, - gdk_screen_get_monitor_at_window - (screen, - GTK_WIDGET (window)->window), - &screen_rect); - if (toolbar) { - gtk_widget_set_size_request (popup, - screen_rect.width, - -1); - gtk_window_move (GTK_WINDOW (popup), - screen_rect.x, - screen_rect.y); - - } else { - if (gtk_widget_get_direction (popup) == GTK_TEXT_DIR_RTL) - { - gtk_window_move (GTK_WINDOW (popup), - screen_rect.x, - screen_rect.y); - } else { - gtk_window_move (GTK_WINDOW (popup), - screen_rect.x + screen_rect.width - popup_width, - screen_rect.y); - } - } -} - -static void -screen_size_changed_cb (GdkScreen *screen, - EvWindow *window) -{ - ev_window_update_fullscreen_popup (window); -} - static void ev_window_sidebar_position_change_cb (GObject *object, GParamSpec *pspec, EvWindow *ev_window) @@ -2025,182 +2756,55 @@ ev_window_sidebar_position_change_cb (GObject *object, GParamSpec *pspec, } static void -destroy_fullscreen_popup (EvWindow *window) -{ - if (window->priv->fullscreen_popup != NULL) - { - gtk_widget_destroy (window->priv->fullscreen_popup); - window->priv->fullscreen_popup = NULL; - } -} - -static void -exit_fullscreen_button_clicked_cb (GtkWidget *button, EvWindow *window) +ev_window_update_fullscreen_action (EvWindow *window) { GtkAction *action; action = gtk_action_group_get_action (window->priv->action_group, "ViewFullscreen"); - g_return_if_fail (action != NULL); - - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), FALSE); + g_signal_handlers_block_by_func + (action, G_CALLBACK (ev_window_cmd_view_fullscreen), window); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), + ev_view_get_fullscreen (EV_VIEW (window->priv->view))); + g_signal_handlers_unblock_by_func + (action, G_CALLBACK (ev_window_cmd_view_fullscreen), window); } static void -fullscreen_popup_size_request_cb (GtkWidget *popup, GtkRequisition *req, EvWindow *window) +fullscreen_toolbar_setup_item_properties (GtkUIManager *ui_manager) { - ev_window_update_fullscreen_popup (window); -} + GtkWidget *item; -static gboolean -fullscreen_timeout_cb (gpointer data) -{ - EvWindow *window = EV_WINDOW (data); - - update_chrome_flag (window, EV_CHROME_FULLSCREEN_TOOLBAR, FALSE); - ev_view_hide_cursor (EV_VIEW (window->priv->view)); - window->priv->fullscreen_timeout_id = 0; + item = gtk_ui_manager_get_widget (ui_manager, "/FullscreenToolbar/GoPreviousPage"); + g_object_set (item, "is-important", FALSE, NULL); - return FALSE; -} + item = gtk_ui_manager_get_widget (ui_manager, "/FullscreenToolbar/GoNextPage"); + g_object_set (item, "is-important", FALSE, NULL); -static void -fullscreen_set_timeout (EvWindow *window) -{ - if (window->priv->fullscreen_timeout_id != 0) { - g_source_remove (window->priv->fullscreen_timeout_id); - } + item = gtk_ui_manager_get_widget (ui_manager, "/FullscreenToolbar/StartPresentation"); + g_object_set (item, "is-important", TRUE, NULL); - window->priv->fullscreen_timeout_id = - g_timeout_add (FULLSCREEN_TIMEOUT, fullscreen_timeout_cb, window); - - update_chrome_flag (window, EV_CHROME_FULLSCREEN_TOOLBAR, TRUE); - update_chrome_visibility (window); - ev_view_show_cursor (EV_VIEW (window->priv->view)); + item = gtk_ui_manager_get_widget (ui_manager, "/FullscreenToolbar/LeaveFullscreen"); + g_object_set (item, "is-important", TRUE, NULL); } static void -fullscreen_clear_timeout (EvWindow *window) -{ - if (window->priv->fullscreen_timeout_id != 0) { - g_source_remove (window->priv->fullscreen_timeout_id); - } - - window->priv->fullscreen_timeout_id = 0; - update_chrome_visibility (window); - ev_view_show_cursor (EV_VIEW (window->priv->view)); -} - - -static gboolean -fullscreen_motion_notify_cb (GtkWidget *widget, - GdkEventMotion *event, - gpointer user_data) -{ - EvWindow *window = EV_WINDOW (user_data); - - fullscreen_set_timeout (window); - - return FALSE; -} - -static gboolean -fullscreen_leave_notify_cb (GtkWidget *widget, - GdkEventCrossing *event, - gpointer user_data) -{ - EvWindow *window = EV_WINDOW (user_data); - - fullscreen_clear_timeout (window); - - return FALSE; -} - -static GtkWidget * -ev_window_get_exit_fullscreen_button (EvWindow *window) -{ - GtkWidget *button, *icon, *label, *hbox; - - button = gtk_button_new (); - g_signal_connect (button, "clicked", - G_CALLBACK (exit_fullscreen_button_clicked_cb), - window); - gtk_widget_show (button); - - hbox = gtk_hbox_new (FALSE, 2); - gtk_widget_show (hbox); - gtk_container_add (GTK_CONTAINER (button), hbox); - - icon = gtk_image_new_from_stock (EV_STOCK_LEAVE_FULLSCREEN, GTK_ICON_SIZE_BUTTON); - gtk_widget_show (icon); - gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0); - - label = gtk_label_new (_("Leave Fullscreen")); - gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - - return button; -} - -static GtkWidget * -ev_window_create_fullscreen_popup (EvWindow *window) -{ - GtkWidget *popup; - GtkWidget *hbox; - GtkWidget *button; - GdkScreen *screen; - - window->priv->fullscreen_toolbar = egg_editable_toolbar_new_with_model - (window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP), NULL); - - popup = gtk_window_new (GTK_WINDOW_POPUP); - hbox = gtk_hbox_new (FALSE, 0); - button = ev_window_get_exit_fullscreen_button (window); - - gtk_container_add (GTK_CONTAINER (popup), hbox); - gtk_box_pack_start (GTK_BOX (hbox), window->priv->fullscreen_toolbar, - TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); - - gtk_widget_show (button); - gtk_widget_show (hbox); - - gtk_window_set_resizable (GTK_WINDOW (popup), FALSE); - - screen = gtk_widget_get_screen (GTK_WIDGET (window)); - g_signal_connect_object (screen, "size-changed", - G_CALLBACK (screen_size_changed_cb), - window, 0); - g_signal_connect_object (popup, "size_request", - G_CALLBACK (fullscreen_popup_size_request_cb), - window, 0); - - gtk_window_set_screen (GTK_WINDOW (popup), - gtk_widget_get_screen (GTK_WIDGET (window))); - - return popup; -} - - -static void -ev_window_update_fullscreen_action (EvWindow *window) +ev_window_run_fullscreen (EvWindow *window) { - GtkAction *action; + if (!window->priv->fullscreen_toolbar) { + window->priv->fullscreen_toolbar = + gtk_ui_manager_get_widget (window->priv->ui_manager, + "/FullscreenToolbar"); - action = gtk_action_group_get_action (window->priv->action_group, "ViewFullscreen"); - g_signal_handlers_block_by_func - (action, G_CALLBACK (ev_window_cmd_view_fullscreen), window); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), - ev_view_get_fullscreen (EV_VIEW (window->priv->view))); - g_signal_handlers_unblock_by_func - (action, G_CALLBACK (ev_window_cmd_view_fullscreen), window); -} + gtk_toolbar_set_style (GTK_TOOLBAR (window->priv->fullscreen_toolbar), + GTK_TOOLBAR_BOTH_HORIZ); + fullscreen_toolbar_setup_item_properties (window->priv->ui_manager); -static void -ev_window_run_fullscreen (EvWindow *window) -{ - if (window->priv->fullscreen_popup == NULL) - window->priv->fullscreen_popup - = ev_window_create_fullscreen_popup (window); + gtk_box_pack_start (GTK_BOX (window->priv->main_box), + window->priv->fullscreen_toolbar, + FALSE, FALSE, 0); + gtk_box_reorder_child (GTK_BOX (window->priv->main_box), + window->priv->fullscreen_toolbar, 1); + } g_object_set (G_OBJECT (window->priv->scrolled_window), "shadow-type", GTK_SHADOW_NONE, @@ -2208,20 +2812,12 @@ ev_window_run_fullscreen (EvWindow *window) ev_view_set_fullscreen (EV_VIEW (window->priv->view), TRUE); ev_window_update_fullscreen_action (window); + + update_chrome_flag (window, EV_CHROME_FULLSCREEN_TOOLBAR, TRUE); + update_chrome_visibility (window); gtk_window_fullscreen (GTK_WINDOW (window)); gtk_widget_grab_focus (window->priv->view); - ev_window_update_fullscreen_popup (window); - - g_signal_connect (window->priv->view, - "motion-notify-event", - G_CALLBACK (fullscreen_motion_notify_cb), - window); - g_signal_connect (window->priv->view, - "leave-notify-event", - G_CALLBACK (fullscreen_leave_notify_cb), - window); - fullscreen_set_timeout (window); if (!ev_window_is_empty (window)) ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", TRUE); @@ -2241,16 +2837,10 @@ ev_window_stop_fullscreen (EvWindow *window) ev_view_set_fullscreen (view, FALSE); ev_window_update_fullscreen_action (window); + update_chrome_flag (window, EV_CHROME_FULLSCREEN_TOOLBAR, FALSE); + update_chrome_visibility (window); gtk_window_unfullscreen (GTK_WINDOW (window)); - g_signal_handlers_disconnect_by_func (window->priv->view, - (gpointer) fullscreen_motion_notify_cb, - window); - g_signal_handlers_disconnect_by_func (window->priv->view, - (gpointer) fullscreen_leave_notify_cb, - window); - fullscreen_clear_timeout (window); - if (!ev_window_is_empty (window)) ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", FALSE); } @@ -2271,6 +2861,69 @@ ev_window_cmd_view_fullscreen (GtkAction *action, EvWindow *window) } } +static gboolean +presentation_timeout_cb (EvWindow *window) +{ + EvView *view = EV_VIEW (window->priv->view); + + if (!view || !ev_view_get_presentation (EV_VIEW (view))) + return FALSE; + + ev_view_hide_cursor (EV_VIEW (window->priv->view)); + window->priv->presentation_timeout_id = 0; + + return FALSE; +} + +static void +presentation_set_timeout (EvWindow *window) +{ + if (window->priv->presentation_timeout_id > 0) { + g_source_remove (window->priv->presentation_timeout_id); + } + + window->priv->presentation_timeout_id = + g_timeout_add (PRESENTATION_TIMEOUT, (GSourceFunc)presentation_timeout_cb, window); + + ev_view_show_cursor (EV_VIEW (window->priv->view)); +} + +static void +presentation_clear_timeout (EvWindow *window) +{ + if (window->priv->presentation_timeout_id > 0) { + g_source_remove (window->priv->presentation_timeout_id); + } + + window->priv->presentation_timeout_id = 0; + + ev_view_show_cursor (EV_VIEW (window->priv->view)); +} + +static gboolean +presentation_motion_notify_cb (GtkWidget *widget, + GdkEventMotion *event, + gpointer user_data) +{ + EvWindow *window = EV_WINDOW (user_data); + + presentation_set_timeout (window); + + return FALSE; +} + +static gboolean +presentation_leave_notify_cb (GtkWidget *widget, + GdkEventCrossing *event, + gpointer user_data) +{ + EvWindow *window = EV_WINDOW (user_data); + + presentation_clear_timeout (window); + + return FALSE; +} + static void ev_window_update_presentation_action (EvWindow *window) { @@ -2295,19 +2948,23 @@ ev_window_run_presentation (EvWindow *window) ev_view_set_presentation (EV_VIEW (window->priv->view), TRUE); ev_window_update_presentation_action (window); + update_chrome_visibility (window); + gtk_widget_grab_focus (window->priv->view); gtk_window_fullscreen (GTK_WINDOW (window)); g_signal_connect (window->priv->view, "motion-notify-event", - G_CALLBACK (fullscreen_motion_notify_cb), + G_CALLBACK (presentation_motion_notify_cb), window); g_signal_connect (window->priv->view, "leave-notify-event", - G_CALLBACK (fullscreen_leave_notify_cb), + G_CALLBACK (presentation_leave_notify_cb), window); - fullscreen_set_timeout (window); + presentation_set_timeout (window); + ev_application_screensaver_disable (EV_APP); + if (!ev_window_is_empty (window)) ev_metadata_manager_set_boolean (window->priv->uri, "presentation", TRUE); } @@ -2324,15 +2981,18 @@ ev_window_stop_presentation (EvWindow *window) ev_view_set_presentation (EV_VIEW (window->priv->view), FALSE); ev_window_update_presentation_action (window); + update_chrome_visibility (window); gtk_window_unfullscreen (GTK_WINDOW (window)); g_signal_handlers_disconnect_by_func (window->priv->view, - (gpointer) fullscreen_motion_notify_cb, + (gpointer) presentation_motion_notify_cb, window); g_signal_handlers_disconnect_by_func (window->priv->view, - (gpointer) fullscreen_leave_notify_cb, + (gpointer) presentation_leave_notify_cb, window); - fullscreen_clear_timeout (window); + presentation_clear_timeout (window); + + ev_application_screensaver_enable (EV_APP); if (!ev_window_is_empty (window)) ev_metadata_manager_set_boolean (window->priv->uri, "presentation", FALSE); @@ -2357,56 +3017,37 @@ ev_window_cmd_view_presentation (GtkAction *action, EvWindow *window) static void ev_window_run_preview (EvWindow *window) { - EggToolbarsModel *model; - EggTbModelFlags flags; - - model = egg_toolbars_model_new (); - - egg_toolbars_model_load_toolbars (model, - DATADIR"/evince-toolbar.xml"); + GtkAction *action; - flags = egg_toolbars_model_get_flags (model, 1); - egg_toolbars_model_set_flags (model, 1, flags &= ~(EGG_TB_MODEL_HIDDEN)); - - egg_editable_toolbar_set_model (EGG_EDITABLE_TOOLBAR (window->priv->toolbar), - model); + if (!window->priv->preview_toolbar) { + window->priv->preview_toolbar = + gtk_ui_manager_get_widget (window->priv->ui_manager, + "/PreviewToolbar"); + + gtk_box_pack_start (GTK_BOX (window->priv->main_box), + window->priv->preview_toolbar, + FALSE, FALSE, 0); + gtk_box_reorder_child (GTK_BOX (window->priv->main_box), + window->priv->preview_toolbar, 1); + } - egg_editable_toolbar_hide (EGG_EDITABLE_TOOLBAR (window->priv->toolbar), - "DefaultToolBar"); - egg_editable_toolbar_show (EGG_EDITABLE_TOOLBAR (window->priv->toolbar), - "PreviewToolBar"); - ev_view_set_continuous (EV_VIEW (window->priv->view), FALSE); + update_chrome_flag (window, EV_CHROME_TOOLBAR, FALSE); update_chrome_flag (window, EV_CHROME_MENUBAR, FALSE); update_chrome_flag (window, EV_CHROME_SIDEBAR, FALSE); - update_chrome_visibility (window); -} - -static gboolean -ev_window_focus_in_event (GtkWidget *widget, GdkEventFocus *event) -{ - EvWindow *window = EV_WINDOW (widget); - EvWindowPrivate *priv = window->priv; - - if (ev_view_get_fullscreen (EV_VIEW (priv->view))) - fullscreen_set_timeout (window); - - return GTK_WIDGET_CLASS (ev_window_parent_class)->focus_in_event (widget, event); -} -static gboolean -ev_window_focus_out_event (GtkWidget *widget, GdkEventFocus *event) -{ - EvWindow *window = EV_WINDOW (widget); - EvWindowPrivate *priv = window->priv; - - if (ev_view_get_fullscreen (EV_VIEW (priv->view))) { - fullscreen_set_timeout (window); - gtk_widget_hide (priv->fullscreen_popup); - } + update_chrome_flag (window, EV_CHROME_PREVIEW_TOOLBAR, TRUE); + + action = gtk_action_group_get_action (window->priv->action_group, + "PreviewPrint"); +#if GTK_CHECK_VERSION (2, 11, 0) + gtk_action_set_visible (action, TRUE); +#else + gtk_action_set_visible (action, FALSE); +#endif - return GTK_WIDGET_CLASS (ev_window_parent_class)->focus_out_event (widget, event); + update_chrome_visibility (window); } static void @@ -2435,21 +3076,12 @@ ev_window_screen_changed (GtkWidget *widget, window); #endif + ev_view_set_screen_dpi (EV_VIEW (window->priv->view), + ev_window_get_screen_dpi (window)); + if (GTK_WIDGET_CLASS (ev_window_parent_class)->screen_changed) { GTK_WIDGET_CLASS (ev_window_parent_class)->screen_changed (widget, old_screen); } - - if (priv->fullscreen_popup != NULL) { - g_signal_handlers_disconnect_by_func - (old_screen, G_CALLBACK (screen_size_changed_cb), window); - - g_signal_connect_object (screen, "size-changed", - G_CALLBACK (screen_size_changed_cb), - window, 0); - gtk_window_set_screen (GTK_WINDOW (priv->fullscreen_popup), screen); - - ev_window_update_fullscreen_popup (window); - } } static void @@ -2625,14 +3257,10 @@ ev_window_cmd_go_backward (GtkAction *action, EvWindow *ev_window) static void ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window) { - char *uri; - - g_return_if_fail (EV_IS_WINDOW (ev_window)); + gchar *uri; uri = g_strdup (ev_window->priv->uri); - - ev_window_open_uri (ev_window, uri, NULL, 0); - + ev_window_open_uri (ev_window, uri, NULL, 0, FALSE, NULL); g_free (uri); } @@ -2640,21 +3268,178 @@ static void ev_window_cmd_help_contents (GtkAction *action, EvWindow *ev_window) { GError *error = NULL; + GdkScreen *screen; + char *command; + const char *lang; + char *uri = NULL; + + int i; + + const char * const * langs = g_get_language_names (); + + for (i = 0; langs[i]; i++) { + lang = langs[i]; + if (strchr (lang, '.')) { + continue; + } + + uri = g_build_filename(GNOMEDATADIR, + "/gnome/help/" PACKAGE, + lang, + "/evince.xml", + NULL); + + if (g_file_test (uri, G_FILE_TEST_EXISTS)) { + break; + } + } + + if (uri == NULL) { + g_warning ("Cannot find help"); + return; + } + + command = g_strconcat ("gnome-help ghelp://", uri, NULL); + g_free (uri); + + 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); + } + g_free (command); +} + +static void +ev_window_cmd_leave_fullscreen (GtkAction *action, EvWindow *window) +{ + ev_window_stop_fullscreen (window); +} + +static void +ev_window_cmd_start_presentation (GtkAction *action, EvWindow *window) +{ + ev_window_stop_fullscreen (window); + ev_window_run_presentation (window); +} + +#ifdef WITH_GTK_PRINT +static gboolean +lookup_printer_from_name (GtkPrinter *printer, + EvWindow *window) +{ + const gchar *printer_name; + + printer_name = gtk_print_settings_get_printer (window->priv->print_settings); + + if ((printer_name + && g_ascii_strcasecmp (printer_name, gtk_printer_get_name (printer)) == 0) || + (!printer_name && gtk_printer_is_default (printer))) { + if (window->priv->printer) + g_object_unref (window->priv->printer); + window->priv->printer = g_object_ref (printer); + + return TRUE; + } + + return FALSE; +} + +static void +ev_window_preview_print_finished (GtkPrintJob *print_job, + EvWindow *window, + GError *error) +{ + if (error) { + GtkWidget *dialog; + + dialog = gtk_message_dialog_new (GTK_WINDOW (window), + GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + _("Failed to print document")); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + error->message); + + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + } + + g_object_unref (print_job); + gtk_widget_destroy (GTK_WIDGET (window)); +} +#endif /* WITH_GTK_PRINT */ + +static void +ev_window_cmd_preview_print (GtkAction *action, EvWindow *window) +{ +#ifdef WITH_GTK_PRINT + GtkPrintSettings *print_settings = NULL; + GtkPageSetup *page_setup; + GtkPrintJob *job; + gchar *filename; + GError *error = NULL; +#if GTK_CHECK_VERSION (2, 11, 0) + const gchar *print_settings_file = window->priv->print_settings_file; + + if (print_settings_file) { + if (g_file_test (print_settings_file, G_FILE_TEST_IS_REGULAR)) { + GError *error = NULL; + + print_settings = gtk_print_settings_new_from_file (print_settings_file, + &error); + + if (error) { + g_warning (error->message); + g_error_free (error); + print_settings = NULL; + } + } + } +#endif /* GTK 2.11.0 */ + + if (!print_settings) + print_settings = gtk_print_settings_new (); + + if (window->priv->print_settings) + g_object_unref (window->priv->print_settings); + window->priv->print_settings = print_settings; + + gtk_enumerate_printers ((GtkPrinterFunc) lookup_printer_from_name, + window, NULL, TRUE); + g_assert (GTK_IS_PRINTER (window->priv->printer)); + + page_setup = gtk_page_setup_new (); + + job = gtk_print_job_new ("evince-print", + window->priv->printer, + window->priv->print_settings, + page_setup); - g_return_if_fail (EV_IS_WINDOW (ev_window)); + g_object_unref (window->priv->print_settings); + window->priv->print_settings = NULL; + g_object_unref (window->priv->printer); + window->priv->printer = NULL; + g_object_unref (page_setup); - gnome_help_display ("evince.xml", NULL, &error); + filename = g_filename_from_uri (window->priv->local_uri ? + window->priv->local_uri : window->priv->uri, + NULL, NULL); - if(error != NULL) { + if (gtk_print_job_set_source_file (job, filename, &error)) { + gtk_print_job_send (job, + (GtkPrintJobCompleteFunc)ev_window_preview_print_finished, + window, NULL); + } else { g_warning (error->message); g_error_free (error); } -} -static void -ev_window_cmd_leave_fullscreen (GtkAction *action, EvWindow *window) -{ - gtk_window_unfullscreen (GTK_WINDOW (window)); + g_free (filename); + + gtk_widget_hide (GTK_WIDGET (window)); +#endif /* WITH_GTK_PRINT */ } static void @@ -2790,8 +3575,11 @@ ev_window_zoom_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window) ev_window_update_actions (ev_window); if (ev_view_get_sizing_mode (view) == EV_SIZING_FREE && !ev_window_is_empty (ev_window)) { - ev_metadata_manager_set_double (ev_window->priv->uri, "zoom", - ev_view_get_zoom (view)); + gdouble zoom; + + zoom = ev_view_get_zoom (view); + zoom *= 72.0 / ev_window_get_screen_dpi (ev_window); + ev_metadata_manager_set_double (ev_window->priv->uri, "zoom", zoom); } } @@ -2867,6 +3655,7 @@ ev_window_dual_mode_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_wi static char * build_comments_string (void) { +#ifdef ENABLE_PDF PopplerBackend backend; const char *backend_name; const char *version; @@ -2885,9 +3674,12 @@ build_comments_string (void) break; } - return g_strdup_printf (_("PostScript and PDF File Viewer.\n" + return g_strdup_printf (_("Document Viewer.\n" "Using poppler %s (%s)"), version, backend_name); +#else + return g_strdup_printf (_("Document Viewer")); +#endif } static void @@ -2899,7 +3691,8 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window) "Marco Pesenti Gritti ", "Nickolay V. Shmyrev ", "Bryan Clark ", - "Carlos Garcia Campos ", + "Carlos Garcia Campos ", + "Wouter Bolsterlee ", NULL }; @@ -2944,7 +3737,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window) "name", _("Evince"), "version", VERSION, "copyright", - _("\xc2\xa9 1996-2005 The Evince authors"), + _("\xc2\xa9 1996-2007 The Evince authors"), "license", license_trans, "website", "http://www.gnome.org/projects/evince", "comments", comments, @@ -3011,28 +3804,25 @@ ev_window_sidebar_visibility_changed_cb (EvSidebar *ev_sidebar, GtkAction *action; action = gtk_action_group_get_action (ev_window->priv->action_group, "ViewSidebar"); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), - GTK_WIDGET_VISIBLE (ev_sidebar)); if (!ev_view_get_presentation (view) && !ev_view_get_fullscreen (view)) { + + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), + GTK_WIDGET_VISIBLE (ev_sidebar)); + ev_metadata_manager_set_boolean (ev_window->priv->uri, "sidebar_visibility", GTK_WIDGET_VISIBLE (ev_sidebar)); } } -static gboolean -view_menu_popup_cb (EvView *view, - EvLink *link, - EvWindow *ev_window) +static void +view_menu_link_popup (EvWindow *ev_window, + EvLink *link) { - GtkWidget *popup; gboolean show_external = FALSE; gboolean show_internal = FALSE; GtkAction *action; - - if (ev_view_get_presentation (EV_VIEW (ev_window->priv->view))) - return FALSE; if (ev_window->priv->link) g_object_unref (ev_window->priv->link); @@ -3042,26 +3832,23 @@ view_menu_popup_cb (EvView *view, else ev_window->priv->link = NULL; - popup = ev_window->priv->view_popup; - if (ev_window->priv->link) { EvLinkAction *ev_action; ev_action = ev_link_get_action (link); - if (!ev_action) - return FALSE; - - switch (ev_link_action_get_action_type (ev_action)) { - case EV_LINK_ACTION_TYPE_GOTO_DEST: - case EV_LINK_ACTION_TYPE_GOTO_REMOTE: - show_internal = TRUE; - break; - case EV_LINK_ACTION_TYPE_EXTERNAL_URI: - case EV_LINK_ACTION_TYPE_LAUNCH: - show_external = TRUE; - break; - default: - break; + if (ev_action) { + switch (ev_link_action_get_action_type (ev_action)) { + case EV_LINK_ACTION_TYPE_GOTO_DEST: + case EV_LINK_ACTION_TYPE_GOTO_REMOTE: + show_internal = TRUE; + break; + case EV_LINK_ACTION_TYPE_EXTERNAL_URI: + case EV_LINK_ACTION_TYPE_LAUNCH: + show_external = TRUE; + break; + default: + break; + } } } @@ -3077,8 +3864,52 @@ view_menu_popup_cb (EvView *view, "GoLink"); gtk_action_set_visible (action, show_internal); - gtk_menu_popup (GTK_MENU (popup), NULL, NULL, - NULL, NULL, + action = gtk_action_group_get_action (ev_window->priv->view_popup_action_group, + "OpenLinkNewWindow"); + gtk_action_set_visible (action, show_internal); +} + +static void +view_menu_image_popup (EvWindow *ev_window, + EvImage *image) +{ + GtkAction *action; + gboolean show_image = FALSE; + + if (ev_window->priv->image) + g_object_unref (ev_window->priv->image); + + if (image) + ev_window->priv->image = g_object_ref (image); + else + ev_window->priv->image = NULL; + + show_image = (ev_window->priv->image != NULL); + + action = gtk_action_group_get_action (ev_window->priv->view_popup_action_group, + "SaveImageAs"); + gtk_action_set_visible (action, show_image); + + action = gtk_action_group_get_action (ev_window->priv->view_popup_action_group, + "CopyImage"); + gtk_action_set_visible (action, show_image); +} + +static gboolean +view_menu_popup_cb (EvView *view, + GObject *object, + EvWindow *ev_window) +{ + if (ev_view_get_presentation (EV_VIEW (ev_window->priv->view))) + return FALSE; + + view_menu_link_popup (ev_window, + EV_IS_LINK (object) ? EV_LINK (object) : NULL); + view_menu_image_popup (ev_window, + EV_IS_IMAGE (object) ? EV_IMAGE (object) : NULL); + + gtk_menu_popup (GTK_MENU (ev_window->priv->view_popup), + NULL, NULL, NULL, NULL, 3, gtk_get_current_event_time ()); return TRUE; } @@ -3151,8 +3982,6 @@ find_bar_search_changed_cb (EggFindBar *find_bar, gboolean visible; const char *search_string; - g_return_if_fail (EV_IS_WINDOW (ev_window)); - /* Either the string or case sensitivity could have changed, * we connect this callback to both. We also connect it * to ::visible so when the find bar is hidden, we should @@ -3213,7 +4042,9 @@ zoom_control_changed_cb (EphyZoomAction *action, ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), mode); if (mode == EV_SIZING_FREE) { - ev_view_set_zoom (EV_VIEW (ev_window->priv->view), zoom, FALSE); + ev_view_set_zoom (EV_VIEW (ev_window->priv->view), + zoom * ev_window_get_screen_dpi (ev_window) / 72.0, + FALSE); } } @@ -3303,12 +4134,17 @@ ev_window_dispose (GObject *object) priv->password_view = NULL; } - if (priv->xfer_job) { - ev_window_clear_xfer_job (window); + if (priv->load_job) { + ev_window_clear_load_job (window); + } + + if (priv->thumbnail_job) { + ev_window_clear_thumbnail_job (window); } if (priv->local_uri) { ev_window_clear_local_uri (window); + priv->local_uri = NULL; } ev_window_close_dialogs (window); @@ -3342,6 +4178,11 @@ ev_window_dispose (GObject *object) priv->link = NULL; } + if (priv->image) { + g_object_unref (priv->image); + priv->image = NULL; + } + if (priv->attach_list) { g_list_foreach (priv->attach_list, (GFunc) g_object_unref, @@ -3359,6 +4200,8 @@ ev_window_dispose (GObject *object) } if (priv->uri) { + if (priv->unlink_temp_file) + ev_window_clear_temp_file (window); g_free (priv->uri); priv->uri = NULL; } @@ -3368,11 +4211,20 @@ ev_window_dispose (GObject *object) priv->dest = NULL; } - if (priv->fullscreen_timeout_id) { - g_source_remove (priv->fullscreen_timeout_id); - priv->fullscreen_timeout_id = 0; + if (priv->history) { + g_object_unref (priv->history); + priv->history = NULL; + } + + if (priv->print_settings_file) { + ev_window_clear_print_settings_file (window); + priv->print_settings_file = NULL; + } + + if (priv->presentation_timeout_id > 0) { + g_source_remove (priv->presentation_timeout_id); + priv->presentation_timeout_id = 0; } - destroy_fullscreen_popup (window); G_OBJECT_CLASS (ev_window_parent_class)->dispose (object); } @@ -3386,8 +4238,6 @@ ev_window_class_init (EvWindowClass *ev_window_class) g_object_class->dispose = ev_window_dispose; g_object_class->finalize = ev_window_finalize; - widget_class->focus_in_event = ev_window_focus_in_event; - widget_class->focus_out_event = ev_window_focus_out_event; widget_class->screen_changed = ev_window_screen_changed; g_type_class_add_private (g_object_class, sizeof (EvWindowPrivate)); @@ -3405,9 +4255,15 @@ static const GtkActionEntry entries[] = { { "FileOpen", GTK_STOCK_OPEN, N_("_Open..."), "O", N_("Open an existing document"), G_CALLBACK (ev_window_cmd_file_open) }, + { "FileOpenCopy", NULL, N_("Op_en a Copy"), NULL, + N_("Open a copy of the current document in a new window"), + G_CALLBACK (ev_window_cmd_file_open_copy) }, { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), "S", N_("Save a copy of the current document"), G_CALLBACK (ev_window_cmd_save_as) }, + { "FilePrintSetup", NULL, N_("Print Set_up..."), NULL, + N_("Setup the page settings for printing"), + G_CALLBACK (ev_window_cmd_file_print_setup) }, { "FilePrint", GTK_STOCK_PRINT, N_("_Print..."), "P", N_("Print this document"), G_CALLBACK (ev_window_cmd_file_print) }, @@ -3419,7 +4275,11 @@ static const GtkActionEntry entries[] = { /* Edit menu */ { "EditCopy", GTK_STOCK_COPY, NULL, "C", NULL, G_CALLBACK (ev_window_cmd_edit_copy) }, - { "EditSelectAll", NULL, N_("Select _All"), "A", NULL, +#ifdef HAVE_GTK_RECENT + { "EditSelectAll", GTK_STOCK_SELECT_ALL, N_("Select _All"), "A", NULL, +#else + { "EditSelectAll", NULL, N_("Select _All"), "A", NULL, +#endif /* HAVE_GTK_RECENT */ G_CALLBACK (ev_window_cmd_edit_select_all) }, { "EditFind", GTK_STOCK_FIND, N_("_Find..."), "F", N_("Find a word or phrase in the document"), @@ -3430,9 +4290,9 @@ static const GtkActionEntry entries[] = { G_CALLBACK (ev_window_cmd_edit_find_previous) }, { "EditToolbar", NULL, N_("T_oolbar"), NULL, NULL, G_CALLBACK (ev_window_cmd_edit_toolbar) }, - { "EditRotateLeft", NULL, N_("Rotate _Left"), NULL, NULL, + { "EditRotateLeft", EV_STOCK_ROTATE_LEFT, N_("Rotate _Left"), NULL, NULL, G_CALLBACK (ev_window_cmd_edit_rotate_left) }, - { "EditRotateRight", NULL, N_("Rotate _Right"), NULL, NULL, + { "EditRotateRight", EV_STOCK_ROTATE_RIGHT, N_("Rotate _Right"), NULL, NULL, G_CALLBACK (ev_window_cmd_edit_rotate_right) }, /* View menu */ @@ -3468,9 +4328,15 @@ static const GtkActionEntry entries[] = { G_CALLBACK (ev_window_cmd_help_about) }, /* Toolbar-only */ - { "LeaveFullscreen", EV_STOCK_LEAVE_FULLSCREEN, N_("Leave Fullscreen"), NULL, + { "LeaveFullscreen", GTK_STOCK_LEAVE_FULLSCREEN, N_("Leave Fullscreen"), NULL, N_("Leave fullscreen mode"), G_CALLBACK (ev_window_cmd_leave_fullscreen) }, + { "StartPresentation", EV_STOCK_RUN_PRESENTATION, N_("Start Presentation"), NULL, + N_("Start a presentation"), + G_CALLBACK (ev_window_cmd_start_presentation) }, + { "PreviewPrint", GTK_STOCK_PRINT, N_("Print"), NULL, + N_("Print this document"), + G_CALLBACK (ev_window_cmd_preview_print) }, /* Accellerators */ { "Escape", NULL, "", "Escape", "", @@ -3553,9 +4419,14 @@ static const GtkActionEntry view_popup_entries [] = { NULL, G_CALLBACK (ev_view_popup_cmd_open_link) }, { "GoLink", GTK_STOCK_GO_FORWARD, N_("_Go To"), NULL, NULL, G_CALLBACK (ev_view_popup_cmd_open_link) }, + { "OpenLinkNewWindow", NULL, N_("Open in New _Window"), NULL, + NULL, G_CALLBACK (ev_view_popup_cmd_open_link_new_window) }, { "CopyLinkAddress", NULL, N_("_Copy Link Address"), NULL, - NULL, - G_CALLBACK (ev_view_popup_cmd_copy_link_address) }, + NULL, G_CALLBACK (ev_view_popup_cmd_copy_link_address) }, + { "SaveImageAs", NULL, N_("_Save Image As..."), NULL, + NULL, G_CALLBACK (ev_view_popup_cmd_save_image_as) }, + { "CopyImage", NULL, N_("Copy _Image"), NULL, + NULL, G_CALLBACK (ev_view_popup_cmd_copy_image) }, }; static const GtkActionEntry attachment_popup_entries [] = { @@ -3566,30 +4437,9 @@ static const GtkActionEntry attachment_popup_entries [] = { }; static void -drag_data_received_cb (GtkWidget *widget, GdkDragContext *context, - gint x, gint y, GtkSelectionData *selection_data, - guint info, guint time, gpointer gdata) +sidebar_links_link_activated_cb (EvSidebarLinks *sidebar_links, EvLink *link, EvWindow *window) { - GList *uri_list = NULL; - GSList *uris = NULL; - gchar *uri; - - uri_list = gnome_vfs_uri_list_parse ((gchar *) selection_data->data); - - if (uri_list) { - while (uri_list) { - uri = gnome_vfs_uri_to_string (uri_list->data, GNOME_VFS_URI_HIDE_NONE); - uris = g_slist_append (uris, (gpointer) uri); - - uri_list = g_list_next (uri_list); - } - - gnome_vfs_uri_list_free (uri_list); - - ev_application_open_uri_list (EV_APP, uris, 0); - - g_slist_free (uris); - } + ev_view_handle_link (EV_VIEW (window->priv->view), link); } static void @@ -3599,14 +4449,12 @@ activate_link_cb (EvPageAction *page_action, EvLink *link, EvWindow *window) gtk_widget_grab_focus (window->priv->view); } -static gboolean -activate_label_cb (EvPageAction *page_action, char *label, EvWindow *window) +static void +navigation_action_activate_link_cb (EvNavigationAction *action, EvLink *link, EvWindow *window) { - g_return_val_if_fail (EV_IS_WINDOW (window), FALSE); - + + ev_view_handle_link (EV_VIEW (window->priv->view), link); gtk_widget_grab_focus (window->priv->view); - - return ev_page_cache_set_page_label (window->priv->page_cache, label); } static void @@ -3622,15 +4470,13 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group) NULL); g_signal_connect (action, "activate_link", G_CALLBACK (activate_link_cb), window); - g_signal_connect (action, "activate_label", - G_CALLBACK (activate_label_cb), window); gtk_action_group_add_action (group, action); g_object_unref (action); 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); @@ -3638,6 +4484,19 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group) G_CALLBACK (zoom_control_changed_cb), window); gtk_action_group_add_action (group, action); g_object_unref (action); + + action = g_object_new (EV_TYPE_NAVIGATION_ACTION, + "name", NAVIGATION_ACTION, + "label", _("Navigation"), + "is_important", TRUE, + "short_label", _("Back"), + "stock_id", GTK_STOCK_GO_DOWN, + "tooltip", _("Move across visited pages"), + NULL); + g_signal_connect (action, "activate_link", + G_CALLBACK (navigation_action_activate_link_cb), window); + gtk_action_group_add_action (group, action); + g_object_unref (action); } static void @@ -3646,9 +4505,9 @@ set_action_properties (GtkActionGroup *action_group) GtkAction *action; action = gtk_action_group_get_action (action_group, "GoPreviousPage"); + g_object_set (action, "is-important", TRUE, NULL); /*translators: this is the label for toolbar button*/ g_object_set (action, "short_label", _("Previous"), NULL); - g_object_set (action, "is-important", TRUE, NULL); action = gtk_action_group_get_action (action_group, "GoNextPage"); g_object_set (action, "is-important", TRUE, NULL); @@ -3658,22 +4517,18 @@ set_action_properties (GtkActionGroup *action_group) action = gtk_action_group_get_action (action_group, "ViewZoomIn"); /*translators: this is the label for toolbar button*/ g_object_set (action, "short_label", _("Zoom In"), NULL); - action = gtk_action_group_get_action (action_group, "ViewZoomIn"); action = gtk_action_group_get_action (action_group, "ViewZoomOut"); /*translators: this is the label for toolbar button*/ g_object_set (action, "short_label", _("Zoom Out"), NULL); - action = gtk_action_group_get_action (action_group, "ViewZoomIn"); action = gtk_action_group_get_action (action_group, "ViewBestFit"); /*translators: this is the label for toolbar button*/ g_object_set (action, "short_label", _("Best Fit"), NULL); - action = gtk_action_group_get_action (action_group, "ViewZoomIn"); action = gtk_action_group_get_action (action_group, "ViewPageWidth"); /*translators: this is the label for toolbar button*/ g_object_set (action, "short_label", _("Fit Width"), NULL); - action = gtk_action_group_get_action (action_group, "ViewZoomIn"); action = gtk_action_group_get_action (action_group, "LeaveFullscreen"); g_object_set (action, "is-important", TRUE, NULL); @@ -3770,7 +4625,7 @@ window_configure_event_cb (EvWindow *window, GdkEventConfigure *event, gpointer { char *uri = window->priv->uri; GdkWindowState state; - int x, y, width, height; + int x, y, width, height, document_width, document_height; state = gdk_window_get_state (GTK_WIDGET (window)->window); @@ -3778,7 +4633,18 @@ window_configure_event_cb (EvWindow *window, GdkEventConfigure *event, gpointer gtk_window_get_position (GTK_WINDOW (window), &x, &y); gtk_window_get_size (GTK_WINDOW (window), &width, &height); - if (!ev_window_is_empty (window)) { + if (!ev_window_is_empty (window) && window->priv->page_cache) { + ev_page_cache_get_max_width (window->priv->page_cache, + 0, 1.0, + &document_width); + ev_page_cache_get_max_height (window->priv->page_cache, + 0, 1.0, + &document_height); + ev_metadata_manager_set_double (uri, "window_width_ratio", + (double)width / document_width); + ev_metadata_manager_set_double (uri, "window_height_ratio", + (double)height / document_height); + ev_metadata_manager_set_int (uri, "window_x", x); ev_metadata_manager_set_int (uri, "window_y", y); ev_metadata_manager_set_int (uri, "window_width", width); @@ -3789,12 +4655,6 @@ window_configure_event_cb (EvWindow *window, GdkEventConfigure *event, gpointer return FALSE; } -static void -sidebar_links_link_activated_cb (EvSidebarLinks *sidebar_links, EvLink *link, EvWindow *window) -{ - ev_view_handle_link (EV_VIEW (window->priv->view), link); -} - static void launch_action (EvWindow *window, EvLinkAction *action) { @@ -3829,17 +4689,45 @@ launch_action (EvWindow *window, EvLinkAction *action) allowing to launch executables is a good idea though. -- marco */ } +static gboolean +uri_is_valid (const gchar *uri) +{ + gchar *p = (gchar *) uri; + + if (!p || !g_ascii_isalpha (*p)) + return FALSE; + + p++; + while (g_ascii_isalnum (*p)) + p++; + + return (g_ascii_strncasecmp (p, "://", strlen ("://")) == 0); +} + static void launch_external_uri (EvWindow *window, EvLinkAction *action) { - const char *uri; - char *escaped; + const gchar *uri = ev_link_action_get_uri (action); + + if (!uri_is_valid (uri)) { + GtkWidget *dialog; - uri = ev_link_action_get_uri (action); - escaped = gnome_vfs_escape_host_and_path_string (uri); + dialog = gtk_message_dialog_new (GTK_WINDOW (window), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + _("Unable to open external link")); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + _("Invalid URI: “%s”"), uri); + g_signal_connect (dialog, "response", + G_CALLBACK (gtk_widget_destroy), + NULL); + gtk_widget_show (dialog); - gnome_vfs_url_show (escaped); - g_free (escaped); + return; + } + + gnome_vfs_url_show (uri); } static void @@ -3855,8 +4743,11 @@ open_remote_link (EvWindow *window, EvLinkAction *action) g_free (dir); ev_application_open_uri_at_dest (EV_APP, uri, + gtk_window_get_screen (GTK_WINDOW (window)), ev_link_action_get_dest (action), 0, + FALSE, + NULL, GDK_CURRENT_TIME); g_free (uri); @@ -3893,6 +4784,16 @@ static void view_external_link_cb (EvView *view, EvLinkAction *action, EvWindow *window) { switch (ev_link_action_get_action_type (action)) { + case EV_LINK_ACTION_TYPE_GOTO_DEST: { + EvLinkDest *dest; + + dest = ev_link_action_get_dest (action); + if (!dest) + return; + + ev_window_cmd_file_open_copy_at_dest (window, dest); + } + break; case EV_LINK_ACTION_TYPE_EXTERNAL_URI: launch_external_uri (window, action); break; @@ -3916,6 +4817,23 @@ ev_view_popup_cmd_open_link (GtkAction *action, EvWindow *window) ev_view_handle_link (EV_VIEW (window->priv->view), window->priv->link); } +static void +ev_view_popup_cmd_open_link_new_window (GtkAction *action, EvWindow *window) +{ + EvLinkAction *ev_action = NULL; + EvLinkDest *dest; + + ev_action = ev_link_get_action (window->priv->link); + if (!ev_action) + return; + + dest = ev_link_action_get_dest (ev_action); + if (!dest) + return; + + ev_window_cmd_file_open_copy_at_dest (window, dest); +} + static void ev_view_popup_cmd_copy_link_address (GtkAction *action, EvWindow *window) { @@ -3934,6 +4852,113 @@ ev_view_popup_cmd_copy_link_address (GtkAction *action, EvWindow *window) gtk_clipboard_set_text (clipboard, uri, -1); } +static void +image_save_dialog_response_cb (GtkWidget *fc, + gint response_id, + EvWindow *ev_window) +{ + GnomeVFSURI *target_uri; + gchar *uri; + gchar *filename; + gboolean is_local; + GError *error = NULL; + + if (response_id != GTK_RESPONSE_OK) { + gtk_widget_destroy (fc); + return; + } + + uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc)); + 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 */ + gdk_pixbuf_save (ev_image_get_pixbuf (ev_window->priv->image), + filename, "png", &error, NULL); + + if (error) { + ev_window_error_dialog (GTK_WINDOW (ev_window), + _("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; + } + + 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); +} + +static void +ev_view_popup_cmd_save_image_as (GtkAction *action, EvWindow *window) +{ + GtkWidget *fc; + GtkFileFilter *filter; + + if (!window->priv->image) + return; + + fc = gtk_file_chooser_dialog_new (_("Save Image"), + GTK_WINDOW (window), + GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_OK, + 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 (); + gtk_file_filter_set_name (filter, _("Images")); + gtk_file_filter_add_pixbuf_formats (filter); + gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (fc), filter); + + g_signal_connect (fc, "response", + G_CALLBACK (image_save_dialog_response_cb), + window); + + gtk_widget_show (fc); +} + +static void +ev_view_popup_cmd_copy_image (GtkAction *action, EvWindow *window) +{ + GtkClipboard *clipboard; + + if (!window->priv->image) + return; + + clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window), + GDK_SELECTION_CLIPBOARD); + gtk_clipboard_set_image (clipboard, + ev_image_get_pixbuf (window->priv->image)); +} + static void ev_attachment_popup_cmd_open_attachment (GtkAction *action, EvWindow *window) { @@ -3964,10 +4989,12 @@ attachment_save_dialog_response_cb (GtkWidget *fc, 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); @@ -3975,9 +5002,10 @@ attachment_save_dialog_response_cb (GtkWidget *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; @@ -3986,26 +5014,57 @@ attachment_save_dialog_response_cb (GtkWidget *fc, 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 (fc), + 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); } @@ -4023,7 +5082,7 @@ ev_attachment_popup_cmd_save_attachment_as (GtkAction *action, EvWindow *window) attachment = (EvAttachment *) window->priv->attach_list->data; fc = gtk_file_chooser_dialog_new ( - _("Save a Copy"), + _("Save Attachment"), GTK_WINDOW (window), attachment ? GTK_FILE_CHOOSER_ACTION_SAVE : GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_CANCEL, @@ -4033,6 +5092,7 @@ ev_attachment_popup_cmd_save_attachment_as (GtkAction *action, EvWindow *window) 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), @@ -4051,7 +5111,7 @@ ev_window_init (EvWindow *ev_window) GtkActionGroup *action_group; GtkAccelGroup *accel_group; GError *error = NULL; - GtkWidget *sidebar_widget, *toolbar_dock; + GtkWidget *sidebar_widget; g_signal_connect (ev_window, "configure_event", G_CALLBACK (window_configure_event_cb), NULL); @@ -4131,21 +5191,19 @@ ev_window_init (EvWindow *ev_window) ev_window->priv->menubar, FALSE, FALSE, 0); - /* This sucks, but there is no way to have a draw=no, expand=true separator - * in a GtkUIManager-built toolbar. So, just add another toolbar. - * See gtk+ bug 166489. - */ - toolbar_dock = ev_window->priv->toolbar_dock = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box), toolbar_dock, - FALSE, FALSE, 0); - gtk_widget_show (toolbar_dock); - ev_window->priv->toolbar = egg_editable_toolbar_new_with_model - (ev_window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP), NULL); + ev_window->priv->toolbar = GTK_WIDGET + (g_object_new (EGG_TYPE_EDITABLE_TOOLBAR, + "ui-manager", ev_window->priv->ui_manager, + "popup-path", "/ToolbarPopup", + "model", ev_application_get_toolbars_model (EV_APP), + NULL)); + egg_editable_toolbar_show (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar), "DefaultToolBar"); - gtk_box_pack_start (GTK_BOX (toolbar_dock), ev_window->priv->toolbar, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box), + ev_window->priv->toolbar, + FALSE, FALSE, 0); gtk_widget_show (ev_window->priv->toolbar); /* Add the main area */ @@ -4167,6 +5225,17 @@ ev_window_init (EvWindow *ev_window) /* 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, @@ -4192,17 +5261,6 @@ ev_window_init (EvWindow *ev_window) 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, @@ -4213,6 +5271,8 @@ ev_window_init (EvWindow *ev_window) ev_window->priv->scrolled_window); ev_window->priv->view = ev_view_new (); + ev_view_set_screen_dpi (EV_VIEW (ev_window->priv->view), + ev_window_get_screen_dpi (ev_window)); ev_window->priv->password_view = ev_password_view_new (); g_signal_connect_swapped (ev_window->priv->password_view, "unlock", @@ -4227,6 +5287,10 @@ ev_window_init (EvWindow *ev_window) g_signal_connect_object (ev_window->priv->view, "external-link", G_CALLBACK (view_external_link_cb), ev_window, 0); + g_signal_connect_object (ev_window->priv->view, "handle-link", + G_CALLBACK (view_handle_link_cb), + ev_window, 0); + g_signal_connect_object (ev_window->priv->view, "popup", G_CALLBACK (view_menu_popup_cb), @@ -4328,19 +5392,7 @@ ev_window_init (EvWindow *ev_window) /* Give focus to the document view */ gtk_widget_grab_focus (ev_window->priv->view); - /* Drag and Drop */ - gtk_drag_dest_unset (GTK_WIDGET (ev_window->priv->view)); - gtk_drag_dest_set (GTK_WIDGET (ev_window->priv->view), - GTK_DEST_DEFAULT_ALL, - ev_drop_types, - sizeof (ev_drop_types) / sizeof (ev_drop_types[0]), - GDK_ACTION_COPY); - g_signal_connect_swapped (G_OBJECT (ev_window->priv->view), "drag-data-received", - G_CALLBACK (drag_data_received_cb), - ev_window); - /* Set it user interface params */ - ev_window_setup_recent (ev_window); setup_chrome_from_metadata (ev_window); @@ -4356,6 +5408,13 @@ ev_window_init (EvWindow *ev_window) ev_window_setup_action_sensitivity (ev_window); } +/** + * ev_window_new: + * + * Creates a #GtkWidget that represents the window. + * + * Returns: the #GtkWidget that represents the window. + */ GtkWidget * ev_window_new (void) {