[Antiright-devel] antiright/src ACE

[Jeffrey Bedard]

CVSROOT:        /cvsroot/antiright
Module name:    antiright
Branch:         
Changes by:     Jeffrey Bedard <address@hidden> 05/07/07 04:16:53

Modified files:
        src            : ACE 

Log message:
        Updated to use new icon set.  Fixed CD player.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/ACE.diff?tr1=1.46&tr2=1.47&r1=text&r2=text

Patches:
Index: antiright/src/ACE
diff -u antiright/src/ACE:1.46 antiright/src/ACE:1.47
--- antiright/src/ACE:1.46      Mon Jul  4 02:47:24 2005
+++ antiright/src/ACE   Thu Jul  7 04:16:53 2005
@@ -81,7 +81,7 @@
        'ACE Load_Meter'\
        'ACE Terminal'\
        'ACE Browser'\
-       'ACE Image_Editor'\
+       'ACE Imager'\
        'ACE Mail'\
        'ACE Background'\
        'ACE -A Settings'\
@@ -103,13 +103,25 @@
        fi
        mp3player="$(ACE -r mp3_player)"
        mp3dir="$(ACE -r mp3_dir)"
-       stop_play="killall $mp3player; rm -f ~/.antiright_mp3s;\
- ACE -A create_fake_song_file"
-       play_next="killall $mp3player; $mp3player -Z $mp3dir/*.mp3\
- 2>> ~/.antiright_mp3s"
-       killjukebox="ACE -A KillJuke"
 }
-
+Play_Next()
+{
+    Setup_Juke_Environment
+    echo $mp3player $mp3dir
+    killall $mp3player
+    echo "#!/bin/sh" > /tmp/ACE.$$
+    echo "$mp3player -Z $mp3dir/*.mp3 2>> ~/.antiright_mp3s" >> /tmp/ACE.$$
+    chmod +x /tmp/ACE.$$
+    /tmp/ACE.$$
+    rm -f /tmp/ACE.$$
+}
+Stop()
+{
+    Setup_Juke_Environment
+    killall $mp3player
+    rm -f ~/.antiright_mp3s;
+    ACE -A create_fake_song_file
+}
 create_fake_song_file()
 {
        echo 'Playing MPEG stream from http://www.nongnu.org/antiright'\
@@ -147,6 +159,16 @@
     echo Playing '-{' $(Juke_Song) '}-     '
 }
 
+Pause()
+{
+    killall -SIGSTOP mpg123
+}
+
+Resume()
+{
+    killall -SIGCONT mpg123
+}
+
 Next_Song()
 {
     killall -SIGINT mpg123 1> /dev/null 2> /dev/null
@@ -174,32 +196,39 @@
 {
     Setup_Juke_Environment
     create_fake_song_file
+    echo '#!/bin/sh' > /tmp/ACE.$$
     arbmdir=$bmdir/antiright
-    $ARSHELL -W DESKTOP -Ac\
-       -UL 'ACE -A Juke_Song'\
-       -r 4\
-       "$play_next \# Play" 'ACE Lock'\
-       -Ai 'ACE Note' $arbmdir/knotes.xpm\
-       -Ai 'ACE Calculator' $arbmdir/kcalc.xpm\
-       "$stop_play \# Stop" 'ACE A.C.E.'\
-       -Ai 'ACE File_Manager' $arbmdir/kfm.xpm\
-       -Ai 'ACE -A File_System_Panel File_Systems' $arbmdir/fileserver.xpm\
-       'vdesk 1' 'vdesk 2'\
-       -Ai 'ACE Terminal' $arbmdir/term.xpm\
-       -Ai 'ACE Load_Meter' $arbmdir/ksysguard.xpm\
-       'vdesk 3' 'vdesk 4'\
-       -Ai 'ACE Editor' $arbmdir/kedit.xpm\
-       -Ai 'ACE Browser' $arbmdir/www.xpm\
-       'vdesk 5' 'vdesk 6'\
-       -Ai 'ACE Background' $arbmdir/kcoloredit.xpm\
-       -Ai 'ACE Mail' $arbmdir/mail.xpm\
-       'ACE Cal' 'ACE Run' \
-       -Ai 'ACE -A Settings' $arbmdir/tools.xpm\
-       -Ai 'ACE CD_Player' $arbmdir/kscd.xpm\
-       -geometry +0+0\
-       -xrm '*marginHeight: 0' -xrm '*marginWidth: 0' -xrm '*spacing: 0'\
-       -xrm '*XmPushButton.marginWidth: 2' \
-       -xrm 'AntiRight.borderWidth: 1' -xrm "*overrideRedirect: True" -l &
+ 
+    POSITION="$(ACE desker_position)"
+    if [ "$POSITION" = "upper_left" ]; then
+       GEOMETRY="+0+0"
+    elif [ "$POSITION" = "upper_right" ]; then
+       GEOMETRY="-0+0"
+    elif [ "$POSITION" = "lower_left" ]; then
+       GEOMETRY="+0-0"
+    elif [ "$POSITION" = "lower_right" ]; then
+       GEOMETRY="-0-0"
+    else
+       GEOMETRY="+0+0"
+    fi
+    #FIXME: Redo to be one command section at a time.  this is a pain in the 
ass
+    echo  "$ARSHELL -W DESKTOP\\" >> /tmp/ACE.$$ 
+    if [ "$(ACE is_clocked)" = "1" ]; then
+       echo " -Ac\\" >> /tmp/ACE.$$
+    fi
+    echo " -UL 'ACE -A Juke_Song' -r 4 'ACE -A Play_Next \# Play' 'ACE Lock' 
-Ai 'ACE Note' $arbmdir/sticky.xpm -Ai 'ACE Calculator' $arbmdir/calculator.xpm 
'ACE -A Stop' 'ACE A.C.E.' -Ai 'ACE File_Manager' $arbmdir/folder.xpm -Ai 'ACE 
-A File_System_Panel File_Systems' $arbmdir/disk.xpm\\" >> /tmp/ACE.$$ 
+
+    PAGED=$(ACE is_paged)
+    if [ "$PAGED" = "1" ]; then
+       echo " 'vdesk 1' 'vdesk 2' -Ai 'ACE Terminal' $arbmdir/terminal.xpm -Ai 
'ACE Load_Meter' $arbmdir/meter.xpm 'vdesk 3' 'vdesk 4' -Ai 'ACE Editor' 
"'$arbmdir/text_editor.xpm'" -Ai 'ACE Browser' $arbmdir/www.xpm 'ACE -A Alarm' 
'ACE -A killdesk # Close' -Ai 'ACE Background' $arbmdir/palate.xpm -Ai 'ACE 
Mail' $arbmdir/mail.xpm\\" >> /tmp/ACE.$$
+    else
+       echo " 'ACE -A Pause' 'ACE -A Resume' -Ai 'ACE Terminal' 
$arbmdir/terminal.xpm -Ai 'ACE Load_Meter' $arbmdir/meter.xpm 'afract & # 
Fractals' 'pongr & # PONGr' -Ai 'ACE Editor' $arbmdir/text_editor.xpm -Ai 'ACE 
Browser' $arbmdir/www.xpm 'ACE -A Alarm' 'ACE -A killdesk Close' -Ai 'ACE 
Background' $arbmdir/palate.xpm -Ai 'ACE Mail' $arbmdir/mail.xpm\\" >> 
/tmp/ACE.$$
+    fi
+    echo " 'ACE Cal' 'ACE Run' -Ai 'ACE -A Settings' $arbmdir/settings.xpm -Ai 
'ACE CD_Player' $arbmdir/music.xpm -geometry $GEOMETRY -xrm '*marginHeight: 0' 
-xrm '*marginWidth: 0' -xrm '*spacing: 0' -xrm '*XmPushButton.marginWidth: 2'  
-xrm 'AntiRight.borderWidth: 1' -xrm '*overrideRedirect: True' -l &" >> 
/tmp/ACE.$$
+    chmod +x /tmp/ACE.$$
+    /tmp/ACE.$$
+    rm -f /tmp/ACE.$$
+
 }
 return_pseudorandom_color()
 {
@@ -320,9 +349,9 @@
 }
 Select_CD_Track()
 {
-    local tracks=$(arcd -T)
-    if [ $tracks -gt 0 ]; then
-       track=$($ARSHELL -W 'Select Track' -ADp "Track: [1-$tracks]")
+    local tracks_number=$(arcd -T)
+    if [ $tracks_number -gt 0 ]; then
+       track=$($ARSHELL -W 'Select Track' -ADp "Track: [1-$tracks_number]")
        track_after_zero="[ $track -gt 0 ]"
        track_before_last="[ $track -le $tracks_number ]"
        if $track_after_zero && $track_before_last; then