diff options
author | skiidoo <aza.skiidoo@gmail.com> | 2008-05-02 10:59:47 (GMT) |
---|---|---|
committer | Mark Tiefenbruck <mark@fluxbox.org> | 2008-05-02 10:59:47 (GMT) |
commit | 146a38c7761b8d1944ee2b8f28eec07ce9742be8 (patch) | |
tree | 3f68f06fefdad157615b19c8a943f17adfc9820f | |
parent | d7afd7b39e8e539b873ece690dd1fae76296d09c (diff) | |
download | fluxbox_paul-146a38c7761b8d1944ee2b8f28eec07ce9742be8.zip fluxbox_paul-146a38c7761b8d1944ee2b8f28eec07ce9742be8.tar.bz2 |
some additions/corrections for fbgm
-rw-r--r-- | ChangeLog | 5 | ||||
-rwxr-xr-x | util/fluxbox-generate_menu.in | 65 |
2 files changed, 39 insertions, 31 deletions
@@ -1,6 +1,9 @@ | |||
1 | (Format: Year/Month/Day) | 1 | (Format: Year/Month/Day) |
2 | Changes for 1.0.1: | 2 | Changes for 1.0.1: |
3 | *08/04/31: | 3 | *08/05/02: |
4 | * Minor changes for fluxbox-generate_menu (thanks skiidoo) | ||
5 | util/fluxbox-generate_menu.in | ||
6 | *08/05/01: | ||
4 | * Notice when user replaces a non-existent menu file (Mark) | 7 | * Notice when user replaces a non-existent menu file (Mark) |
5 | fluxbox.cc Screen.cc | 8 | fluxbox.cc Screen.cc |
6 | *08/04/30: | 9 | *08/04/30: |
diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in index 0a0f76e..d8d2f61 100755 --- a/util/fluxbox-generate_menu.in +++ b/util/fluxbox-generate_menu.in | |||
@@ -70,38 +70,38 @@ display_help() { | |||
70 | 70 | ||
71 | Options: | 71 | Options: |
72 | 72 | ||
73 | -k Insert a kde menu | 73 | -k Insert a KDE menu |
74 | -g Add a gnome menu | 74 | -g Add a Gnome menu |
75 | -B enable backgrounds menu | 75 | -B Enable backgrounds menu |
76 | -su enable sudo commands | 76 | -su Enable sudo commands |
77 | -r Don't remove empty menu-entries; for templates | 77 | -r Don't remove empty menu-entries; for templates |
78 | 78 | ||
79 | -d other path(s) to recursively search for *.desktop files | 79 | -d Other path(s) to recursively search for *.desktop files |
80 | -ds wider search for *.desktop files (takes more time) | 80 | -ds Wider search for *.desktop files (takes more time) |
81 | -i other path(s) to search for icons | 81 | -i Other path(s) to search for icons |
82 | e.g., "/usr/kde/3.3/share/icons/crystalsvg/16x16/*" | 82 | e.g., "/usr/kde/3.3/share/icons/crystalsvg/16x16/*" |
83 | -is wider search for icons (worth the extra time) | 83 | -is Wider search for icons (worth the extra time) |
84 | -in skip icon search | 84 | -in Skip icon search |
85 | 85 | ||
86 | -t Favourite terminal | 86 | -t Favourite terminal |
87 | -w Homepage for console-browsers. Default is fluxbox.org | 87 | -w Homepage for console-browsers. Default is fluxbox.org |
88 | -b Favourite browser | 88 | -b Favourite browser |
89 | -m Menu-title; default is "Fluxbox" | 89 | -m Menu-title; default is "Fluxbox" |
90 | -o Outputfile; default is ~/.@pkgprefix@fluxbox@pkgsuffix@/menu | 90 | -o Outputfile; default is ~/.@pkgprefix@fluxbox@pkgsuffix@/menu |
91 | -u user sub-menu; default is ~/.@pkgprefix@fluxbox@pkgsuffix@/usermenu | 91 | -u User sub-menu; default is ~/.@pkgprefix@fluxbox@pkgsuffix@/usermenu |
92 | 92 | ||
93 | -h Display this help | 93 | -h Display this help |
94 | -a Display the authors of this script | 94 | -a Display the authors of this script |
95 | 95 | ||
96 | Only for packagers: | 96 | Only for packagers: |
97 | 97 | ||
98 | -p prefix; default is @PREFIX@ | 98 | -p Prefix; default is @PREFIX@ |
99 | -n Gnome-prefix; /opt, /usr, /usr/X11R6 and /usr/local autodetected | 99 | -n Gnome-prefix; /opt, /usr, /usr/X11R6 and /usr/local autodetected |
100 | -q KDE-prefix; idem dito | 100 | -q KDE-prefix; idem dito |
101 | 101 | ||
102 | 102 | ||
103 | Files: | 103 | Files: |
104 | ~/.@pkgprefix@fluxbox@pkgsuffix@/usermenu your own submenu which will be included in the menu | 104 | ~/.@pkgprefix@fluxbox@pkgsuffix@/usermenu Your own submenu which will be included in the menu |
105 | ~/.@pkgprefix@fluxbox@pkgsuffix@/menuconfig rc file for fluxbox-generate_menu | 105 | ~/.@pkgprefix@fluxbox@pkgsuffix@/menuconfig rc file for fluxbox-generate_menu |
106 | 106 | ||
107 | EOF | 107 | EOF |
@@ -115,8 +115,8 @@ display_authors() { | |||
115 | 115 | ||
116 | Henrik Kinnunen: Project leader. | 116 | Henrik Kinnunen: Project leader. |
117 | Han Boetes: Packaging, debugging and scripts. | 117 | Han Boetes: Packaging, debugging and scripts. |
118 | Simon Bowden: Cleanups and compatibility for sun. | 118 | Simon Bowden: Cleanups and compatibility for SUN. |
119 | Jeramy B. Smith: Packaging assistance, gnome and kde menu system. | 119 | Jeramy B. Smith: Packaging assistance, Gnome and KDE menu system. |
120 | Filippo Pappalardo: Italian locales and -t option. | 120 | Filippo Pappalardo: Italian locales and -t option. |
121 | $WHOAMI: Innocent bystander. | 121 | $WHOAMI: Innocent bystander. |
122 | 122 | ||
@@ -366,7 +366,7 @@ lookupIcon() { | |||
366 | 366 | ||
367 | execname="$1" | 367 | execname="$1" |
368 | shift | 368 | shift |
369 | [ -n "$1" ] && echo "!! Ignoring extra paramters: $*" >&2 | 369 | [ -n "$1" ] && echo "!! Ignoring extra parameters: $*" >&2 |
370 | 370 | ||
371 | [ -z "$execname" ] && { echo "execname is NULL; cannot lookup"; return 1; } | 371 | [ -z "$execname" ] && { echo "execname is NULL; cannot lookup"; return 1; } |
372 | execname=`removePath "$execname"` | 372 | execname=`removePath "$execname"` |
@@ -538,6 +538,7 @@ rm -f ${MENUFILENAME}.tmp | |||
538 | MENU_ENCODING=UTF-8 # (its also ascii) | 538 | MENU_ENCODING=UTF-8 # (its also ascii) |
539 | 539 | ||
540 | ABOUTITEM='About' | 540 | ABOUTITEM='About' |
541 | ANALYZERMENU='Analyzers' | ||
541 | BACKGROUNDMENU='Backgrounds' | 542 | BACKGROUNDMENU='Backgrounds' |
542 | BACKGROUNDMENUTITLE='Set the Background' | 543 | BACKGROUNDMENUTITLE='Set the Background' |
543 | BROWSERMENU='Browsers' | 544 | BROWSERMENU='Browsers' |
@@ -546,7 +547,7 @@ CONFIGUREMENU='Configure' | |||
546 | EDITORMENU='Editors' | 547 | EDITORMENU='Editors' |
547 | EDUCATIONMENU='Education' | 548 | EDUCATIONMENU='Education' |
548 | EXITITEM='Exit' | 549 | EXITITEM='Exit' |
549 | FBSETTINGSMENU='fluxbox menu' | 550 | FBSETTINGSMENU='Fluxbox menu' |
550 | FILEUTILSMENU='File utils' | 551 | FILEUTILSMENU='File utils' |
551 | FLUXBOXCOMMAND='Fluxbox Command' | 552 | FLUXBOXCOMMAND='Fluxbox Command' |
552 | GAMESMENU='Games' | 553 | GAMESMENU='Games' |
@@ -883,11 +884,12 @@ case ${LC_ALL} in | |||
883 | 884 | ||
884 | MENU_ENCODING=ISO-8859-15 | 885 | MENU_ENCODING=ISO-8859-15 |
885 | 886 | ||
887 | ANALYZERMENU='Analyseurs' | ||
886 | BACKGROUNDMENU="Fond d'écran" | 888 | BACKGROUNDMENU="Fond d'écran" |
887 | BACKGROUNDMENUTITLE="Changer le fond d'écran" | 889 | BACKGROUNDMENUTITLE="Changer le fond d'écran" |
888 | BROWSERMENU='Navigateurs' | 890 | BROWSERMENU='Navigateurs' |
889 | CONFIGUREMENU='Configurer' | 891 | CONFIGUREMENU='Configurer' |
890 | EDITORMENU='Editeurs' | 892 | EDITORMENU='Éditeurs' |
891 | EXITITEM='Sortir' | 893 | EXITITEM='Sortir' |
892 | FBSETTINGSMENU='Configurer Fluxbox' | 894 | FBSETTINGSMENU='Configurer Fluxbox' |
893 | FILEUTILSMENU='Outils fichiers' | 895 | FILEUTILSMENU='Outils fichiers' |
@@ -896,8 +898,9 @@ case ${LC_ALL} in | |||
896 | GNOMEMENUTEXT='Menus Gnome' | 898 | GNOMEMENUTEXT='Menus Gnome' |
897 | GRAPHICMENU='Graphisme' | 899 | GRAPHICMENU='Graphisme' |
898 | KDEMENUTEXT='Menus KDE' | 900 | KDEMENUTEXT='Menus KDE' |
899 | LOCKSCREEN="Verouiller l'écran" | 901 | LOCKSCREEN="Verrouiller l'écran" |
900 | MISCMENU='Divers' | 902 | MISCMENU='Divers' |
903 | MULTIMEDIAMENU='Multimédia' | ||
901 | MUSICMENU='Musique' | 904 | MUSICMENU='Musique' |
902 | NETMENU='Réseau' | 905 | NETMENU='Réseau' |
903 | OFFICEMENU='Bureautique' | 906 | OFFICEMENU='Bureautique' |
@@ -908,12 +911,14 @@ case ${LC_ALL} in | |||
908 | RUNCOMMAND='Run' | 911 | RUNCOMMAND='Run' |
909 | SCREENSHOT="Capture d'écran" | 912 | SCREENSHOT="Capture d'écran" |
910 | STYLEMENUTITLE='Choisir un style...' | 913 | STYLEMENUTITLE='Choisir un style...' |
911 | SYSTEMSTYLES='Styles Systeme' | 914 | SYSTEMSTYLES='Styles Système' |
915 | SYSTEMTOOLSMENU='Outils Système' | ||
912 | TERMINALMENU='Terminaux' | 916 | TERMINALMENU='Terminaux' |
913 | TOOLS='Outils' | 917 | TOOLS='Outils' |
914 | USERSTYLES='Styles Utilisateur' | 918 | USERSTYLES='Styles Utilisateur' |
919 | VIDEOMENU='Vidéo' | ||
915 | WINDOWMANAGERS='Gestionnaires de fenêtres' | 920 | WINDOWMANAGERS='Gestionnaires de fenêtres' |
916 | WINDOWNAME='Nom de la fenetre' | 921 | WINDOWNAME='Nom de la fenêtre' |
917 | WORKSPACEMENU='Liste des bureaux' | 922 | WORKSPACEMENU='Liste des bureaux' |
918 | XUTILSMENU='Outils X' | 923 | XUTILSMENU='Outils X' |
919 | ;; | 924 | ;; |
@@ -1239,24 +1244,24 @@ if [ ! "${INSTALL}" = Yes ]; then | |||
1239 | # KDE_PREFIX=/opt/kde | 1244 | # KDE_PREFIX=/opt/kde |
1240 | 1245 | ||
1241 | 1246 | ||
1242 | # Sepparate the list of background-dirs with semicolumns ':' | 1247 | # Separate the list of background dirs with colons ':' |
1243 | # BACKGROUND_DIRS="${USERFLUXDIR}/backgrounds/:@PREFIX@/share/fluxbox/backgrounds/:/usr/share/wallpapers" | 1248 | # BACKGROUND_DIRS="${USERFLUXDIR}/backgrounds/:@PREFIX@/share/fluxbox/backgrounds/:/usr/share/wallpapers" |
1244 | 1249 | ||
1245 | 1250 | ||
1246 | # --- Boolean variables. | 1251 | # --- Boolean variables. |
1247 | # Setting a variable to ``no'' won't help. Comment them out if you don't | 1252 | # Setting a variable to ``no'' won't help. Comment them out if you don't |
1248 | # want them. Setting are overruled by the command-line options. | 1253 | # want them. Settings are overruled by the command-line options. |
1249 | 1254 | ||
1250 | # Include all backgrounds in your backgrounds-directory | 1255 | # Include all backgrounds in your backgrounds-directory |
1251 | # BACKGROUNDMENUITEM=yes | 1256 | # BACKGROUNDMENUITEM=yes |
1252 | 1257 | ||
1253 | # Include kde-menus | 1258 | # Include KDE-menus |
1254 | # KDEMENU=yes | 1259 | # KDEMENU=yes |
1255 | 1260 | ||
1256 | # Include gnome-menus | 1261 | # Include Gnome-menus |
1257 | # GNOMEMENU=yes | 1262 | # GNOMEMENU=yes |
1258 | 1263 | ||
1259 | # enable sudo commands | 1264 | # Enable sudo commands |
1260 | # DOSUDO=yes | 1265 | # DOSUDO=yes |
1261 | 1266 | ||
1262 | # Don't cleanup the menu | 1267 | # Don't cleanup the menu |
@@ -1565,7 +1570,7 @@ find_it "${LAUNCHER}" append "[exec] (${RUNCOMMAND}) {${LAUNCHER} $FBRUNOPTION | |||
1565 | 1570 | ||
1566 | append_submenu "${TERMINALMENU}" | 1571 | append_submenu "${TERMINALMENU}" |
1567 | normal_find xterm urxvt urxvtc gnome-terminal multi-gnome-terminal Eterm \ | 1572 | normal_find xterm urxvt urxvtc gnome-terminal multi-gnome-terminal Eterm \ |
1568 | konsole aterm mlterm multi-aterm rxvt | 1573 | konsole aterm mlterm multi-aterm rxvt mrxvt |
1569 | append_menu_end | 1574 | append_menu_end |
1570 | 1575 | ||
1571 | 1576 | ||
@@ -1620,7 +1625,7 @@ append_submenu "${NETMENU}" | |||
1620 | normal_find LinNeighborhood jags SambaSentinel | 1625 | normal_find LinNeighborhood jags SambaSentinel |
1621 | append_menu_end | 1626 | append_menu_end |
1622 | 1627 | ||
1623 | append_submenu Analyzer | 1628 | append_submenu "${ANALYZERMENU}" |
1624 | normal_find xnmap nmapfe wireshark ettercap | 1629 | normal_find xnmap nmapfe wireshark ettercap |
1625 | sudo_find xnmap nmapfe wireshark ettercap | 1630 | sudo_find xnmap nmapfe wireshark ettercap |
1626 | append_menu_end | 1631 | append_menu_end |
@@ -1736,7 +1741,7 @@ append_submenu "${GAMESMENU}" | |||
1736 | wesnoth canfeild ace_canfeild golf merlin chickens \ | 1741 | wesnoth canfeild ace_canfeild golf merlin chickens \ |
1737 | supertux tuxdash neverball cube_client blackjack \ | 1742 | supertux tuxdash neverball cube_client blackjack \ |
1738 | doom doom3 quake4 blackshades gltron kpoker concentration \ | 1743 | doom doom3 quake4 blackshades gltron kpoker concentration \ |
1739 | torrent scramble kiki xmoto warsow wormux | 1744 | torrent scramble kiki xmoto warsow wormux zsnes |
1740 | cli_find gnugo xgame | 1745 | cli_find gnugo xgame |
1741 | 1746 | ||
1742 | find_it et append "[exec] (Enemy Territory) {et}" | 1747 | find_it et append "[exec] (Enemy Territory) {et}" |
@@ -1755,7 +1760,7 @@ append_submenu "${SYSTEMTOOLSMENU}" | |||
1755 | normal_find firestarter gtk-lshw gproftd gpureftpd guitoo porthole gtk-iptables \ | 1760 | normal_find firestarter gtk-lshw gproftd gpureftpd guitoo porthole gtk-iptables \ |
1756 | gtk-cpuspeedy | 1761 | gtk-cpuspeedy |
1757 | find_it fireglcontrol append "[exec] (ATI Config) {fireglcontrol}" | 1762 | find_it fireglcontrol append "[exec] (ATI Config) {fireglcontrol}" |
1758 | cli_find top | 1763 | cli_find top htop |
1759 | append_menu_end | 1764 | append_menu_end |
1760 | 1765 | ||
1761 | 1766 | ||
@@ -1840,7 +1845,7 @@ append_submenu "${FBSETTINGSMENU}" | |||
1840 | append_submenu "${TOOLS}" | 1845 | append_submenu "${TOOLS}" |
1841 | normal_find fluxconf fluxkeys fluxmenu | 1846 | normal_find fluxconf fluxkeys fluxmenu |
1842 | find_it fbpanel append "[exec] (Fluxbox panel) {fbpanel}" | 1847 | find_it fbpanel append "[exec] (Fluxbox panel) {fbpanel}" |
1843 | # if gxmessage exitst use it; else use xmessage | 1848 | # if gxmessage exists, use it; else use xmessage |
1844 | find_it gxmessage append \ | 1849 | find_it gxmessage append \ |
1845 | "[exec] (${WINDOWNAME}) {xprop WM_CLASS|cut -d \\\" -f 2|gxmessage -file - -center}" || \ | 1850 | "[exec] (${WINDOWNAME}) {xprop WM_CLASS|cut -d \\\" -f 2|gxmessage -file - -center}" || \ |
1846 | find_it xmessage append \ | 1851 | find_it xmessage append \ |