Dan Espen wrote:
> Haven't you been doing CVS updates?
Sorry, used fvwm-menu-desktop.1 instead of fvwm-menu-desktop.1.in
Correct patch attached.
Thomas
--- /media/daten/shared/sourcen/cvs/fvwm/bin/fvwm-menu-desktop.1.in 2012-07-11 16:45:31.0 +0200
+++ fvwm-menu-desktop.1 2012-07-21 12:18:11.617683854 +0200
@@ -20,88 +20,86 @@
fvwm-menu-desktop \- Reads XDG menu files and creates Fvwm menus
.SH SYNOPSIS
-
fvwm-menu-desktop
-[ \fB\-\-help\fR|\fB\-h\fR|\fB\-?\fR ]
-[ \fB\-\-verbose\fR|\fB\-v\fR ]
+[ \fB\-\-help\fR|\fB\-h\fR ]
+[ \fB\-\-version\fR|\fB\-v\fR ]
[ \fB\-\-install\-prefix\fR \fIDIR\fR ]
[ \fB\-\-desktop\fR \fINAME\fR ]
-[ \fB\-\-title\fR \fINAME\fR ]
+[ \fB\-\-menu\-type\fR \fINAME\fR ]
+[ \fB\-\-theme\fR \fINAME\fR ]
+[ \fB\-\-with\-titles\fR|\fB\-w\fR ]
[ \fB\-\-enable\-mini\-icons\fR ]
+[ \fB\-\-size\fR|\fB\-s\fR \fINUM\fR ]
+[ \fB\-\-title\fR|\fB\-t\fR \fINAME\fR ]
+[ \fB\-\-insert\-in\-menu\fR \fINAME\fR ]
+[ \fB\-\-get\-menus\fR \fIall\fR|\fIdesktop\fR ]
+[ \fB\-\-set\-menus\fR \fImenu_paths\fR ]
+[ \fB\-\-verbose\fR ]
+
.SH DESCRIPTION
-This is a python script which parses XDG menus definitions to build
+This is a python script which parses XDG menus definitions to build
corresponding fvwm menus.
-.SH USAGE
-To add the XDG "application" menu to the "Utilities" menu
-add the following to your fvwm config file (.fvwm/config):
-.EX
- ...
-AddToMenu Utilities "Application Menu" Popup FvwmMenu
-PipeRead 'fvwm-menu-desktop'
-.EE
-
-By default fvwm-menu-desktop
-builds the "applications" menu
-and the menu is named FvwmMenu.
-
-.EX
-AddToMenu Utilities "KDE User Menu" Popup kde\-user
-AddToMenu kde\-user
-+ DynamicPopupAction PipeRead 'fvwm-menu-desktop --desktop kde-user --enable-mini-icons [other options]'
-.EE
-
-If you think that fvwm-menu-desktop slows your startup too much do
-not use PipeRead. Instead run fvwm-menu-desktop
-and
-redirect the menu to a file and Read that file in
-your .fvwm2rc file.
-Another possibility is to use DynamicPopupAction
-(with fvwm menu), the menu will be built only if
-you pop up the menu. The
-following menu creates a "kde\-all" menu which contains the user menu
-which is built each time you pop up "kde\-all" and contains a pop up
-to the system menu which is built only the first time you pop it up.
-.EX
-AddToMenu kde\-all
-+ DynamicPopupAction FuncRecreateKdeAll
-
-AddToMenu kde\-sys
-+ DynamicPopupAction PipeRead 'fvwm-menu-desktop \\
-\-\-desktop kde\-sys [options, but \-\-destroy-type d* or n*]'
-
-AddToFunc FuncRecreateKdeAll \\
-I PipeRead 'fvwm-menu-desktop \\
-\-\-desktop kde\-user \-\-enable\-mini\-icons \-\-name kde\-all \\
-\-\-destroy-type dynamic [options you like]'
-+ I AddToMenu "kde\-all" "" Nop
-+ I AddToMenu "kde\-all" "Kde System%mini/mini\-k.xpm%" Popup kde\-sys
-.EE
-
.SH OPTIONS
.IP "Main Options"
.IP "\fB\-\-help\fR"
Show the help and exit.
-.IP "\fB\-\-verbose\fR"
-Run verbosely.
+
+.IP "\fB\-\-version\fR"
+Show the version and exit.
+
.IP "\fB\-\-install-prefix\fR \fIDIR\fR"
-Optional parameter to override the default location
-for XDG menu definitions. The default location is /etc/xdg/menus.
+Optional parameter to override the default locations for XDG menu
+definitions. Related to the xdg specification the default location is
+/etc/xdg/menus and $HOME/.config/menus if exist.
+
.IP "\fB\-\-desktop\fR \fINAME\fR"
-The name of the menus you want to generate.
-The default is "application".
-.IP "\fB\-\-title\fR \fINAME\fR"
-Define the menu title of the top menu. Default
-is "Gnome System Menu" for gnome\-sys, "Gnome User Menu" for
-gnome\-user, "Gnome Red Hat Menu" for gnome\-redhat,
-"Gnome Mandriva Menu" for gnome\-mandriva. For KDE the
-default is given by KDE itself (or are similar to GNOME title).
-.IP "\fB\-\-name\fR \fINAME\fR"
-Define the menu name of the top menu. Default is the \-\-desktop
-name if you use one above.
+Optional parameter to override the \fINAME\fR of the main desktop
+environment installed on the system. If a system offers multiple
+desktop environments $XDG_MENU_PREFIX is typically set and is
+ignored if \-\-desktop is denoted. Possible names are: \fIgnome\fR,
+\fIkde\fR, \fIxfce\fR, \fIlxde\fR, \fIdebian\fR, etc.
+
+.IP "\fB\-\-menu\-type\fR \fINAME\fR"
+Defines which type of menus should be found. Possible \fINAME\fR types
+could be: \fIapplications\fR, \fIsettings\fR, \fIpreferences\fR, etc.
+
+Note that if the specified menu type doesn't exist the generated menu
+is empty!
+
+.IP "\fB\-\-theme\fR \fINAME\fR"
+Defines the used icon theme. Default is \fIgnome\fR but all others
+found in /usr/share/icons could be used except the \fIhicolor\fR theme
+because it's the default fallback theme if no icon is found.
+
+.IP "\fB\-\-with\-titles\fR|\fB\-w\fR"
+If this option is set menus are generated with titles. Default is no
+titles.
+
+.IP "\fB\-\-title\fR|\fB\-t\fR \fINAME\fR "
+Option to define the menu title \fINAME\fR of the top menu used by Fvwms
+\fBPopup\fR command. Defa
