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

* api/dia-api.xml: 

* sources/Dia.metadata: Hidden the default ctor of
        the PlacementTool.
        * dia/CanvasBox.custom:
        * dia/CanvasImage.custom:
        * dia/CanvasLine.custom: Added creation of PlacementTool for the item.
        * dia/PlacementTool.custom: Removed creation of Box, Image and Line.
        * PROBLEMS: Some problems magically goes away.
        * sample/sample.cs: Updated to accomodate api changes.

svn path=/trunk/diacanvas-sharp/; revision=17842
This commit is contained in:
Martin Willemoes Hansen 2003-09-03 10:16:48 +00:00
Родитель 5b1cb43e4d
Коммит f780414a7d
22 изменённых файлов: 239 добавлений и 50 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -1,3 +1,15 @@
2003-09-03 Martin Willemoes Hansen <mwh@sysrq.dk>
* api/dia-api.xml:
* sources/Dia.metadata: Hidden the default ctor of
the PlacementTool.
* dia/CanvasBox.custom:
* dia/CanvasImage.custom:
* dia/CanvasLine.custom: Added creation of PlacementTool for the item.
* dia/PlacementTool.custom: Removed creation of Box, Image and Line.
* PROBLEMS: Some problems magically goes away.
* sample/sample.cs: Updated to accomodate api changes.
2003-08-31 Martin Willemoes Hansen <mwh@sysrq.dk>
* api/dia-api.xml:

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

@ -56,7 +56,6 @@ Crashes
-------
o Select all, then try to move stuff around.
o Place an image 3 times.
================================================================================

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

@ -1387,7 +1387,7 @@
</parameters>
</method>
</object>
<object name="PlacementTool" cname="DiaPlacementTool" parent="DiaTool">
<object name="PlacementTool" cname="DiaPlacementTool" parent="DiaTool" disabledefaultconstructor="1">
<field cname="object_type" type="GType"/>
<field cname="n_params" type="guint"/>
<field cname="params" type="GParameter*"/>

10
dia/CanvasBox.custom
Просмотреть файл

@ -10,3 +10,13 @@ public CanvasBox() {
Raw = ItemCreate (CanvasBox.GType).Handle;
}
[DllImport("diacanvas2")]
extern static IntPtr dia_placement_tool_new (uint object_type,
IntPtr dummy);
public static PlacementTool PlacementTool()
{
return new PlacementTool (dia_placement_tool_new (CanvasBox.GType,
IntPtr.Zero));
}

16
dia/CanvasImage.custom
Просмотреть файл

@ -12,3 +12,19 @@ public CanvasImage (Gdk.Pixbuf pixbuf) {
Width = pixbuf.Width;
Height = pixbuf.Height;
}
[DllImport("diacanvas2")]
extern static IntPtr dia_placement_tool_new (uint object_type,
IntPtr image, IntPtr pixbuf,
IntPtr width, double wid,
IntPtr height, double hei,
IntPtr dummy);
public static PlacementTool PlacementTool (Gdk.Pixbuf pixbuf)
{
return new PlacementTool (dia_placement_tool_new (CanvasImage.GType,
Marshal.StringToHGlobalAnsi ("image"), pixbuf.Handle,
Marshal.StringToHGlobalAnsi ("width"), pixbuf.Width,
Marshal.StringToHGlobalAnsi ("height"), pixbuf.Height,
IntPtr.Zero));
}

27
dia/CanvasLine.custom
Просмотреть файл

@ -10,6 +10,33 @@ public CanvasLine() {
Raw = ItemCreate (CanvasLine.GType).Handle;
}
// Takes care of constructing the Line when its going to be placed with a
// PlacementTool.
[DllImport("diacanvas2")]
extern static IntPtr dia_placement_tool_new (uint object_type,
IntPtr dummy);
public static PlacementTool PlacementTool()
{
return new PlacementTool (dia_placement_tool_new (CanvasLine.GType,
IntPtr.Zero));
}
[DllImport("diacanvas2")]
extern static IntPtr dia_placement_tool_new (uint object_type,
IntPtr lw, double line_width,
IntPtr col, ulong color,
IntPtr dummy);
public static PlacementTool PlacementTool (double line_width, ulong color)
{
return new PlacementTool (dia_placement_tool_new (CanvasLine.GType,
Marshal.StringToHGlobalAnsi ("line_width"), line_width,
Marshal.StringToHGlobalAnsi ("color"), color,
IntPtr.Zero));
}
// Struct marshalling bug workaround
[DllImport ("diasharpglue")]
extern static void diasharp_canvas_line_set_point_property (IntPtr line,
string property,

26
dia/PlacementTool.custom
Просмотреть файл

@ -9,30 +9,8 @@
[DllImport("diacanvas2")]
extern static IntPtr dia_placement_tool_new (uint object_type, IntPtr dummy);
public static PlacementTool Line()
public PlacementTool()
{
return new PlacementTool (dia_placement_tool_new (CanvasLine.GType,
IntPtr.Zero));
Raw = dia_placement_tool_new (CanvasLine.GType, IntPtr.Zero);
}
public static PlacementTool Box()
{
return new PlacementTool (dia_placement_tool_new (CanvasBox.GType,
IntPtr.Zero));
}
[DllImport("diacanvas2")]
extern static IntPtr dia_placement_tool_new (uint object_type,
IntPtr image, IntPtr pixbuf,
IntPtr width, double wid,
IntPtr height, double hei,
IntPtr dummy);
public static PlacementTool Image (Gdk.Pixbuf pixbuf)
{
return new PlacementTool (dia_placement_tool_new (CanvasImage.GType,
Marshal.StringToHGlobalAnsi ("image"), pixbuf.Handle,
Marshal.StringToHGlobalAnsi ("width"), pixbuf.Width,
Marshal.StringToHGlobalAnsi ("height"), pixbuf.Height,
IntPtr.Zero));
}

13
doc/en/Dia/CanvasBox.xml
Просмотреть файл

@ -168,5 +168,18 @@
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="PlacementTool">
<MemberSignature Language="C#" Value="public static Dia.PlacementTool PlacementTool ();" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>Dia.PlacementTool</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>To be added</summary>
<returns>a <see cref="T:Dia.PlacementTool" /></returns>
<remarks>To be added</remarks>
</Docs>
</Member>
</Members>
</Type>

19
doc/en/Dia/CanvasEditable.xml
Просмотреть файл

@ -35,7 +35,7 @@
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="ChangeText">
<Member MemberName="ChangeText" Deprecated="true">
<MemberSignature Language="C#" Value="public virtual void ChangeText (Dia.ShapeText text_shape, string new_text, Dia.Rectangle new_bounds);" />
<MemberType>Method</MemberType>
<ReturnValue>
@ -101,5 +101,22 @@
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="ChangeText">
<MemberSignature Language="C#" Value="public virtual void ChangeText (Dia.ShapeText text_shape, string new_text);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="text_shape" Type="Dia.ShapeText" />
<Parameter Name="new_text" Type="System.String" />
</Parameters>
<Docs>
<summary>To be added</summary>
<param name="text_shape">a <see cref="T:Dia.ShapeText" /></param>
<param name="new_text">a <see cref="T:System.String" /></param>
<remarks>To be added</remarks>
</Docs>
</Member>
</Members>
</Type>

30
doc/en/Dia/CanvasGroup.xml
Просмотреть файл

@ -275,5 +275,35 @@
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="AddConstruction">
<MemberSignature Language="C#" Value="public virtual void AddConstruction (Dia.CanvasItem item);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="item" Type="Dia.CanvasItem" />
</Parameters>
<Docs>
<summary>To be added</summary>
<param name="item">a <see cref="T:Dia.CanvasItem" /></param>
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="RemoveDestruction">
<MemberSignature Language="C#" Value="public virtual void RemoveDestruction (Dia.CanvasItem item);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="item" Type="Dia.CanvasItem" />
</Parameters>
<Docs>
<summary>To be added</summary>
<param name="item">a <see cref="T:Dia.CanvasItem" /></param>
<remarks>To be added</remarks>
</Docs>
</Member>
</Members>
</Type>

30
doc/en/Dia/CanvasGroupable.xml
Просмотреть файл

@ -149,5 +149,35 @@
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="AddConstruction">
<MemberSignature Language="C#" Value="public virtual void AddConstruction (Dia.CanvasItem item);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="item" Type="Dia.CanvasItem" />
</Parameters>
<Docs>
<summary>To be added</summary>
<param name="item">a <see cref="T:Dia.CanvasItem" /></param>
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="RemoveDestruction">
<MemberSignature Language="C#" Value="public virtual void RemoveDestruction (Dia.CanvasItem item);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="item" Type="Dia.CanvasItem" />
</Parameters>
<Docs>
<summary>To be added</summary>
<param name="item">a <see cref="T:Dia.CanvasItem" /></param>
<remarks>To be added</remarks>
</Docs>
</Member>
</Members>
</Type>

16
doc/en/Dia/CanvasImage.xml
Просмотреть файл

@ -107,5 +107,21 @@
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="PlacementTool">
<MemberSignature Language="C#" Value="public static Dia.PlacementTool PlacementTool (Gdk.Pixbuf pixbuf);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>Dia.PlacementTool</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="pixbuf" Type="Gdk.Pixbuf" />
</Parameters>
<Docs>
<summary>To be added</summary>
<param name="pixbuf">a <see cref="T:Gdk.Pixbuf" /></param>
<returns>a <see cref="T:Dia.PlacementTool" /></returns>
<remarks>To be added</remarks>
</Docs>
</Member>
</Members>
</Type>

4
doc/en/Dia/CanvasItem.xml
Просмотреть файл

@ -243,7 +243,7 @@
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="AddConstruction">
<Member MemberName="AddConstruction" Deprecated="true">
<MemberSignature Language="C#" Value="public void AddConstruction (Dia.CanvasItem item);" />
<MemberType>Method</MemberType>
<ReturnValue>
@ -436,7 +436,7 @@
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="RemoveDestruction">
<Member MemberName="RemoveDestruction" Deprecated="true">
<MemberSignature Language="C#" Value="public void RemoveDestruction (Dia.CanvasItem item);" />
<MemberType>Method</MemberType>
<ReturnValue>

13
doc/en/Dia/CanvasLine.xml
Просмотреть файл

@ -538,5 +538,18 @@
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="PlacementTool">
<MemberSignature Language="C#" Value="public static Dia.PlacementTool PlacementTool ();" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>Dia.PlacementTool</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>To be added</summary>
<returns>a <see cref="T:Dia.PlacementTool" /></returns>
<remarks>To be added</remarks>
</Docs>
</Member>
</Members>
</Type>

19
doc/en/Dia/CanvasText.xml
Просмотреть файл

@ -58,7 +58,7 @@
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="ChangeText">
<Member MemberName="ChangeText" Deprecated="true">
<MemberSignature Language="C#" Value="public virtual void ChangeText (Dia.ShapeText text_shape, string new_text, Dia.Rectangle new_bounds);" />
<MemberType>Method</MemberType>
<ReturnValue>
@ -363,5 +363,22 @@
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="ChangeText">
<MemberSignature Language="C#" Value="public virtual void ChangeText (Dia.ShapeText text_shape, string new_text);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="text_shape" Type="Dia.ShapeText" />
<Parameter Name="new_text" Type="System.String" />
</Parameters>
<Docs>
<summary>To be added</summary>
<param name="text_shape">a <see cref="T:Dia.ShapeText" /></param>
<param name="new_text">a <see cref="T:System.String" /></param>
<remarks>To be added</remarks>
</Docs>
</Member>
</Members>
</Type>

17
doc/en/Dia/PlacementTool.xml
Просмотреть файл

@ -25,7 +25,7 @@
</Interfaces>
<Attributes />
<Members>
<Member MemberName="Line">
<Member MemberName="Line" Deprecated="true">
<MemberSignature Language="C#" Value="public static Dia.PlacementTool Line ();" />
<MemberType>Method</MemberType>
<ReturnValue>
@ -38,7 +38,7 @@
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="Box">
<Member MemberName="Box" Deprecated="true">
<MemberSignature Language="C#" Value="public static Dia.PlacementTool Box ();" />
<MemberType>Method</MemberType>
<ReturnValue>
@ -51,7 +51,7 @@
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="Image">
<Member MemberName="Image" Deprecated="true">
<MemberSignature Language="C#" Value="public static Dia.PlacementTool Image (Gdk.Pixbuf pixbuf);" />
<MemberType>Method</MemberType>
<ReturnValue>
@ -130,5 +130,16 @@
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName=".ctor">
<MemberSignature Language="C#" Value="public PlacementTool ();" />
<MemberType>Constructor</MemberType>
<ReturnValue />
<Parameters />
<Docs>
<summary>To be added</summary>
<returns>a <see cref="T:Dia.PlacementTool" /></returns>
<remarks>To be added</remarks>
</Docs>
</Member>
</Members>
</Type>

2
doc/en/Dia/Shape.xml
Просмотреть файл

@ -282,7 +282,7 @@
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="GetViewInfo">
<Member MemberName="GetViewInfo" Deprecated="true">
<MemberSignature Language="C#" Value="public Dia.ShapeViewInfo GetViewInfo (IntPtr key);" />
<MemberType>Method</MemberType>
<ReturnValue>

2
doc/en/Dia/ShapeViewInfoFree.xml
Просмотреть файл

@ -1,5 +1,5 @@
<Type Name="ShapeViewInfoFree" FullName="Dia.ShapeViewInfoFree">
<TypeSignature Language="C#" Value="public sealed delegate void ShapeViewInfoFree (Dia.ShapeViewInfo item_info);" Maintainer="auto" />
<TypeSignature Language="C#" Maintainer="auto" Value="public sealed delegate void ShapeViewInfoFree ();" />
<AssemblyInfo>
<AssemblyName>dia-sharp</AssemblyName>
<AssemblyPublicKey></AssemblyPublicKey>

2
doc/en/DiaSharp/TextChangedArgs.xml
Просмотреть файл

@ -53,7 +53,7 @@
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="NewBounds">
<Member MemberName="NewBounds" Deprecated="true">
<MemberSignature Language="C#" Value="public Dia.Rectangle NewBounds { get; };" />
<MemberType>Property</MemberType>
<ReturnValue>

11
patches/parser/AdditionOfAssemblyTag.diff
Просмотреть файл

@ -4,13 +4,16 @@ RCS file: /cvs/public/gtk-sharp/parser/gapi.pl,v
retrieving revision 1.1
diff -u -r1.1 gapi.pl
--- parser/gapi.pl 20 Aug 2002 20:35:42 -0000 1.1
+++ parser/gapi.pl 31 Aug 2003 08:15:07 -0000
@@ -28,10 +28,10 @@
+++ parser/gapi.pl 1 Sep 2003 20:46:36 -0000
@@ -28,10 +28,13 @@
}
foreach $entry (@srcs) {
- ($dir, $ns, $lib) = @$entry;
+ ($dir, $ns, $lib, $assembly) = @$entry;
+ if (!$assembly) {
+ $assembly = "";
+ }
print "hi $ns\n";
$file = $files{$ns};
- system ("gapi_pp.pl $dir | gapi2xml.pl $ns $file $lib");
@ -24,7 +27,7 @@ RCS file: /cvs/public/gtk-sharp/parser/gapi2xml.pl,v
retrieving revision 1.40
diff -u -r1.40 gapi2xml.pl
--- parser/gapi2xml.pl 15 Jul 2003 05:52:08 -0000 1.40
+++ parser/gapi2xml.pl 31 Aug 2003 08:15:07 -0000
+++ parser/gapi2xml.pl 1 Sep 2003 20:46:36 -0000
@@ -3,8 +3,10 @@
# gapi2xml.pl : Generates an XML representation of GObject based APIs.
#
@ -68,7 +71,7 @@ RCS file: /cvs/public/gtk-sharp/sources/gtk-sharp.sources,v
retrieving revision 1.20
diff -u -r1.20 gtk-sharp.sources
--- sources/gtk-sharp.sources 26 Aug 2003 21:35:28 -0000 1.20
+++ sources/gtk-sharp.sources 31 Aug 2003 08:15:07 -0000
+++ sources/gtk-sharp.sources 1 Sep 2003 20:46:36 -0000
@@ -9,7 +9,7 @@
libgnomeprint-2.2.1.3/libgnomeprint Gnome gnomeprint-2-2
libgnomeprintui-2.2.1.3/libgnomeprintui Gnome gnomeprint-2-2

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

@ -48,12 +48,8 @@ public class Sample {
CanvasLine line = new CanvasLine();
line.LineWidth = 10;
line.Color = 8327327;
Dia.Point p1 = new Dia.Point (50, 50);
Dia.Point p2 = new Dia.Point (100, 150);
line.HeadPos = p1;
line.TailPos = p2;
line.HeadPos = new Dia.Point (50, 50);;
line.TailPos = new Dia.Point (100, 150);
line.Cap = Dia.CapStyle.Butt;
line.Move (100, 150);
canvas.Root.Add (line);
@ -101,21 +97,21 @@ public class Sample {
void LineTool (object sender, EventArgs args)
{
ToolCleanUp();
view.Tool = PlacementTool.Line();
view.Tool = CanvasLine.PlacementTool (4, 480975);
view.Tool.ButtonReleaseEvent += new DiaSharp.ButtonReleaseEventHandler (UnsetTool);
}
void BoxTool (object sender, EventArgs args)
{
ToolCleanUp();
view.Tool = PlacementTool.Box();
view.Tool = CanvasBox.PlacementTool ();
view.Tool.ButtonReleaseEvent += new DiaSharp.ButtonReleaseEventHandler (UnsetTool);
}
void ImageTool (object sender, EventArgs args)
{
ToolCleanUp();
view.Tool = PlacementTool.Image (new Pixbuf (null, "pixmaps/logo.png"));
view.Tool = CanvasImage.PlacementTool (new Pixbuf (null, "pixmaps/logo.png"));
view.Tool.ButtonReleaseEvent += new DiaSharp.ButtonReleaseEventHandler (UnsetTool);
}

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

@ -244,10 +244,11 @@
<!-- disable default constructor -->
<rule>
<class name="DiaCanvasLine"/>
<class name="DiaCanvasBox"/>
<class name="DiaCanvasImage"/>
<class name="DiaCanvasLine"/>
<class name="DiaCanvasText"/>
<class name="DiaPlacementTool"/>
<data>
<attribute target="class">
<name>disabledefaultconstructor</name>