[Antiright-devel] antiright/src ACE

[Jeffrey Bedard]

CVSROOT:        /cvsroot/antiright
Module name:    antiright
Branch:         
Changes by:     Jeffrey Bedard <address@hidden> 04/12/22 02:20:24

Modified files:
        src            : ACE 

Log message:
        Fixed the Load_Meter.  Reordered buttons on Desktop.  Used new 
clockload applet in Desktop.

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

Patches:
Index: antiright/src/ACE
diff -u antiright/src/ACE:1.28 antiright/src/ACE:1.29
--- antiright/src/ACE:1.28      Thu Dec 16 23:55:47 2004
+++ antiright/src/ACE   Wed Dec 22 02:20:23 2004
@@ -28,7 +28,6 @@
 
 ARSHELL=arshell
 AWK=awk
-use_icons=false
 bmdir=/usr/X11R6/include/X11/bitmaps
 
 ACE_Verification()
@@ -74,46 +73,25 @@
 }
 ACE_Panel()
 {
-    if $use_icons; then
-       $ARSHELL -Am -r 4\
-           -Ab 'ACE Calculator' $bmdir/antiright/calculate.xbm\
-           -Ab 'ACE CD_Player' $bmdir/antiright/cdplayer.xbm\
-           -Ab 'ACE File_Manager' $bmdir/antiright/files.xbm\
-           -Ab 'ACE Note' $bmdir/antiright/notes.xbm\
-           -Ab 'ACE Lock' $bmdir/antiright/lock.xbm\
-           -Ab 'ACE Desktop' $bmdir/antiright/panel.xbm\
-           -Ab 'ACE Editor' $bmdir/antiright/text.xbm\
-           -Ab 'ACE Load_Meter' $bmdir/antiright/load.xbm\
-           -Ab 'ACE Terminal' $bmdir/antiright/terminal.xbm\
-           -Ab 'ACE Browser' $bmdir/antiright/browser.xbm\
-           -Ab 'ACE Image_Editor' $bmdir/antiright/image.xbm\
-           -Ab 'ACE Mail' $bmdir/antiright/mail.xbm\
-           -Ab 'ACE Background' $bmdir/antiright/image.xbm\
-           -Ab 'ACE -A Settings' $bmdir/antiright/switches.xbm\
-           -Ab 'ACE Command' $bmdir/antiright/arrow.xbm\
-           -Ab 'ACE -A File_System_Panel File_Systems'\
-           $bmdir/antiright/files.xbm
-    else
-       $ARSHELL -Am -r 6\
-           -AL\
-           'ACE Chat'\
-           'ACE Alarm'\
-           'ACE Calculator'\
-           'ACE CD_Player'\
-           'ACE File_Manager'\
-           'ACE Note'\
-           'ACE Lock'\
-           'ACE -A Desktop'\
-           'ACE Editor'\
-           'ACE Load_Meter'\
-           'ACE Terminal'\
-           'ACE Browser'\
-           'ACE Image_Editor'\
-           'ACE Mail'\
-           'ACE Background'\
-           'ACE -A Settings'\
-           'ACE Command'
-    fi
+    $ARSHELL -Am -r 6\
+       -AL\
+       'ACE Chat'\
+       'ACE Alarm'\
+       'ACE Calculator'\
+       'ACE CD_Player'\
+       'ACE File_Manager'\
+       'ACE Note'\
+       'ACE Lock'\
+       'ACE -A Desktop'\
+       'ACE Editor'\
+       'ACE Load_Meter'\
+       'ACE Terminal'\
+       'ACE Browser'\
+       'ACE Image_Editor'\
+       'ACE Mail'\
+       'ACE Background'\
+       'ACE -A Settings'\
+       'ACE Command'
 }
 killdesk()
 {
@@ -124,25 +102,25 @@
 Desktop()
 {
     arbmdir=$bmdir/antiright
-    $ARSHELL -W DESKTOP -UL "ACE -A ACE_print_time_and_load" -r 4\
+    $ARSHELL -W DESKTOP -Ac -r 4\
        'ACE A.C.E.' 'ACE Lock'\
+       -Ai 'ACE Note' $arbmdir/knotes.xpm\
        -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\
+       -Ai 'ACE -A File_System_Panel File_Systems' $arbmdir/fileserver.xpm\
        'vdesk 3' 'vdesk 4'\
-       -Ai 'ACE Editor' $arbmdir/kedit.xpm\
+       -Ai 'ACE Terminal' $arbmdir/term.xpm\
        -Ai 'ACE Load_Meter' $arbmdir/ksysguard.xpm\
        'vdesk 5' 'vdesk 6'\
-       -Ai 'ACE Terminal' $arbmdir/term.xpm\
+       -Ai 'ACE Editor' $arbmdir/kedit.xpm\
        -Ai 'ACE Browser' $arbmdir/www.xpm\
        'vdesk 7' 'vdesk 8'\
-       -Ai 'ACE Mail' $arbmdir/mail.xpm\
        -Ai 'ACE Background' $arbmdir/kcoloredit.xpm\
+       -Ai 'ACE Mail' $arbmdir/mail.xpm\
        'ACE Alarm' 'ACE Run' \
        -Ai 'ACE -A Settings' $arbmdir/tools.xpm\
-       -Ai 'ACE -A File_System_Panel File_Systems' $arbmdir/fileserver.xpm\
+       -Ai 'ACE CD_Player' $arbmdir/kscd.xpm\
        -geometry +0+0\
        -xrm '*marginHeight: 0' -xrm '*marginWidth: 0' -xrm '*spacing: 0'\
        -xrm '*XmPushButton.marginWidth: 2' \
@@ -245,9 +223,10 @@
         ' ' $date_and_time $(uptime | cut -d : -f 4 | cut -d , -f 2)\
        $mail_or_users
 }
+
 ACE_load_value()
 {
-    local load=$(ACE_system_load | cut -d , -f $1)
+    local load=$(uptime | cut -d : -f 4 | cut -d , -f $1)
     local to_show=$(echo $load | cut -d . -f 2)
     local divide_by=$(($(echo $load | cut -d . -f 1) + 1))
     echo $(($to_show / $divide_by))
@@ -258,7 +237,7 @@
        -UP "ACE -A ACE_load_value 1"\
        -UP "ACE -A ACE_load_value 2"\
        -UP "ACE -A ACE_load_value 3"\
-       -As -U "ACE -A ACE_system_load"
+       -As -U "uptime | cut -d : -f 4"
 }
 VMStat()
 {