[Antiright-devel] antiright/ACE-desktop ACE system.antiright guid...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/11/11 03:42:35

Modified files:
        ACE-desktop    : ACE system.antiright 
        ACE-desktop/guidl: Horizontal_Deskbar.gdl 
        ACE-desktop/icons/gnome_medium: terminal_32.png 
        ACE-desktop/icons/gnome_small: terminal_16.png 
Added files:
        ACE-desktop/icons: pidgin_16.png pidgin_32.png 

Log message:
        Use better icons for terminal.  Use Pidgin icon for ACE Chat.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/ACE?cvsroot=antiright&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/system.antiright?cvsroot=antiright&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl?cvsroot=antiright&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/icons/pidgin_16.png?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/icons/pidgin_32.png?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/icons/gnome_medium/terminal_32.png?cvsroot=antiright&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/icons/gnome_small/terminal_16.png?cvsroot=antiright&rev=1.2

Patches:
Index: ACE
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/ACE,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- ACE 8 Nov 2007 05:54:09 -0000       1.50
+++ ACE 11 Nov 2007 03:42:33 -0000      1.51
@@ -43,6 +43,9 @@
        if [ "$XDG_CONFIG_DIRS" = "" ]; then
                export XDG_CONFIG_DIRS="/etc/xdg:/usr/pkg/etc/xdg"
        fi
+       if [ "$XDG_CONFIG_DIRS" = "" ]; then
+               echo 'WARNING - no valid antiright system configuration 
directory found.'
+       fi
 }
 
 Search_XDG()
@@ -66,15 +69,31 @@
        IFS=' '
 }
 
+display_config_keys()
+{
+       cut -d: -f1 $1 | grep -v '\#' | sort | uniq
+}
+
 Setup_Dirs()
 {
        Search_XDG
+       if [ "$sysconfigdir" = "" ]; then
+               sysconfigdir=$PREFIX/etc/xdg/antiright
+       fi
        export SYSARCONF=$sysconfigdir/system.antiright
        icon=$datadir/icons
        ARCONF=$XDG_CONFIG_HOME/antiright/antiright.conf
        if [ "$TMPDIR" = "" ]; then
                TMPDIR=/tmp
        fi
+       ARCONF_KEYS="$(display_config_keys $ARCONF)"
+       SYSARCONF_KEYS="$(display_config_keys $SYSARCONF)"
+       MISSING="$(echo $ARCONF_KEYS $SYSARCONF_KEYS | sort | uniq -u)"
+       if [ "$MISSING" != "" ]; then
+               echo You are missing configuration keys $MISSING
+               echo sysconfigdir: $sysconfigdir
+               echo SYSARCONF: $SYSARCONF
+       fi
        rm -f $TMPDIR/ARO.*
 }
 

Index: system.antiright
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/system.antiright,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- system.antiright    22 Jul 2007 08:15:17 -0000      1.15
+++ system.antiright    11 Nov 2007 03:42:34 -0000      1.16
@@ -1,3 +1,4 @@
+Chat: exec pidgin
 Browser:exec firefox
 CD_Player: ACE Terminal cdplay
 Calculator: exec gcalctool

Index: guidl/Horizontal_Deskbar.gdl
===================================================================
RCS file: 
/sources/antiright/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- guidl/Horizontal_Deskbar.gdl        8 Nov 2007 06:41:53 -0000       1.35
+++ guidl/Horizontal_Deskbar.gdl        11 Nov 2007 03:42:34 -0000      1.36
@@ -99,6 +99,7 @@
        "ACE Calculator ,Calculator_32.png",
        "ACE Sticky_Note ,todo_32.png",
        "ACE Screen ,Screen_32.png",
+       "ACE Chat ,pidgin_32.png",
        "ACE System_Monitor ,System_Monitor_32.png";
 
 add "clock applet";

Index: icons/gnome_medium/terminal_32.png
===================================================================
RCS file: 
/sources/antiright/antiright/ACE-desktop/icons/gnome_medium/terminal_32.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
Binary files /tmp/cvs7TZVaK and /tmp/cvsnFPjMh differ

Index: icons/gnome_small/terminal_16.png
===================================================================
RCS file: 
/sources/antiright/antiright/ACE-desktop/icons/gnome_small/terminal_16.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
Binary files /tmp/cvsYsWRqK and /tmp/cvsrIaa3h differ

Index: icons/pidgin_16.png
===================================================================
RCS file: icons/pidgin_16.png
diff -N icons/pidgin_16.png
Binary files /dev/null and /tmp/cvsv7WpYK differ

Index: icons/pidgin_32.png
===================================================================
RCS file: icons/pidgin_32.png
diff -N icons/pidgin_32.png
Binary files /dev/null and /tmp/cvsMf9VcL differ