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 | |
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')
-rw-r--r-- | pdf/xpdf/.cvsignore | 1 | ||||
-rw-r--r-- | pdf/xpdf/Makefile.am | 6 | ||||
-rw-r--r-- | pdf/xpdf/gpdf-ui.xml | 81 |
3 files changed, 4 insertions, 84 deletions
diff --git a/pdf/xpdf/.cvsignore b/pdf/xpdf/.cvsignore index 6635416..301a46b 100644 --- a/pdf/xpdf/.cvsignore +++ b/pdf/xpdf/.cvsignore @@ -3,6 +3,7 @@ Makefile Makefile.in bonobo-application-x-pdf +gnome-pdf-viewer gpdf pdfimages pdfinfo 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) diff --git a/pdf/xpdf/gpdf-ui.xml b/pdf/xpdf/gpdf-ui.xml deleted file mode 100644 index 7a52076..0000000 --- a/pdf/xpdf/gpdf-ui.xml +++ /dev/null @@ -1,81 +0,0 @@ -<Root> - -<commands> - <cmd name="FileOpen" _label="Open" _tip="Open a file" - pixtype="stock" pixname="Open" accel="F3"/> - - <cmd name="FileClose" _label="Close" - _tip="Close the current file" pixtype="stock" pixname="Close" - accel="*Control*w"/> - - <cmd name="FileExit" _label="Exit" _tip="Exit the program" - pixtype="stock" pixname="Exit" accel="*Control*q"/> - - <cmd name="FilePrint" _label="Print" - _tip="Print the current file" pixtype="stock" pixname="Print" hidden="0"/> - - <cmd name="FilePrintSetup" _label="Print Setup" - _tip="Setup the page settings for your current printer" - pixtype="stock" pixname="Print" hidden="0"/> - - <cmd name="HelpAbout" _label="About..." _tip="About this application" - pixtype="stock" pixname="About"/> - - <cmd name="DebugDumpXml" _label="Dump XML" _tip="Dump the UI Xml description"/> - -</commands> - -<menu> - - <submenu name="File" _label="_File"> - - <menuitem name="FileOpen" verb="" _label="_Open..."/> - - <placeholder name="FileOps"/> - - <placeholder name="Print" delimit="top"> - - <menuitem name="FilePrint" verb="" _label="_Print"/> - - <menuitem name="FilePrintSetup" verb="" _label="Print S_etup..."/> - - </placeholder> - - <menuitem name="FileClose" verb="" _label="_Close"/> - - <separator/> - - <menuitem name="FileExit" verb="" _label="E_xit"/> - - </submenu> - - <placeholder name="Component"/> - - <submenu name="Help" _label="_Help"> - - <placeholder name="BuiltMenuItems"/> - - <menuitem name="HelpAbout" verb="" _label="_About..."/> - - </submenu> - - <submenu name="Debug" _label="_Debug" hidden="1"> - - <menuitem name="DebugDumpXml" verb=""/> - - </submenu> -</menu> - -<dockitem name="Toolbar" behavior="exclusive"> - - <toolitem name="open" verb="FileOpen"/> - <toolitem name="print" verb="FilePrint"/> - <separator/> - -</dockitem> - -<status> - <item name="main"/> -</status> - -</Root>
\ No newline at end of file |