[Antiright-devel] antiright/ACE-desktop ACE

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/04/08 01:44:58

Modified files:
        ACE-desktop    : ACE 

Log message:
        Began adding titles to all titled interfaces.
        Fixed [ error in Manual Browse Section.
        Use Prompt_User function for Command.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/ACE?cvsroot=antiright&r1=1.34&r2=1.35

Patches:
Index: ACE
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/ACE,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- ACE 6 Apr 2007 15:42:55 -0000       1.34
+++ ACE 8 Apr 2007 01:44:58 -0000       1.35
@@ -76,7 +76,7 @@
 
 ACE_Verification()
 {
-       $ARSHELL  -or 1 -oe -al "$(echo $1 __ | tr '_' ' ')"\
+       $ARSHELL  -oT Verification -or 1 -oe -al "$(echo $1 __ | tr '_' ' ')"\
                'echo Yes' 'echo No'
 }
 ACE_Check_Configuration_File()
@@ -115,13 +115,17 @@
        ACE -A Deskbar
        if [ "$WINDOWMANAGER" != "" ]; then
                exec $WINDOWMANAGER
-       else
+       elif [ "`which evilwm`" != "" ]; then
+               exec evilwm
+       elif [ "`which twm`" != "" ]; then
                exec twm
+       else
+               echo AR:  error:  WINDOWMANAGER not set
        fi
 }
 Prompt_User()
 {
-       $ARSHELL  -oe -al "Enter $1:" 
+       $ARSHELL -oT Prompt -oe -al "Enter $1:" -at echo
 }
 Binary_Command()
 {
@@ -160,7 +164,7 @@
 }
 Modes()
 {
-       $ARSHELL -or 5 -al "$(ls -l $1)" -ar\
+       $ARSHELL -oT Permissions -or 5 -al "$(ls -l $1)" -ar\
                -al 'Drag a mode to the appropriate chmod'\
                'chmod u' 'chmod g' 'chmod o' -ar -al add: '+r' '+w' '+x'\
                -ar -al subtract: 'chmod -r' '-w' '-x'
@@ -177,7 +181,7 @@
                cd $1 
        fi
        export AR_IN_FM=1
-       CMD="gtkshell -f $datadir/File_Manager.gdl"
+       CMD="gtkshell -oT 'File Manager' -f $datadir/File_Manager.gdl"
        local FILE
        for FILE in *; do
                CMD="$CMD \"ACE -A ARO $FILE & # $FILE\",gtk-file"
@@ -190,11 +194,11 @@
 }
 Clock()
 {
-       gtkshell  -on -og -0-0 -aul "date | tr '\n' ' '"
+       gtkshell -oT Clock -on -og -0-0 -aul "date | tr '\n' ' '"
 }
 Console()
 {
-       local CMD="$ARSHELL -os -og 750x500+0-0 -ou 5000 "
+       local CMD="$ARSHELL -oT Console -os -og 750x500+0-0 -ou 5000 "
 
        for ITEM in "$@"; do
                CMD="$CMD -al $ITEM -aul \"tail -n 3 $ITEM\" "
@@ -204,11 +208,6 @@
        echo "$CMD"
        exec sh -c "$CMD"
 }
-swap_load()
-{
-       echo -n '  '
-       swapctl -l | tail -n 1 | awk '{print $5}' | tr '\n' '\0'
-}
 
 taskbar_update()
 {
@@ -218,7 +217,7 @@
 
 Sticky_Note()
 {
-       nice $ARSHELL  -aT -og 175x200 
+       nice $ARSHELL -oT 'Note' -aT -og 175x200 
 }
 
 Old_Deskbar()
@@ -305,8 +304,7 @@
                elif grep MP3 $TMP; then
                        ACE Terminal -e mpg123 $1 &
                elif grep image $TMP; then
-                       # ImageMagick's display command is used.
-                       display $1 &
+                       ACE Image_Editor $1 &
                elif grep MS $TMP; then
                        # Wine is used to run MS programs.
                        wine $1 & 
@@ -336,7 +334,8 @@
 }
 Man_Browse_Section()
 {
-       local CMD="exec $ARSHELL -os -og 500x450 -or 42"
+       local CMD="exec $ARSHELL -oT \"Manual Section $1\""
+       CMD="$CMD -os -og 500x450 -or 42"
        manual_root=$(ACE Manual_Root)
        cd $manual_root/man$1
        CMD="$CMD \"Manual Section $1\""
@@ -345,7 +344,7 @@
        done
        CMD="$CMD \"ACE -A Man_Browse_Section $1 # Back\""
 
-if [ "DEBUG" = "1"]; then
+if [ "DEBUG" = "1" ]; then
        echo $CMD
 fi
        exec sh -c "$CMD"
@@ -362,17 +361,19 @@
 }
 Command()
 {
-       local COMMAND="$($ARSHELL  -al 'Command:' -oe -at env)"
-       exec $COMMAND $@
+       exec $(Prompt_User command) $@
 }
+
 Calendar()
 {
-       exec $ARSHELL -al "$(cal)"
+       exec $ARSHELL -al "$(cal)" -oT Calendar
 }
+
 ARI()
 {
-    $ARSHELL 'make install; $ARSHELL -r 1 Done; echo Install' >& /dev/null &
+    $ARSHELL -oT ARI 'make install; $ARSHELL -di Done; echo Install'
 }
+
 Diff()
 {
        local file_a="$($ARSHELL -df)"