[Antiright-devel] antiright/src ACE

[Jeffrey Bedard]

CVSROOT:        /cvsroot/antiright
Module name:    antiright
Branch:         
Changes by:     Jeffrey Bedard <address@hidden> 04/11/21 21:46:37

Modified files:
        src            : ACE 

Log message:
        Fixed alarm so that it does not request a command if a time isnt 
specified.

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

Patches:
Index: antiright/src/ACE
diff -u antiright/src/ACE:1.25 antiright/src/ACE:1.26
--- antiright/src/ACE:1.25      Fri Nov 12 20:14:27 2004
+++ antiright/src/ACE   Sun Nov 21 21:46:36 2004
@@ -138,22 +138,34 @@
        -geometry +32+64 -xrm "*highlightThickness: 0"\
        -xrm "*alignment: XmALIGNMENT_CENTER" -t &
 }
-Sticky_Note()
+return_pseudorandom_color()
 {
-    local background
     local ones=$(date +%S | cut -c 2)
-    background=$(\
-       if [ $ones -lt 2 ];\
-       then echo -n skyblue;\
-       elif [ $ones -lt 4 ];\
-       then echo -n pink;\
-       elif [ $ones -lt 6 ];\
-       then echo -n lightgreen;\
-       elif [ $ones -lt 8 ];\
-       then echo -n yellow;\
-       elif [ $ones -lt 10 ];\
-       then echo -n beige;\
-       fi)
+    if [ $ones -lt 1 ];        then 
+       echo -n powderblue
+    elif [ $ones -lt 2 ]; then
+       echo -n lavender
+    elif [ $ones -lt 3 ]; then
+       echo -n pink
+    elif [ $ones -lt 4 ]; then
+       echo -n wheat
+    elif [ $ones -lt 5 ]; then
+       echo -n black
+    elif [ $ones -lt 6 ]; then
+       echo -n darkgray
+    elif [ $ones -lt 7 ]; then
+       echo -n darkred
+    elif [ $ones -lt 8 ]; then
+       echo -n lightsteelblue
+    elif [ $ones -lt 9 ]; then
+       echo -n gainsboro
+    elif [ $ones -lt 10 ]; then
+       echo -n midnightblue
+    fi
+}
+Sticky_Note()
+{
+    local background=$(return_pseudorandom_color)
     $ARSHELL -W 'Sticky Note' -Am -Amf 'ACE Sticky_Note \# New' -Aw\
        -xrm "*XmText.background: $background"\
        -xrm '*XmText.height: 200' -xrm '*XmText.width: 150'\
@@ -267,7 +279,7 @@
 Select_CD_Track()
 {
     tracks=$(arcd -T)
-    if [ "$tracks" != "0" ]; then
+    if [ $tracks -gt 0 ]; then
        track=$($ARSHELL -W 'Select Track' -ADp "Track: [1-$tracks]")
        track_after_zero="[ $track -gt 0 ]"
        track_before_last="[ $track -le $tracks_number ]"
@@ -282,10 +294,13 @@
 }
 CD_Player()
 {
-    $ARSHELL -W 'CD Player' -r 2 \
-       'ACE Play_CD' 'ACE Pause_CD'\
-       'ACE Resume_CD' 'ACE Stop_CD'\
-       'ACE Select_Track' -E "echo Exit"
+    $ARSHELL -W 'CD Player' -r 2 -E \
+       'ACE -A CD_Player & ACE Play_CD'\
+       'ACE -A CD_Player & ACE Pause_CD'\
+       'ACE -A CD_Player & ACE Resume_CD'\
+       'ACE -A CD_Player & ACE Stop_CD'\
+       'ACE -A CD_Player & ACE Select_Track'\
+       "echo Exit"
 }
 
 Calculate()
@@ -299,7 +314,9 @@
 Alarm()
 {
     local alarm_time="$($ARSHELL -W Alarm -ADp 'Time (ex 22:40):')"
-    $ARSHELL -W Alarm -ADp Command: | at "$alarm_time"
+    if [ "$alarm_time" != "" ]; then
+       $ARSHELL -W Alarm -ADp Command: | at "$alarm_time"
+    fi
 }
 
 ACE_get_color()