[Mono-devel-list] Patch for System.Drawing.Design (in System.Drawing.Design.dll)
A - Soft Technologies
A-Soft at A-SoftTech.com
Tue Jun 17 09:49:03 EDT 2003
Hi,
here is another patch for review and commiting. This time it's the
System.Drawing.Design namespace in the System.Drawing.Design dll (not to be
confused with System.Drawing.Design in System.Drawing assembly)
This patch may need my other patches to System.Componentmodel namespace and
System.Drawing.Design which are still not commited.
Also attatched is a newly created Changelog file that goes into the
/mono/mcs/class/System.Drawing.Design/System.Drawing.Design folder.
A.Nahr
Index: ChangeLog
===================================================================
RCS file: /mono/mcs/class/System.Drawing.Design/ChangeLog,v
retrieving revision 1.2
diff -u -r1.2 ChangeLog
--- ChangeLog 8 Apr 2003 06:10:25 -0000 1.2
+++ ChangeLog 17 Jun 2003 13:47:59 -0000
@@ -1,3 +1,7 @@
+2003-06-17 Andreas Nahr <ClassDevelopment at A-SoftTech.com>
+
+ * Added System.Windows.Forms to makefile.gnu
+
2003-04-07 Martin Willemoes Hansen <mwh at sysrq.dk>
* Stubed rest of System.Drawing.Design
Index: makefile.gnu
===================================================================
RCS file: /mono/mcs/class/System.Drawing.Design/makefile.gnu,v
retrieving revision 1.1
diff -u -r1.1 makefile.gnu
--- makefile.gnu 31 Mar 2003 13:29:54 -0000 1.1
+++ makefile.gnu 17 Jun 2003 13:47:59 -0000
@@ -3,7 +3,7 @@
LIBRARY = $(topdir)/class/lib/System.Drawing.Design.dll
LIB_LIST = list.unix
-LIB_FLAGS = -r corlib -r System -r System.Drawing
+LIB_FLAGS = -r corlib -r System -r System.Drawing -r System.Windows.Forms
SOURCES_INCLUDE=*.cs
SOURCES_EXCLUDE=./Test*
Index: BitmapEditor.cs
===================================================================
RCS file:
/mono/mcs/class/System.Drawing.Design/System.Drawing.Design/BitmapEditor.cs,
v
retrieving revision 1.2
diff -u -r1.2 BitmapEditor.cs
--- BitmapEditor.cs 8 Apr 2003 06:10:25 -0000 1.2
+++ BitmapEditor.cs 17 Jun 2003 13:42:15 -0000
@@ -1,43 +1,35 @@
//
-// System.Drawing.Design.BitmapEditor
-//
-// Authors:
-// Martin Willemoes Hansen (mwh at sysrq.dk)
-//
-// (C) 2003 Martin Willemoes Hansen
-//
-
+// System.Drawing.Design.BitmapEditor.cs
+//
+// Authors:
// Martin Willemoes Hansen (mwh at sysrq.dk)
// Andreas Nahr (ClassDevelopment at A-SoftTech.com)
+//
// (C) 2003 Martin Willemoes Hansen
// (C) 2003 Andreas Nahr
+//
+using System;
using System.IO;
-
+using System.Drawing;
namespace System.Drawing.Design
{
public class BitmapEditor : ImageEditor
{
- [MonoTODO]
+
public BitmapEditor()
{
}
protected override string[] GetExtensions()
{
- throw new NotImplementedException();
+ return new string[] {"*.bmp", "*.gif", "*.jpg", "*.jpeg", "*.png",
"*.ico"};
}
- [MonoTODO]
protected override string GetFileDialogDescription()
{
- throw new NotImplementedException();
+ // FIXME: Add multilanguage support
+ return "All bitmap files";
}
- [MonoTODO]
protected override Image LoadFromStream (Stream stream)
{
- throw new NotImplementedException();
- }
-
- [MonoTODO]
- ~BitmapEditor()
- {
+ return new Bitmap (stream);
}
}
-}
+}
Index: ColorEditor.cs
===================================================================
RCS file:
/mono/mcs/class/System.Drawing.Design/System.Drawing.Design/ColorEditor.cs,v
retrieving revision 1.1
diff -u -r1.1 ColorEditor.cs
--- ColorEditor.cs 8 Apr 2003 06:10:25 -0000 1.1
+++ ColorEditor.cs 17 Jun 2003 13:42:15 -0000
@@ -1,49 +1,50 @@
//
-// System.Drawing.Design.ColorEditor
-//
-// Authors:
-// Martin Willemoes Hansen (mwh at sysrq.dk)
-//
-// (C) 2003 Martin Willemoes Hansen
-//
-
-using System.ComponentModel;
-
+// System.Drawing.Design.ColorEditor.cs
+//
+// Authors:
// Martin Willemoes Hansen (mwh at sysrq.dk)
// Andreas Nahr (ClassDevelopment at A-SoftTech.com)
+//
// (C) 2003 Martin Willemoes Hansen
// (C) 2003 Andreas Nahr
+//
+using System;
+using System.Drawing;
+using System.ComponentModel;
namespace System.Drawing.Design
{
public class ColorEditor : UITypeEditor
{
- [MonoTODO]
+
public ColorEditor()
{
}
[MonoTODO]
public override object EditValue (ITypeDescriptorContext context,
- IServiceProvider provider,
- object value)
+ IServiceProvider provider, object value)
{
- throw new NotImplementedException();
+ // TODO IMPLEMENT
+ return value;
}
- [MonoTODO]
public override UITypeEditorEditStyle GetEditStyle (
- ITypeDescriptorContext context)
+ ITypeDescriptorContext context)
{
- throw new NotImplementedException();
+ return UITypeEditorEditStyle.DropDown;
}
- [MonoTODO]
public override bool GetPaintValueSupported (
- ITypeDescriptorContext context)
+ ITypeDescriptorContext context)
{
- throw new NotImplementedException();
+ return true;
}
- [MonoTODO]
public override void PaintValue (PaintValueEventArgs e)
{
- throw new NotImplementedException();
+ Graphics G = e.Graphics;
+ if (e.Value != null)
+ {
+ Color C = (Color) e.Value;
+ G.FillRectangle(new SolidBrush (C), e.Bounds);
+ }
+ G.DrawRectangle (Pens.Black, e.Bounds);
}
}
-}
+}
Index: ContentAlignmentEditor.cs
===================================================================
RCS file:
/mono/mcs/class/System.Drawing.Design/System.Drawing.Design/ContentAlignment
Editor.cs,v
retrieving revision 1.1
diff -u -r1.1 ContentAlignmentEditor.cs
--- ContentAlignmentEditor.cs 8 Apr 2003 06:10:25 -0000 1.1
+++ ContentAlignmentEditor.cs 17 Jun 2003 13:42:15 -0000
@@ -1,36 +1,33 @@
//
-// System.Drawing.Design.ContentAlignmentEditor
-//
-// Authors:
-// Martin Willemoes Hansen (mwh at sysrq.dk)
-//
-// (C) 2003 Martin Willemoes Hansen
-//
-
-using System.ComponentModel;
-
+// System.Drawing.Design.ContentAlignmentEditor.cs
+//
+// Authors:
// Martin Willemoes Hansen (mwh at sysrq.dk)
// Andreas Nahr (ClassDevelopment at A-SoftTech.com)
+//
// (C) 2003 Martin Willemoes Hansen
// (C) 2003 Andreas Nahr
+//
+using System;
+using System.Drawing;
+using System.ComponentModel;
namespace System.Drawing.Design
{
public class ContentAlignmentEditor : UITypeEditor
{
- [MonoTODO]
+
public ContentAlignmentEditor()
{
}
[MonoTODO]
public override object EditValue (ITypeDescriptorContext context,
- IServiceProvider provider,
- object value)
+ IServiceProvider provider, object value)
{
- throw new NotImplementedException();
+ // TODO IMPLEMENT
+ return value;
}
- [MonoTODO]
public override UITypeEditorEditStyle GetEditStyle (
- ITypeDescriptorContext context)
+ ITypeDescriptorContext context)
{
- throw new NotImplementedException();
+ return UITypeEditorEditStyle.DropDown;
}
}
-}
+}
Index: CursorEditor.cs
===================================================================
RCS file:
/mono/mcs/class/System.Drawing.Design/System.Drawing.Design/CursorEditor.cs,
v
retrieving revision 1.1
diff -u -r1.1 CursorEditor.cs
--- CursorEditor.cs 8 Apr 2003 06:10:25 -0000 1.1
+++ CursorEditor.cs 17 Jun 2003 13:42:15 -0000
@@ -1,36 +1,33 @@
//
-// System.Drawing.Design.CursorEditor
-//
-// Authors:
-// Martin Willemoes Hansen (mwh at sysrq.dk)
-//
-// (C) 2003 Martin Willemoes Hansen
-//
-
-using System.ComponentModel;
-
+// System.Drawing.Design.CursorEditor.cs
+//
+// Authors:
// Martin Willemoes Hansen (mwh at sysrq.dk)
// Andreas Nahr (ClassDevelopment at A-SoftTech.com)
+//
// (C) 2003 Martin Willemoes Hansen
// (C) 2003 Andreas Nahr
+//
+using System;
+using System.Drawing;
+using System.ComponentModel;
namespace System.Drawing.Design
{
public class CursorEditor : UITypeEditor
{
- [MonoTODO]
+
public CursorEditor()
{
}
[MonoTODO]
public override object EditValue (ITypeDescriptorContext context,
- IServiceProvider provider,
- object value)
+ IServiceProvider provider, object value)
{
- throw new NotImplementedException();
+ // TODO IMPLEMENT
+ return value;
}
-
- [MonoTODO]
+
public override UITypeEditorEditStyle GetEditStyle (
- ITypeDescriptorContext context)
+ ITypeDescriptorContext context)
{
- throw new NotImplementedException();
+ return UITypeEditorEditStyle.DropDown;
}
}
-}
+}
Index: FontEditor.cs
===================================================================
RCS file:
/mono/mcs/class/System.Drawing.Design/System.Drawing.Design/FontEditor.cs,v
retrieving revision 1.2
diff -u -r1.2 FontEditor.cs
--- FontEditor.cs 8 Apr 2003 06:10:25 -0000 1.2
+++ FontEditor.cs 17 Jun 2003 13:42:16 -0000
@@ -1,35 +1,45 @@
//
-// System.Drawing.Design.FontEditor
-//
-// Authors:
-// Martin Willemoes Hansen (mwh at sysrq.dk)
-//
-// (C) 2003 Martin Willemoes Hansen
-//
-
-using System.ComponentModel;
-
+// System.Drawing.Design.FontEditor.cs
+//
+// Authors:
// Martin Willemoes Hansen (mwh at sysrq.dk)
// Andreas Nahr (ClassDevelopment at A-SoftTech.com)
+//
// (C) 2003 Martin Willemoes Hansen
// (C) 2003 Andreas Nahr
+//
+using System;
+using System.Drawing;
+using System.ComponentModel;
using System.Windows.Forms;
namespace System.Drawing.Design
{
public class FontEditor : UITypeEditor
{
- [MonoTODO]
+
+ private FontDialog fontEdit;
+
public FontEditor()
{
}
- [MonoTODO]
public override object EditValue (ITypeDescriptorContext context,
- IServiceProvider provider,
- object value)
+ IServiceProvider provider, object value)
{
- throw new NotImplementedException();
+ fontEdit = new FontDialog ();
+ if (value is Font)
+ fontEdit.Font = (Font) value;
+ else
+ // Set default
+ fontEdit.Font = new Drawing.Font (FontFamily.GenericSansSerif, 12);
+
+ fontEdit.FontMustExist = true;
+ DialogResult result = fontEdit.ShowDialog();
+
+ if (result == DialogResult.OK)
+ return fontEdit.Font;
+ else
+ return value;
}
- [MonoTODO]
public override UITypeEditorEditStyle GetEditStyle
(ITypeDescriptorContext context)
{
- throw new NotImplementedException();
+ return UITypeEditorEditStyle.Modal;
}
}
-}
+}
Index: FontNameEditor.cs
===================================================================
RCS file:
/mono/mcs/class/System.Drawing.Design/System.Drawing.Design/FontNameEditor.c
s,v
retrieving revision 1.1
diff -u -r1.1 FontNameEditor.cs
--- FontNameEditor.cs 8 Apr 2003 06:10:25 -0000 1.1
+++ FontNameEditor.cs 17 Jun 2003 13:42:16 -0000
@@ -1,33 +1,37 @@
//
-// System.Drawing.Design.FontNameEditor
-//
-// Authors:
-// Martin Willemoes Hansen (mwh at sysrq.dk)
-//
-// (C) 2003 Martin Willemoes Hansen
-//
-
-using System.ComponentModel;
-
+// System.Drawing.Design. FontNameEditor.cs
+//
+// Authors:
// Martin Willemoes Hansen (mwh at sysrq.dk)
// Andreas Nahr (ClassDevelopment at A-SoftTech.com)
+//
// (C) 2003 Martin Willemoes Hansen
// (C) 2003 Andreas Nahr
+//
+using System;
+using System.Drawing;
+using System.ComponentModel;
namespace System.Drawing.Design
{
public class FontNameEditor : UITypeEditor
{
- [MonoTODO]
- public FontNameEditor()
+
+ public FontNameEditor()
{
}
- [MonoTODO]
public override bool GetPaintValueSupported (ITypeDescriptorContext
context)
{
- throw new NotImplementedException();
+ return true;
}
[MonoTODO]
public override void PaintValue (PaintValueEventArgs e)
{
- throw new NotImplementedException();
+ // TODO may not be correct
+ Graphics G = e.Graphics;
+ if (e.Value != null)
+ {
+ Font F = (Font) e.Value;
+ G.DrawString("Ab", F, Brushes.Black, e.Bounds);
+ }
+ G.DrawRectangle (Pens.Black, e.Bounds);
}
}
-}
+}
Index: IconEditor.cs
===================================================================
RCS file:
/mono/mcs/class/System.Drawing.Design/System.Drawing.Design/IconEditor.cs,v
retrieving revision 1.1
diff -u -r1.1 IconEditor.cs
--- IconEditor.cs 8 Apr 2003 06:10:25 -0000 1.1
+++ IconEditor.cs 17 Jun 2003 13:42:16 -0000
@@ -1,81 +1,108 @@
//
-// System.Drawing.Design.IconEditor
-//
-// Authors:
-// Martin Willemoes Hansen (mwh at sysrq.dk)
-//
-// (C) 2003 Martin Willemoes Hansen
-//
-
-using System.ComponentModel;
+// System.Drawing.Design.IconEditor.cs
+//
+// Authors:
// Martin Willemoes Hansen (mwh at sysrq.dk)
// Andreas Nahr (ClassDevelopment at A-SoftTech.com)
+//
// (C) 2003 Martin Willemoes Hansen
// (C) 2003 Andreas Nahr
+//
+using System;
using System.IO;
-
+using System.Drawing;
+using System.ComponentModel;
using System.Windows.Forms;
namespace System.Drawing.Design
{
+ // Strange thing that this is not inherited from ImageEditor
public class IconEditor : UITypeEditor
{
- [MonoTODO]
+
+ private OpenFileDialog openDialog;
+
public IconEditor()
{
}
- [MonoTODO]
- protected static string CreateExtensionsString (string[] extensions,
- string sep)
+ protected static string CreateExtensionsString (string[] extensions,
string sep)
{
- throw new NotImplementedException();
+ if (extensions.Length > 0)
+ {
+ string Ext = extensions[0];
+ for (int x = 1; x < extensions.Length - 1; x++)
+ Ext = string.Concat(Ext, sep, extensions[x]);
+ return Ext;
+ }
+ else
+ {
+ return string.Empty;
+ }
}
- [MonoTODO]
protected static string CreateFilterEntry (IconEditor e)
{
- throw new NotImplementedException();
+ string ExtStr = CreateExtensionsString (e.GetExtensions(), ";");
+ string Desc = e.GetFileDialogDescription() + " (" + ExtStr + ")";
+ return String.Concat (Desc, "|", ExtStr);
}
- [MonoTODO]
public override object EditValue (ITypeDescriptorContext context,
- IServiceProvider provider,
- object value)
+ IServiceProvider provider, object value)
{
- throw new NotImplementedException();
+ openDialog = new OpenFileDialog();
+ // FIXME: Add multilanguage support
+ openDialog.Title = "Open image file";
+ openDialog.CheckFileExists = true;
+ openDialog.CheckPathExists = true;
+ openDialog.Filter = CreateFilterEntry (this);
+ openDialog.Multiselect = false;
+
+ // Show the dialog
+ DialogResult result = openDialog.ShowDialog();
+
+ // Check the result and create a new image from the file
+ if (result == DialogResult.OK)
+ {
+ return LoadFromStream (openDialog.OpenFile());
+ }
+ else
+ return value;
}
- [MonoTODO]
public override UITypeEditorEditStyle GetEditStyle (
- ITypeDescriptorContext context)
+ ITypeDescriptorContext context)
{
- throw new NotImplementedException();
+ return UITypeEditorEditStyle.Modal;
}
- [MonoTODO]
protected virtual string[] GetExtensions()
{
- throw new NotImplementedException();
+ return new string[] {"*.ico"};
}
- [MonoTODO]
protected virtual string GetFileDialogDescription()
{
- throw new NotImplementedException();
+ // FIXME: Add multilanguage support
+ return "Icon files";
}
- [MonoTODO]
public override bool GetPaintValueSupported (
- ITypeDescriptorContext context)
+ ITypeDescriptorContext context)
{
- throw new NotImplementedException();
+ return true;
}
- [MonoTODO]
protected virtual Icon LoadFromStream (Stream stream)
{
- throw new NotImplementedException();
+ return new Icon (stream);
}
- [MonoTODO]
public override void PaintValue (PaintValueEventArgs e)
{
- throw new NotImplementedException();
+ Graphics G = e.Graphics;
+ G.DrawRectangle (Pens.Black, e.Bounds);
+ if (e.Value != null)
+ {
+ Image I = (Image) e.Value;
+ G.DrawImage (I, e.Bounds);
+ }
}
}
}
+
Index: ImageEditor.cs
===================================================================
RCS file:
/mono/mcs/class/System.Drawing.Design/System.Drawing.Design/ImageEditor.cs,v
retrieving revision 1.1
diff -u -r1.1 ImageEditor.cs
--- ImageEditor.cs 31 Mar 2003 13:29:54 -0000 1.1
+++ ImageEditor.cs 17 Jun 2003 13:42:16 -0000
@@ -1,83 +1,104 @@
//
-// System.Drawing.Design.ImageEditor
-//
-// Authors:
-// Martin Willemoes Hansen (mwh at sysrq.dk)
-//
-// (C) 2003 Martin Willemoes Hansen
-//
-
+// System.Drawing.Design.ImageEditor.cs
+//
+// Authors:
// Martin Willemoes Hansen (mwh at sysrq.dk)
// Andreas Nahr (ClassDevelopment at A-SoftTech.com)
+//
// (C) 2003 Martin Willemoes Hansen
// (C) 2003 Andreas Nahr
+//
+using System;
using System.IO;
-using System.ComponentModel;
-
+using System.Drawing;
+using System.ComponentModel;
using System.Windows.Forms;
namespace System.Drawing.Design
{
public class ImageEditor : UITypeEditor
{
- [MonoTODO]
+
+ private OpenFileDialog openDialog;
+
public ImageEditor()
{
}
- [MonoTODO]
public override object EditValue (ITypeDescriptorContext context,
- IServiceProvider provider,
- object value)
+ IServiceProvider provider, object value)
{
- throw new NotImplementedException();
+ openDialog = new OpenFileDialog();
+ // FIXME: Add multilanguage support
+ openDialog.Title = "Open image file";
+ openDialog.CheckFileExists = true;
+ openDialog.CheckPathExists = true;
+ openDialog.Filter = CreateFilterEntry (this);
+ openDialog.Multiselect = false;
+
+ // Show the dialog
+ DialogResult result = openDialog.ShowDialog();
+
+ // Check the result and create a new image from the file
+ if (result == DialogResult.OK)
+ {
+ return LoadFromStream (openDialog.OpenFile());
+ }
+ else
+ return value;
}
- [MonoTODO]
public override UITypeEditorEditStyle GetEditStyle
(ITypeDescriptorContext context)
{
- throw new NotImplementedException();
+ return UITypeEditorEditStyle.Modal;
}
- [MonoTODO]
public override bool GetPaintValueSupported (ITypeDescriptorContext
context)
{
- throw new NotImplementedException();
+ return true;
}
- [MonoTODO]
public override void PaintValue (PaintValueEventArgs e)
{
- throw new NotImplementedException();
+ Graphics G = e.Graphics;
+ if (e.Value != null)
+ {
+ Image I = (Image) e.Value;
+ G.DrawImage (I, e.Bounds);
+ }
+ G.DrawRectangle (Pens.Black, e.Bounds);
}
- [MonoTODO]
protected static string CreateExtensionsString (string[] extensions,
string sep)
{
- throw new NotImplementedException();
+ if (extensions.Length > 0)
+ {
+ string Ext = extensions[0];
+ for (int x = 1; x < extensions.Length - 1; x++)
+ Ext = string.Concat(Ext, sep, extensions[x]);
+ return Ext;
+ }
+ else
+ {
+ return string.Empty;
+ }
}
- [MonoTODO]
protected static string CreateFilterEntry (ImageEditor e)
{
- throw new NotImplementedException();
+ string ExtStr = CreateExtensionsString (e.GetExtensions(), ";");
+ string Desc = e.GetFileDialogDescription() + " (" + ExtStr + ")";
+ return String.Concat (Desc, "|", ExtStr);
}
- [MonoTODO]
protected virtual string[] GetExtensions()
{
- throw new NotImplementedException();
+ return new string[] {"*.bmp", "*.gif", "*.jpg", "*.jpeg", "*.png",
"*.ico", "*.emf", "*.wmf"};
}
- [MonoTODO]
protected virtual string GetFileDialogDescription()
{
- throw new NotImplementedException();
+ // FIXME: Add multilanguage support
+ return "All image files";
}
- [MonoTODO]
protected virtual Image LoadFromStream (Stream stream)
{
- throw new NotImplementedException();
- }
-
- [MonoTODO]
- ~ImageEditor()
- {
+ return new Bitmap (stream);
}
}
-}
+}
Index: MetafileEditor.cs
===================================================================
RCS file:
/mono/mcs/class/System.Drawing.Design/System.Drawing.Design/MetafileEditor.c
s,v
retrieving revision 1.1
diff -u -r1.1 MetafileEditor.cs
--- MetafileEditor.cs 8 Apr 2003 06:10:25 -0000 1.1
+++ MetafileEditor.cs 17 Jun 2003 13:42:16 -0000
@@ -1,39 +1,35 @@
//
-// System.Drawing.Design.MetafileEditor
-//
-// Authors:
-// Martin Willemoes Hansen (mwh at sysrq.dk)
-//
-// (C) 2003 Martin Willemoes Hansen
-//
-
+// System.Drawing.Design.MetafileEditor.cs
+//
+// Authors:
// Martin Willemoes Hansen (mwh at sysrq.dk)
// Andreas Nahr (ClassDevelopment at A-SoftTech.com)
+//
// (C) 2003 Martin Willemoes Hansen
// (C) 2003 Andreas Nahr
+//
+using System;
using System.IO;
-
+using System.Drawing.Imaging;
namespace System.Drawing.Design
{
public class MetafileEditor : ImageEditor
{
- [MonoTODO]
+
public MetafileEditor()
{
}
- [MonoTODO]
protected override string[] GetExtensions()
{
- throw new NotImplementedException();
+ return new string[] {"*.emf", "*.wmf"};
}
- [MonoTODO]
protected override string GetFileDialogDescription()
{
- throw new NotImplementedException();
+ // FIXME: Add multilanguage support
+ return "All metafile files";
}
- [MonoTODO]
protected override Image LoadFromStream (Stream stream)
{
- throw new NotImplementedException();
+ return new Metafile (stream);
}
}
-}
+}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ChangeLog
Type: application/octet-stream
Size: 277 bytes
Desc: not available
Url : http://lists.ximian.com/pipermail/mono-devel-list/attachments/20030617/8e11f8b6/attachment.obj
More information about the Mono-devel-list
mailing list