X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-window.c;h=475cb5ddc1e4a44016068dd27c5eef569d17c8b1;hb=8ccbb218873ff3f7d5e6b924b9ff7d44f1f6d62e;hp=2a67b891652034be3ede47daee5395e21a9b017a;hpb=f47b89da690d2b954423b800dd106694f82f7587;p=evince.git diff --git a/shell/ev-window.c b/shell/ev-window.c index 2a67b891..475cb5dd 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -39,6 +39,7 @@ #include "ev-print-job.h" #include "ev-document-thumbnails.h" #include "ev-document-links.h" +#include "ev-document-types.h" #include "ev-document-find.h" #include "ev-document-security.h" #include "ev-job-queue.h" @@ -47,16 +48,6 @@ #include "egg-recent-view.h" #include "egg-recent-model.h" -#include "ev-poppler.h" -#include "pixbuf-document.h" -#include "ps-document.h" -#ifdef ENABLE_DVI -#include "dvi-document.h" -#endif -#ifdef ENABLE_DJVU -#include "djvu-document.h" -#endif - #include #include #include @@ -73,12 +64,6 @@ #include "ev-application.h" #include "ev-stock-icons.h" -typedef enum { - EV_SIZING_BEST_FIT, - EV_SIZING_FIT_WIDTH, - EV_SIZING_FREE, -} EvSizingMode; - typedef enum { PAGE_MODE_SINGLE_PAGE, PAGE_MODE_CONTINUOUS_PAGE, @@ -101,7 +86,6 @@ struct _EvWindowPrivate { GtkWidget *toolbar; GtkWidget *hpaned; GtkWidget *sidebar; - GtkWidget *thumbs_sidebar; GtkWidget *find_bar; GtkWidget *scrolled_window; GtkWidget *view; @@ -126,8 +110,6 @@ struct _EvWindowPrivate { char *password_uri; EvChrome chrome; - gboolean fullscreen_mode; - EvSizingMode sizing_mode; GSource *fullscreen_timeout_source; /* recent file stuff */ @@ -135,7 +117,7 @@ struct _EvWindowPrivate { EggRecentViewGtk *recent_view; }; -static GtkTargetEntry ev_drop_types[] = { +static const GtkTargetEntry ev_drop_types[] = { { "text/uri-list", 0, 0 } }; @@ -152,20 +134,30 @@ static GtkTargetEntry ev_drop_types[] = { #define GCONF_SIDEBAR_SIZE "/apps/evince/sidebar_size" #define SIDEBAR_DEFAULT_SIZE 132 -#define VIEW_SPACING 10 -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 gboolean start_loading_document (EvWindow *ev_window, - EvDocument *document, - const char *uri); -static void ev_window_set_sizing_mode (EvWindow *ev_window, - EvSizingMode sizing_mode); +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 gboolean start_loading_document (EvWindow *ev_window, + EvDocument *document, + const char *uri); +static void ev_window_sizing_mode_changed_cb (EvView *view, + GParamSpec *pspec, + EvWindow *ev_window); +static void ev_window_add_recent (EvWindow *window, + const char *filename); +static void ev_window_fullscreen (EvWindow *window); +static void ev_window_unfullscreen (EvWindow *window); +static void ev_window_cmd_view_fullscreen (GtkAction *action, + EvWindow *window); +static void ev_window_run_presentation (EvWindow *window); +static void ev_window_stop_presentation (EvWindow *window); +static void ev_window_cmd_view_presentation (GtkAction *action, + EvWindow *window); -static void ev_window_add_recent (EvWindow *window, const char *filename); G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW) @@ -182,11 +174,13 @@ set_action_sensitive (EvWindow *ev_window, static void update_action_sensitivity (EvWindow *ev_window) { + EvView *view; EvDocument *document; EvWindowPageMode page_mode; gboolean sensitive, has_pages = FALSE, has_document; int n_pages = 0, page = -1; + view = EV_VIEW (ev_window->priv->view); document = ev_window->priv->document; page_mode = ev_window->priv->page_mode; has_document = document != NULL; @@ -210,11 +204,15 @@ update_action_sensitivity (EvWindow *ev_window) set_action_sensitive (ev_window, "EditFind", has_pages && EV_IS_DOCUMENT_FIND (document)); set_action_sensitive (ev_window, "EditFindNext", - ev_view_can_find_next (EV_VIEW (ev_window->priv->view))); + ev_view_can_find_next (view)); /* View menu */ - set_action_sensitive (ev_window, "ViewZoomIn", has_pages); - set_action_sensitive (ev_window, "ViewZoomOut", has_pages); + set_action_sensitive (ev_window, "ViewContinuous", has_pages); + set_action_sensitive (ev_window, "ViewDual", has_pages); + set_action_sensitive (ev_window, "ViewZoomIn", + has_pages && ev_view_can_zoom_in (view)); + set_action_sensitive (ev_window, "ViewZoomOut", + has_pages && ev_view_can_zoom_out (view)); set_action_sensitive (ev_window, "ViewNormalSize", has_pages); set_action_sensitive (ev_window, "ViewBestFit", has_pages); set_action_sensitive (ev_window, "ViewPageWidth", has_pages); @@ -265,12 +263,17 @@ update_chrome_visibility (EvWindow *window) { EvWindowPrivate *priv = window->priv; gboolean menubar, toolbar, sidebar, findbar, statusbar, fullscreen_toolbar; + gboolean fullscreen_mode, presentation, fullscreen; - menubar = (priv->chrome & EV_CHROME_MENUBAR) != 0 && !priv->fullscreen_mode; - toolbar = (priv->chrome & EV_CHROME_TOOLBAR) != 0 && !priv->fullscreen_mode; - sidebar = (priv->chrome & EV_CHROME_SIDEBAR) != 0 && !priv->fullscreen_mode; + presentation = ev_view_get_presentation (EV_VIEW (priv->view)); + fullscreen = ev_view_get_fullscreen (EV_VIEW (priv->view)); + fullscreen_mode = fullscreen || presentation; + + menubar = (priv->chrome & EV_CHROME_MENUBAR) != 0 && !fullscreen_mode; + toolbar = (priv->chrome & EV_CHROME_TOOLBAR) != 0 && !fullscreen_mode; + sidebar = (priv->chrome & EV_CHROME_SIDEBAR) != 0 && !fullscreen_mode; fullscreen_toolbar = (priv->chrome & EV_CHROME_TOOLBAR) != 0; - statusbar = (priv->chrome & EV_CHROME_STATUSBAR) != 0 && !priv->fullscreen_mode; + statusbar = (priv->chrome & EV_CHROME_STATUSBAR) != 0 && !fullscreen_mode; findbar = (priv->chrome & EV_CHROME_FINDBAR) != 0; set_widget_visibility (priv->menubar, menubar); @@ -281,7 +284,7 @@ update_chrome_visibility (EvWindow *window) set_widget_visibility (priv->fullscreen_toolbar, fullscreen_toolbar); if (priv->fullscreen_popup != NULL) { - set_widget_visibility (priv->fullscreen_popup, priv->fullscreen_mode); + set_widget_visibility (priv->fullscreen_popup, fullscreen); } } @@ -307,24 +310,56 @@ update_chrome_flag (EvWindow *window, EvChrome flag, const char *pref, gboolean update_chrome_visibility (window); } +static void +ev_window_cmd_continuous (GtkAction *action, EvWindow *ev_window) +{ + gboolean continuous; + + ev_window_stop_presentation (ev_window); + continuous = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)); + g_object_set (G_OBJECT (ev_window->priv->view), + "continuous", continuous, + NULL); + update_action_sensitivity (ev_window); +} + +static void +ev_window_cmd_dual (GtkAction *action, EvWindow *ev_window) +{ + gboolean dual_page; + + ev_window_stop_presentation (ev_window); + dual_page = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)); + g_object_set (G_OBJECT (ev_window->priv->view), + "dual-page", dual_page, + NULL); + update_action_sensitivity (ev_window); +} + static void ev_window_cmd_view_best_fit (GtkAction *action, EvWindow *ev_window) { + ev_window_stop_presentation (ev_window); + if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) { - ev_window_set_sizing_mode (ev_window, EV_SIZING_BEST_FIT); + ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_BEST_FIT); } else { - ev_window_set_sizing_mode (ev_window, EV_SIZING_FREE); + ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE); } + update_action_sensitivity (ev_window); } static void ev_window_cmd_view_page_width (GtkAction *action, EvWindow *ev_window) { + ev_window_stop_presentation (ev_window); + if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) { - ev_window_set_sizing_mode (ev_window, EV_SIZING_FIT_WIDTH); + ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FIT_WIDTH); } else { - ev_window_set_sizing_mode (ev_window, EV_SIZING_FREE); + ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE); } + update_action_sensitivity (ev_window); } static void @@ -333,8 +368,16 @@ update_sizing_buttons (EvWindow *window) GtkActionGroup *action_group = window->priv->action_group; GtkAction *action; gboolean best_fit, page_width; + EvSizingMode sizing_mode; + + if (window->priv->view == NULL) + return; - switch (window->priv->sizing_mode) { + g_object_get (window->priv->view, + "sizing_mode", &sizing_mode, + NULL); + + switch (sizing_mode) { case EV_SIZING_BEST_FIT: best_fit = TRUE; page_width = FALSE; @@ -373,12 +416,6 @@ ev_window_open_page (EvWindow *ev_window, int page) } } -void -ev_window_open_link (EvWindow *ev_window, EvLink *link) -{ - ev_view_go_to_link (EV_VIEW (ev_window->priv->view), link); -} - gboolean ev_window_is_empty (const EvWindow *ev_window) { @@ -404,44 +441,6 @@ unable_to_load (EvWindow *ev_window, gtk_widget_destroy (dialog); } -/* Would be nice to have this in gdk-pixbuf */ -static gboolean -mime_type_supported_by_gdk_pixbuf (const gchar *mime_type) -{ - GSList *formats, *list; - gboolean retval = FALSE; - - formats = gdk_pixbuf_get_formats (); - - list = formats; - while (list) { - GdkPixbufFormat *format = list->data; - int i; - gchar **mime_types; - - if (gdk_pixbuf_format_is_disabled (format)) - continue; - - mime_types = gdk_pixbuf_format_get_mime_types (format); - - for (i = 0; mime_types[i] != NULL; i++) { - if (strcmp (mime_types[i], mime_type) == 0) { - retval = TRUE; - break; - } - } - - if (retval) - break; - - list = list->next; - } - - g_slist_free (formats); - - return retval; -} - static void update_window_title (EvDocument *document, GParamSpec *pspec, EvWindow *ev_window) { @@ -450,7 +449,7 @@ update_window_title (EvDocument *document, GParamSpec *pspec, EvWindow *ev_windo gboolean password_needed; password_needed = (ev_window->priv->password_document != NULL); - if (document) { + if (document && ev_window->priv->page_cache) { doc_title = ev_page_cache_get_title (ev_window->priv->page_cache); /* Make sure we get a valid title back */ @@ -501,21 +500,6 @@ update_window_title (EvDocument *document, GParamSpec *pspec, EvWindow *ev_windo g_free (title); } -static void -hide_sidebar_and_actions (EvWindow *ev_window) -{ - GtkAction *action; - /* Alsthough we update the hiddenness of the sidebar, we don't want to - * store the value */ - g_signal_handlers_disconnect_by_func (ev_window->priv->sidebar, - ev_window_sidebar_visibility_changed_cb, - ev_window); - gtk_widget_hide (ev_window->priv->sidebar); - action = gtk_action_group_get_action (ev_window->priv->action_group, "ViewSidebar"); - gtk_action_set_sensitive (action, FALSE); - -} - static void find_changed_cb (EvDocument *document, int page, EvWindow *ev_window) { @@ -530,9 +514,20 @@ page_changed_cb (EvPageCache *page_cache, update_action_sensitivity (ev_window); } +static void +update_document_mode (EvWindow *window, EvDocumentMode mode) +{ + if (mode == EV_DOCUMENT_MODE_FULL_SCREEN) { + ev_window_fullscreen (window); + } else if (mode == EV_DOCUMENT_MODE_PRESENTATION) { + ev_window_run_presentation (window); + } +} + static void ev_window_setup_document (EvWindow *ev_window) { + EvDocumentInfo *info; EvDocument *document; EvView *view = EV_VIEW (ev_window->priv->view); EvSidebar *sidebar = EV_SIDEBAR (ev_window->priv->sidebar); @@ -555,10 +550,7 @@ ev_window_setup_document (EvWindow *ev_window) ev_window_set_page_mode (ev_window, PAGE_MODE_SINGLE_PAGE); - if (ev_sidebar_supports_document (sidebar, document)) - ev_sidebar_set_document (sidebar, document); - else - hide_sidebar_and_actions (ev_window); + ev_sidebar_set_document (sidebar, document); if (ev_page_cache_get_n_pages (ev_window->priv->page_cache) > 0) { ev_view_set_document (view, document); @@ -568,6 +560,10 @@ ev_window_setup_document (EvWindow *ev_window) action = gtk_action_group_get_action (ev_window->priv->action_group, PAGE_SELECTOR_ACTION); ev_page_action_set_document (EV_PAGE_ACTION (action), document); update_action_sensitivity (ev_window); + + info = ev_document_get_info (document); + update_document_mode (ev_window, info->mode); + g_free (info); } static void @@ -583,10 +579,10 @@ password_dialog_response (GtkWidget *password_dialog, password = ev_password_dialog_get_password (password_dialog); if (password) { - g_mutex_lock (EV_DOC_MUTEX); + ev_document_doc_mutex_lock (); ev_document_security_set_password (EV_DOCUMENT_SECURITY (ev_window->priv->password_document), password); - g_mutex_unlock (EV_DOC_MUTEX); + ev_document_doc_mutex_unlock (); } g_free (password); @@ -692,15 +688,18 @@ start_loading_document (EvWindow *ev_window, if (error->domain == EV_DOCUMENT_ERROR && error->code == EV_DOCUMENT_ERROR_ENCRYPTED) { - char *file_name; + gchar *base_name, *file_name; ev_window->priv->password_document = g_object_ref (document); ev_window->priv->password_uri = g_strdup (uri); - file_name = g_path_get_basename (uri); + base_name = g_path_get_basename (uri); + file_name = gnome_vfs_unescape_string_for_display (base_name); + ev_password_view_set_file_name (EV_PASSWORD_VIEW (ev_window->priv->password_view), file_name); 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); @@ -712,33 +711,6 @@ start_loading_document (EvWindow *ev_window, return FALSE; } -static gboolean -is_file_supported (const gchar *mime_type) -{ - static char *supported_types [] = { - "application/pdf", - "application/postscript", - "application/x-dvi", - "image/vnd.djvu", - "application/x-gzpostscript", - "image/x-eps", - NULL - }; - gint i; - - g_return_val_if_fail (mime_type != NULL, FALSE); - - if (mime_type_supported_by_gdk_pixbuf (mime_type)) - return TRUE; - - for (i = 0; supported_types[i] != NULL; i++) { - if (g_ascii_strcasecmp (mime_type, supported_types[i]) == 0) - return TRUE; - } - - return FALSE; -} - void ev_window_open (EvWindow *ev_window, const char *uri) { @@ -752,22 +724,13 @@ ev_window_open (EvWindow *ev_window, const char *uri) if (mime_type == NULL) document = NULL; - else if (!strcmp (mime_type, "application/pdf")) - document = g_object_new (PDF_TYPE_DOCUMENT, NULL); - else if (!strcmp (mime_type, "application/postscript") || - !strcmp (mime_type, "application/x-gzpostscript") || - !strcmp (mime_type, "image/x-eps")) - document = g_object_new (PS_TYPE_DOCUMENT, NULL); -#ifdef ENABLE_DJVU - else if (!strcmp (mime_type, "image/vnd.djvu")) - document = g_object_new (DJVU_TYPE_DOCUMENT, NULL); -#endif - else if (mime_type_supported_by_gdk_pixbuf (mime_type)) - document = g_object_new (PIXBUF_TYPE_DOCUMENT, NULL); -#ifdef ENABLE_DVI - else if (!strcmp (mime_type, "application/x-dvi")) - document = g_object_new (DVI_TYPE_DOCUMENT, NULL); -#endif + else { + GType document_type = ev_document_type_lookup (mime_type); + + if (document_type!=G_TYPE_INVALID) { + document = g_object_new (document_type, NULL); + } + } if (document) { start_loading_document (ev_window, document, uri); @@ -800,7 +763,7 @@ ev_window_open_uri_list (EvWindow *ev_window, GList *uri_list) uri = gnome_vfs_uri_to_string (list->data, GNOME_VFS_URI_HIDE_NONE); mime_type = gnome_vfs_get_mime_type (uri); - if (is_file_supported (mime_type)) { + if (ev_document_type_lookup (mime_type)!=G_TYPE_INVALID) { if (ev_window_is_empty (EV_WINDOW (ev_window))) { ev_window_open (ev_window, uri); @@ -997,9 +960,9 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window) continue; */ - g_mutex_lock (EV_DOC_MUTEX); + ev_document_doc_mutex_lock (); success = ev_document_save (ev_window->priv->document, uri, NULL); - g_mutex_unlock (EV_DOC_MUTEX); + ev_document_doc_mutex_unlock (); if (success) break; @@ -1241,11 +1204,6 @@ destroy_fullscreen_popup (EvWindow *window) { if (window->priv->fullscreen_popup != NULL) { - /* FIXME multihead */ - g_signal_handlers_disconnect_by_func - (gdk_screen_get_default (), - G_CALLBACK (screen_size_changed_cb), window); - gtk_widget_destroy (window->priv->fullscreen_popup); window->priv->fullscreen_popup = NULL; } @@ -1381,19 +1339,35 @@ ev_window_create_fullscreen_popup (EvWindow *window) gtk_window_set_resizable (GTK_WINDOW (popup), FALSE); /* FIXME multihead */ - g_signal_connect (gdk_screen_get_default (), "size-changed", - G_CALLBACK (screen_size_changed_cb), window); - g_signal_connect (popup, "size_request", - G_CALLBACK (fullscreen_popup_size_request_cb), window); + g_signal_connect_object (gdk_screen_get_default (), "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); return popup; } + static void -ev_window_fullscreen (EvWindow *window) +ev_window_update_fullscreen_action (EvWindow *window) { - window->priv->fullscreen_mode = TRUE; + GtkAction *action; + + 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); +} +static void +ev_window_fullscreen (EvWindow *window) +{ + ev_view_set_fullscreen (EV_VIEW (window->priv->view), TRUE); if (window->priv->fullscreen_popup == NULL) window->priv->fullscreen_popup = ev_window_create_fullscreen_popup (window); @@ -1414,7 +1388,8 @@ ev_window_fullscreen (EvWindow *window) fullscreen_set_timeout (window); gtk_widget_grab_focus (window->priv->view); - + ev_window_update_fullscreen_action (window); + gtk_window_fullscreen (GTK_WINDOW (window)); ev_window_update_fullscreen_popup (window); } @@ -1423,8 +1398,7 @@ ev_window_unfullscreen (EvWindow *window) { EvView *view = EV_VIEW (window->priv->view); - window->priv->fullscreen_mode = FALSE; - + ev_view_set_fullscreen (view, FALSE); g_object_set (G_OBJECT (window->priv->scrolled_window), "shadow-type", GTK_SHADOW_IN, NULL); @@ -1434,62 +1408,100 @@ ev_window_unfullscreen (EvWindow *window) g_signal_handlers_disconnect_by_func (view, (gpointer) fullscreen_motion_notify_cb, window); - - ev_view_set_show_border (view, TRUE); - ev_view_set_spacing (view, VIEW_SPACING); + g_signal_handlers_disconnect_by_func (view, + (gpointer) fullscreen_leave_notify_cb, + window); + ev_window_update_fullscreen_action (window); + gtk_window_unfullscreen (GTK_WINDOW (window)); update_chrome_visibility (window); } static void ev_window_cmd_view_fullscreen (GtkAction *action, EvWindow *window) { - EvView *view; gboolean fullscreen; g_return_if_fail (EV_IS_WINDOW (window)); + ev_window_stop_presentation (window); - view = EV_VIEW (window->priv->view); fullscreen = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)); - if (fullscreen) { - gtk_window_fullscreen (GTK_WINDOW (window)); + ev_window_fullscreen (window); } else { - gtk_window_unfullscreen (GTK_WINDOW (window)); + ev_window_unfullscreen (window); } +} + +static void +ev_window_update_presentation_action (EvWindow *window) +{ + GtkAction *action; - ev_view_set_show_border (view, FALSE); - ev_view_set_spacing (view, 0); + action = gtk_action_group_get_action (window->priv->action_group, "ViewPresentation"); + g_signal_handlers_block_by_func + (action, G_CALLBACK (ev_window_cmd_view_presentation), window); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), + ev_view_get_presentation (EV_VIEW (window->priv->view))); + g_signal_handlers_unblock_by_func + (action, G_CALLBACK (ev_window_cmd_view_presentation), window); } -static gboolean -ev_window_state_event_cb (GtkWidget *widget, GdkEventWindowState *event, EvWindow *window) +static void +ev_window_run_presentation (EvWindow *window) { - if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) - { - GtkActionGroup *action_group; - GtkAction *action; - gboolean fullscreen; + g_object_set (G_OBJECT (window->priv->scrolled_window), + "shadow-type", GTK_SHADOW_NONE, + NULL); - fullscreen = event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN; + gtk_widget_grab_focus (window->priv->view); + ev_view_set_presentation (EV_VIEW (window->priv->view), TRUE); + gtk_window_fullscreen (GTK_WINDOW (window)); + ev_window_update_presentation_action (window); + update_chrome_visibility (window); +} - if (fullscreen) - { - ev_window_fullscreen (window); - } - else - { - ev_window_unfullscreen (window); - } +static void +ev_window_stop_presentation (EvWindow *window) +{ + if (! ev_view_get_presentation (EV_VIEW (window->priv->view))) + return; + + g_object_set (G_OBJECT (window->priv->scrolled_window), + "shadow-type", GTK_SHADOW_IN, + NULL); + ev_view_set_presentation (EV_VIEW (window->priv->view), FALSE); + gtk_window_unfullscreen (GTK_WINDOW (window)); + ev_window_update_presentation_action (window); + update_chrome_visibility (window); +} + +static void +ev_window_cmd_view_presentation (GtkAction *action, EvWindow *window) +{ + gboolean presentation; + + g_return_if_fail (EV_IS_WINDOW (window)); + + presentation = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)); + if (presentation) { + ev_window_run_presentation (window); + } else { + ev_window_stop_presentation (window); + } +} - action_group = window->priv->action_group; +static gboolean +ev_window_state_event (GtkWidget *widget, GdkEventWindowState *event) +{ + EvWindow *window = EV_WINDOW (widget); + + if (event->changed_mask & GDK_WINDOW_STATE_MAXIMIZED) { + gboolean show; - action = gtk_action_group_get_action (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), fullscreen); - g_signal_handlers_unblock_by_func - (action, G_CALLBACK (ev_window_cmd_view_fullscreen), window); + show = (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) == 0; + gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (window->priv->statusbar), + show); } return FALSE; @@ -1500,11 +1512,14 @@ ev_window_focus_in_event (GtkWidget *widget, GdkEventFocus *event) { EvWindow *window = EV_WINDOW (widget); EvWindowPrivate *priv = window->priv; + gboolean fullscreen; - if (priv->fullscreen_mode) - { + g_object_get (priv->view, + "fullscreen", &fullscreen, + NULL); + + if (fullscreen) gtk_widget_show (priv->fullscreen_popup); - } return GTK_WIDGET_CLASS (ev_window_parent_class)->focus_in_event (widget, event); } @@ -1514,11 +1529,14 @@ ev_window_focus_out_event (GtkWidget *widget, GdkEventFocus *event) { EvWindow *window = EV_WINDOW (widget); EvWindowPrivate *priv = window->priv; + gboolean fullscreen; - if (priv->fullscreen_mode) - { + g_object_get (priv->view, + "fullscreen", &fullscreen, + NULL); + + if (fullscreen) gtk_widget_hide (priv->fullscreen_popup); - } return GTK_WIDGET_CLASS (ev_window_parent_class)->focus_out_event (widget, event); } @@ -1564,9 +1582,9 @@ ev_window_cmd_view_zoom_in (GtkAction *action, EvWindow *ev_window) { g_return_if_fail (EV_IS_WINDOW (ev_window)); - ev_window_set_sizing_mode (ev_window, EV_SIZING_FREE); - + ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE); ev_view_zoom_in (EV_VIEW (ev_window->priv->view)); + update_action_sensitivity (ev_window); } static void @@ -1574,9 +1592,9 @@ ev_window_cmd_view_zoom_out (GtkAction *action, EvWindow *ev_window) { g_return_if_fail (EV_IS_WINDOW (ev_window)); - ev_window_set_sizing_mode (ev_window, EV_SIZING_FREE); - + ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE); ev_view_zoom_out (EV_VIEW (ev_window->priv->view)); + update_action_sensitivity (ev_window); } static void @@ -1584,7 +1602,8 @@ ev_window_cmd_view_normal_size (GtkAction *action, EvWindow *ev_window) { g_return_if_fail (EV_IS_WINDOW (ev_window)); - ev_view_set_size (EV_VIEW (ev_window->priv->view), -1, -1); + ev_view_zoom_normal (EV_VIEW (ev_window->priv->view)); + update_action_sensitivity (ev_window); } static void @@ -1669,7 +1688,21 @@ ev_window_cmd_escape (GtkAction *action, EvWindow *window) if (widget && gtk_widget_get_ancestor (widget, EGG_TYPE_FIND_BAR)) { update_chrome_flag (window, EV_CHROME_FINDBAR, NULL, FALSE); } else { - gtk_window_unfullscreen (GTK_WINDOW (window)); + gboolean fullscreen; + gboolean presentation; + + g_object_get (window->priv->view, + "fullscreen", &fullscreen, + "presentation", &presentation, + NULL); + + if (fullscreen) + ev_window_unfullscreen (window); + if (presentation) + ev_window_stop_presentation (window); + + if (fullscreen && presentation) + g_warning ("Both fullscreen and presentation set somehow"); } } @@ -1678,30 +1711,31 @@ update_view_size (EvWindow *window) { int width, height; GtkRequisition vsb_requisition; + GtkRequisition hsb_requisition; int scrollbar_spacing; + /* Calculate the width available for the */ width = window->priv->scrolled_window->allocation.width; height = window->priv->scrolled_window->allocation.height; - if (gtk_scrolled_window_get_shadow_type - (GTK_SCROLLED_WINDOW (window->priv->scrolled_window)) == GTK_SHADOW_IN) - { + if (gtk_scrolled_window_get_shadow_type (GTK_SCROLLED_WINDOW (window->priv->scrolled_window)) == GTK_SHADOW_IN) { width -= 2 * window->priv->view->style->xthickness; height -= 2 * window->priv->view->style->ythickness; } - if (window->priv->sizing_mode == EV_SIZING_BEST_FIT) { - ev_view_set_size (EV_VIEW (window->priv->view), - MAX (1, width), MAX (1, height)); - } else if (window->priv->sizing_mode == EV_SIZING_FIT_WIDTH) { - gtk_widget_size_request (GTK_SCROLLED_WINDOW (window->priv->scrolled_window)->vscrollbar, - &vsb_requisition); - gtk_widget_style_get (window->priv->scrolled_window, - "scrollbar_spacing", &scrollbar_spacing, - NULL); - ev_view_set_size (EV_VIEW (window->priv->view), - width - vsb_requisition.width - scrollbar_spacing, -1); - } + gtk_widget_size_request (GTK_SCROLLED_WINDOW (window->priv->scrolled_window)->vscrollbar, + &vsb_requisition); + gtk_widget_size_request (GTK_SCROLLED_WINDOW (window->priv->scrolled_window)->hscrollbar, + &hsb_requisition); + gtk_widget_style_get (window->priv->scrolled_window, + "scrollbar_spacing", &scrollbar_spacing, + NULL); + + ev_view_set_zoom_for_size (EV_VIEW (window->priv->view), + MAX (1, width), + MAX (1, height), + vsb_requisition.width + scrollbar_spacing, + hsb_requisition.height + scrollbar_spacing); } static void @@ -1712,27 +1746,29 @@ size_allocate_cb (GtkWidget *scrolled_window, update_view_size (window); } -static void -ev_window_set_sizing_mode (EvWindow *ev_window, - EvSizingMode sizing_mode) +static void +ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec, + EvWindow *ev_window) { GtkWidget *scrolled_window; + EvSizingMode sizing_mode; - if (ev_window->priv->sizing_mode == sizing_mode) - return; + g_object_get (ev_window->priv->view, + "sizing-mode", &sizing_mode, + NULL); scrolled_window = ev_window->priv->scrolled_window; - ev_window->priv->sizing_mode = sizing_mode; g_signal_handlers_disconnect_by_func (scrolled_window, size_allocate_cb, ev_window); - update_view_size (ev_window); + if (sizing_mode != EV_SIZING_FREE) + update_view_size (ev_window); switch (sizing_mode) { case EV_SIZING_BEST_FIT: g_object_set (G_OBJECT (scrolled_window), "hscrollbar-policy", GTK_POLICY_NEVER, - "vscrollbar-policy", GTK_POLICY_NEVER, + "vscrollbar-policy", GTK_POLICY_AUTOMATIC, NULL); g_signal_connect (scrolled_window, "size-allocate", G_CALLBACK (size_allocate_cb), @@ -1846,14 +1882,17 @@ ev_window_sidebar_visibility_changed_cb (EvSidebar *ev_sidebar, GParamSpec *pspe EvWindow *ev_window) { GtkAction *action; - gboolean visible; + gboolean visible, fullscreen; + g_object_get (ev_window->priv->view, + "fullscreen", &fullscreen, + NULL); visible = GTK_WIDGET_VISIBLE (ev_sidebar); /* In fullscreen mode the sidebar is not visible, * but we don't want to update the chrome */ - if (ev_window->priv->fullscreen_mode) + if (fullscreen) return; action = gtk_action_group_get_action (ev_window->priv->action_group, "ViewSidebar"); @@ -2010,16 +2049,16 @@ find_bar_search_changed_cb (EggFindBar *find_bar, if (ev_window->priv->document && EV_IS_DOCUMENT_FIND (ev_window->priv->document)) { if (visible && search_string && search_string[0]) { - g_mutex_lock (EV_DOC_MUTEX); + ev_document_doc_mutex_lock (); ev_document_find_begin (EV_DOCUMENT_FIND (ev_window->priv->document), - ev_view_get_page (EV_VIEW (ev_window->priv->view)), + ev_page_cache_get_current_page (ev_window->priv->page_cache), search_string, case_sensitive); - g_mutex_unlock (EV_DOC_MUTEX); + ev_document_doc_mutex_unlock (); } else { - g_mutex_lock (EV_DOC_MUTEX); + ev_document_doc_mutex_lock (); ev_document_find_cancel (EV_DOCUMENT_FIND (ev_window->priv->document)); - g_mutex_unlock (EV_DOC_MUTEX); + ev_document_doc_mutex_unlock (); egg_find_bar_set_status_text (EGG_FIND_BAR (ev_window->priv->find_bar), NULL); @@ -2044,11 +2083,16 @@ ev_window_dispose (GObject *object) priv->action_group = NULL; } + if (priv->page_cache) { + g_signal_handlers_disconnect_by_func (priv->page_cache, page_changed_cb, window); + priv->page_cache = NULL; + } + if (priv->document) { g_object_unref (priv->document); priv->document = NULL; } - + if (priv->view) { g_object_unref (priv->view); priv->view = NULL; @@ -2090,6 +2134,7 @@ ev_window_class_init (EvWindowClass *ev_window_class) g_object_class->dispose = ev_window_dispose; + widget_class->window_state_event = ev_window_state_event; widget_class->focus_in_event = ev_window_focus_in_event; widget_class->focus_out_event = ev_window_focus_out_event; @@ -2097,7 +2142,7 @@ ev_window_class_init (EvWindowClass *ev_window_class) } /* Normal items */ -static GtkActionEntry entries[] = { +static const GtkActionEntry entries[] = { { "File", NULL, N_("_File") }, { "Edit", NULL, N_("_Edit") }, { "View", NULL, N_("_View") }, @@ -2179,7 +2224,7 @@ static GtkActionEntry entries[] = { }; /* Toggle items */ -static GtkToggleActionEntry toggle_entries[] = { +static const GtkToggleActionEntry toggle_entries[] = { /* View Menu */ { "ViewToolbar", NULL, N_("_Toolbar"), "T", N_("Show or hide the toolbar"), @@ -2190,9 +2235,18 @@ static GtkToggleActionEntry toggle_entries[] = { { "ViewSidebar", NULL, N_("Side _pane"), "F9", N_("Show or hide the side pane"), G_CALLBACK (ev_window_view_sidebar_cb), TRUE }, + { "ViewContinuous", NULL, N_("_Continuous"), NULL, + N_("Show the entire document"), + G_CALLBACK (ev_window_cmd_continuous), TRUE }, + { "ViewDual", NULL, N_("_Dual"), NULL, + N_("Show two pages at once"), + G_CALLBACK (ev_window_cmd_dual), FALSE }, { "ViewFullscreen", NULL, N_("_Fullscreen"), "F11", N_("Expand the window to fill the screen"), G_CALLBACK (ev_window_cmd_view_fullscreen) }, + { "ViewPresentation", NULL, N_("_Presentation"), "F12", + N_("Run document as a presentation"), + G_CALLBACK (ev_window_cmd_view_presentation) }, { "ViewBestFit", EV_STOCK_ZOOM_PAGE, N_("_Best Fit"), NULL, N_("Make the current document fill the window"), G_CALLBACK (ev_window_cmd_view_best_fit) }, @@ -2201,7 +2255,7 @@ static GtkToggleActionEntry toggle_entries[] = { G_CALLBACK (ev_window_cmd_view_page_width) }, }; -static GtkRadioActionEntry page_view_entries[] = { +static const GtkRadioActionEntry page_view_entries[] = { { "SinglePage", GTK_STOCK_DND, N_("Single"), NULL, N_("Show the document one page at a time"), PAGE_MODE_SINGLE_PAGE }, @@ -2449,7 +2503,6 @@ ev_window_init (EvWindow *ev_window) ev_window->priv->fullscreen_toolbar = gtk_ui_manager_get_widget (ev_window->priv->ui_manager, "/LeaveFullscreenToolbar"); gtk_toolbar_set_show_arrow (GTK_TOOLBAR (ev_window->priv->fullscreen_toolbar), TRUE); - gtk_toolbar_set_style (GTK_TOOLBAR (ev_window->priv->fullscreen_toolbar), GTK_TOOLBAR_BOTH_HORIZ); /* Add the main area */ ev_window->priv->hpaned = gtk_hpaned_new (); @@ -2486,16 +2539,12 @@ ev_window_init (EvWindow *ev_window) ev_window); gtk_widget_show (sidebar_widget); ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar), - "index", - _("Index"), sidebar_widget); - ev_window->priv->thumbs_sidebar = ev_sidebar_thumbnails_new (); - gtk_widget_show (ev_window->priv->thumbs_sidebar); + sidebar_widget = ev_sidebar_thumbnails_new (); + gtk_widget_show (sidebar_widget); ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar), - "thumbnails", - _("Thumbnails"), - ev_window->priv->thumbs_sidebar); + sidebar_widget); ev_window->priv->scrolled_window = GTK_WIDGET (g_object_new (GTK_TYPE_SCROLLED_WINDOW, @@ -2507,7 +2556,6 @@ ev_window_init (EvWindow *ev_window) ev_window->priv->scrolled_window); ev_window->priv->view = ev_view_new (); - ev_view_set_spacing (EV_VIEW (ev_window->priv->view), VIEW_SPACING); ev_window->priv->password_view = ev_password_view_new (); g_signal_connect_swapped (ev_window->priv->password_view, "unlock", @@ -2524,6 +2572,7 @@ ev_window_init (EvWindow *ev_window) gtk_container_add (GTK_CONTAINER (ev_window->priv->scrolled_window), ev_window->priv->view); + g_signal_connect (ev_window->priv->view, "notify::find-status", G_CALLBACK (view_find_status_changed_cb), @@ -2532,6 +2581,10 @@ ev_window_init (EvWindow *ev_window) "notify::status", G_CALLBACK (view_status_changed_cb), ev_window); + g_signal_connect (ev_window->priv->view, + "notify::sizing-mode", + G_CALLBACK (ev_window_sizing_mode_changed_cb), + ev_window); ev_window->priv->statusbar = gtk_statusbar_new (); gtk_box_pack_end (GTK_BOX (ev_window->priv->main_box), @@ -2584,10 +2637,6 @@ ev_window_init (EvWindow *ev_window) G_CALLBACK (find_bar_search_changed_cb), ev_window); - g_signal_connect (ev_window, "window-state-event", - G_CALLBACK (ev_window_state_event_cb), - ev_window); - /* Give focus to the scrolled window */ gtk_widget_grab_focus (ev_window->priv->scrolled_window); @@ -2600,7 +2649,7 @@ ev_window_init (EvWindow *ev_window) G_CALLBACK (drag_data_received_cb), NULL); /* Set it to something random to force a change */ - ev_window->priv->sizing_mode = EV_SIZING_FREE; - ev_window_set_sizing_mode (ev_window, EV_SIZING_FIT_WIDTH); + + ev_window_sizing_mode_changed_cb (EV_VIEW (ev_window->priv->view), NULL, ev_window); update_action_sensitivity (ev_window); }