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

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/11/02 18:01:09

Modified files:
        ACE-desktop/guidl: Horizontal_Deskbar.gdl 
        gtkshell       : arguments.c macros.h option_options.c 

Log message:
        Automatically use menu-sized stock images, if no custom icon size has
        been set.  Begin using stock items in ACE menu.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl?cvsroot=antiright&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/arguments.c?cvsroot=antiright&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/macros.h?cvsroot=antiright&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/option_options.c?cvsroot=antiright&r1=1.33&r2=1.34

Patches:
Index: ACE-desktop/guidl/Horizontal_Deskbar.gdl
===================================================================
RCS file: 
/sources/antiright/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- ACE-desktop/guidl/Horizontal_Deskbar.gdl    2 Nov 2007 16:49:12 -0000       
1.32
+++ ACE-desktop/guidl/Horizontal_Deskbar.gdl    2 Nov 2007 18:01:08 -0000       
1.33
@@ -6,13 +6,11 @@
 option "no fill";
 
 add button "ACE,Deck_32.png::\n
-       ::-->,multimedia_16.png::Audio::\n
-               ::xmms,multimedia_16.png::\n
-               ::<--::\n
-       ::-->,video_16.png::Video::\n
-               ::xine,video_16.png::\n
-               ::mplayer,multimedia_16.png::\n
+       ::-->,multimedia_16.png::Audio/Video::\n
                ::gmplayer,multimedia_16.png::\n
+               ::mplayer,multimedia_16.png::\n
+               ::xine,video_16.png::\n
+               ::xmms,music_16.png::\n
                ::<--::\n
        ::-->,development_16.png::Development::\n
                ::ACE -A IDE,development_16.png::\n
@@ -20,7 +18,7 @@
                ::eclipse & # Eclipse,development_16.png::\n
                ::netbeans & # NetBeans,development_16.png::\n
                ::<--::\n
-       ::-->,information_16.png::Education::\n
+       ::-->,gtk-info::Education::\n
                ::xlife & # XLife,amusement_16.png::\n
                ::<--::\n
        ::-->,game_16.png::Game::\n
@@ -47,41 +45,41 @@
                ::gimp & # GIMP,gimp_16.png::\n
                ::display & # ImageMagick,graphics_16.png::\n
                ::<--::\n
-       ::-->,network_16.png::Network::\n
+       ::-->,gtk-network::Network::\n
                ::firefox & # FireFox,www_16.png::\n
                ::gaim & # gaim,chat_16.png::\n
                ::pidgin & # pidgin,chat_16.png::\n
-               ::gtk-gnutella & # gtk-gnutella,network_16.png::\n
+               ::gtk-gnutella & # gtk-gnutella,gtk-network::\n
                ::<--::\n
-       ::-->,folder_16.png::Office::\n
+       ::-->,gtk-directory::Office::\n
                ::openoffice.org & # OpenOffice.org,word-processor_16.png::\n
                ::oowriter & # OOWriter,word-processor_16.png::\n
                ::ACE Word_Processor,word-processor_16.png::\n
                ::gnumeric & # Gnumeric_Spreadsheet,gnu_16.png::\n
                ::abiword & # AbiWord,word-processor_16.png::\n
                ::<--::\n
-       ::-->,folder_16.png::System::\n
-               ::ACE File_Manager,file_16.png::\n
+       ::-->,gtk-directory::System::\n
+               ::ACE File_Manager,gtk-directory::\n
                ::ACE System_Monitor,monitoring_16.png::\n
-               ::ACE -A GUIDL File_System_Panel,disk_16.png::\n
-               ::ACE -A GUIDL Network_Panel,network_16.png::\n
-               ::ACE -A GUIDL Publishing_Panel,printing_16.png::\n
+               ::ACE -A GUIDL File_System_Panel,gtk-harddisk::\n
+               ::ACE -A GUIDL Network_Panel,gtk-network::\n
+               ::ACE -A GUIDL Publishing_Panel,gtk-print::\n
                ::<--::\n
        ::-->,utility_16.png::Utility::\n
                ::ACE Terminal,terminal_16.png::\n
                ::ACE Screen & # GNU_Screen,terminal-special_16.png::\n
                ::ACE Calculator,calculator_16.png::\n
-               ::ACE Text_Editor,editor_16.png::\n
-               ::ACE -A GUIDL Editor & # ACE_Text_Editor,editor_16.png::\n
+               ::ACE Text_Editor,gtk-edit::\n
+               ::ACE -A GUIDL Editor & # ACE_Text_Editor,gtk-edit::\n
                ::ACE Sticky_Note,todo_16.png::\n
                ::ACE -A Calendar,clock_16.png::\n
                ::<--::\n
        ::---::\n
-       ::ACE -A GUIDL Manual_Browser,help_16.png::\n
-       ::ACE -A Settings & # ACE_Settings,configuration_16.png::\n
-       ::ACE -A Command & # Run...,system_16.png::\n
-       ::ACE & # ACE_Panel,modules_16.png::\n
-       ::ACE -A Lock,lock_16.png";
+       ::ACE -A GUIDL Manual_Browser,gtk-help::\n
+       ::ACE -A Settings & # ACE_Settings,gtk-preferences::\n
+       ::ACE -A Command & # Run...,gtk-execute::\n
+       ::ACE & # ACE_Panel,gtk-home::\n
+       ::ACE -A Lock,gtk-dialog-authentication";
 
 // command prompt
 // The embedded command prompt cannot be used when the undecorated option

Index: gtkshell/arguments.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/arguments.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- gtkshell/arguments.c        11 Jun 2007 21:32:38 -0000      1.30
+++ gtkshell/arguments.c        2 Nov 2007 18:01:08 -0000       1.31
@@ -36,8 +36,18 @@
 #endif /* DEBUG */
        tokens=g_strsplit(string, "::", SPLIT_ALL);
        /* Determine if the button is a regular button or a menu button.  */
-       tokens[1] ? gsh_menubutton_parse(gsh, tokens) 
-               : $(gsh, add.button, string);
+       if(tokens[1])
+       {
+               if(!GSH_FLAG(GSH_ICON_SIZE_IS_CUSTOM))
+                       gsh->icon_size=GTK_ICON_SIZE_MENU;
+               gsh_menubutton_parse(gsh, tokens);
+       }
+       else
+       {
+               if(!GSH_FLAG(GSH_ICON_SIZE_IS_CUSTOM))
+                       gsh->icon_size=GTK_ICON_SIZE_DND;
+               $(gsh, add.button, string);
+       }
        g_strfreev(tokens);
 }
 

Index: gtkshell/macros.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/macros.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- gtkshell/macros.h   13 Aug 2007 07:12:31 -0000      1.15
+++ gtkshell/macros.h   2 Nov 2007 18:01:08 -0000       1.16
@@ -41,6 +41,7 @@
 #define GSH_FIRST_TERMINAL     GSHBIT(13)
 #define GSH_TERM_TRANSPARENT   GSHBIT(14)
 #define GSH_IN_SECONDARY_WIN   GSHBIT(15)
+#define GSH_ICON_SIZE_IS_CUSTOM GSHBIT(16)
 
 typedef guint Bitmask;
 

Index: gtkshell/option_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/option_options.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- gtkshell/option_options.c   9 Sep 2007 18:03:17 -0000       1.33
+++ gtkshell/option_options.c   2 Nov 2007 18:01:09 -0000       1.34
@@ -75,6 +75,8 @@
                GIS=GTKIS(DIALOG);
        else /* default */
                GIS=GTKIS(DND);
+
+       GSH_SET(GSH_ICON_SIZE_IS_CUSTOM);
 }
 
 void