Commit: 1a0e58590a2ca3414fbb82ab2564f3e44dc6d64b - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Révision: 1a0e58590a2ca3414fbb82ab2564f3e44dc6d64b (tree)
• l'heure: 2001-06-12 19:19:28
• Auteur: Cyrille Chepelov <cyrille@src....>
• Commiter: Cyrille Chepelov

Message de Log

removed lazyprops for standard props. removed lazyprops (phew !) ditto

* objects/SADT/box.c: removed lazyprops for standard props.
* objects/chronograms/chronoline.c: removed lazyprops (phew !)
* objects/chronograms/chronoref.c: ditto

* lib/lazyprops.[ch] (DELETED): good riddance.

* lib/properties.[ch]: new property types:
- PROP_TYPE_STATIC: static text to be displayed in the dialog.
- PROP_TYPE_MULTISTRING: same as string, but renders as a
multi-line entry box.
- PROP_TYPE_NOTEBOOK_BEGIN,_PAGE,_END: stuff to make dialogs
in a tabbed-notebook style (this is a bit complicated to use;
see objects/chronograms/chronoline.c for an example).

Change Summary

• modified: ChangeLog
• delete: lib/lazyprops.c
• delete: lib/lazyprops.h
• modified: lib/properties.c
• modified: lib/properties.h
• modified: objects/GRAFCET/action.c
• modified: objects/GRAFCET/step.c
• modified: objects/GRAFCET/transition.c
• modified: objects/SADT/box.c
• modified: objects/chronogram/chronoline.c
• modified: objects/chronogram/chronoref.c

Modification

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
[phone]  Cyrille Chepelov  <[e-mail]>
+
+	* objects/SADT/box.c: removed lazyprops for standard props.
+	* objects/chronograms/chronoline.c: removed lazyprops (phew !)
+	* objects/chronograms/chronoref.c: ditto 
+
+	* lib/lazyprops.[ch] (DELETED): good riddance.
+
+	* lib/properties.[ch]: new property types:
+	    - PROP_TYPE_STATIC: static text to be displayed in the dialog.
+	    - PROP_TYPE_MULTISTRING: same as string, but renders as a
+	    multi-line entry box.
+	    - PROP_TYPE_NOTEBOOK_BEGIN,_PAGE,_END: stuff to make dialogs
+	    in a tabbed-notebook style (this is a bit complicated to use; 
+	    see objects/chronograms/chronoline.c for an example).
+	       
 2001-06-11  Cyrille Chepelov  <[e-mail]>
 
 	* objects/GRAFCET/boolequation.[ch]: zap lazyprops. Add standard props.

--- a/lib/lazyprops.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/* 
- * Various laziness routines to minimise boilerplate code
- * Copyright(C) 2000 Cyrille Chepelov
- *
- * I stole most of the gtk code here.
- *
- *  WARNING: THIS CODE IS ROTTEN. IT WILL GO AWAY SOON. YOU HAVE BEEN WARNED.
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#define __LAZYPROPS_C
-#ifndef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "lazyprops.h"
-#include "intl.h"
-
-void 
-__propdlg_build_enum(GtkWidget *dialog, 
-		     const gchar *desc,
-		     PropDlgEnumEntry *enumentries)
-{
-  GtkWidget *label,*vbox,*button; 
-  GSList *group; 
-  PropDlgEnumEntry *p; 
-  
-  p = enumentries;
-
-  vbox = gtk_vbox_new(FALSE,0); 
-    
-  label = gtk_label_new((desc)); 
-  gtk_box_pack_start(GTK_BOX(vbox),label,FALSE,TRUE,0); 
-  
-  gtk_widget_show(label); 
-  
-  group = NULL; 
-  while (p->desc) { 
-    button = gtk_radio_button_new_with_label(group, _(p->desc)); 
-    gtk_box_pack_start(GTK_BOX(vbox),button,TRUE,TRUE,0); 
-    gtk_widget_show(button); 
-    p->button = GTK_TOGGLE_BUTTON(button); 
-    if (!group) gtk_toggle_button_set_active(p->button,TRUE); /* first */ 
-    group = gtk_radio_button_group(GTK_RADIO_BUTTON(button)); 
-    p++; 
-  }
-  gtk_box_pack_start(GTK_BOX(dialog),vbox,TRUE,TRUE,0); 
-  gtk_widget_show(vbox); 
-}
-
-void 
-__propdlg_set_enum(PropDlgEnumEntry *enumentries, int value)
-{
-  PropDlgEnumEntry *p = enumentries;
-  while (p->desc) { 
-    if (value == p->value) { 
-      gtk_toggle_button_set_active(p->button,TRUE); 
-      break; 
-    } 
-    p++; 
-  } 
-} 
-  
-int
-__propdlg_get_enum(PropDlgEnumEntry *enumentries) 
-{
-  PropDlgEnumEntry *p = enumentries;
-  while (p->desc) { 
-    if (gtk_toggle_button_get_active(p->button))
-      return p->value;
-    p++;
-  }
-  g_assert_not_reached(); 
-  return 0; 
-}
-
-StringAttribute 
-__propdlg_build_string(GtkWidget *dialog, const gchar *desc)
-{
-  GtkWidget *label,*entry,*hbox;
-
-  hbox = gtk_hbox_new(FALSE, 5);
-  
-  label = gtk_label_new(desc);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
-  entry = gtk_entry_new();
-  gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
-  gtk_widget_show (label);
-  gtk_widget_show (entry);
-  gtk_box_pack_start (GTK_BOX (dialog), hbox, TRUE, TRUE, 0);
-  gtk_widget_show(hbox);
-  
-  return GTK_ENTRY(entry);
-}
-
-MultiStringAttribute 
-__propdlg_build_multistring(GtkWidget *dialog, const gchar *desc, int numlines)
-{
-  GtkWidget *label,*entry,*hbox;
-
-  hbox = gtk_hbox_new(FALSE, numlines);
-  
-  label = gtk_label_new(desc);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
-  entry = gtk_text_new(NULL,NULL);
-  gtk_text_set_editable(GTK_TEXT(entry), TRUE);
-  gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
-  gtk_widget_show (label);
-  gtk_widget_show (entry);
-  gtk_box_pack_start (GTK_BOX (dialog), hbox, TRUE, TRUE, 0);
-  gtk_widget_show(hbox);
-  
-  return GTK_TEXT(entry);
-}
-
-void 
-__propdlg_build_separator(GtkWidget *dialog)
-{ 
-  GtkWidget *label; 
-  label = gtk_hseparator_new (); 
-  gtk_box_pack_start (GTK_BOX (dialog), label, FALSE, TRUE, 0); 
-  gtk_widget_show (label); 
-}
-
-void 
-__propdlg_build_static(GtkWidget *dialog, 
-		       const gchar *desc)
-{ 
-  GtkWidget *label; 
-
-  label = gtk_label_new((desc)); 
-  gtk_label_set_justify(GTK_LABEL(label),GTK_JUSTIFY_LEFT);
-  gtk_widget_show (label); 
-  gtk_box_pack_start(GTK_BOX(dialog), label, FALSE, TRUE, 0); 
-  gtk_widget_show(label);
-}
-
-ArrowAttribute 
-__propdlg_build_arrow(GtkWidget *dialog, const gchar *desc)
-{ 
-  GtkWidget *hbox, *label, *align, *arrow; 
-
-  hbox = gtk_hbox_new(FALSE, 5); 
-  label = gtk_label_new((desc)); 
-  align = gtk_alignment_new(0.0,0.0,0.0,0.0); 
-  gtk_container_add(GTK_CONTAINER(align), label); 
-  gtk_box_pack_start (GTK_BOX (hbox), align, FALSE, TRUE, 0); 
-  gtk_widget_show (label); 
-  gtk_widget_show(align); 
-  arrow = dia_arrow_selector_new(); 
-  gtk_box_pack_start (GTK_BOX (hbox), arrow, TRUE, TRUE, 0); 
-  gtk_widget_show (arrow); 
-  gtk_widget_show(hbox); 
-  gtk_box_pack_start (GTK_BOX(dialog), hbox, TRUE, TRUE, 0); 
-
-  return DIAARROWSELECTOR(arrow); 
-}
-
-LineStyleAttribute
-__propdlg_build_linestyle(GtkWidget *dialog, const gchar *desc)
-{ 
-  GtkWidget *hbox,*label,*linestyle; 
-  hbox = gtk_hbox_new(FALSE, 5); 
-  label = gtk_label_new((desc)); 
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0); 
-  gtk_widget_show (label); 
-  linestyle = dia_line_style_selector_new(); 
-  gtk_box_pack_start (GTK_BOX (hbox), linestyle, TRUE, TRUE, 0); 
-  gtk_widget_show (linestyle); 
-  gtk_widget_show(hbox); 
-  gtk_box_pack_start (GTK_BOX(dialog), hbox, TRUE, TRUE, 0); 
-  
-  return DIALINESTYLESELECTOR(linestyle); 
-}    
-
-
-ColorAttribute 
-__propdlg_build_color(GtkWidget *dialog, const gchar *desc)
-{
-  GtkWidget *hbox,*label,*color; 
-  
-  hbox = gtk_hbox_new(FALSE, 5); 
-  label = gtk_label_new((desc)); 
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0); 
-  gtk_widget_show (label); 
-  color = dia_color_selector_new(); 
-  gtk_box_pack_start (GTK_BOX (hbox), color, TRUE, TRUE, 0); 
-  gtk_widget_show (color); 
-  gtk_widget_show(hbox); 
-  gtk_box_pack_start (GTK_BOX(dialog), hbox, TRUE, TRUE, 0); 
-  
-  return DIACOLORSELECTOR(color); 
-} 
-  
-BoolAttribute 
-__propdlg_build_bool(GtkWidget *dialog, const gchar *desc)
-{ 
-  GtkWidget *hbox, *cb; 
-
-  hbox = gtk_hbox_new(FALSE,5); 
-  cb = gtk_check_button_new_with_label((desc));
-  gtk_box_pack_start(GTK_BOX(hbox),cb,TRUE,TRUE,0); 
-  gtk_widget_show(cb);
-  gtk_widget_show(hbox);
-  gtk_box_pack_start(GTK_BOX(dialog), hbox, FALSE, TRUE, 0); 
-  return GTK_TOGGLE_BUTTON(cb);   
-}
-
-FontAttribute 
-__propdlg_build_font(GtkWidget *dialog, const gchar *desc)
-{ 
-  GtkWidget *hbox, *label, *font; 
-
-  hbox = gtk_hbox_new(FALSE, 5); 
-  label = gtk_label_new((desc)); 
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0); 
-  gtk_widget_show (label); 
-  font = dia_font_selector_new(); 
-  gtk_box_pack_start (GTK_BOX (hbox), font, TRUE, TRUE, 0); 
-  gtk_widget_show (font); 
-  gtk_widget_show(hbox); 
-  gtk_box_pack_start (GTK_BOX(dialog), hbox, TRUE, TRUE, 0); 
-  return DIAFONTSELECTOR(font); 
-}
-									    
-
-RealAttribute
-__propdlg_build_real(GtkWidget *dialog, const gchar *desc,
-		     gfloat lower, gfloat upper, gfloat step_increment)
-{ 
-  GtkWidget *hbox, *label, *spin; 
-  GtkAdjustment *adj; 
-  
-  hbox = gtk_hbox_new(FALSE,5); 
-  label = gtk_label_new( (desc) ); 
-  gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); 
-  gtk_widget_show(label); 
-  adj = (GtkAdjustment *) gtk_adjustment_new(0.1, lower, upper, 
-					     step_increment, 10.0 * step_increment, 0.0); 
-  spin = gtk_spin_button_new(adj, 1.0, 2);
-  gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(spin), TRUE); 
-  gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(spin), TRUE); 
-  gtk_box_pack_start(GTK_BOX (hbox), spin, TRUE, TRUE, 0); 
-  gtk_widget_show (spin); 
-  gtk_widget_show(hbox); 
-  gtk_box_pack_start (GTK_BOX(dialog), hbox, TRUE, TRUE, 0); 
-  return GTK_SPIN_BUTTON(spin); 
-} 
-
-
-
-
-

--- a/lib/lazyprops.h
+++ /dev/null
@@ -1,664 +0,0 @@
-/* 
- * Various laziness support routines to reduce boilerplate code when 
- * dealing with properties. 
- * Copyright(C) 2000 Cyrille Chepelov
- *
- *  WARNING: THIS CODE IS ROTTEN. IT WILL GO AWAY SOON. YOU HAVE BEEN WARNED.
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __LAZYPROPS_H
-#define __LAZYPROPS_H
-
-#include <stdlib.h>
-#include <string.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-#include <libxml/parser.h>
-
-#include "geometry.h"
-#include "font.h"
-#include "text.h"
-#include "dia_xml.h"
-#include "widgets.h"
-#include "message.h"
-
-/* I'm sorry, this header file turned out to be much uglier than I
-   had expected. */
-
-
-/* attribute load/save routines. I wish I had some templates. */
-
-#define MAKE_SAVE_FOO(typename,type) \
-  inline static void  \
-  save_##typename(ObjectNode *obj_node, const gchar *attrname, type value) { \
-    data_add_##typename(new_attribute(obj_node,attrname),value); \
-  } 
-
-MAKE_SAVE_FOO(int,int)
-MAKE_SAVE_FOO(enum,int)
-MAKE_SAVE_FOO(real,real)
-MAKE_SAVE_FOO(boolean,int)
-MAKE_SAVE_FOO(color,Color *)
-MAKE_SAVE_FOO(point,Point *)
-MAKE_SAVE_FOO(rectangle,Rectangle *)
-MAKE_SAVE_FOO(string,char *)
-MAKE_SAVE_FOO(font,Font *)
-MAKE_SAVE_FOO(text,Text *)
-     /* composites are to be handled the hard way */
-#undef MAKE_SAVE_FOO
-
-/* The load functions are a bit heavy for inlining 
-(processor cache pollution ; code size.) */
-
-#ifndef __LAZYPROPS_C
-#define MAKE_LOAD_FOO(typename,type) \
-  type load_##typename(ObjectNode *obj_node, const gchar *attrname, \
-		  type defaultvalue);
-
-#define MAKE_LOAD_FOO2(typename,type) \
-  void  load_##typename(ObjectNode *obj_node, const gchar *attrname, \
-			       type *value, type *defaultvalue);
-#else
-#define MAKE_LOAD_FOO(typename,type) \
-  type load_##typename(ObjectNode *obj_node, const gchar *attrname, \
-		  type defaultvalue);  \
-  type  \
-  load_##typename(ObjectNode *obj_node, const gchar *attrname, \
-		  type defaultvalue) { \
-    AttributeNode attr; \
-    attr = object_find_attribute(obj_node,attrname); \
-    if (attr != NULL)  \
-       return data_##typename( attribute_first_data(attr) ); \
-    else \
-       return defaultvalue; \
-  }
-#define MAKE_LOAD_FOO2(typename,type) \
-  void  load_##typename(ObjectNode *obj_node, const gchar *attrname, \
-			       type *value, type *defaultvalue); \
-  void  \
-  load_##typename(ObjectNode *obj_node, const gchar *attrname, type *value, \
-		  type *defaultvalue) { \
-    AttributeNode attr; \
-    attr = object_find_attribute(obj_node,attrname); \
-    if (attr != NULL)  \
-       data_##typename( attribute_first_data(attr), value); \
-    else \
-       if (defaultvalue) *value = *defaultvalue; \
-  }
-#endif /* __LAZYPROPS_C */
-
-MAKE_LOAD_FOO(int,int)
-MAKE_LOAD_FOO(enum,int)
-MAKE_LOAD_FOO(real,real)
-MAKE_LOAD_FOO(boolean,int)
-MAKE_LOAD_FOO2(color,Color)
-MAKE_LOAD_FOO2(point,Point)
-MAKE_LOAD_FOO2(rectangle,Rectangle)
-MAKE_LOAD_FOO(string,char *)
-MAKE_LOAD_FOO(font,Font *)
-MAKE_LOAD_FOO(text,Text *)
-
-#undef MAKE_LOAD_FOO
-#undef MAKE_LOAD_FOO2
-
-/* More integrated load and save macros. The older one are still useful
- when it comes to fine-tuning (esp. wrt to field names in the saved file) */
-#define SAVE_INT(obj_node,object,field) \
-   save_int((obj_node),#field,(object)->field);
-#define LOAD_INT(obj_node,object,defaults,field) \
-   (object)->field = load_int(obj_node,#field,(defaults)->field);
-#define SAVE_REAL(obj_node,object,field) \
-   save_real((obj_node),#field,(object)->field);
-#define LOAD_REAL(obj_node,object,defaults,field) \
-   (object)->field = load_real(obj_node,#field,(defaults)->field);
-#define SAVE_BOOL(obj_node,object,field) \
-   save_boolean((obj_node),#field,(object)->field);
-#define LOAD_BOOL(obj_node,object,defaults,field) \
-   (object)->field = load_boolean(obj_node,#field,(defaults)->field);
-#define SAVE_COLOR(obj_node,object,field) \
-   save_color((obj_node),#field,&(object)->field); 
-#define LOAD_COLOR(obj_node,object,defaults,field) \
-   load_color(obj_node,#field,&(object)->field,&(defaults)->field);
-#define SAVE_POINT(obj_node,object,field) \
-   save_point((obj_node),#field,&(object)->field); 
-#define LOAD_POINT(obj_node,object,defaults,field) \
-   load_point(obj_node,#field,&(object)->field,&(defaults)->field);
-#define SAVE_RECT(obj_node,object,field) \
-   save_rectangle((obj_node),#field,&(object)->field); 
-#define LOAD_RECT(obj_node,object,defaults,field) \
-   load_rectangle(obj_node,#field,&(object)->field,&(defaults)->field);
-#define SAVE_STRING(obj_node,object,field) \
-   save_string((obj_node),#field,(object)->field); 
-#define LOAD_STRING(obj_node,object,defaults,field) \
-   (object)->field = load_string(obj_node,#field,NULL); \
-   if (!(object)->field) (object)->field = g_strdup((defaults)->field);
-#define SAVE_FONT(obj_node,object,field) \
-   save_font((obj_node),#field,(object)->field); 
-#define LOAD_FONT(obj_node,object,defaults,field) \
-   (object)->field = load_font(obj_node,#field,(defaults)->field);
-#define SAVE_FONTHEIGHT(obj_node,object,field) \
-   save_real((obj_node),#field,(object)->field);
-#define LOAD_FONTHEIGHT(obj_node,object,defaults,field) \
-   (object)->field = load_real(obj_node,#field,(defaults)->field);
-#define SAVE_TEXT(obj_node,object,field) \
-   save_text((obj_node),#field,(object)->field);
-#define LOAD_TEXT(obj_node,object,defaults,field) \
-   (object)->text = load_text(obj_node,#field,NULL);
-
-
-/* Attribute editing dialog ("Properties.*" stuff) */
-/* Goal : no, or almost no gtk garb^Wstuff in an object's code. Or at worst, 
-   really nicely hidden. */
-
-/* contract : 
-    - object type Foo has a single object properties dialog (FooProperties), 
-    which will be pointed to by the first parameter "PropertiesDialog" 
-    (or "propdlg", in short) of all the following macros.
-    - "propdlg" has a single AttributeDialog field, called "dialog", which
-    in fact is a gtk VBox.
-    - "propdlg" has a single Foo * pointer, called "parent", which traces back
-    to the Foo object structure being edited, or NULL.
-
-    - All of (Foo *)'s fields which are to be edited by the property dialog
-    has a matching "propdlg" field of a related type.
-    - Description strings are to be passed with _( ) around it (i18n). 
-
-    - all type-specific macros take at least the following arguments : 
-       * propdlg   the name of the propdlg variable
-       * field     the name of the field being changed (in both propdlg and
-                                                        propdlg->parent)
-       * desc      an i18n-able description string. 
-
-   For the text font, font height and color attributes, the fields in the 
-   dialog structure must respectively be called foo_font, foo_fontheight and
-   foo_color (where "foo" is the name of the text field in the parent object).
-
-*/
-
-#define PROPDLG_TYPE GtkWidget *
-typedef struct {
-  GtkWidget *d;
-  GtkWidget *label;
-  gboolean ready;
-} AttributeDialog; /* This is intended to be opaque */
-
-/* to be called to create a new, empty dialog. */
-#define PROPDLG_CREATE(propdlg,parentvalue) \
-  if (!propdlg) { \
-     (propdlg) = g_malloc0(sizeof(*(propdlg)) ); \
-     (propdlg)->dialog.d = gtk_vbox_new(FALSE,5);  \
-     gtk_object_ref(GTK_OBJECT((propdlg)->dialog.d)); \
-     gtk_object_sink(GTK_OBJECT((propdlg)->dialog.d)); \
-     gtk_container_set_border_width(GTK_CONTAINER((propdlg)->dialog.d), 10); \
-     /* (propdlg)->dialog.ready = FALSE; */ \
-  } \
-  (propdlg)->parent = (parentvalue);
-
-/* to be called when the dialog is almost ready to show (bracket the rest with
-   PROPDLG_CREATE and PROPDLG_READY) */
-#define PROPDLG_READY(propdlg) \
-  if (!(propdlg)->dialog.ready) { \
-     gtk_widget_show((propdlg)->dialog.d); \
-     (propdlg)->dialog.ready = TRUE; \
-  }
-
-/* The return type of get_foo_properties() */
-#define PROPDLG_RETURN(propdlg) \
-    return propdlg->dialog.d;
-/* This defines a notebook inside a dialog. */
-typedef GtkWidget *AttributeNotebook;
-#define PROPDLG_NOTEBOOK_CREATE(propdlg,field) \
-   if (!(propdlg)->dialog.ready) {\
-      (propdlg)->field = gtk_notebook_new (); \
-      gtk_notebook_set_tab_pos (GTK_NOTEBOOK((propdlg)->field), GTK_POS_TOP); \
-      gtk_box_pack_start (GTK_BOX ((propdlg)->dialog.d), \
-			  (propdlg)->field, TRUE, TRUE, 0); \
-      gtk_container_set_border_width (GTK_CONTAINER((propdlg)->field), 10); \
-   }
-#define PROPDLG_NOTEBOOK_READY(propdlg,field) \
-   if (!(propdlg)->dialog.ready) {\
-      gtk_widget_show((propdlg)->field); \
-   }
-
-/* This defines a notebook page.
-   The "field" must be a pointer to an ad-hoc struct similar to the normal
-   property dialog structs. */
-typedef AttributeDialog AttributePage;
-#define PROPDLG_PAGE_CREATE(propdlg,notebook,field,desc) \
-   if (!(propdlg)->dialog.ready) { \
-     (propdlg)->field = g_malloc0(sizeof(*((propdlg)->field))); \
-     (propdlg)->field->dialog.d = gtk_vbox_new(FALSE,5);  \
-     /*(propdlg)->field->dialog.ready = FALSE; */ \
-     gtk_container_set_border_width(GTK_CONTAINER((propdlg)->field->dialog.d),\
-				    10); \
-     (propdlg)->field->dialog.label = gtk_label_new((desc));  \
-  } \
-  (propdlg)->field->parent = (propdlg)->parent;
-
-#define PROPDLG_PAGE_READY(propdlg,notebook,field) \
-  if (!(propdlg)->field->dialog.ready) { \
-     gtk_widget_show_all((propdlg)->field->dialog.d); \
-     gtk_widget_show_all((propdlg)->field->dialog.label); \
-     gtk_widget_show((propdlg)->field->dialog.d); \
-     gtk_notebook_append_page(GTK_NOTEBOOK((propdlg)->notebook), \
-		     (propdlg)->field->dialog.d, \
-		     (propdlg)->field->dialog.label); \
-     (propdlg)->field->dialog.ready = TRUE; \
-  }
-
-/* This defines a real attribute. */
-typedef GtkSpinButton *RealAttribute;
-RealAttribute __propdlg_build_real(GtkWidget *dialog, 
-				   const gchar *desc,
-				   gfloat lower,
-				   gfloat upper,
-				   gfloat step_increment);
-
-#define __PROPDLG_BUILD_REAL(propdlg, field, desc, lower, upper, \
-                             step_increment)\
-   (propdlg)->field = __propdlg_build_real((propdlg)->dialog.d,(desc), \
-                                               (lower),(upper), \
-                                               (step_increment)); 
-#define __PROPDLG_SHOW_REAL(propdlg,field) \
-   gtk_spin_button_set_value((propdlg)->field, \
-	                     (propdlg)->parent->field); 
-#define PROPDLG_SHOW_REAL(propdlg, field, desc, lower, upper, step_increment)\
-   if (!(propdlg)->dialog.ready) {\
-      __PROPDLG_BUILD_REAL((propdlg),field,(desc),(lower), \
-                         (upper),(step_increment)) ;} \
-   __PROPDLG_SHOW_REAL((propdlg),field)
-
-#define PROPDLG_APPLY_REAL(propdlg, field) \
-  (propdlg)->parent->field = \
-    gtk_spin_button_get_value_as_float((propdlg)->field);
-
-/* This defines an int attribute. */
-typedef GtkSpinButton *IntAttribute; 
-#define __PROPDLG_BUILD_INT(propdlg, field, desc, lower, upper, step_increment)\
-   (propdlg)->field = __propdlg_build_real((propdlg)->dialog.d,(desc), \
-                                             (guint)(lower), \
-					     (guint)(upper), \
-					     (guint)(step_increment));
-
-#define __PROPDLG_SHOW_INT(propdlg, field) \
-  gtk_spin_button_set_value((propdlg)->field, \
-			    (propdlg)->parent->field); 
-#define PROPDLG_SHOW_INT(propdlg, field, desc, lower, upper, step_increment)\
-   if (!(propdlg)->dialog.ready) {\
-      __PROPDLG_BUILD_INT((propdlg),field,(desc),(lower), \
-                         (upper),(step_increment)) ;}\
-   __PROPDLG_SHOW_INT((propdlg),field)
-
-#define PROPDLG_APPLY_INT(propdlg, field) \
-  (propdlg)->parent->field = \
-    gtk_spin_button_get_value_as_int((propdlg)->field);
-
-
-
-/* This defines a Boolean attribute : */
-typedef GtkToggleButton *BoolAttribute; 
-BoolAttribute __propdlg_build_bool(GtkWidget *dialog, 
-				   const gchar *desc);
-#define __PROPDLG_BUILD_BOOL(propdlg, field, desc)  \
-   (propdlg)->field = __propdlg_build_bool((propdlg)->dialog.d,(desc));
-#define __PROPDLG_SHOW_BOOL(propdlg,field) \
-  gtk_toggle_button_set_active((propdlg)->field, (propdlg)->parent->field);
-
-#define PROPDLG_SHOW_BOOL(propdlg, field, desc) \
-   if (!(propdlg)->dialog.ready) {\
-      __PROPDLG_BUILD_BOOL((propdlg),field,(desc)) ;}\
-   __PROPDLG_SHOW_BOOL((propdlg),field)
-#define PROPDLG_APPLY_BOOL(propdlg,field) \
-  (propdlg)->parent->field = (propdlg)->field->active;
-
-
-/* This defines a Font attribute : */
-typedef DiaFontSelector *FontAttribute;
-typedef DiaFontSelector *TextFontAttribute;
-
-FontAttribute __propdlg_build_font(GtkWidget *dialog, 
-				   const gchar *desc);
-#define __PROPDLG_BUILD_FONT(propdlg,field,desc) \
-   (propdlg)->field = __propdlg_build_font((propdlg)->dialog.d,(desc));
-#define __PROPDLG_BUILD_TEXTFONT(propdlg,field,desc) \
-         __PROPDLG_BUILD_FONT((propdlg),field##_font,(desc))
-
-#define __PROPDLG_SHOW_FONT(propdlg,field) \
-  dia_font_selector_set_font((propdlg)->field,(propdlg)->parent->field);
-#define __PROPDLG_SHOW_TEXTFONT(propdlg,field) \
-  dia_font_selector_set_font((propdlg)->field##_font, \
-			     (propdlg)->parent->field->font);
-
-#define PROPDLG_SHOW_FONT(propdlg, field, desc) \
-   if (!(propdlg)->dialog.ready) {\
-      __PROPDLG_BUILD_FONT((propdlg),field,(desc)) ;}\
-   __PROPDLG_SHOW_FONT((propdlg),field)
-#define PROPDLG_SHOW_TEXTFONT(propdlg, field, desc) \
-   if (!(propdlg)->dialog.ready) {\
-      __PROPDLG_BUILD_TEXTFONT((propdlg),field,(desc)) ;}\
-   __PROPDLG_SHOW_TEXTFONT((propdlg),field)
-
-#define PROPDLG_APPLY_FONT(propdlg,field) \
-  (propdlg)->parent->field = dia_font_selector_get_font((propdlg)->field);
-#define PROPDLG_APPLY_TEXTFONT(propdlg,field) \
-  text_set_font((propdlg)->parent->field, \
-                dia_font_selector_get_font((propdlg)->field##_font));
-
-/* This defines a Font Height attribute : */
-typedef RealAttribute FontHeightAttribute;
-typedef RealAttribute TextFontHeightAttribute;
-
-#define __PROPDLG_BUILD_FONTHEIGHT(propdlg,field,desc) \
-  __PROPDLG_BUILD_REAL((propdlg),field,(desc),0.0,10.0,0.1)
-#define __PROPDLG_BUILD_TEXTFONTHEIGHT(propdlg,field,desc) \
-  __PROPDLG_BUILD_REAL((propdlg),field##_fontheight,(desc),0.0,10.0,0.1)
-#define __PROPDLG_SHOW_FONTHEIGHT(propdlg,field) \
-  __PROPDLG_SHOW_REAL((propdlg),field)  
-#define __PROPDLG_SHOW_TEXTFONTHEIGHT(propdlg,field) \
-  gtk_spin_button_set_value((propdlg)->field##_fontheight, \
-			    (propdlg)->parent->field->height);
-
-#define PROPDLG_SHOW_FONTHEIGHT(propdlg, field, desc) \
-   if (!(propdlg)->dialog.ready) {\
-      __PROPDLG_BUILD_FONTHEIGHT((propdlg),field,(desc)) ;}\
-   __PROPDLG_SHOW_FONTHEIGHT((propdlg),field)
-#define PROPDLG_SHOW_TEXTFONTHEIGHT(propdlg, field, desc) \
-   if (!(propdlg)->dialog.ready) {\
-      __PROPDLG_BUILD_TEXTFONTHEIGHT((propdlg),field,(desc)) ;}\
-   __PROPDLG_SHOW_TEXTFONTHEIGHT((propdlg),field)
-
-#define PROPDLG_APPLY_FONTHEIGHT(propdlg,field) \
-  PROPDLG_APPLY_REAL((propdlg),field)  
-#define PROPDLG_APPLY_TEXTFONTHEIGHT(propdlg,field) \
-  text_set_height((propdlg)->parent->field, \
-		  gtk_spin_button_get_value_as_float( \
-                              (propdlg)->field##_fontheight));
-
-/* This defines a Color attribute : */
-typedef DiaColorSelector *ColorAttribute;
-typedef DiaColorSelector *TextColorAttribute; 
-ColorAttribute __propdlg_build_color(GtkWidget *dialog,
-				     const gchar *desc);
-#define __PROPDLG_BUILD_COLOR(propdlg,field,desc) \
-   (propdlg)->field = __propdlg_build_color((propdlg)->dialog.d,(desc));
-
-#define __PROPDLG_BUILD_TEXTCOLOR(propdlg,field,desc) \
-    __PROPDLG_BUILD_COLOR((propdlg),field##_color,(desc))
-
-#define __PROPDLG_SHOW_COLOR(propdlg,field) \
-  dia_color_selector_set_color((propdlg)->field, \
-                              &((propdlg)->parent->field));
-#define __PROPDLG_SHOW_TEXTCOLOR(propdlg,field) \
-  dia_color_selector_set_color((propdlg)->field##_color, \
-                               &((propdlg)->parent->field->color));
-
-#define PROPDLG_SHOW_COLOR(propdlg, field, desc) \
-   if (!(propdlg)->dialog.ready) \
-      __PROPDLG_BUILD_COLOR((propdlg),field,(desc)) \
-   __PROPDLG_SHOW_COLOR((propdlg),field)
-#define PROPDLG_SHOW_TEXTCOLOR(propdlg, field, desc) \
-   if (!(propdlg)->dialog.ready) {\
-      __PROPDLG_BUILD_TEXTCOLOR((propdlg),field,(desc)) ;} \
-   __PROPDLG_SHOW_TEXTCOLOR((propdlg),field)
-
-#define PROPDLG_APPLY_COLOR(propdlg,field) \
-  dia_color_selector_get_color((propdlg)->field, \
-                              &((propdlg)->parent->field));
-#define PROPDLG_APPLY_TEXTCOLOR(propdlg,field) \
-  G_STMT_START { \
-    Color col; \
-    dia_color_selector_get_color((propdlg)->field##_color, &col); \
-    text_set_color((propdlg)->parent->field,&col); \
-  } G_STMT_END
-
-
-/* This defines a Line Width attribute : */
-typedef RealAttribute LineWidthAttribute;
-
-#define __PROPDLG_BUILD_LINEWIDTH(propdlg,field,desc) \
-   __PROPDLG_BUILD_REAL((propdlg),field,(desc),0.00,10.00,0.01)
-#define __PROPDLG_SHOW_LINEWIDTH(propdlg,field) \
-   __PROPDLG_SHOW_REAL((propdlg),field)
-#define PROPDLG_SHOW_LINEWIDTH(propdlg, field, desc) \
-   if (!(propdlg)->dialog.ready) {\
-      __PROPDLG_BUILD_LINEWIDTH((propdlg),field,(desc)) ;}\
-   __PROPDLG_SHOW_LINEWIDTH((propdlg),field)
-#define PROPDLG_APPLY_LINEWIDTH(propdlg,field,desc) \
-   PROPDLG_APPLY_REAL(propdlg,field)
-
-/* This defines a Line Style attribute. If that field is named "foo", then
- it will demand two fields in the parent object, foo_style and 
- foo_dashlength, of the correct types (LineStyle and real).
- (I'm not really happy about this).*/
-typedef DiaLineStyleSelector *LineStyleAttribute;
-LineStyleAttribute __propdlg_build_linestyle(GtkWidget *dialog,
-					     const gchar *desc);
-#define __PROPDLG_BUILD_LINESTYLE(propdlg,field,desc) \
-   (propdlg)->field = __propdlg_build_linestyle((propdlg)->dialog.d,(desc));
-
-#define __PROPDLG_SHOW_LINESTYLE(propdlg,field) \
-  dia_line_style_selector_set_linestyle((propdlg)->field, \
-                         (propdlg)->parent->field##_style, \
-                         (propdlg)->parent->field##_dashlength);
-#define PROPDLG_SHOW_LINESTYLE(propdlg, field, desc) \
-   if (!(propdlg)->dialog.ready) {\
-      __PROPDLG_BUILD_LINESTYLE((propdlg),field,(desc)) ;}\
-   __PROPDLG_SHOW_LINESTYLE((propdlg),field)
-#define PROPDLG_APPLY_LINESTYLE(propdlg,field) \
-  dia_line_style_selector_get_linestyle((propdlg)->field, \
-                         &((propdlg)->parent->field##_style), \
-                         &((propdlg)->parent->field##_dashlength));
-
-/* This defines an Arrow attribute. */
-typedef DiaArrowSelector *ArrowAttribute;
-ArrowAttribute __propdlg_build_arrow(GtkWidget *dialog, 
-				     const gchar *desc);
-#define __PROPDLG_BUILD_ARROW(propdlg,field,desc) \
-   (propdlg)->field = __propdlg_build_arrow((propdlg)->dialog.d,(desc));
-
-#define __PROPDLG_SHOW_ARROW(propdlg,field) \
-  dia_arrow_selector_set_arrow((propdlg)->field, \
-                               (propdlg)->parent->field); 
-#define PROPDLG_SHOW_ARROW(propdlg, field, desc) \
-   if (!(propdlg)->dialog.ready) {\
-      __PROPDLG_BUILD_LINEWIDTH((propdlg),field,(desc)) ;}\
-   __PROPDLG_SHOW_LINEWIDTH((propdlg),field)
-#define PROPDLG_APPLY_ARROW(propdlg,field) \
-  (propdlg)->parent->field = \
-     dia_arrow_selector_get_arrow((propdlg)->field);
-
-/* Enum attributes are a bit trickier. They need to provide a way to tell
-   how to build them, ie the human description of all possible values. 
-   To make things funnier, there's a variable number of possible values...
- */
-typedef struct {
-  const gchar *desc;
-  int value;
-  GtkToggleButton *button; /* should be initialised as NULL */
-} PropDlgEnumEntry;
-typedef PropDlgEnumEntry *EnumAttribute;
-
-/* enumentries is a pointer to a NULL-terminated array of PropDlgEnumEntry,
-   to which the _BUILD_ function has the right to write once (the button field)
-*/
-void __propdlg_build_enum(GtkWidget *dialog,
-			  const gchar *desc,
-			  PropDlgEnumEntry *enumentries);
-void __propdlg_set_enum(PropDlgEnumEntry *enumentries,int value);
-int __propdlg_get_enum(PropDlgEnumEntry *enumentries);
-
-#define __PROPDLG_BUILD_ENUM(propdlg,field,desc,enumentries) \
-    (propdlg)->field = (enumentries); \
-    __propdlg_build_enum((propdlg)->dialog.d,(desc),(enumentries));
-#define __PROPDLG_SHOW_ENUM(propdlg,field) \
-  __propdlg_set_enum((propdlg)->field,(propdlg)->parent->field);
-
-#define PROPDLG_SHOW_ENUM(propdlg, field, desc,enumentries) \
-   if (!(propdlg)->dialog.ready) {\
-      __PROPDLG_BUILD_ENUM((propdlg),field,(desc),(enumentries)) ;}\
-   __PROPDLG_SHOW_ENUM((propdlg),field)
-#define PROPDLG_APPLY_ENUM(propdlg,field) \
-  (propdlg)->parent->field = __propdlg_get_enum((propdlg)->field);
-
-/* This defines a string (gchar *) attribute. */
-typedef GtkEntry *StringAttribute;
-StringAttribute __propdlg_build_string(GtkWidget *dialog,
-				       const gchar *desc);
-#define __PROPDLG_BUILD_STRING(propdlg,field,desc) \
- (propdlg)->field = __propdlg_build_string((propdlg)->dialog.d,(desc));
-#define __PROPDLG_SHOW_STRING(propdlg,field) \
- gtk_entry_set_text((propdlg)->field,(propdlg)->parent->field);
-#define PROPDLG_SHOW_STRING(propdlg, field, desc) \
-   if (!(propdlg)->dialog.ready) {\
-      __PROPDLG_BUILD_STRING((propdlg),field,(desc)) ;} \
-   __PROPDLG_SHOW_STRING((propdlg),field)
-#define PROPDLG_APPLY_STRING(propdlg,field) \
- g_free((propdlg)->parent->field); \
- (propdlg)->parent->field = strdup(gtk_entry_get_text((propdlg)->field));
-
-/* This defines a string (gchar *) attribute. */
-typedef GtkText *MultiStringAttribute;
-MultiStringAttribute __propdlg_build_multistring(GtkWidget *dialog,
-						 const gchar *desc,
-						 int numlines);
-#define __PROPDLG_BUILD_MULTISTRING(propdlg,field,desc,numlines) \
- (propdlg)->field = __propdlg_build_multistring((propdlg)->dialog.d, \
-                (desc),(numlines));
-#define __PROPDLG_SHOW_MULTISTRING(propdlg,field) \
- gtk_text_set_point((propdlg)->field, 0 ); \
- gtk_text_forward_delete((propdlg)->field, \
-                         gtk_text_get_length((propdlg)->field)); \
- gtk_text_insert((propdlg)->field, NULL, NULL, NULL, \
-                     g_strdup((propdlg)->parent->field), -1);
-
-#define PROPDLG_SHOW_MULTISTRING(propdlg, field, desc,numlines) \
-   if (!(propdlg)->dialog.ready) {\
-      __PROPDLG_BUILD_MULTISTRING((propdlg),field,(desc),(numlines)) ;} \
-   __PROPDLG_SHOW_MULTISTRING((propdlg),field)
-#define PROPDLG_APPLY_MULTISTRING(propdlg,field) \
- g_free((propdlg)->parent->field); \
- (propdlg)->parent->field = strdup(gtk_editable_get_chars( \
-               GTK_EDITABLE((propdlg)->field),0, -1));
-
-#define __PROPDLG_BUILD_TEXTTEXT(propdlg,field,desc,numlines) \
-   __PROPDLG_BUILD_MULTISTRING((propdlg),field,(desc),(numlines))
-#define __PROPDLG_SHOW_TEXTTEXT(propdlg,field) \
- gtk_text_set_point((propdlg)->field, 0 ); \
- gtk_text_forward_delete((propdlg)->field, \
-                         gtk_text_get_length((propdlg)->field)); \
- gtk_text_insert((propdlg)->field, NULL, NULL, NULL, \
-                     text_get_string_copy((propdlg)->parent->field), -1);
-
-#define PROPDLG_SHOW_TEXTTEXT(propdlg, field, desc,numlines) \
-   if (!(propdlg)->dialog.ready) {\
-      __PROPDLG_BUILD_TEXTTEXT((propdlg),field,(desc),(numlines)) ;} \
-   __PROPDLG_SHOW_TEXTTEXT((propdlg),field)
-#define PROPDLG_APPLY_TEXTTEXT(propdlg,field) \
- text_set_string((propdlg)->parent->field, gtk_editable_get_chars( \
-               GTK_EDITABLE((propdlg)->field),0, -1));
-
-void  __propdlg_build_static(GtkWidget *dialog, const gchar *desc);
-#define __PROPDLG_BUILD_STATIC(propdlg,desc) \
-  __propdlg_build_static((propdlg)->dialog.d,(desc));
-#define PROPDLG_SHOW_STATIC(propdlg,desc) \
-   if (!(propdlg)->dialog.ready) {\
-      __PROPDLG_BUILD_STATIC((propdlg),(desc)); \
-   }
-
-/* This simply puts a separator line. */
-void __propdlg_build_separator(GtkWidget *dialog);
-
-#define __PROPDLG_BUILD_SEPARATOR(propdlg) \
-  __propdlg_build_separator((propdlg)->dialog.d);
-#define PROPDLG_SHOW_SEPARATOR(propdlg) \
-   if (!(propdlg)->dialog.ready) {\
-      __PROPDLG_BUILD_SEPARATOR((propdlg)); \
-   }
-
-
-/* This embeds a sanity check. Shouldn't that made a simple, rude and 
-   brutal g_assert( (probableparent) == (propdlg)->parent ); ? */
-#define PROPDLG_SANITY_CHECK(propdlg, probableparent) \
-  if ( (probableparent) != (propdlg)->parent) { \
-    message_warning("%s/%s dialog problem:  %p != %p\n", \
-      ((probableparent)?((Object *)(probableparent))->type->name:NULL), \
-      ((propdlg)->parent?((Object *)((propdlg)->parent))->type->name:NULL), \
-      (probableparent), (propdlg)->parent); \
-    (probableparent) = (propdlg)->parent; \
-  }
-
-/* State load/save/free macros. Most of the free macros are intentionally 
-   blank. This whole thing assumes the fields have the same names in the
-   object and state structures.
-
-   These macros are designed to make writing the three foo_*_state() as
-   fast as possible (using a lot of cut'n'paste).
-*/
-
-#define OBJECT_SET_INT(object,state,field) (object)->field = (state)->field;
-#define OBJECT_GET_INT(object,state,field) (state)->field = (object)->field;
-#define OBJECT_FREE_INT(state,field)
-#define OBJECT_SET_REAL(object,state,field) (object)->field = (state)->field;
-#define OBJECT_GET_REAL(object,state,field) (state)->field = (object)->field;
-#define OBJECT_FREE_REAL(state,field)
-#define OBJECT_SET_BOOL(object,state,field) (object)->field = (state)->field;
-#define OBJECT_GET_BOOL(object,state,field) (state)->field = (object)->field;
-#define OBJECT_FREE_BOOL(state,field)
-#define OBJECT_SET_COLOR(object,state,field) (object)->field = (state)->field;
-#define OBJECT_GET_COLOR(object,state,field) (state)->field = (object)->field;
-#define OBJECT_FREE_COLOR(state,field)
-#define OBJECT_SET_POINT(object,state,field) (object)->field = (state)->field;
-#define OBJECT_GET_POINT(object,state,field) (state)->field = (object)->field;
-#define OBJECT_FREE_POINT(state,field)
-#define OBJECT_SET_RECT(object,state,field) (object)->field = (state)->field;
-#define OBJECT_GET_RECT(object,state,field) (state)->field = (object)->field;
-#define OBJECT_FREE_RECT(state,field)
-#define OBJECT_SET_STRING(object,state,field) \
-   if ((object)->field) g_free((object)->field); \
-   (object)->field = (state)->field; 
-#define OBJECT_GET_STRING(object,state,field) \
-   (state)->field = g_strdup((object)->field);
-#define OBJECT_FREE_STRING(state,field) g_free((state)->field);
-#define OBJECT_SET_MULTISTRING(object,state,field) \
-   OBJECT_SET_STRING(object,state,field)
-#define OBJECT_GET_MULTISTRING(object,state,field) \
-   OBJECT_GET_STRING(object,state,field)
-#define OBJECT_FREE_MULTISTRING(state,field) \
-   OBJECT_FREE_STRING(state,field)
-#define OBJECT_SET_FONT(object,state,field) (object)->field = (state)->field;
-#define OBJECT_GET_FONT(object,state,field) (state)->field = (object)->field;
-#define OBJECT_FREE_FONT(state,field)
-#define OBJECT_SET_FONTHEIGHT(object,state,field) \
-  (object)->field = (state)->field;
-#define OBJECT_GET_FONTHEIGHT(object,state,field) \
-  (state)->field = (object)->field;
-#define OBJECT_FREE_FONTHEIGHT(state,field)
-#define OBJECT_SET_TEXTATTR(object,state,field) \
-  text_set_attributes((object)->field, &(state)->field##_attrib);
-#define OBJECT_GET_TEXTATTR(object,state,field) \
-  text_get_attributes((object)->field, &(state)->field##_attrib);
-#define OBJECT_FREE_TEXTATTR(state,field);
-
-#endif /* __LAZYPROPS_H */
-
-
-
-
-
-
-
-

--- a/lib/properties.c
+++ b/lib/properties.c
@@ -3,6 +3,7 @@
  *
  * properties.h: property system for dia objects/shapes.
  * Copyright (C) 2000 James Henstridge
+ * Copyright (C) 2001 Cyrille Chepelov
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -189,6 +190,11 @@ prop_copy(Property *dest, Property *src)
   case PROP_TYPE_ENDPOINTS:
     dest->d = src->d;
     break;
+  case PROP_TYPE_NOTEBOOK_BEGIN:
+  case PROP_TYPE_NOTEBOOK_END:
+  case PROP_TYPE_NOTEBOOK_PAGE:
+    break;
+  case PROP_TYPE_MULTISTRING:
   case PROP_TYPE_STRING:
   case PROP_TYPE_FILE:
     g_free(PROP_VALUE_STRING(*dest));
@@ -197,6 +203,8 @@ prop_copy(Property *dest, Property *src)
     else
       PROP_VALUE_STRING(*dest) = NULL;
     break;
+  case PROP_TYPE_STATIC:
+    break;
   case PROP_TYPE_POINTARRAY:
     g_free(PROP_VALUE_POINTARRAY(*dest).pts);
     PROP_VALUE_POINTARRAY(*dest).npts = PROP_VALUE_POINTARRAY(*src).npts;
@@ -266,7 +274,13 @@ prop_free(Property *prop)
   case PROP_TYPE_ENDPOINTS:
   case PROP_TYPE_CONNPOINT_LINE:
   case PROP_TYPE_FONT:
+  case PROP_TYPE_STATIC:
     break;
+  case PROP_TYPE_NOTEBOOK_BEGIN:
+  case PROP_TYPE_NOTEBOOK_END:
+  case PROP_TYPE_NOTEBOOK_PAGE:
+    break;
+  case PROP_TYPE_MULTISTRING:
   case PROP_TYPE_STRING:
   case PROP_TYPE_FILE:
     g_free(PROP_VALUE_STRING(*prop));
@@ -397,11 +411,32 @@ prop_get_widget(Property *prop)
     ret = gtk_spin_button_new(adj, 1.0, 2);
     gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(ret), TRUE);
     break;
+  case PROP_TYPE_NOTEBOOK_BEGIN:
+  case PROP_TYPE_NOTEBOOK_END:
+  case PROP_TYPE_NOTEBOOK_PAGE:
+    g_assert_not_reached();
+    break;
   case PROP_TYPE_STRING:
     ret = gtk_entry_new();
     if (PROP_VALUE_STRING(*prop))
       gtk_entry_set_text(GTK_ENTRY(ret), PROP_VALUE_STRING(*prop));
     break;
+  case PROP_TYPE_MULTISTRING: {
+    GtkWidget *text;
+    /* ret = gtk_hbox_new(FALSE,GPOINTER_TO_INT(prop->extra_data)); */
+    text = gtk_text_new(NULL,NULL);
+    gtk_text_set_editable(GTK_TEXT(text),TRUE);
+    /* gtk_box_pack_start(GTK_BOX(ret),text,TRUE,TRUE); */ 
+    if (PROP_VALUE_STRING(*prop)) {
+      gtk_text_set_point(GTK_TEXT(text), 0);
+      gtk_text_forward_delete(GTK_TEXT(text),
+                              gtk_text_get_length(GTK_TEXT(text)));
+      gtk_text_insert(GTK_TEXT(text), NULL, NULL, NULL,
+                      PROP_VALUE_STRING(*prop),-1);
+    }
+    ret = text;
+    break;
+  }
   case PROP_TYPE_POINT:
   case PROP_TYPE_POINTARRAY:
   case PROP_TYPE_INTARRAY:
@@ -414,6 +449,12 @@ prop_get_widget(Property *prop)
   case PROP_TYPE_RECT:
     ret = gtk_label_new(_("No edit widget"));
     break;
+  case PROP_TYPE_STATIC:
+    if (prop->descr) {
+      ret = gtk_label_new(prop->descr->tooltip);
+      gtk_label_set_justify(GTK_LABEL(ret),GTK_JUSTIFY_LEFT);
+    }
+    break;
   case PROP_TYPE_LINESTYLE:
     ret = dia_line_style_selector_new();
     dia_line_style_selector_set_linestyle(DIALINESTYLESELECTOR(ret),
@@ -481,10 +522,19 @@ prop_set_from_widget(Property *prop, GtkWidget *widget)
     PROP_VALUE_REAL(*prop) = gtk_spin_button_get_value_as_float(
 					GTK_SPIN_BUTTON(widget));
     break;
+  case PROP_TYPE_MULTISTRING:
+    g_free(PROP_VALUE_STRING(*prop));
+    PROP_VALUE_STRING(*prop) = 
+      gtk_editable_get_chars(GTK_EDITABLE(widget),0, -1);
+    break;
   case PROP_TYPE_STRING:
     g_free(PROP_VALUE_STRING(*prop));
     PROP_VALUE_STRING(*prop) = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget)));
     break;
+  case PROP_TYPE_NOTEBOOK_BEGIN:
+  case PROP_TYPE_NOTEBOOK_END:
+  case PROP_TYPE_NOTEBOOK_PAGE:
+  case PROP_TYPE_STATIC:
   case PROP_TYPE_POINT:
   case PROP_TYPE_POINTARRAY:
   case PROP_TYPE_INTARRAY:
@@ -598,10 +648,17 @@ prop_load(Property *prop, ObjectNode obj_node)
   case PROP_TYPE_REAL:
     PROP_VALUE_REAL(*prop) = data_real(data);
     break;
+  case PROP_TYPE_MULTISTRING:
   case PROP_TYPE_STRING:
     g_free(PROP_VALUE_STRING(*prop));
     PROP_VALUE_STRING(*prop) = data_string(data);
     break;
+  case PROP_TYPE_NOTEBOOK_BEGIN:
+  case PROP_TYPE_NOTEBOOK_END:
+  case PROP_TYPE_NOTEBOOK_PAGE:
+    break;
+  case PROP_TYPE_STATIC:
+    break;
   case PROP_TYPE_POINT:
     data_point(data, &PROP_VALUE_POINT(*prop));
     break;
@@ -773,6 +830,13 @@ prop_save(Property *prop, ObjectNode obj_node)
   case PROP_TYPE_REAL:
     data_add_real(attr, PROP_VALUE_REAL(*prop));
     break;
+  case PROP_TYPE_STATIC:
+    break;
+  case PROP_TYPE_NOTEBOOK_BEGIN:
+  case PROP_TYPE_NOTEBOOK_END:
+  case PROP_TYPE_NOTEBOOK_PAGE:
+    break;
+  case PROP_TYPE_MULTISTRING:
   case PROP_TYPE_STRING:
     data_add_string(attr, PROP_VALUE_STRING(*prop));
     break;
@@ -967,6 +1031,13 @@ object_get_props_from_offsets(Object *obj, PropOffset *offsets,
       PROP_VALUE_REAL(props[i]) =
 	struct_member(obj, offsets[j].offset, real);
       break;
+    case PROP_TYPE_STATIC:
+      break;
+    case PROP_TYPE_NOTEBOOK_BEGIN:
+    case PROP_TYPE_NOTEBOOK_END:
+    case PROP_TYPE_NOTEBOOK_PAGE:
+      break;
+    case PROP_TYPE_MULTISTRING:
     case PROP_TYPE_STRING:
       g_free(PROP_VALUE_STRING(props[i]));
       PROP_VALUE_STRING(props[i]) =
@@ -1100,6 +1171,13 @@ object_set_props_from_offsets(Object *obj, PropOffset *offsets,
       struct_member(obj, offsets[j].offset, real) =
 	PROP_VALUE_REAL(props[i]);
       break;
+    case PROP_TYPE_STATIC:
+      break;
+    case PROP_TYPE_NOTEBOOK_BEGIN:
+    case PROP_TYPE_NOTEBOOK_END:
+    case PROP_TYPE_NOTEBOOK_PAGE:
+      break;
+    case PROP_TYPE_MULTISTRING:
     case PROP_TYPE_STRING:
       g_free(struct_member(obj, offsets[j].offset, gchar *));
       struct_member(obj, offsets[j].offset, gchar *) =
@@ -1207,6 +1285,8 @@ object_props_dialog_destroy(GtkWidget *table)
   g_free(widgets);
 }
 
+#define MAXNEST 7
+
 GtkWidget *
 object_create_props_dialog(Object *obj)
 {
@@ -1214,8 +1294,12 @@ object_create_props_dialog(Object *obj)
   Property *props;
   guint nprops = 0, i, j;
   GtkWidget **widgets;
-
   GtkWidget *table, *label;
+  GtkWidget *mainvbox;
+
+  GtkWidget *curcontainer[MAXNEST];
+  int nestlev = -1;
+  gboolean haspage = FALSE;
 
   g_return_val_if_fail(obj->ops->describe_props != NULL, NULL);
   g_return_val_if_fail(obj->ops->get_props != NULL, NULL);
@@ -1237,41 +1321,89 @@ object_create_props_dialog(Object *obj)
       props[j].name       = pdesc[i].name;
       props[j].type       = pdesc[i].type;
       props[j].extra_data = pdesc[i].extra_data;
+      props[j].descr      = &pdesc[i];
       j++;
     }
   obj->ops->get_props(obj, props, nprops);
 
-  table = gtk_table_new(1, 2, FALSE);
+  mainvbox = gtk_vbox_new(FALSE,1);
+  table = NULL;
+  curcontainer[++nestlev] = mainvbox;
 
   /* construct the widgets table */
   for (i = 0, j = 0; pdesc[i].name != NULL; i++)
     if ((pdesc[i].flags & PROP_FLAG_VISIBLE) != 0) {
-      widgets[j] = prop_get_widget(&props[j]);
-
-      label = gtk_label_new(_(pdesc[i].description));
-      gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-      gtk_table_attach(GTK_TABLE(table), label, 0,1, j,j+1,
-		       GTK_FILL, GTK_FILL|GTK_EXPAND, 0, 0);
-      gtk_table_attach(GTK_TABLE(table), widgets[j], 1,2, j,j+1,
-		       GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 0, 0);
-
-      gtk_widget_show(label);
-      gtk_widget_show(widgets[j]);
-
+      switch(props[j].type) {
+      case PROP_TYPE_NOTEBOOK_BEGIN:
+        {
+          GtkWidget *notebook = gtk_notebook_new();
+          gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook),GTK_POS_TOP);
+          gtk_container_set_border_width (GTK_CONTAINER(notebook), 0);
+          gtk_widget_show(notebook);
+          gtk_box_pack_end_defaults(GTK_BOX(curcontainer[nestlev]),notebook);
+          curcontainer[++nestlev] = notebook;
+          table = NULL;
+          /* note: there must be at least one page, immediately after this. */
+          g_assert(nestlev < MAXNEST);
+        } break;
+      case PROP_TYPE_NOTEBOOK_END:
+        {
+          if (haspage) nestlev--;
+          nestlev--;
+          table = NULL;
+          g_assert(nestlev >= 0);
+        } break;
+      case PROP_TYPE_NOTEBOOK_PAGE: 
+        {
+          /* this >must< happen inside a notebook */         
+          GtkWidget *page = gtk_vbox_new(FALSE,1);
+          GtkWidget *pagelabel = gtk_label_new(pdesc[i].description);
+          gtk_container_set_border_width(GTK_CONTAINER(page),1);
+          gtk_widget_show_all(page);
+          gtk_widget_show_all(pagelabel);
+          if (haspage) nestlev--;
+          gtk_notebook_append_page(GTK_NOTEBOOK(curcontainer[nestlev]),
+                                   page,pagelabel);
+          haspage = TRUE;
+          curcontainer[++nestlev] = page;
+          table = NULL;
+          
+          g_assert(nestlev < MAXNEST);
+        } break;
+      default:
+        widgets[j] = prop_get_widget(&props[j]);
+
+        label = gtk_label_new(_(pdesc[i].description));
+        gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+
+        if (!table) {
+          table = gtk_table_new(1, 2, FALSE);
+          gtk_widget_show(table);
+          gtk_box_pack_end_defaults(GTK_BOX(curcontainer[nestlev]),table);
+        }
+        gtk_table_attach(GTK_TABLE(table), label, 0,1, j,j+1,
+                         GTK_FILL, GTK_FILL|GTK_EXPAND, 0, 0);
+        gtk_table_attach(GTK_TABLE(table), widgets[j], 1,2, j,j+1,
+                         GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 0, 0);
+
+        gtk_widget_show(label);
+        gtk_widget_show(widgets[j]);
+        break;
+      }
       j++;
     }
   gtk_table_set_row_spacings(GTK_TABLE(table), 2);
   gtk_table_set_col_spacings(GTK_TABLE(table), 5);
 
-  gtk_object_set_data(GTK_OBJECT(table), prop_array_key,   props);
-  gtk_object_set_data(GTK_OBJECT(table), prop_num_key,
+  gtk_object_set_data(GTK_OBJECT(mainvbox), prop_array_key,   props);
+  gtk_object_set_data(GTK_OBJECT(mainvbox), prop_num_key,
 		      GUINT_TO_POINTER(nprops));
-  gtk_object_set_data(GTK_OBJECT(table), prop_widgets_key, widgets);
+  gtk_object_set_data(GTK_OBJECT(mainvbox), prop_widgets_key, widgets);
 
   gtk_signal_connect(GTK_OBJECT(table), "destroy",
 		     GTK_SIGNAL_FUNC(object_props_dialog_destroy), NULL);
 
-  return table;
+  return mainvbox;
 }
 
 ObjectChange *

--- a/lib/properties.h
+++ b/lib/properties.h
@@ -3,6 +3,7 @@
  *
  * properties.h: property system for dia objects/shapes.
  * Copyright (C) 2000 James Henstridge
+ * Copyright (C) 2001 Cyrille Chepelov
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -54,6 +55,7 @@ typedef enum {
   PROP_TYPE_ENUMARRAY,
   PROP_TYPE_HANDLEARRAY,
   PROP_TYPE_REAL,
+  PROP_TYPE_MULTISTRING, /* same as _STRING but with (gint)extra_data lines */
   PROP_TYPE_STRING,
   PROP_TYPE_POINT,
   PROP_TYPE_POINTARRAY,
@@ -68,7 +70,10 @@ typedef enum {
   PROP_TYPE_ENDPOINTS,
   PROP_TYPE_CONNPOINT_LINE,
   PROP_TYPE_TEXT, /* can't be visible */
-
+  PROP_TYPE_STATIC, /* tooltip is used as a (potentially big) static label */
+  PROP_TYPE_NOTEBOOK_BEGIN,
+  PROP_TYPE_NOTEBOOK_END,
+  PROP_TYPE_NOTEBOOK_PAGE,
   PROP_LAST
 } PropType;
 
@@ -97,6 +102,7 @@ struct _PropDescription {
 struct _Property {
   const gchar *name;
   PropType type;
+  const PropDescription *descr;
   gpointer extra_data;
   union {
     gchar char_data;

--- a/objects/GRAFCET/action.c
+++ b/objects/GRAFCET/action.c
@@ -455,7 +455,7 @@ action_destroy(Action *action)
   connpointline_destroy(action->cps);
   connection_destroy(&action->connection);
 }
-
+ 
 static Object *
 action_load(ObjectNode obj_node, int version, const char *filename)
 {

--- a/objects/GRAFCET/step.c
+++ b/objects/GRAFCET/step.c
@@ -549,7 +549,7 @@ step_load(ObjectNode obj_node, int version, const char *filename)
   return object_load_using_properties(&step_type,
                                       obj_node,version,filename);
 }
-
+ 
 
 
 

--- a/objects/GRAFCET/transition.c
+++ b/objects/GRAFCET/transition.c
@@ -145,7 +145,7 @@ static PropDescription transition_props[] = {
     N_("Color"),N_("The receptivity's color")},
   { "north_pos",PROP_TYPE_POINT,0,N_("North point"),NULL },
   { "south_pos",PROP_TYPE_POINT,0,N_("South point"),NULL },
-  PROP_DESC_END
+  PROP_DESC_END 
 };
 
 static PropDescription *

--- a/objects/SADT/box.c
+++ b/objects/SADT/box.c
@@ -43,7 +43,7 @@
 #include "message.h"
 #include "connpoint_line.h"
 #include "color.h"
-#include "lazyprops.h"
+#include "properties.h"
 
 #include "pixmaps/sadtbox.xpm"
 
@@ -60,21 +60,8 @@ typedef enum {
   ANCHOR_END
 } AnchorShape;
 
-typedef struct _Box Box;
-typedef struct _BoxPropertiesDialog BoxPropertiesDialog;
-typedef struct _BoxDefaultsDialog BoxDefaultsDialog;
-typedef struct _BoxState BoxState;
-typedef struct _BoxDefaults BoxDefaults;
 
-struct _BoxState {
-  ObjectState obj_state;
-
-  real padding;
-  TextAttributes text_attrib;
-  gchar *id;
-};
-
-struct _Box {
+typedef struct _Box {
   Element element;
 
   ConnPointLine *north,*south,*east,*west;
@@ -82,40 +69,9 @@ struct _Box {
   Text *text;
   gchar *id;
   real padding;
-};
-
-struct _BoxPropertiesDialog {
-  AttributeDialog dialog;
-  Box *parent;
-
-  RealAttribute padding;
-  TextFontAttribute text_font;
-  TextFontHeightAttribute text_fontheight;
-  TextColorAttribute text_color;
-  StringAttribute id;
-};
-
-struct _BoxDefaults {
-  Font *font;
-  real font_size;
-  Color fontcolor;
-  real padding;
-};
 
-struct _BoxDefaultsDialog {
-  AttributeDialog dialog;
-  BoxDefaults *parent;
-
-  RealAttribute padding;
-  FontAttribute font;
-  FontHeightAttribute font_size;
-  ColorAttribute fontcolor;
-};
-
-
-static BoxPropertiesDialog *sadtbox_properties_dialog;
-static BoxDefaultsDialog *sadtbox_defaults_dialog;
-static BoxDefaults default_properties;
+  TextAttributes attrs;
+} Box;
 
 static real sadtbox_distance_from(Box *box, Point *point);
 static void sadtbox_select(Box *box, Point *clicked_point,
@@ -131,27 +87,23 @@ static Object *sadtbox_create(Point *startpoint,
 			  Handle **handle1,
 			  Handle **handle2);
 static void sadtbox_destroy(Box *box);
-static Object *sadtbox_copy(Box *box);
-static PROPDLG_TYPE sadtbox_get_properties(Box *box);
-static ObjectChange *sadtbox_apply_properties(Box *box);
-
-static BoxState *sadtbox_get_state(Box *box);
-static void sadtbox_set_state(Box *box, BoxState *state);
-
-static void sadtbox_save(Box *box, ObjectNode obj_node, const char *filename);
-static Object *sadtbox_load(ObjectNode obj_node, int version, const char *filename);
-static PROPDLG_TYPE sadtbox_get_defaults(void);
-static void sadtbox_apply_defaults(void);
-
+static Object *sadtbox_load(ObjectNode obj_node, int version, 
+                            const char *filename);
 static DiaMenu *sadtbox_get_object_menu(Box *box, Point *clickedpoint);
 
+static PropDescription *sadtbox_describe_props(Box *box);
+static void sadtbox_get_props(Box *box, 
+                                 Property *props, guint nprops);
+static void sadtbox_set_props(Box *box, 
+                                 Property *props, guint nprops);
+
 static ObjectTypeOps sadtbox_type_ops =
 {
   (CreateFunc) sadtbox_create,
-  (LoadFunc)   sadtbox_load,
-  (SaveFunc)   sadtbox_save,
-  (GetDefaultsFunc)   sadtbox_get_defaults,
-  (ApplyDefaultsFunc) sadtbox_apply_defaults
+  (LoadFunc)   sadtbox_load/*using_properties*/,
+  (SaveFunc)   object_save_using_properties,
+  (GetDefaultsFunc)   NULL,
+  (ApplyDefaultsFunc) NULL,
 };
 
 ObjectType sadtbox_type =
@@ -168,94 +120,92 @@ static ObjectOps sadtbox_ops = {
   (DrawFunc)            sadtbox_draw,
   (DistanceFunc)        sadtbox_distance_from,
   (SelectFunc)          sadtbox_select,
-  (CopyFunc)            sadtbox_copy,
+  (CopyFunc)            object_copy_using_properties,
   (MoveFunc)            sadtbox_move,
   (MoveHandleFunc)      sadtbox_move_handle,
-  (GetPropertiesFunc)   sadtbox_get_properties,
-  (ApplyPropertiesFunc) sadtbox_apply_properties,
-  (ObjectMenuFunc)      sadtbox_get_object_menu
+  (GetPropertiesFunc)   object_create_props_dialog,
+  (ApplyPropertiesFunc) object_apply_props_from_dialog,
+  (ObjectMenuFunc)      sadtbox_get_object_menu,
+  (DescribePropsFunc)   sadtbox_describe_props,
+  (GetPropsFunc)        sadtbox_get_props,
+  (SetPropsFunc)        sadtbox_set_props
 };
 
-static ObjectChange *
-sadtbox_apply_properties(Box *box)
-{
-  ObjectState *old_state;
-  BoxPropertiesDialog *dlg = sadtbox_properties_dialog;
-
-  PROPDLG_SANITY_CHECK(dlg,box);
-  
-  old_state = (ObjectState *)sadtbox_get_state(box);
-
-  PROPDLG_APPLY_REAL(dlg, padding);
-  PROPDLG_APPLY_TEXTFONT(dlg,text);
-  PROPDLG_APPLY_TEXTFONTHEIGHT(dlg,text);
-  PROPDLG_APPLY_TEXTCOLOR(dlg,text);
-  PROPDLG_APPLY_STRING(dlg,id);
-
-  sadtbox_update_data(box, ANCHOR_MIDDLE, ANCHOR_MIDDLE);
-  return new_object_state_change(&box->element.object, 
-                                 old_state, 
-				 (GetStateFunc)sadtbox_get_state,
-				 (SetStateFunc)sadtbox_set_state);
-}
+static PropNumData text_padding_data = { 0.0, 10.0, 0.1 };
+
+static PropDescription box_props[] = {
+  ELEMENT_COMMON_PROPERTIES,
+  { "padding",PROP_TYPE_REAL,PROP_FLAG_VISIBLE,
+    N_("Text padding"), NULL, &text_padding_data},
+  { "text", PROP_TYPE_TEXT, 0,NULL,NULL},
+  PROP_STD_TEXT_ALIGNMENT,
+  PROP_STD_TEXT_FONT,
+  PROP_STD_TEXT_HEIGHT,
+  PROP_STD_TEXT_COLOUR,
+  { "id", PROP_TYPE_STRING, PROP_FLAG_VISIBLE,
+    N_("Activity/Data identifier"),
+    N_("The identifier which appears in the lower right corner of the Box")},
+  { "cpl_north",PROP_TYPE_CONNPOINT_LINE, 0, NULL, NULL},
+  { "cpl_west",PROP_TYPE_CONNPOINT_LINE, 0, NULL, NULL},
+  { "cpl_south",PROP_TYPE_CONNPOINT_LINE, 0, NULL, NULL},
+  { "cpl_east",PROP_TYPE_CONNPOINT_LINE, 0, NULL, NULL},
+  PROP_DESC_END
+};
 
-static PROPDLG_TYPE
-sadtbox_get_properties(Box *box)
+static PropDescription *
+sadtbox_describe_props(Box *box) 
 {
-  BoxPropertiesDialog *dlg = sadtbox_properties_dialog;
-  
-  PROPDLG_CREATE(dlg,box);
-  
-  PROPDLG_SHOW_REAL(dlg,padding,_("Text padding:"),0.0,10.0,0.1);
-  PROPDLG_SHOW_TEXTFONT(dlg,text,_("Font:"));
-  PROPDLG_SHOW_TEXTFONTHEIGHT(dlg,text,_("Font size:"));
-  PROPDLG_SHOW_TEXTCOLOR(dlg,text,_("Font color:"));
-  PROPDLG_SHOW_STRING(dlg,id,_("Activity/Data identifier"));
-  
-  PROPDLG_READY(dlg);
-  sadtbox_properties_dialog = dlg;
+  if (box_props[0].quark == 0) {
+    prop_desc_list_calculate_quarks(box_props);
+  }
+  return box_props;
+}    
+
+static PropOffset box_offsets[] = {
+  ELEMENT_COMMON_PROPERTIES_OFFSETS,
+  { "padding",PROP_TYPE_REAL,offsetof(Box,padding)},
+  { "text", PROP_TYPE_TEXT, offsetof(Box,text)},
+  { "text_alignment",PROP_TYPE_ENUM,offsetof(Box,attrs.alignment)},
+  { "text_font",PROP_TYPE_FONT,offsetof(Box,attrs.font)},
+  { "text_height",PROP_TYPE_REAL,offsetof(Box,attrs.height)},
+  { "text_color",PROP_TYPE_COLOUR,offsetof(Box,attrs.color)},
+  { "id", PROP_TYPE_STRING, offsetof(Box,id)},
+  { "cpl_north",PROP_TYPE_CONNPOINT_LINE, offsetof(Box,north)},
+  { "cpl_west",PROP_TYPE_CONNPOINT_LINE, offsetof(Box,west)},
+  { "cpl_south",PROP_TYPE_CONNPOINT_LINE, offsetof(Box,south)},
+  { "cpl_east",PROP_TYPE_CONNPOINT_LINE, offsetof(Box,east)},
+  {NULL}
+};
 
-  PROPDLG_RETURN(dlg);
-}
 static void
-sadtbox_apply_defaults(void)
-{
-  BoxDefaultsDialog *dlg = sadtbox_defaults_dialog;
-
-  PROPDLG_APPLY_REAL(dlg,padding);
-  PROPDLG_APPLY_FONT(dlg,font);
-  PROPDLG_APPLY_FONTHEIGHT(dlg,font_size);
-  PROPDLG_APPLY_COLOR(dlg,fontcolor);
+sadtbox_get_props(Box *box, Property *props, guint nprops)
+{  
+  text_get_attributes(box->text,&box->attrs);
+  object_get_props_from_offsets(&box->element.object,
+                                box_offsets,props,nprops);
 }
 
 static void
-init_default_values(void) {
-  static int defaults_initialized = 0;
-
-  if (!defaults_initialized) {
-    default_properties.padding = 0.5;
-    default_properties.font = font_getfont("Helvetica-Bold");
-    default_properties.font_size = 0.8;
-    default_properties.fontcolor = color_black;
-    defaults_initialized = 1;
+sadtbox_set_props(Box *box, Property *props, guint nprops)
+{
+  int i;
+  Property *textprop = NULL;
+
+  object_set_props_from_offsets(&box->element.object,
+                                box_offsets,props,nprops);
+  for (i=0;i<nprops;i++) {
+    if (0 == strcmp(props[i].name,"text")) {
+      textprop = &props[i];
+      break;
+    }
   }
-}
 
-static GtkWidget *
-sadtbox_get_defaults(void)
-{
-  BoxDefaultsDialog *dlg = sadtbox_defaults_dialog;
-
-  init_default_values();
-  PROPDLG_CREATE(dlg, &default_properties);
-  PROPDLG_SHOW_REAL(dlg,padding,_("Text padding:"),0.0,10.0,0.1);
-  PROPDLG_SHOW_FONT(dlg,font,_("Font:"));
-  PROPDLG_SHOW_FONTHEIGHT(dlg,font_size,_("Font size:"));
-  PROPDLG_SHOW_COLOR(dlg,fontcolor,_("Font color:"));
-  PROPDLG_READY(dlg);
-  sadtbox_defaults_dialog = dlg;
-
-  PROPDLG_RETURN(dlg);
+  if ((!textprop) || (!PROP_VALUE_TEXT(*textprop).enabled)) {
+    /* most likely we're called after the dialog box has been applied */
+    text_set_attributes(box->text,&box->attrs);
+  }
+
+  sadtbox_update_data(box, ANCHOR_MIDDLE, ANCHOR_MIDDLE);
 }
 
 static real
@@ -369,41 +319,6 @@ sadtbox_draw(Box *box, Renderer *renderer)
 }
 
 static void
-sadtbox_free_state(ObjectState *objstate)
-{
-  BoxState *state = (BoxState *)objstate;
-  g_free(state->id);
-  /*  g_free(state); */ /* huh ?? NOT HERE !!! */
-}
-
-static BoxState *
-sadtbox_get_state(Box *box)
-{
-  BoxState *state = g_new0(BoxState, 1);
-
-  state->obj_state.free = sadtbox_free_state;
-
-  state->id = g_strdup(box->id);
-  state->padding = box->padding;
-  text_get_attributes(box->text, &state->text_attrib);
-
-  return state;
-}
-
-static void
-sadtbox_set_state(Box *box, BoxState *state)
-{
-  box->padding = state->padding;
-  text_set_attributes(box->text, &state->text_attrib);
-  if (box->id) g_free(box->id);
-  box->id = state->id;
-  g_free(state);
-  
-  sadtbox_update_data(box, ANCHOR_MIDDLE, ANCHOR_MIDDLE);
-}
-
-
-static void
 sadtbox_update_data(Box *box, AnchorShape horiz, AnchorShape vert)
 {
   Element *elem = &box->element;
@@ -572,8 +487,6 @@ sadtbox_create(Point *startpoint,
   Object *obj;
   Point p;
 
-  init_default_values();
-
   box = g_malloc0(sizeof(Box));
   elem = &box->element;
   obj = &elem->object;
@@ -586,15 +499,21 @@ sadtbox_create(Point *startpoint,
   elem->width = DEFAULT_WIDTH;
   elem->height = DEFAULT_HEIGHT;
 
-  box->padding = default_properties.padding;
+  box->padding = 0.5; /* default_values.padding; */
   
   p = *startpoint;
   p.x += elem->width / 2.0;
-  p.y += elem->height / 2.0 + default_properties.font_size / 2;
-  box->text = new_text("", default_properties.font,
+  p.y += elem->height / 2.0 + /*default_properties.font_size*/ 0.8 / 2;
+
+  /*  box->text = new_text("", default_properties.font,
 		       default_properties.font_size, &p, 
 		       &SADTBOX_FG_COLOR,
 		       ALIGN_CENTER);
+  */
+  box->text = new_text("", font_getfont("Helvetica-Bold"),
+		       0.8, &p, 
+		       &color_black,
+		       ALIGN_CENTER);
   box->id = g_strdup("A0"); /* should be made better. 
 				   Automatic counting ? */
 
@@ -628,91 +547,16 @@ sadtbox_destroy(Box *box)
   element_destroy(&box->element);
 }
 
-static Object *
-sadtbox_copy(Box *box)
-{
-  Box *newbox;
-  Element *elem, *newelem;
-  Object *newobj;
-  int rcc;
-
-  elem = &box->element;
-  
-  newbox = g_malloc0(sizeof(Box));
-  newelem = &newbox->element;
-  newobj = &newelem->object;
-
-  element_copy(elem, newelem);
-  rcc = 0;
-  newbox->north = connpointline_copy(newobj,box->north,&rcc);
-  newbox->west = connpointline_copy(newobj,box->west,&rcc);
-  newbox->south = connpointline_copy(newobj,box->south,&rcc);
-  newbox->east = connpointline_copy(newobj,box->east,&rcc);
-  g_assert(rcc == newobj->num_connections);
-  
-  newbox->id = g_strdup(box->id);
-  newbox->padding = box->padding;
-  newbox->text = text_copy(box->text);  
-
-  return &newbox->element.object;
-}
-
-
-static void
-sadtbox_save(Box *box, ObjectNode obj_node, const char *filename)
-{
-  element_save(&box->element, obj_node);
-
-  save_real(obj_node,"padding",box->padding);
-  save_text(obj_node,"text",box->text);
-  save_int(obj_node,"cpl_north",box->north->num_connections);
-  save_int(obj_node,"cpl_west",box->west->num_connections);
-  save_int(obj_node,"cpl_south",box->south->num_connections);
-  save_int(obj_node,"cpl_east",box->east->num_connections);
-  save_string(obj_node,"id",box->id);
-}
 
 static Object *
 sadtbox_load(ObjectNode obj_node, int version, const char *filename)
 {
-  Box *box;
-  Element *elem;
-  Object *obj;
-  int realconncount;
-  Point p = {0.0,0.0};
-
-  box = g_malloc0(sizeof(Box));
-  elem = &box->element;
-  obj = &elem->object;
-  
-  obj->type = &sadtbox_type;
-  obj->ops = &sadtbox_ops;
-
-  element_load(elem, obj_node);
+  return object_load_using_properties(&sadtbox_type,
+                                      obj_node,version,filename);
+}
 
-  box->padding = load_real(obj_node,"padding",default_properties.padding);
-  box->text = load_text(obj_node,"text",NULL);
-  if (!box->text) 
-    box->text = new_text("", default_properties.font,
-			 default_properties.font_size, &p, 
-			 &SADTBOX_FG_COLOR,
-			 ALIGN_CENTER);
 
-  element_init(elem, 8, 0);
-  realconncount = 0;
 
-  box->north = connpointline_load(obj,obj_node,"cpl_north",4,&realconncount);
-  box->west = connpointline_load(obj,obj_node,"cpl_west",3,&realconncount);
-  box->south = connpointline_load(obj,obj_node,"cpl_south",1,&realconncount);
-  box->east = connpointline_load(obj,obj_node,"cpl_east",3,&realconncount);
 
-  box->id = load_string(obj_node,"id",NULL);
-  if (!box->id) box->id = g_strdup("A0");
-  
-  box->element.extra_spacing.border_trans = SADTBOX_LINE_WIDTH/2.0;
-  sadtbox_update_data(box, ANCHOR_MIDDLE, ANCHOR_MIDDLE);
-
-  return &box->element.object;
-}
 
 

--- a/objects/chronogram/chronoline.c
+++ b/objects/chronogram/chronoline.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1998 Alexander Larsson
  *
  * Chronogram objects support
- * Copyright (C) 2000 Cyrille Chepelov 
+ * Copyright (C) 2000, 2001 Cyrille Chepelov 
  * 
  * Ultimately forked from Flowchart toolbox -- objects for drawing flowcharts.
  * Copyright (C) 1999 James Henstridge.
@@ -43,7 +43,7 @@
 #include "message.h"
 #include "connpoint_line.h"
 #include "color.h"
-#include "lazyprops.h"
+#include "properties.h"
 
 #include "chronogram.h"
 #include "chronoline_event.h"
@@ -53,33 +53,7 @@
 #define DEFAULT_WIDTH 7.0
 #define DEFAULT_HEIGHT 5.0
 
-typedef struct _Chronoline Chronoline;
-typedef struct _ChronolinePropertiesDialog ChronolinePropertiesDialog;
-typedef struct _ChronolineDefaultsDialog ChronolineDefaultsDialog;
-typedef struct _ChronolineState ChronolineState;
-typedef struct _ChronolineDefaults ChronolineDefaults;
-
-struct _ChronolineState {
-  ObjectState obj_state;
-
-  real main_lwidth;
-  Color color;
-  real start_time;
-  real end_time;
-  real data_lwidth;
-  Color data_color;
-  char *events;
-  char *name;
-  real rise_time;
-  real fall_time;
-  gboolean multibit;
-
-  Font *font;
-  real font_size;
-  Color font_color;
-};
-
-struct _Chronoline {
+typedef struct _Chronoline {
   Element element;
 
   real main_lwidth;
@@ -97,105 +71,17 @@ struct _Chronoline {
   real font_size;
   Color font_color;
   
+  /* computed values : */
   ConnPointLine *snap; /* not saved ; num_connections derived from
 			  the event string. */
   CLEventList *evtlist;
 
   int checksum;
-  /* computed values : */
   real labelwidth;
   real y_down,y_up;
   Color gray, datagray;
-};
-
-struct _ChronolinePropertiesDialog {
-  AttributeDialog dialog;
-  Chronoline *parent;
-  AttributeNotebook notebook;
-
-  struct {
-    AttributePage dialog;
-    Chronoline *parent;
-
-    MultiStringAttribute events;
-    StringAttribute name;
-  } *data_page;
-  struct {
-    AttributePage dialog;
-    Chronoline *parent;
-
-    BoolAttribute multibit;
-    RealAttribute start_time;
-    RealAttribute end_time;
-    RealAttribute rise_time;
-    RealAttribute fall_time;
-  } *parameter_page;
-  struct {
-    AttributePage dialog;
-    Chronoline *parent;
-
-    RealAttribute main_lwidth;
-    RealAttribute data_lwidth;
-    ColorAttribute data_color;
-    ColorAttribute color;
-    FontAttribute font;
-    FontHeightAttribute font_size;
-    ColorAttribute font_color;
-  } *aspect_page;
-};
-
-struct _ChronolineDefaults {
-  char *name;   /* not edited */
-  char *events; /* not edited */
-
-  real main_lwidth;
-  real data_lwidth;
-  Color color;
-  Color data_color;
-
-  real start_time;
-  real end_time;
-  real rise_time;
-  real fall_time;
-  gboolean multibit;
-   
-  Font *font;
-  real font_size;
-  Color font_color;
-};
-
-struct _ChronolineDefaultsDialog {
-  AttributeDialog dialog;
-  ChronolineDefaults *parent;
-  AttributeNotebook notebook;
-
-  struct {
-    AttributePage dialog;
-    ChronolineDefaults *parent;
-
-    BoolAttribute multibit;
-    RealAttribute start_time;
-    RealAttribute end_time;
-    RealAttribute rise_time;
-    RealAttribute fall_time;
-  } *parameter_page;
-  struct {
-    AttributePage dialog;
-    ChronolineDefaults *parent;
-
-    RealAttribute main_lwidth;
-    RealAttribute data_lwidth;
-    ColorAttribute data_color;
-    ColorAttribute color;
-    FontAttribute font;
-    FontHeightAttribute font_size;
-    ColorAttribute font_color;
-  } *aspect_page;
-};
+} Chronoline;
 
-static ChronolinePropertiesDialog *chronoline_properties_dialog;
-static ChronolineDefaultsDialog *chronoline_defaults_dialog;
-static ChronolineDefaults defaults;
 
 static real chronoline_distance_from(Chronoline *chronoline, Point *point);
 static void chronoline_select(Chronoline *chronoline, Point *clicked_point,
@@ -211,28 +97,21 @@ static Object *chronoline_create(Point *startpoint,
 			  Handle **handle1,
 			  Handle **handle2);
 static void chronoline_destroy(Chronoline *chronoline);
-static Object *chronoline_copy(Chronoline *chronoline);
-static PROPDLG_TYPE chronoline_get_properties(Chronoline *chronoline);
-static ObjectChange *chronoline_apply_properties(Chronoline *chronoline);
-
-static ChronolineState *chronoline_get_state(Chronoline *chronoline);
-static void chronoline_set_state(Chronoline *chronoline, ChronolineState *state);
-
-static void chronoline_save(Chronoline *chronoline, ObjectNode obj_node, const char *filename);
-static Object *chronoline_load(ObjectNode obj_node, int version, const char *filename);
-static PROPDLG_TYPE chronoline_get_defaults(void);
-static void chronoline_apply_defaults(void);
-static void chronoline_free_state(ObjectState *objstate);
-
-/*static DiaMenu *chronoline_get_object_menu(Chronoline *chronoline, Point *clickedpoint); */
+static Object *chronoline_load(ObjectNode obj_node, int version, 
+                               const char *filename);
+static PropDescription *chronoline_describe_props(Chronoline *chronoline);
+static void chronoline_get_props(Chronoline *chronoline, 
+                                 Property *props, guint nprops);
+static void chronoline_set_props(Chronoline *chronoline, 
+                                 Property *props, guint nprops);
 
 static ObjectTypeOps chronoline_type_ops =
 {
   (CreateFunc) chronoline_create,
-  (LoadFunc)   chronoline_load,
-  (SaveFunc)   chronoline_save,
-  (GetDefaultsFunc)   chronoline_get_defaults,
-  (ApplyDefaultsFunc) chronoline_apply_defaults
+  (LoadFunc)   chronoline_load/*using properties*/,
+  (SaveFunc)   object_save_using_properties,
+  (GetDefaultsFunc)   NULL,
+  (ApplyDefaultsFunc) NULL
 };
 
 ObjectType chronoline_type =
@@ -249,195 +128,125 @@ static ObjectOps chronoline_ops = {
   (DrawFunc)            chronoline_draw,
   (DistanceFunc)        chronoline_distance_from,
   (SelectFunc)          chronoline_select,
-  (CopyFunc)            chronoline_copy,
+  (CopyFunc)            object_copy_using_properties,
   (MoveFunc)            chronoline_move,
   (MoveHandleFunc)      chronoline_move_handle,
-  (GetPropertiesFunc)   chronoline_get_properties,
-  (ApplyPropertiesFunc) chronoline_apply_properties,
+  (GetPropertiesFunc)   object_create_props_dialog,
+  (ApplyPropertiesFunc) object_apply_props_from_dialog,
   (ObjectMenuFunc)      NULL,
+  (DescribePropsFunc)   chronoline_describe_props,
+  (GetPropsFunc)        chronoline_get_props,
+  (SetPropsFunc)        chronoline_set_props
 };
 
-static ObjectChange *
-chronoline_apply_properties(Chronoline *chronoline)
-{
-  ObjectState *old_state;
-  ChronolinePropertiesDialog *dlg = chronoline_properties_dialog;
-
-  PROPDLG_SANITY_CHECK(dlg,chronoline);
-
-  old_state = (ObjectState *)chronoline_get_state(chronoline);
-  
-  PROPDLG_APPLY_STRING(dlg->data_page,name);
-  PROPDLG_APPLY_MULTISTRING(dlg->data_page,events);
-
-  PROPDLG_APPLY_REAL(dlg->parameter_page,start_time);
-  PROPDLG_APPLY_REAL(dlg->parameter_page,end_time);
-
-  PROPDLG_APPLY_REAL(dlg->parameter_page,rise_time);
-  PROPDLG_APPLY_REAL(dlg->parameter_page,fall_time);
-
-  PROPDLG_APPLY_BOOL(dlg->parameter_page,multibit);
-
-  PROPDLG_APPLY_REAL(dlg->aspect_page,data_lwidth);
-  PROPDLG_APPLY_COLOR(dlg->aspect_page,data_color);
-  PROPDLG_APPLY_REAL(dlg->aspect_page,main_lwidth);
-  PROPDLG_APPLY_COLOR(dlg->aspect_page,color);
-
-  PROPDLG_APPLY_FONT(dlg->aspect_page,font);
-  PROPDLG_APPLY_FONTHEIGHT(dlg->aspect_page,font_size);
-  PROPDLG_APPLY_COLOR(dlg->aspect_page,font_color);
-  
-  /* time_lstep should probably be a multiplier of time_step, but the user
-     is sovereign. */
-  chronoline_update_data(chronoline);
-
-  return new_object_state_change(&chronoline->element.object, 
-                                 old_state, 
-				 (GetStateFunc)chronoline_get_state,
-				 (SetStateFunc)chronoline_set_state);
-}
-
-static PROPDLG_TYPE
-chronoline_get_properties(Chronoline *chronoline)
-{
-  ChronolinePropertiesDialog *dlg = chronoline_properties_dialog;
-  
-  PROPDLG_CREATE(dlg,chronoline);
-  PROPDLG_NOTEBOOK_CREATE(dlg,notebook);
-  PROPDLG_PAGE_CREATE(dlg,notebook,aspect_page,_("Aspect"));
-  PROPDLG_PAGE_CREATE(dlg,notebook,parameter_page,_("Parameters"));
-  PROPDLG_PAGE_CREATE(dlg,notebook,data_page,_("Data"));
-
-  PROPDLG_SHOW_STRING(dlg->data_page,name,_("Data name:"));
-  PROPDLG_SHOW_SEPARATOR(dlg->data_page);
-  PROPDLG_SHOW_MULTISTRING(dlg->data_page,events,_("Events:"),5);
-  PROPDLG_SHOW_STATIC(dlg->data_page,_("Event specification:\n"
+static PropNumData time_range = { -32767.0, 32768.0, 0.1};
+static PropNumData edge_range = { 0.0, 1000.0, 0.1};
+
+static PropDescription chronoline_props[] = {
+  ELEMENT_COMMON_PROPERTIES,
+  { "nbook", PROP_TYPE_NOTEBOOK_BEGIN, 
+              PROP_FLAG_VISIBLE|PROP_FLAG_DONT_SAVE, NULL, NULL},
+  { "data", PROP_TYPE_NOTEBOOK_PAGE,
+    PROP_FLAG_VISIBLE|PROP_FLAG_DONT_SAVE, 
+    N_("Data"), NULL},
+  { "name", PROP_TYPE_STRING,PROP_FLAG_VISIBLE,N_("Data name"),NULL },
+  { "events", PROP_TYPE_MULTISTRING,PROP_FLAG_VISIBLE,N_("Events"),
+    NULL,GINT_TO_POINTER(5) },
+  { "help", PROP_TYPE_STATIC,PROP_FLAG_VISIBLE|PROP_FLAG_DONT_SAVE,
+    N_("Event specification"),N_(
 			    "@ time    set the pointer at an absolute time.\n"
 			    "( duration  sets the signal up, then wait 'duration'.\n"
 			    ") duration  sets the signal down, then wait 'duration'.\n" 
 			    "u duration  sets the signal to \"unknown\" state, then wait 'duration'.\n"
-			    "example : @ 1.0 (2.0)1.0(2.0)\n" ));
-
-  PROPDLG_SHOW_REAL(dlg->parameter_page,start_time,
-		    _("Start time:"),-32767.0,32768.0,0.1);
-  PROPDLG_SHOW_REAL(dlg->parameter_page,end_time,
-		    _("End time:"),-32767.0,32768.0,0.1);
-  PROPDLG_SHOW_REAL(dlg->parameter_page,rise_time,
-		    _("Rise time:"),0.0,1000.0,.1);
-  PROPDLG_SHOW_REAL(dlg->parameter_page,fall_time,
-		    _("Fall time:"),0.0,1000.0,.1);
-  PROPDLG_SHOW_BOOL(dlg->parameter_page,multibit,
-		    _("Multi-bit data"));
-
-  PROPDLG_SHOW_COLOR(dlg->aspect_page,data_color,_("Data color:"));
-  PROPDLG_SHOW_REAL(dlg->aspect_page,data_lwidth,
-		    _("Data line width:"),0.0,10.0,0.1);
-  PROPDLG_SHOW_COLOR(dlg->aspect_page,color,_("Line color:"));
-  PROPDLG_SHOW_REAL(dlg->aspect_page,main_lwidth,
-		    _("Line width:"),0.0,10.0,0.1);
-  PROPDLG_SHOW_FONT(dlg->aspect_page,font,_("Font:"));
-  PROPDLG_SHOW_FONTHEIGHT(dlg->aspect_page,font_size,_("Font size:"));
-  PROPDLG_SHOW_COLOR(dlg->aspect_page,font_color,_("Font color:"));
-
-  PROPDLG_PAGE_READY(dlg,notebook,data_page);
-  PROPDLG_PAGE_READY(dlg,notebook,parameter_page);
-  PROPDLG_PAGE_READY(dlg,notebook,aspect_page);
-  PROPDLG_NOTEBOOK_READY(dlg,notebook);
-
-  PROPDLG_READY(dlg);
-  chronoline_properties_dialog = dlg;
-
-  PROPDLG_RETURN(dlg);
-}
-static void
-chronoline_apply_defaults(void)
-{
-  ChronolineDefaultsDialog *dlg = chronoline_defaults_dialog;
-
-  PROPDLG_APPLY_REAL(dlg->parameter_page,start_time);
-  PROPDLG_APPLY_REAL(dlg->parameter_page,end_time);
-
-  PROPDLG_APPLY_REAL(dlg->parameter_page,rise_time);
-  PROPDLG_APPLY_REAL(dlg->parameter_page,fall_time);
-
-  PROPDLG_APPLY_BOOL(dlg->parameter_page,multibit);
-
-  PROPDLG_APPLY_REAL(dlg->aspect_page,data_lwidth);
-  PROPDLG_APPLY_COLOR(dlg->aspect_page,data_color);
-  PROPDLG_APPLY_REAL(dlg->aspect_page,main_lwidth);
-  PROPDLG_APPLY_COLOR(dlg->aspect_page,color);
+			    "example : @ 1.0 (2.0)1.0(2.0)\n" )},
+
+  { "parameters",PROP_TYPE_NOTEBOOK_PAGE,
+    PROP_FLAG_VISIBLE|PROP_FLAG_DONT_SAVE, 
+    N_("Parameters"), NULL},
+  { "start_time",PROP_TYPE_REAL,PROP_FLAG_VISIBLE,
+    N_("Start time"),NULL,&time_range},
+  { "end_time",PROP_TYPE_REAL,PROP_FLAG_VISIBLE,
+    N_("End time"),NULL,&time_range},
+  { "rise_time",PROP_TYPE_REAL,PROP_FLAG_VISIBLE,
+    N_("Rise time"),NULL,&edge_range},
+  { "fall_time",PROP_TYPE_REAL,PROP_FLAG_VISIBLE,
+    N_("Fall time"),NULL,&edge_range},
+  { "multibit",PROP_TYPE_BOOL,PROP_FLAG_VISIBLE, N_("Multi-bit data"),NULL},
+
+  { "aspect",PROP_TYPE_NOTEBOOK_PAGE,
+    PROP_FLAG_VISIBLE|PROP_FLAG_DONT_SAVE, 
+    N_("Aspect"), NULL},
+  { "data_color", PROP_TYPE_COLOUR, PROP_FLAG_VISIBLE,
+    N_("Data color"),NULL},
+  { "data_lwidth", PROP_TYPE_REAL, PROP_FLAG_VISIBLE,
+    N_("Data line width"),NULL, &prop_std_line_width_data},
+  { "color", PROP_TYPE_COLOUR, PROP_FLAG_VISIBLE,
+    N_("Line color"),NULL},
+  { "main_lwidth", PROP_TYPE_REAL, PROP_FLAG_VISIBLE,
+    N_("Line width"),NULL, &prop_std_line_width_data},
+
+  { "font", PROP_TYPE_FONT, PROP_FLAG_VISIBLE, N_("Font"), NULL, NULL },
+  { "font_size", PROP_TYPE_REAL, PROP_FLAG_VISIBLE,
+    N_("Font size"), NULL, &prop_std_text_height_data },
+  { "font_color", PROP_TYPE_COLOUR, PROP_FLAG_VISIBLE,
+    N_("Text colour"), NULL, NULL },
+
+  { "nbook_end", PROP_TYPE_NOTEBOOK_END, 
+              PROP_FLAG_VISIBLE|PROP_FLAG_DONT_SAVE, NULL, NULL},
+  {NULL}
+};
 
-  PROPDLG_APPLY_FONT(dlg->aspect_page,font);
-  PROPDLG_APPLY_FONTHEIGHT(dlg->aspect_page,font_size);
-  PROPDLG_APPLY_COLOR(dlg->aspect_page,font_color);
-}
+static PropDescription *
+chronoline_describe_props(Chronoline *chronoline) 
+{
+  if (chronoline_props[0].quark == 0) {
+    prop_desc_list_calculate_quarks(chronoline_props);
+  }
+  return chronoline_props;
+}    
+
+static PropOffset chronoline_offsets[] = {
+  ELEMENT_COMMON_PROPERTIES_OFFSETS,
+  { "nbook", PROP_TYPE_NOTEBOOK_BEGIN, 0}, 
+
+  { "data", PROP_TYPE_NOTEBOOK_PAGE, 0},
+  { "name", PROP_TYPE_STRING, offsetof(Chronoline,name)},
+  { "events", PROP_TYPE_MULTISTRING, offsetof(Chronoline,events)},
+  { "help", PROP_TYPE_STATIC, 0},
+
+  { "parameters",PROP_TYPE_NOTEBOOK_PAGE, 0},
+  { "start_time",PROP_TYPE_REAL, offsetof(Chronoline,start_time)},
+  { "end_time",PROP_TYPE_REAL, offsetof(Chronoline,end_time)},
+  { "rise_time",PROP_TYPE_REAL, offsetof(Chronoline,rise_time)},
+  { "fall_time",PROP_TYPE_REAL, offsetof(Chronoline,fall_time)},
+  { "multibit",PROP_TYPE_BOOL, offsetof(Chronoline,multibit)},
+
+  { "aspect",PROP_TYPE_NOTEBOOK_PAGE,0},
+  { "data_color", PROP_TYPE_COLOUR, offsetof(Chronoline,data_color)},
+  { "data_lwidth", PROP_TYPE_REAL, offsetof(Chronoline,data_lwidth)},
+  { "color", PROP_TYPE_COLOUR, offsetof(Chronoline,color)},
+  { "main_lwidth", PROP_TYPE_REAL, offsetof(Chronoline,main_lwidth)},
+  { "font", PROP_TYPE_FONT, offsetof(Chronoline,font)},
+  { "font_size", PROP_TYPE_REAL, offsetof(Chronoline,font_size)},
+  { "font_color", PROP_TYPE_COLOUR, offsetof(Chronoline,font_color)},
+
+  { "nbook_end", PROP_TYPE_NOTEBOOK_END, 0}, 
+  {NULL}
+};
 
 static void
-chronoline_init_defaults(void) {
-  static int defaults_initialized = 0;
-
-  if (!defaults_initialized) {
-    defaults.name = "";
-    defaults.events = "";
-
-    defaults.font = font_getfont("Helvetica");
-    defaults.font_size = 1.0;
-    defaults.font_color = color_black;
-    defaults.start_time = 0.0;
-    defaults.end_time = 20.0;
-    defaults.rise_time = .3; 
-    defaults.fall_time = .3;
-    defaults.color = color_black;
-    defaults.main_lwidth = .1;
-    defaults.data_lwidth = .1;
-    defaults.data_color.red = 1.0;
-    defaults.data_color.green = 0.0;
-    defaults.data_color.blue = 0.0;
-    defaults.multibit = FALSE;
-
-    defaults_initialized = 1;
-  }
+chronoline_get_props(Chronoline *chronoline, Property *props, guint nprops)
+{  
+  object_get_props_from_offsets(&chronoline->element.object,
+                                chronoline_offsets,props,nprops);
 }
 
-static GtkWidget *
-chronoline_get_defaults(void)
+static void
+chronoline_set_props(Chronoline *chronoline, Property *props, guint nprops)
 {
-  ChronolineDefaultsDialog *dlg = chronoline_defaults_dialog;
-
-  chronoline_init_defaults();
-  PROPDLG_CREATE(dlg, &defaults);
-  PROPDLG_NOTEBOOK_CREATE(dlg,notebook);
-  PROPDLG_PAGE_CREATE(dlg,notebook,aspect_page,_("Aspect"));
-  PROPDLG_PAGE_CREATE(dlg,notebook,parameter_page,_("Parameters"));
-
-  PROPDLG_SHOW_REAL(dlg->parameter_page,start_time,_("Start time:"),
-		    -32767.0,32768.0,0.1);
-  PROPDLG_SHOW_REAL(dlg->parameter_page,end_time,_("End time:"),
-		    -32767.0,32768.0,0.1);
-  PROPDLG_SHOW_REAL(dlg->parameter_page,rise_time,_("Rise time:"),
-		    0.0,1000.0,.1);
-  PROPDLG_SHOW_REAL(dlg->parameter_page,fall_time,_("Fall time:"),
-		    0.0,1000.0,.1);
-  PROPDLG_SHOW_BOOL(dlg->parameter_page,multibit,_("Multi-bit data"));
-
-
-  PROPDLG_SHOW_COLOR(dlg->aspect_page,data_color,_("Data color:"));
-  PROPDLG_SHOW_REAL(dlg->aspect_page,data_lwidth,_("Data line width:"),
-		    0.0,10.0,0.1);
-  PROPDLG_SHOW_COLOR(dlg->aspect_page,color,_("Line color:"));
-  PROPDLG_SHOW_REAL(dlg->aspect_page,main_lwidth,_("Line width:"),
-		    0.0,10.0,0.1);
-  PROPDLG_SHOW_FONT(dlg->aspect_page,font,_("Font:"));
-  PROPDLG_SHOW_FONTHEIGHT(dlg->aspect_page,font_size,_("Font size:"));
-  PROPDLG_SHOW_COLOR(dlg->aspect_page,font_color,_("Font color:"));
-
-  PROPDLG_PAGE_READY(dlg,notebook,parameter_page);
-  PROPDLG_PAGE_READY(dlg,notebook,aspect_page);
-  PROPDLG_NOTEBOOK_READY(dlg,notebook);
-  PROPDLG_READY(dlg);
-  chronoline_defaults_dialog = dlg;
-
-  PROPDLG_RETURN(dlg);
+  object_set_props_from_offsets(&chronoline->element.object,
+                                chronoline_offsets,props,nprops);
+  chronoline_update_data(chronoline);
 }
 
 static real
@@ -658,89 +467,6 @@ chronoline_draw(Chronoline *chronoline, Renderer *renderer)
 			     &chronoline->color);
 }
 
-static void
-chronoline_free_state(ObjectState *objstate)
-{
-  ChronolineState *state G_GNUC_UNUSED= (ChronolineState *)objstate;
-
-  OBJECT_FREE_STRING(state,name);
-  OBJECT_FREE_STRING(state,events);
-
-  OBJECT_FREE_REAL(state,start_time);
-  OBJECT_FREE_REAL(state,end_time);
-
-  OBJECT_FREE_REAL(state,rise_time);
-  OBJECT_FREE_REAL(state,fall_time);
-
-  OBJECT_FREE_BOOL(state,multibit);
-
-  OBJECT_FREE_REAL(state,data_lwidth);
-  OBJECT_FREE_COLOR(state,data_color);
-  OBJECT_FREE_REAL(state,main_lwidth);
-  OBJECT_FREE_COLOR(state,color);
-
-  OBJECT_FREE_FONT(state,font);
-  OBJECT_FREE_FONTHEIGHT(state,font_size);
-  OBJECT_FREE_COLOR(state,font_color);
-}
-
-static ChronolineState *
-chronoline_get_state(Chronoline *chronoline)
-{
-  ChronolineState *state = g_new0(ChronolineState, 1);
-
-  state->obj_state.free = chronoline_free_state; 
-
-  OBJECT_GET_STRING(chronoline,state,name);
-  OBJECT_GET_STRING(chronoline,state,events);
-
-  OBJECT_GET_REAL(chronoline,state,start_time);
-  OBJECT_GET_REAL(chronoline,state,end_time);
-
-  OBJECT_GET_REAL(chronoline,state,rise_time);
-  OBJECT_GET_REAL(chronoline,state,fall_time);
-
-  OBJECT_GET_BOOL(chronoline,state,multibit);
-
-  OBJECT_GET_REAL(chronoline,state,data_lwidth);
-  OBJECT_GET_COLOR(chronoline,state,data_color);
-  OBJECT_GET_REAL(chronoline,state,main_lwidth);
-  OBJECT_GET_COLOR(chronoline,state,color);
-
-  OBJECT_GET_FONT(chronoline,state,font);
-  OBJECT_GET_FONTHEIGHT(chronoline,state,font_size);
-  OBJECT_GET_COLOR(chronoline,state,font_color);
-
-  return state;
-}
-
-static void
-chronoline_set_state(Chronoline *chronoline, ChronolineState *state)
-{
-  OBJECT_SET_STRING(chronoline,state,name);
-  OBJECT_SET_STRING(chronoline,state,events);
-
-  OBJECT_SET_REAL(chronoline,state,start_time);
-  OBJECT_SET_REAL(chronoline,state,end_time);
-
-  OBJECT_SET_REAL(chronoline,state,rise_time);
-  OBJECT_SET_REAL(chronoline,state,fall_time);
-
-  OBJECT_SET_BOOL(chronoline,state,multibit);
-
-  OBJECT_SET_REAL(chronoline,state,data_lwidth);
-  OBJECT_SET_COLOR(chronoline,state,data_color);
-  OBJECT_SET_REAL(chronoline,state,main_lwidth);
-  OBJECT_SET_COLOR(chronoline,state,color);
-
-  OBJECT_SET_FONT(chronoline,state,font);
-  OBJECT_SET_FONTHEIGHT(chronoline,state,font_size);
-  OBJECT_SET_COLOR(chronoline,state,font_color);
-
-  chronoline_update_data(chronoline);
-}
-
-
 inline static void grayify(Color *col,Color *src)
 {
   col->red = .5 * (src->red + color_white.red);
@@ -859,20 +585,6 @@ chronoline_update_data(Chronoline *chronoline)
   }
 }
 
-static void chronoline_alloc(Chronoline **chronoline,
-			    Element **elem,
-			    Object **obj)
-{
-  chronoline_init_defaults();
-
-  *chronoline = g_new0(Chronoline,1);
-  *elem = &((*chronoline)->element);
-
-  *obj = &((*chronoline)->element.object);
-  (*obj)->type = &chronoline_type;
-  (*obj)->ops = &chronoline_ops;
-}
-
 static Object *
 chronoline_create(Point *startpoint,
 	   void *user_data,
@@ -883,7 +595,12 @@ chronoline_create(Point *startpoint,
   Element *elem;
   Object *obj;
 
-  chronoline_alloc(&chronoline,&elem,&obj);
+  chronoline = g_new0(Chronoline,1);
+  elem = &(chronoline->element);
+
+  obj = &(chronoline->element.object);
+  obj->type = &chronoline_type;
+  obj->ops = &chronoline_ops;
 
   chronoline->snap = connpointline_create(obj,0); 
 
@@ -893,25 +610,22 @@ chronoline_create(Point *startpoint,
 
   element_init(elem, 8, 0);
 
-  OBJECT_GET_STRING(&defaults,chronoline,name);
-  OBJECT_GET_STRING(&defaults,chronoline,events);
-
-  OBJECT_GET_REAL(&defaults,chronoline,start_time);
-  OBJECT_GET_REAL(&defaults,chronoline,end_time);
-
-  OBJECT_GET_REAL(&defaults,chronoline,rise_time);
-  OBJECT_GET_REAL(&defaults,chronoline,fall_time);
-
-  OBJECT_GET_BOOL(&defaults,chronoline,multibit);
-
-  OBJECT_GET_REAL(&defaults,chronoline,data_lwidth);
-  OBJECT_GET_COLOR(&defaults,chronoline,data_color);
-  OBJECT_GET_REAL(&defaults,chronoline,main_lwidth);
-  OBJECT_GET_COLOR(&defaults,chronoline,color);
-
-  OBJECT_GET_FONT(&defaults,chronoline,font);
-  OBJECT_GET_FONTHEIGHT(&defaults,chronoline,font_size);
-  OBJECT_GET_COLOR(&defaults,chronoline,font_color);
+  chronoline->name = g_strdup("");
+  chronoline->events = g_strdup("");
+  chronoline->font = font_getfont("Helvetica");
+  chronoline->font_size = 1.0;
+  chronoline->font_color = color_black;
+  chronoline->start_time = 0.0;
+  chronoline->end_time = 20.0;
+  chronoline->rise_time = .3;
+  chronoline->fall_time = .3;
+  chronoline->color = color_black;
+  chronoline->main_lwidth = .1;
+  chronoline->data_lwidth = .1;
+  chronoline->data_color.red = 1.0;
+  chronoline->data_color.green = 0.0;
+  chronoline->data_color.blue = 0.0;
+  chronoline->multibit = FALSE;
   
   chronoline->evtlist = NULL;
   chronoline_update_data(chronoline);
@@ -921,7 +635,7 @@ chronoline_create(Point *startpoint,
   return &chronoline->element.object;
 }
 
-static void
+static void 
 chronoline_destroy(Chronoline *chronoline)
 {
   connpointline_destroy(chronoline->snap);
@@ -930,110 +644,8 @@ chronoline_destroy(Chronoline *chronoline)
 }
 
 static Object *
-chronoline_copy(Chronoline *chronoline)
-{
-  Chronoline *newchronoline;
-  Element *elem, *newelem;
-  Object *newobj, *obj;
-  int rcc = 0;
-
-  elem = &chronoline->element; 
-  obj = &elem->object;
-  chronoline_alloc(&newchronoline,&newelem,&newobj);
-  element_copy(elem, newelem);
-
-  newchronoline->snap = connpointline_copy(newobj,chronoline->snap,&rcc); 
-  g_assert(rcc == newobj->num_connections);
-
-
-  OBJECT_GET_STRING(chronoline,newchronoline,name);
-  OBJECT_GET_STRING(chronoline,newchronoline,events);
-
-  OBJECT_GET_REAL(chronoline,newchronoline,start_time);
-  OBJECT_GET_REAL(chronoline,newchronoline,end_time);
-
-  OBJECT_GET_REAL(chronoline,newchronoline,rise_time);
-  OBJECT_GET_REAL(chronoline,newchronoline,fall_time);
-
-  OBJECT_GET_BOOL(chronoline,newchronoline,multibit);
-
-  OBJECT_GET_REAL(chronoline,newchronoline,data_lwidth);
-  OBJECT_GET_COLOR(chronoline,newchronoline,data_color);
-  OBJECT_GET_REAL(chronoline,newchronoline,main_lwidth);
-  OBJECT_GET_COLOR(chronoline,newchronoline,color);
-
-  OBJECT_GET_FONT(chronoline,newchronoline,font);
-  OBJECT_GET_FONTHEIGHT(chronoline,newchronoline,font_size);
-  OBJECT_GET_COLOR(chronoline,newchronoline,font_color);
-
-  newchronoline->evtlist = NULL;
-
-  chronoline_update_data(newchronoline);
-
-  return &newchronoline->element.object;
-}
-
-
-static void
-chronoline_save(Chronoline *chronoline, ObjectNode obj_node, const char *filename)
-{
-  element_save(&chronoline->element, obj_node);
-
-  SAVE_STRING(obj_node,chronoline,name);
-  SAVE_STRING(obj_node,chronoline,events);
-
-  SAVE_REAL(obj_node,chronoline,start_time);
-  SAVE_REAL(obj_node,chronoline,end_time);
-
-  SAVE_REAL(obj_node,chronoline,rise_time);
-  SAVE_REAL(obj_node,chronoline,fall_time);
-
-  SAVE_BOOL(obj_node,chronoline,multibit);
-
-  SAVE_REAL(obj_node,chronoline,data_lwidth);
-  SAVE_COLOR(obj_node,chronoline,data_color);
-  SAVE_REAL(obj_node,chronoline,main_lwidth);
-  SAVE_COLOR(obj_node,chronoline,color);
-
-  SAVE_FONT(obj_node,chronoline,font);
-  SAVE_FONTHEIGHT(obj_node,chronoline,font_size);
-  SAVE_COLOR(obj_node,chronoline,font_color);
-}
-
-static Object *
 chronoline_load(ObjectNode obj_node, int version, const char *filename)
 {
-  Chronoline *chronoline;
-  Element *elem;
-  Object *obj;
-
-  chronoline_alloc(&chronoline,&elem,&obj);
-  chronoline->snap = connpointline_create(obj,0);
-
-  element_load(elem, obj_node);
-  element_init(elem, 8, 0);
-
-  LOAD_STRING(obj_node,chronoline,&defaults,name);
-  LOAD_STRING(obj_node,chronoline,&defaults,events);
-
-  LOAD_REAL(obj_node,chronoline,&defaults,start_time);
-  LOAD_REAL(obj_node,chronoline,&defaults,end_time);
-
-  LOAD_REAL(obj_node,chronoline,&defaults,rise_time);
-  LOAD_REAL(obj_node,chronoline,&defaults,fall_time);
-
-  LOAD_BOOL(obj_node,chronoline,&defaults,multibit);
-
-  LOAD_REAL(obj_node,chronoline,&defaults,data_lwidth);
-  LOAD_COLOR(obj_node,chronoline,&defaults,data_color);
-  LOAD_REAL(obj_node,chronoline,&defaults,main_lwidth);
-  LOAD_COLOR(obj_node,chronoline,&defaults,color);
-
-  LOAD_FONT(obj_node,chronoline,&defaults,font);
-  LOAD_FONTHEIGHT(obj_node,chronoline,&defaults,font_size);
-  LOAD_COLOR(obj_node,chronoline,&defaults,font_color);
-
-  chronoline_update_data(chronoline);
-
-  return &chronoline->element.object;
+  return object_load_using_properties(&chronoline_type,
+                                      obj_node,version,filename);  
 }

--- a/objects/chronogram/chronoref.c
+++ b/objects/chronogram/chronoref.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1998 Alexander Larsson
  *
  * Chronogram objects support
- * Copyright (C) 2000 Cyrille Chepelov 
+ * Copyright (C) 2000, 2001 Cyrille Chepelov 
  * 
  * Ultimately forked from Flowchart toolbox -- objects for drawing flowcharts.
  * Copyright (C) 1999 James Henstridge.
@@ -51,29 +51,7 @@
 #define DEFAULT_WIDTH 7.0
 #define DEFAULT_HEIGHT 5.0
 
-typedef struct _Chronoref Chronoref;
-typedef struct _ChronorefPropertiesDialog ChronorefPropertiesDialog;
-typedef struct _ChronorefDefaultsDialog ChronorefDefaultsDialog;
-typedef struct _ChronorefState ChronorefState;
-typedef struct _ChronorefDefaults ChronorefDefaults;
-
-struct _ChronorefState {
-  ObjectState obj_state;
-
-  real main_lwidth;
-  real light_lwidth;
-  Color color;
-  real start_time;
-  real end_time;
-  real time_step;
-  real time_lstep;
-  
-  Font *font;
-  real font_size;
-  Color font_color;
-};
-
-struct _Chronoref {
+typedef struct _Chronoref {
   Element element;
 
   real main_lwidth;
@@ -94,59 +72,7 @@ struct _Chronoref {
   real firstmaj,firstmin; /* in time units */
   real firstmaj_x,firstmin_x,majgrad,mingrad; /* in dia graphic units */
   char spec[10];
-};
-
-struct _ChronorefPropertiesDialog {
-  AttributeDialog dialog;
-  Chronoref *parent;
-
-  RealAttribute main_lwidth;
-  RealAttribute light_lwidth;
-  ColorAttribute color;
-  RealAttribute start_time;
-  RealAttribute end_time;
-  RealAttribute time_step;
-  RealAttribute time_lstep;
-  
-  FontAttribute font;
-  FontHeightAttribute font_size;
-  ColorAttribute font_color;
-};
-
-struct _ChronorefDefaults {
-  real main_lwidth;
-  real light_lwidth;
-  Color color;
-  real start_time;
-  real end_time;
-  real time_step;
-  real time_lstep;
-  
-  Font *font;
-  real font_size;
-  Color font_color;
-};
-
-struct _ChronorefDefaultsDialog {
-  AttributeDialog dialog;
-  ChronorefDefaults *parent;
-
-  RealAttribute main_lwidth;
-  RealAttribute light_lwidth;
-  ColorAttribute color;
-  RealAttribute start_time;
-  RealAttribute end_time;
-  RealAttribute time_step;
-  RealAttribute time_lstep;
-  
-  FontAttribute font;
-  FontHeightAttribute font_size;
-  ColorAttribute font_color;
-};
-
-static ChronorefPropertiesDialog *chronoref_properties_dialog;
-static ChronorefDefaultsDialog *chronoref_defaults_dialog;
-static ChronorefDefaults defaults;
+} Chronoref;
 
 static real chronoref_distance_from(Chronoref *chronoref, Point *point);
 static void chronoref_select(Chronoref *chronoref, Point *clicked_point,
@@ -162,27 +88,23 @@ static Object *chronoref_create(Point *startpoint,
 			  Handle **handle1,
 			  Handle **handle2);
 static void chronoref_destroy(Chronoref *chronoref);
-static Object *chronoref_copy(Chronoref *chronoref);
-static PROPDLG_TYPE chronoref_get_properties(Chronoref *chronoref);
-static ObjectChange *chronoref_apply_properties(Chronoref *chronoref);
-
-static ChronorefState *chronoref_get_state(Chronoref *chronoref);
-static void chronoref_set_state(Chronoref *chronoref, ChronorefState *state);
+static Object *chronoref_load(ObjectNode obj_node, int version, 
+                              const char *filename);
+static PropDescription *chronoref_describe_props(Chronoref *chronoref);
+static void chronoref_get_props(Chronoref *chronoref, 
+                                 Property *props, guint nprops);
+static void chronoref_set_props(Chronoref *chronoref, 
+                                 Property *props, guint nprops);
 
-static void chronoref_save(Chronoref *chronoref, ObjectNode obj_node, const char *filename);
-static Object *chronoref_load(ObjectNode obj_node, int version, const char *filename);
-static PROPDLG_TYPE chronoref_get_defaults(void);
-static void chronoref_apply_defaults(void);
-static void chronoref_free_state(ObjectState *objstate);
 
 
 static ObjectTypeOps chronoref_type_ops =
 {
   (CreateFunc) chronoref_create,
-  (LoadFunc)   chronoref_load,
-  (SaveFunc)   chronoref_save,
-  (GetDefaultsFunc)   chronoref_get_defaults,
-  (ApplyDefaultsFunc) chronoref_apply_defaults
+  (LoadFunc)   chronoref_load/*using properties*/,
+  (SaveFunc)   object_save_using_properties,
+  (GetDefaultsFunc)   NULL,
+  (ApplyDefaultsFunc) NULL
 };
 
 ObjectType chronoref_type =
@@ -194,141 +116,92 @@ ObjectType chronoref_type =
   &chronoref_type_ops      /* ops */
 };
 
+
 static ObjectOps chronoref_ops = {
   (DestroyFunc)         chronoref_destroy,
   (DrawFunc)            chronoref_draw,
   (DistanceFunc)        chronoref_distance_from,
   (SelectFunc)          chronoref_select,
-  (CopyFunc)            chronoref_copy,
+  (CopyFunc)            object_copy_using_properties,
   (MoveFunc)            chronoref_move,
   (MoveHandleFunc)      chronoref_move_handle,
-  (GetPropertiesFunc)   chronoref_get_properties,
-  (ApplyPropertiesFunc) chronoref_apply_properties,
+  (GetPropertiesFunc)   object_create_props_dialog,
+  (ApplyPropertiesFunc) object_apply_props_from_dialog,
   (ObjectMenuFunc)      NULL,
+  (DescribePropsFunc)   chronoref_describe_props,
+  (GetPropsFunc)        chronoref_get_props,
+  (SetPropsFunc)        chronoref_set_props
 };
 
-static ObjectChange *
-chronoref_apply_properties(Chronoref *chronoref)
-{
-  ObjectState *old_state;
-  ChronorefPropertiesDialog *dlg = chronoref_properties_dialog;
-
-  PROPDLG_SANITY_CHECK(dlg,chronoref);
-
-  old_state = (ObjectState *)chronoref_get_state(chronoref);
-
-  PROPDLG_APPLY_REAL(dlg,start_time);
-  PROPDLG_APPLY_REAL(dlg,end_time);
-
-  PROPDLG_APPLY_REAL(dlg,time_step);
-  PROPDLG_APPLY_REAL(dlg,time_lstep);
-
-  PROPDLG_APPLY_COLOR(dlg,color);
-  PROPDLG_APPLY_REAL(dlg,main_lwidth);
-  PROPDLG_APPLY_REAL(dlg,light_lwidth);
-  PROPDLG_APPLY_FONT(dlg,font);
-  PROPDLG_APPLY_FONTHEIGHT(dlg,font_size);
-  PROPDLG_APPLY_COLOR(dlg,font_color);
-  
-  /* time_lstep should probably be a multiplier of time_step, but the user
-     is sovereign. */
-  chronoref_update_data(chronoref);
-  return new_object_state_change(&chronoref->element.object, 
-                                 old_state, 
-				 (GetStateFunc)chronoref_get_state,
-				 (SetStateFunc)chronoref_set_state);
-}
+static PropNumData time_range = { -32767.0, 32768.0, 0.1};
+static PropNumData step_range = { 0.0, 1000.0, 0.1};
+
+static PropDescription chronoref_props[] = {
+  ELEMENT_COMMON_PROPERTIES,
+  { "start_time",PROP_TYPE_REAL,PROP_FLAG_VISIBLE,
+    N_("Start time"),NULL,&time_range},
+  { "end_time",PROP_TYPE_REAL,PROP_FLAG_VISIBLE,
+    N_("End time"),NULL,&time_range},
+  { "time_step",PROP_TYPE_REAL,PROP_FLAG_VISIBLE,
+    N_("Major time step"),NULL,&step_range},
+  { "time_lstep",PROP_TYPE_REAL,PROP_FLAG_VISIBLE,
+    N_("Minor time step"),NULL,&step_range},
+
+  { "color", PROP_TYPE_COLOUR, PROP_FLAG_VISIBLE,
+    N_("Line color"),NULL},
+  { "main_lwidth", PROP_TYPE_REAL, PROP_FLAG_VISIBLE,
+    N_("Line width"),NULL, &prop_std_line_width_data},
+  { "light_lwidth", PROP_TYPE_REAL, PROP_FLAG_VISIBLE,
+    N_("Minor step line width"),NULL, &prop_std_line_width_data},
+
+  { "font", PROP_TYPE_FONT, PROP_FLAG_VISIBLE, N_("Font"), NULL, NULL },
+  { "font_size", PROP_TYPE_REAL, PROP_FLAG_VISIBLE,
+    N_("Font size"), NULL, &prop_std_text_height_data },
+  { "font_color", PROP_TYPE_COLOUR, PROP_FLAG_VISIBLE,
+    N_("Text colour"), NULL, NULL },
+
+  {NULL}
+};
 
-static PROPDLG_TYPE
-chronoref_get_properties(Chronoref *chronoref)
-{
-  ChronorefPropertiesDialog *dlg = chronoref_properties_dialog;
-  
-  PROPDLG_CREATE(dlg,chronoref);
-  
-  PROPDLG_SHOW_REAL(dlg,start_time,_("Start time:"),-32767.0,32768.0,0.1);
-  PROPDLG_SHOW_REAL(dlg,end_time,_("End time:"),-32767.0,32768.0,0.1);
-  PROPDLG_SHOW_SEPARATOR(dlg);
-  PROPDLG_SHOW_REAL(dlg,time_step,_("Major time step:"),0.1,1000.0,0.1);
-  PROPDLG_SHOW_REAL(dlg,time_lstep,_("Minor time step:"),0.1,1000.0,0.1);
-  PROPDLG_SHOW_SEPARATOR(dlg);
-  PROPDLG_SHOW_COLOR(dlg,color,_("Line color:"));
-  PROPDLG_SHOW_REAL(dlg,main_lwidth,_("Line width:"),0.0,10.0,0.1);
-  PROPDLG_SHOW_REAL(dlg,light_lwidth,_("Minor step line width:"),
-		     0.0,10.0,0.1);
-  PROPDLG_SHOW_FONT(dlg,font,_("Font:"));
-  PROPDLG_SHOW_FONTHEIGHT(dlg,font_size,_("Font size:"));
-  PROPDLG_SHOW_COLOR(dlg,font_color,_("Font color:"));
-
-  PROPDLG_READY(dlg);
-  chronoref_properties_dialog = dlg;
-
-  PROPDLG_RETURN(dlg);
-}
-static void
-chronoref_apply_defaults(void)
+static PropDescription *
+chronoref_describe_props(Chronoref *chronoref) 
 {
-  ChronorefDefaultsDialog *dlg = chronoref_defaults_dialog;
-  PROPDLG_APPLY_REAL(dlg,start_time);
-  PROPDLG_APPLY_REAL(dlg,end_time);
-
-  PROPDLG_APPLY_REAL(dlg,time_step);
-  PROPDLG_APPLY_REAL(dlg,time_lstep);
-
-  PROPDLG_APPLY_COLOR(dlg,color);
-  PROPDLG_APPLY_REAL(dlg,main_lwidth);
-  PROPDLG_APPLY_REAL(dlg,light_lwidth);
-  PROPDLG_APPLY_FONT(dlg,font);
-  PROPDLG_APPLY_FONTHEIGHT(dlg,font_size);
-  PROPDLG_APPLY_COLOR(dlg,font_color);
-
-}
+  if (chronoref_props[0].quark == 0) {
+    prop_desc_list_calculate_quarks(chronoref_props);
+  }
+  return chronoref_props;
+}    
+
+static PropOffset chronoref_offsets[] = {
+  ELEMENT_COMMON_PROPERTIES_OFFSETS,
+
+  { "start_time",PROP_TYPE_REAL, offsetof(Chronoref,start_time)},
+  { "end_time",PROP_TYPE_REAL, offsetof(Chronoref,end_time)},
+  { "time_step",PROP_TYPE_REAL, offsetof(Chronoref,time_step)},
+  { "time_lstep",PROP_TYPE_REAL, offsetof(Chronoref,time_lstep)},
+  { "color", PROP_TYPE_COLOUR, offsetof(Chronoref,color)},
+  { "main_lwidth", PROP_TYPE_REAL, offsetof(Chronoref,main_lwidth)},
+  { "light_lwidth", PROP_TYPE_REAL, offsetof(Chronoref,light_lwidth)},
+  { "font", PROP_TYPE_FONT, offsetof(Chronoref,font)},
+  { "font_size", PROP_TYPE_REAL, offsetof(Chronoref,font_size)},
+  { "font_color", PROP_TYPE_COLOUR, offsetof(Chronoref,font_color)},
+
+  {NULL}
+};
 
 static void
-chronoref_init_defaults() {
-  static int defaults_initialized = 0;
-
-  if (!defaults_initialized) {
-    defaults.font = font_getfont("Helvetica");
-    defaults.font_size = 1.0;
-    defaults.font_color = color_black;
-    defaults.start_time = 0.0;
-    defaults.end_time = 20.0;
-    defaults.time_step = 5.0;
-    defaults.time_lstep = 1.0;
-    defaults.color = color_black;
-    defaults.main_lwidth = .1;
-    defaults.light_lwidth = .05;
-
-    defaults_initialized = 1;
-  }
+chronoref_get_props(Chronoref *chronoref, Property *props, guint nprops)
+{  
+  object_get_props_from_offsets(&chronoref->element.object,
+                                chronoref_offsets,props,nprops);
 }
 
-static GtkWidget *
-chronoref_get_defaults(void)
+static void
+chronoref_set_props(Chronoref *chronoref, Property *props, guint nprops)
 {
-  ChronorefDefaultsDialog *dlg = chronoref_defaults_dialog;
-
-  chronoref_init_defaults();
-  PROPDLG_CREATE(dlg, &defaults);
-  PROPDLG_SHOW_REAL(dlg,start_time,_("Start time:"),-32767.0,32768.0,0.1);
-  PROPDLG_SHOW_REAL(dlg,end_time,_("End time:"),-32767.0,32768.0,0.1);
-  PROPDLG_SHOW_SEPARATOR(dlg);
-  PROPDLG_SHOW_REAL(dlg,time_step,_("Major time step:"),0.1,1000.0,0.1);
-  PROPDLG_SHOW_REAL(dlg,time_lstep,_("Minor time step:"),0.1,1000.0,0.1);
-  PROPDLG_SHOW_SEPARATOR(dlg);
-  PROPDLG_SHOW_COLOR(dlg,color,_("Line color:"));
-  PROPDLG_SHOW_REAL(dlg,main_lwidth,_("Line width:"),0.0,10.0,0.1);
-  PROPDLG_SHOW_REAL(dlg,light_lwidth,_("Minor step line width:"),
-		     0.0,10.0,0.1);
-  PROPDLG_SHOW_FONT(dlg,font,_("Font:"));
-  PROPDLG_SHOW_FONTHEIGHT(dlg,font_size,_("Font size:"));
-  PROPDLG_SHOW_COLOR(dlg,font_color,_("Font color:"));
-
-  PROPDLG_READY(dlg);
-  chronoref_defaults_dialog = dlg;
-
-  PROPDLG_RETURN(dlg);
+  object_set_props_from_offsets(&chronoref->element.object,
+                                chronoref_offsets,props,nprops);
+  chronoref_update_data(chronoref);
 }
 
 static real
@@ -425,62 +298,6 @@ chronoref_draw(Chronoref *chronoref, Renderer *renderer)
 }
 
 static void
-chronoref_free_state(ObjectState *objstate)
-{
-  ChronorefState *state G_GNUC_UNUSED= (ChronorefState *)objstate;
-  /* actually a useless function ; just a demonstrator. */
-  OBJECT_FREE_REAL(state,main_lwidth);
-  OBJECT_FREE_REAL(state,light_lwidth);
-  OBJECT_FREE_COLOR(state,color);
-  OBJECT_FREE_REAL(state,start_time);
-  OBJECT_FREE_REAL(state,end_time);
-  OBJECT_FREE_REAL(state,time_step);
-  OBJECT_FREE_REAL(state,time_lstep);
-  OBJECT_FREE_FONT(state,font);
-  OBJECT_FREE_FONTHEIGHT(state,font_size);
-  OBJECT_FREE_COLOR(state,font_color);
-}
-
-static ChronorefState *
-chronoref_get_state(Chronoref *chronoref)
-{
-  ChronorefState *state = g_new0(ChronorefState, 1);
-
-  state->obj_state.free = chronoref_free_state; 
-
-  OBJECT_GET_REAL(chronoref,state,main_lwidth);
-  OBJECT_GET_REAL(chronoref,state,light_lwidth);
-  OBJECT_GET_COLOR(chronoref,state,color);
-  OBJECT_GET_REAL(chronoref,state,start_time);
-  OBJECT_GET_REAL(chronoref,state,end_time);
-  OBJECT_GET_REAL(chronoref,state,time_step);
-  OBJECT_GET_REAL(chronoref,state,time_lstep);
-  OBJECT_GET_FONT(chronoref,state,font);
-  OBJECT_GET_FONTHEIGHT(chronoref,state,font_size);
-  OBJECT_GET_COLOR(chronoref,state,font_color);
-
-  return state;
-}
-
-static void
-chronoref_set_state(Chronoref *chronoref, ChronorefState *state)
-{
-  OBJECT_SET_REAL(chronoref,state,main_lwidth);
-  OBJECT_SET_REAL(chronoref,state,light_lwidth);
-  OBJECT_SET_COLOR(chronoref,state,color);
-  OBJECT_SET_REAL(chronoref,state,start_time);
-  OBJECT_SET_REAL(chronoref,state,end_time);
-  OBJECT_SET_REAL(chronoref,state,time_step);
-  OBJECT_SET_REAL(chronoref,state,time_lstep);
-  OBJECT_SET_FONT(chronoref,state,font);
-  OBJECT_SET_FONTHEIGHT(chronoref,state,font_size);
-  OBJECT_SET_COLOR(chronoref,state,font_color);
-
-  chronoref_update_data(chronoref);
-}
-
-
-static void
 chronoref_update_data(Chronoref *chronoref)
 {
   Element *elem = &chronoref->element;
@@ -569,20 +386,6 @@ chronoref_update_data(Chronoref *chronoref)
   connpointline_putonaline(chronoref->scale,&p1,&p2);
 }
 
-static void chronoref_alloc(Chronoref **chronoref,
-			    Element **elem,
-			    Object **obj)
-{
-  chronoref_init_defaults();
-
-  *chronoref = g_new0(Chronoref,1);
-  *elem = &((*chronoref)->element);
-
-  *obj =  &((*chronoref)->element.object);
-  (*obj)->type = &chronoref_type;
-  (*obj)->ops = &chronoref_ops;
-}
-
 static Object *
 chronoref_create(Point *startpoint,
 	   void *user_data,
@@ -593,7 +396,12 @@ chronoref_create(Point *startpoint,
   Element *elem;
   Object *obj;
 
-  chronoref_alloc(&chronoref,&elem,&obj);
+  chronoref = g_new0(Chronoref,1);
+  elem = &(chronoref->element);
+
+  obj =  &(chronoref->element.object);
+  obj->type = &chronoref_type;
+  obj->ops = &chronoref_ops;
 
   chronoref->scale = connpointline_create(obj,0); 
 
@@ -603,17 +411,17 @@ chronoref_create(Point *startpoint,
 
   element_init(elem, 8, 0);
 
-  OBJECT_GET_REAL(&defaults,chronoref,main_lwidth);
-  OBJECT_GET_REAL(&defaults,chronoref,light_lwidth);
-  OBJECT_GET_COLOR(&defaults,chronoref,color);
-  OBJECT_GET_REAL(&defaults,chronoref,start_time);
-  OBJECT_GET_REAL(&defaults,chronoref,end_time);
-  OBJECT_GET_REAL(&defaults,chronoref,time_step);
-  OBJECT_GET_REAL(&defaults,chronoref,time_lstep);
-  OBJECT_GET_FONT(&defaults,chronoref,font);
-  OBJECT_GET_FONTHEIGHT(&defaults,chronoref,font_size);
-  OBJECT_GET_COLOR(&defaults,chronoref,font_color);
-  
+  chronoref->font = font_getfont("Helvetica");
+  chronoref->font_size = 1.0;
+  chronoref->font_color = color_black;
+  chronoref->start_time = 0.0;
+  chronoref->end_time = 20.0;
+  chronoref->time_step = 5.0;
+  chronoref->time_lstep = 1.0;
+  chronoref->color = color_black;
+  chronoref->main_lwidth = .1;
+  chronoref->light_lwidth = .05;
+
   chronoref_update_data(chronoref);
 
   *handle1 = NULL;
@@ -629,80 +437,8 @@ chronoref_destroy(Chronoref *chronoref)
 }
 
 static Object *
-chronoref_copy(Chronoref *chronoref)
-{
-  Chronoref *newchronoref;
-  Element *elem, *newelem;
-  Object *newobj, *obj;
-  int rcc = 0;
-
-  elem = &chronoref->element; 
-  obj = &elem->object;
-  chronoref_alloc(&newchronoref,&newelem,&newobj);
-  element_copy(elem, newelem);
-
-  newchronoref->scale = connpointline_copy(newobj,chronoref->scale,&rcc); 
-  g_assert(rcc == newobj->num_connections);
-
-  OBJECT_GET_REAL(chronoref,newchronoref,main_lwidth);
-  OBJECT_GET_REAL(chronoref,newchronoref,light_lwidth);
-  OBJECT_GET_COLOR(chronoref,newchronoref,color);
-  OBJECT_GET_REAL(chronoref,newchronoref,start_time);
-  OBJECT_GET_REAL(chronoref,newchronoref,end_time);
-  OBJECT_GET_REAL(chronoref,newchronoref,time_step);
-  OBJECT_GET_REAL(chronoref,newchronoref,time_lstep);
-  OBJECT_GET_FONT(chronoref,newchronoref,font);
-  OBJECT_GET_FONTHEIGHT(chronoref,newchronoref,font_size);
-  OBJECT_GET_COLOR(chronoref,newchronoref,font_color);
-  
-  chronoref_update_data(newchronoref);
-
-  return &newchronoref->element.object;
-}
-
-
-static void
-chronoref_save(Chronoref *chronoref, ObjectNode obj_node, const char *filename)
-{
-  element_save(&chronoref->element, obj_node);
-
-  SAVE_REAL(obj_node,chronoref,main_lwidth);
-  SAVE_REAL(obj_node,chronoref,light_lwidth);
-  SAVE_COLOR(obj_node,chronoref,color);
-  SAVE_REAL(obj_node,chronoref,start_time);
-  SAVE_REAL(obj_node,chronoref,end_time);
-  SAVE_REAL(obj_node,chronoref,time_step);
-  SAVE_REAL(obj_node,chronoref,time_lstep);
-  SAVE_FONT(obj_node,chronoref,font);
-  SAVE_FONTHEIGHT(obj_node,chronoref,font_size);
-  SAVE_COLOR(obj_node,chronoref,font_color);
-}
-
-static Object *
 chronoref_load(ObjectNode obj_node, int version, const char *filename)
 {
-  Chronoref *chronoref;
-  Element *elem;
-  Object *obj;
-
-  chronoref_alloc(&chronoref,&elem,&obj);
-  chronoref->scale = connpointline_create(obj,0);
-
-  element_load(elem, obj_node);
-  element_init(elem, 8, 0);
-
-  LOAD_REAL(obj_node,chronoref,&defaults,main_lwidth);
-  LOAD_REAL(obj_node,chronoref,&defaults,light_lwidth);
-  LOAD_COLOR(obj_node,chronoref,&defaults,color);
-  LOAD_REAL(obj_node,chronoref,&defaults,start_time);
-  LOAD_REAL(obj_node,chronoref,&defaults,end_time);
-  LOAD_REAL(obj_node,chronoref,&defaults,time_step);
-  LOAD_REAL(obj_node,chronoref,&defaults,time_lstep);
-  LOAD_FONT(obj_node,chronoref,&defaults,font);
-  LOAD_FONTHEIGHT(obj_node,chronoref,&defaults,font_size);
-  LOAD_COLOR(obj_node,chronoref,&defaults,font_color);
-
-  chronoref_update_data(chronoref);
-
-  return &chronoref->element.object;
+  return object_load_using_properties(&chronoref_type,
+                                      obj_node,version,filename);  
 }