[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright ACE-desktop/ACE gtkshell/button.c gtk...
|
From: |
Jeffrey Bedard |
|
Subject: |
[Antiright-devel] antiright ACE-desktop/ACE gtkshell/button.c gtk... |
|
Date: |
Mon, 19 Feb 2007 20:58:07 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/02/19 20:58:07
Modified files:
ACE-desktop : ACE
gtkshell : button.c gtkshell.h label.c row.c row.h text.c
updated_progress.c
Log message:
Fixed layout, such that labels, single line text areas, and buttons do
not expand to fill empty space. This should allow more complex and
condensed layouts.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/ACE?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/button.c?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.h?cvsroot=antiright&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/label.c?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/row.c?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/row.h?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/text.c?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_progress.c?cvsroot=antiright&r1=1.3&r2=1.4
Patches:
Index: ACE-desktop/ACE
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/ACE,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ACE-desktop/ACE 18 Feb 2007 22:43:25 -0000 1.3
+++ ACE-desktop/ACE 19 Feb 2007 20:58:07 -0000 1.4
@@ -34,7 +34,7 @@
ACE_Verification()
{
$ARSHELL -os -or 1 -oe -al "$(echo $1 __ | tr '_' ' ')"\
- 'echo -n 1 \# Yes' 'echo -n 0 \# No'
+ 'echo Yes' 'echo No'
}
ACE_Check_Configuration_File()
{
@@ -90,11 +90,14 @@
exec twm
fi
}
+Console()
+{
+ nice gtkshell -os -ou 5000 -aul 'tail -n 3 /var/log/messages'
+}
swap_load()
{
echo -n ' '
swapctl -l | tail -n 1 | awk '{print $5}' | tr -d '\n'
-# echo -n ' ' Swap Used ' '
}
taskbar_update()
{
@@ -106,21 +109,7 @@
}
Sticky_Note()
{
- $ARSHELL -aT -og 128x128
-}
-X_dimensions()
-{
- xdpyinfo\
- | awk -v field=$1 '/dim/{dimensions=$2}\
- END{split(dimensions, xy, "x"); print xy[field];}'
-}
-X_width()
-{
- X_dimensions 1
-}
-X_height()
-{
- X_dimensions 2
+ $ARSHELL -os -aT -og 175x200
}
Deskbar()
{
@@ -193,9 +182,9 @@
if grep script $TMP; then
$@ &
elif grep HTML $TMP; then
- ACE Terminal -e lynx $1 &
+ ACE Browser $1 &
elif grep text $TMP; then
- ACE -A Text_Editor $1 &
+ ACE Text_Editor $1 &
elif grep executable $TMP; then
# Execute the file and any arguments.
$@ &
@@ -219,33 +208,34 @@
wine $1 &
elif grep "No such file or directory" $TMP; then
touch $1
- ACE -A Text_Editor $1 &
+ ACE Text_Editor $1 &
elif grep empty $TMP; then
- ACE -A Text_Editor $1 &
+ ACE Text_Editor $1 &
elif grep directory $TMP; then
cd $1
- ACE -A File_Manager
+ ACE File_Manager
else
# Execute the file.
$@ &
fi
else
- $ARSHELL -al "No arguments were specified" &
+ $ARSHELL -de "No arguments were specified" &
fi
rm -f $TMP
}
Read_Man_Page()
{
- ACE Terminal -T $2 -e man $1 $2
+ ACE Terminal -e man $1 $2
}
Man_Browse_Section()
{
local tf=/tmp/antiright_mbs.$$
touch $tf
+ trap "rm -f $tf" EXIT
chmod og-rwx $tf
chmod u+x $tf
echo '#!/bin/sh' >> $tf
- echo "$ARSHELL -or 42\\" >> $tf
+ echo "$ARSHELL -og 500x450 -or 42\\" >> $tf
manual_root=$(ACE Manual_Root)
cd $manual_root/man$1
echo "'Manual Section "$1"' \\" >> $tf
@@ -253,14 +243,19 @@
echo " 'ACE -A Read_Man_Page "$1 $file"' \\" >> $tf
done
echo " 'ACE -A Man_Browse_Section $1 # Back'" >> $tf
- #cat $tf > /tmp/tf.out
+
+if [ "DEBUG" = "1"]; then
+ cat $tf > /tmp/tf.out
+fi
+
$tf
rm -f $tf
}
Manual_Browser()
{
mbs=Man_Browse_Section
- $ARSHELL -or 1 -al "Manual section:" "ACE -A $mbs 1" "ACE -A $mbs 2"\
+ $ARSHELL -os -or 3 -al "Manual section:" -al ' ' -al ' '\
+ "ACE -A $mbs 1" "ACE -A $mbs 2"\
"ACE -A $mbs 3" "ACE -A $mbs 4" "ACE -A $mbs 5"\
"ACE -A $mbs 6" "ACE -A $mbs 7" "ACE -A $mbs 8" "ACE -A $mbs 9"
}
@@ -268,56 +263,44 @@
{
rmp " " $1
}
-NetBSD_Package_Info()
-{
- pkg_info > /tmp/pkg_info.$$
- ACE Terminal -e less /tmp/pkg_info.$$ &
- rm -f /tmp/pkg_info.$$
-}
-NetBSD_Panel()
-{
- $ARSHELL -or 4 -og 64x32\
- 'ACE -A NetBSD_Package_Info'
-}
+
ACE_Panel()
{
- $ARSHELL -os -or 5 -og 410x240\
+ $ARSHELL -os -or 4 \
'ACE IRC' \
'ACE CD_Player' \
'ACE File_Manager' \
'ACE -A Manual_Browser' \
'ACE -A Alarm' \
'ACE Mail' \
- 'ACE -A Background_Editor' \
'ACE -A Settings' \
'ACE -A Command' \
'ACE -A Administration_Panel' \
- 'ACE -A NetBSD_Panel' \
'ACE -A File_System_Panel' \
'ACE -A Network_Panel' \
- 'ACE -A Publishing_Panel'\
- 'ACE -A Manual_Browser'
+ 'ACE -A Manual_Browser' \
+ 'ACE -A Publishing_Panel' \
+ 'ACE -A Calendar'\
+ 'ACE -A OS_Specific'\
+ 'gtkshell -da & # About'
}
+OS_Specific()
+{
+ $ARSHELL -di 'No OS specific functionality available.'
+}
Command()
{
- $ARSHELL -al 'Command:' -ap env
+ $ARSHELL -os -al 'Command:' -ap env
}
Calendar()
{
- ACE Terminal -e "cal | less"
+ $ARSHELL -os -al "$(cal)"
}
ARI()
{
$ARSHELL 'make install; $ARSHELL -r 1 Done; echo Install' > /dev/null &
}
-return_pseudorandom_color()
-{
- local colors="powderblue lavender pink wheat azure antiquewhite \
- lightsteelblue gainsboro thistle darkseagreen"
- local ones=$(date +%S | cut -c 2)
- echo $colors | awk '{print $'$(($ones+1))'}'
-}
Diff()
{
local file_a="$($ARSHELL -al 'Select the first file.' -al FIXME)"
@@ -375,9 +358,9 @@
}
Alarm()
{
- local alarm_time="$($ARSHELL -al 'Alarm Time (ex 22:40):' -ap echo)"
+ local alarm_time="$($ARSHELL -os -al 'Alarm Time (ex 22:40):' -ap echo)"
if [ "$alarm_time" != "" ]; then
- $ARSHELL -al "Alarm Command:" -ap echo | at "$alarm_time"
+ $ARSHELL -os -al "Alarm Command:" -ap echo | at "$alarm_time"
fi
}
@@ -435,7 +418,11 @@
}
Secure_Permissions()
{
+ local choice=$(ACE_Verification\
+ Make_all_your_files_invisible_to_other_users?)
+ if [ "$choice" = "Yes" ]; then
chmod -R o-w ~/*
+ fi
}
See_Open_Ports()
{
@@ -614,7 +601,7 @@
exit 0
;;
L|+L)
- arguments=$($ARSHELL -al 'Launch Arguments:' -ap "echo")
+ arguments=$($ARSHELL -os -al 'Launch Arguments:' -ap "echo")
shift $(($OPTIND - 1))
$@ $arguments &
exit 0
Index: gtkshell/button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/button.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtkshell/button.c 18 Feb 2007 22:43:25 -0000 1.6
+++ gtkshell/button.c 19 Feb 2007 20:58:07 -0000 1.7
@@ -46,7 +46,7 @@
g_signal_connect(G_OBJECT(gsh->button), "clicked",
G_CALLBACK(system_cb), cb);
- gsh_manage(gsh, gsh->button);
+ gsh_manage_unexpanded(gsh, gsh->button);
#ifdef DEBUG
g_debug("==> row: %d out of %d rows\n",
Index: gtkshell/gtkshell.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gtkshell/gtkshell.h 19 Feb 2007 01:43:09 -0000 1.10
+++ gtkshell/gtkshell.h 19 Feb 2007 20:58:07 -0000 1.11
@@ -54,7 +54,6 @@
struct GSH_Rows rows;
struct GSH_Flags flags;
struct GSH_Updater update;
- GtkWidget *label;
GtkWidget *button;
gchar *geometry;
};
Index: gtkshell/label.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/label.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/label.c 17 Feb 2007 23:29:53 -0000 1.3
+++ gtkshell/label.c 19 Feb 2007 20:58:07 -0000 1.4
@@ -28,11 +28,11 @@
GtkWidget *label;
label = gtk_label_new(text);
- gtk_label_set_line_wrap(GTK_LABEL(label), FALSE);
+ gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
gtk_label_set_single_line_mode(GTK_LABEL(label), FALSE);
if(gsh->flags.horizontal_labels)
gtk_label_set_angle(GTK_LABEL(label), 270);
- gsh_manage(gsh, label);
+ gsh_manage_unexpanded(gsh, label);
return label;
}
Index: gtkshell/row.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/row.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtkshell/row.c 18 Feb 2007 22:43:25 -0000 1.6
+++ gtkshell/row.c 19 Feb 2007 20:58:07 -0000 1.7
@@ -23,14 +23,12 @@
#include "gtkshell.h"
void
-gsh_manage(struct GSH *gsh, GtkWidget *widget)
+gsh_manage_generic(struct GSH *gsh, GtkWidget *widget)
{
#ifdef DEBUG
ARBUG("gsh_manage()");
#endif /* DEBUG */
- gsh_check_row(gsh);
- gtk_container_add(GTK_CONTAINER(gsh->rows.v), widget);
gtk_widget_show(widget);
gsh->rows.row++;
@@ -40,12 +38,30 @@
#endif /* DEBUG */
}
+void
+gsh_manage(struct GSH *gsh, GtkWidget *widget)
+{
+ gsh_check_row(gsh);
+ gtk_container_add(GTK_CONTAINER(gsh->rows.v), widget);
+ gsh_manage_generic(gsh, widget);
+}
+
+void
+gsh_manage_unexpanded(struct GSH *gsh, GtkWidget *widget)
+{
+ gsh_check_row(gsh);
+ gtk_box_pack_start(GTK_BOX(gsh->rows.v), widget, FALSE, FALSE, 0);
+ gsh_manage_generic(gsh, widget);
+}
+
+
void
gsh_new_row(struct GSH *gsh)
{
gsh->rows.v = gtk_vbox_new(FALSE, 2);
+
gtk_container_add(GTK_CONTAINER(gsh->rows.h), gsh->rows.v);
gtk_widget_show(gsh->rows.v);
gsh->rows.row = 0;
Index: gtkshell/row.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/row.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/row.h 13 Feb 2007 03:23:28 -0000 1.4
+++ gtkshell/row.h 19 Feb 2007 20:58:07 -0000 1.5
@@ -26,6 +26,10 @@
gsh_manage(struct GSH *gsh, GtkWidget *widget);
void
+gsh_manage_unexpanded(struct GSH *gsh, GtkWidget *widget);
+
+
+void
gsh_new_row(struct GSH *gsh);
void
Index: gtkshell/text.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/text.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/text.c 19 Feb 2007 01:43:09 -0000 1.4
+++ gtkshell/text.c 19 Feb 2007 20:58:07 -0000 1.5
@@ -34,7 +34,7 @@
entry = gtk_entry_new();
g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(entry_cb),
(gpointer) cb);
- gsh_manage(gsh, entry);
+ gsh_manage_unexpanded(gsh, entry);
return(entry);
}
Index: gtkshell/updated_progress.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_progress.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/updated_progress.c 17 Feb 2007 23:07:31 -0000 1.3
+++ gtkshell/updated_progress.c 19 Feb 2007 20:58:07 -0000 1.4
@@ -36,7 +36,7 @@
{
GtkWidget *widget;
widget=gtk_progress_bar_new();
- gsh_manage(gsh, widget);
+ gsh_manage_unexpanded(gsh, widget);
gsh_add_updater(gsh, &gsh_update_progress,
command, (void*)widget);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright ACE-desktop/ACE gtkshell/button.c gtk...,
Jeffrey Bedard <=