[Antiright-devel] antiright/gtkshell clock.c gtkshell.c gtkshell.h

[Jeffrey Bedard]

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

Modified files:
        gtkshell       : clock.c gtkshell.c gtkshell.h 

Log message:
        Added color setting function, gsh_widget_set_color().
        Split clock container management and color setting to separate methods.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/clock.c?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.c?cvsroot=antiright&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.h?cvsroot=antiright&r1=1.54&r2=1.55

Patches:
Index: clock.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/clock.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- clock.c     22 Jul 2007 17:51:21 -0000      1.5
+++ clock.c     22 Jul 2007 19:07:32 -0000      1.6
@@ -35,15 +35,12 @@
                struct tm split_time;
 
                (void)localtime_r(&time_value, &split_time);
+#define GSHTM(element) split_time.tm_##element
                (void)snprintf(time_string, 
                        GSH_CLOCK_TIME_STRING_SIZE,
                        "%.2d/%.2d/%.2d\n%.2d:%.2d:%.2d",
-                       split_time.tm_mon+1,
-                       split_time.tm_mday,
-                       split_time.tm_year%100,
-                       split_time.tm_hour,
-                       split_time.tm_min,
-                       split_time.tm_sec);
+                       GSHTM(mon)+1, GSHTM(mday), GSHTM(year)%100,
+                       GSHTM(hour), GSHTM(min), GSHTM(sec));
        }
 }
 
@@ -53,8 +50,31 @@
        gchar time_string[GSH_CLOCK_TIME_STRING_SIZE];
 
        get_time_string(time_string);
-       gtk_label_set_text(GTK_LABEL((GtkWidget *)clock_pointer), 
-               time_string);
+       gtk_label_set_text(GTK_LABEL((GtkWidget *)clock_pointer), time_string);
+}
+
+#define GSH_SET_CLOCK_COLORS(clock, event_box)\
+       gsh_widget_set_color(event_box, "#223", FALSE);\
+       gsh_widget_set_color(clock, "#dde", TRUE);
+       
+
+static GtkWidget *
+setup_containers(GtkWidget * clock)
+{
+       GtkWidget * frame;
+
+       gtk_widget_show(frame=gtk_frame_new(NULL));
+       gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
+       { /* Setup event box, containment, and colors.  */
+               GtkWidget * event_box;
+
+               gtk_widget_show(event_box=gtk_event_box_new());
+               GSHCA(frame, event_box);
+               GSH_SET_CLOCK_COLORS(clock, event_box);
+               GSHCA(event_box, clock);
+       }
+
+       return frame;
 }
 
 GtkWidget *
@@ -64,7 +84,8 @@
        
        gsh_widget_set_font(clock=gtk_label_new(NULL), "Mono 10");
        GSH_NEW_UPDATER(gsh, update_clock, clock);
+       gtk_widget_show(clock);
 
-       return clock;
+       return setup_containers(clock);
 }
 

Index: gtkshell.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- gtkshell.c  11 Jun 2007 21:32:40 -0000      1.44
+++ gtkshell.c  22 Jul 2007 19:07:32 -0000      1.45
@@ -141,3 +141,16 @@
        return gsh;
 }
 
+void
+gsh_widget_set_color(GtkWidget * widget, 
+       const gchar * color_string, gboolean fg_color)
+{
+       GdkColor color;
+
+       gdk_color_parse(color_string, &color);
+       if(fg_color)
+               gtk_widget_modify_fg(widget, GTK_STATE_NORMAL, &color);
+       else
+               gtk_widget_modify_bg(widget, GTK_STATE_NORMAL, &color);
+}
+

Index: gtkshell.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- gtkshell.h  20 Jul 2007 01:26:34 -0000      1.54
+++ gtkshell.h  22 Jul 2007 19:07:32 -0000      1.55
@@ -115,4 +115,8 @@
 struct GSH *
 gsh_new_GSH();
 
+void
+gsh_widget_set_color(GtkWidget * widget, 
+       const gchar * color_string, gboolean fg_color);
+
 #endif