--- fluxbox-generate_menu.in.orig 2007-10-08 20:49:08.000000000 +0200 +++ fluxbox-generate_menu.in 2008-02-10 00:26:35.000000000 +0100 @@ -73,38 +73,38 @@ Options: - -k Insert a kde menu - -g Add a gnome menu - -B enable backgrounds menu - -su enable sudo commands + -k Insert a KDE menu + -g Add a Gnome menu + -B Enable backgrounds menu + -su Enable sudo commands -r Don't remove empty menu-entries; for templates - -d other path(s) to recursively search for *.desktop files - -ds wider search for *.desktop files (takes more time) - -i other path(s) to search for icons + -d Other path(s) to recursively search for *.desktop files + -ds Wider search for *.desktop files (takes more time) + -i Other path(s) to search for icons e.g., "/usr/kde/3.3/share/icons/crystalsvg/16x16/*" - -is wider search for icons (worth the extra time) - -in skip icon search + -is Wider search for icons (worth the extra time) + -in Skip icon search -t Favourite terminal -w Homepage for console-browsers. Default is fluxbox.org -b Favourite browser -m Menu-title; default is "Fluxbox" -o Outputfile; default is ~/.@pkgprefix@fluxbox@pkgsuffix@/menu - -u user sub-menu; default is ~/.@pkgprefix@fluxbox@pkgsuffix@/usermenu + -u User sub-menu; default is ~/.@pkgprefix@fluxbox@pkgsuffix@/usermenu -h Display this help -a Display the authors of this script Only for packagers: - -p prefix; default is @PREFIX@ + -p Prefix; default is @PREFIX@ -n Gnome-prefix; /opt, /usr, /usr/X11R6 and /usr/local autodetected -q KDE-prefix; idem dito Files: - ~/.@pkgprefix@fluxbox@pkgsuffix@/usermenu your own submenu which will be included in the menu + ~/.@pkgprefix@fluxbox@pkgsuffix@/usermenu Your own submenu which will be included in the menu ~/.@pkgprefix@fluxbox@pkgsuffix@/menuconfig rc file for fluxbox-generate_menu EOF @@ -117,8 +117,8 @@ Henrik Kinnunen: Project leader. Han Boetes: Packaging, debugging and scripts. - Simon Bowden: Cleanups and compatibility for sun. - Jeramy B. Smith: Packaging assistance, gnome and kde menu system. + Simon Bowden: Cleanups and compatibility for SUN. + Jeramy B. Smith: Packaging assistance, Gnome and KDE menu system. Filippo Pappalardo: Italian locales and -t option. $WHOAMI: Innocent bystander. @@ -396,7 +396,7 @@ execname="$1" shift - [ -n "$1" ] && echo "!! Ignoring extra paramters: $*" >&2 + [ -n "$1" ] && echo "!! Ignoring extra parameters: $*" >&2 [ -z "$execname" ] && { echo "execname is NULL; cannot lookup"; return 1; } execname=`removePath "$execname"` @@ -568,6 +568,7 @@ MENU_ENCODING=UTF-8 # (its also ascii) ABOUTITEM='About' +ANALYZERMENU='Analyzers' BACKGROUNDMENU='Backgrounds' BACKGROUNDMENUTITLE='Set the Background' BROWSERMENU='Browsers' @@ -576,7 +577,7 @@ EDITORMENU='Editors' EDUCATIONMENU='Education' EXITITEM='Exit' -FBSETTINGSMENU='fluxbox menu' +FBSETTINGSMENU='Fluxbox menu' FILEUTILSMENU='File utils' FLUXBOXCOMMAND='Fluxbox Command' GAMESMENU='Games' @@ -913,11 +914,12 @@ MENU_ENCODING=ISO-8859-15 + ANALYZERMENU='Analyseurs' BACKGROUNDMENU="Fond d'écran" BACKGROUNDMENUTITLE="Changer le fond d'écran" BROWSERMENU='Navigateurs' CONFIGUREMENU='Configurer' - EDITORMENU='Editeurs' + EDITORMENU='Éditeurs' EXITITEM='Sortir' FBSETTINGSMENU='Configurer Fluxbox' FILEUTILSMENU='Outils fichiers' @@ -926,8 +928,9 @@ GNOMEMENUTEXT='Menus Gnome' GRAPHICMENU='Graphisme' KDEMENUTEXT='Menus KDE' - LOCKSCREEN="Verouiller l'écran" + LOCKSCREEN="Verrouiller l'écran" MISCMENU='Divers' + MULTIMEDIAMENU='Multimédia' MUSICMENU='Musique' NETMENU='Réseau' OFFICEMENU='Bureautique' @@ -938,12 +941,14 @@ RUNCOMMAND='Run' SCREENSHOT="Capture d'écran" STYLEMENUTITLE='Choisir un style...' - SYSTEMSTYLES='Styles Systeme' + SYSTEMSTYLES='Styles Système' + SYSTEMTOOLSMENU='Outils Système' TERMINALMENU='Terminaux' TOOLS='Outils' USERSTYLES='Styles Utilisateur' + VIDEOMENU='Vidéo' WINDOWMANAGERS='Gestionnaires de fenêtres' - WINDOWNAME='Nom de la fenetre' + WINDOWNAME='Nom de la fenêtre' WORKSPACEMENU='Liste des bureaux' XUTILSMENU='Outils X' ;; @@ -1269,24 +1274,24 @@ # KDE_PREFIX=/opt/kde -# Sepparate the list of background-dirs with semicolumns ':' +# Separate the list of background-dirs with semicolumns ':' # BACKGROUND_DIRS="${USERFLUXDIR}/backgrounds/:@PREFIX@/share/fluxbox/backgrounds/:/usr/share/wallpapers" # --- Boolean variables. # Setting a variable to ``no'' won't help. Comment them out if you don't -# want them. Setting are overruled by the command-line options. +# want them. Setting are overruled by the command-line options. # Include all backgrounds in your backgrounds-directory # BACKGROUNDMENUITEM=yes -# Include kde-menus +# Include KDE-menus # KDEMENU=yes -# Include gnome-menus +# Include Gnome-menus # GNOMEMENU=yes -# enable sudo commands +# Enable sudo commands # DOSUDO=yes # Don't cleanup the menu @@ -1571,6 +1576,15 @@ EOF + +# +# Ah my fluxbox hero. Please help me update the apps list. +# $ cp fluxbox-generate-menu.in fluxbox-generate-menu.in.orig +# $ $EDITOR fluxbox-generate-menu.in +# $ diff -u fluxbox-generate-menu.in.orig fluxbox-generate-menu.in > fbgm.diff +# email fbgm.diff to han@mijncomputer.nl +# + echo "[begin] (${MENUTITLE})" >> ${MENUFILENAME} if [ -n "$MENU_ENCODING" ]; then @@ -1649,7 +1663,7 @@ normal_find LinNeighborhood jags SambaSentinel append_menu_end - append_submenu Analyzer + append_submenu "${ANALYZERMENU}" normal_find xnmap nmapfe wireshark ettercap sudo_find xnmap nmapfe wireshark ettercap append_menu_end @@ -1685,6 +1699,7 @@ append_submenu "${GRAPHICMENU}" normal_find gimp gimp2 gimp-2.2 inkscape sodipodi xv gqview showimg xpaint kpaint kiconedit \ ee xzgv xscreensaver-demo xlock gphoto tuxpaint krita skencil + find_it display append "[exec] (ImageMagick Display) {display}" find_it xnview append "[exec] (xnview browser) {xnview -browser}" find_it blender append "[exec] (blender) {blender -w}" find_it gears append "[exec] (Mesa gears) {gears}" @@ -1718,9 +1733,10 @@ find_it gcalc append "[exec] (gcalc) {gcalc}" || \ find_it gnome-calculator append "[exec] (gcalc) {gnome-calculator}" find_it ical append "[exec] (Calendar) {ical}" + find_it sunbird append "[exec] (Sunbird) {sunbird}" # older <=1.1.3 apparently have stuff like swriter, not sowriter - for ext in s so oo xoo; do + for ext in oo xoo; do find_it ${ext}ffice2 && ( find_it ${ext}ffice2 append "[exec] (Open Office 2) {${ext}ffice2}" find_it ${ext}base2 append "[exec] (OO Base 2) {${ext}base2}" @@ -1765,7 +1781,7 @@ wesnoth canfeild ace_canfeild golf merlin chickens \ supertux tuxdash neverball cube_client blackjack \ doom doom3 quake4 blackshades gltron kpoker concentration \ - torrent scramble kiki xmoto warsow wormux + torrent scramble kiki xmoto warsow wormux zsnes cli_find gnugo xgame find_it et append "[exec] (Enemy Territory) {et}" @@ -1784,7 +1800,7 @@ normal_find firestarter gtk-lshw gproftd gpureftpd guitoo porthole gtk-iptables \ gtk-cpuspeedy find_it fireglcontrol append "[exec] (ATI Config) {fireglcontrol}" - cli_find top + cli_find top htop append_menu_end @@ -1869,7 +1885,7 @@ append_submenu "${TOOLS}" normal_find fluxconf fluxkeys fluxmenu find_it fbpanel append "[exec] (Fluxbox panel) {fbpanel}" - # if gxmessage exitst use it; else use xmessage + # if gxmessage exist use it; else use xmessage find_it gxmessage append \ "[exec] (${WINDOWNAME}) {xprop WM_CLASS|cut -d \\\" -f 2|gxmessage -file - -center}" || \ find_it xmessage append \