aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-07-29 09:29:45 (GMT)
committerfluxgen <fluxgen>2003-07-29 09:29:45 (GMT)
commitc9168c884be4e740c771d26322ee9936eeb1ec5a (patch)
treea52ee6b193b3c33b977de45d4e7a49530aad5c45
parent7394ce39c859483c57c8964367c822e1eb128c9b (diff)
downloadfluxbox-c9168c884be4e740c771d26322ee9936eeb1ec5a.zip
fluxbox-c9168c884be4e740c771d26322ee9936eeb1ec5a.tar.bz2
update from Han
-rw-r--r--util/fbsetbg22
-rwxr-xr-xutil/fluxbox-generate_menu7
2 files changed, 15 insertions, 14 deletions
diff --git a/util/fbsetbg b/util/fbsetbg
index 9a22cab..0fe7956 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.12 2003/07/20 11:23:51 rathnor Exp $ 26# $Id: fbsetbg,v 1.13 2003/07/29 09:29:45 fluxgen Exp $
27 27
28# 28#
29# Portability notes: 29# Portability notes:
@@ -154,9 +154,9 @@ case $WPSETTER in
154 debugstory="chbg is a nice app. You won't have any problems." 154 debugstory="chbg is a nice app. You won't have any problems."
155 ;; 155 ;;
156 xsri) 156 xsri)
157 full='--center-x --center-y --scale-width=100 --scale-width=100' 157 full='--center-x --center-y --scale-width=100 --scale-width=100'
158 tile='--tile' 158 tile='--tile'
159 center='--center-x --center-y' 159 center='--center-x --center-y'
160 aspect=$full 160 aspect=$full
161 debugstory="This is a RedHat specific app. I can't find docs about it." 161 debugstory="This is a RedHat specific app. I can't find docs about it."
162 ;; 162 ;;
@@ -182,17 +182,17 @@ case $WPSETTER in
182 debugstory="wmsetbg is a nice app. You won't have any problems." 182 debugstory="wmsetbg is a nice app. You won't have any problems."
183 ;; 183 ;;
184 xsetbg) 184 xsetbg)
185 tile='-border black' 185 tile='-border black'
186 center='-center -border black' 186 center='-center -border black'
187 aspect='-fullscreen -border black' 187 aspect='-fullscreen -border black'
188 full=$aspect #broken 188 full=$aspect #broken
189 debugstory="xsetbg is actually xli. The fillscreen option (-f) is broken, defaults to (-a). $standardrant" 189 debugstory="xsetbg is actually xli. The fillscreen option (-f) is broken, defaults to (-a). $standardrant"
190 ;; 190 ;;
191 xli) 191 xli)
192 tile='-onroot -quiet -border black' 192 tile='-onroot -quiet -border black'
193 center='-center -onroot -quiet -border black' 193 center='-center -onroot -quiet -border black'
194 aspect='-fullscreen -onroot -quiet -border black' 194 aspect='-fullscreen -onroot -quiet -border black'
195 full=$aspect #broken 195 full=$aspect #broken
196 debugstory='The fillscreen option (-f) is broken, defaults to (-a). $standardrant' 196 debugstory='The fillscreen option (-f) is broken, defaults to (-a). $standardrant'
197 ;; 197 ;;
198 qiv) 198 qiv)
diff --git a/util/fluxbox-generate_menu b/util/fluxbox-generate_menu
index 2e7ce88..7ba20dc 100755
--- a/util/fluxbox-generate_menu
+++ b/util/fluxbox-generate_menu
@@ -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,v 1.40 2003/07/17 23:39:34 rathnor Exp $ 25# $Id: fluxbox-generate_menu,v 1.41 2003/07/29 09:29:45 fluxgen Exp $
26 26
27# 27#
28# Portability notes: 28# Portability notes:
@@ -787,8 +787,9 @@ append_submenu "${MULTIMEDIAMENU}"
787 append_menu_end 787 append_menu_end
788 788
789 append_submenu "${MUSICMENU}" 789 append_submenu "${MUSICMENU}"
790 normal_find xmms noatun alsaplayer gqmpeg aumix xmixer gmix kmix grecord \ 790 normal_find xmms noatun alsaplayer gqmpeg aumix xmixer gmix kmix kscd \
791 kmidi xplaycd soundtracker grip easytag audacity zinf rhythmbox 791 grecord kmidi xplaycd soundtracker grip easytag audacity \
792 zinf rhythmbox
792 find_it cdcd append "[exec] (cdcd) {${DEFAULT_TERM} -e cdcd}" 793 find_it cdcd append "[exec] (cdcd) {${DEFAULT_TERM} -e cdcd}"
793 find_it cplay append "[exec] (cplay) {${DEFAULT_TERM} -e cplay}" 794 find_it cplay append "[exec] (cplay) {${DEFAULT_TERM} -e cplay}"
794 find_it alsamixer append "[exec] (AlsaMixer) {${DEFAULT_TERM} -e alsamixer}" 795 find_it alsamixer append "[exec] (AlsaMixer) {${DEFAULT_TERM} -e alsamixer}"