From 241b695992167918d7acd216e18ee57d7d1ae96b Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 10 Nov 2008 19:57:10 +0100 Subject: [PATCH] enable VPATH build, reorganize app default files --- Makefile.am | 20 ++----- app-defaults/Xmh | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++ app-defaults/Xmh.ad | 173 --------------------------------------------------- 3 files changed, 178 insertions(+), 188 deletions(-) create mode 100644 app-defaults/Xmh delete mode 100644 app-defaults/Xmh.ad diff --git a/Makefile.am b/Makefile.am index f930a3c..ab6fe88 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,21 +62,13 @@ xmh_SOURCES = \ appman_PRE = \ xmh.man -# App default files (*.ad) +# App default files appdefaultdir = @appdefaultdir@ - -APPDEFAULTFILES = \ +dist_appdefault_DATA = \ app-defaults/Xmh -SUFFIXES = .ad - -.ad: - cp $< $@ - -appdefault_DATA = $(APPDEFAULTFILES) - # bitmap files bitmapdir = $(includedir)/X11/bitmaps @@ -85,9 +77,7 @@ dist_bitmap_DATA = black6 box6 # -EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) Xmh.sample - -CLEANFILES = $(APPDEFAULTFILES) +EXTRA_DIST = Xmh.sample appmandir = $(APP_MAN_DIR) @@ -95,7 +85,7 @@ appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) EXTRA_DIST += $(appman_PRE) -CLEANFILES += $(appman_DATA) +CLEANFILES = $(appman_DATA) SED = sed @@ -116,7 +106,7 @@ MAN_SUBSTS = \ -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' -SUFFIXES += .$(APP_MAN_SUFFIX) .man +SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): sed $(MAN_SUBSTS) < $< > $@ diff --git a/app-defaults/Xmh b/app-defaults/Xmh new file mode 100644 index 0000000..fd71a5c --- /dev/null +++ b/app-defaults/Xmh @@ -0,0 +1,173 @@ +! $XConsortium: Xmh.ad,v 1.32 94/02/09 19:44:06 gildea Exp $ +! AppDefaultsVersion should only be defined in the site-wide file +Xmh.AppDefaultsVersion: 1 + +Xmh.Geometry: 508x750 +Xmh.ReplyInsertFilter: cat +Xmh.SendBreakWidth: 2000 +*ShapeStyle: Oval +*Command.BorderWidth: 1 +*MenuButton.BorderWidth: 1 +*toc*cursor: left_ptr + +*menuBox.folderButton.Label: Folder +*menuBox.tocButton.Label: Table of Contents +*menuBox.messageButton.Label: Message +*menuBox.sequenceButton.Label: Sequence +*menuBox.viewButton.Label: View +*menuBox.optionButton.Label: Options +*SimpleMenu*SmeLine.Height: 20 + +*close.Label: Close Window +*compose.Label: Compose Message +*open.Label: Open Folder +*openInNew.Label: Open Folder in New Window +*create.Label: Create Folder +*folderMenu*delete.Label: Delete Folder +*inc.Label: Incorporate New Mail +*next.Label: View Next Message +*prev.Label: View Previous +*delete.Label: Delete +*move.Label: Move +*copy.Label: Copy as Link +*unmark.Label: Unmark +*viewNew.Label: View In New +*reply.Label: Reply +*forward.Label: Forward +*useAsComp.Label: Use as Composition +*commit.Label: Commit Changes +*print.Label: Print +*pack.Label: Pack Folder +*sort.Label: Sort Folder +*rescan.Label: Rescan Folder +*pick.Label: Pick +*openSeq.Label: Open Sequence +*addToSeq.Label: Add to Sequence +*removeFromSeq.Label: Remove from Sequence +*deleteSeq.Label: Delete Sequence +*edit.Label: Edit Message +*save.Label: Save Message +*send.Label: Send +*reset.Label: New Headers +*insert.Label: Insert +*optionMenu*reverse.Label: Read in Reverse + +Xmh.notice.Dialog.Text.BorderWidth: 0 +Xmh.notice.Dialog.Text.TextSink.Font: -*-courier-bold-r-*--*-120-*-*-*-*-iso8859-1 +Xmh.notice.Dialog.confirm.Label:Acknowledged +Xmh.notice.BorderWidth: 2 +Xmh.confirm.Dialog.yes.Label: Yes +Xmh.confirm.Dialog.no.Label: No +Xmh.prompt.Dialog.okay.Label: Okay +Xmh.prompt.Dialog.cancel.Label: Cancel +Xmh.error.Dialog.OK.Label: Acknowledged + +*toc.rightMargin: 0 +*toc.scrollVertical: WhenNeeded +*view.scrollVertical: Always +*view.scrollHorizontal: WhenNeeded +*view.autoFill: True +*comp.scrollVertical: Always +*comp.scrollHorizontal: WhenNeeded +*comp.autoFill: True + +*sequenceMenu.Translations: #override\n\ +:XtMenuPopdown()notify()XmhOpenSequence()unhighlight()\n\ +:XtMenuPopdown()XmhPushSequence()notify()XmhAddToSequence()XmhPopSequence()unhighlight()\n\ +:XtMenuPopdown()notify()unhighlight()\n + +*sequenceMenu.baseTranslations: #override\n\ +:XtMenuPopdown()notify()XmhOpenSequence()unhighlight()\n\ +:XtMenuPopdown()XmhPushSequence()notify()XmhAddToSequence()XmhPopSequence()unhighlight()\n\ +:XtMenuPopdown()notify()unhighlight()\n + +*folders*MenuButton.Translations:#override\n\ +:set()XmhPopupFolderMenu()\n\ +:XmhSetCurrentFolder()XmhOpenFolder()reset()\n\ +:XmhPushFolder()XmhSetCurrentFolder()XmhMarkMove()XmhPopFolder()reset()\n\ +:XmhSetCurrentFolder()reset()\n\ +:reset()XmhLeaveFolderButton()\n + +*folders*MenuButton.baseTranslations:#override\n\ +:set()XmhPopupFolderMenu()\n\ +:XmhSetCurrentFolder()XmhOpenFolder()reset()\n\ +:XmhPushFolder()XmhSetCurrentFolder()XmhMarkMove()XmhPopFolder()reset()\n\ +:XmhSetCurrentFolder()reset()\n\ +:reset()XmhLeaveFolderButton()\n + +*folders*SimpleMenu.Translations:#override\n\ +:XtMenuPopdown()notify()XmhOpenFolder()unhighlight()\n\ +:XtMenuPopdown()XmhPushFolder()notify()XmhMarkMove()XmhPopFolder()unhighlight()\n\ +:XtMenuPopdown()notify()unhighlight()\n + +*folders*SimpleMenu.baseTranslations:#override\n\ +:XtMenuPopdown()notify()XmhOpenFolder()unhighlight()\n\ +:XtMenuPopdown()XmhPushFolder()notify()XmhMarkMove()XmhPopFolder()unhighlight()\n\ +:XtMenuPopdown()notify()unhighlight()\n + +*toc.Translations: #override\n\ + : select-start()\n\ + :select-end(PRIMARY)XmhViewNextMessage()\n\ + CtrlR: no-op(RingBell)\n\ + CtrlS: no-op(RingBell)\n + +*toc.baseTranslations: #override\n\ + : select-start()\n\ + :select-end(PRIMARY)XmhViewNextMessage()\n\ + CtrlR: no-op(RingBell)\n\ + CtrlS: no-op(RingBell)\n + +*toc.Accelerators: #override\n\ + :CtrlV: next-page()\n\ + :MetaV: previous-page()\n +*view.Accelerators: #override\n\ + :Ctrlv: next-page()\n\ + :Metav: previous-page()\n + +*tocMenu.Accelerators: #override\n\ + :MetaI: XmhIncorporateNewMail()\n\ + :MetaC: XmhCommitChanges()\n\ + :MetaR: XmhForceRescan()\n\ + :MetaP: XmhPackFolder()\n\ + :MetaS: XmhSortFolder()\n + +*messageMenu.Accelerators: #override\n\ + Metaspace: XmhViewNextMessage()\n\ + :Metac: XmhMarkCopy()\n\ + :Metad: XmhMarkDelete()\n\ + :Metaf: XmhForward()\n\ + :Metam: XmhMarkMove()\n\ + :Metan: XmhViewNextMessage()\n\ + :Metap: XmhViewPreviousMessage()\n\ + :Metar: XmhReply()\n\ + :Metau: XmhUnmark()\n + +*viewButtons.close.Translations:#override\n\ + ,: XmhCloseView()unset()\n +*viewButtons.reply.Translations:#override\n\ + ,: XmhViewReply()unset()\n +*viewButtons.forward.Translations:#override\n\ + ,: XmhViewForward()unset()\n +*viewButtons.useAsComp.Translations:#override\n\ + ,: XmhViewUseAsComposition()unset()\n +*viewButtons.edit.Translations:#override\n\ + ,: XmhEditView()unset()\n +*viewButtons.save.Translations:#override\n\ + ,: XmhSaveView()unset()\n +*viewButtons.print.Translations:#override\n\ + ,: XmhPrintView()unset()\n +*viewButtons.delete.Translations:#override\n\ + ,: XmhViewMarkDelete()unset()\n + +*compButtons.close.Translations:#override\n\ + ,: XmhCloseView()unset()\n +*compButtons.send.Translations:#override\n\ + ,: XmhSend()unset()\n +*compButtons.reset.Translations:#override\n\ + ,: XmhResetCompose()unset()\n +*compButtons.compose.Translations:#override\n\ + ,: XmhComposeMessage()unset()\n +*compButtons.save.Translations:#override\n\ + ,: XmhSave()unset()\n +*compButtons.insert.Translations:#override\n\ + ,: XmhInsert()unset()\n diff --git a/app-defaults/Xmh.ad b/app-defaults/Xmh.ad deleted file mode 100644 index fd71a5c..0000000 --- a/app-defaults/Xmh.ad +++ /dev/null @@ -1,173 +0,0 @@ -! $XConsortium: Xmh.ad,v 1.32 94/02/09 19:44:06 gildea Exp $ -! AppDefaultsVersion should only be defined in the site-wide file -Xmh.AppDefaultsVersion: 1 - -Xmh.Geometry: 508x750 -Xmh.ReplyInsertFilter: cat -Xmh.SendBreakWidth: 2000 -*ShapeStyle: Oval -*Command.BorderWidth: 1 -*MenuButton.BorderWidth: 1 -*toc*cursor: left_ptr - -*menuBox.folderButton.Label: Folder -*menuBox.tocButton.Label: Table of Contents -*menuBox.messageButton.Label: Message -*menuBox.sequenceButton.Label: Sequence -*menuBox.viewButton.Label: View -*menuBox.optionButton.Label: Options -*SimpleMenu*SmeLine.Height: 20 - -*close.Label: Close Window -*compose.Label: Compose Message -*open.Label: Open Folder -*openInNew.Label: Open Folder in New Window -*create.Label: Create Folder -*folderMenu*delete.Label: Delete Folder -*inc.Label: Incorporate New Mail -*next.Label: View Next Message -*prev.Label: View Previous -*delete.Label: Delete -*move.Label: Move -*copy.Label: Copy as Link -*unmark.Label: Unmark -*viewNew.Label: View In New -*reply.Label: Reply -*forward.Label: Forward -*useAsComp.Label: Use as Composition -*commit.Label: Commit Changes -*print.Label: Print -*pack.Label: Pack Folder -*sort.Label: Sort Folder -*rescan.Label: Rescan Folder -*pick.Label: Pick -*openSeq.Label: Open Sequence -*addToSeq.Label: Add to Sequence -*removeFromSeq.Label: Remove from Sequence -*deleteSeq.Label: Delete Sequence -*edit.Label: Edit Message -*save.Label: Save Message -*send.Label: Send -*reset.Label: New Headers -*insert.Label: Insert -*optionMenu*reverse.Label: Read in Reverse - -Xmh.notice.Dialog.Text.BorderWidth: 0 -Xmh.notice.Dialog.Text.TextSink.Font: -*-courier-bold-r-*--*-120-*-*-*-*-iso8859-1 -Xmh.notice.Dialog.confirm.Label:Acknowledged -Xmh.notice.BorderWidth: 2 -Xmh.confirm.Dialog.yes.Label: Yes -Xmh.confirm.Dialog.no.Label: No -Xmh.prompt.Dialog.okay.Label: Okay -Xmh.prompt.Dialog.cancel.Label: Cancel -Xmh.error.Dialog.OK.Label: Acknowledged - -*toc.rightMargin: 0 -*toc.scrollVertical: WhenNeeded -*view.scrollVertical: Always -*view.scrollHorizontal: WhenNeeded -*view.autoFill: True -*comp.scrollVertical: Always -*comp.scrollHorizontal: WhenNeeded -*comp.autoFill: True - -*sequenceMenu.Translations: #override\n\ -:XtMenuPopdown()notify()XmhOpenSequence()unhighlight()\n\ -:XtMenuPopdown()XmhPushSequence()notify()XmhAddToSequence()XmhPopSequence()unhighlight()\n\ -:XtMenuPopdown()notify()unhighlight()\n - -*sequenceMenu.baseTranslations: #override\n\ -:XtMenuPopdown()notify()XmhOpenSequence()unhighlight()\n\ -:XtMenuPopdown()XmhPushSequence()notify()XmhAddToSequence()XmhPopSequence()unhighlight()\n\ -:XtMenuPopdown()notify()unhighlight()\n - -*folders*MenuButton.Translations:#override\n\ -:set()XmhPopupFolderMenu()\n\ -:XmhSetCurrentFolder()XmhOpenFolder()reset()\n\ -:XmhPushFolder()XmhSetCurrentFolder()XmhMarkMove()XmhPopFolder()reset()\n\ -:XmhSetCurrentFolder()reset()\n\ -:reset()XmhLeaveFolderButton()\n - -*folders*MenuButton.baseTranslations:#override\n\ -:set()XmhPopupFolderMenu()\n\ -:XmhSetCurrentFolder()XmhOpenFolder()reset()\n\ -:XmhPushFolder()XmhSetCurrentFolder()XmhMarkMove()XmhPopFolder()reset()\n\ -:XmhSetCurrentFolder()reset()\n\ -:reset()XmhLeaveFolderButton()\n - -*folders*SimpleMenu.Translations:#override\n\ -:XtMenuPopdown()notify()XmhOpenFolder()unhighlight()\n\ -:XtMenuPopdown()XmhPushFolder()notify()XmhMarkMove()XmhPopFolder()unhighlight()\n\ -:XtMenuPopdown()notify()unhighlight()\n - -*folders*SimpleMenu.baseTranslations:#override\n\ -:XtMenuPopdown()notify()XmhOpenFolder()unhighlight()\n\ -:XtMenuPopdown()XmhPushFolder()notify()XmhMarkMove()XmhPopFolder()unhighlight()\n\ -:XtMenuPopdown()notify()unhighlight()\n - -*toc.Translations: #override\n\ - : select-start()\n\ - :select-end(PRIMARY)XmhViewNextMessage()\n\ - CtrlR: no-op(RingBell)\n\ - CtrlS: no-op(RingBell)\n - -*toc.baseTranslations: #override\n\ - : select-start()\n\ - :select-end(PRIMARY)XmhViewNextMessage()\n\ - CtrlR: no-op(RingBell)\n\ - CtrlS: no-op(RingBell)\n - -*toc.Accelerators: #override\n\ - :CtrlV: next-page()\n\ - :MetaV: previous-page()\n -*view.Accelerators: #override\n\ - :Ctrlv: next-page()\n\ - :Metav: previous-page()\n - -*tocMenu.Accelerators: #override\n\ - :MetaI: XmhIncorporateNewMail()\n\ - :MetaC: XmhCommitChanges()\n\ - :MetaR: XmhForceRescan()\n\ - :MetaP: XmhPackFolder()\n\ - :MetaS: XmhSortFolder()\n - -*messageMenu.Accelerators: #override\n\ - Metaspace: XmhViewNextMessage()\n\ - :Metac: XmhMarkCopy()\n\ - :Metad: XmhMarkDelete()\n\ - :Metaf: XmhForward()\n\ - :Metam: XmhMarkMove()\n\ - :Metan: XmhViewNextMessage()\n\ - :Metap: XmhViewPreviousMessage()\n\ - :Metar: XmhReply()\n\ - :Metau: XmhUnmark()\n - -*viewButtons.close.Translations:#override\n\ - ,: XmhCloseView()unset()\n -*viewButtons.reply.Translations:#override\n\ - ,: XmhViewReply()unset()\n -*viewButtons.forward.Translations:#override\n\ - ,: XmhViewForward()unset()\n -*viewButtons.useAsComp.Translations:#override\n\ - ,: XmhViewUseAsComposition()unset()\n -*viewButtons.edit.Translations:#override\n\ - ,: XmhEditView()unset()\n -*viewButtons.save.Translations:#override\n\ - ,: XmhSaveView()unset()\n -*viewButtons.print.Translations:#override\n\ - ,: XmhPrintView()unset()\n -*viewButtons.delete.Translations:#override\n\ - ,: XmhViewMarkDelete()unset()\n - -*compButtons.close.Translations:#override\n\ - ,: XmhCloseView()unset()\n -*compButtons.send.Translations:#override\n\ - ,: XmhSend()unset()\n -*compButtons.reset.Translations:#override\n\ - ,: XmhResetCompose()unset()\n -*compButtons.compose.Translations:#override\n\ - ,: XmhComposeMessage()unset()\n -*compButtons.save.Translations:#override\n\ - ,: XmhSave()unset()\n -*compButtons.insert.Translations:#override\n\ - ,: XmhInsert()unset()\n -- 1.6.0.3