Commit: f4dc25cdb0a8e4f21037fb8d1561849c2b44410b - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Révision: f4dc25cdb0a8e4f21037fb8d1561849c2b44410b (tree)
• l'heure: 2001-06-11 06:11:16
• Auteur: Cyrille Chepelov <cyrille@src....>
• Commiter: Cyrille Chepelov

Message de Log

a NULL point can be given to connpointline_adjust_count(), in case there's

* lib/connpoint_line.c: a NULL point can be given to
connpointline_adjust_count(), in case there's not really a clicked
point.
* lib/properties.[ch]: added support for CONNPOINT_LINE properties.

* objects/GRAFCET/vergent.c: dropped lazyprops for standard
properties.

* objects/UML/lifeline.c: pruned some legacy stuff (now pure
standard properties code). Grafted a dynamic number of connection
points (heavily inspired from what Vergent does). This is the real
fix for #55863.

Change Summary

• modified: ChangeLog
• modified: lib/connpoint_line.c
• modified: lib/connpoint_line.h
• modified: lib/properties.c
• modified: lib/properties.h
• modified: objects/GRAFCET/vergent.c
• modified: objects/UML/lifeline.c
• modified: po/fr.po

Modification

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
[phone]  Cyrille Chepelov  <[e-mail]>
+
+	* lib/connpoint_line.c: a NULL point can be given to
+	connpointline_adjust_count(), in case there's not really a clicked
+	point.
+	* lib/properties.[ch]: added support for CONNPOINT_LINE properties.
+
+	* objects/GRAFCET/vergent.c: dropped lazyprops for standard
+	properties.
+	
+	* objects/UML/lifeline.c: pruned some legacy stuff (now pure
+	standard properties code). Grafted a dynamic number of connection
+	points (heavily inspired from what Vergent does). This is the real
+	fix for #55863.
+	
 2001-06-09  Cyrille Chepelov  <[e-mail]>
 
 	* app/app_procs.c (app_init): added a call to

--- a/lib/connpoint_line.c
+++ b/lib/connpoint_line.c
@@ -363,6 +363,8 @@ cpl_get_pointbefore(ConnPointLine *cpl, Point *clickedpoint)
   real dist = 65536.0;
   real tmpdist;
 
+  if (!clickedpoint) return 0;
+
   for (i=0,elem=cpl->connections;
        i<cpl->num_connections; 
        i++,elem=g_slist_next(elem)) {

--- a/lib/connpoint_line.h
+++ b/lib/connpoint_line.h
@@ -1,5 +1,4 @@
-/* 
- * SADT diagram support for dia 
+/* Dynamic container for connection points  -*- c -*-
  * Copyright(C) 2000 Cyrille Chepelov
  *
  * Connection point line is a helper struct, to hold a few connection points

--- a/lib/properties.c
+++ b/lib/properties.c
@@ -34,6 +34,7 @@
 
 #include "intl.h"
 #include "widgets.h"
+#include "connpoint_line.h"
 
 #define LIBDIA_COMPILATION
 #undef G_INLINE_FUNC
@@ -183,6 +184,7 @@ prop_copy(Property *dest, Property *src)
   case PROP_TYPE_ARROW:
   case PROP_TYPE_COLOUR:
   case PROP_TYPE_FONT:
+  case PROP_TYPE_CONNPOINT_LINE:
   case PROP_TYPE_ENDPOINTS:
     dest->d = src->d;
     break;
@@ -243,6 +245,7 @@ prop_free(Property *prop)
   case PROP_TYPE_ARROW:
   case PROP_TYPE_COLOUR:
   case PROP_TYPE_ENDPOINTS:
+  case PROP_TYPE_CONNPOINT_LINE:
   case PROP_TYPE_FONT:
     break;
   case PROP_TYPE_STRING:
@@ -378,6 +381,7 @@ prop_get_widget(Property *prop)
   case PROP_TYPE_BEZPOINT:
   case PROP_TYPE_BEZPOINTARRAY:
   case PROP_TYPE_ENDPOINTS:
+  case PROP_TYPE_CONNPOINT_LINE:
   case PROP_TYPE_RECT:
     ret = gtk_label_new(_("No edit widget"));
     break;
@@ -457,6 +461,7 @@ prop_set_from_widget(Property *prop, GtkWidget *widget)
   case PROP_TYPE_BEZPOINT:
   case PROP_TYPE_BEZPOINTARRAY:
   case PROP_TYPE_ENDPOINTS:
+  case PROP_TYPE_CONNPOINT_LINE:
   case PROP_TYPE_RECT:
     /* nothing */
     break;
@@ -508,7 +513,13 @@ prop_load(Property *prop, ObjectNode obj_node)
   if (!PROP_IS_OTHER(prop->type)) {
     attr = object_find_attribute(obj_node, prop->name);
     if (!attr) {
-      g_warning("Could not find attribute %s", prop->name);
+      switch(prop->type) {
+      case PROP_TYPE_CONNPOINT_LINE:
+        PROP_VALUE_CONNPOINT_LINE(*prop) = 1;
+        break;
+      default:
+        g_warning("Could not find attribute %s", prop->name);
+      }
       return;
     }
     data = attribute_first_data(attr);
@@ -622,6 +633,9 @@ prop_load(Property *prop, ObjectNode obj_node)
     g_free(PROP_VALUE_FILE(*prop));
     PROP_VALUE_FILE(*prop) = data_string(data);
     break;
+  case PROP_TYPE_CONNPOINT_LINE:
+    PROP_VALUE_CONNPOINT_LINE(*prop) = data_int(data);
+    break;
   default:
     if (custom_props == NULL || prop->type - PROP_LAST >= custom_props->len) {
       g_warning("prop type id %d out of range!!!", prop->type);
@@ -675,6 +689,9 @@ prop_save(Property *prop, ObjectNode obj_node)
   case PROP_TYPE_INT:
     data_add_int(attr, PROP_VALUE_INT(*prop));
     break;
+  case PROP_TYPE_CONNPOINT_LINE:
+    data_add_int(attr,PROP_VALUE_CONNPOINT_LINE(*prop));
+    break;
   case PROP_TYPE_ENUM:
     data_add_enum(attr, PROP_VALUE_ENUM(*prop));
     break;
@@ -859,6 +876,10 @@ object_get_props_from_offsets(Object *obj, PropOffset *offsets,
       PROP_VALUE_INT(props[i]) =
 	struct_member(obj, offsets[j].offset, gint);
       break;
+    case PROP_TYPE_CONNPOINT_LINE:
+      PROP_VALUE_CONNPOINT_LINE(props[i]) = 
+        struct_member(obj,offsets[j].offset, ConnPointLine *)->num_connections;
+      break;
     case PROP_TYPE_REAL:
       PROP_VALUE_REAL(props[i]) =
 	struct_member(obj, offsets[j].offset, real);
@@ -968,6 +989,13 @@ object_set_props_from_offsets(Object *obj, PropOffset *offsets,
       struct_member(obj, offsets[j].offset, gint) =
 	PROP_VALUE_INT(props[i]);
       break;
+    case PROP_TYPE_CONNPOINT_LINE:
+      connpointline_adjust_count(struct_member(obj,offsets[j].offset, 
+                                               ConnPointLine *),
+                                 PROP_VALUE_CONNPOINT_LINE(props[i]),
+                                 &struct_member(obj,offsets[j].offset, 
+                                               ConnPointLine *)->end);
+      break;
     case PROP_TYPE_REAL:
       struct_member(obj, offsets[j].offset, real) =
 	PROP_VALUE_REAL(props[i]);

--- a/lib/properties.h
+++ b/lib/properties.h
@@ -1,4 +1,4 @@
-/* Dia -- a diagram creation/manipulation program
+/* Dia -- a diagram creation/manipulation program -*- c -*-
  * Copyright (C) 1998 Alexander Larsson
  *
  * properties.h: property system for dia objects/shapes.
@@ -61,6 +61,7 @@ typedef enum {
   PROP_TYPE_FONT,
   PROP_TYPE_FILE,
   PROP_TYPE_ENDPOINTS,
+  PROP_TYPE_CONNPOINT_LINE,
 
   PROP_LAST
 } PropType;
@@ -118,6 +119,7 @@ struct _Property {
     struct {
       Point endpoints[2];
     } endpoints_data;
+    gint connpoint_line_data;
     gpointer other_data;
   } d;
 };
@@ -151,6 +153,7 @@ struct _PropEnumData {
 #define PROP_VALUE_FILE(prop)          ((prop).d.string_data)
 #define PROP_VALUE_OTHER(prop)         ((prop).d.other_data)
 #define PROP_VALUE_ENDPOINTS(prop)     ((prop).d.endpoints_data)
+#define PROP_VALUE_CONNPOINT_LINE(prop) ((prop).d.connpoint_line_data)
 
 /* Copy the data member of the property
  * If NULL, then just copy data member straight */

--- a/objects/GRAFCET/vergent.c
+++ b/objects/GRAFCET/vergent.c
@@ -36,7 +36,7 @@
 #include "widgets.h"
 #include "message.h"
 #include "color.h"
-#include "lazyprops.h"
+#include "properties.h"
 #include "geometry.h"
 #include "connpoint_line.h"
 
@@ -48,16 +48,6 @@
 
 typedef enum { VERGENT_OR, VERGENT_AND } VergentType;
 
-typedef struct _VergentPropertiesDialog VergentPropertiesDialog;
-typedef struct _VergentDefaultsDialog VergentDefaultsDialog;
-typedef struct _VergentState VergentState;
-
-struct _VergentState {
-  ObjectState obj_state;
-  
-  VergentType type;
-};
-
 typedef struct _Vergent {
   Connection connection;
  
@@ -67,30 +57,9 @@ typedef struct _Vergent {
   VergentType type;
 } Vergent;
 
-struct _VergentPropertiesDialog {
-  AttributeDialog dialog;
-  Vergent *parent;
-
-  EnumAttribute type;
-};
-
-typedef struct _VergentDefaults {
-  VergentType type;
-} VergentDefaults;
-
-struct _VergentDefaultsDialog {
-  AttributeDialog dialog;
-  VergentDefaults *parent;
-
-  EnumAttribute type;
-};
-
-static VergentPropertiesDialog *vergent_properties_dialog;
-static VergentDefaultsDialog *vergent_defaults_dialog;
-static VergentDefaults defaults;
-
 static void vergent_move_handle(Vergent *vergent, Handle *handle,
-				   Point *to, HandleMoveReason reason, ModifierKeys modifiers);
+                                Point *to, HandleMoveReason reason, 
+                                ModifierKeys modifiers);
 static void vergent_move(Vergent *vergent, Point *to);
 static void vergent_select(Vergent *vergent, Point *clicked_point,
 			      Renderer *interactive_renderer);
@@ -102,17 +71,13 @@ static Object *vergent_create(Point *startpoint,
 static real vergent_distance_from(Vergent *vergent, Point *point);
 static void vergent_update_data(Vergent *vergent);
 static void vergent_destroy(Vergent *vergent);
-static Object *vergent_copy(Vergent *vergent);
-static GtkWidget *vergent_get_properties(Vergent *vergent);
-static ObjectChange *vergent_apply_properties(Vergent *vergent);
-
-static VergentState *vergent_get_state(Vergent *vergent);
-static void vergent_set_state(Vergent *vergent, VergentState *state);
-
-static void vergent_save(Vergent *vergent, ObjectNode obj_node,
-			    const char *filename);
 static Object *vergent_load(ObjectNode obj_node, int version,
-			       const char *filename);
+                            const char *filename);
+static PropDescription *vergent_describe_props(Vergent *vergent);
+static void vergent_get_props(Vergent *vergent, 
+                              Property *props, guint nprops);
+static void vergent_set_props(Vergent *vergent, 
+                              Property *props, guint nprops);
 
 static DiaMenu *vergent_get_object_menu(Vergent *vergent,
 					Point *clickedpoint);
@@ -120,8 +85,8 @@ static DiaMenu *vergent_get_object_menu(Vergent *vergent,
 static ObjectTypeOps vergent_type_ops =
 {
   (CreateFunc)vergent_create,   /* create */
-  (LoadFunc)  vergent_load,     /* load */
-  (SaveFunc)  vergent_save,      /* save */
+  (LoadFunc)  vergent_load,/*using properties*/     /* load */
+  (SaveFunc)  object_save_using_properties,      /* save */
   (GetDefaultsFunc)   NULL, 
   (ApplyDefaultsFunc) NULL  
 };
@@ -141,70 +106,68 @@ static ObjectOps vergent_ops = {
   (DrawFunc)            vergent_draw,
   (DistanceFunc)        vergent_distance_from,
   (SelectFunc)          vergent_select,
-  (CopyFunc)            vergent_copy,
+  (CopyFunc)            object_copy_using_properties,
   (MoveFunc)            vergent_move,
   (MoveHandleFunc)      vergent_move_handle,
-  (GetPropertiesFunc)   vergent_get_properties,
-  (ApplyPropertiesFunc) vergent_apply_properties,
-  (ObjectMenuFunc)      vergent_get_object_menu
-};
+  (GetPropertiesFunc)   object_create_props_dialog,
+  (ApplyPropertiesFunc) object_apply_props_from_dialog,
+  (ObjectMenuFunc)      vergent_get_object_menu,
+  (DescribePropsFunc)   vergent_describe_props,
+  (GetPropsFunc)        vergent_get_props,
+  (SetPropsFunc)        vergent_set_props
 
-static ObjectChange *
-vergent_apply_properties(Vergent *vergent)
-{
-  ObjectState *old_state;
-  VergentPropertiesDialog *dlg = vergent_properties_dialog;
-
-  PROPDLG_SANITY_CHECK(dlg,vergent);
-  
-  old_state = (ObjectState *)vergent_get_state(vergent);
+};
 
-  PROPDLG_APPLY_ENUM(dlg,type);
-  
-  vergent_update_data(vergent);
-  return new_object_state_change(&vergent->connection.object, old_state, 
-				 (GetStateFunc)vergent_get_state,
-				 (SetStateFunc)vergent_set_state);
-}
+static PropEnumData prop_vtype_data[] = {
+  { N_("OR"), VERGENT_OR },
+  { N_("AND"), VERGENT_AND },
+  { NULL, 0 }
+};
 
-PropDlgEnumEntry vergent_type_enum[] = {
-  { N_("OR"),VERGENT_OR,NULL },
-  { N_("AND"),VERGENT_AND,NULL },
-  { NULL } };
+static PropDescription vergent_props[] = {
+  CONNECTION_COMMON_PROPERTIES,
+  { "cpl_north",PROP_TYPE_CONNPOINT_LINE, 0,
+    "cpl_north","cpl_north"},
+  { "cpl_south",PROP_TYPE_CONNPOINT_LINE, 0,
+    "cpl_south","cpl_south"},
+  { "vtype", PROP_TYPE_ENUM, PROP_FLAG_VISIBLE,
+    N_("Vergent type:"),NULL, prop_vtype_data},
+  PROP_DESC_END
+};
 
-static PROPDLG_TYPE
-vergent_get_properties(Vergent *vergent)
+static PropDescription *
+vergent_describe_props(Vergent *vergent) 
 {
-  VergentPropertiesDialog *dlg = vergent_properties_dialog;
-  
-  PROPDLG_CREATE(dlg,vergent);
-  PROPDLG_SHOW_ENUM(dlg,type,_("Vergent type:"),vergent_type_enum);
-  PROPDLG_READY(dlg);
-  
-  vergent_properties_dialog = dlg;
-
-  PROPDLG_RETURN(dlg);
+  if (vergent_props[0].quark == 0) {
+    prop_desc_list_calculate_quarks(vergent_props);
+  }
+  return vergent_props;
 }
 
-static void 
-vergent_apply_defaults()
-{
-  VergentDefaultsDialog *dlg = vergent_defaults_dialog;  
+static PropOffset vergent_offsets[] = {
+  CONNECTION_COMMON_PROPERTIES_OFFSETS,
+  {"cpl_north",PROP_TYPE_CONNPOINT_LINE,offsetof(Vergent,north)},
+  {"cpl_south",PROP_TYPE_CONNPOINT_LINE,offsetof(Vergent,south)},
+  {"vtype",PROP_TYPE_ENUM,offsetof(Vergent,type)},
+  { NULL,0,0 }
+};
 
-  PROPDLG_APPLY_ENUM(dlg,type);
+static void
+vergent_get_props(Vergent *vergent, Property *props, guint nprops)
+{  
+  object_get_props_from_offsets(&vergent->connection.object,
+                                vergent_offsets,props,nprops);
 }
 
 static void
-init_default_values() {
-  static int defaults_initialized = 0;
-  
-  if (!defaults_initialized) {
-    defaults.type = VERGENT_OR;
-
-    defaults_initialized = 1;
-  }
+vergent_set_props(Vergent *vergent, Property *props, guint nprops)
+{
+  object_set_props_from_offsets(&vergent->connection.object,
+                                vergent_offsets,props,nprops);  
+  vergent_update_data(vergent);
 }
 
+
 static real
 vergent_distance_from(Vergent *vergent, Point *point)
 {
@@ -227,26 +190,6 @@ vergent_distance_from(Vergent *vergent, Point *point)
   return distance_rectangle_point(&rectangle,point);
 }
 
-static VergentState *
-vergent_get_state(Vergent *vergent)
-{
-  VergentState *state = g_new0(VergentState, 1);
-
-  state->obj_state.free = NULL;
-  state->type = vergent->type;
-
-  return state;
-}
-
-static void
-vergent_set_state(Vergent *vergent, VergentState *state)
-{
-  vergent->type = state->type;
-
-  g_free(state);  
-  vergent_update_data(vergent);
-}
-
 static void
 vergent_select(Vergent *vergent, Point *clicked_point,
 		  Renderer *interactive_renderer)
@@ -382,6 +325,8 @@ vergent_update_data(Vergent *vergent)
   connection_update_handles(conn);
 }
 
+/* Object menu handling */
+
 typedef struct {
   ObjectChange obj_change;
   
@@ -441,7 +386,6 @@ vergent_delete_cp_callback(Object *obj, Point *clicked, gpointer data)
   return vergent_create_change((Vergent *)obj,0,clicked); 
 }
 
-
 static DiaMenuItem object_menu_items[] = {
   { N_("Add connection point"), vergent_add_cp_callback, NULL, 1 },
   { N_("Delete  connection point"), vergent_delete_cp_callback, NULL, 1 },
@@ -466,9 +410,6 @@ vergent_get_object_menu(Vergent *vergent, Point *clickedpoint)
   return &object_menu;
 }
 
-
-
-
 static Object *
 vergent_create(Point *startpoint,
 		  void *user_data,
@@ -481,7 +422,6 @@ vergent_create(Point *startpoint,
   int i;
   Point defaultlen  = {6.0,0.0};
 
-  init_default_values();
   vergent = g_malloc0(sizeof(Vergent));
   conn = &vergent->connection;
   obj = &conn->object;
@@ -506,7 +446,6 @@ vergent_create(Point *startpoint,
   
   vergent->north = connpointline_create(obj,1);
   vergent->south = connpointline_create(obj,1);
-
   
   switch(GPOINTER_TO_INT(user_data)) {
   case VERGENT_OR:
@@ -535,97 +474,10 @@ vergent_destroy(Vergent *vergent)
 }
 
 static Object *
-vergent_copy(Vergent *vergent)
-{
-  Vergent *newvergent;
-  Connection *conn, *newconn;
-  Object *newobj;
-  int realconncount,i;
-
-  conn = &vergent->connection;
- 
-  newvergent = g_malloc0(sizeof(Vergent));
-  newconn = &newvergent->connection;
-  newobj = &newconn->object;
-
-  connection_copy(conn, newconn);
-
-  realconncount = 4;
-  newobj->connections[0] = &newvergent->northeast;
-  newobj->connections[1] = &newvergent->northwest;
-  newobj->connections[2] = &newvergent->southwest;
-  newobj->connections[3] = &newvergent->southeast;
-  for (i=0; i<4; i++) {
-    newobj->connections[i]->object = newobj;
-    newobj->connections[i]->connected = NULL;
-  }
-
-  newvergent->north = connpointline_copy(newobj,vergent->north,&realconncount);
-  newvergent->south = connpointline_copy(newobj,vergent->south,&realconncount);
-  g_assert(realconncount == newobj->num_connections);
-  newvergent->type = vergent->type;
-
-  vergent_update_data(newvergent); 
-
-  return &newvergent->connection.object;
-}
-
-
-static void
-vergent_save(Vergent *vergent, ObjectNode obj_node,
-		const char *filename)
-{
-  connection_save(&vergent->connection, obj_node);
-
-  save_enum(obj_node,"vtype",vergent->type);
-  connpointline_save(vergent->north,obj_node,"cpl_north");
-  connpointline_save(vergent->south,obj_node,"cpl_south");
-}
-
-static Object *
 vergent_load(ObjectNode obj_node, int version, const char *filename)
 {
-  Vergent *vergent;
-  Connection *conn;
-  Object *obj;
-  int i,realconncount;
-
-  init_default_values();
-  vergent = g_malloc0(sizeof(Vergent));
-
-  conn = &vergent->connection;
-  obj = &conn->object;
-  
-  obj->type = &vergent_type;
-  obj->ops = &vergent_ops;
-
-  connection_load(conn, obj_node);
-  connection_init(conn, 2, 4);
-  
-  obj->connections[0] = &vergent->northeast;
-  obj->connections[1] = &vergent->northwest;
-  obj->connections[2] = &vergent->southwest;
-  obj->connections[3] = &vergent->southeast;
-  for (i=0; i<4; i++) {
-    obj->connections[i]->object = obj;
-    obj->connections[i]->connected = NULL;
-  }
-
-  realconncount = 4;
-  g_assert(realconncount == obj->num_connections);
-
-  vergent->north = connpointline_load(obj,obj_node,
-				      "cpl_north",2,&realconncount);
-  vergent->south = connpointline_load(obj,obj_node,
-				      "cpl_south",2,&realconncount);
-
-  g_assert(realconncount == obj->num_connections);
-
-  vergent->type = load_enum(obj_node,"vtype",VERGENT_OR);
-
-  vergent_update_data(vergent);
-
-  return &vergent->connection.object;
+  return object_load_using_properties(&vergent_type,
+                                      obj_node,version,filename);
 }
 
 

--- a/objects/UML/lifeline.c
+++ b/objects/UML/lifeline.c
@@ -32,26 +32,18 @@
 #include "render.h"
 #include "handle.h"
 #include "properties.h"
+#include "connpoint_line.h"
 
 #include "pixmaps/lifeline.xpm"
 
 typedef struct _Lifeline Lifeline;
-typedef struct _LifelineState LifelineState;
 
-struct _LifelineState {
-  ObjectState obj_state;
-  
-  int draw_focuscontrol;
-  int draw_cross;
-};
-
-#define CONNECTIONS 6 /* must be even */
     
 struct _Lifeline {
   Connection connection;  
 
-  ConnectionPoint connections[CONNECTIONS];
-
+  ConnectionPoint connections[6]; /* the static ones. 6 is meant to 
+                                     be hardcoded. */
   Handle boxbot_handle;
   Handle boxtop_handle;
 
@@ -59,6 +51,15 @@ struct _Lifeline {
     
   int draw_focuscontrol;
   int draw_cross;
+  
+  ConnPointLine *northwest,*southwest,*northeast,*southeast;
+
+  /* we're (almost) obliged to do this stupid gymnastic with twin 
+     connpoint_lines, because we really do want to reload older objects 
+     (those created before we had the CPLs) without funny side effects. And 
+     we don't want to have two connection points (one static, one dynamic) in 
+     the same place either.
+  */
 };
 
 #define LIFELINE_LINEWIDTH 0.05
@@ -74,10 +75,11 @@ struct _Lifeline {
 #define HANDLE_BOXBOT (HANDLE_CUSTOM2)
 
 static void lifeline_move_handle(Lifeline *lifeline, Handle *handle,
-				   Point *to, HandleMoveReason reason, ModifierKeys modifiers);
+                                 Point *to, HandleMoveReason reason, 
+                                 ModifierKeys modifiers);
 static void lifeline_move(Lifeline *lifeline, Point *to);
 static void lifeline_select(Lifeline *lifeline, Point *clicked_point,
-			      Renderer *interactive_renderer);
+                            Renderer *interactive_renderer);
 static void lifeline_draw(Lifeline *lifeline, Renderer *renderer);
 static Object *lifeline_create(Point *startpoint,
 				 void *user_data,
@@ -86,28 +88,24 @@ static Object *lifeline_create(Point *startpoint,
 static real lifeline_distance_from(Lifeline *lifeline, Point *point);
 static void lifeline_update_data(Lifeline *lifeline);
 static void lifeline_destroy(Lifeline *lifeline);
-static Object *lifeline_copy(Lifeline *lifeline);
-static void lifeline_save(Lifeline *lifeline, ObjectNode obj_node,
-			  const char *filename);
 static Object *lifeline_load(ObjectNode obj_node, int version,
 			     const char *filename);
-static ObjectChange *lifeline_apply_properties(Lifeline *lif, GtkWidget *widget);
 static PropDescription *lifeline_describe_props(Lifeline *lifeline);
 
-static LifelineState *lifeline_get_state(Lifeline *lif);
-static void lifeline_set_state(Lifeline *lif,
-			       LifelineState *state);
 static void lifeline_get_props(Lifeline * lifeline, Property *props, 
 			       guint nprops);
 static void lifeline_set_props(Lifeline * lifeline, Property *props,
 			       guint nprops);
+static DiaMenu *lifeline_get_object_menu(Lifeline *lifeline,
+					Point *clickedpoint);
+
 
 
 static ObjectTypeOps lifeline_type_ops =
 {
   (CreateFunc) lifeline_create,
-  (LoadFunc)   lifeline_load,
-  (SaveFunc)   lifeline_save
+  (LoadFunc)   lifeline_load,/* using properties */
+  (SaveFunc)   object_save_using_properties
 };
 
 ObjectType lifeline_type =
@@ -123,24 +121,29 @@ static ObjectOps lifeline_ops = {
   (DrawFunc)            lifeline_draw,
   (DistanceFunc)        lifeline_distance_from,
   (SelectFunc)          lifeline_select,
-  (CopyFunc)            lifeline_copy,
+  (CopyFunc)            object_copy_using_properties,
   (MoveFunc)            lifeline_move,
   (MoveHandleFunc)      lifeline_move_handle,
   (GetPropertiesFunc)   object_create_props_dialog,
-  (ApplyPropertiesFunc) lifeline_apply_properties,
-  (ObjectMenuFunc)      NULL,
+  (ApplyPropertiesFunc) object_apply_props_from_dialog,
+  (ObjectMenuFunc)      lifeline_get_object_menu,
   (DescribePropsFunc)   lifeline_describe_props,
   (GetPropsFunc)        lifeline_get_props,
   (SetPropsFunc)        lifeline_set_props
 };
 
 static PropDescription lifeline_props[] = {
-  OBJECT_COMMON_PROPERTIES,
-  { "focus_control", PROP_TYPE_BOOL, PROP_FLAG_VISIBLE,
+  CONNECTION_COMMON_PROPERTIES,
+  { "rtop", PROP_TYPE_REAL, 0, NULL,NULL,NULL},
+  { "rbot", PROP_TYPE_REAL, 0, NULL,NULL,NULL},
+  { "draw_focus", PROP_TYPE_BOOL, PROP_FLAG_VISIBLE,
     N_("Draw focus of control:"), NULL, NULL },
-  { "cross", PROP_TYPE_BOOL, PROP_FLAG_VISIBLE,
+  { "draw_cross", PROP_TYPE_BOOL, PROP_FLAG_VISIBLE,
     N_("Draw destruction mark:"), NULL, NULL },
-  
+  { "cpl_northwest",PROP_TYPE_CONNPOINT_LINE, 0, NULL, NULL },
+  { "cpl_southwest",PROP_TYPE_CONNPOINT_LINE, 0, NULL, NULL },
+  { "cpl_northeast",PROP_TYPE_CONNPOINT_LINE, 0, NULL, NULL },
+  { "cpl_southeast",PROP_TYPE_CONNPOINT_LINE, 0, NULL, NULL },
   PROP_DESC_END
 };
 
@@ -153,9 +156,15 @@ lifeline_describe_props(Lifeline *lifeline)
 }
 
 static PropOffset lifeline_offsets[] = {
-  OBJECT_COMMON_PROPERTIES_OFFSETS,
-  { "focus_control", PROP_TYPE_BOOL, offsetof(Lifeline, draw_focuscontrol) },
-  { "cross", PROP_TYPE_BOOL, offsetof(Lifeline, draw_cross) },
+  CONNECTION_COMMON_PROPERTIES_OFFSETS,
+  { "draw_focus", PROP_TYPE_BOOL, offsetof(Lifeline, draw_focuscontrol) },
+  { "draw_cross", PROP_TYPE_BOOL, offsetof(Lifeline, draw_cross) },
+  { "rtop", PROP_TYPE_REAL, offsetof(Lifeline, rtop) },
+  { "rbot", PROP_TYPE_REAL, offsetof(Lifeline, rbot) },
+  { "cpl_northwest",PROP_TYPE_CONNPOINT_LINE,offsetof(Lifeline,northwest)},
+  { "cpl_southwest",PROP_TYPE_CONNPOINT_LINE,offsetof(Lifeline,southwest)},
+  { "cpl_northeast",PROP_TYPE_CONNPOINT_LINE,offsetof(Lifeline,northeast)},
+  { "cpl_southeast",PROP_TYPE_CONNPOINT_LINE,offsetof(Lifeline,southeast)},
   { NULL, 0, 0 },
 };
 
@@ -319,6 +328,108 @@ lifeline_draw(Lifeline *lifeline, Renderer *renderer)
   }
 }
 
+/* Object menu handling */
+
+typedef struct {
+  ObjectChange obj_change;
+  
+  ObjectChange *northeast,*southeast,*northwest,*southwest;
+} LifelineChange;
+
+static void lifeline_change_apply(LifelineChange *change, Object *obj)
+{
+  change->northwest->apply(change->northwest,obj);
+  change->southwest->apply(change->southwest,obj);
+  change->northeast->apply(change->northeast,obj);
+  change->southeast->apply(change->southeast,obj);
+}
+
+static void lifeline_change_revert(LifelineChange *change, Object *obj)
+{
+  change->northwest->revert(change->northwest,obj);
+  change->southwest->revert(change->southwest,obj);
+  change->northeast->revert(change->northeast,obj);
+  change->southeast->revert(change->southeast,obj);
+}
+
+static void lifeline_change_free(LifelineChange *change) 
+{
+  if (change->northeast->free) change->northeast->free(change->northeast);
+  g_free(change->northeast);
+  if (change->northwest->free) change->northwest->free(change->northwest);
+  g_free(change->northwest);
+  if (change->southeast->free) change->southeast->free(change->southeast);
+  g_free(change->southeast);
+  if (change->southwest->free) change->southwest->free(change->southwest);
+  g_free(change->southwest);
+}
+
+static ObjectChange *
+lifeline_create_change(Lifeline *lifeline, int add, Point *clicked) 
+{
+  LifelineChange *vc;
+ 
+  vc = g_new0(LifelineChange,1);
+  vc->obj_change.apply = (ObjectChangeApplyFunc)lifeline_change_apply;
+  vc->obj_change.revert = (ObjectChangeRevertFunc)lifeline_change_revert;
+  vc->obj_change.free = (ObjectChangeFreeFunc)lifeline_change_free;
+  
+  if (add) {
+    vc->northeast = connpointline_add_point(lifeline->northeast,clicked);
+    vc->northwest = connpointline_add_point(lifeline->northwest,clicked);
+    vc->southeast = connpointline_add_point(lifeline->southeast,clicked);
+    vc->southwest = connpointline_add_point(lifeline->southwest,clicked);
+  } else {
+    vc->northeast = connpointline_remove_point(lifeline->northeast,clicked);
+    vc->southwest = connpointline_remove_point(lifeline->southwest,clicked);
+    vc->southeast = connpointline_remove_point(lifeline->southeast,clicked);
+    vc->northwest = connpointline_remove_point(lifeline->northwest,clicked);
+  }
+  lifeline_update_data(lifeline);
+  return (ObjectChange *)vc;
+}
+
+static ObjectChange *
+lifeline_add_cp_callback(Object *obj, Point *clicked, gpointer data)
+{
+  return lifeline_create_change((Lifeline *)obj,1,clicked);
+}
+
+static ObjectChange *
+lifeline_delete_cp_callback(Object *obj, Point *clicked, gpointer data)
+{ 
+  return lifeline_create_change((Lifeline *)obj,0,clicked); 
+}
+
+static DiaMenuItem object_menu_items[] = {
+  { N_("Add connection points"), lifeline_add_cp_callback, NULL, 1 },
+  { N_("Remove connection points"), lifeline_delete_cp_callback, NULL, 1 },
+};
+
+static DiaMenu object_menu = {
+  N_("UML Lifeline"),
+  sizeof(object_menu_items)/sizeof(DiaMenuItem),
+  object_menu_items,
+  NULL
+};
+
+static DiaMenu *
+lifeline_get_object_menu(Lifeline *lifeline, Point *clickedpoint)
+{
+  /* Set entries sensitive/selected etc here */
+  g_assert( (lifeline->northwest->num_connections == 
+             lifeline->northeast->num_connections) || 
+            (lifeline->northwest->num_connections == 
+             lifeline->southwest->num_connections) ||
+            (lifeline->southwest->num_connections == 
+             lifeline->southeast->num_connections) );
+
+  object_menu_items[0].active = 1;
+  object_menu_items[1].active = (lifeline->northeast->num_connections > 1);
+
+  return &object_menu;
+}
+
 static Object *
 lifeline_create(Point *startpoint,
 		  void *user_data,
@@ -343,7 +454,7 @@ lifeline_create(Point *startpoint,
   obj->type = &lifeline_type;
   obj->ops = &lifeline_ops;
 
-  connection_init(conn, 4, CONNECTIONS);
+  connection_init(conn, 4, 6);
 
   lifeline->rtop = LIFELINE_HEIGHT/3;
   lifeline->rbot = lifeline->rtop+0.7;
@@ -366,12 +477,17 @@ lifeline_create(Point *startpoint,
   obj->handles[1]->connect_type = HANDLE_NONCONNECTABLE;
 
   /* Connection points */
-  for (i=0;i<CONNECTIONS;i++) {
+  for (i=0;i<6;i++) {
     obj->connections[i] = &lifeline->connections[i];
     lifeline->connections[i].object = obj;
     lifeline->connections[i].connected = NULL;
   }
 
+  lifeline->northwest = connpointline_create(obj,1);
+  lifeline->southwest = connpointline_create(obj,1);
+  lifeline->northeast = connpointline_create(obj,1);
+  lifeline->southeast = connpointline_create(obj,1);
+
   lifeline_update_data(lifeline);
 
   *handle1 = obj->handles[0];
@@ -380,84 +496,23 @@ lifeline_create(Point *startpoint,
   return &lifeline->connection.object;
 }
 
-
 static void
 lifeline_destroy(Lifeline *lifeline)
 {
+  connpointline_destroy(lifeline->southeast);
+  connpointline_destroy(lifeline->northwest);
+  connpointline_destroy(lifeline->northeast);
+  connpointline_destroy(lifeline->southwest);
   connection_destroy(&lifeline->connection);
 }
 
-static Object *
-lifeline_copy(Lifeline *lifeline)
-{
-  int i;
-  Lifeline *newlifeline;
-  Connection *conn, *newconn;
-  Object *newobj;
-  
-  conn = &lifeline->connection;
-  
-  newlifeline = g_malloc0(sizeof(Lifeline));
-  newconn = &newlifeline->connection;
-  newobj = &newconn->object;
-
-  connection_copy(conn, newconn);
-
-  for (i = 0; i < CONNECTIONS; i++) {
-    newobj->connections[i] = &newlifeline->connections[i];
-    newlifeline->connections[i].object = newobj;
-    newlifeline->connections[i].connected = NULL;
-    newlifeline->connections[i].pos = lifeline->connections[i].pos;
-    newlifeline->connections[i].last_pos = lifeline->connections[i].last_pos;
-  }
-
-  newlifeline->boxbot_handle = lifeline->boxbot_handle;
-  newobj->handles[2] = &newlifeline->boxbot_handle;
-  newlifeline->boxtop_handle = lifeline->boxtop_handle;
-  newobj->handles[3] = &newlifeline->boxtop_handle;
-
-  newlifeline->rtop = lifeline->rtop;
-  newlifeline->rbot = lifeline->rbot;
-
-   newlifeline->draw_focuscontrol = lifeline->draw_focuscontrol;
-   newlifeline->draw_cross = lifeline->draw_cross;
-
-  return &newlifeline->connection.object;
-}
-
-static LifelineState *
-lifeline_get_state(Lifeline *lif)
-{
-  LifelineState *state = g_new0(LifelineState, 1);
-
-  state->obj_state.free = NULL;
-
-  state->draw_focuscontrol = lif->draw_focuscontrol;
-  state->draw_cross = lif->draw_cross;
-
-  return state;
-}
-
-static void
-lifeline_set_state(Lifeline *lif, LifelineState *state)
-{
-  lif->draw_focuscontrol = state->draw_focuscontrol;
-  lif->draw_cross = state->draw_cross;
-  
-  g_free(state);
-  
-  lifeline_update_data(lif);
-}
-
 static void
 lifeline_update_data(Lifeline *lifeline)
 {
   Connection *conn = &lifeline->connection;
   Object *obj = &conn->object;
   LineBBExtras *extra = &conn->extra_spacing;
-  Point p1, p2;
-  real r;
-  int i;
+  Point p1, p2, pnw, psw, pne, pse, pmw,pme;
 
   obj->position = conn->endpoints[0];
 
@@ -489,122 +544,46 @@ lifeline_update_data(Lifeline *lifeline)
   if (lifeline->draw_focuscontrol) {  
       p1.x -= LIFELINE_WIDTH/2.0;
       p2.x += LIFELINE_WIDTH/2.0; 
-      /* Update connections: */      
-      r = (p2.y - p1.y)/(float)(CONNECTIONS/2-1); 
-      for (i = 0; i < CONNECTIONS/2; ++i) {
-        lifeline->connections[i*2].pos.x = p1.x;
-        lifeline->connections[i*2+1].pos.x = p2.x;
-        lifeline->connections[i*2+1].pos.y =
-          lifeline->connections[i*2].pos.y = p1.y + i*r;
-      }
-  } else {     
-    /* without focus of control, the points are over the line */
-    r = (p2.y - p1.y)/(float)(CONNECTIONS-1); 
-    for (i = 0; i < CONNECTIONS; i++) {
-      lifeline->connections[i].pos.x = p1.x;
-      lifeline->connections[i].pos.y = p1.y + i*r;
-    }
   }
-}
-
-
-static void
-lifeline_save(Lifeline *lifeline, ObjectNode obj_node,
-	      const char *filename)
-{
-  connection_save(&lifeline->connection, obj_node);
-
-  data_add_real(new_attribute(obj_node, "rtop"),
-		lifeline->rtop);
-  data_add_real(new_attribute(obj_node, "rbot"),
-		lifeline->rbot);
-  data_add_boolean(new_attribute(obj_node, "draw_focus"),
-		   lifeline->draw_focuscontrol);
-  data_add_boolean(new_attribute(obj_node, "draw_cross"),
-		   lifeline->draw_cross);
+  /* Update connections: */      
+
+  pnw.x = p1.x; pnw.y = p1.y;
+  psw.x = p1.x; psw.y = p2.y;
+  pne.x = p2.x; pne.y = p1.y;
+  pse.x = p2.x; pse.y = p2.y;
+  pmw.x = pnw.x;
+  pme.x = pne.x;
+  pmw.y = pme.y = (p1.y + p2.y)/2;
+
+  lifeline->connections[0].pos = pnw;
+  lifeline->connections[1].pos = pne;
+  lifeline->connections[2].pos = pmw;
+  lifeline->connections[3].pos = pme;
+  lifeline->connections[4].pos = psw;
+  lifeline->connections[5].pos = pse;
+
+  connpointline_update(lifeline->northwest);
+  connpointline_putonaline(lifeline->northwest,&pnw,&pmw);
+  connpointline_update(lifeline->southwest);
+  connpointline_putonaline(lifeline->southwest,&pmw,&psw);
+  connpointline_update(lifeline->northeast);
+  connpointline_putonaline(lifeline->northeast,&pne,&pme);
+  connpointline_update(lifeline->southeast);
+  connpointline_putonaline(lifeline->southeast,&pme,&pse);
 }
 
 static Object *
 lifeline_load(ObjectNode obj_node, int version, const char *filename)
 {
-  Lifeline *lifeline;
-  AttributeNode attr;
-  Connection *conn;
-  Object *obj;
-  int i;
+  return object_load_using_properties(&lifeline_type,
+                                      obj_node,version,filename);
+}
 
-  lifeline = g_malloc0(sizeof(Lifeline));
 
-  conn = &lifeline->connection;
-  obj = &conn->object;
 
-  obj->type = &lifeline_type;
-  obj->ops = &lifeline_ops;
 
-  connection_load(conn, obj_node);
-  
-  connection_init(conn, 4, CONNECTIONS);
-
-  attr = object_find_attribute(obj_node, "rtop");
-  if (attr != NULL)
-    lifeline->rtop = data_real(attribute_first_data(attr));
-  else
-    lifeline->rtop = LIFELINE_HEIGHT/3;
-
-  attr = object_find_attribute(obj_node, "rbot");
-  if (attr != NULL)
-    lifeline->rbot = data_real(attribute_first_data(attr));
-  else
-    lifeline->rbot = lifeline->rtop+0.7;
-
-  attr = object_find_attribute(obj_node, "draw_focus");
-  if (attr != NULL)
-    lifeline->draw_focuscontrol = data_boolean(attribute_first_data(attr));
-  else
-    lifeline->draw_focuscontrol = 1;
-
-  attr = object_find_attribute(obj_node, "draw_cross");
-  if (attr != NULL)
-    lifeline->draw_cross = data_boolean(attribute_first_data(attr));
-  else
-    lifeline->draw_cross = 0;
 
-  /* Connection points */
-  for (i=0;i<CONNECTIONS;i++) {
-    obj->connections[i] = &lifeline->connections[i];
-    lifeline->connections[i].object = obj;
-    lifeline->connections[i].connected = NULL;
-  }
 
-  lifeline->boxbot_handle.id = HANDLE_BOXBOT;
-  lifeline->boxbot_handle.type = HANDLE_MINOR_CONTROL;
-  lifeline->boxbot_handle.connect_type = HANDLE_NONCONNECTABLE;
-  lifeline->boxbot_handle.connected_to = NULL;
-  obj->handles[2] = &lifeline->boxbot_handle;
-  
-  lifeline->boxtop_handle.id = HANDLE_BOXTOP;
-  lifeline->boxtop_handle.type = HANDLE_MINOR_CONTROL;
-  lifeline->boxtop_handle.connect_type = HANDLE_NONCONNECTABLE;
-  lifeline->boxtop_handle.connected_to = NULL;
-  obj->handles[3] = &lifeline->boxtop_handle;
-  
-  lifeline_update_data(lifeline);
-  
-  return &lifeline->connection.object;
-}
 
 
-static ObjectChange *
-lifeline_apply_properties(Lifeline *lif, GtkWidget *widget)
-{
-  ObjectState *old_state;
-
-  old_state = (ObjectState*) lifeline_get_state(lif);
-
-  object_apply_props_from_dialog((Object *)lif, widget);
-  
-  lifeline_update_data(lif);
-  return new_object_state_change(&lif->connection.object, old_state, 
-				 (GetStateFunc)lifeline_get_state,
-				 (SetStateFunc)lifeline_set_state);
-}
+ 

--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dia 0.86\n"
-"POT-Creation-Date: 2001-06-08 06:57+0200\n"
+"POT-Creation-Date: 2001-06-10 23:09+0200\n"
 "PO-Revision-Date: 2001-05-17 13:31+0200\n"
 "Last-Translator: Christophe Merlet <[e-mail]>\n"
 "Language-Team: Gnome French Team <[e-mail]>\n"
@@ -35,15 +35,15 @@ msgstr "Ne pas afficher l'
 msgid "Show this help message"
 msgstr "Afficher ce message d'aide"
 
-#: app/app_procs.c:182
+#: app/app_procs.c:185
 msgid "Can't connect to session manager!\n"
 msgstr "Ne peut se connecter au gestionnaire de session !\n"
 
-#: app/app_procs.c:193
+#: app/app_procs.c:196
 msgid "[OPTION...] [FILE...]"
 msgstr "[OPTION...] [FICHIER...]"
 
-#: app/app_procs.c:196
+#: app/app_procs.c:199
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -53,20 +53,20 @@ msgstr ""
 "Tapez ｫ %s --help ｻ pour voir une liste compl鑼e des options en ligne de "
 "commande.\n"
 
-#: app/app_procs.c:245 app/app_procs.c:247
+#: app/app_procs.c:248 app/app_procs.c:250
 msgid ""
 "Couldn't find standard objects when looking for object-libs, exiting...\n"
 msgstr "Ne peut trouver les objets standards dans object-libs, termin?..\n"
 
-#: app/app_procs.c:272
+#: app/app_procs.c:275
 msgid "Need valid input file\n"
 msgstr "N馗essite un fichier d'entr馥 valide\n"
 
-#: app/app_procs.c:338 app/app_procs.c:344
+#: app/app_procs.c:341 app/app_procs.c:347
 msgid "Quit, are you sure?"
 msgstr "ﾊtes-vous s? de vouloir quitter ?"
 
-#: app/app_procs.c:351
+#: app/app_procs.c:354
 msgid ""
 "Modified diagrams exists.\n"
 "Are you sure you want to quit?"
@@ -74,21 +74,21 @@ msgstr ""
 "Des diagrammes ont 騁 modifi駸.\n"
 "Voulez-vous vraiment quitter ?"
 
-#: app/app_procs.c:361 app/app_procs.c:366
+#: app/app_procs.c:364 app/app_procs.c:369
 msgid "Quit"
 msgstr "Quitter"
 
-#: app/app_procs.c:378 app/display.c:958 app/layer_dialog.c:989
+#: app/app_procs.c:381 app/display.c:958 app/layer_dialog.c:989
 #: app/lineprops_area.c:741 app/lineprops_area.c:941 app/linewidth_area.c:246
 #: app/paginate_psprint.c:264
 msgid "Cancel"
 msgstr "Annuler"
 
-#: app/app_procs.c:453 app/app_procs.c:460
+#: app/app_procs.c:456 app/app_procs.c:463
 msgid "Could not create per-user Dia config directory"
 msgstr "Ne peut cr馥r le r駱ertoire de configuration personnel de Dia"
 
-#: app/app_procs.c:462
+#: app/app_procs.c:465
 msgid ""
 "Could not create per-user Dia config directory. Please make sure that the "
 "environment variable HOME points to an existing directory."
@@ -97,7 +97,7 @@ msgstr ""
 "Veuillez v駻ifier que la variable d'environnement HOME pointe vers un \n"
 "r駱ertoire existant."
 
-#: app/app_procs.c:484
+#: app/app_procs.c:487
 msgid "Objects and filters internal to dia"
 msgstr "Objets et filtres internes de Dia"
 
@@ -320,12 +320,12 @@ msgstr ""
 "Enregistrer les changements maintenant ?"
 
 #: app/display.c:937 app/filedlg.c:246 app/filedlg.c:435 app/preferences.c:503
-#: lib/properties.c:288
+#: lib/properties.c:291
 msgid "Yes"
 msgstr "Oui"
 
 #: app/display.c:947 app/filedlg.c:259 app/filedlg.c:448 app/preferences.c:503
-#: app/preferences.c:514 lib/properties.c:290 lib/properties.c:311
+#: app/preferences.c:514 lib/properties.c:293 lib/properties.c:314
 msgid "No"
 msgstr "Non"
 
@@ -429,8 +429,8 @@ msgstr "D
 msgid "Create Text"
 msgstr "Cr馥r du texte"
 
-#: app/interface.c:58 app/menus.c:197 lib/properties.c:1262
-#: lib/properties.h:366
+#: app/interface.c:58 app/menus.c:197 lib/properties.c:1290
+#: lib/properties.h:369
 msgid "Text"
 msgstr "Texte"
 
@@ -583,7 +583,7 @@ msgstr "D
 msgid "Line Style Properties"
 msgstr "Propri騁駸 du style de ligne"
 
-#: app/linewidth_area.c:216 lib/properties.h:342
+#: app/linewidth_area.c:216 lib/properties.h:345
 msgid "Line width"
 msgstr "Largeur de ligne"
 
@@ -793,17 +793,17 @@ msgstr "Transitif"
 msgid "Same Type"
 msgstr "M麥e type"
 
-#: app/menus.c:164 lib/properties.c:1247 lib/properties.h:330
+#: app/menus.c:164 lib/properties.c:1275 lib/properties.h:333
 #: lib/widgets.c:199
 msgid "Left"
 msgstr "ﾀ gauche"
 
-#: app/menus.c:165 app/menus.c:174 lib/properties.c:1248 lib/properties.h:331
+#: app/menus.c:165 app/menus.c:174 lib/properties.c:1276 lib/properties.h:334
 #: lib/widgets.c:205
 msgid "Center"
 msgstr "Au centre"
 
-#: app/menus.c:166 lib/properties.c:1249 lib/properties.h:332
+#: app/menus.c:166 lib/properties.c:1277 lib/properties.h:335
 #: lib/widgets.c:211
 msgid "Right"
 msgstr "ﾀ droite"
@@ -1505,19 +1505,19 @@ msgstr "Chargement..."
 msgid "Dia v %s"
 msgstr "Dia v %s"
 
-#: lib/properties.c:1256 lib/properties.h:345
+#: lib/properties.c:1284 lib/properties.h:348
 msgid "Line colour"
 msgstr "Couleur de ligne :"
 
-#: lib/properties.c:1257 lib/properties.h:348
+#: lib/properties.c:1285 lib/properties.h:351
 msgid "Line style"
 msgstr "Style de ligne"
 
-#: lib/properties.c:1258 lib/properties.h:352
+#: lib/properties.c:1286 lib/properties.h:355
 msgid "Fill colour"
 msgstr "Couleur de remplissage"
 
-#: lib/properties.c:1259 lib/properties.h:355
+#: lib/properties.c:1287 lib/properties.h:358
 #: objects/custom/custom_object.c:362 objects/flowchart/box.c:317
 #: objects/flowchart/diamond.c:310 objects/flowchart/ellipse.c:310
 #: objects/flowchart/parallelogram.c:321 objects/standard/beziergon.c:222
@@ -1526,29 +1526,29 @@ msgstr "Couleur de remplissage"
 msgid "Draw background"
 msgstr "Dessiner le fond"
 
-#: lib/properties.c:1260 lib/properties.h:359
+#: lib/properties.c:1288 lib/properties.h:362
 msgid "Start arrow"
 msgstr "Fl鐵he de d饕ut"
 
-#: lib/properties.c:1261 lib/properties.h:362
+#: lib/properties.c:1289 lib/properties.h:365
 msgid "End arrow"
 msgstr "Fl鐵he de fin"
 
-#: lib/properties.c:1263 lib/properties.h:369
+#: lib/properties.c:1291 lib/properties.h:372
 msgid "Text alignment"
 msgstr "Alignement"
 
-#: lib/properties.c:1264 lib/properties.h:372 objects/GRAFCET/condition.c:131
+#: lib/properties.c:1292 lib/properties.h:375 objects/GRAFCET/condition.c:131
 #: objects/GRAFCET/transition.c:140
 msgid "Font"
 msgstr "Police"
 
-#: lib/properties.c:1265 lib/properties.h:375 objects/GRAFCET/condition.c:133
+#: lib/properties.c:1293 lib/properties.h:378 objects/GRAFCET/condition.c:133
 #: objects/GRAFCET/transition.c:142
 msgid "Font size"
 msgstr "Taille de police"
 
-#: lib/properties.c:1266 lib/properties.h:378
+#: lib/properties.c:1294 lib/properties.h:381
 msgid "Text colour"
 msgstr "Couleur du texte"
 
@@ -1604,7 +1604,7 @@ msgstr ""
 msgid "Font %s not found, using Courier instead.\n"
 msgstr "Police %s non trouv馥, utilisation de la police Courier  la place.\n"
 
-#: lib/properties.c:382 lib/properties.c:414
+#: lib/properties.c:386 lib/properties.c:418
 msgid "No edit widget"
 msgstr "Pas de widget d'馘ition"
 
@@ -2801,28 +2801,28 @@ msgstr "Point Sud"
 msgid "Draw arrow heads on upward arcs:"
 msgstr "Dessine les fl鐵hes sur les arcs montants :"
 
-#: objects/GRAFCET/vergent.c:171
+#: objects/GRAFCET/vergent.c:122
 msgid "OR"
 msgstr "OU"
 
-#: objects/GRAFCET/vergent.c:172
+#: objects/GRAFCET/vergent.c:123
 msgid "AND"
 msgstr "ET"
 
-#: objects/GRAFCET/vergent.c:181
+#: objects/GRAFCET/vergent.c:134
 msgid "Vergent type:"
 msgstr "Type de vergence :"
 
-#: objects/GRAFCET/vergent.c:446 objects/SADT/box.c:539
+#: objects/GRAFCET/vergent.c:390 objects/SADT/box.c:539
 #: objects/standard/line.c:182
 msgid "Add connection point"
 msgstr "Ajouter un point de connexion"
 
-#: objects/GRAFCET/vergent.c:447
+#: objects/GRAFCET/vergent.c:391
 msgid "Delete  connection point"
 msgstr "Supprimer un point de connexion"
 
-#: objects/GRAFCET/vergent.c:451
+#: objects/GRAFCET/vergent.c:395
 msgid "GRAFCET OR/AND vergent"
 msgstr "Vergence ET/OU de GRAFCET"
 
@@ -3119,14 +3119,26 @@ msgstr "Afficher la fl
 msgid "Interface:"
 msgstr "Interface :"
 
-#: objects/UML/lifeline.c:138
+#: objects/UML/lifeline.c:140
 msgid "Draw focus of control:"
 msgstr "Afficher le focus du contr?e :"
 
-#: objects/UML/lifeline.c:140
+#: objects/UML/lifeline.c:142
 msgid "Draw destruction mark:"
 msgstr "Montrer la marque de destruction :"
 
+#: objects/UML/lifeline.c:405
+msgid "Add connection points"
+msgstr "Ajouter des points de connexion"
+
+#: objects/UML/lifeline.c:406
+msgid "Remove connection points"
+msgstr "Supprimer des points de connexion"
+
+#: objects/UML/lifeline.c:410
+msgid "UML Lifeline"
+msgstr "Ligne de vie UML"
+
 #: objects/UML/message.c:158
 msgid "Call"
 msgstr "Appel"
@@ -3526,8 +3538,8 @@ msgid "Fig Format import and export filter"
 msgstr "Filtre d'import depuis le format Fig"
 
 #: plug-ins/xfig/xfig-import.c:73
-msgid "Polygon import is not implemented yes"
-msgstr "Type d'objet %d pas encore impl駑ent?
+msgid "Polygon import is not implemented yet"
+msgstr "Import de polygones pas encore impl駑ent?
 
 #: plug-ins/xfig/xfig-import.c:74
 msgid "Patterns are not supported by Dia"