[Antiright-devel] antiright/src ACE

[Jeffrey Bedard]

CVSROOT:        /cvsroot/antiright
Module name:    antiright
Branch:         
Changes by:     Jeffrey Bedard <address@hidden> 05/07/30 21:03:31

Modified files:
        src            : ACE 

Log message:
        Added an extension capability to the desktop using the Custom_Apps
        setting, in which the user can set the apps to be displayed.  Fixed
        the settings panel to have the same number of buttons in each column.

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

Patches:
Index: antiright/src/ACE
diff -u antiright/src/ACE:1.54 antiright/src/ACE:1.55
--- antiright/src/ACE:1.54      Sat Jul 30 20:35:44 2005
+++ antiright/src/ACE   Sat Jul 30 21:03:31 2005
@@ -229,8 +229,8 @@
     if [ "$PAGED" = "1" ]; then
        echo "  -Ai 'vdesk 1' $arbmdir/1.xpm -Ai 'vdesk 2' $arbmdir/2.xpm  -Ai 
'vdesk 3' $arbmdir/3.xpm -Ai 'vdesk 4' $arbmdir/4.xpm\\" >> /tmp/ACE.$$
     fi
-    echo " -Ai 'ACE -A Play_Next \# Play' $arbmdir/play.xpm -Ai 'ACE -A Stop' 
$arbmdir/stop.xpm -Ai 'ACE -A Pause' $arbmdir/pause.xpm -Ai 'ACE -A Resume' 
$arbmdir/resume.xpm -Ai 'ACE Lock' $arbmdir/lock.xpm -Ai 'ACE -A 
restart_dialog' $arbmdir/refresh.xpm -Ai 'ACE -A Settings' 
$arbmdir/settings.xpm -Ai 'ACE' $arbmdir/ace.xpm  -Ai 'ACE -L Run' 
$arbmdir/runner.xpm -Ai 'ACE Terminal' $arbmdir/terminal.xpm -Ai 'ACE -A Alarm' 
$arbmdir/clock.xpm -Ai 'ACE -A Sticky_Note' $arbmdir/sticky.xpm -Ai 'ACE 
Calculator' $arbmdir/calculator.xpm -Ai 'ACE -A Background_Editor' 
$arbmdir/palate.xpm   -Ai 'ACE File_Manager' $arbmdir/folder.xpm -Ai 'ACE -A 
File_System_Panel File_Systems' $arbmdir/disk.xpm -Ai 'ACE Mail' 
$arbmdir/mail.xpm -Ai 'ACE Cal' $arbmdir/calendar.xpm  -Ai 'ACE Load_Meter' 
$arbmdir/meter.xpm   -Ai 'ACE Editor' $arbmdir/text_editor.xpm -Ai 'ACE 
Browser' $arbmdir/www.xpm -Ai 'ACE CD_Player' $arbmdir/music.xpm -Ai 'afract & 
# Fractals' $arbmdir/fractal.xpm -Ai 'pongr & # PONGr' $arbmdir/pong.xpm\\" >> 
/tmp/ACE.$$
-
+    echo " -Ai 'ACE -A Play_Next \# Play' $arbmdir/play.xpm -Ai 'ACE -A Stop' 
$arbmdir/stop.xpm -Ai 'ACE -A Pause' $arbmdir/pause.xpm -Ai 'ACE -A Resume' 
$arbmdir/resume.xpm -Ai 'ACE Lock' $arbmdir/lock.xpm -Ai 'ACE -A 
restart_dialog' $arbmdir/refresh.xpm -Ai 'ACE -A Settings' 
$arbmdir/settings.xpm -Ai 'ACE' $arbmdir/ace.xpm  -Ai 'ACE -L Run' 
$arbmdir/runner.xpm -Ai 'ACE Terminal' $arbmdir/terminal.xpm -Ai 'ACE -A Alarm' 
$arbmdir/clock.xpm -Ai 'ACE -A Sticky_Note' $arbmdir/sticky.xpm -Ai 'ACE 
Calculator' $arbmdir/calculator.xpm -Ai 'ACE -A Background_Editor' 
$arbmdir/palate.xpm   -Ai 'ACE File_Manager' $arbmdir/folder.xpm -Ai 'ACE -A 
File_System_Panel File_Systems' $arbmdir/disk.xpm -Ai 'ACE Mail' 
$arbmdir/mail.xpm -Ai 'ACE Cal' $arbmdir/calendar.xpm  -Ai 'ACE Load_Meter' 
$arbmdir/meter.xpm   -Ai 'ACE Editor' $arbmdir/text_editor.xpm -Ai 'ACE 
Browser' $arbmdir/www.xpm -Ai 'ACE CD_Player' $arbmdir/music.xpm -Ai 'afract & 
# Fractals' $arbmdir/fractal.xpm -Ai 'pongr & # PONGr' $arbmdir/pong.xpm \\" >> 
/tmp/ACE.$$
+    echo "$(ACE Custom_Apps) \\" >> /tmp/ACE.$$
     # Get the full screen geometry.
     GEOMETRY=$(xdpyinfo | grep dimensions | awk '{print $2}')
 
@@ -244,7 +244,7 @@
     echo " -geometry $GEOMETRY -xrm '*marginHeight: 0' -xrm '*marginWidth: 0' 
-xrm '*spacing: 0' -xrm '*XmPushButton.marginWidth: 2'  -xrm 
'AntiRight.borderWidth: 1' -xrm '*overrideRedirect: True' -xrm 
'*shadowThickness: 0' -xrm '*background: $(ACE background)' -xrm '*foreground: 
$(ACE foreground)' -xrm '*borderWidth: 0' -xrm '*borderColor: $(ACE 
background)' -l -xrm '*XmMenuShell*.background: grey64' -xrm 
'*XmMenuShell*.shadowThickness: 1' -xrm '*XmMenuShell*.foreground: white' -xrm 
'*XmMenuShell*.fontList: -*-helvetica-bold-r-*-*-14-*-*-*-*-*-*-*' &" >> 
/tmp/ACE.$$
     chmod +x /tmp/ACE.$$
     /tmp/ACE.$$
-    #rm -f /tmp/ACE.$$
+    rm -f /tmp/ACE.$$
 }
 restart_desktop()
 {
@@ -372,7 +372,7 @@
 {
     ACE_Check_Configuration_File
     TMP=${TMPDIR:-/tmp}/ACE.$$
-    echo "$ARSHELL -W Settings -Am -r 15"\\ > $TMP
+    echo "$ARSHELL -W Settings -Am -r 14"\\ > $TMP
     for title in $(ACE_record_titles)
       do
       echo " \"ACE -A Settings_Node $title\""\\ >> $TMP
@@ -476,8 +476,11 @@
 Network_Panel()
 {
     $ARSHELL -Am -r 4 -W 'Network Panel'\
-       'ACE Open_Display'      'ACE Open_URL'\
-       'ACE FTP' 'ACE Telnet' 'ACE SSH' 'ACE SFTP'\
+       'ACE Open_Display' 'ACE Open_URL'\
+       'ACE -A ACE_peer_operation ftp'\
+       'ACE -A ACE_peer_operation telnet'\
+       'ACE -A ACE_Peer_operation ssh'\
+       'ACE -A ACE_peer_operation sftp'\
        'ACE PPP_On' 'ACE PPP_Off'
 }
 
@@ -616,11 +619,11 @@
 }
 Manual_Page()
 {
-    xterm -e man $1
+    ACE Terminal -e man $1
 }
 ACE_peer_operation()
 {
-    ACE -L "$(echo -n $1 | tr [a-z] [A-Z]) Peer" xterm -e $1
+    ACE -L "$(echo -n $1 | tr [a-z] [A-Z]) Peer" ACE Terminal -e $1
 }
 Open_Display()
 {