aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathias <mathias>2005-01-04 13:42:25 (GMT)
committermathias <mathias>2005-01-04 13:42:25 (GMT)
commit1657de3cefd497823fcd3e57316cf32499dbd415 (patch)
tree774da14c20a5503563be486d3f22c30f5bdfff98
parent901902330a638335e6ca5a2718073df73fe4ba4a (diff)
downloadfluxbox-1657de3cefd497823fcd3e57316cf32499dbd415.zip
fluxbox-1657de3cefd497823fcd3e57316cf32499dbd415.tar.bz2
added apps to fbgm
-rw-r--r--ChangeLog2
-rwxr-xr-xutil/fluxbox-generate_menu.in26
2 files changed, 20 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index a2face5..1c66b05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.12 2Changes for 0.9.12
3<<<<<<< .mine
4*05/01/04: 3*05/01/04:
4 * Added apps to fluxbox-generate_menu (thanx to Uwe Weissenbacher <UweWeissenbacher@gmx.net>)
5 * Added ko_KR (thanx Jo Hyunseok <ttrand at gmail dot com>) 5 * Added ko_KR (thanx Jo Hyunseok <ttrand at gmail dot com>)
6 * Updated ru_RU (thanx php-coder) 6 * Updated ru_RU (thanx php-coder)
7 ru_RU/Translation.m 7 ru_RU/Translation.m
diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
index 20412b2..24f8627 100755
--- a/util/fluxbox-generate_menu.in
+++ b/util/fluxbox-generate_menu.in
@@ -267,6 +267,7 @@ MISCMENU='Misc'
267MULTIMEDIAMENU='Multimedia' 267MULTIMEDIAMENU='Multimedia'
268MUSICMENU='Audio' 268MUSICMENU='Audio'
269NETMENU='Net' 269NETMENU='Net'
270NEWS='News'
270OFFICEMENU='Office' 271OFFICEMENU='Office'
271RANDOMBACKGROUND='Random Background' 272RANDOMBACKGROUND='Random Background'
272REGENERATEMENU='Regen Menu' 273REGENERATEMENU='Regen Menu'
@@ -799,6 +800,10 @@ if [ ! "${INSTALL}" = Yes ]; then
799# location with your own menu-entries 800# location with your own menu-entries
800# USERMENU=~/.fluxbox/usermenu 801# USERMENU=~/.fluxbox/usermenu
801 802
803# Put the launcher you would like to use here
804# LAUNCHER=fbrun
805# LAUNCHER=fbgm
806
802# Options for fbrun 807# Options for fbrun
803# FBRUNOPTIONS='-font 10x20 -fg grey -bg black -title run' 808# FBRUNOPTIONS='-font 10x20 -fg grey -bg black -title run'
804 809
@@ -1039,7 +1044,7 @@ case "$DEFAULT_BROWSERNAME" in
1039 *) append "[exec] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;; 1044 *) append "[exec] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;;
1040esac 1045esac
1041 1046
1042find_it fbrun append "[exec] (${RUNCOMMAND}) {fbrun $FBRUNOPTIONS}" 1047find_it ${LAUNCHER} append "[exec] (${RUNCOMMAND}) {${LAUNCHER} $FBRUNOPTIONS}"
1043 1048
1044 1049
1045append_submenu "${TERMINALMENU}" 1050append_submenu "${TERMINALMENU}"
@@ -1059,8 +1064,10 @@ append_submenu "${NETMENU}"
1059 append_menu_end 1064 append_menu_end
1060 1065
1061 append_submenu IM 1066 append_submenu IM
1062 normal_find gaim kopete gnomemeeting sim kadu 1067 normal_find gaim kopete gnomemeeting sim kadu psi
1063 find_it licq append "[exec] (licq) {env QT_XFT=true licq}" 1068 find_it licq append "[exec] (licq) {env QT_XFT=true licq}"
1069 find_it centericq append "[exec] (centericq) {${DEFAULT_TERM} -e centericq}"
1070 find_it micq append "[exec] (micq) {${DEFAULT_TERM} -e micq}"
1064 append_menu_end 1071 append_menu_end
1065 1072
1066 append_submenu Mail 1073 append_submenu Mail
@@ -1068,11 +1075,16 @@ append_submenu "${NETMENU}"
1068 find_it mutt append "[exec] (mutt) {${DEFAULT_TERM} -e mutt}" 1075 find_it mutt append "[exec] (mutt) {${DEFAULT_TERM} -e mutt}"
1069 append_menu_end 1076 append_menu_end
1070 1077
1078 append_submenu News
1079 normal_find liferea pears
1080 find_it slrn append "[exec] (slrn) {${DEFAULT_TERM} -e slrn}"
1081 append_menu_end
1082
1071 append_submenu IRC 1083 append_submenu IRC
1072 normal_find xchat ksirc vyqchat lostirc logui konversation kvirc 1084 normal_find xchat ksirc vyqchat lostirc logui konversation kvirc
1073 find_it irssi append "[exec] (irssi) {${DEFAULT_TERM} -e irssi}" 1085 find_it irssi append "[exec] (irssi) {${DEFAULT_TERM} -e irssi}"
1074 find_it BitchX append "[exec] (BitchX) {${DEFAULT_TERM} -e BitchX -N}" || \ 1086 find_it BitchX append "[exec] (BitchX) {${DEFAULT_TERM} -e BitchX -N}" || \
1075 find_it bitchx append "[exec] (BitchX) {${DEFAULT_TERM} -e bitchx -N}" 1087 find_it bitchx append "[exec] (BitchX) {${DEFAULT_TERM} -e bitchx -N}"
1076 find_it ircii append "[exec] (ircii) {${DEFAULT_TERM} -e ircii -s}" 1088 find_it ircii append "[exec] (ircii) {${DEFAULT_TERM} -e ircii -s}"
1077 find_it epic4 append "[exec] (epic4) {${DEFAULT_TERM} -e epic4}" 1089 find_it epic4 append "[exec] (epic4) {${DEFAULT_TERM} -e epic4}"
1078 find_it weechat append "[exec] (weechat) {${DEFAULT_TERM} -e weechat}" 1090 find_it weechat append "[exec] (weechat) {${DEFAULT_TERM} -e weechat}"
@@ -1094,7 +1106,7 @@ append_submenu "${NETMENU}"
1094 find_it yafc append "[exec] (yafc) {${DEFAULT_TERM} -e yafc}" 1106 find_it yafc append "[exec] (yafc) {${DEFAULT_TERM} -e yafc}"
1095 append_menu_end 1107 append_menu_end
1096 1108
1097 normal_find pan xnmap skype 1109 normal_find pan xnmap skype x3270
1098 1110
1099append_menu_end 1111append_menu_end
1100 1112
@@ -1111,7 +1123,7 @@ append_submenu "${EDITORMENU}"
1111append_menu_end 1123append_menu_end
1112 1124
1113append_submenu "${FILEUTILSMENU}" 1125append_submenu "${FILEUTILSMENU}"
1114 normal_find konqueror gentoo krusader linuxcmd rox tuxcmd krename 1126 normal_find konqueror gentoo krusader linuxcmd rox tuxcmd krename xfe
1115 find_it nautilus append "[exec] (nautilus) {nautilus --no-desktop}" 1127 find_it nautilus append "[exec] (nautilus) {nautilus --no-desktop}"
1116 find_it mc append "[exec] (mc) {${DEFAULT_TERM} -e mc}" 1128 find_it mc append "[exec] (mc) {${DEFAULT_TERM} -e mc}"
1117append_menu_end 1129append_menu_end
@@ -1177,7 +1189,7 @@ append_submenu "${GAMESMENU}"
1177 openmortal quake2 quake3 skoosh same-gnome enigma xbill \ 1189 openmortal quake2 quake3 skoosh same-gnome enigma xbill \
1178 icebreaker scorched3d sol dosbox black-box enigma freeciv \ 1190 icebreaker scorched3d sol dosbox black-box enigma freeciv \
1179 freeciv-server frozen-bubble liquidwar qt-nethack gnugo \ 1191 freeciv-server frozen-bubble liquidwar qt-nethack gnugo \
1180 nethack-gnome pathological scummvm 1192 nethack-gnome pathological scummvm xqf
1181 1193
1182 find_it et append "[exec] (Enemy Territory) {et}" 1194 find_it et append "[exec] (Enemy Territory) {et}"
1183 find_it ut append "[exec] (Unreal Tournament) {ut}" 1195 find_it ut append "[exec] (Unreal Tournament) {ut}"
@@ -1268,7 +1280,7 @@ append_submenu "${FBSETTINGSMENU}"
1268 "[exec] (${WINDOWNAME}) {xprop WM_CLASS|cut -d \\\" -f 2|xmessage -file - -center}" 1280 "[exec] (${WINDOWNAME}) {xprop WM_CLASS|cut -d \\\" -f 2|xmessage -file - -center}"
1269 find_it import append "[exec] (${SCREENSHOT} - JPG) {import screenshot.jpg && display -resize 50% screenshot.jpg}" 1281 find_it import append "[exec] (${SCREENSHOT} - JPG) {import screenshot.jpg && display -resize 50% screenshot.jpg}"
1270 find_it import append "[exec] (${SCREENSHOT} - PNG) {import screenshot.png && display -resize 50% screenshot.png}" 1282 find_it import append "[exec] (${SCREENSHOT} - PNG) {import screenshot.png && display -resize 50% screenshot.png}"
1271 find_it fbrun append "[exec] (${RUNCOMMAND}) {fbrun $FBRUNOPTIONS}" 1283 find_it ${LAUNCHER} append "[exec] (${RUNCOMMAND}) {${LAUNCHER} $FBRUNOPTIONS}"
1272 find_it switch append "[exec] (gtk-theme-switch) {switch}" 1284 find_it switch append "[exec] (gtk-theme-switch) {switch}"
1273 find_it switch2 append "[exec] (gtk2-theme-switch) {switch2}" 1285 find_it switch2 append "[exec] (gtk2-theme-switch) {switch2}"
1274 find_it fluxbox-generate_menu append "[exec] (${REGENERATEMENU}) {fluxbox-generate_menu}" 1286 find_it fluxbox-generate_menu append "[exec] (${REGENERATEMENU}) {fluxbox-generate_menu}"