? lib/diamarshal.c
? lib/diamarshal.h
? plug-ins/gprint/Makefile
? plug-ins/gprint/Makefile.in
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/dia/ChangeLog,v
retrieving revision 1.1657
diff -u -r1.1657 ChangeLog
--- ChangeLog	31 Dec 2004 20:13:35 -0000	1.1657
+++ ChangeLog	7 Jan 2005 19:52:31 -0000
@@ -1,3 +1,7 @@
+2005-01-07  Tim Olsen  <tolsen@alum.mit.edu>
+
+	* objects/UML/activity.c : add fill- and line-colour properties
+
 2004-12-31  Hans Breuer  <hans@breuer.org>
 
 	* lib/dia_dirs.c(dia_get_canonical_path) : complete
Index: objects/UML/activity.c
===================================================================
RCS file: /cvs/gnome/dia/objects/UML/activity.c,v
retrieving revision 1.9
diff -u -r1.9 activity.c
--- objects/UML/activity.c	4 Jul 2004 16:05:28 -0000	1.9
+++ objects/UML/activity.c	7 Jan 2005 19:52:34 -0000
@@ -47,6 +47,8 @@
   Text *text;
 
   TextAttributes attrs;
+  Color line_color;
+  Color fill_color;
 };
 
 
@@ -116,9 +118,11 @@
 static PropDescription activity_props[] = {
   ELEMENT_COMMON_PROPERTIES,
 
+  PROP_STD_LINE_COLOUR_OPTIONAL, 
+  PROP_STD_FILL_COLOUR_OPTIONAL, 
   PROP_STD_TEXT_FONT,
   PROP_STD_TEXT_HEIGHT,
-  PROP_STD_TEXT_COLOUR,
+  PROP_STD_TEXT_COLOUR_OPTIONAL,
   { "text", PROP_TYPE_TEXT, 0, N_("Text"), NULL, NULL }, 
   
   PROP_DESC_END
@@ -135,6 +139,8 @@
 
 static PropOffset state_offsets[] = {
   ELEMENT_COMMON_PROPERTIES_OFFSETS,
+  {"line_colour",PROP_TYPE_COLOUR,offsetof(State,line_color)},
+  {"fill_colour",PROP_TYPE_COLOUR,offsetof(State,fill_color)},
   {"text",PROP_TYPE_TEXT,offsetof(State,text)},
   {"text_font",PROP_TYPE_FONT,offsetof(State,attrs.font)},
   {"text_height",PROP_TYPE_REAL,offsetof(State,attrs.height)},
@@ -224,8 +230,10 @@
    p1.y = y;
    p2.x = x + w;
    p2.y = y + h;
-   renderer_ops->fill_rounded_rect(renderer, &p1, &p2, &color_white, 1.0);
-   renderer_ops->draw_rounded_rect(renderer, &p1, &p2, &color_black, 1.0);
+   renderer_ops->fill_rounded_rect(renderer, &p1, &p2,
+				   &state->fill_color, 1.0);
+   renderer_ops->draw_rounded_rect(renderer, &p1, &p2,
+				   &state->line_color, 1.0);
    
    text_draw(state->text, renderer);
 }
@@ -310,6 +318,9 @@
   elem->width = STATE_WIDTH;
   elem->height = STATE_HEIGHT;
 
+  state->line_color = attributes_get_foreground();
+  state->fill_color = attributes_get_background();
+
   font = dia_font_new_from_style (DIA_FONT_SANS, 0.8);
   p = *startpoint;
   p.x += STATE_WIDTH/2.0;
