[Antiright-devel] antiright configure ACE-desktop/ACE ACE-desktop...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/07/21 16:16:40

Modified files:
        .              : configure 
        ACE-desktop    : ACE system.antiright 
        ACE-desktop/guidl: File_Manager.gdl 
        gtkshell       : guidl_options.c terminal.c terminal_options.c 

Log message:
        Fix merge conflicts.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/configure?cvsroot=antiright&r1=1.105&r2=1.106
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/ACE?cvsroot=antiright&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/system.antiright?cvsroot=antiright&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/File_Manager.gdl?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl_options.c?cvsroot=antiright&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/terminal.c?cvsroot=antiright&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/terminal_options.c?cvsroot=antiright&r1=1.6&r2=1.7

Patches:
Index: configure
===================================================================
RCS file: /sources/antiright/antiright/configure,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- configure   20 Jul 2007 00:57:20 -0000      1.105
+++ configure   21 Jul 2007 16:16:38 -0000      1.106
@@ -55,7 +55,6 @@
 
 DEFS="$DEFS -DPACKAGE_STRING='\"AntiRight_$VERSION\"'"
 
-
 if [ "$PREFIX" = "" ]; then
        PREFIX=/usr/local
 fi

Index: ACE-desktop/ACE
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/ACE,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- ACE-desktop/ACE     1 Jun 2007 20:15:02 -0000       1.42
+++ ACE-desktop/ACE     21 Jul 2007 16:16:39 -0000      1.43
@@ -21,6 +21,8 @@
 datadir=$PREFIX/share/ACE-desktop
 icon=$datadir/icons
 
+rm -f /tmp/ARO.*
+
 DEBUG=0
 if [ "$DEBUG" = "1" ]; then
        #set -vx
@@ -97,6 +99,24 @@
                        ~/.antiright
        fi
 }
+
+Clean_Config()
+{
+       local KEYDIR=/tmp/keys.$$
+       rm -rf $KEYDIR
+       mkdir $KEYDIR
+       chmod og-rwx $KEYDIR
+       cd $KEYDIR
+       for key in $(grep : ~/.antiright | grep -v '#' | cut -d: -f1); do
+               grep $key: ~/.antiright >> $key
+       done
+       for file in *; do
+               tail -n 1 $file >> new.antiright
+       done
+       mv new.antiright ~/.antiright
+       rm -rf $KEYDIR
+}
+
 ACE_record_titles()
 {
        $AWK -F : 'NF > 0 {if ($0 !~ /#/){print $1}}' ~/.antiright\

Index: ACE-desktop/system.antiright
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/system.antiright,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- ACE-desktop/system.antiright        1 Jun 2007 18:51:30 -0000       1.12
+++ ACE-desktop/system.antiright        21 Jul 2007 16:16:39 -0000      1.13
@@ -1,69 +1,34 @@
-###############################################################################
-#
-#    AntiRight
-#    (c) 2002-2006 Jeffrey Bedard
-#    address@hidden
-# 
-#    This file is part of AntiRight.
-#
-#     AntiRight is free software; you can redistribute it and/or modify
-#     it under the terms of the GNU General Public License as published by
-#     the Free Software Foundation; either version 2 of the License, or
-#     (at your option) any later version.
-#
-#     AntiRight is distributed in the hope that it will be useful,
-#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#     GNU General Public License for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with AntiRight; if not, write to the Free Software
-#     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
02110-1301  USA
-#
-##############################################################################
-
-# This is the AntiRight configuration file.
-# It is esential to operation of AntiRight.  
-# The format is defined as follows:  
-# item:value
-# : is the field separator, and only the second field is counted as data.  
-
-# revision 2
-
-# With this preference scheme, the entire AntiRight environment can be
-# customized.  
-
-# Applications
-Browser: exec firefox
-Mail:ACE Terminal -e mail
-Image_Editor:exec gimp
-File_Manager: exec rox
-Word_Processor: exec abiword
-Calculator: exec gcalctool
+Browser:exec firefox
 CD_Player: ACE Terminal cdplay
+Calculator: exec gcalctool
 Calendar: ACE -A Calendar
-System_Monitor: nice ACE Terminal -e top
-Print:lpr
+Custom_Updater: biff
+Deskbar_X:echo +0
+Deskbar_Y:echo +0
+File_Manager:ACE -A File_Manager
+File_Sharing:exec nice -n 20 gtk-gnutella
+IRC:ACE Terminal -e irc
+Image_Editor:exec gimp
+Lock_Display:exec xlock
+Mail:ACE Terminal -e mutt
+Manual_Root:echo /usr/share/man
+Open_URL:ACE -L Open_URL ACE Browser
+PPP_Off:pkill pppd
 PPP_On:wvdial
-PPP_Off:killall wvdial
-mp3_dir:~/mp3
-mp3_player:mpg321
-Text_Editor: exec gvim
-Screen: ACE Terminal -e screen -D -RR
-# This is the administration panel configuration.  
 Root_Shell: ACE Terminal -e su
-# This is the file system panel configuration.  
+Screen: ACE Terminal -e screen -D -RR
 See_Free_space: ACE -A See_Free_Space
-# This is the network panel configuration
-Open_URL: ACE -L Open_URL xterm -e lynx
-
-# Meta Information
+Sticky_Note: ACE -A Sticky_Note
+System_Monitor: nice ACE Terminal -e top
+Terminal:gshterm
+Text_Editor:exec ACE -A GUIDL Editor
+Word_Processor: exec abiword
 background: echo grey30
+deskbar_style: echo 3
+deskbar_updater: echo TRUE
 foreground: echo black
-# Customizations
-IRC:ACE Terminal -e irc
-PPP_Off:pkill pppd
 mp3_dir:~/archive/music
+mp3_player:mpg321
 Manual_Root:echo /usr/share/man
 Lock_Display:exec xlock -mode blank
 deskbar_style: echo 3

Index: ACE-desktop/guidl/File_Manager.gdl
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/guidl/File_Manager.gdl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ACE-desktop/guidl/File_Manager.gdl  16 Apr 2007 02:23:29 -0000      1.3
+++ ACE-desktop/guidl/File_Manager.gdl  21 Jul 2007 16:16:39 -0000      1.4
@@ -6,7 +6,7 @@
 option "geometry" "750x500";
 option "exit_on_activate";
 
-add buttons    "exit # Exit,gtk-quit",
+add buttons    "exit # Refresh,gtk-refresh",
                "cd ..; ACE -A File_Manager & # UP,gtk-directory",
                "ACE -A Delete & # ACE_-A_Delete,gtk-delete",
                "ACE Text_Editor & # address@hidden@Editor,gtk-edit",

Index: gtkshell/guidl_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl_options.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gtkshell/guidl_options.c    11 Jun 2007 21:32:41 -0000      1.10
+++ gtkshell/guidl_options.c    21 Jul 2007 16:16:39 -0000      1.11
@@ -43,6 +43,8 @@
        DEF("terminal font", "-otf");
        DEF("terminal width", "-otw");
        DEF("terminal height", "-oth");
+       DEF("terminal transparent", "-ott");
+       DEF("terminal not transparent", "-otT");
        DEF("rows", "-or");
        DEF("update frequency", "-ou");
        DEF("application", "-oa");

Index: gtkshell/terminal.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/terminal.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- gtkshell/terminal.c 11 Jun 2007 21:32:44 -0000      1.26
+++ gtkshell/terminal.c 21 Jul 2007 16:16:39 -0000      1.27
@@ -38,18 +38,16 @@
 static void
 set_vte_specific_terminal_options(struct GSH_Terminal * term)
 {
+       GSH * gsh;
+
+       gsh=term->gsh;
        VSETW(size, term->dimensions.width, term->dimensions.height);
        VSETW(allow_bold, TRUE);
        VSETW(backspace_binding, VTE_ERASE_ASCII_BACKSPACE);
-       {
-               GSH * gsh;
-               
-               gsh=(GSH *)term->gsh;
                if(GSH_FLAG(GSH_TERM_TRANSPARENT))
                {
                        VSETW(background_transparent, TRUE);
                }
-       }
 }
 #endif /* HAVE_VTE */
 

Index: gtkshell/terminal_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/terminal_options.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtkshell/terminal_options.c 11 Jun 2007 21:32:44 -0000      1.6
+++ gtkshell/terminal_options.c 21 Jul 2007 16:16:40 -0000      1.7
@@ -53,6 +53,12 @@
                        GSH_COUNT(argc, counter);
                        GSHTD.width=atoi(argv[*counter]);
                        break;
+               case 'T': /* Next terminal will not be transparent.  */
+                       GSH_UNSET(GSH_TERM_TRANSPARENT);
+                       break;
+               case 't': /* Next terminal will be transparent.  */
+                       GSH_SET(GSH_TERM_TRANSPARENT);
+                       break;
                default: /* Error message.  */
                        ARWARN("invalid tertiary terminal option");
                }