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

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/05/19 23:32:44

Modified files:
        ACE-desktop/guidl: Horizontal_Deskbar.gdl 
        gtkshell       : menu.c 

Log message:
        Added continuation line support for menus.  Added menus corresponding to
        freedesktop.org's main application categories.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl?cvsroot=antiright&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/menu.c?cvsroot=antiright&r1=1.18&r2=1.19

Patches:
Index: ACE-desktop/guidl/Horizontal_Deskbar.gdl
===================================================================
RCS file: 
/sources/antiright/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- ACE-desktop/guidl/Horizontal_Deskbar.gdl    14 May 2007 12:16:11 -0000      
1.14
+++ ACE-desktop/guidl/Horizontal_Deskbar.gdl    19 May 2007 23:32:44 -0000      
1.15
@@ -5,8 +5,29 @@
 option "undecorated";
 option "no fill";
 // menu button
-add button "ACE,ACE_32.png::ACE,ACE_32.png::ACE -A 
IDE,Text_Editor_32.png::eclipse-3.2,gtk-execute::eclipse,gtk-execute::ACE -A 
Settings,gtk-preferences";
-
+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
+       ::-->::AudioVideo::UNDEFINED::<--::\n
+       ::-->::Audio::UNDEFINED::<--::\n
+       ::-->::Video::UNDEFINED::<--::\n
+       ::-->::Development::\n
+               ::eclipse-3.2 # Eclipse_3.2,gtk-execute::\n
+               ::eclipse # Eclipse,gtk-execute::\n
+               ::ACE -A IDE,Text_Editor_32.png::\n
+               ::<--::\n
+       ::-->::Education::UNDEFINED::<--::\n
+       ::-->::Game::UNDEFINED::<--::\n
+       ::-->::Graphics::gimp::<--::\n
+       ::-->::Network::firefox::<--::\n
+       ::-->::Office::oowriter::<--::\n
+       ::-->::Settings::\n
+               ACE -A Settings # ACE_Settings,gtk-preferences::\n
+               ::<--::\n
+       ::-->::System::UNDEFINED::<--::\n
+       ::-->::Utility::UNDEFINED::<--::\n
+       ::---::ACE -A Lock";
 add "separator";
 add button "ACE -A Command ,gtk-execute";
 

Index: gtkshell/menu.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/menu.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- gtkshell/menu.c     19 May 2007 23:13:28 -0000      1.18
+++ gtkshell/menu.c     19 May 2007 23:32:44 -0000      1.19
@@ -47,9 +47,13 @@
                        gtk_menu_shell_append(GTK_MENU_SHELL(gsh->rows->v), 
                                separator);
                }
-               else /* Create a button.  */
+                       /* 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]);
        }
+       }
        g_strfreev(pair);
 }