diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj index 60791adb91..86908624fc 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj @@ -80,6 +80,7 @@ + @@ -87,15 +88,19 @@ + + + + diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonCodeBuilder.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonCodeBuilder.cs new file mode 100644 index 0000000000..7cb790dc88 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonCodeBuilder.cs @@ -0,0 +1,81 @@ +// +// +// +// +// $Revision$ +// + +using System; +using System.Text; + +namespace ICSharpCode.PythonBinding +{ + public class PythonCodeBuilder + { + StringBuilder codeBuilder = new StringBuilder(); + string indentString = "\t"; + int indent; + + public PythonCodeBuilder() + { + } + + /// + /// Gets or sets the string used for indenting. + /// + public string IndentString { + get { return indentString; } + set { indentString = value; } + } + + /// + /// Returns the code. + /// + public override string ToString() + { + return codeBuilder.ToString(); + } + + /// + /// Appends text at the end of the current code. + /// + public void Append(string text) + { + codeBuilder.Append(text); + } + + /// + /// Appends carriage return and line feed to the existing text. + /// + public void AppendLine() + { + Append("\r\n"); + } + + /// + /// Appends the text indented. + /// + public void AppendIndented(string text) + { + for (int i = 0; i < indent; ++i) { + codeBuilder.Append(indentString); + } + codeBuilder.Append(text); + } + + public void AppendIndentedLine(string text) + { + AppendIndented(text + "\r\n"); + } + + public void IncreaseIndent() + { + indent++; + } + + public void DecreaseIndent() + { + indent--; + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonControl.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonControl.cs index ada249bcaf..47ab6f0cad 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonControl.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonControl.cs @@ -25,65 +25,17 @@ namespace ICSharpCode.PythonBinding /// public class PythonControl { - StringBuilder codeBuilder; + PythonCodeBuilder codeBuilder; string indentString = String.Empty; - int indent; - IEventBindingService eventBindingService; - static readonly Attribute[] notDesignOnlyFilter = new Attribute[] { DesignOnlyAttribute.No }; - static readonly DesignerSerializationVisibility[] notHiddenDesignerVisibility = new DesignerSerializationVisibility[] { DesignerSerializationVisibility.Content, DesignerSerializationVisibility.Visible }; - static readonly DesignerSerializationVisibility[] contentDesignerVisibility = new DesignerSerializationVisibility[] { DesignerSerializationVisibility.Content }; - - /// - /// Used so the EventBindingService.GetEventProperty method can be called to get the property descriptor - /// for an event. - /// - class PythonFormEventBindingService : EventBindingService - { - public PythonFormEventBindingService() - : base(new ServiceContainer()) - { - } - - protected override string CreateUniqueMethodName(IComponent component, EventDescriptor e) - { - return String.Empty; - } - - protected override ICollection GetCompatibleMethods(EventDescriptor e) - { - return new ArrayList(); - } - - protected override bool ShowCode() - { - return false; - } - - protected override bool ShowCode(int lineNumber) - { - return false; - } - - protected override bool ShowCode(IComponent component, EventDescriptor e, string methodName) - { - return false; - } - } public PythonControl() : this("\t") { } - public PythonControl(string indentString) - : this(indentString, new PythonFormEventBindingService()) - { - } - - PythonControl(string indentString, IEventBindingService eventBindingService) + public PythonControl(string indentString) { this.indentString = indentString; - this.eventBindingService = eventBindingService; } /// @@ -91,10 +43,11 @@ namespace ICSharpCode.PythonBinding /// public string GenerateInitializeComponentMethod(Control control) { - codeBuilder = new StringBuilder(); + codeBuilder = new PythonCodeBuilder(); + codeBuilder.IndentString = indentString; - AppendIndentedLine("def InitializeComponent(self):"); - IncreaseIndent(); + codeBuilder.AppendIndentedLine("def InitializeComponent(self):"); + codeBuilder.IncreaseIndent(); GenerateInitializeComponentMethodBodyInternal(control); @@ -106,498 +59,26 @@ namespace ICSharpCode.PythonBinding /// public string GenerateInitializeComponentMethodBody(Control control, int initialIndent) { - codeBuilder = new StringBuilder(); + codeBuilder = new PythonCodeBuilder(); + codeBuilder.IndentString = indentString; - indent = initialIndent; + for (int i = 0; i < initialIndent; ++i) { + codeBuilder.IncreaseIndent(); + } GenerateInitializeComponentMethodBodyInternal(control); return codeBuilder.ToString(); - } - - /// - /// Gets a list of properties that should be serialized for the specified form. - /// - public static PropertyDescriptorCollection GetSerializableProperties(object obj) - { - return GetSerializableProperties(obj, notHiddenDesignerVisibility); - } - - /// - /// Gets a list of properties that should have their content serialized for the specified form. - /// - public static PropertyDescriptorCollection GetSerializableContentProperties(object obj) - { - return GetSerializableProperties(obj, contentDesignerVisibility); - } - - /// - /// Gets the serializable properties with the specified designer serialization visibility. - /// - public static PropertyDescriptorCollection GetSerializableProperties(object obj, DesignerSerializationVisibility[] visibility) - { - List requiredVisibility = new List(visibility); - List properties = new List(); - foreach (PropertyDescriptor property in TypeDescriptor.GetProperties(obj, notDesignOnlyFilter).Sort()) { - if (requiredVisibility.Contains(property.SerializationVisibility)) { - if (property.ShouldSerializeValue(obj)) { - properties.Add(property); - } - } - } - return new PropertyDescriptorCollection(properties.ToArray()); - } - - /// - /// Determines whether the object is an IComponent and has a non-null ISite. - /// - public static bool IsSitedComponent(object obj) - { - IComponent component = obj as IComponent; - if (component != null) { - return component.Site != null; - } - return false; - } - - /// - /// Gets the AddRange method on the object that is not hidden from the designer. - /// - public static MethodInfo GetAddRangeSerializationMethod(object obj) - { - foreach (MethodInfo methodInfo in obj.GetType().GetMethods()) { - if (methodInfo.Name == "AddRange") { - ParameterInfo[] parameters = methodInfo.GetParameters(); - if (parameters.Length == 1) { - if (parameters[0].ParameterType.IsArray) { - if (!IsHiddenFromDesignerSerializer(methodInfo)) { - return methodInfo; - } - } - } - } - } - return null; - } - - /// - /// Gets the Add serialization method that is not hidden from the designer. - /// - public static MethodInfo GetAddSerializationMethod(object obj) - { - foreach (MethodInfo methodInfo in obj.GetType().GetMethods()) { - if (methodInfo.Name == "Add") { - return methodInfo; - } - } - return null; - } - - /// - /// Gets the type used in the array for the first parameter to the method. - /// - public static Type GetArrayParameterType(MethodInfo methodInfo) - { - if (methodInfo != null) { - ParameterInfo[] parameters = methodInfo.GetParameters(); - if (parameters.Length > 0) { - Type arrayType = parameters[0].ParameterType; - return arrayType.GetElementType(); - } - } - return null; - } - - /// - /// Checks whether the method is marked with the DesignerSerializationVisibility.Hidden attribute. - /// - public static bool IsHiddenFromDesignerSerializer(MethodInfo methodInfo) - { - foreach (DesignerSerializationVisibilityAttribute attribute in methodInfo.GetCustomAttributes(typeof(DesignerSerializationVisibilityAttribute), true)) { - if (attribute.Visibility == DesignerSerializationVisibility.Hidden) { - return true; - } - } - return false; - } - - /// - /// Gets the child objects that need to be stored in the generated designer code on the specified object. - /// - /// - /// For a MenuStrip the child components include the MenuStrip.Items. - /// For a Control the child components include the Control.Controls. - /// - public static object[] GetChildComponents(object obj) - { - List childComponents = new List(); - foreach (PropertyDescriptor property in GetSerializableContentProperties(obj)) { - ICollection collection = property.GetValue(obj) as ICollection; - if (collection != null) { - foreach (object childObject in collection) { - // Add only those IComponents which are sited and any other objects - // which are not IComponents. - IComponent component = childObject as IComponent; - if ((component == null) || IsSitedComponent(component)) { - childComponents.Add(childObject); - } - } - } - } - return childComponents.ToArray(); - } - + } + void GenerateInitializeComponentMethodBodyInternal(Control control) { - AppendChildControlCreation(control); - AppendChildControlSuspendLayout(control.Controls); - AppendIndentedLine("self.SuspendLayout()"); - AppendRootControl(control); - AppendChildControlResumeLayout(control.Controls); - AppendIndentedLine("self.ResumeLayout(False)"); - AppendIndentedLine("self.PerformLayout()"); - } - - /// - /// Generates python code for the control's InitializeComponent method. - /// - void AppendRootControl(Control rootControl) - { - // Add the controls on the form. - foreach (Control control in rootControl.Controls) { - AppendComponent(control); - } - - // Add root control. - AppendComponent(rootControl, false, false); - } - - void AppendComponent(IComponent component) - { - AppendComponent(component, true, true); - } - - /// - /// Generates python code for the component. - /// - void AppendComponent(IComponent component, bool addComponentNameToProperty, bool addChildComponentProperties) - { - AppendComment(component.Site.Name); - - string propertyOwnerName = GetPropertyOwnerName(component, addComponentNameToProperty); - AppendProperties(propertyOwnerName, component); - AppendEventHandlers(propertyOwnerName, component); - - if (addChildComponentProperties) { - AppendChildComponentProperties(component); - } - } - - /// - /// Generates python code for an object's properties which is not an IComponent. - /// - void AppendObject(object obj, int count) - { - AppendProperties(GetVariableName(obj, count), obj); - } - - /// - /// Appends a property to the InitializeComponents method. - /// - void AppendProperty(string propertyOwnerName, object obj, PropertyDescriptor propertyDescriptor) - { - object propertyValue = propertyDescriptor.GetValue(obj); - if (propertyValue == null) { - return; - } - - if (propertyDescriptor.SerializationVisibility == DesignerSerializationVisibility.Visible) { - string propertyName = propertyOwnerName + "." + propertyDescriptor.Name; - Control control = propertyValue as Control; - if (control != null) { - AppendIndentedLine(propertyName + " = self._" + control.Name); - } else { - AppendIndentedLine(propertyName + " = " + PythonPropertyValueAssignment.ToString(propertyValue)); - } - } else { - // DesignerSerializationVisibility.Content - AppendMethodCallWithArrayParameter(propertyOwnerName, obj, propertyDescriptor); - } - } - - /// - /// Appends the comment lines before the control has its properties set. - /// - void AppendComment(string controlName) - { - AppendIndentedLine("# "); - AppendIndentedLine("# " + controlName); - AppendIndentedLine("# "); - } - - /// - /// Increases the indent of any append lines. - /// - void IncreaseIndent() - { - ++indent; - } - - void DecreaseIndent() - { - --indent; - } - - void Append(string text) - { - codeBuilder.Append(text); - } - - void AppendLine() - { - Append("\r\n"); - } - - void AppendIndentedLine(string text) - { - AppendIndented(text + "\r\n"); - } - - void AppendIndented(string text) - { - for (int i = 0; i < indent; ++i) { - codeBuilder.Append(indentString); - } - codeBuilder.Append(text); - } - - void AppendChildControlCreation(Control parentControl) - { - AppendChildComponentCreation(GetChildComponents(parentControl)); - } - - void AppendChildComponentCreation(ICollection components) - { - int count = 1; - foreach (object obj in components) { - IComponent component = obj as IComponent; - if (IsSitedComponent(component)) { - AppendComponentCreation(component); - AppendChildComponentCreation(GetChildComponents(component)); - } else if (component == null) { - AppendChildObjectCreation(obj, count); - count++; - } - } - } - - void AppendComponentCreation(IComponent component) - { - AppendComponentCreation(component.Site.Name, component); - } - - void AppendComponentCreation(string name, object obj) - { - AppendIndentedLine("self._" + name + " = " + obj.GetType().FullName + "()"); - } - - void AppendChildObjectCreation(object obj, int count) - { - if (obj is String) { - // Do nothing. - } else { - AppendIndentedLine(GetVariableName(obj, count) + " = " + obj.GetType().FullName + "()"); - } - } - - void AppendChildControlSuspendLayout(Control.ControlCollection controls) - { - AppendChildControlLayoutMethodCalls(controls, new string[] {"SuspendLayout()"}); - } - - void AppendChildControlResumeLayout(Control.ControlCollection controls) - { - AppendChildControlLayoutMethodCalls(controls, new string[] {"ResumeLayout(False)", "PerformLayout()"}); - } - - void AppendChildControlLayoutMethodCalls(Control.ControlCollection controls, string[] methods) - { - foreach (Control control in controls) { - if (HasSitedChildComponents(control)) { - foreach (string method in methods) { - AppendIndentedLine("self._" + control.Name + "." + method); - } - AppendChildControlLayoutMethodCalls(control.Controls, methods); - } - } - } - - /// - /// Generates code that wires an event to an event handler. - /// - /// - /// Note that the EventDescriptorCollection.Sort method does not work if the - /// enumerator is called first. Sorting will only occur if an item is retrieved after calling - /// Sort or CopyTo is called. The PropertyDescriptorCollection class does not behave - /// in the same way. - void AppendEventHandlers(string propertyOwnerName, object component) - { - EventDescriptorCollection events = TypeDescriptor.GetEvents(component, notDesignOnlyFilter).Sort(); - if (events.Count > 0) { - EventDescriptor dummyEventDescriptor = events[0]; - } - foreach (EventDescriptor eventDescriptor in events) { - AppendEventHandler(propertyOwnerName, component, eventDescriptor); - } - } - - void AppendEventHandler(string propertyOwnerName, object component, EventDescriptor eventDescriptor) - { - PropertyDescriptor propertyDescriptor = eventBindingService.GetEventProperty(eventDescriptor); - if (propertyDescriptor.ShouldSerializeValue(component)) { - string methodName = (string)propertyDescriptor.GetValue(component); - AppendIndentedLine(propertyOwnerName + "." + eventDescriptor.Name + " += self." + methodName); - } - } - - bool HasSitedChildComponents(Control control) - { - return HasSitedComponents(GetChildComponents(control)); - } - - bool HasSitedComponents(ICollection items) - { - foreach (object item in items) { - if (IsSitedComponent(item)) { - return true; - } - } - return false; - } - - void AppendSystemArray(string componentName, string methodName, string typeName, ICollection components) - { - if (components.Count > 0) { - AppendIndentedLine("self._" + componentName + "." + methodName + "(System.Array[" + typeName + "]("); - IncreaseIndent(); - int i = 0; - foreach (object component in components) { - if (i == 0) { - AppendIndented("["); - } else { - Append(","); - AppendLine(); - AppendIndented(String.Empty); - } - if (component is IComponent) { - Append("self._" + ((IComponent)component).Site.Name); - } else if (component is String) { - Append(PythonPropertyValueAssignment.ToString(component)); - } else { - Append(GetVariableName(component, i + 1)); - } - ++i; - } - Append("]))"); - AppendLine(); - DecreaseIndent(); - } - } - - void AppendProperties(string propertyOwnerName, object obj) - { - foreach (PropertyDescriptor property in GetSerializableProperties(obj)) { - AppendProperty(propertyOwnerName, obj, property); - } - } - - string GetPropertyOwnerName(IComponent component, bool addComponentNameToProperty) - { - if (addComponentNameToProperty) { - return "self._" + component.Site.Name; - } - return "self"; - } - - /// - /// Appends the properties of any component that is contained in a collection property that is - /// marked as DesignerSerializationVisibility.Content. - /// - void AppendChildComponentProperties(object component) - { - foreach (PropertyDescriptor property in PythonControl.GetSerializableContentProperties(component)) { - object propertyCollection = property.GetValue(component); - ICollection collection = propertyCollection as ICollection; - if (collection != null) { - int count = 1; - foreach (object childObject in collection) { - IComponent childComponent = childObject as IComponent; - if (IsSitedComponent(childComponent)) { - AppendComponent(childComponent, true, true); - } else if (childComponent == null) { - AppendObject(childObject, count); - ++count; - } - } - } - } - } - - /// - /// Returns the sited components in the collection. If an object in the collection is not - /// an IComponent then this is added to the collection. - /// - ICollection GetSitedComponentsAndNonComponents(ICollection components) - { - List sitedComponents = new List(); - foreach (object obj in components) { - IComponent component = obj as IComponent; - if (component == null || IsSitedComponent(component)) { - sitedComponents.Add(obj); - } - } - return sitedComponents.ToArray(); - } - - /// - /// Appends an array as a parameter and its associated method call. - /// - /// - /// Looks for the AddRange method first. If that does not exist or is hidden from the designer the - /// Add method is looked for. - /// - void AppendMethodCallWithArrayParameter(string propertyOwnerName, object propertyOwner, PropertyDescriptor propertyDescriptor) - { - IComponent component = propertyOwner as IComponent; - ICollection collectionProperty = propertyDescriptor.GetValue(propertyOwner) as ICollection; - if (collectionProperty != null) { - MethodInfo addRangeMethod = GetAddRangeSerializationMethod(collectionProperty); - if (addRangeMethod != null) { - Type arrayElementType = GetArrayParameterType(addRangeMethod); - AppendSystemArray(component.Site.Name, propertyDescriptor.Name + "." + addRangeMethod.Name, arrayElementType.FullName, GetSitedComponentsAndNonComponents(collectionProperty)); - } else { - MethodInfo addMethod = GetAddSerializationMethod(collectionProperty); - ParameterInfo[] parameters = addMethod.GetParameters(); - foreach (object item in collectionProperty) { - IComponent collectionComponent = item as IComponent; - if (IsSitedComponent(collectionComponent)) { - AppendIndentedLine(propertyOwnerName + "." + propertyDescriptor.Name + "." + addMethod.Name + "(self._" + collectionComponent.Site.Name + ")"); - } - } - } - } - } - - /// - /// Gets the variable name for the specified type. - /// - /// - /// The variable name is simply the type name with the first character in lower case followed by the - /// count. - /// - static string GetVariableName(object obj, int count) - { - string typeName = obj.GetType().Name; - return typeName[0].ToString().ToLowerInvariant() + typeName.Substring(1) + count; + PythonDesignerComponent rootDesignerComponent = PythonDesignerComponentFactory.CreateDesignerRootComponent(control); + rootDesignerComponent.AppendCreateChildComponents(codeBuilder); + rootDesignerComponent.AppendChildComponentsSuspendLayout(codeBuilder); + rootDesignerComponent.AppendSuspendLayout(codeBuilder); + rootDesignerComponent.AppendComponent(codeBuilder); + rootDesignerComponent.AppendChildComponentsResumeLayout(codeBuilder); + rootDesignerComponent.AppendResumeLayout(codeBuilder); } } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonDesignerComponent.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonDesignerComponent.cs new file mode 100644 index 0000000000..5cc65338f0 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonDesignerComponent.cs @@ -0,0 +1,590 @@ +// +// +// +// +// $Revision$ +// + +using System; +using System.Collections; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.Design; +using System.Drawing; +using System.Reflection; +using System.Windows.Forms; + +namespace ICSharpCode.PythonBinding +{ + /// + /// Represents an IComponent in the designer. + /// + public class PythonDesignerComponent + { + IComponent component; + static readonly Attribute[] notDesignOnlyFilter = new Attribute[] { DesignOnlyAttribute.No }; + static readonly DesignerSerializationVisibility[] notHiddenDesignerVisibility = new DesignerSerializationVisibility[] { DesignerSerializationVisibility.Content, DesignerSerializationVisibility.Visible }; + static readonly DesignerSerializationVisibility[] contentDesignerVisibility = new DesignerSerializationVisibility[] { DesignerSerializationVisibility.Content }; + IEventBindingService eventBindingService; + + protected static readonly string[] suspendLayoutMethods = new string[] {"SuspendLayout()"}; + protected static readonly string[] resumeLayoutMethods = new string[] {"ResumeLayout(False)", "PerformLayout()"}; + + /// + /// Used so the EventBindingService.GetEventProperty method can be called to get the property descriptor + /// for an event. + /// + class PythonEventBindingService : EventBindingService + { + public PythonEventBindingService() + : base(new ServiceContainer()) + { + } + + protected override string CreateUniqueMethodName(IComponent component, EventDescriptor e) + { + return String.Empty; + } + + protected override ICollection GetCompatibleMethods(EventDescriptor e) + { + return new ArrayList(); + } + + protected override bool ShowCode() + { + return false; + } + + protected override bool ShowCode(int lineNumber) + { + return false; + } + + protected override bool ShowCode(IComponent component, EventDescriptor e, string methodName) + { + return false; + } + } + + public PythonDesignerComponent(IComponent component) + : this(component, new PythonEventBindingService()) + { + } + + PythonDesignerComponent(IComponent component, IEventBindingService eventBindingService) + { + this.component = component; + this.eventBindingService = eventBindingService; + } + + /// + /// Gets a list of properties that should be serialized for the specified form. + /// + public static PropertyDescriptorCollection GetSerializableProperties(object obj) + { + return GetSerializableProperties(obj, notHiddenDesignerVisibility); + } + + /// + /// Gets a list of properties that should have their content serialized for the specified form. + /// + public static PropertyDescriptorCollection GetSerializableContentProperties(object obj) + { + return GetSerializableProperties(obj, contentDesignerVisibility); + } + + /// + /// Gets the serializable properties with the specified designer serialization visibility. + /// + public static PropertyDescriptorCollection GetSerializableProperties(object obj, DesignerSerializationVisibility[] visibility) + { + List requiredVisibility = new List(visibility); + List properties = new List(); + foreach (PropertyDescriptor property in TypeDescriptor.GetProperties(obj, notDesignOnlyFilter).Sort()) { + if (requiredVisibility.Contains(property.SerializationVisibility)) { + if (property.ShouldSerializeValue(obj)) { + properties.Add(property); + } + } + } + return new PropertyDescriptorCollection(properties.ToArray()); + } + + /// + /// Checks whether the method is marked with the DesignerSerializationVisibility.Hidden attribute. + /// + public static bool IsHiddenFromDesignerSerializer(MethodInfo methodInfo) + { + foreach (DesignerSerializationVisibilityAttribute attribute in methodInfo.GetCustomAttributes(typeof(DesignerSerializationVisibilityAttribute), true)) { + if (attribute.Visibility == DesignerSerializationVisibility.Hidden) { + return true; + } + } + return false; + } + + /// + /// Gets the AddRange method on the object that is not hidden from the designer. + /// + public static MethodInfo GetAddRangeSerializationMethod(object obj) + { + foreach (MethodInfo methodInfo in obj.GetType().GetMethods()) { + if (methodInfo.Name == "AddRange") { + ParameterInfo[] parameters = methodInfo.GetParameters(); + if (parameters.Length == 1) { + if (parameters[0].ParameterType.IsArray) { + if (!IsHiddenFromDesignerSerializer(methodInfo)) { + return methodInfo; + } + } + } + } + } + return null; + } + + /// + /// Gets the Add serialization method that is not hidden from the designer. + /// + public static MethodInfo GetAddSerializationMethod(object obj) + { + foreach (MethodInfo methodInfo in obj.GetType().GetMethods()) { + if (methodInfo.Name == "Add") { + return methodInfo; + } + } + return null; + } + + /// + /// Gets the type used in the array for the first parameter to the method. + /// + public static Type GetArrayParameterType(MethodInfo methodInfo) + { + if (methodInfo != null) { + ParameterInfo[] parameters = methodInfo.GetParameters(); + if (parameters.Length > 0) { + Type arrayType = parameters[0].ParameterType; + return arrayType.GetElementType(); + } + } + return null; + } + + /// + /// Appends code that creates an instance of the component. + /// + public virtual void AppendCreateInstance(PythonCodeBuilder codeBuilder) + { + AppendComponentCreation(codeBuilder, component); + } + + /// + /// Appends the code to create the child components. + /// + public void AppendCreateChildComponents(PythonCodeBuilder codeBuilder) + { + AppendCreateChildComponents(codeBuilder, GetChildComponents()); + } + + /// + /// Appends the component's properties. + /// + public virtual void AppendComponent(PythonCodeBuilder codeBuilder) + { + AppendComment(codeBuilder); + AppendComponentProperties(codeBuilder); + AppendChildComponentProperties(codeBuilder); + } + + /// + /// Determines whether the object is an IComponent and has a non-null ISite. + /// + public static bool IsSitedComponent(object obj) + { + IComponent component = obj as IComponent; + if (component != null) { + return component.Site != null; + } + return false; + } + + /// + /// Determines whether this designer component is sited. + /// + public bool IsSited { + get { return IsSitedComponent(component); } + } + + /// + /// Gets the child objects that need to be stored in the generated designer code on the specified object. + /// + /// + /// For a MenuStrip the child components include the MenuStrip.Items. + /// For a Control the child components include the Control.Controls. + /// + public object[] GetChildComponents() + { + List childComponents = new List(); + foreach (PropertyDescriptor property in GetSerializableContentProperties(component)) { + ICollection collection = property.GetValue(component) as ICollection; + if (collection != null) { + foreach (object childObject in collection) { + IComponent childComponent = childObject as IComponent; + if (IsSitedComponent(childComponent)) { + childComponents.Add(childObject); + } + } + } + } + return childComponents.ToArray(); + } + + /// + /// Appends SuspendLayout method call if the component has any sited child components. + /// + public virtual void AppendSuspendLayout(PythonCodeBuilder codeBuilder) + { + if (HasSitedChildComponents()) { + AppendMethodCalls(codeBuilder, suspendLayoutMethods); + } + } + + /// + /// Appends the ResumeLayout and PerformLayout method calls if the component has any sited + /// child components. + /// + public virtual void AppendResumeLayout(PythonCodeBuilder codeBuilder) + { + if (HasSitedChildComponents()) { + AppendMethodCalls(codeBuilder, resumeLayoutMethods); + } + } + + public void AppendChildComponentsSuspendLayout(PythonCodeBuilder codeBuilder) + { + AppendChildComponentsMethodCalls(codeBuilder, suspendLayoutMethods); + } + + public void AppendChildComponentsResumeLayout(PythonCodeBuilder codeBuilder) + { + AppendChildComponentsMethodCalls(codeBuilder, resumeLayoutMethods); + } + + void AppendChildComponentsMethodCalls(PythonCodeBuilder codeBuilder, string[] methods) + { + foreach (IComponent component in GetChildComponents()) { + PythonDesignerComponent designerComponent = PythonDesignerComponentFactory.CreateDesignerComponent(component); + if (designerComponent.component is Control) { + if (designerComponent.HasSitedChildComponents()) { + designerComponent.AppendMethodCalls(codeBuilder, methods); + } + } + designerComponent.AppendChildComponentsMethodCalls(codeBuilder, methods); + } + } + + + /// + /// Appends the code to create the specified object. + /// + public void AppendObjectCreation(PythonCodeBuilder codeBuilder, object obj, int count, object[] parameters) + { + if (obj is String) { + // Do nothing. + } else { + codeBuilder.AppendIndented(GetVariableName(obj, count) + " = " + obj.GetType().FullName); + + codeBuilder.Append("("); + for (int i = 0; i < parameters.Length; ++i) { + if (i > 0) { + codeBuilder.Append(", "); + } + codeBuilder.Append(PythonPropertyValueAssignment.ToString(parameters[i])); + } + codeBuilder.Append(")"); + codeBuilder.AppendLine(); + } + } + + /// + /// Appends the code to create the specified IComponent + /// + public void AppendComponentCreation(PythonCodeBuilder codeBuilder, IComponent component) + { + codeBuilder.AppendIndentedLine("self._" + component.Site.Name + " = " + component.GetType().FullName + "()"); + } + + /// + /// Generates the code for the component's properties. + /// + public void AppendComponentProperties(PythonCodeBuilder codeBuilder) + { + AppendComponentProperties(codeBuilder, true, false, false); + } + + /// + /// Appends the properties of any component that is contained in a collection property that is + /// marked as DesignerSerializationVisibility.Content. + /// + public void AppendChildComponentProperties(PythonCodeBuilder codeBuilder) + { + foreach (PropertyDescriptor property in PythonDesignerComponent.GetSerializableContentProperties(component)) { + object propertyCollection = property.GetValue(component); + ICollection collection = propertyCollection as ICollection; + if (collection != null) { + foreach (object childObject in collection) { + IComponent childComponent = childObject as IComponent; + if (childComponent != null) { + PythonDesignerComponent designerComponent = PythonDesignerComponentFactory.CreateDesignerComponent(childComponent); + if (designerComponent.IsSited) { + designerComponent.AppendComponentProperties(codeBuilder, true, true, true); + } + } + } + } + } + } + /// + /// Generates python code for an object's properties when the object is not an IComponent. + /// + public void AppendObjectProperties(PythonCodeBuilder codeBuilder, object obj, int count) + { + AppendProperties(codeBuilder, PythonDesignerComponent.GetVariableName(obj, count), obj); + } + + /// + /// Appends the comment lines containing the component name before the component has its properties set. + /// + /// + public void AppendComment(PythonCodeBuilder codeBuilder) + { + codeBuilder.AppendIndentedLine("# "); + codeBuilder.AppendIndentedLine("# " + component.Site.Name); + codeBuilder.AppendIndentedLine("# "); + } + + public bool HasSitedChildComponents() + { + return HasSitedComponents(GetChildComponents()); + } + + /// + /// Appends the method calls if this component. + /// + public void AppendMethodCalls(PythonCodeBuilder codeBuilder, string[] methods) + { + foreach (string method in methods) { + codeBuilder.AppendIndentedLine(GetPropertyOwnerName() + "." + method); + } + } + + /// + /// Gets the variable name for the specified type. + /// + /// + /// The variable name is simply the type name with the first character in lower case followed by the + /// count. + /// + public static string GetVariableName(object obj, int count) + { + string typeName = obj.GetType().Name; + return typeName[0].ToString().ToLowerInvariant() + typeName.Substring(1) + count; + } + + /// + /// Appends an array as a parameter and its associated method call. + /// + /// + /// Looks for the AddRange method first. If that does not exist or is hidden from the designer the + /// Add method is looked for. + /// + public static void AppendMethodCallWithArrayParameter(PythonCodeBuilder codeBuilder, string propertyOwnerName, object propertyOwner, PropertyDescriptor propertyDescriptor) + { + IComponent component = propertyOwner as IComponent; + ICollection collectionProperty = propertyDescriptor.GetValue(propertyOwner) as ICollection; + if (collectionProperty != null) { + MethodInfo addRangeMethod = GetAddRangeSerializationMethod(collectionProperty); + if (addRangeMethod != null) { + Type arrayElementType = GetArrayParameterType(addRangeMethod); + AppendSystemArray(codeBuilder, component.Site.Name, propertyDescriptor.Name + "." + addRangeMethod.Name, arrayElementType.FullName, GetSitedComponentsAndNonComponents(collectionProperty)); + } else { + MethodInfo addMethod = GetAddSerializationMethod(collectionProperty); + ParameterInfo[] parameters = addMethod.GetParameters(); + foreach (object item in collectionProperty) { + IComponent collectionComponent = item as IComponent; + if (PythonDesignerComponent.IsSitedComponent(collectionComponent)) { + codeBuilder.AppendIndentedLine(propertyOwnerName + "." + propertyDescriptor.Name + "." + addMethod.Name + "(self._" + collectionComponent.Site.Name + ")"); + } + } + } + } + } + + /// + /// Appends a property. + /// + public static void AppendProperty(PythonCodeBuilder codeBuilder, string propertyOwnerName, object obj, PropertyDescriptor propertyDescriptor) + { + object propertyValue = propertyDescriptor.GetValue(obj); + if (propertyValue == null) { + return; + } + + if (propertyDescriptor.SerializationVisibility == DesignerSerializationVisibility.Visible) { + string propertyName = propertyOwnerName + "." + propertyDescriptor.Name; + Control control = propertyValue as Control; + if (control != null) { + codeBuilder.AppendIndentedLine(propertyName + " = self._" + control.Name); + } else { + codeBuilder.AppendIndentedLine(propertyName + " = " + PythonPropertyValueAssignment.ToString(propertyValue)); + } + } else { + // DesignerSerializationVisibility.Content + AppendMethodCallWithArrayParameter(codeBuilder, propertyOwnerName, obj, propertyDescriptor); + } + } + + /// + /// Appends the properties of the object to the code builder. + /// + public static void AppendProperties(PythonCodeBuilder codeBuilder, string propertyOwnerName, object obj) + { + foreach (PropertyDescriptor property in GetSerializableProperties(obj)) { + AppendProperty(codeBuilder, propertyOwnerName, obj, property); + } + } + + /// + /// Appends the properties of the component. + /// + public void AppendProperties(PythonCodeBuilder codeBuilder) + { + AppendProperties(codeBuilder, GetPropertyOwnerName(), component); + } + + /// + /// Generates python code for the component. + /// + public void AppendComponentProperties(PythonCodeBuilder codeBuilder, bool addComponentNameToProperty, bool addChildComponentProperties, bool addComment) + { + if (addComment) { + AppendComment(codeBuilder); + } + + AppendProperties(codeBuilder); + AppendEventHandlers(codeBuilder, eventBindingService); + + if (addChildComponentProperties) { + AppendChildComponentProperties(codeBuilder); + } + } + + /// + /// Generates code that wires an event to an event handler. + /// + /// + /// Note that the EventDescriptorCollection.Sort method does not work if the + /// enumerator is called first. Sorting will only occur if an item is retrieved after calling + /// Sort or CopyTo is called. The PropertyDescriptorCollection class does not behave + /// in the same way. + public void AppendEventHandlers(PythonCodeBuilder codeBuilder, IEventBindingService eventBindingService) + { + EventDescriptorCollection events = TypeDescriptor.GetEvents(component, notDesignOnlyFilter).Sort(); + if (events.Count > 0) { + EventDescriptor dummyEventDescriptor = events[0]; + } + foreach (EventDescriptor eventDescriptor in events) { + AppendEventHandler(codeBuilder, component, eventDescriptor, eventBindingService); + } + } + + void AppendEventHandler(PythonCodeBuilder codeBuilder, object component, EventDescriptor eventDescriptor, IEventBindingService eventBindingService) + { + PropertyDescriptor propertyDescriptor = eventBindingService.GetEventProperty(eventDescriptor); + if (propertyDescriptor.ShouldSerializeValue(component)) { + string methodName = (string)propertyDescriptor.GetValue(component); + codeBuilder.AppendIndentedLine(GetPropertyOwnerName() + "." + eventDescriptor.Name + " += self." + methodName); + } + } + + /// + /// Gets the owner of any properties generated (e.g. "self._textBox1"). + public virtual string GetPropertyOwnerName() + { + return "self._" + component.Site.Name; + } + + protected IComponent Component { + get { return component; } + } + + static bool HasSitedComponents(ICollection items) + { + foreach (object item in items) { + if (IsSitedComponent(item)) { + return true; + } + } + return false; + } + + void AppendCreateChildComponents(PythonCodeBuilder codeBuilder, ICollection childComponents) + { + foreach (object obj in childComponents) { + IComponent component = obj as IComponent; + PythonDesignerComponent designerComponent = PythonDesignerComponentFactory.CreateDesignerComponent(component); + if (designerComponent.IsSited) { + designerComponent.AppendCreateInstance(codeBuilder); + designerComponent.AppendCreateChildComponents(codeBuilder); + } + } + } + + /// + /// Returns the sited components in the collection. If an object in the collection is not + /// an IComponent then this is added to the collection. + /// + static ICollection GetSitedComponentsAndNonComponents(ICollection components) + { + List sitedComponents = new List(); + foreach (object obj in components) { + IComponent component = obj as IComponent; + if (component == null || IsSitedComponent(component)) { + sitedComponents.Add(obj); + } + } + return sitedComponents.ToArray(); + } + + static void AppendSystemArray(PythonCodeBuilder codeBuilder, string componentName, string methodName, string typeName, ICollection components) + { + if (components.Count > 0) { + codeBuilder.AppendIndentedLine("self._" + componentName + "." + methodName + "(System.Array[" + typeName + "]("); + codeBuilder.IncreaseIndent(); + int i = 0; + foreach (object component in components) { + if (i == 0) { + codeBuilder.AppendIndented("["); + } else { + codeBuilder.Append(","); + codeBuilder.AppendLine(); + codeBuilder.AppendIndented(String.Empty); + } + if (component is IComponent) { + codeBuilder.Append("self._" + ((IComponent)component).Site.Name); + } else if (component is String) { + codeBuilder.Append(PythonPropertyValueAssignment.ToString(component)); + } else { + codeBuilder.Append(GetVariableName(component, i + 1)); + } + ++i; + } + codeBuilder.Append("]))"); + codeBuilder.AppendLine(); + codeBuilder.DecreaseIndent(); + } + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonDesignerComponentFactory.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonDesignerComponentFactory.cs new file mode 100644 index 0000000000..40d6cf5de5 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonDesignerComponentFactory.cs @@ -0,0 +1,36 @@ +// +// +// +// +// $Revision$ +// + +using System; +using System.ComponentModel; +using System.Windows.Forms; + +namespace ICSharpCode.PythonBinding +{ + public class PythonDesignerComponentFactory + { + PythonDesignerComponentFactory() + { + } + + /// + /// Creates a PythonDesignerComponent class for the specified component. + /// + public static PythonDesignerComponent CreateDesignerComponent(IComponent component) + { + if (component is ListView) { + return new PythonListViewComponent(component); + } + return new PythonDesignerComponent(component); + } + + public static PythonDesignerComponent CreateDesignerRootComponent(IComponent component) + { + return new PythonDesignerRootComponent(component); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonDesignerRootComponent.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonDesignerRootComponent.cs new file mode 100644 index 0000000000..986d7db998 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonDesignerRootComponent.cs @@ -0,0 +1,49 @@ +// +// +// +// +// $Revision$ +// + +using System; +using System.ComponentModel; + +namespace ICSharpCode.PythonBinding +{ + /// + /// Represents a root component in the designer. + /// + public class PythonDesignerRootComponent : PythonDesignerComponent + { + public PythonDesignerRootComponent(IComponent component) + : base(component) + { + } + + public override string GetPropertyOwnerName() + { + return "self"; + } + + public override void AppendSuspendLayout(PythonCodeBuilder codeBuilder) + { + AppendMethodCalls(codeBuilder, suspendLayoutMethods); + } + + public override void AppendResumeLayout(PythonCodeBuilder codeBuilder) + { + AppendMethodCalls(codeBuilder, resumeLayoutMethods); + } + + public override void AppendComponent(PythonCodeBuilder codeBuilder) + { + // Add the child component's first. + foreach (IComponent component in GetChildComponents()) { + PythonDesignerComponentFactory.CreateDesignerComponent(component).AppendComponent(codeBuilder); + } + + // Add root component + AppendComponentProperties(codeBuilder, false, false, true); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonListViewComponent.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonListViewComponent.cs new file mode 100644 index 0000000000..ae56a32673 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonListViewComponent.cs @@ -0,0 +1,82 @@ +// +// +// +// +// $Revision$ +// + +using System; +using System.ComponentModel; +using System.Windows.Forms; + +namespace ICSharpCode.PythonBinding +{ + /// + /// Used to generate code for a ListView component currently being designed. + /// + public class PythonListViewComponent : PythonDesignerComponent + { + public PythonListViewComponent(IComponent component) : base(component) + { + } + + /// + /// Appends code that creates an instance of the list view. + /// + public override void AppendCreateInstance(PythonCodeBuilder codeBuilder) + { + // Append list view item creation first. + int count = 1; + foreach (ListViewItem item in GetListViewItems(Component)) { + AppendObjectCreation(codeBuilder, item, count, GetConstructorParameters(item)); + ++count; + } + + // Append list view creation. + base.AppendCreateInstance(codeBuilder); + } + + /// + /// Appends the component's properties. + /// + public override void AppendComponent(PythonCodeBuilder codeBuilder) + { + AppendComment(codeBuilder); + AppendListViewItemProperties(codeBuilder); + AppendComponentProperties(codeBuilder); + AppendChildComponentProperties(codeBuilder); + } + + /// + /// Gets the parameters to the ListViewItem constructor. + /// + /// + /// The constructors that are used: + /// ListViewItem() + /// ListViewItem(String text) + /// ListViewItem(string[] subItems) + /// + object[] GetConstructorParameters(ListViewItem item) + { + if (String.IsNullOrEmpty(item.Text)) { + return new object[0]; + } + return new object[] {item.Text}; + } + + static ListView.ListViewItemCollection GetListViewItems(IComponent component) + { + ListView listView = (ListView)component; + return listView.Items; + } + + void AppendListViewItemProperties(PythonCodeBuilder codeBuilder) + { + int count = 1; + foreach (ListViewItem item in GetListViewItems(Component)) { + AppendObjectProperties(codeBuilder, item, count); + ++count; + } + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/CreateDesignerComponentTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/CreateDesignerComponentTests.cs new file mode 100644 index 0000000000..603141cee3 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/CreateDesignerComponentTests.cs @@ -0,0 +1,45 @@ +// +// +// +// +// $Revision$ +// + +using System; +using System.Windows.Forms; +using ICSharpCode.PythonBinding; +using NUnit.Framework; + +namespace PythonBinding.Tests.Designer +{ + /// + /// Tests the PythonControl's CreateDesignerComponent method. + /// + [TestFixture] + public class CreateDesignerComponentTests + { + [Test] + public void ListViewComponent() + { + using (ListView listView = new ListView()) { + Assert.IsInstanceOfType(typeof(PythonListViewComponent), PythonDesignerComponentFactory.CreateDesignerComponent(listView)); + } + } + + [Test] + public void TextBoxComponent() + { + using (TextBox textBox = new TextBox()) { + Assert.IsInstanceOfType(typeof(PythonDesignerComponent), PythonDesignerComponentFactory.CreateDesignerComponent(textBox)); + } + } + + [Test] + public void CreateRootDesigner() + { + using (TextBox textBox = new TextBox()) { + Assert.IsInstanceOfType(typeof(PythonDesignerRootComponent), PythonDesignerComponentFactory.CreateDesignerRootComponent(textBox)); + } + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/FindAddRangeMethodTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/FindAddRangeMethodTests.cs index 4f48d4febe..4ae74d4dd2 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/FindAddRangeMethodTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/FindAddRangeMethodTests.cs @@ -27,7 +27,7 @@ namespace PythonBinding.Tests.Designer MethodInfo expectedMethodInfo = FindMethod(menuStrip.Items, "AddRange", typeof(ToolStripItem[])); Assert.IsNotNull(expectedMethodInfo); - Assert.AreSame(expectedMethodInfo, PythonControl.GetAddRangeSerializationMethod(menuStrip.Items)); + Assert.AreSame(expectedMethodInfo, PythonDesignerComponent.GetAddRangeSerializationMethod(menuStrip.Items)); } } @@ -36,7 +36,7 @@ namespace PythonBinding.Tests.Designer { using (MenuStrip menuStrip = new MenuStrip()) { MethodInfo methodInfo = FindMethod(menuStrip.Items, "AddRange", typeof(ToolStripItem[])); - Assert.AreEqual(typeof(ToolStripItem), PythonControl.GetArrayParameterType(methodInfo)); + Assert.AreEqual(typeof(ToolStripItem), PythonDesignerComponent.GetArrayParameterType(methodInfo)); } } @@ -44,13 +44,13 @@ namespace PythonBinding.Tests.Designer public void GetArrayParameterTypeFromMethodWithNoParameters() { MethodInfo methodInfo = typeof(String).GetMethod("Clone"); - Assert.IsNull(PythonControl.GetArrayParameterType(methodInfo)); + Assert.IsNull(PythonDesignerComponent.GetArrayParameterType(methodInfo)); } [Test] public void GetArrayParameterTypeWithNullMethodInfo() { - Assert.IsNull(PythonControl.GetArrayParameterType(null)); + Assert.IsNull(PythonDesignerComponent.GetArrayParameterType(null)); } /// @@ -61,7 +61,7 @@ namespace PythonBinding.Tests.Designer public void FormControlsAddRangeMethodNotFound() { using (Form form = new Form()) { - Assert.IsNull(PythonControl.GetAddRangeSerializationMethod(form.Controls)); + Assert.IsNull(PythonDesignerComponent.GetAddRangeSerializationMethod(form.Controls)); } } @@ -72,7 +72,7 @@ namespace PythonBinding.Tests.Designer MethodInfo expectedMethodInfo = FindMethod(form.Controls, "Add", typeof(Control)); Assert.IsNotNull(expectedMethodInfo); - Assert.AreSame(expectedMethodInfo, PythonControl.GetAddSerializationMethod(form.Controls)); + Assert.AreSame(expectedMethodInfo, PythonDesignerComponent.GetAddSerializationMethod(form.Controls)); } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateAcceptButtonFormTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateAcceptButtonFormTestFixture.cs index b2b46fc08f..9ed46536ae 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateAcceptButtonFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateAcceptButtonFormTestFixture.cs @@ -51,8 +51,8 @@ namespace PythonBinding.Tests.Designer PythonControl pythonForm = new PythonControl(" "); generatedPythonCode = pythonForm.GenerateInitializeComponentMethod(form); - formChildComponents = PythonControl.GetChildComponents(form); - buttonChildComponents = PythonControl.GetChildComponents(button); + formChildComponents = PythonDesignerComponentFactory.CreateDesignerComponent(form).GetChildComponents(); + buttonChildComponents = PythonDesignerComponentFactory.CreateDesignerComponent(button).GetChildComponents(); } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateListViewItemTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateListViewItemTestFixture.cs index 3817acfbfe..edf5555785 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateListViewItemTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateListViewItemTestFixture.cs @@ -22,9 +22,14 @@ namespace PythonBinding.Tests.Designer public class GenerateListViewItemsFormTestFixture { string generatedPythonCode; - object[] listViewChildren; - ListViewItem listViewItem1; - ListViewItem listViewItem2; + string createListViewCode; + string createListViewChildComponentsCode; + string suspendLayoutCode; + string resumeLayoutCode; + string listViewPropertiesCode; + object[] listViewChildComponents; + ColumnHeader columnHeader1; + ColumnHeader columnHeader2; [TestFixtureSetUp] public void SetUpFixture() @@ -47,23 +52,70 @@ namespace PythonBinding.Tests.Designer descriptors = TypeDescriptor.GetProperties(listView); PropertyDescriptor descriptor = descriptors.Find("UseCompatibleStateImageBehavior", false); descriptor.SetValue(listView, true); + descriptor = descriptors.Find("View", false); + descriptor.SetValue(listView, View.Details); form.Controls.Add(listView); + // Add column headers. + columnHeader1 = (ColumnHeader)host.CreateComponent(typeof(ColumnHeader), "columnHeader1"); + descriptors = TypeDescriptor.GetProperties(columnHeader1); + descriptor = descriptors.Find("Text", false); + descriptor.SetValue(columnHeader1, "columnHeader1"); + listView.Columns.Add(columnHeader1); + + columnHeader2 = (ColumnHeader)host.CreateComponent(typeof(ColumnHeader), "columnHeader2"); + descriptors = TypeDescriptor.GetProperties(columnHeader2); + descriptor = descriptors.Find("Text", false); + descriptor.SetValue(columnHeader2, "columnHeader2"); + listView.Columns.Add(columnHeader2); + + // Add list view items. ListViewItem item = new ListViewItem("aaa"); item.ToolTipText = "tooltip"; listView.Items.Add(item); ListViewItem item2 = new ListViewItem("bbb"); listView.Items.Add(item2); + + ListViewItem item3 = new ListViewItem(); + listView.Items.Add(item3); PythonControl pythonForm = new PythonControl(" "); generatedPythonCode = pythonForm.GenerateInitializeComponentMethod(form); - listViewChildren = PythonControl.GetChildComponents(listView); - if (listViewChildren != null && listViewChildren.Length > 1) { - listViewItem1 = listViewChildren[0] as ListViewItem; - listViewItem2 = listViewChildren[1] as ListViewItem; - } + // Get list view creation code. + PythonCodeBuilder codeBuilder = new PythonCodeBuilder(); + codeBuilder.IndentString = " "; + PythonListViewComponent listViewComponent = new PythonListViewComponent(listView); + listViewComponent.AppendCreateInstance(codeBuilder); + createListViewCode = codeBuilder.ToString(); + + // Get list view child component's creation code. + codeBuilder = new PythonCodeBuilder(); + codeBuilder.IndentString = " "; + listViewComponent.AppendCreateChildComponents(codeBuilder); + createListViewChildComponentsCode = codeBuilder.ToString(); + + // Get list view suspend layout code. + codeBuilder = new PythonCodeBuilder(); + codeBuilder.IndentString = " "; + listViewComponent.AppendSuspendLayout(codeBuilder); + suspendLayoutCode = codeBuilder.ToString(); + + // Get generated list view property code. + codeBuilder = new PythonCodeBuilder(); + codeBuilder.IndentString = " "; + codeBuilder.IncreaseIndent(); + listViewComponent.AppendComponent(codeBuilder); + listViewPropertiesCode = codeBuilder.ToString(); + + // Get list view resume layout code. + codeBuilder = new PythonCodeBuilder(); + codeBuilder.IndentString = " "; + listViewComponent.AppendResumeLayout(codeBuilder); + resumeLayoutCode = codeBuilder.ToString(); + + listViewChildComponents = listViewComponent.GetChildComponents(); } } @@ -71,55 +123,131 @@ namespace PythonBinding.Tests.Designer public void GeneratedCode() { string expectedCode = "def InitializeComponent(self):\r\n" + + " listViewItem1 = System.Windows.Forms.ListViewItem(\"aaa\")\r\n" + + " listViewItem2 = System.Windows.Forms.ListViewItem(\"bbb\")\r\n" + + " listViewItem3 = System.Windows.Forms.ListViewItem()\r\n" + " self._listView1 = System.Windows.Forms.ListView()\r\n" + - " listViewItem1 = System.Windows.Forms.ListViewItem()\r\n" + - " listViewItem2 = System.Windows.Forms.ListViewItem()\r\n" + + " self._columnHeader1 = System.Windows.Forms.ColumnHeader()\r\n" + + " self._columnHeader2 = System.Windows.Forms.ColumnHeader()\r\n" + + " self._listView1.SuspendLayout()\r\n" + " self.SuspendLayout()\r\n" + " # \r\n" + " # listView1\r\n" + " # \r\n" + + " listViewItem1.ToolTipText = \"tooltip\"\r\n" + + " self._listView1.Columns.AddRange(System.Array[System.Windows.Forms.ColumnHeader](\r\n" + + " [self._columnHeader1,\r\n" + + " self._columnHeader2]))\r\n" + " self._listView1.Items.AddRange(System.Array[System.Windows.Forms.ListViewItem](\r\n" + " [listViewItem1,\r\n" + - " listViewItem2]))\r\n" + + " listViewItem2,\r\n" + + " listViewItem3]))\r\n" + " self._listView1.Location = System.Drawing.Point(0, 0)\r\n" + " self._listView1.Name = \"listView1\"\r\n" + " self._listView1.Size = System.Drawing.Size(204, 104)\r\n" + " self._listView1.TabIndex = 0\r\n" + - " listViewItem1.ToolTipText = \"tooltip\"\r\n" + + " self._listView1.View = System.Windows.Forms.View.Details\r\n" + + " # \r\n" + + " # columnHeader1\r\n" + + " # \r\n" + + " self._columnHeader1.Text = \"columnHeader1\"\r\n" + + " # \r\n" + + " # columnHeader2\r\n" + + " # \r\n" + + " self._columnHeader2.Text = \"columnHeader2\"\r\n" + " # \r\n" + " # MainForm\r\n" + " # \r\n" + " self.ClientSize = System.Drawing.Size(200, 300)\r\n" + " self.Controls.Add(self._listView1)\r\n" + " self.Name = \"MainForm\"\r\n" + + " self._listView1.ResumeLayout(False)\r\n" + + " self._listView1.PerformLayout()\r\n" + " self.ResumeLayout(False)\r\n" + " self.PerformLayout()\r\n"; - Assert.AreEqual(expectedCode, generatedPythonCode); + Assert.AreEqual(expectedCode, generatedPythonCode, generatedPythonCode); + } + + /// + /// Should include the column header and list view item creation. + /// + [Test] + public void ListViewCreationCode() + { + string expectedCode = "listViewItem1 = System.Windows.Forms.ListViewItem(\"aaa\")\r\n" + + "listViewItem2 = System.Windows.Forms.ListViewItem(\"bbb\")\r\n" + + "listViewItem3 = System.Windows.Forms.ListViewItem()\r\n" + + "self._listView1 = System.Windows.Forms.ListView()\r\n"; + Assert.AreEqual(expectedCode, createListViewCode); } [Test] - public void TwoListViewChildren() + public void TwoListViewChildComponents() { - Assert.AreEqual(2, listViewChildren.Length); + Assert.AreEqual(2, listViewChildComponents.Length); } [Test] - public void ListViewItem1Text() + public void ListViewChildComponentAreColumnHeaders() { - Assert.AreEqual("aaa", listViewItem1.Text); + object[] expectedChildComponents = new object[] {columnHeader1, columnHeader2}; + Assert.AreEqual(expectedChildComponents, listViewChildComponents); } [Test] - public void ListViewItem1TooltipText() + public void SuspendLayoutGeneratedCode() { - Assert.AreEqual("tooltip", listViewItem1.ToolTipText); - } + string expectedCode = "self._listView1.SuspendLayout()\r\n"; + Assert.AreEqual(expectedCode, suspendLayoutCode); + } [Test] - public void ListViewItem2Text() + public void ResumeLayoutGeneratedCode() { - Assert.AreEqual("bbb", listViewItem2.Text); + string expectedCode = "self._listView1.ResumeLayout(False)\r\n" + + "self._listView1.PerformLayout()\r\n"; + Assert.AreEqual(expectedCode, resumeLayoutCode); + } + + [Test] + public void GeneratedListViewPropertiesCode() + { + string expectedCode = " # \r\n" + + " # listView1\r\n" + + " # \r\n" + + " listViewItem1.ToolTipText = \"tooltip\"\r\n" + + " self._listView1.Columns.AddRange(System.Array[System.Windows.Forms.ColumnHeader](\r\n" + + " [self._columnHeader1,\r\n" + + " self._columnHeader2]))\r\n" + + " self._listView1.Items.AddRange(System.Array[System.Windows.Forms.ListViewItem](\r\n" + + " [listViewItem1,\r\n" + + " listViewItem2,\r\n" + + " listViewItem3]))\r\n" + + " self._listView1.Location = System.Drawing.Point(0, 0)\r\n" + + " self._listView1.Name = \"listView1\"\r\n" + + " self._listView1.Size = System.Drawing.Size(204, 104)\r\n" + + " self._listView1.TabIndex = 0\r\n" + + " self._listView1.View = System.Windows.Forms.View.Details\r\n" + + " # \r\n" + + " # columnHeader1\r\n" + + " # \r\n" + + " self._columnHeader1.Text = \"columnHeader1\"\r\n" + + " # \r\n" + + " # columnHeader2\r\n" + + " # \r\n" + + " self._columnHeader2.Text = \"columnHeader2\"\r\n"; + + Assert.AreEqual(expectedCode, listViewPropertiesCode); + } + + [Test] + public void ListViewChildComponentsCreated() + { + string expectedCode = "self._columnHeader1 = System.Windows.Forms.ColumnHeader()\r\n" + + "self._columnHeader2 = System.Windows.Forms.ColumnHeader()\r\n"; + + Assert.AreEqual(expectedCode, createListViewChildComponentsCode); } } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateMenuStripItemsTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateMenuStripItemsTestFixture.cs index a04e424346..ad3fa5fbb0 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateMenuStripItemsTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateMenuStripItemsTestFixture.cs @@ -80,8 +80,8 @@ namespace PythonBinding.Tests.Designer PythonControl pythonForm = new PythonControl(" "); generatedPythonCode = pythonForm.GenerateInitializeComponentMethod(form); - menuStripChildComponents = PythonControl.GetChildComponents(menuStrip); - fileMenuItemChildComponents = PythonControl.GetChildComponents(fileMenuItem); + menuStripChildComponents = PythonDesignerComponentFactory.CreateDesignerComponent(menuStrip).GetChildComponents(); + fileMenuItemChildComponents = PythonDesignerComponentFactory.CreateDesignerComponent(fileMenuItem).GetChildComponents(); } } @@ -145,7 +145,7 @@ namespace PythonBinding.Tests.Designer " self.ResumeLayout(False)\r\n" + " self.PerformLayout()\r\n"; - Assert.AreEqual(expectedCode, generatedPythonCode); + Assert.AreEqual(expectedCode, generatedPythonCode, generatedPythonCode); } [Test] diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateSimpleFormTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateSimpleFormTestFixture.cs index a754b3a57e..b85d8d2654 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateSimpleFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateSimpleFormTestFixture.cs @@ -20,6 +20,8 @@ namespace PythonBinding.Tests.Designer public class GenerateSimpleFormTestFixture { string generatedPythonCode; + string formPropertiesCode; + string propertyOwnerName; [TestFixtureSetUp] public void SetUpFixture() @@ -36,6 +38,14 @@ namespace PythonBinding.Tests.Designer string indentString = " "; PythonControl pythonForm = new PythonControl(indentString); generatedPythonCode = pythonForm.GenerateInitializeComponentMethod(form); + + PythonCodeBuilder codeBuilder = new PythonCodeBuilder(); + codeBuilder.IndentString = indentString; + codeBuilder.IncreaseIndent(); + PythonDesignerRootComponent designerRootComponent = new PythonDesignerRootComponent(form); + propertyOwnerName = designerRootComponent.GetPropertyOwnerName(); + designerRootComponent.AppendComponentProperties(codeBuilder); + formPropertiesCode = codeBuilder.ToString(); } } @@ -54,5 +64,19 @@ namespace PythonBinding.Tests.Designer Assert.AreEqual(expectedCode, generatedPythonCode); } + + [Test] + public void FormPropertiesCode() + { + string expectedCode = " self.ClientSize = System.Drawing.Size(284, 264)\r\n" + + " self.Name = \"MainForm\"\r\n"; + Assert.AreEqual(expectedCode, formPropertiesCode); + } + + [Test] + public void PropertyOwnerName() + { + Assert.AreEqual("self", propertyOwnerName); + } } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateTextBoxFormTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateTextBoxFormTestFixture.cs index 47e0521d8b..fbb322724a 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateTextBoxFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateTextBoxFormTestFixture.cs @@ -20,6 +20,13 @@ namespace PythonBinding.Tests.Designer public class GenerateTextBoxFormTestFixture { string generatedPythonCode; + string textBoxPropertyCode; + string textBoxSuspendLayoutCode; + string textBoxResumeLayoutCode; + string textBoxCreationCode; + string textBoxPropertyOwnerName; + string suspendLayoutCode; + string resumeLayoutCode; [TestFixtureSetUp] public void SetUpFixture() @@ -43,6 +50,41 @@ namespace PythonBinding.Tests.Designer string indentString = " "; PythonControl pythonForm = new PythonControl(indentString); generatedPythonCode = pythonForm.GenerateInitializeComponentMethod(form); + + PythonCodeBuilder codeBuilder = new PythonCodeBuilder(); + codeBuilder.IndentString = indentString; + codeBuilder.IncreaseIndent(); + PythonDesignerComponent designerComponent = new PythonDesignerComponent(textBox); + designerComponent.AppendComponent(codeBuilder); + textBoxPropertyCode = codeBuilder.ToString(); + + codeBuilder = new PythonCodeBuilder(); + codeBuilder.IndentString = indentString; + designerComponent.AppendCreateInstance(codeBuilder); + textBoxCreationCode = codeBuilder.ToString(); + + codeBuilder = new PythonCodeBuilder(); + codeBuilder.IndentString = indentString; + designerComponent.AppendSuspendLayout(codeBuilder); + textBoxSuspendLayoutCode = codeBuilder.ToString(); + + codeBuilder = new PythonCodeBuilder(); + codeBuilder.IndentString = indentString; + designerComponent.AppendResumeLayout(codeBuilder); + textBoxResumeLayoutCode = codeBuilder.ToString(); + + textBoxPropertyOwnerName = designerComponent.GetPropertyOwnerName(); + + PythonDesignerRootComponent designerRootComponent = new PythonDesignerRootComponent(form); + codeBuilder = new PythonCodeBuilder(); + codeBuilder.IndentString = indentString; + designerRootComponent.AppendSuspendLayout(codeBuilder); + suspendLayoutCode = codeBuilder.ToString(); + + codeBuilder = new PythonCodeBuilder(); + codeBuilder.IndentString = indentString; + designerRootComponent.AppendResumeLayout(codeBuilder); + resumeLayoutCode = codeBuilder.ToString(); } } @@ -70,5 +112,57 @@ namespace PythonBinding.Tests.Designer Assert.AreEqual(expectedCode, generatedPythonCode); } + + [Test] + public void TextBoxGeneratedCode() + { + string expectedCode = " # \r\n" + + " # textBox1\r\n" + + " # \r\n" + + " self._textBox1.Location = System.Drawing.Point(10, 10)\r\n" + + " self._textBox1.Name = \"textBox1\"\r\n" + + " self._textBox1.Size = System.Drawing.Size(110, 20)\r\n" + + " self._textBox1.TabIndex = 1\r\n"; + Assert.AreEqual(expectedCode, textBoxPropertyCode); + } + + [Test] + public void SuspendLayoutCodeNotGenerated() + { + Assert.AreEqual(String.Empty, textBoxSuspendLayoutCode); + } + + [Test] + public void ResumeLayoutCodeNotGenerated() + { + Assert.AreEqual(String.Empty, textBoxResumeLayoutCode); + } + + [Test] + public void TextBoxCreationCode() + { + string expectedCode = "self._textBox1 = System.Windows.Forms.TextBox()\r\n"; + Assert.AreEqual(expectedCode, textBoxCreationCode); + } + + [Test] + public void TextBoxPropertyOwnerName() + { + Assert.AreEqual("self._textBox1", textBoxPropertyOwnerName); + } + + [Test] + public void SuspendLayoutCode() + { + Assert.AreEqual("self.SuspendLayout()\r\n", suspendLayoutCode); + } + + [Test] + public void ResumeLayoutCode() + { + string expectedCode = "self.ResumeLayout(False)\r\n" + + "self.PerformLayout()\r\n"; + Assert.AreEqual(expectedCode, resumeLayoutCode); + } } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GetSerializableContentPropertiesTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GetSerializableContentPropertiesTestFixture.cs index 0426759388..41328d5cde 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GetSerializableContentPropertiesTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GetSerializableContentPropertiesTestFixture.cs @@ -27,7 +27,7 @@ namespace PythonBinding.Tests.Designer using (Form form = new Form()) { // Modify Form.Text so it is identified as needing serialization. form.Text = "abc"; - properties = PythonControl.GetSerializableContentProperties(form); + properties = PythonDesignerComponent.GetSerializableContentProperties(form); } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/IgnoreDesignTimePropertiesTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/IgnoreDesignTimePropertiesTestFixture.cs index 1cd7d34bbd..2f8aee473f 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/IgnoreDesignTimePropertiesTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/IgnoreDesignTimePropertiesTestFixture.cs @@ -56,7 +56,7 @@ namespace PythonBinding.Tests.Designer PythonControl pythonForm = new PythonControl(" "); generatedCode = pythonForm.GenerateInitializeComponentMethod(form); - propertyDescriptors = PythonControl.GetSerializableProperties(form); + propertyDescriptors = PythonDesignerComponent.GetSerializableProperties(form); } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/IsSitedComponentTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/IsSitedComponentTests.cs index 8ba20b3df8..024bd050b2 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/IsSitedComponentTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/IsSitedComponentTests.cs @@ -19,13 +19,13 @@ namespace PythonBinding.Tests.Designer [Test] public void NullComponent() { - Assert.IsFalse(PythonControl.IsSitedComponent(null)); + Assert.IsFalse(PythonDesignerComponent.IsSitedComponent(null)); } [Test] public void ComponentNotSited() { - Assert.IsFalse(PythonControl.IsSitedComponent(new Component())); + Assert.IsFalse(PythonDesignerComponent.IsSitedComponent(new Component())); } [Test] @@ -33,13 +33,22 @@ namespace PythonBinding.Tests.Designer { Component component = new Component(); component.Site = this; - Assert.IsTrue(PythonControl.IsSitedComponent(component)); + Assert.IsTrue(PythonDesignerComponent.IsSitedComponent(component)); + } + + [Test] + public void SitedDesignerComponent() + { + Component component = new Component(); + component.Site = this; + PythonDesignerComponent designerComponent = new PythonDesignerComponent(component); + Assert.IsTrue(designerComponent.IsSited); } [Test] public void NonComponent() { - Assert.IsFalse(PythonControl.IsSitedComponent(String.Empty)); + Assert.IsFalse(PythonDesignerComponent.IsSitedComponent(String.Empty)); } public IComponent Component { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/PythonCodeBuilderTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/PythonCodeBuilderTests.cs new file mode 100644 index 0000000000..80dba222af --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/PythonCodeBuilderTests.cs @@ -0,0 +1,76 @@ +// +// +// +// +// $Revision$ +// + +using System; +using ICSharpCode.PythonBinding; +using NUnit.Framework; + +namespace PythonBinding.Tests.Designer +{ + [TestFixture] + public class PythonCodeBuilderTests + { + PythonCodeBuilder codeBuilder; + + [SetUp] + public void Init() + { + codeBuilder = new PythonCodeBuilder(); + codeBuilder.IndentString = "\t"; + } + + [Test] + public void AppendNewLine() + { + codeBuilder.AppendLine(); + Assert.AreEqual("\r\n", codeBuilder.ToString()); + } + + [Test] + public void AppendText() + { + codeBuilder.Append("abc"); + Assert.AreEqual("abc", codeBuilder.ToString()); + } + + [Test] + public void AppendIndentedText() + { + codeBuilder.IncreaseIndent(); + codeBuilder.AppendIndented("abc"); + Assert.AreEqual("\tabc", codeBuilder.ToString()); + } + + [Test] + public void IncreaseIndentTwice() + { + codeBuilder.IncreaseIndent(); + codeBuilder.IncreaseIndent(); + codeBuilder.AppendIndented("abc"); + Assert.AreEqual("\t\tabc", codeBuilder.ToString()); + } + + [Test] + public void DecreaseIndent() + { + codeBuilder.IncreaseIndent(); + codeBuilder.AppendIndented("abc"); + codeBuilder.AppendLine(); + codeBuilder.DecreaseIndent(); + codeBuilder.AppendIndented("abc"); + Assert.AreEqual("\tabc\r\nabc", codeBuilder.ToString()); + } + + [Test] + public void AppendIndentedLine() + { + codeBuilder.IncreaseIndent(); + codeBuilder.AppendIndentedLine("abc"); + Assert.AreEqual("\tabc\r\n", codeBuilder.ToString()); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj index 411f50743e..3b1c74e5b6 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj @@ -145,6 +145,7 @@ + @@ -210,6 +211,7 @@ + diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/TODO.txt b/src/AddIns/BackendBindings/Python/PythonBinding/Test/TODO.txt index 83bab5104a..c8f6b44f29 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/TODO.txt +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/TODO.txt @@ -25,7 +25,6 @@ def main(args): print "Hello, World!" return 0 -* Test python compiler task logging. * CtrlSpaceHelper.AddUsing should be called in the PythonResolver when the ExpressionContext is Importable. @@ -71,10 +70,6 @@ def main(args): code completion after the import is incorrect here. It needs to show items that are in the System namespace. -* Python code converter. - - More tests... - * The PythonDesignerGenerator inserts an event handler at the end of the active document. This is not correct. It should insert it at the end of the form class. The file could contain multiple classes and @@ -93,9 +88,6 @@ def main(args): Handle invalid event name. Check that += operator used. -* Double clicking an event handler name in the property grid when it is already defined generates a new - event handler. - * ContextMenuStrip - designer does not generate the correct code. * Look at fixing the compiled exe so it can be run from a different folder.