* sources/makefile: Targets DiaCanvas2-0.12.0
* sources/diacanvas-sharp-sources.xml: Ditto * NEWS: Ditto * configure.in: Targets new Mono, Gtk# and DiaCanvas2 * sample/makefile.am: Uses resource id's * sample/sample.cs: Ditto svn path=/trunk/diacanvas-sharp/; revision=25086
This commit is contained in:
Родитель
402b956e98
Коммит
2bf9ab05c5
|
@ -1,3 +1,12 @@
|
||||||
|
2004-04-06 Martin Willemoes Hansen <mwh@sysrq.dk>
|
||||||
|
|
||||||
|
* sources/makefile: Targets DiaCanvas2-0.12.0
|
||||||
|
* sources/diacanvas-sharp-sources.xml: Ditto
|
||||||
|
* NEWS: Ditto
|
||||||
|
* configure.in: Targets new Mono, Gtk# and DiaCanvas2
|
||||||
|
* sample/makefile.am: Uses resource id's
|
||||||
|
* sample/sample.cs: Ditto
|
||||||
|
|
||||||
2004-03-02 Martin Willemoes Hansen <mwh@sysrq.dk>
|
2004-03-02 Martin Willemoes Hansen <mwh@sysrq.dk>
|
||||||
|
|
||||||
* dia/Dia.metadata: Marked Shape and Variable opaque.
|
* dia/Dia.metadata: Marked Shape and Variable opaque.
|
||||||
|
|
1
NEWS
1
NEWS
|
@ -3,6 +3,7 @@
|
||||||
|
|
||||||
* Bugfixes
|
* Bugfixes
|
||||||
* API updated
|
* API updated
|
||||||
|
* Targets DiaCanvas2-0.12.0
|
||||||
|
|
||||||
0.3.0
|
0.3.0
|
||||||
=====
|
=====
|
||||||
|
|
10
configure.in
10
configure.in
|
@ -19,15 +19,15 @@ if test "x$PKG_CONFIG" = "xno"; then
|
||||||
fi
|
fi
|
||||||
AC_SUBST(MONO)
|
AC_SUBST(MONO)
|
||||||
|
|
||||||
PKG_CHECK_MODULES(MONO, mono >= 0.30.2)
|
PKG_CHECK_MODULES(MONO, mono >= 0.31)
|
||||||
AC_SUBST(MONO_CFLAGS)
|
AC_SUBST(MONO_CFLAGS)
|
||||||
AC_SUBST(MONO_LIBS)
|
AC_SUBST(MONO_LIBS)
|
||||||
|
|
||||||
PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp >= 0.17)
|
PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp >= 0.18)
|
||||||
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.10.0)
|
PKG_CHECK_MODULES(DIACANVAS2, diacanvas2 >= 0.12.0)
|
||||||
AC_SUBST(DIACANVAS2_CFLAGS)
|
AC_SUBST(DIACANVAS2_CFLAGS)
|
||||||
AC_SUBST(DIACANVAS2_LIBS)
|
AC_SUBST(DIACANVAS2_LIBS)
|
||||||
|
|
||||||
|
@ -55,9 +55,9 @@ if test "x$GAPI_FIXUP" = "xno"; then
|
||||||
fi
|
fi
|
||||||
AC_SUBST(GAPI_FIXUP)
|
AC_SUBST(GAPI_FIXUP)
|
||||||
|
|
||||||
AC_PATH_PROG(GAPI_CODEGEN, gapi_codegen, no)
|
AC_PATH_PROG(GAPI_CODEGEN, gapi-codegen, no)
|
||||||
if test "x$GAPI_CODEGEN" = "xno"; then
|
if test "x$GAPI_CODEGEN" = "xno"; then
|
||||||
AC_MSG_CHECKING(for gapi-codegen.exe)
|
AC_MSG_CHECKING(for gapi_codegen.exe)
|
||||||
GAPI_CODEGEN=`which gapi_codegen.exe 2> /dev/null`
|
GAPI_CODEGEN=`which gapi_codegen.exe 2> /dev/null`
|
||||||
if test "x$GAPI_CODEGEN" = "xno" ; then
|
if test "x$GAPI_CODEGEN" = "xno" ; then
|
||||||
AC_MSG_ERROR(['gapi_codegen'/'gapi_codegen.exe' not found.])
|
AC_MSG_ERROR(['gapi_codegen'/'gapi_codegen.exe' not found.])
|
||||||
|
|
|
@ -179,22 +179,22 @@
|
||||||
</method>
|
</method>
|
||||||
</interface>
|
</interface>
|
||||||
<interface name="CanvasGroupable" cname="DiaCanvasGroupable">
|
<interface name="CanvasGroupable" cname="DiaCanvasGroupable">
|
||||||
<signal cname="add" when="LAST" name="Added">
|
<signal cname="add" when="FIRST" name="Added">
|
||||||
<return-type type="gboolean" />
|
<return-type type="void" />
|
||||||
<parameters>
|
<parameters>
|
||||||
<parameter type="DiaCanvasGroupable*" name="group" />
|
<parameter type="DiaCanvasGroupable*" name="group" />
|
||||||
<parameter type="DiaCanvasItem*" name="item" />
|
<parameter type="DiaCanvasItem*" name="item" />
|
||||||
</parameters>
|
</parameters>
|
||||||
</signal>
|
</signal>
|
||||||
<signal cname="remove" when="LAST" name="Removed">
|
<signal cname="remove" when="FIRST" name="Removed">
|
||||||
<return-type type="gboolean" />
|
<return-type type="void" />
|
||||||
<parameters>
|
<parameters>
|
||||||
<parameter type="DiaCanvasGroupable*" name="group" />
|
<parameter type="DiaCanvasGroupable*" name="group" />
|
||||||
<parameter type="DiaCanvasItem*" name="item" />
|
<parameter type="DiaCanvasItem*" name="item" />
|
||||||
</parameters>
|
</parameters>
|
||||||
</signal>
|
</signal>
|
||||||
<method name="Add" cname="dia_canvas_groupable_add">
|
<method name="Add" cname="dia_canvas_groupable_add">
|
||||||
<return-type type="gboolean" />
|
<return-type type="void" />
|
||||||
<parameters>
|
<parameters>
|
||||||
<parameter type="DiaCanvasItem*" name="item" />
|
<parameter type="DiaCanvasItem*" name="item" />
|
||||||
</parameters>
|
</parameters>
|
||||||
|
@ -230,7 +230,7 @@
|
||||||
</parameters>
|
</parameters>
|
||||||
</method>
|
</method>
|
||||||
<method name="Remove" cname="dia_canvas_groupable_remove">
|
<method name="Remove" cname="dia_canvas_groupable_remove">
|
||||||
<return-type type="gboolean" />
|
<return-type type="void" />
|
||||||
<parameters>
|
<parameters>
|
||||||
<parameter type="DiaCanvasItem*" name="item" />
|
<parameter type="DiaCanvasItem*" name="item" />
|
||||||
</parameters>
|
</parameters>
|
||||||
|
@ -299,6 +299,12 @@
|
||||||
<property name="GridColor" cname="grid_color" type="ulong" readable="true" writeable="true" />
|
<property name="GridColor" cname="grid_color" type="ulong" readable="true" writeable="true" />
|
||||||
<property name="GridBg" cname="grid_bg" type="ulong" readable="true" writeable="true" />
|
<property name="GridBg" cname="grid_bg" type="ulong" readable="true" writeable="true" />
|
||||||
<property name="PangoLayout" cname="pango_layout" type="PangoLayout" readable="true" />
|
<property name="PangoLayout" cname="pango_layout" type="PangoLayout" readable="true" />
|
||||||
|
<virtual_method name="Update" cname="update">
|
||||||
|
<return-type type="void" />
|
||||||
|
<parameters>
|
||||||
|
<parameter type="DiaCanvas*" name="canvas" />
|
||||||
|
</parameters>
|
||||||
|
</virtual_method>
|
||||||
<method name="AddConstraint" cname="dia_canvas_add_constraint">
|
<method name="AddConstraint" cname="dia_canvas_add_constraint">
|
||||||
<return-type type="void" />
|
<return-type type="void" />
|
||||||
<parameters>
|
<parameters>
|
||||||
|
@ -585,6 +591,37 @@
|
||||||
<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" writeable="true" />
|
||||||
|
<virtual_method name="Update" cname="update">
|
||||||
|
<return-type type="void" />
|
||||||
|
<parameters>
|
||||||
|
<parameter type="DiaCanvasItem*" name="item" />
|
||||||
|
<parameter type="gdouble" array="true" name="affine" />
|
||||||
|
</parameters>
|
||||||
|
</virtual_method>
|
||||||
|
<virtual_method name="ShapeNext" cname="shape_next">
|
||||||
|
<return-type type="gboolean" />
|
||||||
|
<parameters>
|
||||||
|
<parameter type="DiaCanvasItem*" name="item" />
|
||||||
|
<parameter type="DiaCanvasIter*" name="iter" />
|
||||||
|
</parameters>
|
||||||
|
</virtual_method>
|
||||||
|
<virtual_method name="Point" cname="point">
|
||||||
|
<return-type type="gdouble" />
|
||||||
|
<parameters>
|
||||||
|
<parameter type="DiaCanvasItem*" name="item" />
|
||||||
|
<parameter type="gdouble" name="x" />
|
||||||
|
<parameter type="gdouble" name="y" />
|
||||||
|
</parameters>
|
||||||
|
</virtual_method>
|
||||||
|
<virtual_method name="Glue" cname="glue">
|
||||||
|
<return-type type="gdouble" />
|
||||||
|
<parameters>
|
||||||
|
<parameter type="DiaCanvasItem*" name="item" />
|
||||||
|
<parameter type="DiaHandle*" name="handle" />
|
||||||
|
<parameter type="gdouble*" name="wx" />
|
||||||
|
<parameter type="gdouble*" name="wy" />
|
||||||
|
</parameters>
|
||||||
|
</virtual_method>
|
||||||
<method name="AffineGetType" cname="dia_canvas_item_affine_get_type" shared="true">
|
<method name="AffineGetType" cname="dia_canvas_item_affine_get_type" shared="true">
|
||||||
<return-type type="GType" />
|
<return-type type="GType" />
|
||||||
</method>
|
</method>
|
||||||
|
|
|
@ -9,14 +9,14 @@ ASSEMBLIES= -r glib-sharp \
|
||||||
-r gnome-sharp \
|
-r gnome-sharp \
|
||||||
-r ../dia/diacanvas-sharp.dll
|
-r ../dia/diacanvas-sharp.dll
|
||||||
|
|
||||||
RESOURCES= -resource:glade/gui.glade \
|
RESOURCES= -resource:glade/gui.glade,gui.glade \
|
||||||
-resource:pixmaps/logo.png \
|
-resource:pixmaps/logo.png,logo.png \
|
||||||
-resource:pixmaps/selection.png \
|
-resource:pixmaps/selection.png,selection.png \
|
||||||
-resource:pixmaps/gimp-zoom.png \
|
-resource:pixmaps/gimp-zoom.png,gimp-zoom.png \
|
||||||
-resource:pixmaps/line.png \
|
-resource:pixmaps/line.png,line.png \
|
||||||
-resource:pixmaps/box.png \
|
-resource:pixmaps/box.png,box.png \
|
||||||
-resource:pixmaps/glade-image.png \
|
-resource:pixmaps/glade-image.png,glade-image.png \
|
||||||
-resource:pixmaps/text.png
|
-resource:pixmaps/text.png,text.png
|
||||||
|
|
||||||
SAMPLE= sample.exe
|
SAMPLE= sample.exe
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,7 @@ public class Sample {
|
||||||
|
|
||||||
public Sample()
|
public Sample()
|
||||||
{
|
{
|
||||||
XML gui = new XML (null, "glade/gui.glade", "main", null);
|
XML gui = new XML (null, "gui.glade", "main", null);
|
||||||
gui.Autoconnect (this);
|
gui.Autoconnect (this);
|
||||||
|
|
||||||
canvas = new Dia.Canvas();
|
canvas = new Dia.Canvas();
|
||||||
|
@ -53,11 +53,11 @@ public class Sample {
|
||||||
[Glade.Widget] Gtk.Image image1, image2, image3, image4, image5;
|
[Glade.Widget] Gtk.Image image1, image2, image3, image4, image5;
|
||||||
void SetupTools()
|
void SetupTools()
|
||||||
{
|
{
|
||||||
image1.Pixbuf = new Pixbuf (null, "pixmaps/selection.png");
|
image1.Pixbuf = new Pixbuf (null, "selection.png");
|
||||||
image2.Pixbuf = new Pixbuf (null, "pixmaps/gimp-zoom.png");
|
image2.Pixbuf = new Pixbuf (null, "gimp-zoom.png");
|
||||||
image3.Pixbuf = new Pixbuf (null, "pixmaps/line.png");
|
image3.Pixbuf = new Pixbuf (null, "line.png");
|
||||||
image4.Pixbuf = new Pixbuf (null, "pixmaps/box.png");
|
image4.Pixbuf = new Pixbuf (null, "box.png");
|
||||||
image5.Pixbuf = new Pixbuf (null, "pixmaps/glade-image.png");
|
image5.Pixbuf = new Pixbuf (null, "glade-image.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
void CreateItemsProgramatically() {
|
void CreateItemsProgramatically() {
|
||||||
|
@ -95,7 +95,7 @@ public class Sample {
|
||||||
//figure.Move (50, 250);
|
//figure.Move (50, 250);
|
||||||
//canvas.Root.Add (figure);
|
//canvas.Root.Add (figure);
|
||||||
|
|
||||||
CanvasImage image = new CanvasImage (new Pixbuf (null, "pixmaps/logo.png"));
|
CanvasImage image = new CanvasImage (new Pixbuf (null, "logo.png"));
|
||||||
image.Move (50, 50);
|
image.Move (50, 50);
|
||||||
canvas.Root.Add (image);
|
canvas.Root.Add (image);
|
||||||
|
|
||||||
|
@ -137,7 +137,7 @@ public class Sample {
|
||||||
|
|
||||||
void ImageTool (object sender, EventArgs args)
|
void ImageTool (object sender, EventArgs args)
|
||||||
{
|
{
|
||||||
Pixbuf pixbuf = new Pixbuf (null, "pixmaps/logo.png");
|
Pixbuf pixbuf = new Pixbuf (null, "logo.png");
|
||||||
view.Tool = new PlacementTool (typeof (CanvasImage),
|
view.Tool = new PlacementTool (typeof (CanvasImage),
|
||||||
"Image", pixbuf,
|
"Image", pixbuf,
|
||||||
"Width", pixbuf.Width,
|
"Width", pixbuf.Width,
|
||||||
|
@ -247,7 +247,7 @@ public class Sample {
|
||||||
|
|
||||||
string [] documenters = new String [] {};
|
string [] documenters = new String [] {};
|
||||||
string translators = null;
|
string translators = null;
|
||||||
Pixbuf pixbuf = new Pixbuf(null, "pixmaps/logo.png");
|
Pixbuf pixbuf = new Pixbuf(null, "logo.png");
|
||||||
|
|
||||||
new Gnome.About ("DiaCanvas# Sample", "0.1",
|
new Gnome.About ("DiaCanvas# Sample", "0.1",
|
||||||
@"Copyright (C) 2003 Martin Willemoes Hansen
|
@"Copyright (C) 2003 Martin Willemoes Hansen
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<api filename="../dia/diacanvas-api.xml">
|
<api filename="../dia/diacanvas-api.xml">
|
||||||
<library name="diacanvas2">
|
<library name="diacanvas2">
|
||||||
<namespace name="Dia">
|
<namespace name="Dia">
|
||||||
<dir>diacanvas2-0.10.0/src</dir>
|
<dir>diacanvas2-0.12.0/diacanvas</dir>
|
||||||
</namespace>
|
</namespace>
|
||||||
</library>
|
</library>
|
||||||
</api>
|
</api>
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
PACKAGE=diacanvas2-0.10.0
|
PACKAGE=diacanvas2-0.12.0
|
||||||
|
|
||||||
all:
|
all:
|
||||||
gapi-parser diacanvas-sharp-sources.xml
|
gapi-parser diacanvas-sharp-sources.xml
|
||||||
|
|
||||||
get-source-code:
|
get-source-code:
|
||||||
wget http://aleron.dl.sourceforge.net/sourceforge/diacanvas/$(PACKAGE).tar.gz \
|
wget http://dl.sourceforge.net/sourceforge/diacanvas/$(PACKAGE).tar.gz \
|
||||||
--output-document=- | tar -xz;
|
--output-document=- | tar -xz;
|
||||||
|
|
||||||
#export CVS_PASSWORD=""
|
#export CVS_PASSWORD=""
|
||||||
|
|
Загрузка…
Ссылка в новой задаче