[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[39] fvwm/components/functions

[<dom...@us...>]

Revision: 39
          http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=39&view=rev
Author:   dominique_libre
Date:     2010-12-22 21:22:40 +0000 (Wed, 22 Dec 2010)

Log Message:
-----------
Added support for terminator in the man page menu

Modified Paths:
--------------
    ChangeLog
    fvwm/components/functions/Developer-Menu

Modified: ChangeLog
===================================================================
--- ChangeLog	2010-12-22 20:07:18 UTC (rev 38)
+++ ChangeLog	2010-12-22 21:22:40 UTC (rev 39)
@@ -14,6 +14,7 @@
   * Removed Music preferences form the main preference.
     Will be incorporated into the Music button.
   * Added font preference menu.
+  * Added terminator support into the devman menu
   
 Mardi 22 décembre 2010 Dominique Michel
 The commit list bounced here too !

Modified: fvwm/components/functions/Developer-Menu
===================================================================
--- fvwm/components/functions/Developer-Menu	2010-12-22 20:07:18 UTC (rev 38)
+++ fvwm/components/functions/Developer-Menu	2010-12-22 21:22:40 UTC (rev 39)
@@ -2,9 +2,6 @@
 
 # Where is your system documentation:
 SetEnv System_Documentation /usr/share/doc
-# Which pager program to use for the system documentation:
-Test (EnvIsSet PAGER) SetEnv Pager_Exec $[PAGER]
-Test (!EnvIsSet PAGER) SetEnv Pager_Exec "less"
 
 DestroyMenu /Developer
 AddToMenu /Developer '$[gt.Developer menu]' Title
@@ -24,7 +21,7 @@
 + "" Nop
 + '$[gt.FVWM-Crystal documentation]' Popup /Developer/FVWM-Crystal-Documentation
 + '$[gt.FVWM manpages]' Popup /Developer/FvwmManpages
-+ '$[gt.X.org documentation]' Popup /Developer/X.org-Documentation
++ '$[gt.X.org documentation]' Popup /Developer/X.Org-Documentation
 + MissingSubmenuFunction System_Documentation-generator
 + '$[gt.Main system documentation]' Popup $[System_Documentation]
 + "" Nop
@@ -41,7 +38,8 @@
 
 DestroyFunc FvwmViewManPage
 AddToFunc FvwmViewManPage
-+ I Test (!EnvMatch DefaultTerminal gnome-terminal, !EnvMatch DefaultTerminal multi-gnome-terminal, !EnvMatch DefaultTerminal xterm) X $[DefaultTerminal] -e man $0
++ I Test (!EnvMatch DefaultTerminal gnome-terminal, !EnvMatch DefaultTerminal multi-gnome-terminal, !EnvMatch DefaultTerminal xterm, !EnvMatch DefaultTerminal terminator) X $[DefaultTerminal] -e man $0
++ I TestRc (NoMatch) Test (EnvMatch DefaultTerminal terminator) X $[DefaultTerminal] -x man $0
 + I TestRc (NoMatch) X $[DefaultTerminal] -e "man $0"
 
 DestroyMenu /Developer/FvwmManpages
@@ -122,16 +120,51 @@
 + "%22x22/categories/help.png%fvwm-menu-xlock" FvwmViewManPage fvwm-menu-xlock
 + "%22x22/categories/help.png%fvwm-root" FvwmViewManPage fvwm-root
 
-DestroyMenu /Developer/X.org-Documentation
-AddToMenu /Developer/X.org-Documentation
-+ '$[gt.Under construction]' Nop
+DestroyMenu /Developer/X.Org-Documentation
+AddToMenu /Developer/X.Org-Documentation
++ '$[gt.X.Org documentation]' Popup /Developer/X.Org/X.Org
+#+ '$[gt.X.Org-X11 documentation]' Popup /Developer/X.Org/X11
++ '$[gt.X.Org-Xserver documentation]' Popup /Developer/X.Org/Xserver
 
+DestroyMenu /Developer/X.Org/X.Org
+AddToMenu /Developer/X.Org/X.Org
++ "%22x22/categories/help.png%X" FvwmViewManPage X
++ "%22x22/categories/help.png%XOrgFoundation" FvwmViewManPage XOrgFoundation
++ "%22x22/categories/help.png%Consortium" FvwmViewManPage Consortium
++ "%22x22/categories/help.png%Standards" FvwmViewManPage Standards
++ "%22x22/categories/help.png%XProjectTeam" FvwmViewManPage XProjectTeam
++ "%22x22/categories/help.png%Xprint" FvwmViewManPage Xprint
++ "%22x22/categories/help.png%Xsecurity" FvwmViewManPage Xsecurity
+
+#DestroyMenu /Developer/X.Org/X11
+#AddToMenu /Developer/X.Org/X11
+#+ "%22x22/categories/help.png%X" FvwmViewManPage X
+
+DestroyMenu /Developer/X.Org/Xserver
+AddToMenu /Developer/X.Org/Xserver
++ "%22x22/categories/help.png%Xorg" FvwmViewManPage Xorg
++ "%22x22/categories/help.png%Xserver" FvwmViewManPage Xserver
++ "%22x22/categories/help.png%Xnest" FvwmViewManPage Xnest
++ "%22x22/categories/help.png%Xvfb" FvwmViewManPage Xvfb
++ "%22x22/categories/help.png%cvt" FvwmViewManPage cvt
++ "%22x22/categories/help.png%gtf" FvwmViewManPage gtf
++ "%22x22/categories/help.png%xorgcfg" FvwmViewManPage xorgcfg
++ "%22x22/categories/help.png%xorgconfig" FvwmViewManPage xorgconfig
++ "%22x22/categories/help.png%xorg.conf" FvwmViewManPage xorg.conf
++ "%22x22/categories/help.png%exa" FvwmViewManPage exa
++ "%22x22/categories/help.png%fbdevhw" FvwmViewManPage fbdevhw
+
 DestroyFunc System_Documentation-generator
 AddToFunc System_Documentation-generator
-+ I PipeRead 'case "$0" in \
-        "$[System_Documentation]"*) myexec="$[Pager_Exec]" direxec="mc";; \
++ I Test (EnvIsSet PAGER) PipeRead 'case "$0" in \
+        "$[System_Documentation]"*) myexec="$[PAGER]" direxec="mc";; \
     esac; \
     fvwm-menu-directory --func-name System_Documentation-generator --dir "$0" --exec-t="${direxec}" \
+    --exec-file "${myexec}"' 
++ I Test (!EnvIsSet PAGER) PipeRead 'case "$0" in \
+        "$[System_Documentation]"*) myexec="less" direxec="mc";; \
+    esac; \
+    fvwm-menu-directory --func-name System_Documentation-generator --dir "$0" --exec-t="${direxec}" \
     --exec-file "${myexec}"'
 
 DestroyMenu /Developer/WindowStyle
@@ -151,7 +184,9 @@
 + "!Borders"            Pick WindowStyle !Borders
 + "Borders"             Pick WindowStyle Borders
 + "" Nop
-+ "ResizeOpaque"        Pick WindowStyle ResizeOpaque"
++ "ResizeOpaque"        Pick WindowStyle ResizeOpaque
 + "ResizeOutline"       Pick WindowStyle ResizeOutline
+#+ "" Nop
+#+ "Layer 1"             Pick WindowStyle Layer 2
 
 # vim:ft=fvwm


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.