aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-11-23 01:19:01 (GMT)
committerrathnor <rathnor>2003-11-23 01:19:01 (GMT)
commit5722b04b97aca8431d4621431e46c9bf01c4f9a7 (patch)
tree43814d8a981cf601b9f4764f670bc490e88ddd58
parentd757c08e006dea8147d8219ea2e0ca1c84c9cf7e (diff)
downloadfluxbox-5722b04b97aca8431d4621431e46c9bf01c4f9a7.zip
fluxbox-5722b04b97aca8431d4621431e46c9bf01c4f9a7.tar.bz2
util updates from han
-rw-r--r--ChangeLog3
-rw-r--r--util/.cvsignore1
-rw-r--r--util/fbsetbg4
-rwxr-xr-xutil/fluxbox-generate_menu.in11
4 files changed, 11 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index e54c639..b653846 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.7: 2Changes for 0.9.7:
3*03/11/23:
4 * Some util/ updates from Han
5 .cvsignore fbsetbg fluxbox_generate_menu.in
3*03/11/19: 6*03/11/19:
4 * Fix menu draw bug for empty submenus (Simon) 7 * Fix menu draw bug for empty submenus (Simon)
5 Menu.cc 8 Menu.cc
diff --git a/util/.cvsignore b/util/.cvsignore
index 11cb841..99b004c 100644
--- a/util/.cvsignore
+++ b/util/.cvsignore
@@ -4,3 +4,4 @@ Makefile
4Makefile.in 4Makefile.in
5bsetroot 5bsetroot
6startfluxbox 6startfluxbox
7fluxbox-generate_menu
diff --git a/util/fbsetbg b/util/fbsetbg
index b747e30..b31cb6f 100644
--- a/util/fbsetbg
+++ b/util/fbsetbg
@@ -23,7 +23,7 @@
23# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 23# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
24# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 24# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
25# 25#
26# $Id: fbsetbg,v 1.22 2003/10/16 15:54:20 rathnor Exp $ 26# $Id: fbsetbg,v 1.23 2003/11/23 01:19:01 rathnor Exp $
27 27
28# Portability notes: 28# Portability notes:
29# To guarantee this script works on all platforms that support fluxbox 29# To guarantee this script works on all platforms that support fluxbox
@@ -279,7 +279,7 @@ done
279standardrant=\ 279standardrant=\
280"$WPSETTER sets the 'wrong' wallpaper. Transparency for fluxbox and 280"$WPSETTER sets the 'wrong' wallpaper. Transparency for fluxbox and
281apps like aterm and xchat won't work right with it. Consider installing 281apps like aterm and xchat won't work right with it. Consider installing
282chbg, wmsetbg (from windowmaker) or Esetroot (from Eterm) and I'll use 282feh, wmsetbg (from windowmaker) or Esetroot (from Eterm) and I'll use
283them instead." 283them instead."
284 284
285standardok=\ 285standardok=\
diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
index 079641d..0887d4f 100755
--- a/util/fluxbox-generate_menu.in
+++ b/util/fluxbox-generate_menu.in
@@ -22,7 +22,7 @@
22# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23# DEALINGS IN THE SOFTWARE. 23# DEALINGS IN THE SOFTWARE.
24# 24#
25# $Id: fluxbox-generate_menu.in,v 1.1 2003/11/15 19:29:18 fluxgen Exp $ 25# $Id: fluxbox-generate_menu.in,v 1.2 2003/11/23 01:19:01 rathnor Exp $
26 26
27# 27#
28# Portability notes: 28# Portability notes:
@@ -84,7 +84,7 @@ Options:
84 84
85 85
86Files: 86Files:
87 ~/.fluxbux/usermenu your own submenu which will be included in the menu 87 ~/.fluxbox/usermenu your own submenu which will be included in the menu
88 ~/.fluxbox/menuconfig rc file for fluxbox-generate_menu 88 ~/.fluxbox/menuconfig rc file for fluxbox-generate_menu
89 89
90EOF 90EOF
@@ -877,7 +877,7 @@ append_submenu "${NETMENU}"
877 append_menu_end 877 append_menu_end
878 878
879 append_submenu ftp 879 append_submenu ftp
880 normal_find gftp IglooFTP-PRO 880 normal_find gftp IglooFTP-PRO
881 find_it pftp append "[exec] (pftp) {${DEFAULT_TERM} -e pftp}" 881 find_it pftp append "[exec] (pftp) {${DEFAULT_TERM} -e pftp}"
882 find_it ftp append "[exec] (ftp) {${DEFAULT_TERM} -e ftp}" 882 find_it ftp append "[exec] (ftp) {${DEFAULT_TERM} -e ftp}"
883 find_it lftp append "[exec] (lftp) {${DEFAULT_TERM} -e lftp}" 883 find_it lftp append "[exec] (lftp) {${DEFAULT_TERM} -e lftp}"
@@ -907,7 +907,7 @@ append_menu_end
907append_submenu "${MULTIMEDIAMENU}" 907append_submenu "${MULTIMEDIAMENU}"
908 append_submenu "${GRAPHICMENU}" 908 append_submenu "${GRAPHICMENU}"
909 normal_find gimp xv gqview showimg xpaint kpaint kiconedit \ 909 normal_find gimp xv gqview showimg xpaint kpaint kiconedit \
910 ee xscreensaver-demo xlock 910 ee xzgv xscreensaver-demo xlock
911 find_it xnview append "[exec] (xnview browser) {xnview -browser}" 911 find_it xnview append "[exec] (xnview browser) {xnview -browser}"
912 find_it blender append "[exec] (blender) {blender -w}" 912 find_it blender append "[exec] (blender) {blender -w}"
913 find_it gears append "[exec] (Mesa gears) {gears}" 913 find_it gears append "[exec] (Mesa gears) {gears}"
@@ -950,7 +950,6 @@ append_submenu "${OFFICEMENU}"
950 find_it oopadmin append "[exec] (OO Printer Administration) {oopadmin}" 950 find_it oopadmin append "[exec] (OO Printer Administration) {oopadmin}"
951 find_it mrproject append "[exec] (Mr.Project) {mrproject}" 951 find_it mrproject append "[exec] (Mr.Project) {mrproject}"
952 find_it soffice append "[exec] (Star Office) {soffice}" 952 find_it soffice append "[exec] (Star Office) {soffice}"
953
954 normal_find abiword kword wordperfect katoob acroread xpdf 953 normal_find abiword kword wordperfect katoob acroread xpdf
955append_menu_end 954append_menu_end
956 955
@@ -960,7 +959,7 @@ append_submenu "${GAMESMENU}"
960 gnotski iagno knights eboard xboard freecell pysol \ 959 gnotski iagno knights eboard xboard freecell pysol \
961 gtali tuxracer xpenguins xsnow xeyes xpenguins smclone openmortal \ 960 gtali tuxracer xpenguins xsnow xeyes xpenguins smclone openmortal \
962 quake2 quake3 skoosh same-gnome enigma xbill icebreaker 961 quake2 quake3 skoosh same-gnome enigma xbill icebreaker
963 find_it et append "[exec] (Enemy Territory) {et}" 962 find_it et append "[exec] (Enemy Territory) {et}"
964append_menu_end 963append_menu_end
965 964
966# We'll only use this once 965# We'll only use this once