aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimonb <simonb>2006-04-19 15:44:18 (GMT)
committersimonb <simonb>2006-04-19 15:44:18 (GMT)
commit4d5369221f7bc0b639a39012bb2268ad464936b3 (patch)
treed79eeda09677584c51ee97dbf3ef17b75abb2134
parente11743622381da90321d29b3da9ab70ef8b9a739 (diff)
downloadfluxbox_pavel-4d5369221f7bc0b639a39012bb2268ad464936b3.zip
fluxbox_pavel-4d5369221f7bc0b639a39012bb2268ad464936b3.tar.bz2
fbgm expansion - system utils menu
-rw-r--r--ChangeLog3
-rwxr-xr-xutil/fluxbox-generate_menu.in84
2 files changed, 56 insertions, 31 deletions
diff --git a/ChangeLog b/ChangeLog
index e521000..45ed7de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.16: 2Changes for 0.9.16:
3*06/04/19: 3*06/04/19:
4 * Add a bunch of apps to fluxbox-generate_menu, plus a new System
5 Tools menu (thanks Ku8aZ at users.sourceforge.net)
6 fluxbox-generate_menu.in
4 * Update Norwegian Bokml translation, nb_NO, sf.net patch #1393780 7 * Update Norwegian Bokml translation, nb_NO, sf.net patch #1393780
5 (Thanks Alexander N. Sornes, emptydoor at users.sourceforge.net) 8 (Thanks Alexander N. Sornes, emptydoor at users.sourceforge.net)
6 nls/nb_NO/Translation.m 9 nls/nb_NO/Translation.m
diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
index 6bf919e..5e7a16b 100755
--- a/util/fluxbox-generate_menu.in
+++ b/util/fluxbox-generate_menu.in
@@ -559,6 +559,7 @@ ABOUTITEM='About'
559BACKGROUNDMENU='Backgrounds' 559BACKGROUNDMENU='Backgrounds'
560BACKGROUNDMENUTITLE='Set the Background' 560BACKGROUNDMENUTITLE='Set the Background'
561BROWSERMENU='Browsers' 561BROWSERMENU='Browsers'
562BURNINGMENU='Burning'
562CONFIGUREMENU='Configure' 563CONFIGUREMENU='Configure'
563EDITORMENU='Editors' 564EDITORMENU='Editors'
564EDUCATIONMENU='Education' 565EDUCATIONMENU='Education'
@@ -585,6 +586,7 @@ RUNCOMMAND='Run'
585SCREENSHOT='Screenshot' 586SCREENSHOT='Screenshot'
586STYLEMENUTITLE='Choose a style...' 587STYLEMENUTITLE='Choose a style...'
587SYSTEMSTYLES='System Styles' 588SYSTEMSTYLES='System Styles'
589SYSTEMTOOLSMENU='System Tools'
588TERMINALMENU='Terminals' 590TERMINALMENU='Terminals'
589TOOLS='Tools' 591TOOLS='Tools'
590USERSTYLES='User Styles' 592USERSTYLES='User Styles'
@@ -644,6 +646,7 @@ case ${LC_ALL} in
644 BACKGROUNDMENU='Pozadí' 646 BACKGROUNDMENU='Pozadí'
645 BACKGROUNDMENUTITLE='Nastavení pozadí' 647 BACKGROUNDMENUTITLE='Nastavení pozadí'
646 BROWSERMENU='Prohlížeče' 648 BROWSERMENU='Prohlížeče'
649 BURNINGMENU='Vypalování'
647 CONFIGUREMENU='Konfigurace' 650 CONFIGUREMENU='Konfigurace'
648 EDITORMENU='Editory' 651 EDITORMENU='Editory'
649 EXITITEM='Ukončit' 652 EXITITEM='Ukončit'
@@ -668,6 +671,7 @@ case ${LC_ALL} in
668 RUNCOMMAND='Spustit program...' 671 RUNCOMMAND='Spustit program...'
669 SCREENSHOT='Screenshot' 672 SCREENSHOT='Screenshot'
670 STYLEMENUTITLE='Volba stylu...' 673 STYLEMENUTITLE='Volba stylu...'
674 SYSTEMTOOLSMENU='Systémové utility'
671 SYSTEMSTYLES='Systémové styly' 675 SYSTEMSTYLES='Systémové styly'
672 TERMINALMENU='Terminály' 676 TERMINALMENU='Terminály'
673 TOOLS='Nástroje' 677 TOOLS='Nástroje'
@@ -1470,7 +1474,7 @@ if find_it_options $MY_BROWSER; then
1470else 1474else
1471 [ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2 1475 [ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2
1472 #The precise order is up for debate. 1476 #The precise order is up for debate.
1473 for browser in firefox mozilla-firefox mozilla-firebird MozillaFirebird opera skipstone mozilla galeon konqueror dillo netscape w3m links lynx; do 1477 for browser in firefox mozilla-firefox mozilla-firebird MozillaFirebird opera skipstone mozilla galeon konqueror dillo netscape w3m amaya links lynx; do
1474 if find_it $browser; then 1478 if find_it $browser; then
1475 DEFAULT_BROWSER=$browser 1479 DEFAULT_BROWSER=$browser
1476 break 1480 break
@@ -1508,7 +1512,7 @@ append "[exec] (${DEFAULT_TERMNAME}) {${DEFAULT_TERM}}"
1508 1512
1509case "$DEFAULT_BROWSERNAME" in 1513case "$DEFAULT_BROWSERNAME" in
1510 links|w3m|lynx) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;; 1514 links|w3m|lynx) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;;
1511 firefox|firebird|mozilla|phoenix|galeon|dillo|netscape) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;; 1515 firefox|firebird|mozilla|phoenix|galeon|dillo|netscape|amaya) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;
1512 konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;; 1516 konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;;
1513 opera) append "[exec] (opera) {env QT_XFT=true opera}" ;; 1517 opera) append "[exec] (opera) {env QT_XFT=true opera}" ;;
1514 MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;; 1518 MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;;
@@ -1537,7 +1541,8 @@ append_submenu "${NETMENU}"
1537 append_menu_end 1541 append_menu_end
1538 1542
1539 append_submenu IM 1543 append_submenu IM
1540 normal_find gaim kopete gnomemeeting sim kadu psi amsn 1544 normal_find gaim kopete gnomemeeting sim kadu psi amsn aim ayttm everyb
1545uddy gabber ymessenger
1541 find_it licq append "[exec] (licq) {env QT_XFT=true licq}" 1546 find_it licq append "[exec] (licq) {env QT_XFT=true licq}"
1542 cli_find centericq micq 1547 cli_find centericq micq
1543 append_menu_end 1548 append_menu_end
@@ -1549,7 +1554,7 @@ append_submenu "${NETMENU}"
1549 append_menu_end 1554 append_menu_end
1550 1555
1551 append_submenu News 1556 append_submenu News
1552 normal_find liferea pears 1557 normal_find liferea pears pan
1553 cli_find slrn tin 1558 cli_find slrn tin
1554 append_menu_end 1559 append_menu_end
1555 1560
@@ -1568,11 +1573,11 @@ append_submenu "${NETMENU}"
1568 append_menu_end 1573 append_menu_end
1569 1574
1570 append_submenu ftp 1575 append_submenu ftp
1571 normal_find gftp IglooFTP-PRO 1576 normal_find gftp IglooFTP-PRO kbear
1572 cli_find ncftp pftp ftp lftp yafc 1577 cli_find ncftp pftp ftp lftp yafc
1573 append_menu_end 1578 append_menu_end
1574 1579
1575 normal_find pan xnmap skype x3270 1580 normal_find xnmap skype x3270
1576 1581
1577append_menu_end 1582append_menu_end
1578 1583
@@ -1593,7 +1598,7 @@ append_menu_end
1593 1598
1594append_submenu "${FILEUTILSMENU}" 1599append_submenu "${FILEUTILSMENU}"
1595 find_it konqueror append "[exec] (konqueror) {kfmclient openProfile filemanagement}" 1600 find_it konqueror append "[exec] (konqueror) {kfmclient openProfile filemanagement}"
1596 normal_find gentoo krusader kcommander linuxcmd rox tuxcmd krename xfe xplore 1601 normal_find gentoo krusader kcommander linuxcmd rox tuxcmd krename xfe xplore worker endeavour2 evidence
1597 find_it nautilus append "[exec] (nautilus) {nautilus --no-desktop --browser}" 1602 find_it nautilus append "[exec] (nautilus) {nautilus --no-desktop --browser}"
1598 cli_find mc 1603 cli_find mc
1599append_menu_end 1604append_menu_end
@@ -1631,32 +1636,33 @@ append_menu_end
1631 1636
1632 1637
1633append_submenu "${OFFICEMENU}" 1638append_submenu "${OFFICEMENU}"
1634 normal_find xclock xcalc kcalc grisbi qbankmanager 1639 normal_find xclock xcalc kcalc grisbi qbankmanager evolution
1635 find_it gcalc append "[exec] (gcalc) {gcalc}" || \ 1640 find_it gcalc append "[exec] (gcalc) {gcalc}" || \
1636 find_it gnome-calculator append "[exec] (gcalc) {gnome-calculator}" 1641 find_it gnome-calculator append "[exec] (gcalc) {gnome-calculator}"
1637 find_it ical append "[exec] (Calendar) {ical}" 1642 find_it ical append "[exec] (Calendar) {ical}"
1638 1643
1639 for ext in s o xo; do 1644 # older <=1.1.3 apparently have stuff like swriter, not sowriter
1640 find_it ${ext}office2 && ( 1645 for ext in s so oo xoo; do
1641 find_it ${ext}office2 append "[exec] (Open Office 2) {${ext}office2}" 1646 find_it ${ext}ffice2 && (
1642 find_it ${ext}obase2 append "[exec] (OO Base 2) {${ext}obase2}" 1647 find_it ${ext}ffice2 append "[exec] (Open Office 2) {${ext}ffice2}"
1643 find_it ${ext}ocalc2 append "[exec] (OO Calc 2) {${ext}ocalc2}" 1648 find_it ${ext}base2 append "[exec] (OO Base 2) {${ext}base2}"
1644 find_it ${ext}owriter2 append "[exec] (OO Writer 2) {${ext}owriter2}" 1649 find_it ${ext}calc2 append "[exec] (OO Calc 2) {${ext}calc2}"
1645 find_it ${ext}oweb2 append "[exec] (OO Web 2) {${ext}oweb2}" 1650 find_it ${ext}writer2 append "[exec] (OO Writer 2) {${ext}writer2}"
1646 find_it ${ext}ohtml2 append "[exec] (OO HTML 2) {${ext}ohtml2}" 1651 find_it ${ext}web2 append "[exec] (OO Web 2) {${ext}web2}"
1647 find_it ${ext}oimpress2 append "[exec] (OO Impress 2) {${ext}oimpress2}" 1652 find_it ${ext}html2 append "[exec] (OO HTML 2) {${ext}html2}"
1648 find_it ${ext}odraw2 append "[exec] (OO Draw 2) {${ext}odraw2}" 1653 find_it ${ext}impress2 append "[exec] (OO Impress 2) {${ext}impress2}"
1649 find_it ${ext}omath2 append "[exec] (OO Math 2) {${ext}omath2}" 1654 find_it ${ext}draw2 append "[exec] (OO Draw 2) {${ext}draw2}"
1650 find_it ${ext}ofromtemplate2 append "[exec] (OO Templates 2) {${ext}ofromtemplate2}" 1655 find_it ${ext}math2 append "[exec] (OO Math 2) {${ext}math2}"
1656 find_it ${ext}fromtemplate2 append "[exec] (OO Templates 2) {${ext}fromtemplate2}"
1651 ) 1657 )
1652 find_it ${ext}office && ( 1658 find_it ${ext}ffice && (
1653 find_it ${ext}office append "[exec] (Open Office) {${ext}office}" 1659 find_it ${ext}ffice append "[exec] (Open Office) {${ext}ffice}"
1654 find_it ${ext}ocalc append "[exec] (OO Calc) {${ext}ocalc}" 1660 find_it ${ext}calc append "[exec] (OO Calc) {${ext}calc}"
1655 find_it ${ext}owriter append "[exec] (OO Writer) {${ext}owriter}" 1661 find_it ${ext}writer append "[exec] (OO Writer) {${ext}writer}"
1656 find_it ${ext}oimpress append "[exec] (OO Impress) {${ext}oimpress}" 1662 find_it ${ext}impress append "[exec] (OO Impress) {${ext}impress}"
1657 find_it ${ext}odraw append "[exec] (OO Draw) {${ext}odraw}" 1663 find_it ${ext}draw append "[exec] (OO Draw) {${ext}draw}"
1658 find_it ${ext}omath append "[exec] (OO Math) {${ext}omath}" 1664 find_it ${ext}math append "[exec] (OO Math) {${ext}math}"
1659 find_it ${ext}opadmin append "[exec] (OO Printer Admin) {${ext}opadmin}" 1665 find_it ${ext}padmin append "[exec] (OO Printer Admin) {${ext}padmin}"
1660 find_it mrproject append "[exec] (Mr.Project) {mrproject}" 1666 find_it mrproject append "[exec] (Mr.Project) {mrproject}"
1661 ) 1667 )
1662 done 1668 done
@@ -1672,12 +1678,12 @@ append_submenu "${GAMESMENU}"
1672 gnotski iagno knights eboard xboard scid freecell pysol \ 1678 gnotski iagno knights eboard xboard scid freecell pysol \
1673 gtali tuxracer xpenguins xsnow xeyes smclone \ 1679 gtali tuxracer xpenguins xsnow xeyes smclone \
1674 openmortal quake2 quake3 skoosh same-gnome enigma xbill \ 1680 openmortal quake2 quake3 skoosh same-gnome enigma xbill \
1675 icebreaker scorched3d sol dosbox black-box enigma freeciv \ 1681 icebreaker scorched3d sol dosbox black-box freeciv \
1676 freeciv-server frozen-bubble liquidwar qt-nethack \ 1682 freeciv-server frozen-bubble liquidwar qt-nethack \
1677 nethack-gnome pathological scummvm xqf \ 1683 nethack-gnome pathological scummvm xqf \
1678 wesnoth canfeild ace_canfeild golf merlin chickens \ 1684 wesnoth canfeild ace_canfeild golf merlin chickens \
1679 supertux tuxdash neverball cube_client blackjack \ 1685 supertux tuxdash neverball cube_client blackjack \
1680 doom doom3 quake4 blackshades gltron kpoker concentration torrent scramble 1686 doom doom3 quake4 blackshades gltron kpoker concentration torrent scramble kiki
1681 cli_find gnugo 1687 cli_find gnugo
1682 1688
1683 find_it et append "[exec] (Enemy Territory) {et}" 1689 find_it et append "[exec] (Enemy Territory) {et}"
@@ -1686,6 +1692,22 @@ append_submenu "${GAMESMENU}"
1686 find_it ut2004 append "[exec] (Unreal Tournament 2004) {ut2004}" 1692 find_it ut2004 append "[exec] (Unreal Tournament 2004) {ut2004}"
1687append_menu_end 1693append_menu_end
1688 1694
1695append_submenu "${SYSTEMTOOLSMENU}"
1696 append_submenu "${BURNINGMENU}"
1697 normal_find k3b cdbakeoven graveman xcdroast arson eroaster gcombust \
1698 gtoaster kiso kover gtkcdlabel kcdlabel cdw cdlabelgen
1699 clifind mp3burn cdrx burncenter
1700 append_menu_end
1701
1702 normal_find firestarter gtk-lshw gproftd gpureftpd guitoo porthole gtk-iptables \
1703 gtk-cpuspeedy
1704 find_it fireglcontrol append "[exec] (ATI Config) {fireglcontrol}"
1705 clifind top
1706append_menu_end
1707
1708
1709
1710
1689# We'll only use this once 1711# We'll only use this once
1690ETCAPPLNK=/etc/X11/applnk 1712ETCAPPLNK=/etc/X11/applnk
1691PARSING_DESKTOP="true" 1713PARSING_DESKTOP="true"
@@ -1780,7 +1802,7 @@ append_submenu "${FBSETTINGSMENU}"
1780 1802
1781 append_submenu ${WINDOWMANAGERS} 1803 append_submenu ${WINDOWMANAGERS}
1782 #hard to properly maintain since there are so many exceptions to the rule. 1804 #hard to properly maintain since there are so many exceptions to the rule.
1783 for wm in icewm ion kde sawfish enlightenment fvwm openbox evilwm waimea xfce pekwm; do 1805 for wm in icewm ion kde sawfish enlightenment fvwm openbox evilwm waimea xfce pekwm xfce4 fvwm2 blackbox ; do
1784 find_it start${wm} append "[restart] (${wm}) {start${wm}}" ||\ 1806 find_it start${wm} append "[restart] (${wm}) {start${wm}}" ||\
1785 find_it ${wm} append "[restart] (${wm}) {${wm}}" 1807 find_it ${wm} append "[restart] (${wm}) {${wm}}"
1786 done 1808 done