X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-window.c;h=2a3783476e71fd723fb4284997cc5cbf854efa2d;hb=681b0a3166a61b96b9a0ee35ca1b0aaa487809b3;hp=2475de0af289d86378e74ce2ffd9ce9abe8370f8;hpb=ba8b43149d216ed8737107ed0525dd367166b8dc;p=evince.git diff --git a/shell/ev-window.c b/shell/ev-window.c index 2475de0a..2a378347 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -55,6 +55,7 @@ #include "ev-application.h" #include "ev-stock-icons.h" #include "ev-file-helpers.h" +#include #include #include @@ -225,7 +226,6 @@ update_action_sensitivity (EvWindow *ev_window) 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); set_action_sensitive (ev_window, "ViewReload", has_pages); @@ -458,11 +458,12 @@ update_sizing_buttons (EvWindow *window) } void -ev_window_open_page (EvWindow *ev_window, int page) +ev_window_open_page_label (EvWindow *ev_window, + const char *label) { 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); + ev_page_cache_set_page_label (ev_window->priv->page_cache, + label); } } @@ -613,7 +614,7 @@ ev_window_setup_document (EvWindow *ev_window) info = ev_document_get_info (document); update_document_mode (ev_window, info->mode); - g_free (info); + ev_document_info_free (info); } static void @@ -1069,23 +1070,38 @@ using_postscript_printer (GnomePrintConfig *config) } static void -ev_window_print (EvWindow *ev_window) +ev_window_print (EvWindow *window) +{ + EvPageCache *page_cache; + int last_page; + + page_cache = ev_document_get_page_cache (window->priv->document); + last_page = ev_page_cache_get_n_pages (page_cache); + + ev_window_print_range (window, 1, -1); +} + +void +ev_window_print_range (EvWindow *ev_window, int first_page, int last_page) { GnomePrintConfig *config; GnomePrintJob *job; GtkWidget *print_dialog; - EvPageCache *page_cache; gchar *pages_label; EvPrintJob *print_job = NULL; + EvPageCache *page_cache; g_return_if_fail (EV_IS_WINDOW (ev_window)); g_return_if_fail (ev_window->priv->document != NULL); + page_cache = ev_document_get_page_cache (ev_window->priv->document); + if (last_page == -1) { + last_page = ev_page_cache_get_n_pages (page_cache); + } + config = gnome_print_config_default (); job = gnome_print_job_new (config); - page_cache = ev_document_get_page_cache (ev_window->priv->document); - print_dialog = gnome_print_dialog_new (job, (guchar *) _("Print"), (GNOME_PRINT_DIALOG_RANGE | GNOME_PRINT_DIALOG_COPIES)); @@ -1094,8 +1110,7 @@ ev_window_print (EvWindow *ev_window) gnome_print_dialog_construct_range_page (GNOME_PRINT_DIALOG (print_dialog), GNOME_PRINT_RANGE_ALL | GNOME_PRINT_RANGE_RANGE, - 1, - ev_page_cache_get_n_pages (page_cache), + first_page, last_page, NULL, (const guchar *)pages_label); g_free (pages_label); @@ -1724,15 +1739,6 @@ ev_window_cmd_view_zoom_out (GtkAction *action, EvWindow *ev_window) update_action_sensitivity (ev_window); } -static void -ev_window_cmd_view_normal_size (GtkAction *action, EvWindow *ev_window) -{ - g_return_if_fail (EV_IS_WINDOW (ev_window)); - - ev_view_zoom_normal (EV_VIEW (ev_window->priv->view)); - update_action_sensitivity (ev_window); -} - static void ev_window_cmd_go_previous_page (GtkAction *action, EvWindow *ev_window) { @@ -1780,7 +1786,11 @@ ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window) uri = g_strdup (ev_window->priv->uri); ev_window_open (ev_window, uri); - ev_window_open_page (ev_window, page); + + /* In case the number of pages in the document has changed. */ + 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); g_free (uri); } @@ -1834,7 +1844,7 @@ ev_window_cmd_escape (GtkAction *action, EvWindow *window) } static void -update_view_size (EvWindow *window) +update_view_size (EvView *view, EvWindow *window) { int width, height; GtkRequisition vsb_requisition; @@ -1865,14 +1875,6 @@ update_view_size (EvWindow *window) hsb_requisition.height + scrollbar_spacing); } -static void -size_allocate_cb (GtkWidget *scrolled_window, - GtkAllocation *allocation, - EvWindow *window) -{ - update_view_size (window); -} - static void ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window) @@ -1886,10 +1888,10 @@ ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec, scrolled_window = ev_window->priv->scrolled_window; - g_signal_handlers_disconnect_by_func (scrolled_window, size_allocate_cb, ev_window); + g_signal_handlers_disconnect_by_func (ev_window->priv->view, update_view_size, ev_window); if (sizing_mode != EV_SIZING_FREE) - update_view_size (ev_window); + update_view_size (NULL, ev_window); switch (sizing_mode) { case EV_SIZING_BEST_FIT: @@ -1897,8 +1899,8 @@ ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec, "hscrollbar-policy", GTK_POLICY_NEVER, "vscrollbar-policy", GTK_POLICY_AUTOMATIC, NULL); - g_signal_connect (scrolled_window, "size-allocate", - G_CALLBACK (size_allocate_cb), + g_signal_connect (ev_window->priv->view, "zoom_invalid", + G_CALLBACK (update_view_size), ev_window); break; case EV_SIZING_FIT_WIDTH: @@ -1906,8 +1908,8 @@ ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec, "hscrollbar-policy", GTK_POLICY_NEVER, "vscrollbar-policy", GTK_POLICY_AUTOMATIC, NULL); - g_signal_connect (scrolled_window, "size-allocate", - G_CALLBACK (size_allocate_cb), + g_signal_connect (ev_window->priv->view, "zoom_invalid", + G_CALLBACK (update_view_size), ev_window); break; case EV_SIZING_FREE: @@ -1921,16 +1923,46 @@ ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec, update_sizing_buttons (ev_window); } +static char * +build_comments_string (void) +{ + PopplerBackend backend; + const char *backend_name; + const char *version; + + backend = poppler_get_backend (); + version = poppler_get_version (); + switch (backend) { + case POPPLER_BACKEND_CAIRO: + backend_name = "cairo"; + break; + case POPPLER_BACKEND_SPLASH: + backend_name = "splash"; + break; + default: + backend_name = "unknown"; + break; + } + + return g_strdup_printf (_("PostScript and PDF File Viewer.\n" + "Using poppler %s (%s)"), + version, backend_name); +} + static void ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window) { const char *authors[] = { - N_("Many..."), + "Martin Kretzschmar ", + "Jonathan Blandford ", + "Marco Pesenti Gritti ", + "Nickolay V. Shmyrev ", + "Bryan Clark ", NULL }; const char *documenters[] = { - N_("Not so many..."), + "Nickolay V. Shmyrev ", NULL }; @@ -1949,6 +1981,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window) }; char *license_trans; + char *comments; #ifdef ENABLE_NLS const char **p; @@ -1962,6 +1995,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window) license_trans = g_strconcat (_(license[0]), "\n", _(license[1]), "\n", _(license[2]), "\n", NULL); + comments = build_comments_string (); gtk_show_about_dialog ( GTK_WINDOW (ev_window), @@ -1971,12 +2005,13 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window) _("\xc2\xa9 1996-2004 The Evince authors"), "license", license_trans, "website", "http://www.gnome.org/projects/evince", - "comments", _("PostScript and PDF File Viewer."), + "comments", comments, "authors", authors, "documenters", documenters, "translator-credits", _("translator-credits"), NULL); + g_free (comments); g_free (license_trans); } @@ -2328,18 +2363,15 @@ static const GtkActionEntry entries[] = { { "ViewZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "minus", N_("Shrink the document"), G_CALLBACK (ev_window_cmd_view_zoom_out) }, - { "ViewNormalSize", GTK_STOCK_ZOOM_100, NULL, "0", - N_("Reset the zoom level to the default value"), - G_CALLBACK (ev_window_cmd_view_normal_size) }, { "ViewReload", GTK_STOCK_REFRESH, N_("_Reload"), "R", N_("Reload the document"), G_CALLBACK (ev_window_cmd_view_reload) }, /* Go menu */ - { "GoPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "Page_Up", + { "GoPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "Page_Up", N_("Go to the previous page"), G_CALLBACK (ev_window_cmd_go_previous_page) }, - { "GoNextPage", GTK_STOCK_GO_FORWARD, N_("_Next Page"), "Page_Down", + { "GoNextPage", GTK_STOCK_GO_FORWARD, N_("_Next Page"), "Page_Down", N_("Go to the next page"), G_CALLBACK (ev_window_cmd_go_next_page) }, { "GoFirstPage", GTK_STOCK_GOTO_FIRST, N_("_First Page"), "Home", @@ -2369,6 +2401,12 @@ static const GtkActionEntry entries[] = { { "Slash", GTK_STOCK_FIND, NULL, "slash", N_("Find a word or phrase in the document"), G_CALLBACK (ev_window_cmd_edit_find) }, + { "PageDown", NULL, "", "Page_Down", + N_("Scroll one page forward"), + G_CALLBACK (ev_window_cmd_scroll_forward) }, + { "PageUp", NULL, "", "Page_Up", + N_("Scroll one page backward"), + G_CALLBACK (ev_window_cmd_scroll_backward) }, { "Space", NULL, "", "space", N_("Scroll one page forward"), G_CALLBACK (ev_window_cmd_scroll_forward) }, @@ -2436,6 +2474,25 @@ drag_data_received_cb (GtkWidget *widget, GdkDragContext *context, } } +static void +activate_link_cb (EvPageAction *page_action, EvLink *link, EvWindow *window) +{ + g_return_if_fail (EV_IS_WINDOW (window)); + + ev_page_cache_set_link (window->priv->page_cache, link); + gtk_widget_grab_focus (window->priv->view); +} + +static gboolean +activate_label_cb (EvPageAction *page_action, char *label, EvWindow *window) +{ + g_return_val_if_fail (EV_IS_WINDOW (window), FALSE); + + gtk_widget_grab_focus (window->priv->view); + + return ev_page_cache_set_page_label (window->priv->page_cache, label); +} + static void register_custom_actions (EvWindow *window, GtkActionGroup *group) { @@ -2447,6 +2504,10 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group) "tooltip", _("Select Page"), "visible_overflown", FALSE, 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); @@ -2593,6 +2654,8 @@ static void set_view_actions_sensitivity (EvWindow *window, gboolean sensitive) { if (window->priv->action_group) { + set_action_sensitive (window, "PageDown", sensitive); + set_action_sensitive (window, "PageUp", sensitive); set_action_sensitive (window, "Space", sensitive); set_action_sensitive (window, "ShiftSpace", sensitive); set_action_sensitive (window, "BackSpace", sensitive); @@ -2672,7 +2735,7 @@ ev_window_init (EvWindow *ev_window) if (!gtk_ui_manager_add_ui_from_file (ev_window->priv->ui_manager, DATADIR"/evince-ui.xml", &error)) { - g_message ("building menus failed: %s", error->message); + g_warning ("building menus failed: %s", error->message); g_error_free (error); } @@ -2861,8 +2924,8 @@ ev_window_init (EvWindow *ev_window) G_CALLBACK (find_bar_search_changed_cb), ev_window); - /* Give focus to the scrolled window */ - gtk_widget_grab_focus (ev_window->priv->scrolled_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));