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

* sources/diacanvas-sharp-sources.xml: Target DiaCanvas2-0.14.2 

* sources/makefile: Ditto
        * dia/diacanvas-api.raw: Ditto
        * configure.in: Ditto + bumped version number
        * dia/Dia.metadata: Added rename metadata for events in
          DiaUndoManager
        * NEWS: Updated for new release
        * sample/sample.cs: Removed Simple Text Item,
          commented out broken undo/redo function,
          removed e-mail addresses from the about dialog
        * sample/CanvasTextBox: Removed EditingDoneHandler.

svn path=/trunk/diacanvas-sharp/; revision=38523
This commit is contained in:
Martin Willemoes Hansen 2005-01-08 14:56:35 +00:00
Родитель f5911f2ecc
Коммит 982c6361e7
9 изменённых файлов: 234 добавлений и 116 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -1,3 +1,17 @@
2005-01-08 Martin Willemoes Hansen <mwh@sysrq.dk>
* sources/diacanvas-sharp-sources.xml: Target DiaCanvas2-0.14.2
* sources/makefile: Ditto
* dia/diacanvas-api.raw: Ditto
* configure.in: Ditto + bumped version number
* dia/Dia.metadata: Added rename metadata for events in
DiaUndoManager
* NEWS: Updated for new release
* sample/sample.cs: Removed Simple Text Item,
commented out broken undo/redo function,
removed e-mail addresses from the about dialog
* sample/CanvasTextBox: Removed EditingDoneHandler.
2004-08-18 Martin Willemoes Hansen <mwh@sysrq.dk> 2004-08-18 Martin Willemoes Hansen <mwh@sysrq.dk>
* diacanvas-sharp.pc.in: Added require list of * diacanvas-sharp.pc.in: Added require list of

5
NEWS
Просмотреть файл

@ -1,7 +1,10 @@
0.5.1 0.5.1
===== =====
* CanvasLine.Dash can be exercised 100% * Target DiaCanvas2-0.14.2
* Text is now editable
* Undo/Redo-regression
* Line dashes-regression
0.5.0 0.5.0
===== =====

6
configure.in
Просмотреть файл

@ -1,10 +1,10 @@
AC_INIT(README) AC_INIT(README)
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE(diacanvas-sharp, 0.5.0) AM_INIT_AUTOMAKE(diacanvas-sharp, 0.5.1)
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
AM_PROG_LIBTOOL AM_PROG_LIBTOOL
API_VERSION=0.5.0.0 API_VERSION=0.5.1.0
AC_SUBST(API_VERSION) AC_SUBST(API_VERSION)
dnl Defines CC to avoid warnings dnl Defines CC to avoid warnings
@ -86,7 +86,7 @@ PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp >= 1.0)
AC_SUBST(GTK_SHARP_CFLAGS) AC_SUBST(GTK_SHARP_CFLAGS)
AC_SUBST(GTK_SHARP_LIBS) AC_SUBST(GTK_SHARP_LIBS)
PKG_CHECK_MODULES(DIACANVAS2, diacanvas2 >= 0.13.0) PKG_CHECK_MODULES(DIACANVAS2, diacanvas2 >= 0.14.2)
AC_SUBST(DIACANVAS2_CFLAGS) AC_SUBST(DIACANVAS2_CFLAGS)
AC_SUBST(DIACANVAS2_LIBS) AC_SUBST(DIACANVAS2_LIBS)

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

@ -36,6 +36,12 @@
<attr path="/api/namespace/struct[@cname='DiaShape']/method[@name='GetViewInfo']" name="hidden">1</attr> <attr path="/api/namespace/struct[@cname='DiaShape']/method[@name='GetViewInfo']" name="hidden">1</attr>
<attr path="/api/namespace/struct[@cname='DiaShape']" name="opaque">1</attr> <attr path="/api/namespace/struct[@cname='DiaShape']" name="opaque">1</attr>
<attr path="/api/namespace/struct[@cname='DiaShapeViewInfo']" name="hidden">1</attr> <attr path="/api/namespace/struct[@cname='DiaShapeViewInfo']" name="hidden">1</attr>
<attr path="/api/namespace/interface[@cname='DiaUndoManager']/signal[@name='AddUndoAction']" name="name">AddedUndoAction</attr>
<attr path="/api/namespace/interface[@cname='DiaUndoManager']/signal[@name='DiscardTransaction']" name="name">DiscardedTransaction</attr>
<attr path="/api/namespace/interface[@cname='DiaUndoManager']/signal[@name='BeginTransaction']" name="name">BeganTransaction</attr>
<attr path="/api/namespace/interface[@cname='DiaUndoManager']/signal[@name='UndoTransaction']" name="name">UndidTransaction</attr>
<attr path="/api/namespace/interface[@cname='DiaUndoManager']/signal[@name='CommitTransaction']" name="name">CommitedTransaction</attr>
<attr path="/api/namespace/interface[@cname='DiaUndoManager']/signal[@name='RedoTransaction']" name="name">RedidTransaction</attr>
<attr path="/api/namespace/struct[@cname='DiaVariableClass']" name="hidden">1</attr> <attr path="/api/namespace/struct[@cname='DiaVariableClass']" name="hidden">1</attr>
<attr path="/api/namespace/struct[@cname='DiaVariable']" name="opaque">1</attr> <attr path="/api/namespace/struct[@cname='DiaVariable']" name="opaque">1</attr>
</metadata> </metadata>

280
dia/diacanvas-api.raw
Просмотреть файл

@ -128,9 +128,16 @@
<callback name="ShapeViewInfoFree" cname="DiaShapeViewInfoFree"> <callback name="ShapeViewInfoFree" cname="DiaShapeViewInfoFree">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="DiaCanvasViewItem*" name="item"/>
<parameter type="DiaShapeViewInfo*" name="item_info"/> <parameter type="DiaShapeViewInfo*" name="item_info"/>
</parameters> </parameters>
</callback> </callback>
<callback name="UndoFunc" cname="DiaUndoFunc">
<return-type type="void"/>
<parameters>
<parameter type="DiaUndoAction*" name="action"/>
</parameters>
</callback>
<interface name="CanvasEditable" cname="DiaCanvasEditable"> <interface name="CanvasEditable" cname="DiaCanvasEditable">
<signal name="StartEditing" cname="start_editing" when="LAST"> <signal name="StartEditing" cname="start_editing" when="LAST">
<return-type type="void"/> <return-type type="void"/>
@ -162,9 +169,19 @@
<parameter type="const-gchar*" name="new_text"/> <parameter type="const-gchar*" name="new_text"/>
</parameters> </parameters>
</method> </method>
<method name="GetEditableShape" cname="dia_canvas_editable_get_editable_shape">
<return-type type="DiaShapeText*"/>
<parameters>
<parameter type="gdouble" name="x"/>
<parameter type="gdouble" name="y"/>
</parameters>
</method>
<method name="GetType" cname="dia_canvas_editable_get_type" shared="true"> <method name="GetType" cname="dia_canvas_editable_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
<method name="IsEditable" cname="dia_canvas_editable_is_editable">
<return-type type="gboolean"/>
</method>
<method name="StartEditing" cname="dia_canvas_editable_start_editing"> <method name="StartEditing" cname="dia_canvas_editable_start_editing">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -249,12 +266,84 @@
</parameters> </parameters>
</method> </method>
</interface> </interface>
<interface name="UndoManager" cname="DiaUndoManager">
<signal name="BeginTransaction" cname="begin_transaction" when="LAST">
<return-type type="void"/>
<parameters>
<parameter type="DiaUndoManager*" name="undo_manager"/>
</parameters>
</signal>
<signal name="CommitTransaction" cname="commit_transaction" when="LAST">
<return-type type="void"/>
<parameters>
<parameter type="DiaUndoManager*" name="undo_manager"/>
</parameters>
</signal>
<signal name="DiscardTransaction" cname="discard_transaction" when="LAST">
<return-type type="void"/>
<parameters>
<parameter type="DiaUndoManager*" name="undo_manager"/>
</parameters>
</signal>
<signal name="AddUndoAction" cname="add_undo_action" when="LAST">
<return-type type="void"/>
<parameters>
<parameter type="DiaUndoManager*" name="undo_manager"/>
<parameter type="DiaUndoAction*" name="action"/>
</parameters>
</signal>
<signal name="UndoTransaction" cname="undo_transaction" when="LAST">
<return-type type="void"/>
<parameters>
<parameter type="DiaUndoManager*" name="undo_manager"/>
</parameters>
</signal>
<signal name="RedoTransaction" cname="redo_transaction" when="LAST">
<return-type type="void"/>
<parameters>
<parameter type="DiaUndoManager*" name="undo_manager"/>
</parameters>
</signal>
<method name="AddUndoAction" cname="dia_undo_manager_add_undo_action">
<return-type type="void"/>
<parameters>
<parameter type="DiaUndoAction*" name="action"/>
</parameters>
</method>
<method name="BeginTransaction" cname="dia_undo_manager_begin_transaction">
<return-type type="void"/>
</method>
<method name="CanRedo" cname="dia_undo_manager_can_redo">
<return-type type="gboolean"/>
</method>
<method name="CanUndo" cname="dia_undo_manager_can_undo">
<return-type type="gboolean"/>
</method>
<method name="CommitTransaction" cname="dia_undo_manager_commit_transaction">
<return-type type="void"/>
</method>
<method name="DiscardTransaction" cname="dia_undo_manager_discard_transaction">
<return-type type="void"/>
</method>
<method name="GetType" cname="dia_undo_manager_get_type" shared="true">
<return-type type="GType"/>
</method>
<method name="InTransaction" cname="dia_undo_manager_in_transaction">
<return-type type="gboolean"/>
</method>
<method name="RedoTransaction" cname="dia_undo_manager_redo_transaction">
<return-type type="void"/>
</method>
<method name="UndoTransaction" cname="dia_undo_manager_undo_transaction">
<return-type type="void"/>
</method>
</interface>
<object name="Canvas" cname="DiaCanvas" parent="GObject"> <object name="Canvas" cname="DiaCanvas" parent="GObject">
<field cname="static_extents" bits="1" type="gboolean"/> <field cname="static_extents" bits="1" type="gboolean"/>
<field cname="snap_to_grid" bits="1" type="gboolean"/> <field cname="snap_to_grid" bits="1" type="gboolean"/>
<field cname="allow_undo" bits="1" type="gboolean"/> <field cname="allow_undo" bits="1" type="gboolean"/>
<field cname="allow_state_requests" bits="1" type="gboolean"/> <field cname="allow_state_requests" bits="1" type="gboolean"/>
<field cname="in_undo" bits="1" type="gboolean"/> <field cname="in_undo" bits="1" type="//gboolean"/>
<field cname="extents" type="DiaRectangle"/> <field cname="extents" type="DiaRectangle"/>
<field cname="root" type="DiaCanvasItem*"/> <field cname="root" type="DiaCanvasItem*"/>
<field cname="interval_x" type="gdouble"/> <field cname="interval_x" type="gdouble"/>
@ -265,10 +354,7 @@
<field cname="grid_bg" type="DiaColor"/> <field cname="grid_bg" type="DiaColor"/>
<field cname="solver" type="DiaSolver*"/> <field cname="solver" type="DiaSolver*"/>
<field cname="idle_id" type="guint"/> <field cname="idle_id" type="guint"/>
<field cname="stack_depth" type="guint"/> <field cname="undo_manager" type="DiaUndoManager*"/>
<field cname="undo" type="GSList*"/>
<field cname="redo" type="GSList*"/>
<field cname="undo_entry" type="gpointer"/>
<signal name="ExtentsChanged" cname="extents_changed" when="FIRST"> <signal name="ExtentsChanged" cname="extents_changed" when="FIRST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -312,12 +398,6 @@
<parameter type="DiaConstraint*" name="c"/> <parameter type="DiaConstraint*" name="c"/>
</parameters> </parameters>
</method> </method>
<method name="ClearRedo" cname="dia_canvas_clear_redo">
<return-type type="void"/>
</method>
<method name="ClearUndo" cname="dia_canvas_clear_undo">
<return-type type="void"/>
</method>
<method name="FindObjectsInRectangle" cname="dia_canvas_find_objects_in_rectangle"> <method name="FindObjectsInRectangle" cname="dia_canvas_find_objects_in_rectangle">
<return-type type="GList*"/> <return-type type="GList*"/>
<parameters> <parameters>
@ -327,17 +407,11 @@
<method name="GetPangoLayout" cname="dia_canvas_get_pango_layout" shared="true"> <method name="GetPangoLayout" cname="dia_canvas_get_pango_layout" shared="true">
<return-type type="PangoLayout*"/> <return-type type="PangoLayout*"/>
</method> </method>
<method name="GetRedoDepth" cname="dia_canvas_get_redo_depth">
<return-type type="guint"/>
</method>
<method name="GetType" cname="dia_canvas_get_type" shared="true"> <method name="GetType" cname="dia_canvas_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
<method name="GetUndoDepth" cname="dia_canvas_get_undo_depth"> <method name="GetUndoManager" cname="dia_canvas_get_undo_manager">
<return-type type="guint"/> <return-type type="DiaUndoManager*"/>
</method>
<method name="GetUndoStackDepth" cname="dia_canvas_get_undo_stack_depth">
<return-type type="guint"/>
</method> </method>
<method name="GlueHandle" cname="dia_canvas_glue_handle"> <method name="GlueHandle" cname="dia_canvas_glue_handle">
<return-type type="gdouble"/> <return-type type="gdouble"/>
@ -351,12 +425,6 @@
</parameters> </parameters>
</method> </method>
<constructor cname="dia_canvas_new"/> <constructor cname="dia_canvas_new"/>
<method name="PopRedo" cname="dia_canvas_pop_redo">
<return-type type="void"/>
</method>
<method name="PopUndo" cname="dia_canvas_pop_undo">
<return-type type="void"/>
</method>
<method name="Preserve" cname="dia_canvas_preserve"> <method name="Preserve" cname="dia_canvas_preserve">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -380,12 +448,6 @@
<parameter type="const-char*" name="property_name"/> <parameter type="const-char*" name="property_name"/>
</parameters> </parameters>
</method> </method>
<method name="PushUndo" cname="dia_canvas_push_undo">
<return-type type="void"/>
<parameters>
<parameter type="const-char*" name="optional_comment"/>
</parameters>
</method>
<method name="RedrawViews" cname="dia_canvas_redraw_views"> <method name="RedrawViews" cname="dia_canvas_redraw_views">
<return-type type="void"/> <return-type type="void"/>
</method> </method>
@ -419,10 +481,10 @@
<parameter type="gboolean" name="stat"/> <parameter type="gboolean" name="stat"/>
</parameters> </parameters>
</method> </method>
<method name="SetUndoStackDepth" cname="dia_canvas_set_undo_stack_depth"> <method name="SetUndoManager" cname="dia_canvas_set_undo_manager">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="guint" name="depth"/> <parameter type="DiaUndoManager*" name="undo_manager"/>
</parameters> </parameters>
</method> </method>
<method name="SnapToGrid" cname="dia_canvas_snap_to_grid"> <method name="SnapToGrid" cname="dia_canvas_snap_to_grid">
@ -514,7 +576,6 @@
</object> </object>
<object name="CanvasImage" cname="DiaCanvasImage" parent="DiaCanvasElement"> <object name="CanvasImage" cname="DiaCanvasImage" parent="DiaCanvasElement">
<field cname="pixbuf" type="GdkPixbuf*"/> <field cname="pixbuf" type="GdkPixbuf*"/>
<field cname="clip" type="//DiaShape*"/>
<field cname="image" type="DiaShape*"/> <field cname="image" type="DiaShape*"/>
<property name="Image" cname="image" type="GdkPixbuf" readable="true" writeable="true"/> <property name="Image" cname="image" type="GdkPixbuf" readable="true" writeable="true"/>
<method name="GetType" cname="dia_canvas_image_get_type" shared="true"> <method name="GetType" cname="dia_canvas_image_get_type" shared="true">
@ -560,7 +621,7 @@
<return-type type="gboolean"/> <return-type type="gboolean"/>
<parameters> <parameters>
<parameter type="DiaCanvasItem*" name="item"/> <parameter type="DiaCanvasItem*" name="item"/>
<parameter type="DiaEvent*" name="event"/> <parameter type="gpointer" name="event"/>
</parameters> </parameters>
</signal> </signal>
<signal name="Move" cname="move" when="LAST"> <signal name="Move" cname="move" when="LAST">
@ -591,7 +652,7 @@
<property name="Connect" cname="connect" type="DiaHandle" writeable="true"/> <property name="Connect" cname="connect" type="DiaHandle" writeable="true"/>
<property name="Disconnect" cname="disconnect" 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="Affine" cname="affine" type="DiaAffine" readable="true" writeable="true"/>
<property name="Handles" cname="handles" type="DiaCanvasItemHandles" readable="true" writeable="true"/> <property name="Handles" cname="handles" type="DiaCanvasItemHandles" readable="true"/>
<virtual_method name="Update" cname="update"> <virtual_method name="Update" cname="update">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -940,7 +1001,6 @@
<field cname="handle_layer" type="GnomeCanvasItem*"/> <field cname="handle_layer" type="GnomeCanvasItem*"/>
<field cname="tool" type="DiaTool*"/> <field cname="tool" type="DiaTool*"/>
<field cname="default_tool" type="DiaTool*"/> <field cname="default_tool" type="DiaTool*"/>
<field cname="selector" type="//GnomeCanvasItem*"/>
<field cname="focus_item" type="DiaCanvasViewItem*"/> <field cname="focus_item" type="DiaCanvasViewItem*"/>
<field cname="selected_items" type="GList*"/> <field cname="selected_items" type="GList*"/>
<field cname="text_view" type="GtkTextView*"/> <field cname="text_view" type="GtkTextView*"/>
@ -996,14 +1056,6 @@
<parameter type="DiaCanvasViewItem*" name="item"/> <parameter type="DiaCanvasViewItem*" name="item"/>
</parameters> </parameters>
</method> </method>
<method name="GdkEventToDiaEvent" cname="dia_canvas_view_gdk_event_to_dia_event">
<return-type type="void"/>
<parameters>
<parameter type="DiaCanvasViewItem*" name="item"/>
<parameter type="GdkEvent*" name="gdk_event"/>
<parameter type="DiaEvent*" name="dia_event"/>
</parameters>
</method>
<method name="GetActiveView" cname="dia_canvas_view_get_active_view" shared="true"> <method name="GetActiveView" cname="dia_canvas_view_get_active_view" shared="true">
<return-type type="DiaCanvasView*"/> <return-type type="DiaCanvasView*"/>
</method> </method>
@ -1082,7 +1134,8 @@
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="DiaCanvasViewItem*" name="item"/> <parameter type="DiaCanvasViewItem*" name="item"/>
<parameter type="DiaShapeText*" name="text_shape"/> <parameter type="gdouble" name="x"/>
<parameter type="gdouble" name="y"/>
</parameters> </parameters>
</method> </method>
<method name="Unselect" cname="dia_canvas_view_unselect"> <method name="Unselect" cname="dia_canvas_view_unselect">
@ -1103,6 +1156,7 @@
<field cname="gc" type="GdkGC*"/> <field cname="gc" type="GdkGC*"/>
<field cname="n_handle_pos" type="guint"/> <field cname="n_handle_pos" type="guint"/>
<field cname="handle_pos" type="gint*"/> <field cname="handle_pos" type="gint*"/>
<field cname="view_info" type="GSList*"/>
<field cname="redraw_area" type="ArtUta*"/> <field cname="redraw_area" type="ArtUta*"/>
<field cname="event_time" type="guint32"/> <field cname="event_time" type="guint32"/>
<property name="Item" cname="item" type="DiaCanvasItem" readable="true" writeable="true"/> <property name="Item" cname="item" type="DiaCanvasItem" readable="true" writeable="true"/>
@ -1117,7 +1171,7 @@
<method name="EmitEvent" cname="dia_canvas_view_item_emit_event"> <method name="EmitEvent" cname="dia_canvas_view_item_emit_event">
<return-type type="gboolean"/> <return-type type="gboolean"/>
<parameters> <parameters>
<parameter type="DiaEvent*" name="event"/> <parameter type="gpointer" name="event"/>
</parameters> </parameters>
</method> </method>
<method name="Foreach" cname="dia_canvas_view_item_foreach"> <method name="Foreach" cname="dia_canvas_view_item_foreach">
@ -1276,8 +1330,6 @@
<property name="PosI" cname="pos_i" type="DiaPoint" readable="true" writeable="true"/> <property name="PosI" cname="pos_i" type="DiaPoint" readable="true" writeable="true"/>
<property name="PosW" cname="pos_w" type="DiaPoint" readable="true" writeable="true"/> <property name="PosW" cname="pos_w" type="DiaPoint" readable="true" writeable="true"/>
<property name="Strength" cname="strength" type="DiaStrength" readable="true" writeable="true"/> <property name="Strength" cname="strength" type="DiaStrength" readable="true" writeable="true"/>
<property name="Connect" cname="connect" type="DiaCanvasItem" readable="true" writeable="true"/>
<property name="Disconnect" cname="disconnect" type="DiaCanvasItem" readable="true" writeable="true"/>
<property name="ConnectedTo" cname="connected_to" type="DiaCanvasItem" readable="true"/> <property name="ConnectedTo" cname="connected_to" type="DiaCanvasItem" readable="true"/>
<property name="Connectable" cname="connectable" type="gboolean" readable="true" writeable="true"/> <property name="Connectable" cname="connectable" type="gboolean" readable="true" writeable="true"/>
<property name="Movable" cname="movable" type="gboolean" readable="true" writeable="true"/> <property name="Movable" cname="movable" type="gboolean" readable="true" writeable="true"/>
@ -1343,6 +1395,9 @@
<parameter type="gdouble" name="y"/> <parameter type="gdouble" name="y"/>
</parameters> </parameters>
</constructor> </constructor>
<method name="PreserveState" cname="dia_handle_preserve_state">
<return-type type="void"/>
</method>
<method name="RemoveAllConstraints" cname="dia_handle_remove_all_constraints"> <method name="RemoveAllConstraints" cname="dia_handle_remove_all_constraints">
<return-type type="void"/> <return-type type="void"/>
</method> </method>
@ -1468,7 +1523,7 @@
</object> </object>
<object name="PlacementTool" cname="DiaPlacementTool" parent="DiaTool"> <object name="PlacementTool" cname="DiaPlacementTool" parent="DiaTool">
<field cname="object_type" type="GType"/> <field cname="object_type" type="GType"/>
<field cname="handle_tool" type="DiaHandleTool*"/> <field cname="handle_tool" type="DiaTool*"/>
<field cname="n_params" type="guint"/> <field cname="n_params" type="guint"/>
<field cname="params" type="GParameter*"/> <field cname="params" type="GParameter*"/>
<field cname="new_object" type="DiaCanvasItem*"/> <field cname="new_object" type="DiaCanvasItem*"/>
@ -1482,6 +1537,13 @@
<parameter ellipsis="true"/> <parameter ellipsis="true"/>
</parameters> </parameters>
</constructor> </constructor>
<constructor cname="dia_placement_tool_newv">
<parameters>
<parameter type="GType" name="object_type"/>
<parameter type="guint" name="n_params"/>
<parameter type="GParameter*" name="params"/>
</parameters>
</constructor>
</object> </object>
<object name="SelectionTool" cname="DiaSelectionTool" parent="DiaTool"> <object name="SelectionTool" cname="DiaSelectionTool" parent="DiaTool">
<field cname="selector" type="GnomeCanvasItem*"/> <field cname="selector" type="GnomeCanvasItem*"/>
@ -1624,6 +1686,36 @@
</parameters> </parameters>
</method> </method>
</object> </object>
<object name="Undo" cname="DiaUndo" parent="GObject">
<field cname="_priv" type="gpointer"/>
<implements>
<interface cname="DiaUndoManager"/>
</implements>
<method name="ClearRedoStack" cname="dia_undo_clear_redo_stack">
<return-type type="void"/>
</method>
<method name="ClearUndoStack" cname="dia_undo_clear_undo_stack">
<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="GType"/>
</method>
<method name="SetMaxDepth" cname="dia_undo_set_max_depth">
<return-type type="void"/>
<parameters>
<parameter type="guint" name="depth"/>
</parameters>
</method>
</object>
<boxed name="CanvasIter" cname="DiaCanvasIter"> <boxed name="CanvasIter" cname="DiaCanvasIter">
<field cname="data" array_len="3" type="gpointer"/> <field cname="data" array_len="3" type="gpointer"/>
<field cname="destroy_func" type="GDestroyNotify"/> <field cname="destroy_func" type="GDestroyNotify"/>
@ -1655,6 +1747,12 @@
<parameter ellipsis="true"/> <parameter ellipsis="true"/>
</parameters> </parameters>
</constructor> </constructor>
<constructor cname="dia_dash_style_newv">
<parameters>
<parameter type="gint" name="n_dash"/>
<parameter type="gdouble" name="dashes"/>
</parameters>
</constructor>
</boxed> </boxed>
<struct name="EventButton" cname="DiaEventButton"> <struct name="EventButton" cname="DiaEventButton">
<field cname="type" type="DiaEventType"/> <field cname="type" type="DiaEventType"/>
@ -1738,9 +1836,10 @@
<struct name="Shape" cname="DiaShape"> <struct name="Shape" cname="DiaShape">
<field cname="type" type="DiaShapeType"/> <field cname="type" type="DiaShapeType"/>
<field cname="visibility" bits="4" type="guint"/> <field cname="visibility" bits="4" type="guint"/>
<field cname="update_cnt" bits="28" type="guint"/> <field cname="update_cnt" bits="14" type="guint"/>
<field cname="ref_cnt" bits="14" type="guint"/>
<field cname="color" type="DiaColor"/> <field cname="color" type="DiaColor"/>
<field cname="view_info" type="GList*"/> <field cname="extra_1" type="gpointer"/>
<method name="ArtGetPangoLayout" cname="dia_shape_art_get_pango_layout" shared="true"> <method name="ArtGetPangoLayout" cname="dia_shape_art_get_pango_layout" shared="true">
<return-type type="PangoLayout*"/> <return-type type="PangoLayout*"/>
</method> </method>
@ -1797,12 +1896,6 @@
<method name="GetType" cname="dia_shape_get_type"> <method name="GetType" cname="dia_shape_get_type">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
<method name="GetViewInfo" cname="dia_shape_get_view_info">
<return-type type="DiaShapeViewInfo*"/>
<parameters>
<parameter type="gpointer" name="key"/>
</parameters>
</method>
<method name="Image" cname="dia_shape_image"> <method name="Image" cname="dia_shape_image">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -1848,6 +1941,9 @@
<parameter type="DiaPoint*" name="lower_right"/> <parameter type="DiaPoint*" name="lower_right"/>
</parameters> </parameters>
</method> </method>
<method name="Ref" cname="dia_shape_ref">
<return-type type="DiaShape*"/>
</method>
<method name="RequestUpdate" cname="dia_shape_request_update"> <method name="RequestUpdate" cname="dia_shape_request_update">
<return-type type="void"/> <return-type type="void"/>
</method> </method>
@ -1870,28 +1966,8 @@
<parameter type="const-gchar*" name="text"/> <parameter type="const-gchar*" name="text"/>
</parameters> </parameters>
</method> </method>
<method name="XGetPangoLayout" cname="dia_shape_x_get_pango_layout" shared="true"> <method name="Unref" cname="dia_shape_unref">
<return-type type="PangoLayout*"/>
</method>
<method name="XRender" cname="dia_shape_x_render">
<return-type type="void"/> <return-type type="void"/>
<parameters>
<parameter type="DiaCanvasViewItem*" name="item"/>
<parameter type="GdkDrawable*" name="drawable"/>
<parameter type="int" name="x"/>
<parameter type="int" name="y"/>
<parameter type="int" name="width"/>
<parameter type="int" name="height"/>
</parameters>
</method>
<method name="XUpdate" cname="dia_shape_x_update">
<return-type type="ArtSVP*"/>
<parameters>
<parameter type="DiaCanvasViewItem*" name="item"/>
<parameter type="double*" name="affine"/>
<parameter type="ArtSVP*" name="clip_path"/>
<parameter type="int" name="flags"/>
</parameters>
</method> </method>
</struct> </struct>
<boxed name="ShapeBezier" cname="DiaShapeBezier"> <boxed name="ShapeBezier" cname="DiaShapeBezier">
@ -2268,20 +2344,54 @@
</method> </method>
</boxed> </boxed>
<struct name="ShapeViewInfo" cname="DiaShapeViewInfo"> <struct name="ShapeViewInfo" cname="DiaShapeViewInfo">
<field cname="key" type="gpointer"/> <field cname="shape" type="DiaShape*"/>
<field cname="free_func" type="DiaShapeViewInfoFree"/> <field cname="free_func" type="DiaShapeViewInfoFree"/>
<field cname="data" type="gpointer"/> <field cname="data" type="gpointer"/>
<method name="Clear" cname="dia_shape_view_info_clear"> <method name="Free" cname="dia_shape_view_info_free" shared="true">
<return-type type="void"/>
</method>
<method name="Remove" cname="dia_shape_view_info_remove" shared="true">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="DiaShape*" name="shape"/> <parameter type="DiaCanvasViewItem*" name="item"/>
<parameter type="DiaShapeViewInfo*" name="view_info"/> <parameter type="DiaShapeViewInfo*" name="view_info"/>
</parameters> </parameters>
</method> </method>
<method name="Get" cname="dia_shape_view_info_get" shared="true">
<return-type type="DiaShapeViewInfo*"/>
<parameters>
<parameter type="DiaCanvasViewItem*" name="item"/>
<parameter type="DiaShape*" name="shape"/>
</parameters>
</method>
<constructor cname="dia_shape_view_info_new">
<parameters>
<parameter type="DiaShape*" name="shape"/>
</parameters>
</constructor>
</struct> </struct>
<boxed name="UndoAction" cname="DiaUndoAction">
<field cname="undo" type="DiaUndoFunc"/>
<field cname="redo" type="DiaUndoFunc"/>
<field cname="destroy" type="GDestroyNotify"/>
<method name="Destroy" cname="dia_undo_action_destroy">
<return-type type="void"/>
</method>
<method name="GetType" cname="dia_undo_action_get_type" shared="true">
<return-type type="GType"/>
</method>
<constructor cname="dia_undo_action_new">
<parameters>
<parameter type="gsize" name="sizeof_undo_action"/>
<parameter type="DiaUndoFunc" name="undo"/>
<parameter type="DiaUndoFunc" name="redo"/>
<parameter type="GDestroyNotify" name="destroy"/>
</parameters>
</constructor>
<method name="Redo" cname="dia_undo_action_redo">
<return-type type="void"/>
</method>
<method name="Undo" cname="dia_undo_action_undo">
<return-type type="void"/>
</method>
</boxed>
<struct name="Variable" cname="DiaVariable"> <struct name="Variable" cname="DiaVariable">
<field cname="parent" type="GObject"/> <field cname="parent" type="GObject"/>
<field cname="value" type="gdouble"/> <field cname="value" type="gdouble"/>

12
sample/CanvasTextBox.cs
Просмотреть файл

@ -29,19 +29,9 @@ public class CanvasTextBox : CanvasGroup {
{ {
text = new CanvasText(); text = new CanvasText();
text.Font = FontDescription.FromString ("sans 20"); text.Font = FontDescription.FromString ("sans 20");
text.Text = "Hi, im editable"; text.Text = "Hi, im editable!";
text.Width = 205; text.Width = 205;
text.Height = 100; text.Height = 100;
Add (text); Add (text);
text.EditingDone += new EditingDoneHandler (editing_done);
}
void editing_done (object sender, EditingDoneArgs args)
{
Console.WriteLine ("Editing Done");
// Change view back to text box
// get canvas
// get canvasview
// focus this
} }
} }

23
sample/sample.cs
Просмотреть файл

@ -71,20 +71,14 @@ public class Sample {
textbox.Move (50, 150); textbox.Move (50, 150);
canvas.Root.Add (textbox); canvas.Root.Add (textbox);
// Adding text
Dia.CanvasText text = new Dia.CanvasText();
text.Text = "Hello, World!";
text.Font = FontDescription.FromString ("sans 20");
text.Height = 50;
text.Width = 190;
text.Move (300, 150);
canvas.Root.Add (text);
// Adding line // Adding line
Dia.CanvasLine line = new Dia.CanvasLine(); Dia.CanvasLine line = new Dia.CanvasLine();
line.LineWidth = 10; line.LineWidth = 10;
line.Color = 8327327; line.Color = 8327327;
line.Dash = new double [] { 2, 4, 8, 16, 32 };
// Broke between 0.13 and 0.14
// line.Dash = new double [] { 2, 4, 8, 16, 32 };
line.HeadPos = new Dia.Point (50, 70);; line.HeadPos = new Dia.Point (50, 70);;
line.TailPos = new Dia.Point (200, 250); line.TailPos = new Dia.Point (200, 250);
line.Cap = Dia.CapStyle.Butt; line.Cap = Dia.CapStyle.Butt;
@ -236,8 +230,9 @@ public class Sample {
dialog.Destroy(); dialog.Destroy();
} }
void Undo (object sender, EventArgs args) { canvas.PopUndo(); } // Undo / Redo broke between 0.13 and 0.14
void Redo (object sender, EventArgs args) { canvas.PopRedo(); } void Undo (object sender, EventArgs args) { /* canvas.PopUndo(); */ }
void Redo (object sender, EventArgs args) { /* canvas.PopRedo(); */ }
void ZoomIn (object sender, EventArgs args) { view.Zoom += 0.1; } void ZoomIn (object sender, EventArgs args) { view.Zoom += 0.1; }
@ -255,8 +250,8 @@ public class Sample {
Assembly assembly = Assembly.GetExecutingAssembly(); Assembly assembly = Assembly.GetExecutingAssembly();
string [] authors = new String [] { string [] authors = new String [] {
"Martin Willemoes Hansen <mwh@sysrq.dk> (Maintainer and founder)", "Martin Willemoes Hansen (Maintainer and founder)",
"Mario Fuentes <mario@gnome.cl>", "Mario Fuentes",
}; };
string [] documenters = new String [] {}; string [] documenters = new String [] {};

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

@ -2,7 +2,7 @@
<api filename="../dia/diacanvas-api.raw"> <api filename="../dia/diacanvas-api.raw">
<library name="diacanvas2"> <library name="diacanvas2">
<namespace name="Dia"> <namespace name="Dia">
<dir>diacanvas2-0.13.0/diacanvas</dir> <dir>diacanvas2-0.14.2/diacanvas</dir>
</namespace> </namespace>
</library> </library>
</api> </api>

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

@ -1,4 +1,4 @@
PACKAGE=diacanvas2-0.13.0 PACKAGE=diacanvas2-0.14.2
all: all:
gapi-parser diacanvas-sharp-sources.xml gapi-parser diacanvas-sharp-sources.xml