[Antiright-devel] antiright ACE-desktop/guidl/File_Manager.gdl AC...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/04/01 05:34:56

Modified files:
        ACE-desktop/guidl: File_Manager.gdl Horizontal_Deskbar.gdl 
        gtkshell       : add_options.c guidl.lex guidl.y guidl_util.c 
                         main.c option_options.c 

Log message:
        Added separator widget feature.  Added widget to GUIDL.
        Added oT option to set the window title.
        Use separator in File_Manager and Horizontal_Deskbar.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/File_Manager.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.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/add_options.c?cvsroot=antiright&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl.lex?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl.y?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl_util.c?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/main.c?cvsroot=antiright&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/option_options.c?cvsroot=antiright&r1=1.17&r2=1.18

Patches:
Index: ACE-desktop/guidl/File_Manager.gdl
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/guidl/File_Manager.gdl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ACE-desktop/guidl/File_Manager.gdl  26 Mar 2007 14:09:20 -0000      1.1
+++ ACE-desktop/guidl/File_Manager.gdl  1 Apr 2007 05:34:56 -0000       1.2
@@ -15,13 +15,5 @@
                "ACE -A Command & # ACE_-A_Command,gtk-execute",
                "ACE -A Modes & # ACE_-A_Modes,gtk-info",
                "ACE -A File_Manager & # Refresh,gtk-refresh";
-
-add label "----------------";
-
-
-               
-
-
-
-
+add separator;
 

Index: ACE-desktop/guidl/Horizontal_Deskbar.gdl
===================================================================
RCS file: 
/sources/antiright/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ACE-desktop/guidl/Horizontal_Deskbar.gdl    26 Mar 2007 14:09:20 -0000      
1.5
+++ ACE-desktop/guidl/Horizontal_Deskbar.gdl    1 Apr 2007 05:34:56 -0000       
1.6
@@ -4,12 +4,12 @@
 option "geometry" "+0-0";
 option "undecorated";
 // menu button
+// Won't work on some broken versions of GTK, esp. on linux.
 add button "ACE,ACE_32.png::ACE,ACE_32.png::ACE -A 
IDE,Text_Editor_32.png::eclipse,gtk-execute";
-// This is a simple "separator."
-//add label "|";
+
 // command prompt
 add prompt "env";
-//add label "|";
+
 // For unlabeled items, the space between the item command and the comma allows
 // for a blank label.
 add buttons 
@@ -20,10 +20,10 @@
        "ACE Text_Editor ,Text_Editor_32.png",
        "ACE Calculator ,Calculator_32.png",
        "ACE Sticky_Note ,Sticky_Note_32.png";
-add label "|";
+add separator;
 add buttons 
        "ACE Screen,Screen_32.png",
        "ACE System_Monitor,System_Monitor_32.png";
-add label "|";
+add separator;
 add updating label "date '+%m/%d/%y%n%H:%M:%S'";
 

Index: gtkshell/add_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/add_options.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- gtkshell/add_options.c      16 Mar 2007 00:39:31 -0000      1.19
+++ gtkshell/add_options.c      1 Apr 2007 05:34:56 -0000       1.20
@@ -55,6 +55,20 @@
        g_free(output);
 }
 
+static void
+add_separator(struct GSH * gsh)
+{
+       GtkWidget * separator;
+
+       if(gsh->rows.rows == 1)
+               separator=gtk_vseparator_new();
+       else
+               separator=gtk_hseparator_new();
+
+       gsh_manage_unexpanded(gsh, separator);
+       gtk_widget_show(separator);
+}
+
 void
 gsh_handle_add_arguments(struct GSH * gsh, int argc, char **argv, int *counter)
 {
@@ -83,6 +97,10 @@
                gsh_new_row(gsh);
                break;
 
+       case 'S': /* Add a separator.  */
+               add_separator(gsh);
+               break;
+
        case 's': /* Add a shell.  */
                gsh_count(argc, counter);
                gsh_setup_terminal(gsh, argv[*counter]);

Index: gtkshell/guidl.lex
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl.lex,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/guidl.lex  19 Mar 2007 10:18:25 -0000      1.4
+++ gtkshell/guidl.lex  1 Apr 2007 05:34:56 -0000       1.5
@@ -27,6 +27,7 @@
 window         return WINDOW;
 echo           return TOKEN_ECHO;
 text           return TEXT;
+separator      return SEPARATOR;
 
 [ \t\n]                /* ignore */;
 "//".*$                /* comment */;

Index: gtkshell/guidl.y
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl.y,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gtkshell/guidl.y    19 Mar 2007 10:18:25 -0000      1.5
+++ gtkshell/guidl.y    1 Apr 2007 05:34:56 -0000       1.6
@@ -141,6 +141,11 @@
 }
 |
 ADD BUTTONS buttons
+|
+ADD SEPARATOR
+{
+       gsh_append_arg((gchar *)"-aS");
+}
 ;
 
 buttons:

Index: gtkshell/guidl_util.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl_util.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/guidl_util.c       19 Mar 2007 10:18:25 -0000      1.2
+++ gtkshell/guidl_util.c       1 Apr 2007 05:34:56 -0000       1.3
@@ -89,6 +89,8 @@
                option_switch=g_strdup("g");
        else if(!strcmp(option, "terminal font"))
                option_switch=g_strdup("tf");
+       else if(!strcmp(option, "title"))
+               option_switch=g_strdup("T");
        else
        {
                ARWARN("Invalid option.");

Index: gtkshell/main.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/main.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- gtkshell/main.c     24 Mar 2007 04:17:13 -0000      1.16
+++ gtkshell/main.c     1 Apr 2007 05:34:56 -0000       1.17
@@ -39,6 +39,7 @@
        gsh_check_and_set_geometry(gsh);
        /* Show everything when ready.  */
        gtk_widget_show(gsh->window);
+
 }
 
 static void

Index: gtkshell/option_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/option_options.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- gtkshell/option_options.c   24 Mar 2007 04:17:13 -0000      1.17
+++ gtkshell/option_options.c   1 Apr 2007 05:34:56 -0000       1.18
@@ -68,12 +68,17 @@
                GSH_UNSET(GSH_NO_LABEL_EXPAND);
                break;
 
-       case 'n':
+       case 'n': /* no decorations, desktop panel not to be touched by the
+                  * window manager.  */
+               gsh->window=gtk_window_new(GTK_WINDOW_POPUP);
+
+               gtk_window_set_type_hint(GTK_WINDOW(gsh->window),
+                                        GDK_WINDOW_TYPE_HINT_DOCK);
                gtk_window_set_decorated(GTK_WINDOW(gsh->window),
                                         FALSE);
-
                gtk_window_set_skip_taskbar_hint
                        (GTK_WINDOW(gsh->window), TRUE);
+               gtk_window_stick(GTK_WINDOW(gsh->window));
 
                break;
 
@@ -87,6 +92,11 @@
                GSH_SET(GSH_SCROLL);
                break;
 
+       case 'T': /* Set the window title.  */
+               gsh_count(argc, counter);
+               gtk_window_set_title(GTK_WINDOW(gsh->window), argv[*counter]);
+               break;
+
        case 't':
                gsh_handle_terminal_options(gsh, argc, argv, counter);
                break;
@@ -97,3 +107,4 @@
                break;
        }
 }
+