[Antiright-devel] antiright/src ACE

[Jeffrey Bedard]

CVSROOT:        /cvsroot/antiright
Module name:    antiright
Branch:         
Changes by:     Jeffrey Bedard <address@hidden> 04/12/12 01:16:38

Modified files:
        src            : ACE 

Log message:
        Consolidated Desktop_Lite() and Pager() into a unified form in 
Desktop().  Added a Cancel option for file management.  Only the 5 minute load 
is displayed by ACE_print_time_and_load() to conserve space.

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

Patches:
Index: antiright/src/ACE
diff -u antiright/src/ACE:1.26 antiright/src/ACE:1.27
--- antiright/src/ACE:1.26      Sun Nov 21 21:46:36 2004
+++ antiright/src/ACE   Sun Dec 12 01:16:38 2004
@@ -112,56 +112,45 @@
            'ACE Command'
     fi
 }
-Kill_Desktop()
+killdesk()
 {
     kill $(ps xa | grep DESKTOP | awk '{print $1}' | tr '\n' ' ')\
        &> /dev/null 2> /dev/null
 }
-Desktop_Lite()
+
+Desktop()
 {
-    $ARSHELL -r 2\
-       -Ai 'ACE Calculator' $bmdir/antiright/kcalc.xpm\
-       -Ai 'ACE CD_Player' $bmdir/antiright/kscd.xpm\
-       -Ai 'ACE File_Manager' $bmdir/antiright/kfm.xpm\
-       -Ai 'ACE Note' $bmdir/antiright/knotes.xpm\
-       -Ai 'ACE Editor' $bmdir/antiright/kedit.xpm\
-       -Ai 'ACE Load_Meter' $bmdir/antiright/ksysguard.xpm\
-       -Ai 'ACE Terminal' $bmdir/antiright/term.xpm\
-       -Ai 'ACE Browser' $bmdir/antiright/www.xpm\
-       -Ai 'ACE Mail' $bmdir/antiright/mail.xpm\
-       -Ai 'ACE Background' $bmdir/antiright/kcoloredit.xpm\
-       -Ai 'ACE -A Settings' $bmdir/antiright/tools.xpm\
-       -Ai 'ACE -A File_System_Panel File_Systems'\
-       $bmdir/antiright/fileserver.xpm\
-       -xrm "*overrideRedirect: True" -xrm "*marginWidth: 0"\
-       -xrm "*marginHeight: 0" -xrm "*margin: 0" -W DESKTOP\
-       -geometry +32+64 -xrm "*highlightThickness: 0"\
-       -xrm "*alignment: XmALIGNMENT_CENTER" -t &
+    arbmdir=$bmdir/antiright
+    $ARSHELL -W DESKTOP -UL "ACE -A ACE_print_time_and_load" -r 4\
+       'ACE A.C.E.' 'ACE Lock'\
+       -Ai 'ACE Calculator' $arbmdir/kcalc.xpm\
+       -Ai 'ACE CD_Player' $arbmdir/kscd.xpm\
+       'vdesk 1' 'vdesk 2'\
+       -Ai 'ACE File_Manager' $arbmdir/kfm.xpm\
+       -Ai 'ACE Note' $arbmdir/knotes.xpm\
+       'vdesk 3' 'vdesk 4'\
+       -Ai 'ACE Editor' $arbmdir/kedit.xpm\
+       -Ai 'ACE Load_Meter' $arbmdir/ksysguard.xpm\
+       'vdesk 5' 'vdesk 6'\
+       -Ai 'ACE Terminal' $arbmdir/term.xpm\
+       -Ai 'ACE Browser' $arbmdir/www.xpm\
+       'vdesk 7' 'vdesk 8'\
+       -Ai 'ACE Mail' $arbmdir/mail.xpm\
+       -Ai 'ACE Background' $arbmdir/kcoloredit.xpm\
+       'ACE Alarm' 'ACE Run' \
+       -Ai 'ACE -A Settings' $arbmdir/tools.xpm\
+       -Ai 'ACE -A File_System_Panel File_Systems' $arbmdir/fileserver.xpm\
+       -geometry +0+0\
+       -xrm '*marginHeight: 0' -xrm '*marginWidth: 0' -xrm '*spacing: 0'\
+       -xrm '*XmPushButton.marginWidth: 2' \
+       -xrm 'AntiRight.borderWidth: 1' -xrm "*overrideRedirect: True" &
 }
 return_pseudorandom_color()
 {
+    local colors="powderblue lavender pink wheat black darkgeay darkred\
+ lightsteelblue gainsboro midnightblue"
     local ones=$(date +%S | cut -c 2)
-    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
+    echo $colors | awk '{print $'$(($ones+1))'}'
 }
 Sticky_Note()
 {
@@ -186,11 +175,16 @@
     # operations.
     ACE -A File_Manager
 }
+Cancel_File_Operation()
+{
+    ACE -A File_Manager
+}
 Manage_Files()
 {
     $ARSHELL -Al "Choose an operation to perform" -E\
        'ACE -A Delete_File'\
-       'ACE -A Copy_File'
+       'ACE -A Copy_File'\
+       'ACE -A Cancel_File_Operation'
 }
 File_Manager()
 {
@@ -243,7 +237,10 @@
            mail_or_users="Mail."
        fi
     fi
-    echo -n $date_and_time $(uptime | cut -d : -f 4) $mail_or_users
+    # In order to conserve space, only the 5 minute load is given.  
+    echo -n\
+        ' ' $date_and_time $(uptime | cut -d : -f 4 | cut -d , -f 2)\
+       $mail_or_users
 }
 ACE_load_value()
 {
@@ -264,18 +261,6 @@
 {
     $ARSHELL -Uf 3000 -UL 'vmstat' -xrm '*fontList: fixed'
 }
-Pager()
-{
-    $ARSHELL -r 1\
-       'ACE A.C.E.' 'ACE Lock'\
-       'vdesk 1' 'vdesk 2' 'vdesk 3' 'vdesk 4'\
-       'vdesk 5' 'vdesk 6' 'vdesk 7' 'vdesk 8'\
-       'ACE Alarm' 'ACE Run' -As \
-       -xrm '*overrideRedirect: True' -geometry +0+0\
-       -xrm '*marginHeight: 0' -xrm '*marginWidth: 0' -xrm '*spacing: 0'\
-       -xrm '*XmPushButton.marginWidth: 2' -U "ACE -A ACE_print_time_and_load"\
-       -xrm 'AntiRight.borderWidth: 1'
-}
 Select_CD_Track()
 {
     tracks=$(arcd -T)
@@ -371,9 +356,11 @@
        'ACE See_Open_Ports'\
        'ACE See_User_Processes'\
        'ACE System_Monitor'\
-       "$ARSHELL -Am -UL vmstat -xrm '*fontList: fixed' & # Memory_Statistics"\
+       "$ARSHELL\
+ -W 'Memory' -Am -UL vmstat -xrm '*fontList: fixed' & # Memory_Statistics"\
        "$ARSHELL -Am -UL uptime -xrm '*fontList: fixed' & # Uptime"\
-       "$ARSHELL -Am -UL iostat -xrm '*fontList: fixed' & # I/O_Statistics"\
+       "$ARSHELL\
+ -W 'I/O Statistics' -Am -UL iostat -xrm '*fontList: fixed' & # 
I/O_Statistics"\
        'ACE -A Load_Meter'
 }
 Fix_File_Permissions()