[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright ACE-desktop/ACE ACE-desktop/system.an...
From: |
Jeffrey Bedard |
Subject: |
[Antiright-devel] antiright ACE-desktop/ACE ACE-desktop/system.an... |
Date: |
Tue, 07 Sep 2010 06:50:30 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 10/09/07 06:50:30
Modified files:
ACE-desktop : ACE system.antiright
gtkshell : options.c
Added files:
ACE-desktop/guidl: Deskbar.gdl
Removed files:
ACE-desktop/guidl: Horizontal_Deskbar.gdl Old_Deskbar.gdl
Small_Deskbar.gdl
ACE-desktop/hacks: deskbar.sh deskbar2.sh
Log message:
Remove old deskbar implementations. Add new Deskbar.gdl implementation.
Integrate gtkshell provided configuration interface into ACE, replace
existing
facility. This speeds ACE load time.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/ACE?cvsroot=antiright&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/system.antiright?cvsroot=antiright&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Deskbar.gdl?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl?cvsroot=antiright&r1=1.49&r2=0
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Old_Deskbar.gdl?cvsroot=antiright&r1=1.4&r2=0
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Small_Deskbar.gdl?cvsroot=antiright&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/hacks/deskbar.sh?cvsroot=antiright&r1=1.5&r2=0
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/hacks/deskbar2.sh?cvsroot=antiright&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/options.c?cvsroot=antiright&r1=1.56&r2=1.57
Patches:
Index: ACE-desktop/ACE
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/ACE,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- ACE-desktop/ACE 31 Aug 2010 19:57:20 -0000 1.63
+++ ACE-desktop/ACE 7 Sep 2010 06:50:29 -0000 1.64
@@ -43,9 +43,6 @@
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()
@@ -71,20 +68,7 @@
display_config_keys()
{
- cut -d: -f1 $1 | grep -v '\#' | sort | uniq
-}
-
-SetupDefaults()
-{
- ARCONF_KEYS="$(display_config_keys $ARCONF)"
- SYSARCONF_KEYS="$(display_config_keys $SYSARCONF)"
- for CANDIDATE in $(echo $SYSARCONF_KEYS | tr '\n' ' '); do
- if [ "$(grep $CANDIDATE $ARCONF)" = "" ]; then
- echo "$CANDIDATE: ACE -A Undefined $CANDIDATE"\
- >> $ARCONF
- echo ACE: Warning: $CANDIDATE command is undefined.
- fi
- done
+ $ARSHELL -ca | grep -v '\[*\]'
}
Setup_Dirs()
@@ -99,7 +83,6 @@
if [ "$TMPDIR" = "" ]; then
TMPDIR=/tmp
fi
- SetupDefaults
rm -f $TMPDIR/ARO.*
# This allows external programs to
# use antiright resourcedirectories.
@@ -207,46 +190,10 @@
$ARSHELL -oT Verification -or 1 -oe -al "$(echo $1 __ | tr '_' ' ')"\
'echo Yes' 'echo No'
}
-ACE_Check_Configuration_File()
-{
- if [ ! -f $ARCONF ]; then
- local OLD_ARCONF="$HOME/.antiright"
- if [ -f $OLD_ARCONF ]; then
- # Preserve previous configuration.
- mv $OLD_ARCONF $ARCONF
- else
- # New installation.
- cp $SYSARCONF $ARCONF
- fi
- fi
- # Fix missing Terminal app definition for old config files.
- if [ "$(grep Terminal: $ARCONF)" = "" ]; then
- echo 'Terminal: gshterm' >> $ARCONF
- fi
-}
-
-Clean_Config()
-{
- local KEYDIR=$TMPDIR/keys.$$
- rm -rf $KEYDIR
- mkdir $KEYDIR
- chmod 0700 $KEYDIR
- cd $KEYDIR
- for key in $(grep : $ARCONF | grep -v '#' | cut -d: -f1); do
- grep $key: $ARCONF >> $key
- done
- NEW_ARCONF="$TMPDIR/.new.antiright.conf.$$"
- for file in *; do
- tail -n 1 $file >> $NEW_ARCONF
- done
- mv $NEW_ARCONF $ARCONF
- rm -rf $KEYDIR
-}
ACE_record_titles()
{
- $AWK -F : 'NF > 0 {if ($0 !~ /#/){print $1}}' $ARCONF\
- | sort | uniq | tr '\n' ' '
+ $ARSHELL -ca | cut -d '=' -f 1 | grep -v '\[*\]' | tr '\n' ' '
}
ACE_confval()
@@ -257,29 +204,24 @@
fi
# This prints values of records matching $1 that do not contain # characters
$AWK -v config_item=$1 '\
- BEGIN {FS=":"}\
+ BEGIN {FS="="}\
$1 ~ config_item {if ($0 !~ /#/) value=$2}\
END {print value}' $CONFFILE
# The value is printed in the end to ensure that it is the most recent value
}
-set_value()
-{
- echo "$1":"$2" >> $ARCONF
-}
-
ACE_read_configuration_value()
{
- VALUE="`ACE_confval \"$1\"`"
+ VALUE=`$ARSHELL -cg $1`
if ( [ "$VALUE" = "" ] || ( echo $VALUE | grep Undefined ) ); then
VALUE="`ACE_confval \"$1\" $SYSARCONF`"
+ $ARSHELL -cs "$1" "$VALUE"
fi
if [ "$VALUE" = "" ]; then
ACE -A Settings_Node "$1"
- ACE_confval "$1"
- else
- echo "$VALUE"
+ VALUE=`$ARSHELL -cg "$1"`
fi
+ echo "$VALUE"
}
AR_Prepare_Environment()
@@ -303,7 +245,7 @@
Deskbar()
{
- Hack deskbar
+ GUIDL Deskbar -og "1024x16+208-0"
}
AR()
@@ -402,7 +344,7 @@
}
Console()
{
- local CMD="$ARSHELL -oT Console -os -og 750x500+0-0 -ou 5000 "
+ local CMD="$ARSHELL -oT Console -os -ou 5000 "
for ITEM in "$@"; do
CMD="$CMD -al $ITEM -aul \"tail -n 3 $ITEM\" "
@@ -482,12 +424,12 @@
{
new_value=$($ARSHELL -og 256x154\
-al 'Current command:'\
- -al "$(ACE -R $1)"\
+ -al "$(ACE -r $1)"\
-al 'Enter a new command:'\
-oE -oe -at "echo"\
'# Close')
if [ "$new_value" != "" ]; then
- set_value "$1" "$new_value"
+ $ARSHELL -cs "$1" "$new_value"
fi
}
@@ -498,8 +440,6 @@
local LIST=" : "
local BEFORE_FIRST_FLAG="TRUE"
- # Ensure the existance of a configuration file.
- ACE_Check_Configuration_File
for title in $(ACE_record_titles); do
LIST="$LIST,$title:$(ACE -r $title)"
done
@@ -511,9 +451,7 @@
local CMD="exec $ARSHELL -or 10"
CMD="$CMD -ol -oi 'small toolbar'"
CMD="$CMD 'ACE -A View_Settings & # See_All_Values,gtk-index'"
- # Ensure the existance of a configuration file.
- ACE_Check_Configuration_File
- for title in $(ACE_record_titles); do
+ for title in `ACE_record_titles`; do
CMD="$CMD \"ACE -A Settings_Node $title # $title,gtk-preferences\""
done
exec sh -c "$CMD"
@@ -686,14 +624,9 @@
# Main()
ACE_Init
-ACE_Check_Configuration_File
while getopts ':ctp:R:r:L:V:A:g:B:' OPT; do
case $OPT in
- c|+c)
- ACE_Check_Configuration_File
- exit 0
- ;;
t|+t)
ACE_record_titles
exit 0
Index: ACE-desktop/system.antiright
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/system.antiright,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- ACE-desktop/system.antiright 6 Dec 2007 14:40:49 -0000 1.18
+++ ACE-desktop/system.antiright 7 Sep 2010 06:50:29 -0000 1.19
@@ -1,48 +1,48 @@
-Chat: exec pidgin
-Browser:exec firefox
-CD_Player: ACE Terminal cdplay
-Calculator: exec gcalctool
-Calendar: ACE -A Calendar
-Custom_Updater: biff
-Deskbar_X:echo +0
-Deskbar_Y:echo +0
-File_Manager:ACE -A GUIDL File_Shell
-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
-Root_Shell: ACE Terminal -e su
-Screen: ACE Terminal -e screen -D -RR
-See_Free_space: ACE -A See_Free_Space
-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
-Manual_Root:echo /usr/share/man
-Lock_Display:exec xlock -mode blank
-deskbar_style: echo 3
-deskbar_updater: echo TRUE
-Sticky_Note: ACE -A Sticky_Note
-Panel_Items: echo Lock_Display Screen Terminal File_Manager System_Monitor
Browser File_Sharing Text_Editor Word_Processor Image_Editor Calculator
Sticky_Note
-Browser:exec firefox
-File_Sharing:exec nice -n 20 gtk-gnutella
-Deskbar_X:echo +0
-Deskbar_Y:echo +0
-Custom_Updater: biff
-Terminal: gshterm
-roff_flags: -me
-roff_file: ~/default.roff
-hosts_to_monitor: echo localhost heap compaq
-mp3_dir:echo /home/jefbed/archive/amusic
-mp3_player:echo mpg123
-Desk_Icons:echo 1
+Chat= exec pidgin
+Browser=exec firefox
+CD_Player= ACE Terminal cdplay
+Calculator= exec gcalctool
+Calendar= ACE -A Calendar
+Custom_Updater= biff
+Deskbar_X=echo +0
+Deskbar_Y=echo +0
+File_Manager=ACE -A GUIDL File_Shell
+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
+Root_Shell= ACE Terminal -e su
+Screen= ACE Terminal -e screen -D -RR
+See_Free_space= ACE -A See_Free_Space
+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
+Manual_Root=echo /usr/share/man
+Lock_Display=exec xlock -mode blank
+deskbar_style= echo 3
+deskbar_updater= echo TRUE
+Sticky_Note= ACE -A Sticky_Note
+Panel_Items= echo Lock_Display Screen Terminal File_Manager System_Monitor
Browser File_Sharing Text_Editor Word_Processor Image_Editor Calculator
Sticky_Note
+Browser=exec firefox
+File_Sharing=exec nice -n 20 gtk-gnutella
+Deskbar_X=echo +0
+Deskbar_Y=echo +0
+Custom_Updater= biff
+Terminal= gshterm
+roff_flags= -me
+roff_file= ~/default.roff
+hosts_to_monitor= echo localhost heap compaq
+mp3_dir=echo /home/jefbed/archive/amusic
+mp3_player=echo mpg123
+Desk_Icons=echo 1
Index: gtkshell/options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/options.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- gtkshell/options.c 6 Sep 2010 20:48:57 -0000 1.56
+++ gtkshell/options.c 7 Sep 2010 06:50:30 -0000 1.57
@@ -88,17 +88,27 @@
return g_build_filename(g_get_user_config_dir(), GSH_KEY_FILE, NULL);
}
-static gchar *
-get_value(const gchar * key)
+static GKeyFile *
+get_key_file(void)
{
GKeyFile *kf;
- gchar *value;
gchar *fn;
kf = g_key_file_new();
fn = get_key_filename();
g_key_file_load_from_file(kf, fn, G_KEY_FILE_NONE, NULL);
g_free(fn);
+
+ return kf;
+}
+
+static gchar *
+get_value(const gchar * key)
+{
+ GKeyFile *kf;
+ gchar *value;
+
+ kf = get_key_file();
value = g_key_file_get_string(kf, GSH_KEY_FILE_GROUP, key, NULL);
g_key_file_free(kf);
@@ -123,6 +133,23 @@
__attribute__ ((noreturn))
static void
+print_all_values(GSH *gsh __attribute__ ((unused)),
+ gint *counter __attribute__ ((unused)),
+ const gchar **argv __attribute__ ((unused)))
+{
+ GKeyFile *kf;
+ gchar *data;
+
+ kf = get_key_file();
+ data=g_key_file_to_data(kf, NULL, NULL);
+ g_key_file_free(kf);
+ puts(data);
+ g_free(data);
+ exit(0);
+}
+
+__attribute__ ((noreturn))
+static void
set_value(GSH *gsh __attribute__ ((unused)),
gint *counter, const gchar **argv)
{
@@ -132,7 +159,10 @@
const gchar *key = argv[++(*counter)];
const gchar *value = argv[++(*counter)];
- kf = g_key_file_new();
+ kf = get_key_file();
+#ifdef DEBUG
+ fprintf(stderr, "KEY: %s\tVALUE: %s\n", key, value);
+#endif
g_key_file_set_string(kf, GSH_KEY_FILE_GROUP, key, value);
data=g_key_file_to_data(kf, &data_size, NULL);
g_key_file_free(kf);
@@ -189,6 +219,7 @@
ARTDEF ("-aup", gsh_add_updating_progress_cb, "add updating progress bar");
/* Configuration utility */
+ ARTDEF ("-ca", print_all_values, "print all values");
ARTDEF ("-cg", print_value, "print value");
ARTDEF ("-cs", set_value, "set value");
Index: ACE-desktop/guidl/Deskbar.gdl
===================================================================
RCS file: ACE-desktop/guidl/Deskbar.gdl
diff -N ACE-desktop/guidl/Deskbar.gdl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ACE-desktop/guidl/Deskbar.gdl 7 Sep 2010 06:50:29 -0000 1.1
@@ -0,0 +1,28 @@
+
+option "rows" 1;
+option "icon size" "menu";
+option "undecorated";
+option "no fill";
+
+add "app menu";
+add buttons
+ "ACE & # Ace,start-here"
+ "ACE -A Settings & # Cfg,gtk-preferences"
+ "ACE Lock_Display & # Lck,gnome-lockscreen"
+ "ACE File_Manager & # Fmr,file-manager"
+ "ACE Terminal & # Trm,terminal"
+ "ACE Browser & # Www,web-browser"
+ "ACE Sticky & # Snt,gtk-copy"
+ "ACE Calculator & # Clc,calc"
+ "ACE Editor & # Edt,text-editor"
+ "ACE Chat & # Cht,internet-group-chat"
+ "ACE Word & # Wpr,wordprocessing"
+ "ACE Spreadsheet & # Sst,spreadsheet"
+ "ACE CD_Player & # Mus,audio-x-generic";
+
+option "horizontal clock";
+add "clock applet";
+
+option "fill";
+add button "killall gtkshell arwm # Die,gtk-quit";
+
Index: ACE-desktop/guidl/Horizontal_Deskbar.gdl
===================================================================
RCS file: ACE-desktop/guidl/Horizontal_Deskbar.gdl
diff -N ACE-desktop/guidl/Horizontal_Deskbar.gdl
--- ACE-desktop/guidl/Horizontal_Deskbar.gdl 31 Mar 2009 00:44:54 -0000
1.49
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,51 +0,0 @@
-// This is the default static deskbar, used by deskbar_style==3.
-
-option "rows" 1;
-option "geometry" "+0-0";
-option "undecorated";
-option "no fill";
-//option "check commands";
-
-option "icon size" "DND";
-
-add "app menu";
-
-add button "ACE ,Deck_32.png::\n
- ::Exit___,gtk-quit::\n
- ::ACE -A GUIDL Manual_Browser,gtk-help::\n
- ::ACE -A Settings & # ACE_Settings,gtk-preferences::\n
- ::ACE -A Command & # Run...,gtk-execute::\n
- ::ACE & # ACE_Panel,gtk-home::\n
- ::ACE Lock,gtk-dialog-authentication";
-
-// command prompt
-// The embedded command prompt cannot be used when the undecorated option
-// is set
-//add prompt "env";
-
-
-// For unlabeled items, the space between the item command and the comma allows
-// for a blank label.
-add buttons
- "ACE -A Command ,gtk-execute",
- "ACE Lock ,gtk-dialog-authentication",
- "ACE Terminal ,terminal_32.png",
- "ACE File_Manager ,gtk-open",
- "ACE Browser ,www_32.png",
- "ACE Text_Editor ,gtk-edit",
- "ACE Calculator ,Calculator_32.png",
- "ACE Sticky_Note ,todo_32.png",
- "ACE Screen ,screen_32.png",
- "ACE Chat ,chat_32.png",
- "ACE System_Monitor ,system_monitor_32.png";
-
-//options "horizontal clock";
-add "clock applet";
-
-// Uncomment the following if you want a custom command updated each
-//add "separator";
-// second as a panel applet.
-//option "fill";
-// Add a user-settable custom updating label.
-//add "updating label" "ACE Custom_Updater";
-
Index: ACE-desktop/guidl/Old_Deskbar.gdl
===================================================================
RCS file: ACE-desktop/guidl/Old_Deskbar.gdl
diff -N ACE-desktop/guidl/Old_Deskbar.gdl
--- ACE-desktop/guidl/Old_Deskbar.gdl 25 Jul 2007 04:42:37 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-option "geometry" "+0+0";
-option "rows" 1;
-add "updating label" "date";
-option "icon size" "menu";
-add buttons "ACE Lock,gtk-dialog-authentication",
- "ACE Screen,gtk-execute",
- "ACE Terminal,gtk-execute",
- "ACE Browser,gtk-connect",
- "ACE Sticky_Note,gtk-edit",
- "ACE";
-add "prompt" "env";
-
Index: ACE-desktop/guidl/Small_Deskbar.gdl
===================================================================
RCS file: ACE-desktop/guidl/Small_Deskbar.gdl
diff -N ACE-desktop/guidl/Small_Deskbar.gdl
--- ACE-desktop/guidl/Small_Deskbar.gdl 31 Aug 2010 19:57:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,51 +0,0 @@
-// This is the default static deskbar, used by deskbar_style==3.
-
-option "rows" 1;
-option "geometry" "+0-0";
-option "undecorated";
-option "no fill";
-//option "check commands";
-
-option "icon size" "small toolbar";
-
-add "app menu";
-
-add button "ACE ,Deck_16.png::\n
- ::Exit___,gtk-quit::\n
- ::ACE -A GUIDL Manual_Browser,gtk-help::\n
- ::ACE -A Settings & # ACE_Settings,gtk-preferences::\n
- ::ACE -A Command & # Run...,gtk-execute::\n
- ::ACE & # ACE_Panel,gtk-home::\n
- ::ACE Lock,gtk-dialog-authentication";
-// command prompt
-// The embedded command prompt cannot be used when the undecorated option
-// is set
-//add prompt "env";
-add "separator";
-
-// For unlabeled items, the space between the item command and the comma allows
-// for a blank label.
-add buttons
- "ACE -A Command ,gtk-execute",
- "ACE Lock ,gtk-dialog-authentication",
- "ACE Terminal ,terminal_16.png",
- "ACE File_Manager ,gtk-open",
- "ACE Browser ,www_16.png",
- "ACE Text_Editor ,gtk-edit",
- "ACE Calculator ,Calculator_16.png",
- "ACE Sticky_Note ,todo_16.png",
- "ACE Screen ,screen_16.png",
- "ACE Chat ,chat_16.png",
- "ACE System_Monitor ,system_monitor_16.png";
-
-//options "horizontal clock";
-//add "clock applet";
-add "updating label" "date";
-
-// Uncomment the following if you want a custom command updated each
-//add "separator";
-// second as a panel applet.
-//option "fill";
-// Add a user-settable custom updating label.
-//add "updating label" "ACE Custom_Updater";
-
Index: ACE-desktop/hacks/deskbar.sh
===================================================================
RCS file: ACE-desktop/hacks/deskbar.sh
diff -N ACE-desktop/hacks/deskbar.sh
--- ACE-desktop/hacks/deskbar.sh 25 Aug 2010 20:50:49 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,66 +0,0 @@
-#!/bin/sh
-# GUIShell (c) 2002-2010 Jeffrey Bedard address@hidden
-
-# This file is part of GUIShell.
-
-# GUIShell 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. GUIShell
-# 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
-# GUIShell; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-ARSHELL=gtkshell
-AWK=awk
-
-# Import ACE environment.
-eval "$(ACE -A Setup_Dirs -e)"
-
-# Get current deskbar style.
-STYLE="$(ACE deskbar_style)"
-
-SHORTCUTS="$HOME/.shortcutrc"
-
-if [ "$STYLE" = "0" ]; then
- ACE -A GUIDL Old_Deskbar
-elif [ "$STYLE" = "1" ]; then
- if [ "$(ACE Desk_Icons)" = "1" ]; then
- gtkshell -f $datadir/Horizontal_Deskbar.gdl\
- --- -on -og -24+48 'ACE ,ACE_32.png'\
- --- -on -og -24+96 'ACE File_Manager ,gtk-directory'\
- --- -on -og -24+144\
- 'ACE -A GUIDL File_System_Panel ,gtk-harddisk'\
- --- -on -og -24+192\
- 'ACE -A GUIDL Network_Panel ,gtk-network'\
- --- -on -og -24-48 'rm -rf ,gtk-delete'
- else
- touch $SHORTCUTS
- ACE -A GUIDL Horizontal_Deskbar $(cat $SHORTCUTS)
- fi
-else
- WIDTH=`xdpyinfo | grep dim | awk '{print $2}' | cut -dx -f1`
- gtkshell\
- -or 1 -on\
- -oi "menu"\
- -og ${WIDTH}x20+0-0\
- -aAm\
- "ACE,gtk-find"\
- "ACE Lock & # Lock,gtk-dialog-authentication"\
- "ACE File_Manager & # Files,gtk-open"\
- "ACE Screen & # Screen,gtk-network"\
- "ACE Terminal & # Terminal,gtk-execute"\
- "ACE Browser & # Browser,gtk-dnd"\
- "ACE Sticky & # Sticky_Note,gtk-copy"\
- "ACE Editor & # Editor,gtk-edit"\
- "ACE Calculator & # Calculator,gtk-execute"\
- "ACE Chat & # Chat,gtk-connect"\
- "ACE Word & # Office,gtk-new"\
- "ACE CD_Player & # Music,gtk-media-play"\
- -oH -aAc
-fi
-
Index: ACE-desktop/hacks/deskbar2.sh
===================================================================
RCS file: ACE-desktop/hacks/deskbar2.sh
diff -N ACE-desktop/hacks/deskbar2.sh
--- ACE-desktop/hacks/deskbar2.sh 25 Aug 2010 20:50:49 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-gtkshell\
- -or 1 -on\
- -oi "menu"\
- -og 1440x20+0-0\
- -aAm\
- "ACE & # Ace,start-here"\
- "ACE Lock & # Lk,gnome-lockscreen"\
- "ACE File_Manager & # Fm,file-manager"\
- "ACE Screen & # Scrn,gtk-network"\
- "ACE Terminal & # Trm,terminal"\
- "ACE Browser & # Www,web-browser"\
- "ACE Sticky & # Sn,gtk-copy"\
- "ACE Editor & # Edt,text-editor"\
- "ACE Calculator & # Clc,calc"\
- "ACE Chat & # Cht,pidgin"\
- "ACE Word & # Wp,wordprocessing"\
- "ACE Spreadsheet & # Ss,spreadsheet"\
- "ACE CD_Player & # Mus,audio-x-generic"\
- -aul date
-
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright ACE-desktop/ACE ACE-desktop/system.an...,
Jeffrey Bedard <=