diff options
author | Martin Kretzschmar <mkretzschmar@src.gnome.org> | 2002-10-04 14:42:36 (GMT) |
---|---|---|
committer | Martin Kretzschmar <mkretzschmar@src.gnome.org> | 2002-10-04 14:42:36 (GMT) |
commit | 58200a9a6965c0acc5e538b685f3f1b3b8b44f51 (patch) | |
tree | 3dfef55674389326703087a7a656a0b1f2c07506 /pdf/xpdf/Makefile.am | |
parent | 28efc982987afde802230593bb6ae54c7ab8b87f (diff) |
distribute gpdf-window-ui.xml
* shell/Makefile.am (EXTRA_DIST): distribute gpdf-window-ui.xml
* shell/gpdf-window-ui.xml: new file, based on xpdf/gpdf-ui.xml
* shell/gpdf.c (GPDF_IS_NON_NULL_WINDOW): add macro
(GW_RETURN_UNLESS_GW, GW_RETURN_VAL_UNLESS_GW): kill macros, use
GPDF_IS_NON_NULL_WINDOW with g_return_bla instead, this looks
more G'ish to me
* xpdf/.cvsignore: ignore gnome-pdf-viewer binary
* xpdf/Makefile.am (XML_FILES): don't distribute gpdf-ui.xml
(EXTRA_DIST): no ChangeLog here
* xpdf/gpdf-ui.xml: remove
* xpdf/gpdf-control-ui.xml: new file, based on
bonobo-application-x-pdf-ui.xml, half-hearted attempts to be
HIG-compliant
* xpdf/gpdf-control.cc (GPDF_IS_NON_NULL_CONTROL): add, use it
(gc_key_press_event): keyhandling mostly copied from embeddable
(verb_GoPagePrev_cb, verb_GoPageNext_cb, verb_GoPageFirst_cb)
(verb_GoPageLast_cb, gc_verbs []): add page verbs
(gc_set_ui_container, gc_unset_ui_container)
(gpdf_control_activate): install UI merging
(gc_set_zoom_items_visibility): only a dummy
(gpdf_control_construct): decompose into:
(gc_setup_persist, gc_setup_widgets): construct helpers
* xpdf/gpdf-embeddable-view.cc: use pdf_view_page_bla
* xpdf/gpdf-embeddable.h (bed_t): kill already unused typedef
* xpdf/pdf-view.h (pdf_view_page_prev, pdf_view_page_next)
(pdf_view_page_first, pdf_view_page_last): export
* xpdf/pdf-view.cc (first_page, last_page, next_page, prev_page):
static again
(pdf_view_page_prev, pdf_view_page_next, pdf_view_page_first)
(pdf_view_page_last): methods to be called by the control (and the
embeddable view) to do what their names say
(IS_NON_NULL_PDF_VIEW): like IS_PDF_VIEW with obvious extra check
Diffstat (limited to 'pdf/xpdf/Makefile.am')
-rw-r--r-- | pdf/xpdf/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am index 5965b87..3155607 100644 --- a/pdf/xpdf/Makefile.am +++ b/pdf/xpdf/Makefile.am @@ -208,11 +208,11 @@ oafdir = $(datadir)/oaf oaf_DATA = GNOME_PDF.oafinfo XML_FILES = \ - gpdf-ui.xml \ - bonobo-application-x-pdf-ui.xml + bonobo-application-x-pdf-ui.xml \ + gpdf-control-ui.xml uidir = $(datadir)/gnome/ui ui_DATA = $(XML_FILES) -EXTRA_DIST = $(stock_DATA) ChangeLog $(ltk) \ +EXTRA_DIST = $(stock_DATA) $(ltk) \ $(oaf_DATA) config.h $(XML_FILES) |