diff options
author | Carlos Garcia Campos <carlosgc@gnome.org> | 2007-07-08 20:09:36 (GMT) |
---|---|---|
committer | Carlos Garcia Campos <carlosgc@src.gnome.org> | 2007-07-08 20:09:36 (GMT) |
commit | 6426ce3672bf190ab39d9c49c841232c127d174f (patch) | |
tree | 74ae4a68b2a5d1cd559b2c7c77a58f9820fa6abf /shell/ev-jobs.c | |
parent | 080921f46c2e66ee230dd5781794638219557349 (diff) |
Merge evince-forms branch.
2007-07-08 Carlos Garcia Campos <carlosgc@gnome.org>
* configure.ac:
* backend/pdf/ev-poppler.cc: (pdf_document_get_crop_box),
(ev_form_field_from_poppler_field),
(pdf_document_forms_get_form_fields),
(pdf_document_forms_form_field_text_get_text),
(pdf_document_forms_form_field_text_set_text),
(pdf_document_forms_form_field_button_set_state),
(pdf_document_forms_form_field_button_get_state),
(pdf_document_forms_form_field_choice_get_item),
(pdf_document_forms_form_field_choice_get_n_items),
(pdf_document_forms_form_field_choice_is_item_selected),
(pdf_document_forms_form_field_choice_select_item),
(pdf_document_forms_form_field_choice_toggle_item),
(pdf_document_forms_form_field_choice_unselect_all),
(pdf_document_forms_form_field_choice_set_text),
(pdf_document_forms_form_field_choice_get_text),
(pdf_document_document_forms_iface_init):
* libdocument/Makefile.am:
* libdocument/ev-form-field.[ch]:
* libdocument/ev-document-forms.[ch]:
* shell/ev-pixbuf-cache.[ch]: (dispose_cache_job_info),
(move_one_job), (copy_job_to_job_info), (add_job_if_needed),
(add_job), (ev_pixbuf_cache_reload_page),
(ev_pixbuf_cache_get_form_field_mapping):
* shell/ev-jobs.[ch]: (ev_job_render_new), (ev_job_render_run):
* shell/ev-view-private.h:
* shell/ev-view.[ch]: (ev_view_set_scroll_adjustments),
(ev_view_handle_cursor_over_xy),
(ev_view_get_form_field_at_location),
(ev_view_forms_remove_widgets), (ev_view_form_field_destroy),
(ev_view_form_field_button_create_widget),
(ev_view_form_field_text_save), (ev_view_form_field_text_changed),
(ev_view_form_field_text_create_widget),
(ev_view_form_field_choice_save),
(ev_view_form_field_choice_changed),
(ev_view_form_field_choice_create_widget),
(ev_view_handle_form_field), (ev_view_size_allocate),
(ev_view_realize), (draw_end_presentation_page),
(ev_view_button_press_event), (ev_view_remove_all),
(ev_view_motion_notify_event), (ev_view_key_press_event),
(ev_view_enter_notify_event), (highlight_find_results),
(draw_loading_text), (draw_one_page), (ev_view_destroy),
(ev_view_class_init), (page_changed_cb),
(on_adjustment_value_changed), (ev_view_set_presentation),
(merge_selection_region), (ev_view_set_cursor),
(ev_view_reset_presentation_state):
Merge evince-forms branch.
svn path=/trunk/; revision=2560
Diffstat (limited to 'shell/ev-jobs.c')
-rw-r--r-- | shell/ev-jobs.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/shell/ev-jobs.c b/shell/ev-jobs.c index d9cdac8..0f0a0da 100644 --- a/shell/ev-jobs.c +++ b/shell/ev-jobs.c @@ -3,6 +3,7 @@ #include "ev-document-thumbnails.h" #include "ev-document-links.h" #include "ev-document-images.h" +#include "ev-document-forms.h" #include "ev-document-factory.h" #include "ev-document-misc.h" #include "ev-file-helpers.h" @@ -265,6 +266,7 @@ ev_job_render_new (EvDocument *document, EvRectangle *selection_points, GdkColor *text, GdkColor *base, + gboolean include_forms, gboolean include_links, gboolean include_images, gboolean include_text, @@ -284,6 +286,7 @@ ev_job_render_new (EvDocument *document, job->target_height = height; job->text = *text; job->base = *base; + job->include_forms = include_forms; job->include_links = include_links; job->include_images = include_images; job->include_text = include_text; @@ -330,6 +333,7 @@ ev_job_render_run (EvJobRender *job) ev_document_fc_mutex_lock (); job->surface = ev_document_render (EV_JOB (job)->document, job->rc); + if (job->include_links && EV_IS_DOCUMENT_LINKS (EV_JOB (job)->document)) job->link_mapping = ev_document_links_get_links (EV_DOCUMENT_LINKS (EV_JOB (job)->document), @@ -338,6 +342,10 @@ ev_job_render_run (EvJobRender *job) job->image_mapping = ev_document_images_get_images (EV_DOCUMENT_IMAGES (EV_JOB (job)->document), job->rc->page); + if (job->include_forms && EV_IS_DOCUMENT_FORMS (EV_JOB (job)->document)) + job->form_field_mapping = + ev_document_forms_get_form_fields (EV_DOCUMENT_FORMS (EV_JOB(job)->document), + job->rc->page); if (job->include_text && EV_IS_SELECTION (EV_JOB (job)->document)) job->text_mapping = ev_selection_get_selection_map (EV_SELECTION (EV_JOB (job)->document), |