[Antiright-devel] antiright ACE-desktop/guidl/ACE_Panel.gdl gtksh...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/08/15 00:32:51

Modified files:
        ACE-desktop/guidl: ACE_Panel.gdl 
        gtkshell       : button.c button.h 

Log message:
        Removed test menu from ACE panel.  Use a mapping structure rather than
        nested conditionals to assign icons to labels.  Store definitions
        in header file.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/ACE_Panel.gdl?cvsroot=antiright&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/button.c?cvsroot=antiright&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/button.h?cvsroot=antiright&r1=1.11&r2=1.12

Patches:
Index: ACE-desktop/guidl/ACE_Panel.gdl
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/guidl/ACE_Panel.gdl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- ACE-desktop/guidl/ACE_Panel.gdl     25 Jul 2007 04:42:37 -0000      1.8
+++ ACE-desktop/guidl/ACE_Panel.gdl     15 Aug 2007 00:32:51 -0000      1.9
@@ -28,7 +28,5 @@
        "ACE -A GUIDL Network_Panel,gtk-network", 
        "ACE -A GUIDL Publishing_Panel,gtk-print", 
        "ACE -A Calendar,gtk-execute",
-       "ACE -A IDE,gtk-edit",
-       "More...::\n
-               ::test";
+       "ACE -A IDE,gtk-edit";
 

Index: gtkshell/button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/button.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- gtkshell/button.c   11 Jun 2007 21:32:38 -0000      1.51
+++ gtkshell/button.c   15 Aug 2007 00:32:51 -0000      1.52
@@ -63,10 +63,9 @@
 static void
 create_button(struct GSH * gsh)
 {
-       if(!GTK_IS_MENU(gsh->rows->v) && !GTK_IS_MENU_BAR(gsh->rows->v))
-               gsh->widgets.button=gtk_button_new();
-       else
-               gtk_widget_show(gsh->widgets.button=gtk_menu_item_new());
+       gtk_widget_show(gsh->widgets.button=(!GTK_IS_MENU(gsh->rows->v) 
+               && !GTK_IS_MENU_BAR(gsh->rows->v))
+               ? gtk_button_new() : gtk_menu_item_new());
 }
 
 static void
@@ -79,38 +78,24 @@
 static GtkWidget *
 label_to_icon_translation(const gchar * label)
 {
-       GtkWidget * image;
-       gchar * cut_label;
-
-       cut_label=(gchar *)label;
-       g_strstrip(cut_label);
-#define MATCHES(text) !strcmp(text, cut_label)
-#define ICON(id)\
-       gtk_widget_show(image=gtk_image_new_from_stock(GTK_STOCK_##id, \
-               GTK_ICON_SIZE_SMALL_TOOLBAR))
-
-       if(MATCHES("Exit"))
-               ICON(QUIT);
-       else if(MATCHES("About"))
-               ICON(ABOUT);
-       else if(MATCHES("Open..."))
-               ICON(OPEN);
-       else if(MATCHES("Save"))
-               ICON(SAVE);
-       else if(MATCHES("Save As..."))
-               ICON(SAVE_AS);
-       else if(MATCHES("Cut"))
-               ICON(CUT);
-       else if(MATCHES("Copy"))
-               ICON(COPY);
-       else if(MATCHES("Paste"))
-               ICON(PASTE);
-       else if(MATCHES("Close"))
-               ICON(CLOSE);
-       else
-               ICON(EXECUTE);
+       GtkWidget * image=NULL;
+       struct
+       {
+               const gchar * label;
+               const gchar * icon;
+       } mapping[] = GSH_LABEL_TO_ICON_MAPPINGS;
+       const guint mapping_size=sizeof(mapping)/sizeof(mapping[0]);
+       guint mapping_count;
+
+       for(mapping_count=0; mapping_count < mapping_size; mapping_count++)
+               if(!strcmp(mapping[mapping_count].label, 
+                       g_strstrip((gchar*)label)))
+                       gtk_widget_show(image=gtk_image_new_from_stock(
+                               mapping[mapping_count].icon, 
+                               GTK_ICON_SIZE_SMALL_TOOLBAR));
 
-       return image;
+       return image ? image : gtk_image_new_from_stock(
+               GTK_STOCK_EXECUTE, GTK_ICON_SIZE_SMALL_TOOLBAR);
 }
 
 static void

Index: gtkshell/button.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/button.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- gtkshell/button.h   11 Jun 2007 21:32:38 -0000      1.11
+++ gtkshell/button.h   15 Aug 2007 00:32:51 -0000      1.12
@@ -26,4 +26,17 @@
 GtkWidget *
 gsh_add_button(struct GSH * gsh, const gchar * string);
 
+#define GSH_LABEL_TO_ICON_MAPPINGS \
+{\
+       { "Run...", GTK_STOCK_EXECUTE },\
+       { "About", GTK_STOCK_ABOUT },\
+       { "Exit", GTK_STOCK_QUIT },\
+       { "Save", GTK_STOCK_SAVE },\
+       { "Save As...", GTK_STOCK_SAVE_AS },\
+       { "Cut", GTK_STOCK_CUT },\
+       { "Copy", GTK_STOCK_COPY },\
+       { "Paste", GTK_STOCK_PASTE },\
+       { "Close", GTK_STOCK_CLOSE }\
+}
+
 #endif