[Antiright-devel] antiright ACE-desktop/guidl/Clock.gdl ACE-deskt...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/04/16 02:23:29

Modified files:
        ACE-desktop/guidl: Clock.gdl File_Manager.gdl 
                           Horizontal_Deskbar.gdl IDE.gdl 
                           Manual_Browser.gdl Old_Deskbar.gdl 
        gtkshell       : guidl.lex guidl.y guidl_widgets.c 

Log message:
        Switched GUIDL definition format to that of looked up widgets, for
        the most part.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Clock.gdl?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/File_Manager.gdl?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl?cvsroot=antiright&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/IDE.gdl?cvsroot=antiright&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Manual_Browser.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.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl.lex?cvsroot=antiright&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl.y?cvsroot=antiright&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl_widgets.c?cvsroot=antiright&r1=1.1&r2=1.2

Patches:
Index: ACE-desktop/guidl/Clock.gdl
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/guidl/Clock.gdl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ACE-desktop/guidl/Clock.gdl 9 Apr 2007 21:01:50 -0000       1.1
+++ ACE-desktop/guidl/Clock.gdl 16 Apr 2007 02:23:29 -0000      1.2
@@ -3,5 +3,5 @@
 option "title" "Clock";
 option "geometry" "-0-0";
 
-add updating label "date | tr '\n' ' '";
+add "updating label" "date | tr '\n' ' '";
 

Index: ACE-desktop/guidl/File_Manager.gdl
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/guidl/File_Manager.gdl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ACE-desktop/guidl/File_Manager.gdl  1 Apr 2007 05:34:56 -0000       1.2
+++ ACE-desktop/guidl/File_Manager.gdl  16 Apr 2007 02:23:29 -0000      1.3
@@ -15,5 +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 separator;
+add "separator";
 

Index: ACE-desktop/guidl/Horizontal_Deskbar.gdl
===================================================================
RCS file: 
/sources/antiright/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ACE-desktop/guidl/Horizontal_Deskbar.gdl    6 Apr 2007 14:06:06 -0000       
1.7
+++ ACE-desktop/guidl/Horizontal_Deskbar.gdl    16 Apr 2007 02:23:29 -0000      
1.8
@@ -7,7 +7,7 @@
 // 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";
 
-add separator;
+add "separator";
 add button "ACE -A Command ,gtk-execute";
 
 // command prompt
@@ -25,10 +25,10 @@
        "ACE Text_Editor ,Text_Editor_32.png",
        "ACE Calculator ,Calculator_32.png",
        "ACE Sticky_Note ,Sticky_Note_32.png";
-add separator;
+add "separator";
 add buttons 
        "ACE Screen,Screen_32.png",
        "ACE System_Monitor,System_Monitor_32.png";
-add separator;
-add updating label "date '+%m/%d/%y%n%H:%M:%S'";
+add "separator";
+add "updating label" "date '+%m/%d/%y%n%H:%M:%S'";
 

Index: ACE-desktop/guidl/IDE.gdl
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/guidl/IDE.gdl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- ACE-desktop/guidl/IDE.gdl   9 Apr 2007 15:12:59 -0000       1.8
+++ ACE-desktop/guidl/IDE.gdl   16 Apr 2007 02:23:29 -0000      1.9
@@ -2,17 +2,16 @@
 // This is an IDE, particularly suited for development
 // of AntiRight.  It is a combination of useful functionality
 // into one app, rather than a reinvention of such.
-
 option "rows" 2;
 
 option "terminal font" "Mono 12";
 option "terminal width" 80;
 option "terminal height" 24;
-add terminal "vi";
+add "terminal" "vi";
 
 option "terminal font" "Mono 10";
 option "terminal height" 8;
-add terminal "$SHELL";
+add "terminal" "$SHELL";
 option "rows" 16;
 
 add buttons
@@ -25,7 +24,7 @@
        "gshterm -e cvs -q -z3 update -dP # CVS_Update";
 
 option "no label fill";
-add label "     TODO:     ";
+add "label" "     TODO:     ";
 
-add text;
+add "text";
 

Index: ACE-desktop/guidl/Manual_Browser.gdl
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/guidl/Manual_Browser.gdl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ACE-desktop/guidl/Manual_Browser.gdl        19 Mar 2007 07:09:30 -0000      
1.1
+++ ACE-desktop/guidl/Manual_Browser.gdl        16 Apr 2007 02:23:29 -0000      
1.2
@@ -1,7 +1,7 @@
 option "rows" 3;
-add label "Manual section:";
-add label " ";
-add label " ";
+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",

Index: ACE-desktop/guidl/Old_Deskbar.gdl
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/guidl/Old_Deskbar.gdl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ACE-desktop/guidl/Old_Deskbar.gdl   19 Mar 2007 07:09:30 -0000      1.1
+++ ACE-desktop/guidl/Old_Deskbar.gdl   16 Apr 2007 02:23:29 -0000      1.2
@@ -1,7 +1,7 @@
 option "geometry" "+0+0";
 option "rows" 1;
-add updating label "date";
+add "updating label" "date";
 add buttons "ACE Lock", "ACE Screen", "ACE Terminal", "ACE Browser",
        "ACE Sticky_Note", "ACE";
-add prompt "env";
+add "prompt" "env";
 

Index: gtkshell/guidl.lex
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl.lex,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gtkshell/guidl.lex  13 Apr 2007 03:00:07 -0000      1.8
+++ gtkshell/guidl.lex  16 Apr 2007 02:23:29 -0000      1.9
@@ -13,22 +13,12 @@
 [0-9]+         yylval.number=atoi(yytext); return NUM;
 ,              return COMMA;
 ;              return END;
-::             return IFS;
 option         return OPTION;
 button         return BUTTON;
-add            return ADD;
-prompt         return PROMPT;
-viewer         return VIEWER;
 label          return LABEL;
-row            return ROW;
-progress       return PROGRESS;
-updating       return UPDATING;
+add            return ADD;
 buttons                return BUTTONS;
-terminal       return TERMINAL;
-window         return WINDOW;
 echo           return TOKEN_ECHO;
-text           return TEXT;
-separator      return SEPARATOR;
 dialog         return DIALOG;
 system         return SYSTEM;
 

Index: gtkshell/guidl.y
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl.y,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- gtkshell/guidl.y    16 Apr 2007 01:19:51 -0000      1.15
+++ gtkshell/guidl.y    16 Apr 2007 02:23:29 -0000      1.16
@@ -55,10 +55,9 @@
        gchar * string;
        gint number;
 }
-%token IFS SC COMMA OPTION PROMPT VIEWER LABEL
-%token BUTTON END ADD UPDATING PROGRESS BUTTONS
-%token TERMINAL WINDOW TOKEN_ECHO TEXT SEPARATOR
-%token ROW DIALOG SYSTEM
+%token IFS SC COMMA OPTION LABEL
+%token BUTTON END ADD BUTTONS
+%token DIALOG SYSTEM TOKEN_ECHO
 %token <string> STRING
 %token <number> NUM
 %%
@@ -115,29 +114,14 @@
 ;
 
 add:
-ADD PROMPT STRING
+ADD STRING STRING
 {
-       gsh_guidl_add("-at", $3);
+       gsh_guidl_widget($2, $3);
 }
 |
-ADD VIEWER STRING
+ADD STRING
 {
-       gsh_guidl_add("-ae", $3);
-}
-|
-ADD ROW
-{
-       gsh_append_arg((gchar*)"-ar");
-}
-|
-ADD TEXT
-{
-       gsh_append_arg((gchar *)"-aT");
-}
-|
-ADD LABEL STRING
-{
-       gsh_guidl_add("-al", $3);
+       gsh_guidl_widget($2, NULL);
 }
 |
 ADD BUTTON button
@@ -157,27 +141,8 @@
        gsh_guidl_add("-aup", $4);
 }
 |
-ADD UPDATING LABEL STRING
-{
-       gsh_guidl_add("-aul", $4);
-}
-|
-ADD TERMINAL STRING
-{
-       gsh_guidl_add("-as", $3);
-}
-|
-ADD WINDOW
-{
-       gsh_append_arg((gchar *)"-aw");
-}
 |
 ADD BUTTONS buttons
-|
-ADD SEPARATOR
-{
-       gsh_append_arg((gchar *)"-aS");
-}
 ;
 
 buttons:

Index: gtkshell/guidl_widgets.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl_widgets.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtkshell/guidl_widgets.c    16 Apr 2007 01:50:31 -0000      1.1
+++ gtkshell/guidl_widgets.c    16 Apr 2007 02:23:29 -0000      1.2
@@ -30,8 +30,15 @@
 setup_definitions(struct ARTupleVector * widgets)
 {
        DEF("label", "-al");
-       DEF("field", "-at");
+       DEF("prompt", "-at");
        DEF("terminal", "-as");
+       DEF("window", "-aw");
+       DEF("separator", "-aS");
+       DEF("updating label", "-aul");
+       DEF("updating progress", "-aup");
+       DEF("row", "-ar");
+       DEF("viewer", "-ae");
+       DEF("text", "-aT");
 }
 
 static void