aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathias <mathias>2006-01-07 19:57:42 (GMT)
committermathias <mathias>2006-01-07 19:57:42 (GMT)
commitb7ddb0ca13278d7b5a3a45ef03fd394b9b387bf3 (patch)
treed9c0b3bea5078b82d0e5e5fb43f119c968515998
parent3d012e07a104f0f0e9c1ad242ef11916d0593205 (diff)
downloadfluxbox-b7ddb0ca13278d7b5a3a45ef03fd394b9b387bf3.zip
fluxbox-b7ddb0ca13278d7b5a3a45ef03fd394b9b387bf3.tar.bz2
* minor addons to fbgm, close Gentoo #74523 and #110677 (Mathias)
-rw-r--r--ChangeLog10
-rwxr-xr-xutil/fluxbox-generate_menu.in47
2 files changed, 38 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e692ec..3db3769 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.15: 2Changes for 0.9.15:
3*06/01/07:
4 * minor addons to fbgm, close Gentoo #74523 and #110677 (Mathias)
3*06/01/03: 5*06/01/03:
4 * Improved style loading 6 * Improved style loading
5 (Henrik) 7 (Henrik)
@@ -19,7 +21,7 @@ Changes for 0.9.15:
19 background.pixmap: <image filename> 21 background.pixmap: <image filename>
20 background.color: <color> 22 background.color: <color>
21 background.colorTo: <color> 23 background.colorTo: <color>
22 The background.pixmap filename will be sent to "fbsetbg" 24 The background.pixmap filename will be sent to "fbsetbg"
23 which in turn sets the background. 25 which in turn sets the background.
24 The following options will be available for the background.pixmap: 26 The following options will be available for the background.pixmap:
25 - tiled 27 - tiled
@@ -30,10 +32,10 @@ Changes for 0.9.15:
30 and it can also generate a normal texture: 32 and it can also generate a normal texture:
31 background: gradient 33 background: gradient
32 background.color: blue 34 background.color: blue
33 background.colorTo: green 35 background.colorTo: green
34 The rootCommand in the style is now obsolete and 36 The rootCommand in the style is now obsolete and
35 if the "background" item is not found in the style then the default 37 if the "background" item is not found in the style then the default
36 background will be black and with a warning text. 38 background will be black and with a warning text.
37 (Henrik) 39 (Henrik)
38 RootTheme.hh/cc, Screen.cc 40 RootTheme.hh/cc, Screen.cc
39*05/11/16: 41*05/11/16:
diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
index 4d85db9..de5d890 100755
--- a/util/fluxbox-generate_menu.in
+++ b/util/fluxbox-generate_menu.in
@@ -1534,7 +1534,7 @@ append_menu_end
1534 1534
1535append_submenu "${EDITORMENU}" 1535append_submenu "${EDITORMENU}"
1536 normal_find gvim bluefish nedit gedit xedit kword kwrite kate anjuta \ 1536 normal_find gvim bluefish nedit gedit xedit kword kwrite kate anjuta \
1537 wings xemacs emacs kvim cream evim scite 1537 wings xemacs emacs kvim cream evim scite Ted
1538 cli_find nano vim vi zile jed joe 1538 cli_find nano vim vi zile jed joe
1539 find_it emacs append "[exec] (emacs-nw) {${DEFAULT_TERM} -e emacs -nw}" 1539 find_it emacs append "[exec] (emacs-nw) {${DEFAULT_TERM} -e emacs -nw}"
1540 find_it xemacs append "[exec] (xemacs-nw) {${DEFAULT_TERM} -e xemacs -nw}" 1540 find_it xemacs append "[exec] (xemacs-nw) {${DEFAULT_TERM} -e xemacs -nw}"
@@ -1542,7 +1542,7 @@ append_menu_end
1542 1542
1543append_submenu "${EDUCATIONMENU}" 1543append_submenu "${EDUCATIONMENU}"
1544 normal_find celestia scilab geomview scigraphica oregano xcircuit electric \ 1544 normal_find celestia scilab geomview scigraphica oregano xcircuit electric \
1545 pymol chemtool xdrawchem 1545 pymol elem chemtool xdrawchem
1546 find_it R append "[exec] (R) {${DEFAULT_TERM} -e R --gui=gnome}" 1546 find_it R append "[exec] (R) {${DEFAULT_TERM} -e R --gui=gnome}"
1547 cli_find maxima grace yacas octave gnuplot grass coq acl 1547 cli_find maxima grace yacas octave gnuplot grass coq acl
1548append_menu_end 1548append_menu_end
@@ -1579,7 +1579,7 @@ append_submenu "${MULTIMEDIAMENU}"
1579 append_menu_end 1579 append_menu_end
1580 1580
1581 append_submenu "${XUTILSMENU}" 1581 append_submenu "${XUTILSMENU}"
1582 normal_find xfontsel xman xload xfigxbiff editres viewres xclock \ 1582 normal_find xfontsel xman xload xbiff editres viewres xclock \
1583 xmag wmagnify gkrellm gkrellm2 vmware portagemaster celestia 1583 xmag wmagnify gkrellm gkrellm2 vmware portagemaster celestia
1584 find_it xrdb append "[exec] (Reload .Xdefaults) {xrdb -load $HOME/.Xdefaults}" 1584 find_it xrdb append "[exec] (Reload .Xdefaults) {xrdb -load $HOME/.Xdefaults}"
1585 append_menu_end 1585 append_menu_end
@@ -1587,37 +1587,53 @@ append_menu_end
1587 1587
1588 1588
1589append_submenu "${OFFICEMENU}" 1589append_submenu "${OFFICEMENU}"
1590 normal_find xclock xcalc kcalc gv 1590 normal_find xclock xcalc kcalc grisbi qbankmanager
1591 find_it gcalc append "[exec] (gcalc) {gcalc}" || \ 1591 find_it gcalc append "[exec] (gcalc) {gcalc}" || \
1592 find_it gnome-calculator append "[exec] (gcalc) {gnome-calculator}" 1592 find_it gnome-calculator append "[exec] (gcalc) {gnome-calculator}"
1593 find_it ical append "[exec] (Calendar) {ical}"
1593 1594
1594 for ext in s o xo; do 1595 for ext in s o xo; do
1595 find_it ${ext}office append "[exec] (Open Office) {${ext}office}" 1596 find_it ${ext}office2 && (
1596 find_it ${ext}ocalc append "[exec] (OO Calc) {${ext}ocalc}" 1597 find_it ${ext}office2 append "[exec] (Open Office 2) {${ext}office2}"
1597 find_it ${ext}owriter append "[exec] (OO Writer) {${ext}owriter}" 1598 find_it ${ext}obase2 append "[exec] (OO Base 2) {${ext}obase2}"
1598 find_it ${ext}oimpress append "[exec] (OO Impress) {${ext}oimpress}" 1599 find_it ${ext}ocalc2 append "[exec] (OO Calc 2) {${ext}ocalc2}"
1599 find_it ${ext}odraw append "[exec] (OO Draw) {${ext}odraw}" 1600 find_it ${ext}owriter2 append "[exec] (OO Writer 2) {${ext}owriter2}"
1600 find_it ${ext}omath append "[exec] (OO Math) {${ext}omath}" 1601 find_it ${ext}oweb2 append "[exec] (OO Web 2) {${ext}oweb2}"
1601 find_it ${ext}opadmin append "[exec] (OO Printer Admin) {${ext}opadmin}" 1602 find_it ${ext}ohtml2 append "[exec] (OO HTML 2) {${ext}ohtml2}"
1602 find_it mrproject append "[exec] (Mr.Project) {mrproject}" 1603 find_it ${ext}oimpress2 append "[exec] (OO Impress 2) {${ext}oimpress2}"
1604 find_it ${ext}odraw2 append "[exec] (OO Draw 2) {${ext}odraw2}"
1605 find_it ${ext}omath2 append "[exec] (OO Math 2) {${ext}omath2}"
1606 find_it ${ext}ofromtemplate2 append "[exec] (OO Templates 2) {${ext}ofromtemplate2}"
1607 )
1608 find_it ${ext}office && (
1609 find_it ${ext}office append "[exec] (Open Office) {${ext}office}"
1610 find_it ${ext}ocalc append "[exec] (OO Calc) {${ext}ocalc}"
1611 find_it ${ext}owriter append "[exec] (OO Writer) {${ext}owriter}"
1612 find_it ${ext}oimpress append "[exec] (OO Impress) {${ext}oimpress}"
1613 find_it ${ext}odraw append "[exec] (OO Draw) {${ext}odraw}"
1614 find_it ${ext}omath append "[exec] (OO Math) {${ext}omath}"
1615 find_it ${ext}opadmin append "[exec] (OO Printer Admin) {${ext}opadmin}"
1616 find_it mrproject append "[exec] (Mr.Project) {mrproject}"
1617 )
1603 done 1618 done
1604 1619
1605 normal_find abiword kword wordperfect katoob acroread xpdf lyx 1620 normal_find abiword kword wordperfect katoob lyx acroread xpdf gv ghostview
1606 normal_find dia xfig 1621 normal_find dia xfig
1622 normal_find gnumeric
1607append_menu_end 1623append_menu_end
1608 1624
1609append_submenu "${GAMESMENU}" 1625append_submenu "${GAMESMENU}"
1610 normal_find bzflag gnibbles gnobots2 tuxpuck gataxx glines \ 1626 normal_find bzflag gnibbles gnobots2 tuxpuck gataxx glines \
1611 gnect mahjongg gnomine gnome-stones gnometris gnotravex \ 1627 gnect mahjongg gnomine gnome-stones gnometris gnotravex \
1612 gnotski iagno knights eboard xboard scid freecell pysol \ 1628 gnotski iagno knights eboard xboard scid freecell pysol \
1613 gtali tuxracer xpenguins xsnow xeyes xpenguins smclone \ 1629 gtali tuxracer xpenguins xsnow xeyes smclone \
1614 openmortal quake2 quake3 skoosh same-gnome enigma xbill \ 1630 openmortal quake2 quake3 skoosh same-gnome enigma xbill \
1615 icebreaker scorched3d sol dosbox black-box enigma freeciv \ 1631 icebreaker scorched3d sol dosbox black-box enigma freeciv \
1616 freeciv-server frozen-bubble liquidwar qt-nethack \ 1632 freeciv-server frozen-bubble liquidwar qt-nethack \
1617 nethack-gnome pathological scummvm xqf \ 1633 nethack-gnome pathological scummvm xqf \
1618 wesnoth canfeild ace_canfeild golf merlin chickens \ 1634 wesnoth canfeild ace_canfeild golf merlin chickens \
1619 supertux tuxdash neverball cube_client blackjack \ 1635 supertux tuxdash neverball cube_client blackjack \
1620 doom doom3 blackshades gltron kpoker 1636 doom doom3 quake4 blackshades gltron kpoker concentration torrent scramble
1621 cli_find gnugo 1637 cli_find gnugo
1622 1638
1623 find_it et append "[exec] (Enemy Territory) {et}" 1639 find_it et append "[exec] (Enemy Territory) {et}"
@@ -1704,6 +1720,7 @@ append_submenu "${FBSETTINGSMENU}"
1704 1720
1705 append_submenu ${TOOLS} 1721 append_submenu ${TOOLS}
1706 normal_find fluxconf fluxkeys fluxmenu 1722 normal_find fluxconf fluxkeys fluxmenu
1723 find_it fbpanel append "[exec] (Fluxbox panel) {fbpanel}"
1707 # if gxmessage exitst use it; else use xmessage 1724 # if gxmessage exitst use it; else use xmessage
1708 find_it gxmessage append \ 1725 find_it gxmessage append \
1709 "[exec] (${WINDOWNAME}) {xprop WM_CLASS|cut -d \\\" -f 2|gxmessage -file - -center}" || \ 1726 "[exec] (${WINDOWNAME}) {xprop WM_CLASS|cut -d \\\" -f 2|gxmessage -file - -center}" || \