mono
/
diacanvas-sharp
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

* sources/dia-sharp.sources: 

* sources/makefile:
        * PROBLEMS:
        * README:
        * api/dia-api.xml: Target latest cvs version of diacanvas2
        * patches/*.diff: Rearranged patches, a dir
          for each software and version of it that
          has been modified.
        * patches/dia-storage.h.diff: Fix for comments next to parameters.
        * patches/acinclude.m4.diff: Fix for not finding python 2.3
        * sources/Dia.Metadata: Fixed nameclashes

svn path=/trunk/diacanvas-sharp/; revision=17116
This commit is contained in:
Martin Willemoes Hansen 2003-08-06 10:46:59 +00:00
Родитель 9cea5feac7
Коммит 27d66816d3
23 изменённых файлов: 779 добавлений и 56 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
ChangeLog
Просмотреть файл

@ -1,3 +1,17 @@
2003-08-06 Martin Willemoes Hansen <mwh@sysrq.dk>
* sources/dia-sharp.sources:
* sources/makefile:
* PROBLEMS:
* README:
* api/dia-api.xml: Target latest cvs version of diacanvas2
* patches/*.diff: Rearranged patches, a dir
for each software and version of it that
has been modified.
* patches/dia-storage.h.diff: Fix for comments next to parameters.
* patches/acinclude.m4.diff: Fix for not finding python 2.3
* sources/Dia.Metadata: Fixed nameclashes
2003-07-31 Martin Willemoes Hansen <mwh@sysrq.dk>
* Upgraded to latest gtk# cvs

3
PROBLEMS
Просмотреть файл

@ -29,6 +29,9 @@ Property has unknown Type DiaCanvasItemHandles in Object Dia.CanvasItem
Defined in diatypes.c and diacanvas.h
Maybe make a real type in c or make a manual wrapper class in C#
Field has unknown Type GDestroyNotify
Part of GObject, probably not wraped.
================================================================================

8
README
Просмотреть файл

@ -1,3 +1,11 @@
=============
Requirenments
=============
mono-0.25
Latest gtk-sharp from CVS
Latest diacanvas2 from CVS
====
Make
====

645
api/dia-api.xml
Просмотреть файл

@ -23,9 +23,13 @@
<member cname="DIA_COMPOSITE" name="Composite" value="1 &lt;&lt; 2"/>
<member cname="DIA_NEED_UPDATE" name="NeedUpdate" value="1 &lt;&lt; 3"/>
<member cname="DIA_UPDATE_ALL" name="UpdateAll" value="1 &lt;&lt; 4"/>
<member cname="DIA_SELECT" name="Select" value="1 &lt;&lt; 8"/>
<member cname="DIA_FOCUS" name="Focus" value="1 &lt;&lt; 9"/>
<member cname="DIA_GRAB" name="Grab" value="1 &lt;&lt; 10"/>
</enum>
<enum name="CanvasItemUIStateFlags" cname="DiaCanvasItemUIStateFlags" type="enum">
<member cname="DIA_UI_STATE_UNSELECTED" name="Unselected"/>
<member cname="DIA_UI_STATE_SELECTED" name="Selected"/>
<member cname="DIA_UI_STATE_FOCUSED" name="Focused"/>
<member cname="DIA_UI_STATE_GRABBED" name="Grabbed"/>
<member cname="DIA_UI_STATE_UNCHANGED" name="Unchanged"/>
</enum>
<enum name="CapStyle" cname="DiaCapStyle" type="enum">
<member cname="DIA_CAP_BUTT" name="Butt"/>
@ -56,6 +60,8 @@
<member cname="DIA_EVENT_MOTION" name="Motion"/>
<member cname="DIA_EVENT_KEY_PRESS" name="KeyPress"/>
<member cname="DIA_EVENT_KEY_RELEASE" name="KeyRelease"/>
<member cname="DIA_EVENT_FOCUS_IN" name="FocusIn"/>
<member cname="DIA_EVENT_FOCUS_OUT" name="FocusOut"/>
</enum>
<enum name="FillStyle" cname="DiaFillStyle" type="enum">
<member cname="DIA_FILL_NONE" name="None"/>
@ -120,18 +126,92 @@
<parameter type="DiaShapeViewInfo*" name="item_info"/>
</parameters>
</callback>
<callback name="StorageFreeFunc" cname="DiaStorageFreeFunc">
<return-type type="void"/>
<parameters>
<parameter type="GtkArg*" name="value"/>
</parameters>
</callback>
<callback name="StorageLoadFunc" cname="DiaStorageLoadFunc">
<return-type type="gboolean"/>
<parameters>
<parameter type="DiaStorage*" name="storage"/>
<parameter type="DiaAttributeNode*" name="attr"/>
<parameter type="DiaPersistent*" name="object"/>
<parameter type="GtkArg*" name="value"/>
</parameters>
</callback>
<callback name="StorageSaveFunc" cname="DiaStorageSaveFunc">
<return-type type="gboolean"/>
<parameters>
<parameter type="DiaStorage*" name="storage"/>
<parameter type="DiaAttributeNode*" name="attr"/>
<parameter type="DiaPersistent*" name="object"/>
<parameter type="GtkArg*" name="value"/>
</parameters>
</callback>
<interface name="CanvasEditable" cname="DiaCanvasEditable">
<signal name="StartEditing" cname="start_editing" when="LAST">
<return-type type="void"/>
<parameters>
<parameter type="DiaCanvasEditable*" name="editable"/>
<parameter type="DiaShapeText*" name="text_shape"/>
</parameters>
</signal>
<signal name="EditingDone" cname="editing_done" when="LAST">
<return-type type="void"/>
<parameters>
<parameter type="DiaCanvasEditable*" name="editable"/>
<parameter type="DiaShapeText*" name="text_shape"/>
<parameter type="const-gchar*" name="new_text"/>
</parameters>
</signal>
<signal name="TextChanged" cname="text_changed" when="LAST">
<return-type type="void"/>
<parameters>
<parameter type="DiaCanvasEditable*" name="editable"/>
<parameter type="DiaShapeText*" name="text_shape"/>
<parameter type="const-gchar*" name="new_text"/>
<parameter type="DiaRectangle*" name="new_bounds"/>
</parameters>
</signal>
<method name="DoneEditing" cname="dia_canvas_editable_editing_done">
<return-type type="void"/>
<parameters>
<parameter type="DiaShapeText*" name="text_shape"/>
<parameter type="const-gchar*" name="new_text"/>
</parameters>
</method>
<method name="GetType" cname="dia_canvas_editable_get_type" shared="true">
<return-type type="GType"/>
</method>
<method name="EditingStart" cname="dia_canvas_editable_start_editing">
<return-type type="void"/>
<parameters>
<parameter type="DiaShapeText*" name="text_shape"/>
</parameters>
</method>
<method name="ChangeText" cname="dia_canvas_editable_text_changed">
<return-type type="void"/>
<parameters>
<parameter type="DiaShapeText*" name="text_shape"/>
<parameter type="const-gchar*" name="new_text"/>
<parameter type="DiaRectangle*" name="new_bounds"/>
</parameters>
</method>
</interface>
<interface name="CanvasGroupable" cname="DiaCanvasGroupable">
<signal name="Added" cname="add" when="LAST">
<return-type type="gboolean"/>
<parameters>
<parameter type="DiaCanvasItem*" name="group"/>
<parameter type="DiaCanvasGroupable*" name="group"/>
<parameter type="DiaCanvasItem*" name="item"/>
</parameters>
</signal>
<signal name="Removed" cname="remove" when="LAST">
<return-type type="gboolean"/>
<parameters>
<parameter type="DiaCanvasItem*" name="group"/>
<parameter type="DiaCanvasGroupable*" name="group"/>
<parameter type="DiaCanvasItem*" name="item"/>
</parameters>
</signal>
@ -191,10 +271,11 @@
</method>
</interface>
<object name="Canvas" cname="DiaCanvas" parent="GObject">
<field cname="static_extents" type="gboolean"/>
<field cname="snap_to_grid" type="gboolean"/>
<field cname="allow_undo" type="gboolean"/>
<field cname="in_undo" type="gboolean"/>
<field cname="static_extents" bits="1" type="gboolean"/>
<field cname="snap_to_grid" bits="1" type="gboolean"/>
<field cname="allow_undo" bits="1" type="gboolean"/>
<field cname="allow_state_requests" bits="1" type="gboolean"/>
<field cname="in_undo" bits="1" type="gboolean"/>
<field cname="extents" type="DiaRectangle"/>
<field cname="root" type="DiaCanvasItem*"/>
<field cname="interval_x" type="gdouble"/>
@ -231,6 +312,7 @@
<property name="SnapToGrid" cname="snap_to_grid" type="gboolean" readable="true" writeable="true"/>
<property name="StaticExtents" cname="static_extents" type="gboolean" readable="true" writeable="true"/>
<property name="Extents" cname="extents" type="DiaRectangle" readable="true" writeable="true"/>
<property name="AllowStateRequests" cname="allow_state_requests" type="gboolean" readable="true" writeable="true"/>
<property name="AllowUndo" cname="allow_undo" type="gboolean" readable="true" writeable="true"/>
<property name="GridIntX" cname="grid_int_x" type="gdouble" readable="true" writeable="true"/>
<property name="GridIntY" cname="grid_int_y" type="gdouble" readable="true" writeable="true"/>
@ -366,12 +448,24 @@
<return-type type="void"/>
</method>
</object>
<object name="CanvasBezier" cname="DiaCanvasBezier" parent="DiaCanvasItem">
<property name="BezierWidth" cname="bezier_width" type="gdouble" readable="true" writeable="true"/>
<property name="Color" cname="color" type="ulong" readable="true" writeable="true"/>
<property name="Cap" cname="cap" type="DiaCapStyle" readable="true" writeable="true"/>
<property name="Join" cname="join" type="DiaJoinStyle" readable="true" writeable="true"/>
<property name="AddPoint" cname="add_point" type="DiaPoint" writeable="true"/>
<method name="GetType" cname="dia_canvas_bezier_get_type" shared="true">
<return-type type="GType"/>
</method>
</object>
<object name="CanvasBox" cname="DiaCanvasBox" parent="DiaCanvasElement" disabledefaultconstructor="1">
<field cname="color" type="DiaColor"/>
<field cname="bg_color" type="DiaColor"/>
<field cname="line_width" type="gdouble"/>
<field cname="fill_color" type="DiaColor"/>
<field cname="border_width" type="gdouble"/>
<field cname="border" type="DiaShape*"/>
<property name="Color" cname="color" type="ulong" readable="true" writeable="true"/>
<property name="FillColor" cname="fill_color" type="ulong" readable="true" writeable="true"/>
<property name="BorderWidth" cname="border_width" type="gdouble" readable="true" writeable="true"/>
<property name="BgColor" cname="bg_color" type="ulong" readable="true" writeable="true"/>
<property name="LineWidth" cname="line_width" type="gdouble" readable="true" writeable="true"/>
<method name="GetType" cname="dia_canvas_box_get_type" shared="true">
@ -401,6 +495,17 @@
<return-type type="GType"/>
</method>
</object>
<object name="CanvasEllipse" cname="DiaCanvasEllipse" parent="DiaCanvasItem">
<field cname="width" type="gdouble"/>
<field cname="height" type="gdouble"/>
<field cname="line_width" type="gdouble"/>
<field cname="color" type="DiaColor"/>
<field cname="old_x" type="gdouble"/>
<field cname="old_y" type="gdouble"/>
<method name="GetType" cname="dia_canvas_ellipse_get_type" shared="true">
<return-type type="GtkType"/>
</method>
</object>
<object name="CanvasGroup" cname="DiaCanvasGroup" parent="DiaCanvasItem">
<field cname="children" type="GList*"/>
<implements>
@ -477,6 +582,13 @@
<parameter type="gint" name="new_state"/>
</parameters>
</signal>
<signal name="HasState" cname="has_state" when="LAST">
<return-type type="gboolean"/>
<parameters>
<parameter type="DiaCanvasItem*" name="item"/>
<parameter type="gint" name="state"/>
</parameters>
</signal>
<signal name="Event" cname="event" when="LAST">
<return-type type="gboolean"/>
<parameters>
@ -507,12 +619,12 @@
<parameter type="DiaHandle*" name="handle"/>
</parameters>
</signal>
<property name="PropParent" cname="prop_parent" type="DiaCanvasItem" readable="true" writeable="true"/>
<property name="PropVisible" cname="prop_visible" type="gboolean" readable="true" writeable="true"/>
<property name="PropConnect" cname="prop_connect" type="DiaHandle" writeable="true"/>
<property name="PropDisconnect" cname="prop_disconnect" type="DiaHandle" writeable="true"/>
<property name="PropAffine" cname="prop_affine" type="DiaAffine" readable="true" writeable="true"/>
<property name="PropHandles" cname="prop_handles" type="DiaCanvasItemHandles" readable="true" writeable="true"/>
<property name="Parent" cname="parent" type="DiaCanvasItem" readable="true" writeable="true"/>
<property name="Visible" cname="visible" type="gboolean" readable="true" writeable="true"/>
<property name="Connect" cname="connect" type="DiaHandle" writeable="true"/>
<property name="Disconnect" cname="disconnect" type="DiaHandle" writeable="true"/>
<property name="Affine" cname="affine" type="DiaAffine" readable="true" writeable="true"/>
<property name="Handles" cname="handles" type="DiaCanvasItemHandles" readable="true" writeable="true"/>
<method name="AffineGetType" cname="dia_canvas_item_affine_get_type" shared="true">
<return-type type="GType"/>
</method>
@ -552,7 +664,7 @@
<parameter type="gdouble*" name="y2"/>
</parameters>
</method>
<method name="Connect" cname="dia_canvas_item_connect">
<method name="MakeConnect" cname="dia_canvas_item_connect">
<return-type type="gboolean"/>
<parameters>
<parameter type="DiaHandle*" name="handle"/>
@ -566,7 +678,7 @@
<parameter ellipsis="true"/>
</parameters>
</method>
<method name="Disconnect" cname="dia_canvas_item_disconnect">
<method name="MakeDisconnect" cname="dia_canvas_item_disconnect">
<return-type type="gboolean"/>
<parameters>
<parameter type="DiaHandle*" name="handle"/>
@ -612,6 +724,18 @@
<method name="Invisible" cname="dia_canvas_item_invisible">
<return-type type="void"/>
</method>
<method name="IsFocused" cname="dia_canvas_item_is_focused">
<return-type type="gboolean"/>
</method>
<method name="IsGrabbed" cname="dia_canvas_item_is_grabbed">
<return-type type="gboolean"/>
</method>
<method name="IsSelected" cname="dia_canvas_item_is_selected">
<return-type type="gboolean"/>
</method>
<method name="IsVisible" cname="dia_canvas_item_is_visible">
<return-type type="gboolean"/>
</method>
<method name="Move" cname="dia_canvas_item_move">
<return-type type="void"/>
<parameters>
@ -702,7 +826,7 @@
<method name="UpdateNow" cname="dia_canvas_item_update_now">
<return-type type="void"/>
</method>
<method name="Visible" cname="dia_canvas_item_visible">
<method name="MakeVisible" cname="dia_canvas_item_visible">
<return-type type="void"/>
</method>
</object>
@ -781,7 +905,7 @@
<field cname="editable" type="gboolean"/>
<field cname="markup" type="gboolean"/>
<field cname="text_shape" type="DiaShape*"/>
<signal name="TextChanged" cname="text_changed" when="LAST">
<signal name="TextChanged" cname="text_changed" when="LAST" hidden="1">
<return-type type="void"/>
<parameters>
<parameter type="DiaCanvasText*" name="canvas_text"/>
@ -795,11 +919,14 @@
<property name="Height" cname="height" type="gdouble" readable="true" writeable="true"/>
<property name="Editable" cname="editable" type="gboolean" readable="true" writeable="true"/>
<property name="Markup" cname="markup" type="gboolean" readable="true" writeable="true"/>
<property name="WrapWord" cname="wrap-word" type="gboolean" readable="true" writeable="true"/>
<property name="WrapWord" cname="wrap_word" type="gboolean" readable="true" writeable="true"/>
<property name="Multiline" cname="multiline" type="gboolean" readable="true" writeable="true"/>
<property name="Color" cname="color" type="ulong" readable="true" writeable="true"/>
<property name="Alignment" cname="alignment" type="PangoAlignment" readable="true" writeable="true"/>
<property name="Layout" cname="layout" type="PangoLayout" readable="true"/>
<implements>
<interface cname="DiaCanvasEditable"/>
</implements>
<method name="GetType" cname="dia_canvas_text_get_type" shared="true">
<return-type type="GType"/>
</method>
@ -812,6 +939,10 @@
<field cname="selector" type="GnomeCanvasItem*"/>
<field cname="focus_item" type="DiaCanvasViewItem*"/>
<field cname="selected_items" type="GList*"/>
<field cname="text_view" type="GtkTextView*"/>
<field cname="edited_item" type="DiaCanvasViewItem*"/>
<field cname="edited_shape" type="DiaShapeText*"/>
<field cname="text_buffer_changed_id" type="guint"/>
<field cname="last_item" type="DiaCanvasViewItem*"/>
<field cname="old_x" type="gdouble"/>
<field cname="old_y" type="gdouble"/>
@ -845,6 +976,9 @@
<method name="AaNew" cname="dia_canvas_view_aa_new" shared="true">
<return-type type="GtkWidget*"/>
</method>
<method name="EditingDone" cname="dia_canvas_view_editing_done">
<return-type type="void"/>
</method>
<method name="FindViewItem" cname="dia_canvas_view_find_view_item">
<return-type type="DiaCanvasViewItem*"/>
<parameters>
@ -927,6 +1061,13 @@
<parameter type="gdouble" name="zoom"/>
</parameters>
</method>
<method name="StartEditing" cname="dia_canvas_view_start_editing">
<return-type type="void"/>
<parameters>
<parameter type="DiaCanvasViewItem*" name="item"/>
<parameter type="DiaShapeText*" name="text_shape"/>
</parameters>
</method>
<method name="Unselect" cname="dia_canvas_view_unselect">
<return-type type="void"/>
<parameters>
@ -945,8 +1086,11 @@
<field cname="gc" type="GdkGC*"/>
<field cname="n_handle_pos" type="guint"/>
<field cname="handle_pos" type="gint*"/>
<field cname="redraw_area" type="ArtUta*"/>
<field cname="event_time" type="guint32"/>
<property name="Item" cname="item" type="DiaCanvasItem" readable="true" writeable="true"/>
<property name="Interactive" cname="interactive" type="gboolean" readable="true" writeable="true"/>
<property name="Visible" cname="visible" type="gboolean" readable="true" writeable="true"/>
<method name="AddItems" cname="dia_canvas_view_item_add_items" shared="true">
<return-type type="void"/>
<parameters>
@ -954,6 +1098,12 @@
<parameter type="DiaCanvasItem*" name="item"/>
</parameters>
</method>
<method name="EmitEvent" cname="dia_canvas_view_item_emit_event">
<return-type type="gboolean"/>
<parameters>
<parameter type="DiaEvent*" name="event"/>
</parameters>
</method>
<method name="Foreach" cname="dia_canvas_view_item_foreach">
<return-type type="gint"/>
<parameters>
@ -964,12 +1114,18 @@
<method name="GetType" cname="dia_canvas_view_item_get_type" shared="true">
<return-type type="GtkType"/>
</method>
<method name="HasFocus" cname="dia_canvas_view_item_has_focus">
<method name="IsFocused" cname="dia_canvas_view_item_is_focused">
<return-type type="gboolean"/>
</method>
<method name="IsSelected" cname="dia_canvas_view_item_is_selected">
<return-type type="gboolean"/>
</method>
<method name="RequestRedrawUta" cname="dia_canvas_view_item_request_redraw_uta">
<return-type type="void"/>
<parameters>
<parameter type="ArtUta*" name="uta"/>
</parameters>
</method>
</object>
<object name="Constraint" cname="DiaConstraint" parent="GObject">
<field cname="immutable" type="guint"/>
@ -1081,6 +1237,12 @@
<parameter type="DiaHandle*" name="middle"/>
</parameters>
</method>
<method name="AddPointConstraint" cname="dia_handle_add_point_constraint">
<return-type type="void"/>
<parameters>
<parameter type="DiaHandle*" name="host"/>
</parameters>
</method>
<method name="DistanceI" cname="dia_handle_distance_i">
<return-type type="gdouble"/>
<parameters>
@ -1377,14 +1539,216 @@
</parameters>
</method>
</object>
<object name="Undo" cname="DiaUndo" parent="GObject">
<field cname="_priv" type="gpointer"/>
<method name="ClearRedo" cname="dia_undo_clear_redo">
<return-type type="void"/>
</method>
<method name="ClearUndo" cname="dia_undo_clear_undo">
<return-type type="void"/>
</method>
<method name="GetDepth" cname="dia_undo_get_depth">
<return-type type="guint"/>
</method>
<method name="GetMaxDepth" cname="dia_undo_get_max_depth">
<return-type type="guint"/>
</method>
<method name="GetRedoDepth" cname="dia_undo_get_redo_depth">
<return-type type="guint"/>
</method>
<method name="GetType" cname="dia_undo_get_type" shared="true">
<return-type type="GtkType"/>
</method>
<method name="Pop" cname="dia_undo_pop">
<return-type type="void"/>
</method>
<method name="PopRedo" cname="dia_undo_pop_redo">
<return-type type="void"/>
</method>
<method name="Preserve" cname="dia_undo_preserve">
<return-type type="void"/>
<parameters>
<parameter type="GObject*" name="object"/>
<parameter type="const-char*" name="property_name"/>
<parameter type="const-GValue*" name="value"/>
<parameter type="gboolean" name="last"/>
</parameters>
</method>
<method name="PreserveProperty" cname="dia_undo_preserve_property">
<return-type type="void"/>
<parameters>
<parameter type="GObject*" name="object"/>
<parameter type="const-char*" name="property_name"/>
</parameters>
</method>
<method name="PreservePropertyLast" cname="dia_undo_preserve_property_last">
<return-type type="void"/>
<parameters>
<parameter type="GObject*" name="object"/>
<parameter type="const-char*" name="property_name"/>
</parameters>
</method>
<method name="Push" cname="dia_undo_push">
<return-type type="void"/>
<parameters>
<parameter type="const-char*" name="optional_comment"/>
</parameters>
</method>
<method name="SetMaxDepth" cname="dia_undo_set_max_depth">
<return-type type="void"/>
<parameters>
<parameter type="guint" name="depth"/>
</parameters>
</method>
</object>
<object name="Persistent" cname="DiaPersistent" parent="GtkObject">
<field cname="id" type="DiaId"/>
<field cname="rev" type="DiaRev"/>
<field cname="conn_signals" type="GSList*"/>
<method name="GetType" cname="dia_persistent_get_type" shared="true">
<return-type type="GtkType"/>
</method>
<method name="MoveObject" cname="dia_persistent_move_object" shared="true">
<return-type type="gboolean"/>
<parameters>
<parameter type="DiaPersistentFactory*" name="factory"/>
<parameter type="DiaPersistentFactory*" name="dest"/>
<parameter type="DiaPersistent*" name="object"/>
</parameters>
</method>
<method name="SignalConnectFull" cname="dia_persistent_signal_connect_full">
<return-type type="void"/>
<parameters>
<parameter type="gchar*" name="name"/>
<parameter type="GtkSignalFunc" name="func"/>
<parameter type="gchar*" name="func_name"/>
<parameter type="DiaPersistent*" name="slot_object"/>
</parameters>
</method>
<method name="SignalDisconnectByFunc" cname="dia_persistent_signal_disconnect_by_func">
<return-type type="void"/>
<parameters>
<parameter type="GtkSignalFunc" name="func"/>
<parameter type="DiaPersistent*" name="slot_object"/>
</parameters>
</method>
<method name="SignalDisconnectByObject" cname="dia_persistent_signal_disconnect_by_object">
<return-type type="void"/>
<parameters>
<parameter type="DiaPersistent*" name="slot_object"/>
</parameters>
</method>
</object>
<object name="PersistentFactory" cname="DiaPersistentFactory" parent="GtkObject">
<field cname="next_id" type="DiaId"/>
<field cname="object_hash" type="GHashTable*"/>
<signal name="SaveStart" cname="save_start" when="LAST">
<return-type type="gboolean"/>
<parameters>
<parameter type="DiaPersistentFactory*" name="factory"/>
</parameters>
</signal>
<signal name="SaveEnd" cname="save_end" when="LAST">
<return-type type="void"/>
<parameters>
<parameter type="DiaPersistentFactory*" name="factory"/>
</parameters>
</signal>
<signal name="LoadStart" cname="load_start" when="LAST">
<return-type type="gboolean"/>
<parameters>
<parameter type="DiaPersistentFactory*" name="factory"/>
</parameters>
</signal>
<signal name="LoadEnd" cname="load_end" when="LAST">
<return-type type="void"/>
<parameters>
<parameter type="DiaPersistentFactory*" name="factory"/>
</parameters>
</signal>
<signal name="SaveObject" cname="save_object" when="LAST">
<return-type type="gboolean"/>
<parameters>
<parameter type="DiaPersistentFactory*" name="factory"/>
<parameter type="DiaPersistent*" name="obj"/>
</parameters>
</signal>
<signal name="LoadObject" cname="load_object" when="LAST">
<return-type type="gboolean"/>
<parameters>
<parameter type="DiaPersistentFactory*" name="factory"/>
<parameter type="DiaPersistent*" name="obj"/>
</parameters>
</signal>
<method name="Dump" cname="dia_persistent_factory_dump">
<return-type type="void"/>
</method>
<method name="GetType" cname="dia_persistent_factory_get_type" shared="true">
<return-type type="GtkType"/>
</method>
<method name="Load" cname="dia_persistent_factory_load">
<return-type type="gchar*"/>
<parameters>
<parameter type="const-gchar*" name="filename"/>
</parameters>
</method>
<method name="Lookup" cname="dia_persistent_factory_lookup">
<return-type type="DiaPersistent*"/>
<parameters>
<parameter type="DiaId" name="id"/>
</parameters>
</method>
<constructor cname="dia_persistent_factory_new"/>
<constructor cname="dia_persistent_factory_new_object">
<parameters>
<parameter type="DiaPersistentFactory*" name="factory"/>
<parameter type="GtkType" name="type"/>
</parameters>
</constructor>
<method name="Save" cname="dia_persistent_factory_save">
<return-type type="gchar*"/>
<parameters>
<parameter type="const-gchar*" name="filename"/>
</parameters>
</method>
</object>
<alias name="AttributeNode" cname="DiaAttributeNode" type="int"/>
<boxed name="CanvasIter" cname="DiaCanvasIter">
<field cname="data" array_len="3" type="gpointer"/>
<field cname="destroy_func" type="GDestroyNotify"/>
<field cname="stamp" type="gint"/>
<method name="Destroy" cname="dia_canvas_iter_destroy">
<return-type type="void"/>
</method>
<method name="GetType" cname="dia_canvas_iter_get_type" shared="true">
<return-type type="GType"/>
</method>
<method name="Init" cname="dia_canvas_iter_init">
<return-type type="void"/>
</method>
</boxed>
<alias name="Color" cname="DiaColor" type="guint32"/>
<struct name="Copy" cname="DiaCopy">
<field cname="objects" type="GList*"/>
<field cname="factory" type="DiaPersistentFactory*"/>
<method name="Add" cname="dia_copy_add">
<return-type type="void"/>
<parameters>
<parameter type="DiaPersistentFactory*" name="factory"/>
<parameter type="DiaCanvasItem*" name="item"/>
</parameters>
</method>
<method name="Clear" cname="dia_copy_clear">
<return-type type="void"/>
</method>
<constructor cname="dia_copy_new"/>
<method name="Paste" cname="dia_copy_paste">
<return-type type="DiaCopy*"/>
<parameters>
<parameter type="DiaPersistentFactory*" name="factory"/>
</parameters>
</method>
</struct>
<boxed name="DashStyle" cname="DiaDashStyle">
<field cname="n_dash" type="guint"/>
<field cname="dash" array_len="1" type="gdouble"/>
@ -1392,6 +1756,7 @@
<return-type type="GType"/>
</method>
</boxed>
<alias name="Document" cname="DiaDocument" type="int"/>
<struct name="EventButton" cname="DiaEventButton">
<field cname="type" type="DiaEventType"/>
<field cname="x" type="gdouble"/>
@ -1399,7 +1764,9 @@
<field cname="modifier" type="DiaEventMask"/>
<field cname="button" type="guint"/>
</struct>
<struct name="EventEnter" cname="DiaEventEnter" opaque="true"/>
<struct name="EventFocus" cname="DiaEventFocus">
<field cname="type" type="DiaEventType"/>
</struct>
<struct name="EventKey" cname="DiaEventKey">
<field cname="type" type="DiaEventType"/>
<field cname="keyval" type="guint"/>
@ -1407,7 +1774,6 @@
<field cname="string" type="gchar*"/>
<field cname="modifier" type="DiaEventMask"/>
</struct>
<struct name="EventLeave" cname="DiaEventLeave" opaque="true"/>
<struct name="EventMotion" cname="DiaEventMotion">
<field cname="type" type="DiaEventType"/>
<field cname="x" type="gdouble"/>
@ -1416,7 +1782,7 @@
<field cname="dx" type="gdouble"/>
<field cname="dy" type="gdouble"/>
</struct>
<struct name="Expression" cname="DiaExpression" hidden="1">
<struct name="Expression" cname="DiaExpression">
<field cname="len" type="guint"/>
<field cname="variable" type="struct-_DiaExpressionElem{DiaVariable*"/>
<field cname="constant" type="gdouble"/>
@ -1444,6 +1810,8 @@
</parameters>
</method>
</struct>
<alias name="Id" cname="DiaId" type="guint32"/>
<alias name="ObjectNode" cname="DiaObjectNode" type="int"/>
<boxed name="Point" cname="DiaPoint">
<field cname="x" type="gdouble"/>
<field cname="y" type="gdouble"/>
@ -1466,6 +1834,7 @@
<return-type type="GType"/>
</method>
</boxed>
<alias name="Rev" cname="DiaRev" type="guint16"/>
<struct name="SPoint" cname="DiaSPoint">
<field cname="x" type="DiaVariable*"/>
<field cname="y" type="DiaVariable*"/>
@ -2041,6 +2410,228 @@
</parameters>
</method>
</struct>
<alias name="SignalNode" cname="DiaSignalNode" type="int"/>
<struct name="Storage" cname="DiaStorage">
<field cname="filename" type="gchar*"/>
<field cname="doc_node" type="DiaDocument*"/>
<field cname="factory" type="DiaPersistentFactory*"/>
<method name="ArgFree" cname="dia_storage_arg_free" shared="true">
<return-type type="void"/>
<parameters>
<parameter type="GtkArg*" name="arg"/>
</parameters>
</method>
<method name="ArgReset" cname="dia_storage_arg_reset" shared="true">
<return-type type="void"/>
<parameters>
<parameter type="GtkArg*" name="arg"/>
</parameters>
</method>
<method name="AttributeGetName" cname="dia_storage_attribute_get_name">
<return-type type="const-gchar*"/>
<parameters>
<parameter type="DiaAttributeNode*" name="attr"/>
</parameters>
</method>
<method name="AttributeGetType" cname="dia_storage_attribute_get_type">
<return-type type="GtkType"/>
<parameters>
<parameter type="DiaAttributeNode*" name="attr"/>
</parameters>
</method>
<method name="AttributeGetValue" cname="dia_storage_attribute_get_value">
<return-type type="gboolean"/>
<parameters>
<parameter type="DiaAttributeNode*" name="attr"/>
<parameter type="DiaPersistent*" name="object"/>
<parameter type="GtkArg*" name="value"/>
</parameters>
</method>
<method name="AttributeGetValueRaw" cname="dia_storage_attribute_get_value_raw">
<return-type type="const-gchar*"/>
<parameters>
<parameter type="DiaAttributeNode*" name="attr"/>
</parameters>
</method>
<method name="AttributeInvalid" cname="dia_storage_attribute_invalid">
<return-type type="void"/>
<parameters>
<parameter type="DiaAttributeNode*" name="attr"/>
</parameters>
</method>
<method name="AttributeIsNil" cname="dia_storage_attribute_is_nil">
<return-type type="gboolean"/>
<parameters>
<parameter type="DiaAttributeNode*" name="attr"/>
</parameters>
</method>
<method name="AttributeNext" cname="dia_storage_attribute_next">
<return-type type="DiaAttributeNode*"/>
<parameters>
<parameter type="DiaAttributeNode*" name="attr"/>
</parameters>
</method>
<method name="AttributeSetNil" cname="dia_storage_attribute_set_nil">
<return-type type="void"/>
<parameters>
<parameter type="DiaAttributeNode*" name="attr"/>
</parameters>
</method>
<method name="AttributeSetValue" cname="dia_storage_attribute_set_value">
<return-type type="void"/>
<parameters>
<parameter type="DiaAttributeNode*" name="attr"/>
<parameter type="const-gchar*" name="value"/>
</parameters>
</method>
<method name="Free" cname="dia_storage_free">
<return-type type="void"/>
</method>
<method name="GetAttribute" cname="dia_storage_get_attribute">
<return-type type="DiaAttributeNode*"/>
<parameters>
<parameter type="DiaStorageNode*" name="node"/>
</parameters>
</method>
<method name="GetObject" cname="dia_storage_get_object">
<return-type type="DiaObjectNode*"/>
</method>
<method name="GetSignal" cname="dia_storage_get_signal">
<return-type type="DiaSignalNode*"/>
<parameters>
<parameter type="DiaObjectNode*" name="node"/>
</parameters>
</method>
<method name="Init" cname="dia_storage_init" shared="true">
<return-type type="void"/>
</method>
<method name="Load" cname="dia_storage_load" shared="true">
<return-type type="DiaStorage*"/>
<parameters>
<parameter type="const-gchar*" name="filename"/>
</parameters>
</method>
<constructor cname="dia_storage_new">
<parameters>
<parameter type="const-gchar*" name="filename"/>
<parameter type="gboolean" name="compressed"/>
</parameters>
</constructor>
<constructor cname="dia_storage_new_attribute">
<parameters>
<parameter type="DiaStorage*" name="storage"/>
<parameter type="DiaStorageNode*" name="parent"/>
<parameter type="DiaPersistent*" name="object"/>
<parameter type="GtkArg*" name="value"/>
</parameters>
</constructor>
<constructor cname="dia_storage_new_object">
<parameters>
<parameter type="DiaStorage*" name="storage"/>
<parameter type="GtkType" name="type"/>
<parameter type="DiaId" name="id"/>
<parameter type="DiaRev" name="rev"/>
</parameters>
</constructor>
<constructor cname="dia_storage_new_signal">
<parameters>
<parameter type="DiaStorage*" name="storage"/>
<parameter type="DiaObjectNode*" name="node"/>
<parameter type="gchar*" name="signal_name"/>
<parameter type="const-gchar*" name="callback_name"/>
<parameter type="DiaId" name="data_id"/>
</parameters>
</constructor>
<method name="NodeDelete" cname="dia_storage_node_delete">
<return-type type="void"/>
<parameters>
<parameter type="DiaStorageNode*" name="attr"/>
</parameters>
</method>
<method name="ObjectGetClass" cname="dia_storage_object_get_class">
<return-type type="GtkType"/>
<parameters>
<parameter type="DiaObjectNode*" name="node"/>
</parameters>
</method>
<method name="ObjectGetId" cname="dia_storage_object_get_id">
<return-type type="DiaId"/>
<parameters>
<parameter type="DiaObjectNode*" name="node"/>
</parameters>
</method>
<method name="ObjectGetRev" cname="dia_storage_object_get_rev">
<return-type type="DiaRev"/>
<parameters>
<parameter type="DiaObjectNode*" name="node"/>
</parameters>
</method>
<method name="ObjectNext" cname="dia_storage_object_next">
<return-type type="DiaObjectNode*"/>
<parameters>
<parameter type="DiaObjectNode*" name="object"/>
</parameters>
</method>
<method name="RegisterNewType" cname="dia_storage_register_new_type" shared="true">
<return-type type="GtkType"/>
<parameters>
<parameter type="const-gchar*" name="name"/>
<parameter type="DiaStorageLoadFunc" name="load"/>
<parameter type="DiaStorageSaveFunc" name="save"/>
<parameter type="DiaStorageFreeFunc" name="free"/>
</parameters>
</method>
<method name="RegisterType" cname="dia_storage_register_type" shared="true">
<return-type type="void"/>
<parameters>
<parameter type="GtkType" name="type"/>
<parameter type="DiaStorageLoadFunc" name="load"/>
<parameter type="DiaStorageSaveFunc" name="save"/>
<parameter type="DiaStorageFreeFunc" name="free"/>
</parameters>
</method>
<method name="Save" cname="dia_storage_save">
<return-type type="gboolean"/>
</method>
<method name="SignalGetCallback" cname="dia_storage_signal_get_callback">
<return-type type="const-gchar*"/>
<parameters>
<parameter type="DiaSignalNode*" name="sig"/>
</parameters>
</method>
<method name="SignalGetDataId" cname="dia_storage_signal_get_data_id">
<return-type type="DiaId"/>
<parameters>
<parameter type="DiaSignalNode*" name="sig"/>
</parameters>
</method>
<method name="SignalGetName" cname="dia_storage_signal_get_name">
<return-type type="const-gchar*"/>
<parameters>
<parameter type="DiaSignalNode*" name="sig"/>
</parameters>
</method>
<method name="SignalNext" cname="dia_storage_signal_next">
<return-type type="DiaSignalNode*"/>
<parameters>
<parameter type="DiaSignalNode*" name="sig"/>
</parameters>
</method>
<method name="SignalSetDataId" cname="dia_storage_signal_set_data_id">
<return-type type="void"/>
<parameters>
<parameter type="DiaSignalNode*" name="sig"/>
<parameter type="DiaId" name="id"/>
</parameters>
</method>
<method name="ToBuffer" cname="dia_storage_to_buffer">
<return-type type="gchar*"/>
<parameters>
<parameter type="gint*" name="size"/>
</parameters>
</method>
</struct>
<alias name="StorageNode" cname="DiaStorageNode" type="int"/>
<struct name="Variable" cname="DiaVariable">
<field cname="parent" type="GObject"/>
<field cname="value" type="gdouble"/>
@ -2068,7 +2659,7 @@
</parameters>
</method>
</struct>
<struct name="VariableClass" cname="DiaVariableClass" hidden="1">
<struct name="VariableClass" cname="DiaVariableClass">
<field cname="parent_class" type="GObjectClass"/>
<callback cname="changed">
<return-type type="void"/>

4
patches/acinclude.m4.diff Normal file
Просмотреть файл

@ -0,0 +1,4 @@
39c39
< AC_PATH_PROGS(PYTHON, python2.2 python2 python)
---
> AC_PATH_PROGS(PYTHON, python2.3 python2.2 python2 python)

32
patches/dia-storage.h.diff Normal file
Просмотреть файл

@ -0,0 +1,32 @@
--- dia-storage.h.~1.4.~ 2001-08-01 17:24:51.000000000 +0200
+++ dia-storage.h 2003-08-06 09:56:26.000000000 +0200
@@ -133,9 +133,12 @@
gboolean dia_storage_save (DiaStorage *storage);
-/* Dump the XML tree to a memory buffer, mainly for debugging. */
+/* Dump the XML tree to a memory buffer, mainly for debugging.
+ *
+ * size: out parameter
+ */
gchar* dia_storage_to_buffer (DiaStorage *storage,
- /*out*/gint *size);
+ gint *size);
/*
* Object handling
@@ -173,11 +176,13 @@
/* Name is also save in returned_arg->name.
* Returns `value' on success, NULL on error.
+ *
+ * value: in and out parameter
*/
gboolean dia_storage_attribute_get_value (DiaStorage *storage,
DiaAttributeNode *attr,
DiaPersistent *object,
- /*< INOUT >*/GtkArg *value);
+ GtkArg *value);
/* Retrieve (child-)attributes from object or attribute. */
DiaAttributeNode* dia_storage_get_attribute (DiaStorage *storage,

0
patches/dia-canvas-group.c.diff → patches/diacanvas2-0.9.2/dia-canvas-group.c.diff
Просмотреть файл

0
patches/dia-canvas-item.c.diff → patches/diacanvas2-0.9.2/dia-canvas-item.c.diff
Просмотреть файл

0
patches/dia-canvas-view-item.c.diff → patches/diacanvas2-0.9.2/dia-canvas-view-item.c.diff
Просмотреть файл

0
patches/dia-canvas-view.c.diff → patches/diacanvas2-0.9.2/dia-canvas-view.c.diff
Просмотреть файл

0
patches/dia-canvas.c.diff → patches/diacanvas2-0.9.2/dia-canvas.c.diff
Просмотреть файл

0
patches/dia-canvas.h.diff → patches/diacanvas2-0.9.2/dia-canvas.h.diff
Просмотреть файл

0
patches/dia-export-svg.c.diff → patches/diacanvas2-0.9.2/dia-export-svg.c.diff
Просмотреть файл

0
patches/dia-textbox.c.diff → patches/diacanvas2-0.9.2/dia-textbox.c.diff
Просмотреть файл

0
patches/test-canvas-item.c.diff → patches/diacanvas2-0.9.2/test-canvas-item.c.diff
Просмотреть файл

0
patches/test-canvas.c.diff → patches/diacanvas2-0.9.2/test-canvas.c.diff
Просмотреть файл

0
patches/test-item.c.diff → patches/diacanvas2-0.9.2/test-item.c.diff
Просмотреть файл

0
patches/test-shape-art.c.diff → patches/diacanvas2-0.9.2/test-shape-art.c.diff
Просмотреть файл

0
patches/gapi2xml.pl.diff → patches/parser/gapi2xml.pl.diff
Просмотреть файл

0
patches/gapi_pp.pl.diff → patches/parser/gapi_pp.pl.diff
Просмотреть файл

104
sources/Dia.metadata
Просмотреть файл

@ -2,9 +2,11 @@
<metadata>
<!-- hides -->
<rule>
<rule>
<class name="DiaVariableClass"/>
<class name="DiaExpression"/>
<class name="DiaVariableClass"/>
<data>
<attribute target="class">
<name>hidden</name>
@ -12,7 +14,6 @@
</attribute>
</data>
</rule>
<rule>
<class name="DiaConstraint">
<method>AddExpression</method>
</class>
@ -23,8 +24,63 @@
</attribute>
</data>
</rule>
<rule>
<class name="DiaCanvasText">
<signal>TextChanged</signal>
</class>
<data>
<attribute target="signal">
<name>hidden</name>
<value>1</value>
</attribute>
</data>
</rule>
<!-- renames -->
<rule>
<class name="DiaCanvas">
<method>SnapToGrid</method>
</class>
<data>
<attribute target="method">
<name>name</name>
<value>SnapToGridCoordinates</value>
</attribute>
</data>
</rule>
<rule>
<class name="DiaCanvasEditable">
<method>EditingDone</method>
</class>
<data>
<attribute target="method">
<name>name</name>
<value>DoneEditing</value>
</attribute>
</data>
</rule>
<rule>
<class name="DiaCanvasEditable">
<method>StartEditing</method>
</class>
<data>
<attribute target="method">
<name>name</name>
<value>EditingStart</value>
</attribute>
</data>
</rule>
<rule>
<class name="DiaCanvasEditable">
<method>TextChanged</method>
</class>
<data>
<attribute target="method">
<name>name</name>
<value>ChangeText</value>
</attribute>
</data>
</rule>
<rule>
<class name="DiaCanvasGroupable">
<signal>Add</signal>
@ -47,17 +103,6 @@
</attribute>
</data>
</rule>
<rule>
<class name="DiaCanvas">
<method>SnapToGrid</method>
</class>
<data>
<attribute target="method">
<name>name</name>
<value>SnapToGridCoordinates</value>
</attribute>
</data>
</rule>
<rule>
<class name="DiaCanvasItem">
<signal>Move</signal>
@ -91,6 +136,39 @@
</attribute>
</data>
</rule>
<rule>
<class name="DiaCanvasItem">
<method>Visible</method>
</class>
<data>
<attribute target="method">
<name>name</name>
<value>MakeVisible</value>
</attribute>
</data>
</rule>
<rule>
<class name="DiaCanvasItem">
<method>Connect</method>
</class>
<data>
<attribute target="method">
<name>name</name>
<value>MakeConnect</value>
</attribute>
</data>
</rule>
<rule>
<class name="DiaCanvasItem">
<method>Disconnect</method>
</class>
<data>
<attribute target="method">
<name>name</name>
<value>MakeDisconnect</value>
</attribute>
</data>
</rule>
<!-- disable default constructor -->
<rule>

2
sources/dia-sharp.sources
Просмотреть файл

@ -1 +1 @@
./diacanvas2-0.9.2/src Dia diacanvas2
./diacanvas2/src Dia diacanvas2

23
sources/makefile
Просмотреть файл

@ -1,24 +1,17 @@
PACKAGE=diacanvas2-0.9.2
PACKAGE=diacanvas2
all:
gapi.pl dia-sharp.sources ../api
get-source-code:
wget http://aleron.dl.sourceforge.net/sourceforge/diacanvas/$(PACKAGE).tar.gz \
--output-document=- | tar -xz;
#wget http://aleron.dl.sourceforge.net/sourceforge/diacanvas/$(PACKAGE).tar.gz \
#--output-document=- | tar -xz;
patch $(PACKAGE)/src/dia-canvas.c ../patches/dia-canvas.c.diff
patch $(PACKAGE)/src/dia-canvas-group.c ../patches/dia-canvas-group.c.diff
patch $(PACKAGE)/src/dia-canvas.h ../patches/dia-canvas.h.diff
patch $(PACKAGE)/src/dia-canvas-item.c ../patches/dia-canvas-item.c.diff
patch $(PACKAGE)/src/dia-canvas-view.c ../patches/dia-canvas-view.c.diff
patch $(PACKAGE)/src/dia-canvas-view-item.c ../patches/dia-canvas-view-item.c.diff
patch $(PACKAGE)/src/dia-export-svg.c ../patches/dia-export-svg.c.diff
patch $(PACKAGE)/demos/dia-textbox.c ../patches/dia-textbox.c.diff
patch $(PACKAGE)/demos/test-canvas.c ../patches/test-canvas.c.diff
patch $(PACKAGE)/unit_tests/test-canvas-item.c ../patches/test-canvas-item.c.diff
patch $(PACKAGE)/unit_tests/test-item.c ../patches/test-item.c.diff
patch $(PACKAGE)/unit_tests/test-shape-art.c ../patches/test-shape-art.c.diff
export CVS_PASSWORD=""
cvs -z3 -d:pserver:anonymous@cvs.sf.net:/cvsroot/diacanvas co $(PACKAGE)
patch $(PACKAGE)/src/dia-storage.h ../patches/dia-storage.h.diff
patch $(PACKAGE)/acinclude.m4 ../patches/acinclude.m4.diff
distclean:
rm -rf $(PACKAGE)