summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rwxr-xr-xutil/fluxbox-generate_menu.in52
2 files changed, 32 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ca0a67..b0cfa16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0.0: 2Changes for 1.0.0:
3*07/06/28:
4 * Added some missing Open Office entries and window managers, plus some other
5 minor changes in fluxbox-generate_menu
6 fluxbox-generate_menu.in
3*07/06/16: 7*07/06/16:
4 * Fixed compile error with --disable-remember (Mark) 8 * Fixed compile error with --disable-remember (Mark)
5 Window.cc/hh Remember.cc/hh 9 Window.cc/hh Remember.cc/hh
diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
index ae2c54f..b98ea2a 100755
--- a/util/fluxbox-generate_menu.in
+++ b/util/fluxbox-generate_menu.in
@@ -1318,6 +1318,7 @@ testoption() {
1318 esac 1318 esac
1319} 1319}
1320 1320
1321BACKUPOPTIONS=$@
1321# Get options. 1322# Get options.
1322while [ $# -gt 0 ]; do 1323while [ $# -gt 0 ]; do
1323 case "$1" in 1324 case "$1" in
@@ -1636,7 +1637,7 @@ append_submenu "${NETMENU}"
1636 normal_find xnmap nmapfe 1637 normal_find xnmap nmapfe
1637 append_menu_end 1638 append_menu_end
1638 1639
1639 normal_find x3270 1640 normal_find x3270 wpa_gui
1640 1641
1641append_menu_end 1642append_menu_end
1642 1643
@@ -1650,7 +1651,7 @@ append_menu_end
1650 1651
1651append_submenu "${EDUCATIONMENU}" 1652append_submenu "${EDUCATIONMENU}"
1652 normal_find celestia scilab geomview scigraphica oregano xcircuit electric \ 1653 normal_find celestia scilab geomview scigraphica oregano xcircuit electric \
1653 pymol elem chemtool xdrawchem stellarium 1654 pymol elem chemtool xdrawchem gperiodic stellarium
1654 find_it drgeo append "[exec] (Dr. Geo) {drgeo}" 1655 find_it drgeo append "[exec] (Dr. Geo) {drgeo}"
1655 find_it R append "[exec] (R) {${DEFAULT_TERM} -e R --gui=gnome}" 1656 find_it R append "[exec] (R) {${DEFAULT_TERM} -e R --gui=gnome}"
1656 cli_find maxima grace yacas octave gnuplot grass coq acl 1657 cli_find maxima grace yacas octave gnuplot grass coq acl
@@ -1704,26 +1705,29 @@ append_submenu "${OFFICEMENU}"
1704 # older <=1.1.3 apparently have stuff like swriter, not sowriter 1705 # older <=1.1.3 apparently have stuff like swriter, not sowriter
1705 for ext in s so oo xoo; do 1706 for ext in s so oo xoo; do
1706 find_it ${ext}ffice2 && ( 1707 find_it ${ext}ffice2 && (
1707 find_it ${ext}ffice2 append "[exec] (Open Office 2) {${ext}ffice2}" 1708 find_it ${ext}ffice2 append "[exec] (Open Office 2) {${ext}ffice2}"
1708 find_it ${ext}base2 append "[exec] (OO Base 2) {${ext}base2}" 1709 find_it ${ext}base2 append "[exec] (OO Base 2) {${ext}base2}"
1709 find_it ${ext}calc2 append "[exec] (OO Calc 2) {${ext}calc2}" 1710 find_it ${ext}calc2 append "[exec] (OO Calc 2) {${ext}calc2}"
1710 find_it ${ext}writer2 append "[exec] (OO Writer 2) {${ext}writer2}" 1711 find_it ${ext}writer2 append "[exec] (OO Writer 2) {${ext}writer2}"
1711 find_it ${ext}web2 append "[exec] (OO Web 2) {${ext}web2}" 1712 find_it ${ext}web2 append "[exec] (OO Web 2) {${ext}web2}"
1712 find_it ${ext}html2 append "[exec] (OO HTML 2) {${ext}html2}" 1713 find_it ${ext}html2 append "[exec] (OO HTML 2) {${ext}html2}"
1713 find_it ${ext}impress2 append "[exec] (OO Impress 2) {${ext}impress2}" 1714 find_it ${ext}impress2 append "[exec] (OO Impress 2) {${ext}impress2}"
1714 find_it ${ext}draw2 append "[exec] (OO Draw 2) {${ext}draw2}" 1715 find_it ${ext}draw2 append "[exec] (OO Draw 2) {${ext}draw2}"
1715 find_it ${ext}math2 append "[exec] (OO Math 2) {${ext}math2}" 1716 find_it ${ext}math2 append "[exec] (OO Math 2) {${ext}math2}"
1716 find_it ${ext}fromtemplate2 append "[exec] (OO Templates 2) {${ext}fromtemplate2}" 1717 find_it ${ext}fromtemplate2 append "[exec] (OO Templates 2) {${ext}fromtemplate2}"
1717 ) 1718 )
1718 find_it ${ext}ffice && ( 1719 find_it ${ext}ffice && (
1719 find_it ${ext}ffice append "[exec] (Open Office) {${ext}ffice}" 1720 find_it ${ext}ffice append "[exec] (Open Office) {${ext}ffice}"
1720 find_it ${ext}calc append "[exec] (OO Calc) {${ext}calc}" 1721 find_it ${ext}base append "[exec] (OO Base) {${ext}base}"
1721 find_it ${ext}writer append "[exec] (OO Writer) {${ext}writer}" 1722 find_it ${ext}calc append "[exec] (OO Calc) {${ext}calc}"
1722 find_it ${ext}impress append "[exec] (OO Impress) {${ext}impress}" 1723 find_it ${ext}writer append "[exec] (OO Writer) {${ext}writer}"
1723 find_it ${ext}draw append "[exec] (OO Draw) {${ext}draw}" 1724 find_it ${ext}web append "[exec] (OO Web) {${ext}web}"
1724 find_it ${ext}math append "[exec] (OO Math) {${ext}math}" 1725 find_it ${ext}impress append "[exec] (OO Impress) {${ext}impress}"
1725 find_it ${ext}padmin append "[exec] (OO Printer Admin) {${ext}padmin}" 1726 find_it ${ext}draw append "[exec] (OO Draw) {${ext}draw}"
1726 find_it mrproject append "[exec] (Mr.Project) {mrproject}" 1727 find_it ${ext}math append "[exec] (OO Math) {${ext}math}"
1728 find_it ${ext}fromtemplate append "[exec] (OO Templates) {${ext}fromtemplate}"
1729 find_it ${ext}padmin append "[exec] (OO Printer Admin) {${ext}padmin}"
1730 find_it mrproject append "[exec] (Mr.Project) {mrproject}"
1727 ) 1731 )
1728 done 1732 done
1729 1733
@@ -1845,7 +1849,7 @@ append_submenu "${FBSETTINGSMENU}"
1845 1849
1846 append "[workspaces] (${WORKSPACEMENU})" 1850 append "[workspaces] (${WORKSPACEMENU})"
1847 1851
1848 append_submenu ${TOOLS} 1852 append_submenu "${TOOLS}"
1849 normal_find fluxconf fluxkeys fluxmenu 1853 normal_find fluxconf fluxkeys fluxmenu
1850 find_it fbpanel append "[exec] (Fluxbox panel) {fbpanel}" 1854 find_it fbpanel append "[exec] (Fluxbox panel) {fbpanel}"
1851 # if gxmessage exitst use it; else use xmessage 1855 # if gxmessage exitst use it; else use xmessage
@@ -1858,12 +1862,12 @@ append_submenu "${FBSETTINGSMENU}"
1858 find_it ${LAUNCHER} append "[exec] (${RUNCOMMAND}) {${LAUNCHER} $FBRUNOPTIONS}" 1862 find_it ${LAUNCHER} append "[exec] (${RUNCOMMAND}) {${LAUNCHER} $FBRUNOPTIONS}"
1859 find_it switch append "[exec] (gtk-theme-switch) {switch}" 1863 find_it switch append "[exec] (gtk-theme-switch) {switch}"
1860 find_it switch2 append "[exec] (gtk2-theme-switch) {switch2}" 1864 find_it switch2 append "[exec] (gtk2-theme-switch) {switch2}"
1861 find_it fluxbox-generate_menu append "[exec] (${REGENERATEMENU}) {fluxbox-generate_menu}" 1865 find_it fluxbox-generate_menu append "[exec] (${REGENERATEMENU}) {fluxbox-generate_menu ${BACKUPOPTIONS}}"
1862 append_menu_end 1866 append_menu_end
1863 1867
1864 append_submenu ${WINDOWMANAGERS} 1868 append_submenu "${WINDOWMANAGERS}"
1865 #hard to properly maintain since there are so many exceptions to the rule. 1869 #hard to properly maintain since there are so many exceptions to the rule.
1866 for wm in icewm ion kde sawfish enlightenment fvwm openbox evilwm waimea xfce pekwm xfce4 fvwm2 blackbox ; do 1870 for wm in mwm twm wmii beryl compiz metacity icewm ion kde sawfish enlightenment fvwm openbox evilwm waimea xfce pekwm xfce4 fvwm2 blackbox ; do
1867 find_it start${wm} append "[restart] (${wm}) {start${wm}}" ||\ 1871 find_it start${wm} append "[restart] (${wm}) {start${wm}}" ||\
1868 find_it ${wm} append "[restart] (${wm}) {${wm}}" 1872 find_it ${wm} append "[restart] (${wm}) {${wm}}"
1869 done 1873 done