X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-window.c;h=fdee542a739c593563c1555423e28a66d5ea6958;hb=94ba47eee644072736b10ef3fe2188043ade22dd;hp=8b3044f1799924563b56ca63750fc06dfc9a1503;hpb=e8096c18ba580156072e8c84103bee6f6d3f0bfc;p=evince.git diff --git a/shell/ev-window.c b/shell/ev-window.c index 8b3044f1..fdee542a 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -43,13 +43,23 @@ #include "ev-document-security.h" #include "ev-job-queue.h" #include "eggfindbar.h" +#include "egg-recent-view-gtk.h" +#include "egg-recent-view.h" +#include "egg-recent-model.h" -#include "pdf-document.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 #include #include @@ -119,6 +129,10 @@ struct _EvWindowPrivate { gboolean fullscreen_mode; EvSizingMode sizing_mode; GSource *fullscreen_timeout_source; + + /* recent file stuff */ + EggRecentModel *recent_model; + EggRecentViewGtk *recent_view; }; static GtkTargetEntry ev_drop_types[] = { @@ -149,6 +163,8 @@ static gboolean start_loading_document (EvWindow *ev_window, static void ev_window_set_sizing_mode (EvWindow *ev_window, EvSizingMode sizing_mode); +static void ev_window_add_recent (EvWindow *window, const char *filename); + G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW) static void @@ -166,42 +182,44 @@ update_action_sensitivity (EvWindow *ev_window) { EvDocument *document; EvWindowPageMode page_mode; - EvView *view; + gboolean sensitive, has_pages = FALSE, has_document; + int n_pages = 0, page = -1; document = ev_window->priv->document; page_mode = ev_window->priv->page_mode; - view = EV_VIEW (ev_window->priv->view); + has_document = document != NULL; + if (has_document && ev_window->priv->page_cache) { + page = ev_page_cache_get_current_page (ev_window->priv->page_cache); + n_pages = ev_page_cache_get_n_pages (ev_window->priv->page_cache); + has_pages = has_document && n_pages > 0; + } /* File menu */ /* "FileOpen": always sensitive */ - set_action_sensitive (ev_window, "FileSaveAs", document!=NULL); - set_action_sensitive (ev_window, "FilePrint", document!=NULL); + set_action_sensitive (ev_window, "FileSaveAs", has_document); + set_action_sensitive (ev_window, "FilePrint", has_pages); /* "FileCloseWindow": always sensitive */ /* Edit menu */ - set_action_sensitive (ev_window, "EditCopy", document!=NULL); - set_action_sensitive (ev_window, "EditSelectAll", document!=NULL); - if (document) - set_action_sensitive (ev_window, "EditFind", EV_IS_DOCUMENT_FIND (document)); - else - set_action_sensitive (ev_window, "EditFind", FALSE); + sensitive = has_pages && ev_document_can_get_text (document); + set_action_sensitive (ev_window, "EditCopy", sensitive); + set_action_sensitive (ev_window, "EditSelectAll", sensitive); + 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))); /* View menu */ - set_action_sensitive (ev_window, "ViewZoomIn", document!=NULL); - set_action_sensitive (ev_window, "ViewZoomOut", document!=NULL); - set_action_sensitive (ev_window, "ViewNormalSize", document!=NULL); - set_action_sensitive (ev_window, "ViewBestFit", document!=NULL); - set_action_sensitive (ev_window, "ViewPageWidth", document!=NULL); - set_action_sensitive (ev_window, "ViewReload", document!=NULL); + set_action_sensitive (ev_window, "ViewZoomIn", has_pages); + set_action_sensitive (ev_window, "ViewZoomOut", has_pages); + set_action_sensitive (ev_window, "ViewNormalSize", has_pages); + set_action_sensitive (ev_window, "ViewBestFit", has_pages); + set_action_sensitive (ev_window, "ViewPageWidth", has_pages); + set_action_sensitive (ev_window, "ViewReload", has_pages); /* Go menu */ if (document) { - int n_pages; - int page; - page = ev_page_cache_get_current_page (ev_window->priv->page_cache); - n_pages = ev_page_cache_get_n_pages (ev_window->priv->page_cache); - set_action_sensitive (ev_window, "GoPreviousPage", page > 0); set_action_sensitive (ev_window, "GoNextPage", page < n_pages - 1); set_action_sensitive (ev_window, "GoFirstPage", page > 0); @@ -226,7 +244,7 @@ update_action_sensitivity (EvWindow *ev_window) /* "HelpAbout": always sensitive */ /* Toolbar-specific actions: */ - set_action_sensitive (ev_window, PAGE_SELECTOR_ACTION, document!=NULL); + set_action_sensitive (ev_window, PAGE_SELECTOR_ACTION, has_pages); } static void @@ -347,8 +365,10 @@ update_sizing_buttons (EvWindow *window) void ev_window_open_page (EvWindow *ev_window, int page) { - if (ev_window->priv->page_cache) - ev_page_cache_set_current_page (ev_window->priv->page_cache, page); + if (ev_window->priv->page_cache) { + page = CLAMP (page, 0, ev_page_cache_get_n_pages (ev_window->priv->page_cache)); + ev_page_cache_set_current_page (ev_window->priv->page_cache, page); + } } void @@ -479,26 +499,6 @@ update_window_title (EvDocument *document, GParamSpec *pspec, EvWindow *ev_windo g_free (title); } -static void -update_total_pages (EvWindow *ev_window) -{ - GtkAction *action; - int pages; - - pages = ev_page_cache_get_n_pages (ev_window->priv->page_cache); - action = gtk_action_group_get_action (ev_window->priv->action_group, PAGE_SELECTOR_ACTION); - ev_page_action_set_total_pages (EV_PAGE_ACTION (action), pages); -} - -/* This function assumes that ev_window just had ev_window->document set. - */ -static gboolean -document_supports_sidebar (EvDocument *document) -{ - /* FIXME: Remove the (TRUE ||) after links are fixed in poppler-glib */ - return (EV_IS_DOCUMENT_THUMBNAILS (document) && (EV_IS_DOCUMENT_LINKS (document))); -} - static void hide_sidebar_and_actions (EvWindow *ev_window) { @@ -514,27 +514,27 @@ hide_sidebar_and_actions (EvWindow *ev_window) } +static void +find_changed_cb (EvDocument *document, int page, EvWindow *ev_window) +{ + update_action_sensitivity (ev_window); +} + static void page_changed_cb (EvPageCache *page_cache, gint page, EvWindow *ev_window) { - GtkAction *action; - - action = gtk_action_group_get_action - (ev_window->priv->action_group, PAGE_SELECTOR_ACTION); - - ev_page_action_set_current_page (EV_PAGE_ACTION (action), page); update_action_sensitivity (ev_window); } - static void ev_window_setup_document (EvWindow *ev_window) { EvDocument *document; EvView *view = EV_VIEW (ev_window->priv->view); EvSidebar *sidebar = EV_SIDEBAR (ev_window->priv->sidebar); + GtkAction *action; document = ev_window->priv->document; ev_window->priv->page_cache = ev_document_get_page_cache (ev_window->priv->document); @@ -544,18 +544,27 @@ ev_window_setup_document (EvWindow *ev_window) "notify::title", G_CALLBACK (update_window_title), ev_window, 0); + if (EV_IS_DOCUMENT_FIND (document)) { + g_signal_connect_object (G_OBJECT (document), + "find_changed", + G_CALLBACK (find_changed_cb), + ev_window, 0); + } ev_window_set_page_mode (ev_window, PAGE_MODE_SINGLE_PAGE); - if (document_supports_sidebar (document)) + if (ev_sidebar_supports_document (sidebar, document)) ev_sidebar_set_document (sidebar, document); else hide_sidebar_and_actions (ev_window); - ev_view_set_document (view, document); + if (ev_page_cache_get_n_pages (ev_window->priv->page_cache) > 0) { + ev_view_set_document (view, document); + } update_window_title (document, NULL, ev_window); - update_total_pages (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); } @@ -670,6 +679,8 @@ start_loading_document (EvWindow *ev_window, g_object_unref (ev_window->priv->document); ev_window->priv->document = g_object_ref (document); ev_window_setup_document (ev_window); + + ev_window_add_recent (ev_window, uri); return TRUE; } @@ -705,6 +716,8 @@ 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 @@ -743,8 +756,16 @@ ev_window_open (EvWindow *ev_window, const char *uri) !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 if (document) { start_loading_document (ev_window, document, uri); @@ -805,6 +826,69 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *ev_window) ev_application_open (EV_APP, NULL); } +static void +ev_window_cmd_recent_file_activate (EggRecentViewGtk *view, EggRecentItem *item, + EvWindow *ev_window) +{ + char *uri; + GtkWidget *window; + + uri = egg_recent_item_get_uri (item); + + window = GTK_WIDGET (ev_application_get_empty_window (EV_APP)); + gtk_widget_show (window); + ev_window_open (EV_WINDOW (window), uri); + + g_free (uri); +} + +static void +ev_window_add_recent (EvWindow *window, const char *filename) +{ + EggRecentItem *item; + + if (strstr (filename, "file:///") == NULL) + return; + + item = egg_recent_item_new_from_uri (filename); + egg_recent_item_add_group (item, "Evince"); + egg_recent_model_add_full (window->priv->recent_model, item); +} + +static void +ev_window_setup_recent (EvWindow *ev_window) +{ + GtkWidget *menu_item; + GtkWidget *menu; + + menu_item = gtk_ui_manager_get_widget (ev_window->priv->ui_manager, "/MainMenu/FileMenu"); + menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu_item)); + menu_item = gtk_ui_manager_get_widget (ev_window->priv->ui_manager, "/MainMenu/FileMenu/RecentFilesMenu"); + + g_return_if_fail (menu != NULL); + g_return_if_fail (menu_item != NULL); + + /* it would be better if we just filtered by mime-type, but there + * doesn't seem to be an easy way to figure out which mime-types we + * can handle */ + ev_window->priv->recent_model = egg_recent_model_new (EGG_RECENT_MODEL_SORT_MRU); + + ev_window->priv->recent_view = egg_recent_view_gtk_new (menu, menu_item); + egg_recent_view_gtk_show_icons (EGG_RECENT_VIEW_GTK (ev_window->priv->recent_view), FALSE); + egg_recent_model_set_limit (ev_window->priv->recent_model, 5); + + egg_recent_view_set_model (EGG_RECENT_VIEW (ev_window->priv->recent_view), + ev_window->priv->recent_model); + + egg_recent_model_set_filter_groups (ev_window->priv->recent_model, + "Evince", NULL); + + egg_recent_view_gtk_set_trailing_sep (ev_window->priv->recent_view, TRUE); + + g_signal_connect (ev_window->priv->recent_view, "activate", + G_CALLBACK (ev_window_cmd_recent_file_activate), ev_window); +} + /* FIXME static gboolean overwrite_existing_file (GtkWindow *window, const gchar *file_name) @@ -1067,10 +1151,18 @@ ev_window_cmd_edit_find (GtkAction *action, EvWindow *ev_window) } else { update_chrome_flag (ev_window, EV_CHROME_FINDBAR, NULL, TRUE); - egg_find_bar_grab_focus (EGG_FIND_BAR (ev_window->priv->find_bar)); + gtk_widget_grab_focus (ev_window->priv->find_bar); } } +static void +ev_window_cmd_edit_find_next (GtkAction *action, EvWindow *ev_window) +{ + g_return_if_fail (EV_IS_WINDOW (ev_window)); + + ev_view_find_next (EV_VIEW (ev_window->priv->view)); +} + static void ev_window_cmd_edit_copy (GtkAction *action, EvWindow *ev_window) { @@ -1507,7 +1599,7 @@ ev_window_cmd_go_first_page (GtkAction *action, EvWindow *ev_window) { g_return_if_fail (EV_IS_WINDOW (ev_window)); - ev_page_cache_set_current_page (ev_window->priv->page_cache, 1); + ev_page_cache_set_current_page (ev_window->priv->page_cache, 0); } static void @@ -1518,7 +1610,7 @@ ev_window_cmd_go_last_page (GtkAction *action, EvWindow *ev_window) g_return_if_fail (EV_IS_WINDOW (ev_window)); n_pages = ev_page_cache_get_n_pages (ev_window->priv->page_cache); - ev_page_cache_set_current_page (ev_window->priv->page_cache, n_pages); + ev_page_cache_set_current_page (ev_window->priv->page_cache, n_pages - 1); } static void @@ -1529,12 +1621,7 @@ ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window) g_return_if_fail (EV_IS_WINDOW (ev_window)); -#if 0 - /* FIXME: uncomment when this is written.*/ - page = ev_page_cache_get_page (ev_window->priv->page_cache); -#else - page = 1; -#endif + page = ev_page_cache_get_current_page (ev_window->priv->page_cache); uri = g_strdup (ev_window->priv->uri); ev_window_open (ev_window, uri); @@ -1546,9 +1633,16 @@ ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window) static void ev_window_cmd_help_contents (GtkAction *action, EvWindow *ev_window) { + GError *error = NULL; + g_return_if_fail (EV_IS_WINDOW (ev_window)); - /* FIXME */ + gnome_help_display ("evince.xml", NULL, &error); + + if(error != NULL) { + g_warning (error->message); + g_error_free (error); + } } static void @@ -1557,6 +1651,19 @@ ev_window_cmd_leave_fullscreen (GtkAction *action, EvWindow *window) gtk_window_unfullscreen (GTK_WINDOW (window)); } +static void +ev_window_cmd_escape (GtkAction *action, EvWindow *window) +{ + GtkWidget *widget; + + widget = gtk_window_get_focus (GTK_WINDOW (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)); + } +} + static void update_view_size (EvWindow *window) { @@ -1890,9 +1997,12 @@ 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) { + if (visible && search_string && search_string[0]) { g_mutex_lock (EV_DOC_MUTEX); - ev_document_find_begin (EV_DOCUMENT_FIND (ev_window->priv->document), search_string, case_sensitive); + ev_document_find_begin (EV_DOCUMENT_FIND (ev_window->priv->document), + ev_view_get_page (EV_VIEW (ev_window->priv->view)), + search_string, + case_sensitive); g_mutex_unlock (EV_DOC_MUTEX); } else { g_mutex_lock (EV_DOC_MUTEX); @@ -1947,6 +2057,14 @@ ev_window_dispose (GObject *object) priv->password_uri = NULL; } + if (priv->find_bar) { + g_signal_handlers_disconnect_by_func + (window->priv->find_bar, + G_CALLBACK (find_bar_close_cb), + window); + priv->find_bar = NULL; + } + destroy_fullscreen_popup (window); G_OBJECT_CLASS (ev_window_parent_class)->dispose (object); @@ -1998,6 +2116,9 @@ static GtkActionEntry entries[] = { { "EditFind", GTK_STOCK_FIND, NULL, "F", N_("Find a word or phrase in the document"), G_CALLBACK (ev_window_cmd_edit_find) }, + { "EditFindNext", NULL, N_("Find Ne_xt"), "G", + N_("Find next occurrence of the word or phrase"), + G_CALLBACK (ev_window_cmd_edit_find_next) }, /* View menu */ { "ViewZoomIn", GTK_STOCK_ZOOM_IN, NULL, "plus", @@ -2028,7 +2149,7 @@ static GtkActionEntry entries[] = { G_CALLBACK (ev_window_cmd_go_last_page) }, /* Help menu */ - { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), NULL, + { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", N_("Display help for the viewer application"), G_CALLBACK (ev_window_cmd_help_contents) }, @@ -2037,9 +2158,12 @@ static GtkActionEntry entries[] = { G_CALLBACK (ev_window_cmd_help_about) }, /* Toolbar-only */ - { "LeaveFullscreen", EV_STOCK_LEAVE_FULLSCREEN, N_("Leave Fullscreen"), "Escape", + { "LeaveFullscreen", EV_STOCK_LEAVE_FULLSCREEN, N_("Leave Fullscreen"), NULL, N_("Leave fullscreen mode"), - G_CALLBACK (ev_window_cmd_leave_fullscreen) } + G_CALLBACK (ev_window_cmd_leave_fullscreen) }, + + { "Escape", NULL, N_("Selection Caret"), "Escape", "", + G_CALLBACK (ev_window_cmd_escape) } }; /* Toggle items */ @@ -2074,13 +2198,6 @@ static GtkRadioActionEntry page_view_entries[] = { PAGE_MODE_CONTINUOUS_PAGE } }; -static void -goto_page_cb (GtkAction *action, int page_number, EvWindow *ev_window) -{ - ev_page_cache_set_current_page (ev_window->priv->page_cache, - page_number); -} - static void drag_data_received_cb (GtkWidget *widget, GdkDragContext *context, gint x, gint y, GtkSelectionData *selection_data, @@ -2109,8 +2226,6 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group) "label", _("Page"), "tooltip", _("Select Page"), NULL); - g_signal_connect (action, "goto_page", - G_CALLBACK (goto_page_cb), window); gtk_action_group_add_action (group, action); g_object_unref (action); } @@ -2124,10 +2239,27 @@ set_action_properties (GtkActionGroup *action_group) /*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"); - /*translators: this is the label for toolbar button*/ g_object_set (action, "is-important", TRUE, NULL); + /*translators: this is the label for toolbar button*/ g_object_set (action, "short_label", _("Next"), NULL); + + 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); @@ -2207,6 +2339,22 @@ load_chrome (void) return chrome; } +static void +sidebar_widget_model_set (EvSidebarLinks *ev_sidebar_links, + GParamSpec *pspec, + EvWindow *ev_window) +{ + GtkTreeModel *model; + GtkAction *action; + + g_object_get (G_OBJECT (ev_sidebar_links), + "model", &model, + NULL); + + action = gtk_action_group_get_action (ev_window->priv->action_group, PAGE_SELECTOR_ACTION); + ev_page_action_set_model (EV_PAGE_ACTION (action), model); +} + static void ev_window_init (EvWindow *ev_window) { @@ -2320,6 +2468,10 @@ ev_window_init (EvWindow *ev_window) /* Stub sidebar, for now */ sidebar_widget = ev_sidebar_links_new (); + g_signal_connect (sidebar_widget, + "notify::model", + G_CALLBACK (sidebar_widget_model_set), + ev_window); gtk_widget_show (sidebar_widget); ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar), "index", @@ -2383,6 +2535,7 @@ ev_window_init (EvWindow *ev_window) ev_window->priv->find_bar, FALSE, TRUE, 0); + ev_window_setup_recent (ev_window); ev_window->priv->chrome = load_chrome (); set_chrome_actions (ev_window); update_chrome_visibility (ev_window);