Menu
▾
▴
[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[805] fvwm/components/functions
|
From: <dom...@us...> - 2015-12-03 15:06:21
|
Revision: 805
http://sourceforge.net/p/fvwm-crystal/code/805
Author: dominique_libre
Date: 2015-12-03 15:06:19 +0000 (Thu, 03 Dec 2015)
Log Message:
-----------
Alwin: fix some MPD volume issues and small things
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/About
fvwm/components/functions/Mixer
fvwm/components/functions/Music-mpd
fvwm/components/functions/Preferences-Menu
Modified: ChangeLog
===================================================================
--- ChangeLog 2015-12-02 14:40:38 UTC (rev 804)
+++ ChangeLog 2015-12-03 15:06:19 UTC (rev 805)
@@ -3,6 +3,14 @@
Version 3.4.0
-------------
+Jeudi 3 décembre 2015
+ functions/About: repair 2 names and shortcut that was used 2 times; by Alwin.
+ functions/Mixer: make MPD volume to appear; convert from float to int for 'mpc volume';
+ double the 1.5 dB value, as 3% is approximately 1.5 dB for MPC; patch by Alwin.
+ functions/Music-mpd: make volume label to appear only 1 time - Alwin.
+ functions/Preferences-Menu: show only 1 menu separator when rox and nautilus are not
+ installed. patch by Alwin.
+
Mercredi 2 décembre 2015
recipes/*: Crystal button: replace outdated random wallpaper function by new menu;
add a menu on button3.
Modified: fvwm/components/functions/About
===================================================================
--- fvwm/components/functions/About 2015-12-02 14:40:38 UTC (rev 804)
+++ fvwm/components/functions/About 2015-12-03 15:06:19 UTC (rev 805)
@@ -12,7 +12,7 @@
*About: Line center
*About: Text "Dominique Michel <dom...@us...>"
*About: Line center
-*About: Text "$[gt.With contributions from:] Rafa Bisingier <ra...@ma...>"
+*About: Text "$[gt.With contributions from:] Rafal Bisingier <ra...@ma...>"
*About: Line center
*About: Text "Dominik Tomasik <d.t...@ga...>"
*About: Line center
@@ -24,7 +24,7 @@
*About: Line center
*About: Text "Daniel da Silva <da...@me...>"
*About: Line center
-*About: Text "Ber the BlackDragon Geens <be...@la...>"
+*About: Text "Bert \'theBlackDragon\' Geens <be...@la...>"
*About: Line center
*About: Text "$[gt.The majority of the icons are from the Tango project and from]"
*About: Line center
@@ -39,7 +39,7 @@
*About: Line center
*About: Line center
*About: Line center
-*About: Button quit " $[gt.Feedback, support] " ^[
+*About: Button quit " $[gt.Feedback, support] " ^M
*About: Command Module FvwmForm UserFeedback-Dialog
*About: Button quit " $[gt.Close] " ^[
*About: Command Nop
Modified: fvwm/components/functions/Mixer
===================================================================
--- fvwm/components/functions/Mixer 2015-12-02 14:40:38 UTC (rev 804)
+++ fvwm/components/functions/Mixer 2015-12-03 15:06:19 UTC (rev 805)
@@ -50,7 +50,7 @@
PipeRead "if [ $[infostore.Mixer] = amixer ] ; then NVolControl=`amixer -c $[infostore.SoundCard] get Master \ 2>/dev/null | grep Master -c`; echo InfoStoreAdd VolControl `if [ $NVolControl = 0 ]; then echo PCM; else echo Master; fi`; fi"
# Set SnddB: >0 = control in dB
-PipeRead "if [ $[infostore.Mixer] = amixer ] ; then echo InfoStoreAdd SnddB `amixer -c $[infostore.SoundCard] get $[infostore.VolControl] \| grep dB -c` \
+PipeRead "if [ $[infostore.Mixer] = amixer ] ; then echo InfoStoreAdd SnddB `amixer -c $[infostore.SoundCard] get $[infostore.VolControl] \| grep dB -c` ; \\
else echo InfoStoreAdd SnddB 0 ; fi"
# aumix {{{2
@@ -93,7 +93,7 @@
audacious) exec audtool set-volume +$[0] ;; \\
cdcd) echo Nop ;; \\
cmus) exec cmus-remote --volume +$[0]% > /dev/null ;; \\
- mpd) exec mpc volume +$[0] > /dev/null ;; \\
+ mpd) exec mpc volume +`echo "($[0]*2+0.5)/1" | bc` > /dev/null ;; \\
quodlibet) exec quodlibet --volume-up > /dev/null ;; \\
xmms2) echo Nop ;; \\
*) echo Nop ;; \\
@@ -111,7 +111,7 @@
audacious) exec audtool set-volume -$[0] ;; \\
cdcd) echo Nop ;; \\
cmus) exec cmus-remote --volume -$[0]% > /dev/null ;; \\
- mpd) exec mpc volume -$[0] > /dev/null ;; \\
+ mpd) exec mpc volume -`echo "($[0]*2+0.5)/1" | bc` > /dev/null ;; \\
quodlibet) exec quodlibet --volume-down > /dev/null ;; \\
xmms2) echo Nop ;; \\
*) echo Nop ;; \\
Modified: fvwm/components/functions/Music-mpd
===================================================================
--- fvwm/components/functions/Music-mpd 2015-12-02 14:40:38 UTC (rev 804)
+++ fvwm/components/functions/Music-mpd 2015-12-03 15:06:19 UTC (rev 805)
@@ -174,7 +174,7 @@
+ I AddToMenu /Music '$[gt.Seek &forward]' Exec mpc seek +7% > /dev/null
+ I AddToMenu /Music '$[gt.Seek &backward]' Exec mpc seek -7% > /dev/null
+ I PipeRead 'mpc crossfade | sed -e "s/crossfade:\ //" | sed -e "s:^.\\+$:AddToMenu\ /Music \'$[gt.Crossfade] \(&\)\' Popup /Music/Crossfade:"'
-+ I PipeRead 'mpc volume | sed -e "s/volume:\ //" | sed -e "s:%:%%:" | sed -e "s:[ \t]::g" | sed -e "s:^.\\+$:AddToMenu\ /Music \'$[gt.Volume] \(&\)\' Popup /Mixer:"'
++ I PipeRead 'mpc volume | sed -e "s/volume://" | sed -e "s:%:%%:" | sed -e "s:[ \t]::g" | sed -e "s:^.\\+$:AddToMenu\ /Music \'$[gt.Volume] \(&\)\' Popup /Mixer:"'
+ I AddToMenu /Music '$[gt.Toggle random]' Music-ToggleRandom
+ I AddToMenu /Music '$[gt.Toggle repeat]' Exec mpc repeat
# Function below doesn't work for me (harnir), if it does for you, conatct me
Modified: fvwm/components/functions/Preferences-Menu
===================================================================
--- fvwm/components/functions/Preferences-Menu 2015-12-02 14:40:38 UTC (rev 804)
+++ fvwm/components/functions/Preferences-Menu 2015-12-03 15:06:19 UTC (rev 805)
@@ -250,7 +250,8 @@
AddToMenu /Preferences/DesktopManager
+ '%22x22/fvwm-crystal/Off.png%$[gt.None]' TestDesktopManager-None
+ '%22x22/fvwm-crystal/fvwm-crystal.png%FVWM-Crystal' TestDesktopManager-Crystal
-+ "" Nop
+Test (x rox) + "" Nop
+Test (!x rox,x nautilus) + "" Nop
Test (x rox) + '%22x22/apps/rox.png%ROX-Filer' ActivateDesktopManager-ROX
Test (x nautilus) + '%22x22/apps/nautilus.png%Nautilus' ActivateDesktopManager-Nautilus
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
