[Antiright-devel] antiright ACE-desktop/ACE ACE-desktop/guidl/IDE...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/05/06 06:23:36

Modified files:
        ACE-desktop    : ACE 
        ACE-desktop/guidl: IDE.gdl 
        gtkshell       : button.c callbacks.c gtkshell.c gtkshell.h 
                         guidl_options.c image_button.c macros.h 
                         option_options.c 

Log message:
        Added special command handling to command callback, to allow for
        functions to be bound to specific buttons through the existing 
mechanisms.
        Added option to change icon size.
        Use icons and application mode for IDE.  Fixed IDE CD when canceled.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/ACE?cvsroot=antiright&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/IDE.gdl?cvsroot=antiright&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/button.c?cvsroot=antiright&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/callbacks.c?cvsroot=antiright&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.c?cvsroot=antiright&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.h?cvsroot=antiright&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl_options.c?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/image_button.c?cvsroot=antiright&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/macros.h?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/option_options.c?cvsroot=antiright&r1=1.25&r2=1.26

Patches:
Index: ACE-desktop/ACE
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/ACE,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- ACE-desktop/ACE     9 Apr 2007 21:01:49 -0000       1.38
+++ ACE-desktop/ACE     6 May 2007 06:23:36 -0000       1.39
@@ -74,6 +74,15 @@
        GUIDL IDE
 }
 
+IDE_CD()
+{
+       local DIR="$(gtkshell -dd)"
+       if [ "$DIR" != "" ]; then
+               cd $DIR
+               IDE &
+       fi
+}
+
 ACE_Verification()
 {
        $ARSHELL  -oT Verification -or 1 -oe -al "$(echo $1 __ | tr '_' ' ')"\

Index: ACE-desktop/guidl/IDE.gdl
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/guidl/IDE.gdl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- ACE-desktop/guidl/IDE.gdl   6 May 2007 05:00:11 -0000       1.16
+++ ACE-desktop/guidl/IDE.gdl   6 May 2007 06:23:36 -0000       1.17
@@ -8,10 +8,12 @@
 option "rows" 4;
 
 option "application";
+option "icon size" "menu";
 add buttons 
-       "File::Exit",
-       "Edit::EMPTY",
-       "Help::About";
+       "File::Exit__,gtk-quit",
+       "Help::gtkshell -da # About,gtk-about";
+
+option "icon size" "small toolbar";
 
 option "no fill";
 add "system label" "pwd";
@@ -31,13 +33,15 @@
 
 option "no fill";
 add buttons
-       "cd `gtkshell -dd` && ACE -A IDE & # CD",
-       "make", 
-       "make clean", 
-       "make install", 
-       "make test",
-       "gshterm -e cvs commit # CVS_Commit",
-       "gshterm -e cvs -q -z3 update -dP # CVS_Update";
+       "ACE -A IDE_CD # CD,gtk-open",
+       "make,gtk-save", 
+       "make clean,gtk-delete", 
+       "make install,gtk-save", 
+       "make test,gtk-execute",
+       "gshterm -e cvs commit # CVS_Commit,gtk-save",
+       "gshterm -e cvs -q -z3 update -dP # CVS_Update,gtk-open";
+
+add "separator";
 
 add "label" "     TODO:     ";
 option "fill";

Index: gtkshell/button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/button.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- gtkshell/button.c   5 May 2007 23:38:07 -0000       1.37
+++ gtkshell/button.c   6 May 2007 06:23:36 -0000       1.38
@@ -67,9 +67,14 @@
 static void
 setup_command_button(struct GSH * gsh, const gchar * command)
 {
-       setup_label(gsh->widgets.button, command);
-       gsh_setup_drag_drop(gsh, gsh->widgets.button);
+       GtkWidget * button;
+
+       button = gsh->widgets.button;
+       setup_label(button, command);
+       gsh_setup_drag_drop(gsh, button);
        setup_callback(gsh, command);
+       if(GTK_IS_BUTTON(button))
+               gtk_button_set_alignment(GTK_BUTTON(button), 0.0, 0.5);
 }
 
 static gboolean

Index: gtkshell/callbacks.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/callbacks.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- gtkshell/callbacks.c        5 May 2007 22:33:06 -0000       1.21
+++ gtkshell/callbacks.c        6 May 2007 06:23:36 -0000       1.22
@@ -51,6 +51,19 @@
                gtk_main_quit();
 }
 
+static gboolean
+test_special_command(struct GSH_CBData * cb)
+{
+       const gchar * command = cb->data;
+       if(!strcmp(command, "Exit__"))
+       {
+               exit(0);
+               /* unreachable */
+       }
+       else
+               return FALSE;
+}
+
 void
 gsh_system_cb(GtkWidget *widget, gpointer data)
 {
@@ -62,6 +75,7 @@
        ARWIFNP(data)
        {
                struct GSH_CBData *cb = data;
+               if(!test_special_command(cb))
                (void) antiright_system(cb->data);
                (void) gsh_test_exit(cb->gsh);
        }

Index: gtkshell/gtkshell.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- gtkshell/gtkshell.c 6 May 2007 05:00:11 -0000       1.33
+++ gtkshell/gtkshell.c 6 May 2007 06:23:36 -0000       1.34
@@ -57,6 +57,7 @@
        $(gsh, add.window);
        gsh->widgets.menu_bar=NULL;
        gsh->widgets.app_frame=NULL;
+       gsh->icon_size=GTK_ICON_SIZE_DND;
 }
 
 struct GSH *

Index: gtkshell/gtkshell.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- gtkshell/gtkshell.h 6 May 2007 05:00:11 -0000       1.42
+++ gtkshell/gtkshell.h 6 May 2007 06:23:36 -0000       1.43
@@ -52,6 +52,7 @@
        /* member data */
        /address@hidden@*/ gchar *geometry;
        Bitmask bflags;
+       GtkIconSize icon_size;
 
        /* member data categories */
        struct

Index: gtkshell/guidl_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl_options.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtkshell/guidl_options.c    6 May 2007 05:00:11 -0000       1.6
+++ gtkshell/guidl_options.c    6 May 2007 06:23:36 -0000       1.7
@@ -46,6 +46,7 @@
        DEF("rows", "-or");
        DEF("update frequency", "-ou");
        DEF("application", "-oa");
+       DEF("icon size", "-oi");
 }
 
 GSH_GUIDL_ITEM_FUNC(option, DICT);

Index: gtkshell/image_button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/image_button.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gtkshell/image_button.c     5 May 2007 23:38:07 -0000       1.12
+++ gtkshell/image_button.c     6 May 2007 06:23:36 -0000       1.13
@@ -71,7 +71,7 @@
 /* Get an image from the antiright icon distribution or the GTK stock
    icon set.  */
 static GtkWidget * 
-get_default_image(const gchar * name)
+get_default_image(struct GSH * gsh, const gchar * name)
 {
        gchar * prefixed_name;
        GtkWidget * image;
@@ -80,23 +80,23 @@
                            PREFIX, name);
        image = g_file_test(prefixed_name, G_FILE_TEST_EXISTS)
                ? gtk_image_new_from_file(prefixed_name)
-               : gtk_image_new_from_stock(name, GTK_ICON_SIZE_DND);
+               : gtk_image_new_from_stock(name, gsh->icon_size);
        g_free(prefixed_name);
 
        return image;
 }
 
 static GtkWidget *
-get_image(const gchar * name)
+get_image(struct GSH * gsh, const gchar * name)
 {
        return g_file_test(name, G_FILE_TEST_EXISTS)
                ? gtk_image_new_from_file(name)
-               : get_default_image(name);
+               : get_default_image(gsh, name);
 }
 
 void
 gsh_image_button(struct GSH * gsh, char *command, char *name)
 {
-       generic_image_button(gsh, command, get_image(name));
+       generic_image_button(gsh, command, get_image(gsh, name));
 }
 

Index: gtkshell/macros.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/macros.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtkshell/macros.h   6 May 2007 05:00:11 -0000       1.6
+++ gtkshell/macros.h   6 May 2007 06:23:36 -0000       1.7
@@ -35,7 +35,6 @@
 #define GSH_NO_EXPAND          256
 #define GSH_GUIDL_NO_DUMMY     512
 #define GSH_APP_MODE           1024
-
 typedef guint Bitmask;
 
 #define GSH_FLAG(flag) ((gsh->bflags & flag) == flag)

Index: gtkshell/option_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/option_options.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- gtkshell/option_options.c   6 May 2007 05:00:11 -0000       1.25
+++ gtkshell/option_options.c   6 May 2007 06:23:36 -0000       1.26
@@ -44,6 +44,23 @@
                                    TRUE);
 }
 
+static void
+set_icon_size(struct GSH * gsh, const gchar * arg)
+{
+       if(!strcmp("menu", arg))
+               gsh->icon_size=GTK_ICON_SIZE_MENU;
+       else if(!strcmp("small toolbar", arg))
+               gsh->icon_size=GTK_ICON_SIZE_SMALL_TOOLBAR;
+       else if(!strcmp("large toolbar", arg))
+               gsh->icon_size=GTK_ICON_SIZE_LARGE_TOOLBAR;
+       else if(!strcmp("button", arg))
+               gsh->icon_size=GTK_ICON_SIZE_BUTTON;
+       else if(!strcmp("dialog", arg))       
+               gsh->icon_size=GTK_ICON_SIZE_DIALOG;
+       else /* default */
+               gsh->icon_size=GTK_ICON_SIZE_DND;
+}
+
 void
 gsh_handle_option_arguments(struct GSH * gsh, int argc, char **argv,
                            int *counter)
@@ -95,7 +112,10 @@
        case 'h':
                GSH_SET(GSH_HORIZONTAL_LABELS);
                break;
-       
+       case 'i':
+               GSH_COUNT(argc, counter);
+               set_icon_size(gsh, argv[*counter]);
+               break;
        case 'l':
                GSH_SET(GSH_NO_EXPAND);
                break;