[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright configure ACE-desktop/system.antirigh...
|
From: |
Jeffrey Bedard |
|
Subject: |
[Antiright-devel] antiright configure ACE-desktop/system.antirigh... |
|
Date: |
Fri, 01 Jun 2007 18:51:31 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/06/01 18:51:31
Modified files:
. : configure
ACE-desktop : system.antiright
ACE-desktop/guidl: ACE_Panel.gdl Administration_Panel.gdl
Clock.gdl File_System_Panel.gdl
Horizontal_Deskbar.gdl Manual_Browser.gdl
Monitoring_Panel.gdl Network_Panel.gdl
Old_Deskbar.gdl Publishing_Panel.gdl
gtkshell : Makefile menu.c
libantiright : Makefile
Log message:
Updated static interface panels to have icons. Added missing items to
system.antiright. Added ability to set roff flags and file from
Publishing_Panel. Added manual browser link to deskbar.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/configure?cvsroot=antiright&r1=1.101&r2=1.102
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/system.antiright?cvsroot=antiright&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/ACE_Panel.gdl?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Administration_Panel.gdl?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Clock.gdl?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/File_System_Panel.gdl?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl?cvsroot=antiright&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Manual_Browser.gdl?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Monitoring_Panel.gdl?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Network_Panel.gdl?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Old_Deskbar.gdl?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Publishing_Panel.gdl?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/Makefile?cvsroot=antiright&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/menu.c?cvsroot=antiright&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/Makefile?cvsroot=antiright&r1=1.12&r2=1.13
Patches:
Index: configure
===================================================================
RCS file: /sources/antiright/antiright/configure,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- configure 26 May 2007 16:02:28 -0000 1.101
+++ configure 1 Jun 2007 18:51:29 -0000 1.102
@@ -100,7 +100,9 @@
DEFS="$DEFS -DHAVE_VTE"
echo 'VTE=1' >> config.mk
INCLUDE="$INCLUDE $(pkg-config --cflags vte)"
- LDFLAGS="$LDFLAGS $(pkg-config --libs vte)"
+# Do not include previous contents to ensure proper library ordering.
+# Because of this, non-gtk specific libraries should follow.
+ LDFLAGS="$(pkg-config --libs vte)"
else
echo not found
fi
Index: ACE-desktop/system.antiright
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/system.antiright,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ACE-desktop/system.antiright 1 Jun 2007 04:04:19 -0000 1.11
+++ ACE-desktop/system.antiright 1 Jun 2007 18:51:30 -0000 1.12
@@ -76,4 +76,6 @@
Deskbar_Y:echo +0
Custom_Updater: biff
Terminal: gshterm
+roff_flags: -me
+roff_file: ~/default.roff
Index: ACE-desktop/guidl/ACE_Panel.gdl
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/guidl/ACE_Panel.gdl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ACE-desktop/guidl/ACE_Panel.gdl 26 May 2007 21:46:08 -0000 1.5
+++ ACE-desktop/guidl/ACE_Panel.gdl 1 Jun 2007 18:51:30 -0000 1.6
@@ -5,7 +5,7 @@
add buttons
"ACE IRC,gtk-execute",
"ACE File_Manager,gtk-open",
- "ACE GUIDL Manual_Browser,gtk-execute",
+ "ACE -A GUIDL Manual_Browser,gtk-execute",
"ACE CD_Player,gtk-cdrom",
"ACE Calculator,gtk-execute",
"ACE -A Alarm,gtk-execute",
Index: ACE-desktop/guidl/Administration_Panel.gdl
===================================================================
RCS file:
/sources/antiright/antiright/ACE-desktop/guidl/Administration_Panel.gdl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ACE-desktop/guidl/Administration_Panel.gdl 19 Mar 2007 07:09:30 -0000
1.1
+++ ACE-desktop/guidl/Administration_Panel.gdl 1 Jun 2007 18:51:30 -0000
1.2
@@ -1,6 +1,6 @@
option "rows" 4;
-add buttons "ACE -A Secure_Permissions",
- "ACE Root_Shell",
- "ACE -A Monitoring_Panel",
- "ACE -A OS_Specific";
+add buttons "ACE -A Secure_Permissions,gtk-dialog-authentication",
+ "ACE Root_Shell,Terminal_32.png",
+ "ACE -A Monitoring_Panel,System_Monitor_32.png",
+ "ACE -A OS_Specific,gtk-open";
Index: ACE-desktop/guidl/Clock.gdl
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/guidl/Clock.gdl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ACE-desktop/guidl/Clock.gdl 16 Apr 2007 02:23:29 -0000 1.2
+++ ACE-desktop/guidl/Clock.gdl 1 Jun 2007 18:51:30 -0000 1.3
@@ -2,6 +2,5 @@
option "undecorated";
option "title" "Clock";
option "geometry" "-0-0";
-
-add "updating label" "date | tr '\n' ' '";
+add "clock applet";
Index: ACE-desktop/guidl/File_System_Panel.gdl
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/guidl/File_System_Panel.gdl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ACE-desktop/guidl/File_System_Panel.gdl 9 Apr 2007 20:40:05 -0000
1.1
+++ ACE-desktop/guidl/File_System_Panel.gdl 1 Jun 2007 18:51:30 -0000
1.2
@@ -1,8 +1,8 @@
// Static definition for ACE File System Panel follows.
option "rows" 2;
-add buttons "ACE -A Mount_File_System",
- "ACE -A Unmount_File_System",
- "ACE See_Free_Space",
- "ACE -A Show_All_File_Systems",
- "ACE -A Diff";
+add buttons "ACE -A Mount_File_System,gtk-connect",
+ "ACE -A Unmount_File_System,gtk-disconnect",
+ "ACE See_Free_Space,gtk-info",
+ "ACE -A Show_All_File_Systems,gtk-harddisk",
+ "ACE -A Diff,gtk-info";
Index: ACE-desktop/guidl/Horizontal_Deskbar.gdl
===================================================================
RCS file:
/sources/antiright/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- ACE-desktop/guidl/Horizontal_Deskbar.gdl 26 May 2007 21:46:08 -0000
1.18
+++ ACE-desktop/guidl/Horizontal_Deskbar.gdl 1 Jun 2007 18:51:30 -0000
1.19
@@ -83,6 +83,7 @@
::ACE -A Calendar,gtk-execute::\n
::<--::\n
::---::\n
+ ::ACE -A Manual_Browser,gtk-help::\n
::ACE -A Command & # Run...,gtk-execute::\n
::ACE & # ACE_Panel,ACE_32.png::\n
::ACE -A Lock,Lock_Display_32.png";
Index: ACE-desktop/guidl/Manual_Browser.gdl
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/guidl/Manual_Browser.gdl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ACE-desktop/guidl/Manual_Browser.gdl 16 Apr 2007 02:23:29 -0000
1.2
+++ ACE-desktop/guidl/Manual_Browser.gdl 1 Jun 2007 18:51:30 -0000
1.3
@@ -1,14 +1,13 @@
option "rows" 3;
add "label" "Manual section:";
-add "label" " ";
-add "label" " ";
-add buttons "ACE -A Man_Browse_Section 1",
- "ACE -A Man_Browse_Section 2",
- "ACE -A Man_Browse_Section 3",
- "ACE -A Man_Browse_Section 4",
- "ACE -A Man_Browse_Section 5",
- "ACE -A Man_Browse_Section 6",
- "ACE -A Man_Browse_Section 7",
- "ACE -A Man_Browse_Section 8",
- "ACE -A Man_Browse_Section 9";
+add "row";
+add buttons "ACE -A Man_Browse_Section 1,gtk-help",
+ "ACE -A Man_Browse_Section 2,gtk-help",
+ "ACE -A Man_Browse_Section 3,gtk-help",
+ "ACE -A Man_Browse_Section 4,gtk-help",
+ "ACE -A Man_Browse_Section 5,gtk-help",
+ "ACE -A Man_Browse_Section 6,gtk-help",
+ "ACE -A Man_Browse_Section 7,gtk-help",
+ "ACE -A Man_Browse_Section 8,gtk-help",
+ "ACE -A Man_Browse_Section 9,gtk-help";
Index: ACE-desktop/guidl/Monitoring_Panel.gdl
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/guidl/Monitoring_Panel.gdl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ACE-desktop/guidl/Monitoring_Panel.gdl 19 Mar 2007 07:09:30 -0000
1.1
+++ ACE-desktop/guidl/Monitoring_Panel.gdl 1 Jun 2007 18:51:30 -0000
1.2
@@ -1,10 +1,11 @@
option "rows" 4;
-add buttons "gtkshell -os -og 640x480 -ou 3000 -aul 'ps xau' & # Processes",
- "gtkshell -ou 2000 -aul who & # Users",
- "gtkshell -ou 5000 -aul df & # Disks",
- "ACE System_Monitor",
- "gtkshell -ou 2500 -aul uptime & # Uptime",
- "ACE -A System_Accounting",
- "xload -bg darkslategrey -fg white -hl azure & # XLoad",
- "gtkshell -aul iostat";
+add buttons
+ "gtkshell -os -og 640x480 -ou 3000 -aul 'ps xau' & #
Processes,gtk-execute",
+ "gtkshell -ou 2000 -aul who & # Users,gtk-info",
+ "gtkshell -ou 5000 -aul df & # Disks,gtk-harddisk",
+ "ACE System_Monitor,System_Monitor_32.png",
+ "gtkshell -ou 2500 -aul uptime & # Uptime,gtk-info",
+ "ACE -A System_Accounting,gtk-index",
+ "xload -bg darkslategrey -fg white -hl azure & #
XLoad,System_Monitor_32.png",
+ "gtkshell -aul iostat,System_Monitor_32.png";
Index: ACE-desktop/guidl/Network_Panel.gdl
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/guidl/Network_Panel.gdl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ACE-desktop/guidl/Network_Panel.gdl 6 Apr 2007 15:42:55 -0000 1.1
+++ ACE-desktop/guidl/Network_Panel.gdl 1 Jun 2007 18:51:30 -0000 1.2
@@ -1,13 +1,13 @@
// Static definition for ACE Network Panel.
option "rows" 5;
-add buttons "ACE -A Open_Display",
- "ACE -A Open_URL",
- "ACE -A ACE_peer_operation ftp",
- "ACE -A ACE_peer_operation sftp",
- "ACE -A ACE_peer_operation ssh",
- "ACE -A ACE_peer_operation telnet",
- "ACE -A See_Open_Ports",
- "ACE PPP_On", "ACE PPP_Off";
+add buttons "ACE -A Open_Display,gtk-open",
+ "ACE -A Open_URL,gtk-jump-to",
+ "ACE -A ACE_peer_operation ftp,gtk-connect",
+ "ACE -A ACE_peer_operation sftp,gtk-dialog-authentication",
+ "ACE -A ACE_peer_operation ssh,gtk-dialog-authentication",
+ "ACE -A ACE_peer_operation telnet,gtk-connect",
+ "ACE -A See_Open_Ports,gtk-network",
+ "ACE PPP_On,gtk-connect", "ACE PPP_Off,gtk-disconnect";
Index: ACE-desktop/guidl/Old_Deskbar.gdl
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/guidl/Old_Deskbar.gdl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ACE-desktop/guidl/Old_Deskbar.gdl 16 Apr 2007 02:23:29 -0000 1.2
+++ ACE-desktop/guidl/Old_Deskbar.gdl 1 Jun 2007 18:51:30 -0000 1.3
@@ -1,7 +1,12 @@
option "geometry" "+0+0";
option "rows" 1;
add "updating label" "date";
-add buttons "ACE Lock", "ACE Screen", "ACE Terminal", "ACE Browser",
- "ACE Sticky_Note", "ACE";
+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,gtk-execute";
add "prompt" "env";
Index: ACE-desktop/guidl/Publishing_Panel.gdl
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/guidl/Publishing_Panel.gdl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ACE-desktop/guidl/Publishing_Panel.gdl 9 Apr 2007 20:40:05 -0000
1.1
+++ ACE-desktop/guidl/Publishing_Panel.gdl 1 Jun 2007 18:51:30 -0000
1.2
@@ -1,11 +1,13 @@
// Static definition for runoff-based publishing utilties.
-option "rows" 4;
+option "rows" 3;
-add buttons "ACE -A Preview_roff",
- "ACE -A Print_roff",
- "ACE -A Save_PDF",
- "ACE -A Save_PS",
- "ACE -A Save_TEXT",
- "ACE -A Save_JPEG",
- "ACE -A Word_Count_roff";
+add buttons "ACE -A Preview_roff,gtk-print-preview",
+ "ACE -A Print_roff,gtk-print-preview",
+ "ACE -A Save_PDF,gtk-save",
+ "ACE -A Save_PS,gtk-save",
+ "ACE -A Save_TEXT,gtk-save",
+ "ACE -A Save_JPEG,gtk-save",
+ "ACE -A Word_Count_roff & # Count_Words,gtk-info",
+ "ACE -A Settings_Node roff_file,gtk-file",
+ "ACE -A Settings_Node roff_flags,gtk-preferences";
Index: gtkshell/Makefile
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/Makefile,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- gtkshell/Makefile 26 May 2007 16:02:28 -0000 1.34
+++ gtkshell/Makefile 1 Jun 2007 18:51:30 -0000 1.35
@@ -26,7 +26,8 @@
include ../config.mk
CFLAGS+=$(DEFS) $(INCLUDE)
-LDFLAGS+=-L../libantiright -lantiright
+GTKFLAGS=$(LDFLAGS)
+ARFLAGS=-L../libantiright -lantiright
#LDFLAGS+=-lefence
@@ -45,7 +46,7 @@
gtkshell: y.tab.h $(objects) $(program)
- $(CC) -o gtkshell $(objects) $(program) $(LDFLAGS)
+ $(CC) -o gtkshell $(objects) $(program) $(ARFLAGS) $(LDFLAGS)
ar rcs libgtkshell.a $(objects)
lex.yy.c: guidl.lex
Index: gtkshell/menu.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/menu.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- gtkshell/menu.c 23 May 2007 14:57:46 -0000 1.21
+++ gtkshell/menu.c 1 Jun 2007 18:51:30 -0000 1.22
@@ -35,6 +35,20 @@
}
static void
+parse_special_and_noicon_items(GSH * gsh, gchar ** pair)
+{
+ /* Test if a separator should be created. */
+ if(!strncmp(pair[0], "---", 3))
+ setup_separator_menu_item(gsh);
+ /* String does not contain \n. */
+ else if(strncmp(pair[0], "\\n", 2))
+ { /* Support continuation lines for menu specification. */
+ /* Create a button. */
+ $(gsh, add.button, pair[0]);
+ }
+}
+
+static void
menuitem_parse(struct GSH * gsh, gchar * string)
{
gchar **pair;
@@ -46,28 +60,16 @@
if(pair[1])
gsh_image_button(gsh, pair[0], pair[1]);
else
- {
- /* Test if a separator should be created. */
- if(!strncmp(pair[0], "---", 3))
- setup_separator_menu_item(gsh);
- /* String does not contain \n. */
- else if(strncmp(pair[0], "\\n", 2))
- { /* Support continuation lines for menu specification. */
- /* Create a button. */
- $(gsh, add.button, pair[0]);
- }
- }
+ parse_special_and_noicon_items(gsh, pair);
g_strfreev(pair);
}
static void
set_submenu_label(gpointer widget, gpointer user_data)
{
- const gchar * text = (const gchar *)user_data;
- GtkWidget * label = (GtkWidget *)widget;
-
- if(GTK_IS_LABEL(label))
- gtk_label_set_text(GTK_LABEL(label), text);
+ if(GTK_IS_LABEL((GtkWidget *)widget))
+ gtk_label_set_text(GTK_LABEL((GtkWidget *)widget),
+ (const gchar *)user_data);
}
static void
@@ -119,7 +121,6 @@
for(i=1; ARPBOOL(tokens[i]); i++)
{
- const gchar * submenu_open = "-->";
const gchar * submenu_close = "<--";
if(!strncmp(tokens[i], submenu_close, 3))
@@ -129,6 +130,7 @@
}
else
{
+ const gchar * submenu_open = "-->";
const gboolean start_submenu = (!strncmp(tokens[i],
submenu_open, 3) && submenu_count < max_menus);
Index: libantiright/Makefile
===================================================================
RCS file: /sources/antiright/antiright/libantiright/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- libantiright/Makefile 20 May 2007 18:29:58 -0000 1.12
+++ libantiright/Makefile 1 Jun 2007 18:51:31 -0000 1.13
@@ -1,6 +1,5 @@
include ../config.mk
-CFLAGS+=`pkg-config --cflags glib-2.0`
CFLAGS+=$(DEFS) $(INCLUDE)
all: libantiright.a
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright configure ACE-desktop/system.antirigh...,
Jeffrey Bedard <=