[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: |
Thu, 06 Dec 2007 14:40:51 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/12/06 14:40:50
Modified files:
ACE-desktop : ACE system.antiright
ACE-desktop/guidl: Horizontal_Deskbar.gdl
gtkshell : clock.c guidl_options.c macros.h
option_options.c
Added files:
ACE-desktop/icons: Calculator_16.png Deck_16.png
Log message:
Add desktop icons. Add option for single-line clock.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/ACE?cvsroot=antiright&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/system.antiright?cvsroot=antiright&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl?cvsroot=antiright&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/icons/Calculator_16.png?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/icons/Deck_16.png?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/clock.c?cvsroot=antiright&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl_options.c?cvsroot=antiright&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/macros.h?cvsroot=antiright&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/option_options.c?cvsroot=antiright&r1=1.35&r2=1.36
Patches:
Index: ACE-desktop/ACE
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/ACE,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- ACE-desktop/ACE 29 Nov 2007 20:56:17 -0000 1.54
+++ ACE-desktop/ACE 6 Dec 2007 14:40:49 -0000 1.55
@@ -163,7 +163,9 @@
GUIDL()
{
- exec $ARSHELL -f $datadir/$1.gdl
+ local GUIDLFILE="$datadir/$1.gdl"
+ shift
+ exec $ARSHELL -f $GUIDLFILE $@
}
IDE()
@@ -370,6 +372,11 @@
nice $ARSHELL -oT 'Note' -aT -og 175x200
}
+Deskbar_Icon_Arguments()
+{
+ echo "--- 'Exit___ ,gtk-quit' -al Exit"
+}
+
Deskbar()
{
local STYLE="$(ACE deskbar_style)"
@@ -377,8 +384,19 @@
if [ "$STYLE" = "0" ]; then
GUIDL Old_Deskbar
else
+ 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
GUIDL Horizontal_Deskbar
fi
+ fi
}
Read_Man_Page()
{
Index: ACE-desktop/system.antiright
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/system.antiright,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- ACE-desktop/system.antiright 12 Nov 2007 11:30:46 -0000 1.17
+++ ACE-desktop/system.antiright 6 Dec 2007 14:40:49 -0000 1.18
@@ -45,3 +45,4 @@
hosts_to_monitor: echo localhost heap compaq
mp3_dir:echo /home/jefbed/archive/amusic
mp3_player:echo mpg123
+Desk_Icons:echo 1
Index: ACE-desktop/guidl/Horizontal_Deskbar.gdl
===================================================================
RCS file:
/sources/antiright/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- ACE-desktop/guidl/Horizontal_Deskbar.gdl 12 Nov 2007 22:36:27 -0000
1.43
+++ ACE-desktop/guidl/Horizontal_Deskbar.gdl 6 Dec 2007 14:40:49 -0000
1.44
@@ -6,6 +6,8 @@
option "no fill";
//option "check commands";
+
+
add button "ACE ,Deck_32.png::\n
::-->,multimedia_16.png::Audio/Video::\n
::gmplayer,multimedia_16.png::\n
@@ -77,6 +79,7 @@
::ACE -A Calendar,clock_16.png::\n
::<--::\n
::---::\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
@@ -88,10 +91,13 @@
// is set
//add prompt "env";
+//options "icon size" "menu";
+
+
// For unlabeled items, the space between the item command and the comma allows
// for a blank label.
add buttons
- "ACE -A Command # Command ,gtk-execute",
+ "ACE -A Command ,gtk-execute",
"ACE Lock ,gtk-dialog-authentication",
"ACE Terminal ,terminal_32.png",
"ACE File_Manager ,gtk-open",
@@ -103,6 +109,7 @@
"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
Index: gtkshell/clock.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/clock.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gtkshell/clock.c 23 Nov 2007 23:15:31 -0000 1.7
+++ gtkshell/clock.c 6 Dec 2007 14:40:50 -0000 1.8
@@ -25,8 +25,15 @@
#define GSH_CLOCK_TIME_STRING_SIZE 20
+struct
+GSHClockData
+{
+ GSH * gsh;
+ GtkWidget * clock_widget;
+};
+
static void
-get_time_string(gchar * time_string)
+get_time_string(gchar * time_string, GSH * gsh)
{
time_t time_value;
@@ -38,8 +45,9 @@
#define GSHTM(element) split_time.tm_##element
(void)snprintf(time_string,
GSH_CLOCK_TIME_STRING_SIZE,
- "%.2d/%.2d/%.2d\n%.2d:%.2d:%.2d",
+ "%.2d/%.2d/%.2d%c%.2d:%.2d:%.2d",
GSHTM(mon)+1, GSHTM(mday), GSHTM(year)%100,
+ (GSH_FLAG(GSH_HORIZ_CLOCK) ? ' ' : '\n'),
GSHTM(hour), GSHTM(min), GSHTM(sec));
}
}
@@ -47,10 +55,11 @@
static void
update_clock(const gchar * command, gpointer clock_pointer)
{
+ struct GSHClockData * clock = (struct GSHClockData*)clock_pointer;
gchar time_string[GSH_CLOCK_TIME_STRING_SIZE];
- get_time_string(time_string);
- gtk_label_set_text(GTK_LABEL((GtkWidget *)clock_pointer), time_string);
+ get_time_string(time_string, clock->gsh);
+ gtk_label_set_text(GTK_LABEL(clock->clock_widget), time_string);
}
static GtkWidget *
@@ -79,9 +88,13 @@
gsh_clock_new(GSH * gsh)
{
GtkWidget * clock;
+ struct GSHClockData * clock_data;
+ clock_data=malloc(sizeof(struct GSHClockData));
gsh_widget_set_font(clock=gtk_label_new(NULL), "Mono 10");
- GSH_NEW_UPDATER(gsh, update_clock, clock);
+ clock_data->clock_widget=clock;
+ clock_data->gsh=gsh;
+ GSH_NEW_UPDATER(gsh, update_clock, (gpointer)clock_data);
gtk_widget_show(clock);
return setup_containers(clock);
Index: gtkshell/guidl_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl_options.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gtkshell/guidl_options.c 8 Nov 2007 06:41:53 -0000 1.12
+++ gtkshell/guidl_options.c 6 Dec 2007 14:40:50 -0000 1.13
@@ -51,6 +51,7 @@
DEF("icon size", "-oi");
DEF("pane next", "-op");
DEF("check commands", "-oC");
+ DEF("horizontal clock", "-oH");
}
GSH_GUIDL_ITEM_FUNC(option, DICT);
Index: gtkshell/macros.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/macros.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- gtkshell/macros.h 8 Nov 2007 06:41:53 -0000 1.17
+++ gtkshell/macros.h 6 Dec 2007 14:40:50 -0000 1.18
@@ -43,6 +43,7 @@
#define GSH_IN_SECONDARY_WIN GSHBIT(15)
#define GSH_ICON_SIZE_IS_CUSTOM GSHBIT(16)
#define GSH_CHECK_COMMANDS GSHBIT(17)
+#define GSH_HORIZ_CLOCK GSHBIT(18)
typedef guint Bitmask;
Index: gtkshell/option_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/option_options.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- gtkshell/option_options.c 8 Nov 2007 06:41:54 -0000 1.35
+++ gtkshell/option_options.c 6 Dec 2007 14:40:50 -0000 1.36
@@ -131,7 +131,9 @@
ar_asprintf(&gsh->geometry, "%s", argv[(*counter)]);
break;
-
+ case 'H':
+ GSH_SET(GSH_HORIZ_CLOCK);
+ break;
case 'h':
GSH_SET(GSH_HORIZONTAL_LABELS);
break;
Index: ACE-desktop/icons/Calculator_16.png
===================================================================
RCS file: ACE-desktop/icons/Calculator_16.png
diff -N ACE-desktop/icons/Calculator_16.png
Binary files /dev/null and /tmp/cvsPsTiuj differ
Index: ACE-desktop/icons/Deck_16.png
===================================================================
RCS file: ACE-desktop/icons/Deck_16.png
diff -N ACE-desktop/icons/Deck_16.png
Binary files /dev/null and /tmp/cvsk9zqlm differ
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright ACE-desktop/ACE ACE-desktop/system.an...,
Jeffrey Bedard <=