aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathias <mathias>2004-12-10 03:19:54 (GMT)
committermathias <mathias>2004-12-10 03:19:54 (GMT)
commit910215d0a5f409363a5e4152eb6b31896e18a65d (patch)
tree9496f1bb3367bb2fedb75a9efc0fa4d84a5ce3a7
parent09439fe83aade3e0863a364e1d54990480b714af (diff)
downloadfluxbox_paul-910215d0a5f409363a5e4152eb6b31896e18a65d.zip
fluxbox_paul-910215d0a5f409363a5e4152eb6b31896e18a65d.tar.bz2
closes #1081200
added some ideas from the gentoo's ebuild (thanx ciaranm) minor cosmetic updates
-rwxr-xr-xutil/fluxbox-generate_menu.in63
1 files changed, 33 insertions, 30 deletions
diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
index 659b808..20412b2 100755
--- a/util/fluxbox-generate_menu.in
+++ b/util/fluxbox-generate_menu.in
@@ -173,8 +173,8 @@ append_menu_end() {
173menu_entry() { 173menu_entry() {
174 if [ -f "$1" ]; then 174 if [ -f "$1" ]; then
175 # space&tab here 175 # space&tab here
176 entry_name=`grep '^[ ]*Name=' "$1" | head -1 | cut -d = -f 2` 176 entry_name=`grep '^[ ]*Name=' "$1" | head -n 1 | cut -d = -f 2`
177 entry_exec=`grep '^[ ]*Exec=' "$1" | head -1 | cut -d = -f 2` 177 entry_exec=`grep '^[ ]*Exec=' "$1" | head -n 1 | cut -d = -f 2`
178 if [ -n "$entry_name" -a -n "$entry_exec" ]; then 178 if [ -n "$entry_name" -a -n "$entry_exec" ]; then
179 append "[exec] ($entry_name) {$entry_exec}" 179 append "[exec] ($entry_name) {$entry_exec}"
180 fi 180 fi
@@ -248,6 +248,7 @@ rm -f ${MENUFILENAME}.tmp
248} 248}
249 249
250# menu defaults (if translation forget to set one of them) 250# menu defaults (if translation forget to set one of them)
251ABOUTITEM='About'
251BACKGROUNDMENU='Backgrounds' 252BACKGROUNDMENU='Backgrounds'
252BACKGROUNDMENUTITLE='Set the Background' 253BACKGROUNDMENUTITLE='Set the Background'
253BROWSERMENU='Browsers' 254BROWSERMENU='Browsers'
@@ -642,29 +643,29 @@ case ${LC_ALL} in
642# $ diff u fluxbox-generate-menu.in.orig fluxbox-generate-menu.in > fbgm.diff 643# $ diff u fluxbox-generate-menu.in.orig fluxbox-generate-menu.in > fbgm.diff
643# email fbgm.diff to han@mijncomputer.nl 644# email fbgm.diff to han@mijncomputer.nl
644 645
645 BACKGROUNDMENUTITLE='Seleccionar Fondo' 646 BACKGROUNDMENUTITLE='Seleccionar Fondo'
646 BROWSERMENU='Navegadores' 647 BROWSERMENU='Navegadores'
647 CONFIGUREMENU='Configurar' 648 CONFIGUREMENU='Configurar'
648 EDITORMENU='Editores' 649 EDITORMENU='Editores'
649 EXITITEM='Salir' 650 EXITITEM='Salir'
650 FBSETTINGSMENU='Menú fluxbox' 651 FBSETTINGSMENU='Menú fluxbox'
651 GAMESMENU='Juegos' 652 GAMESMENU='Juegos'
652 GNOMEMENUTEXT='Menús Gnome' 653 GNOMEMENUTEXT='Menús Gnome'
653 GRAPHICMENU='Gráficos' 654 GRAPHICMENU='Gráficos'
654 KDEMENUTEXT='Menús KDE' 655 KDEMENUTEXT='Menús KDE'
655 MISCMENU='Varios' 656 MISCMENU='Varios'
656 MULTIMEDIAMENU='Multimedia' 657 MULTIMEDIAMENU='Multimedia'
657 MUSICMENU='Música' 658 MUSICMENU='Música'
658 NETMENU='Red' 659 NETMENU='Red'
659 OFFICEMENU='Oficina' 660 OFFICEMENU='Oficina'
660 RELOADITEM='Reconfigurar' 661 RELOADITEM='Reconfigurar'
661 RESTARTITEM='Reiniciar' 662 RESTARTITEM='Reiniciar'
662 STYLEMENUTITLE='Escoge un Estilo...' 663 STYLEMENUTITLE='Escoge un Estilo...'
663 SYSTEMSTYLES='Estilos del Sistema' 664 SYSTEMSTYLES='Estilos del Sistema'
664 TERMINALMENU='Terminales' 665 TERMINALMENU='Terminales'
665 USERSTYLES='Estilos del Usuario' 666 USERSTYLES='Estilos del Usuario'
666 WORKSPACEMENU='Lista de Escritorios' 667 WORKSPACEMENU='Lista de Escritorios'
667 XUTILSMENU='Utilidades X' 668 XUTILSMENU='Utilidades X'
668 BACKGROUNDMENU='Fondos' 669 BACKGROUNDMENU='Fondos'
669 FILEUTILSMENU='Utilidades' 670 FILEUTILSMENU='Utilidades'
670 FLUXBOXCOMMAND='Comandos de Fluxbox' 671 FLUXBOXCOMMAND='Comandos de Fluxbox'
@@ -964,7 +965,7 @@ if find_it_options $MY_TERM; then
964else 965else
965 [ -n "$MY_TERM" ] && echo "Warning: you chose an invalid term." >&2 966 [ -n "$MY_TERM" ] && echo "Warning: you chose an invalid term." >&2
966 #The precise order is up for debate. 967 #The precise order is up for debate.
967 for term in Eterm aterm rxvt wterm xterm konsole gnome-terminal; do 968 for term in Eterm urxvt urxvtc aterm rxvt wterm xterm konsole gnome-terminal; do
968 if find_it $term; then 969 if find_it $term; then
969 DEFAULT_TERM=$term 970 DEFAULT_TERM=$term
970 break 971 break
@@ -1026,7 +1027,7 @@ EOF
1026 1027
1027echo "[begin] (${MENUTITLE})" >> ${MENUFILENAME} 1028echo "[begin] (${MENUTITLE})" >> ${MENUFILENAME}
1028 1029
1029append "[exec] (${DEFAULT_TERMNAME}) {${DEFAULT_TERM}}" 1030append "[exec] (${DEFAULT_TERMNAME}) {${DEFAULT_TERM}}"
1030 1031
1031case "$DEFAULT_BROWSERNAME" in 1032case "$DEFAULT_BROWSERNAME" in
1032 links|w3m|lynx) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;; 1033 links|w3m|lynx) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;;
@@ -1099,7 +1100,7 @@ append_menu_end
1099 1100
1100append_submenu "${EDITORMENU}" 1101append_submenu "${EDITORMENU}"
1101 normal_find gvim bluefish nedit gedit xedit kword kwrite kate anjuta \ 1102 normal_find gvim bluefish nedit gedit xedit kword kwrite kate anjuta \
1102 wings xemacs emacs 1103 wings xemacs emacs kvim cream
1103 find_it nano append "[exec] (nano) {${DEFAULT_TERM} -e nano}" 1104 find_it nano append "[exec] (nano) {${DEFAULT_TERM} -e nano}"
1104 find_it vi append "[exec] (vi) {${DEFAULT_TERM} -e vi}" ||\ 1105 find_it vi append "[exec] (vi) {${DEFAULT_TERM} -e vi}" ||\
1105 find_it vim append "[exec] (vim) {${DEFAULT_TERM} -e vim}" 1106 find_it vim append "[exec] (vim) {${DEFAULT_TERM} -e vim}"
@@ -1117,7 +1118,7 @@ append_menu_end
1117 1118
1118append_submenu "${MULTIMEDIAMENU}" 1119append_submenu "${MULTIMEDIAMENU}"
1119 append_submenu "${GRAPHICMENU}" 1120 append_submenu "${GRAPHICMENU}"
1120 normal_find gimp xv gqview showimg xpaint kpaint kiconedit \ 1121 normal_find gimp gimp2 inkscape sodipodi xv gqview showimg xpaint kpaint kiconedit \
1121 ee xzgv xscreensaver-demo xlock 1122 ee xzgv xscreensaver-demo xlock
1122 find_it xnview append "[exec] (xnview browser) {xnview -browser}" 1123 find_it xnview append "[exec] (xnview browser) {xnview -browser}"
1123 find_it blender append "[exec] (blender) {blender -w}" 1124 find_it blender append "[exec] (blender) {blender -w}"
@@ -1165,6 +1166,7 @@ append_submenu "${OFFICEMENU}"
1165 done 1166 done
1166 1167
1167 normal_find abiword kword wordperfect katoob acroread xpdf lyx 1168 normal_find abiword kword wordperfect katoob acroread xpdf lyx
1169 normal_find dia xfig
1168append_menu_end 1170append_menu_end
1169 1171
1170append_submenu "${GAMESMENU}" 1172append_submenu "${GAMESMENU}"
@@ -1210,7 +1212,7 @@ append_submenu "${FBSETTINGSMENU}"
1210 1212
1211 append_menu "[submenu] (${SYSTEMSTYLES}) {${STYLEMENUTITLE}}" 1213 append_menu "[submenu] (${SYSTEMSTYLES}) {${STYLEMENUTITLE}}"
1212 append "[stylesdir] (${PREFIX}/share/fluxbox/styles)" 1214 append "[stylesdir] (${PREFIX}/share/fluxbox/styles)"
1213 append "[stylesdir] (/usr/share/commonbox/styles/)" 1215 append "[stylesdir] (/usr/share/commonbox/styles/)"
1214 append_menu_end 1216 append_menu_end
1215 1217
1216 append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}" 1218 append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}"
@@ -1289,6 +1291,7 @@ append_submenu "${FBSETTINGSMENU}"
1289 append "[commanddialog] (${FLUXBOXCOMMAND})" 1291 append "[commanddialog] (${FLUXBOXCOMMAND})"
1290 append "[reconfig] (${RELOADITEM})" 1292 append "[reconfig] (${RELOADITEM})"
1291 append "[restart] (${RESTARTITEM})" 1293 append "[restart] (${RESTARTITEM})"
1294 append "[exec] (${ABOUTITEM}) {(fluxbox -v; fluxbox -info | sed 1d) 2> /dev/null | xmessage -file - -center}"
1292 append "[separator]" 1295 append "[separator]"
1293 append "[exit] (${EXITITEM})" 1296 append "[exit] (${EXITITEM})"
1294 1297