[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright ACE-desktop/guidl/ACE_Panel.gdl ACE-d...
From: |
Jeffrey Bedard |
Subject: |
[Antiright-devel] antiright ACE-desktop/guidl/ACE_Panel.gdl ACE-d... |
Date: |
Wed, 25 Jul 2007 04:42:39 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/07/25 04:42:39
Modified files:
ACE-desktop/guidl: ACE_Panel.gdl Horizontal_Deskbar.gdl
Old_Deskbar.gdl
ACE-desktop/hacks: juke.sh
doc : gtkshell.1
gtkshell : add_options.c gtkshell.h guidl_util.c options.c
tree.c
Removed files:
ACE-desktop/icons: File_Manager.png File_Manager_32.png
Lock_Display.png Lock_Display_32.png
Text_Editor.png Text_Editor_32.png
Log message:
Removed redundant icons. Added gtk list/tree support. Fixed premature
freeing
of non-option argument strings from guidl results. Icon fixups.
Added manual page for list addition option.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/ACE_Panel.gdl?cvsroot=antiright&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl?cvsroot=antiright&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Old_Deskbar.gdl?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/hacks/juke.sh?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/icons/File_Manager.png?cvsroot=antiright&r1=1.2&r2=0
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/icons/File_Manager_32.png?cvsroot=antiright&r1=1.2&r2=0
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/icons/Lock_Display.png?cvsroot=antiright&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/icons/Lock_Display_32.png?cvsroot=antiright&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/icons/Text_Editor.png?cvsroot=antiright&r1=1.2&r2=0
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/icons/Text_Editor_32.png?cvsroot=antiright&r1=1.2&r2=0
http://cvs.savannah.gnu.org/viewcvs/antiright/doc/gtkshell.1?cvsroot=antiright&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/add_options.c?cvsroot=antiright&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.h?cvsroot=antiright&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl_util.c?cvsroot=antiright&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/options.c?cvsroot=antiright&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/tree.c?cvsroot=antiright&r1=1.1&r2=1.2
Patches:
Index: ACE-desktop/guidl/ACE_Panel.gdl
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/guidl/ACE_Panel.gdl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ACE-desktop/guidl/ACE_Panel.gdl 3 Jun 2007 05:53:52 -0000 1.7
+++ ACE-desktop/guidl/ACE_Panel.gdl 25 Jul 2007 04:42:37 -0000 1.8
@@ -5,27 +5,30 @@
option "icon size" "menu";
add button "File::Exit___,gtk-quit";
add button "Help::gtkshell -da & # About,gtk-about";
-option "icon size" "large toolbar";
+//option "icon size" "large toolbar";
+option "icon size" "DND";
add buttons
- "ACE IRC,gtk-execute",
+ "ACE IRC,gtk-connect",
"ACE File_Manager,gtk-open",
- "ACE -A GUIDL Manual_Browser,gtk-execute",
+ "ACE -A GUIDL Manual_Browser,gtk-help",
"ACE CD_Player,gtk-cdrom",
- "ACE Calculator,gtk-execute",
+ "ACE Calculator,Calculator_32.png",
"ACE -A Alarm,gtk-execute",
- "ACE Mail,gtk-execute",
+ "ACE Mail,gtk-connect",
"ACE -A Settings,gtk-preferences",
"ACE -A Command,gtk-execute",
"ACE -A GUIDL Administration_Panel,gtk-preferences",
"ACE Lock_Display,gtk-dialog-authentication",
- "ACE Terminal,gtk-execute",
- "ACE Sticky_Note,gtk-edit",
- "ACE Browser,gtk-execute",
+ "ACE Terminal,Terminal_32.png",
+ "ACE Sticky_Note,Sticky_Note_32.png",
+ "ACE Browser,Browser_32.png",
"ACE Image_Editor,gtk-select-color",
"ACE Word_Processor,gtk-edit",
"ACE -A GUIDL File_System_Panel,gtk-harddisk",
"ACE -A GUIDL Network_Panel,gtk-network",
"ACE -A GUIDL Publishing_Panel,gtk-print",
"ACE -A Calendar,gtk-execute",
- "ACE -A IDE,gtk-edit";
+ "ACE -A IDE,gtk-edit",
+ "More...::\n
+ ::test";
Index: ACE-desktop/guidl/Horizontal_Deskbar.gdl
===================================================================
RCS file:
/sources/antiright/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- ACE-desktop/guidl/Horizontal_Deskbar.gdl 3 Jun 2007 05:53:52 -0000
1.20
+++ ACE-desktop/guidl/Horizontal_Deskbar.gdl 25 Jul 2007 04:42:37 -0000
1.21
@@ -4,12 +4,8 @@
option "geometry" "+0-0";
option "undecorated";
option "no fill";
-// menu button
-//add button "ACE,ACE_32.png::ACE,ACE_32.png::ACE -A IDE,Text_Editor_32.png::\n
-// ::---::eclipse-3.2,gtk-execute::eclipse,gtk-execute::---::\n
-// ::ACE -A Settings,gtk-preferences";
-add button "ACE,ACE_32.png::\n
+add button "ACE,Deck_32.png::\n
::-->::Audio/Video::\n
::xine,gtk-media-play::\n
::xmms,gtk-media-play::\n
@@ -33,7 +29,7 @@
::xlife & # XLife,gtk-execute::\n
::<--::\n
::-->::Game::\n
- ::-->::BSD_Games::\n
+ ::-->,gtk-open::BSD_Games::\n
::ACE Terminal -e atc & # Air_Traffic_Control::\n
::ACE Terminal -e boggle & # Boggle::\n
::ACE Terminal -e cribbage & # Cribbage::\n
@@ -47,10 +43,10 @@
::ACE Terminal -e tetris & # Tetris::\n
::ACE Terminal -e wump & # Wumpus::\n
::<--::\n
- ::xboard & # Chess::\n
- ::civclient & # Civilization::\n
- ::lbreakout & # LBreakout::\n
- ::ltris & # LTris::\n
+ ::xboard & # Chess,gtk-execute::\n
+ ::civclient & # FreeCiv,gtk-execute::\n
+ ::lbreakout & # LBreakout,gtk-execute::\n
+ ::ltris & # LTris,gtk-execute::\n
::<--::\n
::-->::Graphics::\n
::gimp,gtk-color-picker::\n
@@ -90,8 +86,8 @@
::ACE -A GUIDL 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";
-add "separator";
+ ::ACE -A Lock,gtk-dialog-authentication";
+//add "separator";
add button "ACE -A Command ,gtk-execute";
// command prompt
@@ -102,20 +98,17 @@
// For unlabeled items, the space between the item command and the comma allows
// for a blank label.
add buttons
- "ACE Lock ,Lock_Display_32.png",
+ "ACE Lock ,gtk-dialog-authentication",
"ACE Terminal ,Terminal_32.png",
- "ACE File_Manager ,File_Manager_32.png",
+ "ACE File_Manager ,gtk-open",
"ACE Browser ,Browser_32.png",
- "ACE Text_Editor ,Text_Editor_32.png",
+ "ACE Text_Editor ,gtk-edit",
"ACE Calculator ,Calculator_32.png",
"ACE Sticky_Note ,Sticky_Note_32.png";
add "separator";
add buttons
"ACE Screen,Screen_32.png",
"ACE System_Monitor,System_Monitor_32.png";
-add "separator";
-// Add a clock.
-//add "updating label" "date '+%m/%d/%y%n%H:%M:%S'";
add "clock applet";
// Uncomment the following if you want a custom command updated each
Index: ACE-desktop/guidl/Old_Deskbar.gdl
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/guidl/Old_Deskbar.gdl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ACE-desktop/guidl/Old_Deskbar.gdl 1 Jun 2007 18:51:30 -0000 1.3
+++ ACE-desktop/guidl/Old_Deskbar.gdl 25 Jul 2007 04:42:37 -0000 1.4
@@ -7,6 +7,6 @@
"ACE Terminal,gtk-execute",
"ACE Browser,gtk-connect",
"ACE Sticky_Note,gtk-edit",
- "ACE,gtk-execute";
+ "ACE";
add "prompt" "env";
Index: ACE-desktop/hacks/juke.sh
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/hacks/juke.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ACE-desktop/hacks/juke.sh 22 Jul 2007 16:22:28 -0000 1.2
+++ ACE-desktop/hacks/juke.sh 25 Jul 2007 04:42:38 -0000 1.3
@@ -1,21 +1,21 @@
#!/bin/sh
-MP3_DIR=$(ACE mp3_dir)
-cd $MP3_DIR
-MP3_PLAYER=$(ACE mp3_player)
+MUSIC_DIR=$(ACE mp3_dir)
+cd $MUSIC_DIR
+MUSIC_PLAYER=$(ACE mp3_player)
next_song() {
- pkill $MP3_PLAYER
+ pkill $MUSIC_PLAYER
}
stop_playing() {
rm -f *.core
- pkill -f $MP3_PLAYER juke.sh
+ pkill -f $MUSIC_PLAYER juke.sh
exit 0
}
song_title() {
- ps xaww | grep -v xargs | grep $MP3_PLAYER | grep -v '(sh)'\
+ ps xaww | grep -v xargs | grep $MUSIC_PLAYER | grep -v '(sh)'\
| awk '{print substr($0, index($0, $6)); exit(0);}'
}
@@ -42,7 +42,7 @@
}
random_song() {
- shuffle -p 1 -0 * | xargs -0 $MP3_PLAYER
+ shuffle -p 1 -0 * | xargs -0 $MUSIC_PLAYER
}
show_usage()
Index: doc/gtkshell.1
===================================================================
RCS file: /sources/antiright/antiright/doc/gtkshell.1,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- doc/gtkshell.1 27 Apr 2007 02:02:06 -0000 1.9
+++ doc/gtkshell.1 25 Jul 2007 04:42:39 -0000 1.10
@@ -14,7 +14,9 @@
command
.B ]T[t
command
-.B ]u[[l
+.B ]u[[L
+list
+.B ][l
command
.B ][p
command
@@ -86,6 +88,13 @@
.B file
in the text buffer.
.TP
+.B \-aL list
+Add a list. The format of this list is as follows: comma separated
+key-value pairs, each separated by colons.
+
+.I Example:
+gtkshell -aL "key1:value1,2:2,apple:orange,foo:bar"
+.TP
.B \-al label
Adds a label with
.B label
Index: gtkshell/add_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/add_options.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- gtkshell/add_options.c 9 Jul 2007 02:12:25 -0000 1.44
+++ gtkshell/add_options.c 25 Jul 2007 04:42:39 -0000 1.45
@@ -169,7 +169,12 @@
gsh_add_form(gsh, argv[(*counter)]);
break;
- case 'l':
+ case 'L': /* Add a list. */
+ GSH_COUNT(argc, counter);
+ $(gsh, manage, gsh_tree_view_new(gsh, argv[*counter]));
+ break;
+
+ case 'l': /* Add a label. */
GSH_COUNT(argc, counter);
$(gsh, add.label, argv[(*counter)]);
break;
Index: gtkshell/gtkshell.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- gtkshell/gtkshell.h 22 Jul 2007 19:07:32 -0000 1.55
+++ gtkshell/gtkshell.h 25 Jul 2007 04:42:39 -0000 1.56
@@ -65,7 +65,7 @@
GtkWidget * last_managed;
struct /* app mode */
{
- struct
+ struct /* menus */
{
GtkWidget * file;
GtkWidget * edit;
Index: gtkshell/guidl_util.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl_util.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- gtkshell/guidl_util.c 11 Jun 2007 21:32:41 -0000 1.22
+++ gtkshell/guidl_util.c 25 Jul 2007 04:42:39 -0000 1.23
@@ -22,15 +22,31 @@
#include "gtkshell.h"
+/* This must be eliminated if thread-safe gtkshell is to be implemented. */
struct GDLEnvironment * gsh_guidl_env=NULL;
-#define EDEL(member) ARDELETE(env->member)
+static void
+free_option_args(struct ARArguments * args)
+{
+ gint argc=args->argc-1;
+
+ for(; 0 <= argc; argc--)
+ {
+ char * arg;
+
+ arg=args->argv[argc];
+ if(arg[0] == '-')
+ g_free(arg);
+ }
+}
static void
gsh_delete_GDLEnvironment(struct GDLEnvironment * env)
{
- EDEL(dictionaries);
- EDEL(args);
+ ARDELETE(env->dictionaries);
+ /* Command line arguments should remain intact for updater widgets. */
+/* ARDELETE(env->args); */
+ free_option_args(env->args);
}
#define APPEND_ARG(env, arg) $(env->args, add, arg)
Index: gtkshell/options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/options.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- gtkshell/options.c 11 Jun 2007 21:32:43 -0000 1.29
+++ gtkshell/options.c 25 Jul 2007 04:42:39 -0000 1.30
@@ -111,8 +111,6 @@
break;
case 't': /* test area. */
{
- GSH_COUNT(argc, counter);
- $(gsh, manage, gsh_tree_view_new(gsh, argv[*counter]));
}
break;
default:
Index: gtkshell/tree.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/tree.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtkshell/tree.c 11 Jun 2007 21:32:44 -0000 1.1
+++ gtkshell/tree.c 25 Jul 2007 04:42:39 -0000 1.2
@@ -39,14 +39,46 @@
-1);
}
+static void
+split_and_add_pair(gchar * pair, GtkTreeIter * iter, GtkListStore * store)
+{
+ gchar ** split_pair;
+
+ /* Use colon-separated key-value pair. */
+ if((split_pair=g_strsplit(pair, ":", 2)))
+ {
+ add_item(store, iter,
+ (const gchar *)split_pair[0],
+ (const gchar *)split_pair[1]);
+ /* Free allocated string array. */
+ g_strfreev(split_pair);
+ }
+ else /* Allocation was not successful. */
+ {
+ ARWARN("split_pair NULL");
+ }
+}
+
+static void
+parse_input(const gchar * input, GtkListStore * store)
+{
+ GtkTreeIter iter;
+ gchar ** pairs;
+ guint counter;
+
+ for(counter=0, pairs=g_strsplit(input, ",", -1);
+ pairs[counter]; counter++)
+ split_and_add_pair(pairs[counter], &iter, store);
+ g_strfreev(pairs);
+}
+
static GtkTreeModel *
-setup_model(void)
+setup_model(const gchar * input)
{
GtkListStore * store;
- GtkTreeIter iter;
store=gtk_list_store_new(COLUMN_COUNT, G_TYPE_STRING, G_TYPE_STRING);
- add_item(store, &iter, "DISPLAY", ":0");
+ parse_input(input, store);
return GTK_TREE_MODEL(store);
}
@@ -55,6 +87,7 @@
gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view),\
-1, name, renderer, "text", id, NULL)
+
GtkWidget *
gsh_tree_view_new(GSH * gsh, const gchar * input)
{
@@ -62,7 +95,7 @@
GtkCellRenderer * renderer;
GtkWidget * view;
- model=setup_model();
+ model=setup_model(input);
view=gtk_tree_view_new();
renderer=gtk_cell_renderer_text_new();
ADD_COLUMN(view, "KEY", KEY_COLUMN);
Index: ACE-desktop/icons/File_Manager.png
===================================================================
RCS file: ACE-desktop/icons/File_Manager.png
diff -N ACE-desktop/icons/File_Manager.png
Binary files /tmp/cvsArZ7ea and /dev/null differ
Index: ACE-desktop/icons/File_Manager_32.png
===================================================================
RCS file: ACE-desktop/icons/File_Manager_32.png
diff -N ACE-desktop/icons/File_Manager_32.png
Binary files /tmp/cvstzlAa8 and /dev/null differ
Index: ACE-desktop/icons/Lock_Display.png
===================================================================
RCS file: ACE-desktop/icons/Lock_Display.png
diff -N ACE-desktop/icons/Lock_Display.png
Binary files /tmp/cvsUgSqr8 and /dev/null differ
Index: ACE-desktop/icons/Lock_Display_32.png
===================================================================
RCS file: ACE-desktop/icons/Lock_Display_32.png
diff -N ACE-desktop/icons/Lock_Display_32.png
Binary files /tmp/cvszDfJH8 and /dev/null differ
Index: ACE-desktop/icons/Text_Editor.png
===================================================================
RCS file: ACE-desktop/icons/Text_Editor.png
diff -N ACE-desktop/icons/Text_Editor.png
Binary files /tmp/cvsKoyaAb and /dev/null differ
Index: ACE-desktop/icons/Text_Editor_32.png
===================================================================
RCS file: ACE-desktop/icons/Text_Editor_32.png
diff -N ACE-desktop/icons/Text_Editor_32.png
Binary files /tmp/cvs1ca44b and /dev/null differ
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright ACE-desktop/guidl/ACE_Panel.gdl ACE-d...,
Jeffrey Bedard <=