[svn] r7596: vs-plugin/trunk/Nemerle.VsIntegration: !ToDo/ToDo.txt Nemerle.VisualStudio.csproj Project/Nem...

pbludov svnadmin at nemerle.org
Sun Apr 15 11:02:22 CEST 2007


Log:
User Controls support.

Author: pbludov
Date: Sun Apr 15 11:02:09 2007
New Revision: 7596

Added:
   vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/UserControl/
   vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/UserControl/UserControl.Designer.n
   vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/UserControl/UserControl.ico   (contents, props changed)
   vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/UserControl/UserControl.n
   vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/UserControl/UserControl.vstemplate
   vs-plugin/trunk/Nemerle.VsIntegration/Templates/Projects/WindowsApplication/MainForm.Designer.n
      - copied, changed from rev 7595, vs-plugin/trunk/Nemerle.VsIntegration/Templates/Projects/WindowsApplication/Form1.Designer.n
   vs-plugin/trunk/Nemerle.VsIntegration/Templates/Projects/WindowsApplication/MainForm.n
      - copied, changed from rev 7595, vs-plugin/trunk/Nemerle.VsIntegration/Templates/Projects/WindowsApplication/Form1.n
Removed:
   vs-plugin/trunk/Nemerle.VsIntegration/Templates/Projects/WindowsApplication/Form1.Designer.n
   vs-plugin/trunk/Nemerle.VsIntegration/Templates/Projects/WindowsApplication/Form1.n
Modified:
   vs-plugin/trunk/Nemerle.VsIntegration/!ToDo/ToDo.txt
   vs-plugin/trunk/Nemerle.VsIntegration/Nemerle.VisualStudio.csproj
   vs-plugin/trunk/Nemerle.VsIntegration/Project/NemerleAssemblyReferenceNode.cs
   vs-plugin/trunk/Nemerle.VsIntegration/Project/NemerleFileNode.cs
   vs-plugin/trunk/Nemerle.VsIntegration/Project/NemerleFileNodeCodeDomProvider.cs
   vs-plugin/trunk/Nemerle.VsIntegration/Project/NemerleOAFileItem.cs
   vs-plugin/trunk/Nemerle.VsIntegration/Resources.Designer.cs
   vs-plugin/trunk/Nemerle.VsIntegration/Resources.resx
   vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/Class/Class.n
   vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/Class/Nemerle.vstemplate
   vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/Form/Form.Designer.n
   vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/Form/Form.n
   vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/Form/windowsform.vstemplate
   vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/ResX/Resource.vstemplate
   vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/Text/TextFile.vstemplate
   vs-plugin/trunk/Nemerle.VsIntegration/Templates/Projects/WindowsApplication/Program.n
   vs-plugin/trunk/Nemerle.VsIntegration/Templates/Projects/WindowsApplication/WindowsApplication.nproj

Modified: vs-plugin/trunk/Nemerle.VsIntegration/!ToDo/ToDo.txt
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/!ToDo/ToDo.txt	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/!ToDo/ToDo.txt	Sun Apr 15 11:02:09 2007
@@ -1,7 +1,7 @@
 1.  (Готово) Реализовать вывод информации о АСТ файла в докинг-окно "Ast Tool Window".
 		Обновление окна делает на Check().
-2.	Поженить новый инсталлятор с имеющимся. Добавить возможность задать каталог и выбрать компоненты.
-3.	Генерация кода с метаданных.
+2.	Поженить новый инсталлятор с имеющимся. Добавить возможность задать каталог и выбрать компоненты. -> pbludov
+3.	Генерация кода с метаданных. -> pbludov
 4.  Надо сделать так чтобы хинты с сообщениями об ошибках включали все сообщения 
     приходящиеся на некоторый локейшон, а не только последний (как сейчас). -> IT
 5.  Имеются некоторые глюки при комлите уточнений типов (type enforcement).

Modified: vs-plugin/trunk/Nemerle.VsIntegration/Nemerle.VisualStudio.csproj
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Nemerle.VisualStudio.csproj	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Nemerle.VisualStudio.csproj	Sun Apr 15 11:02:09 2007
@@ -205,6 +205,8 @@
     <Content Include="CodeSnippets\Snippets\match.snippet">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Templates\ProjectItems\UserControl\UserControl.ico" />
+    <Content Include="Templates\ProjectItems\UserControl\UserControl.vstemplate" />
     <None Include="CtcComponents\Guids.h" />
     <None Include="CtcComponents\PkgCmdID.h" />
     <None Include="nemerle.snk" />
@@ -296,6 +298,8 @@
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
     <None Include="Resources\Nemerle.ico" />
+    <None Include="Templates\ProjectItems\UserControl\UserControl.Designer.n" />
+    <None Include="Templates\ProjectItems\UserControl\UserControl.n" />
     <EmbeddedResource Include="GUI\AstToolControl.resx">
       <SubType>Designer</SubType>
       <DependentUpon>AstToolControl.cs</DependentUpon>

Modified: vs-plugin/trunk/Nemerle.VsIntegration/Project/NemerleAssemblyReferenceNode.cs
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Project/NemerleAssemblyReferenceNode.cs	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Project/NemerleAssemblyReferenceNode.cs	Sun Apr 15 11:02:09 2007
@@ -27,7 +27,7 @@
 			}
 		}
 
-		public override Guid ItemTypeGuid
+/*		public override Guid ItemTypeGuid
 		{
 			get
 			{
@@ -37,5 +37,6 @@
 				return VSConstants.GUID_ItemType_PhysicalFile;
 			}
 		}
+ */
 	}
 }

Modified: vs-plugin/trunk/Nemerle.VsIntegration/Project/NemerleFileNode.cs
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Project/NemerleFileNode.cs	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Project/NemerleFileNode.cs	Sun Apr 15 11:02:09 2007
@@ -1,6 +1,5 @@
 using System;
 using System.Diagnostics;
-using System.Globalization;
 using System.IO;
 
 using VSLangProj;
@@ -31,6 +30,20 @@
 
 			//((FileNodeProperties)NodeProperties).OnCustomToolChanged          += OnCustomToolChanged;
 			//((FileNodeProperties)NodeProperties).OnCustomToolNameSpaceChanged += OnCustomToolNameSpaceChanged;
+
+			// HasDesigner property is not virtual, so we have to set it up in the ctor.
+			//
+			switch (SubType)
+			{
+				case ProjectFileAttributeValue.Component:
+				case ProjectFileAttributeValue.Form:
+				case ProjectFileAttributeValue.UserControl:
+					HasDesigner = true;
+					break;
+				default:
+					HasDesigner = false;
+					break;
+			}
 		}
 
 		#endregion
@@ -45,21 +58,6 @@
 		#region Properties
 
 		/// <summary>
-		/// Returns bool indicating whether this node is of subtype "Form"
-		/// </summary>
-		public bool IsFormSubType
-		{
-			get
-			{
-				string result = ItemNode.GetMetadata(ProjectFileConstants.SubType);
-
-				return
-					!string.IsNullOrEmpty(result) &&
-					 string.Compare(result, ProjectFileAttributeValue.Form, true, CultureInfo.InvariantCulture) == 0;
-			}
-		}
-
-		/// <summary>
 		/// Returns the SubType of an Nemerle FileNode. It is 
 		/// </summary>
 		public string SubType
@@ -140,8 +138,9 @@
 		{
 			if (FileName.EndsWith(NemerleConstants.FileExtension, StringComparison.InvariantCultureIgnoreCase))
 			{
-				int imageIndex = IsFormSubType ? (int)NemerleConstants.ImageListIndex.NemerleForm :
-					(int)NemerleConstants.ImageListIndex.NemerleSource;
+				int imageIndex = HasDesigner?
+					NemerleConstants.ImageListIndex.NemerleForm:
+					NemerleConstants.ImageListIndex.NemerleSource;
 				return 
 					PackageUtilities.GetIntPointerFromImage(NemerleProjectNode.NemerleImageList.Images[imageIndex]);
 			}
@@ -158,7 +157,7 @@
 
 			Debug.Assert(manager != null, "Could not get the FileDocumentManager");
 
-			Guid viewGuid = IsFormSubType? NativeMethods.LOGVIEWID_Designer : NativeMethods.LOGVIEWID_Code;
+			Guid viewGuid = HasDesigner? NativeMethods.LOGVIEWID_Designer: NativeMethods.LOGVIEWID_Code;
 
 			IVsWindowFrame frame;
 
@@ -202,7 +201,7 @@
 						return VSConstants.S_OK;
 
 					case VsCommands.ViewForm:
-						if (IsFormSubType)
+						if (HasDesigner)
 							result |= QueryStatusResult.SUPPORTED | QueryStatusResult.ENABLED;
 						return VSConstants.S_OK;
 				}

Modified: vs-plugin/trunk/Nemerle.VsIntegration/Project/NemerleFileNodeCodeDomProvider.cs
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Project/NemerleFileNodeCodeDomProvider.cs	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Project/NemerleFileNodeCodeDomProvider.cs	Sun Apr 15 11:02:09 2007
@@ -93,13 +93,7 @@
 
 		private bool IsFormSubType
 		{
-			get
-			{
-				NemerleFileNode nFileNode = _fileNode as NemerleFileNode;
-				if (nFileNode != null)
-					return nFileNode.IsFormSubType;
-				return false;
-			}
+			get { return _fileNode.HasDesigner; }
 		}
 
 		private string PathOfMainFile()

Modified: vs-plugin/trunk/Nemerle.VsIntegration/Project/NemerleOAFileItem.cs
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Project/NemerleOAFileItem.cs	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Project/NemerleOAFileItem.cs	Sun Apr 15 11:02:09 2007
@@ -46,7 +46,7 @@
 			{
 				// Get the subtype and decide the viewkind based on the result.
 				//
-				if (((NemerleFileNode)Node).IsFormSubType)
+				if (Node.HasDesigner)
 					return base.Open(Constants.vsViewKindDesigner);
 			}
 

Modified: vs-plugin/trunk/Nemerle.VsIntegration/Resources.Designer.cs
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Resources.Designer.cs	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Resources.Designer.cs	Sun Apr 15 11:02:09 2007
@@ -96,6 +96,96 @@
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Windows Form.
+        /// </summary>
+        internal static string _2237 {
+            get {
+                return ResourceManager.GetString("2237", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Class.
+        /// </summary>
+        internal static string _2245 {
+            get {
+                return ResourceManager.GetString("2245", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to An empty class definiton.
+        /// </summary>
+        internal static string _2262 {
+            get {
+                return ResourceManager.GetString("2262", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to A blank Windows Form.
+        /// </summary>
+        internal static string _2264 {
+            get {
+                return ResourceManager.GetString("2264", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to User Control.
+        /// </summary>
+        internal static string _2295 {
+            get {
+                return ResourceManager.GetString("2295", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to A reusable Windows Forms control.
+        /// </summary>
+        internal static string _2296 {
+            get {
+                return ResourceManager.GetString("2296", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Text File.
+        /// </summary>
+        internal static string _2316 {
+            get {
+                return ResourceManager.GetString("2316", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to An empty text file.
+        /// </summary>
+        internal static string _2317 {
+            get {
+                return ResourceManager.GetString("2317", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Resources File.
+        /// </summary>
+        internal static string _2390 {
+            get {
+                return ResourceManager.GetString("2390", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to A file for storing resources.
+        /// </summary>
+        internal static string _2391 {
+            get {
+                return ResourceManager.GetString("2391", resourceCulture);
+            }
+        }
+        
         internal static System.Drawing.Icon _300 {
             get {
                 object obj = ResourceManager.GetObject("300", resourceCulture);
@@ -319,15 +409,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Output File.
-        /// </summary>
-        internal static string OutputFile1 {
-            get {
-                return ResourceManager.GetString("OutputFile1", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to The name of the project&apos;s primary output file..
         /// </summary>
         internal static string OutputFileDescription {

Modified: vs-plugin/trunk/Nemerle.VsIntegration/Resources.resx
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Resources.resx	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Resources.resx	Sun Apr 15 11:02:09 2007
@@ -217,9 +217,6 @@
   <data name="NestedProjectFileAssemblyFilter" xml:space="preserve">
     <value>MyNested Project File (*.nestedproj){0}*.nestedproj{1}</value>
   </data>
-  <data name="OutputFile1" xml:space="preserve">
-    <value>Output File</value>
-  </data>
   <data name="104" xml:space="preserve">
     <value>DDQ8HJPRZZE3QJKCEAEZZEZDJ0CJPKMPEJEIZQEZQARPARHDHAC0D3CQDCEJPIJCE3P2K9E9IDJCMEMHRKQDHAQ1QMZRAPHAEQP2HQP3IAQMZDKIJRI3CZQJIIDTECII</value>
   </data>
@@ -272,4 +269,44 @@
   <data name="DefineConstantsDescription" xml:space="preserve">
     <value>Specifies symbols on which to perform conditional compilation. Separate symbols with a semicolon.</value>
   </data>
+  <data name="2295" xml:space="preserve">
+    <value>User Control</value>
+    <comment>ProjectItems\UserControl</comment>
+  </data>
+  <data name="2296" xml:space="preserve">
+    <value>A reusable Windows Forms control</value>
+    <comment>ProjectItems\UserControl</comment>
+  </data>
+  <data name="2237" xml:space="preserve">
+    <value>Windows Form</value>
+    <comment>ProjectItems\Form</comment>
+  </data>
+  <data name="2245" xml:space="preserve">
+    <value>Class</value>
+    <comment>ProjectItems\Class</comment>
+  </data>
+  <data name="2262" xml:space="preserve">
+    <value>An empty class definiton</value>
+    <comment>ProjectItems\Class</comment>
+  </data>
+  <data name="2264" xml:space="preserve">
+    <value>A blank Windows Form</value>
+    <comment>ProjectItems\Form</comment>
+  </data>
+  <data name="2316" xml:space="preserve">
+    <value>Text File</value>
+    <comment>ProjectItems\Text</comment>
+  </data>
+  <data name="2317" xml:space="preserve">
+    <value>An empty text file</value>
+    <comment>ProjectItems\Text</comment>
+  </data>
+  <data name="2390" xml:space="preserve">
+    <value>Resources File</value>
+    <comment>ProjectItems\ResX</comment>
+  </data>
+  <data name="2391" xml:space="preserve">
+    <value>A file for storing resources</value>
+    <comment>ProjectItems\ResX</comment>
+  </data>
 </root>
\ No newline at end of file

Modified: vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/Class/Class.n
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/Class/Class.n	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/Class/Class.n	Sun Apr 15 11:02:09 2007
@@ -4,7 +4,9 @@
 
 namespace $rootnamespace$
 {
-	// Description of $safeitemrootname$
+  /// <summary>
+  /// Description of $safeitemrootname$.
+  /// </summary>
 	class $safeitemrootname$
 	{
 	}

Modified: vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/Class/Nemerle.vstemplate
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/Class/Nemerle.vstemplate	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/Class/Nemerle.vstemplate	Sun Apr 15 11:02:09 2007
@@ -1,11 +1,11 @@
 <VSTemplate Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" Type="Item">
   <TemplateData>
-    <DefaultName>Class.n</DefaultName>
-    <Name>Class</Name>
-    <Description>An empty class definiton</Description>
+    <Name Package="{cf7296f1-47e5-4915-83a0-8c44961f0981}" ID="2245" />
+    <Description Package="{cf7296f1-47e5-4915-83a0-8c44961f0981}" ID="2262" />
     <ProjectType>Nemerle</ProjectType>
     <SortOrder>10</SortOrder>
     <Icon>Class.ico</Icon>
+  	<DefaultName>Class.n</DefaultName>
   </TemplateData>
   <TemplateContent>
     <References />

Modified: vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/Form/Form.Designer.n
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/Form/Form.Designer.n	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/Form/Form.Designer.n	Sun Apr 15 11:02:09 2007
@@ -17,6 +17,7 @@
             {
                 components.Dispose();
             }
+
             base.Dispose(disposing);
         }
 

Modified: vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/Form/Form.n
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/Form/Form.n	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/Form/Form.n	Sun Apr 15 11:02:09 2007
@@ -8,6 +8,9 @@
 
 namespace $rootnamespace$
 {
+  /// <summary>
+  /// Description of $safeitemrootname$.
+  /// </summary>
     public partial class $safeitemrootname$ : Form
     {
         public this()

Modified: vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/Form/windowsform.vstemplate
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/Form/windowsform.vstemplate	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/Form/windowsform.vstemplate	Sun Apr 15 11:02:09 2007
@@ -1,7 +1,7 @@
 <VSTemplate Version="2.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
   <TemplateData>
-    <Name>Windows Form</Name>
-    <Description>A blank Windows Form</Description>
+    <Name Package="{cf7296f1-47e5-4915-83a0-8c44961f0981}" ID="2237" />
+    <Description Package="{cf7296f1-47e5-4915-83a0-8c44961f0981}" ID="2264" />
     <Icon>Form.ico</Icon>
     <ProjectType>Nemerle</ProjectType>
     <SortOrder>40</SortOrder>

Modified: vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/ResX/Resource.vstemplate
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/ResX/Resource.vstemplate	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/ResX/Resource.vstemplate	Sun Apr 15 11:02:09 2007
@@ -1,7 +1,7 @@
 <VSTemplate Version="2.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
   <TemplateData>
-    <Name>Resources File</Name>
-    <Description>A file for storing resources</Description>
+    <Name Package="{cf7296f1-47e5-4915-83a0-8c44961f0981}" ID="2390" />
+    <Description Package="{cf7296f1-47e5-4915-83a0-8c44961f0981}" ID="2391" />
     <Icon>Resource_Resx.ico</Icon>
     <ProjectType>Nemerle</ProjectType>
     <SortOrder>300</SortOrder>

Modified: vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/Text/TextFile.vstemplate
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/Text/TextFile.vstemplate	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/Text/TextFile.vstemplate	Sun Apr 15 11:02:09 2007
@@ -1,7 +1,7 @@
 <VSTemplate Version="2.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
   <TemplateData>
-    <Name>Text File</Name>
-    <Description>A blank text file.</Description>
+    <Name Package="{cf7296f1-47e5-4915-83a0-8c44961f0981}" ID="2316" />
+    <Description Package="{cf7296f1-47e5-4915-83a0-8c44961f0981}" ID="2317" />
     <Icon>Text.ico</Icon>
     <ProjectType>Nemerle</ProjectType>
     <SortOrder>180</SortOrder>

Added: vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/UserControl/UserControl.Designer.n
==============================================================================
--- (empty file)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/UserControl/UserControl.Designer.n	Sun Apr 15 11:02:09 2007
@@ -0,0 +1,38 @@
+namespace $rootnamespace$
+{
+  public partial class $safeitemrootname$
+  {
+    /// <summary>
+    /// Required designer variable.
+    /// </summary>
+    private mutable components : System.ComponentModel.IContainer = null;
+
+    /// <summary>
+    /// Clean up any resources being used.
+    /// </summary>
+    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+    protected override Dispose(disposing : bool) : void
+    {
+      when (disposing && (components != null))
+      {
+        components.Dispose();
+      }
+
+      base.Dispose(disposing);
+    }
+
+    #region
+
+    /// <summary>
+    /// Required method for Designer support - do not modify
+    /// the contents of this method with the code editor.
+    /// </summary>
+    private InitializeComponent() : void
+    {
+      this.components =  System.ComponentModel.Container();
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+    }
+
+    #endregion
+  }
+}

Added: vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/UserControl/UserControl.ico
==============================================================================
Binary file. No diff available.

Added: vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/UserControl/UserControl.n
==============================================================================
--- (empty file)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/UserControl/UserControl.n	Sun Apr 15 11:02:09 2007
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace $rootnamespace$
+{
+  /// <summary>
+  /// Description of $safeitemrootname$.
+  /// </summary>
+  [ToolboxBitmap(typeof($safeitemrootname$))]
+  public partial class $safeitemrootname$ : UserControl
+  {
+    public this()
+    {
+      InitializeComponent();
+    }
+  }
+}

Added: vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/UserControl/UserControl.vstemplate
==============================================================================
--- (empty file)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Templates/ProjectItems/UserControl/UserControl.vstemplate	Sun Apr 15 11:02:09 2007
@@ -0,0 +1,33 @@
+<VSTemplate Version="2.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name Package="{cf7296f1-47e5-4915-83a0-8c44961f0981}" ID="2295" />
+    <Description Package="{cf7296f1-47e5-4915-83a0-8c44961f0981}" ID="2296" />
+    <Icon>UserControl.ico</Icon>
+    <ProjectType>Nemerle</ProjectType>
+    <SortOrder>40</SortOrder>
+    <DefaultName>UserControl.n</DefaultName>
+  </TemplateData>
+  <TemplateContent>
+    <References>
+      <Reference>
+        <Assembly>System</Assembly>
+      </Reference>
+      <Reference>
+        <Assembly>System.Data</Assembly>
+      </Reference>
+      <Reference>
+        <Assembly>System.Drawing</Assembly>
+      </Reference>
+      <Reference>
+        <Assembly>System.Windows.Forms</Assembly>
+      </Reference>
+      <Reference>
+        <Assembly>System.Xml</Assembly>
+      </Reference>
+    </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="UserControl">UserControl.n</ProjectItem>
+    <ProjectItem ReplaceParameters="true">UserControl.Designer.n</ProjectItem>
+    <ProjectItem>UserControl.ico</ProjectItem>
+  </TemplateContent>
+</VSTemplate>

Copied: vs-plugin/trunk/Nemerle.VsIntegration/Templates/Projects/WindowsApplication/MainForm.Designer.n (from rev 7595, vs-plugin/trunk/Nemerle.VsIntegration/Templates/Projects/WindowsApplication/Form1.Designer.n)
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Templates/Projects/WindowsApplication/Form1.Designer.n	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Templates/Projects/WindowsApplication/MainForm.Designer.n	Sun Apr 15 11:02:09 2007
@@ -1,6 +1,6 @@
 namespace $safeprojectname$
 {
-    public partial class Form1
+  public partial class MainForm
     {
         /// <summary>
         /// Required designer variable.
@@ -17,6 +17,7 @@
             {
                 components.Dispose();
             }
+
             base.Dispose(disposing);
         }
 
@@ -28,7 +29,7 @@
         {
             this.components =  System.ComponentModel.Container();
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Text = "Form1";
+        this.Text = "MainForm";
         }
     }
 }

Copied: vs-plugin/trunk/Nemerle.VsIntegration/Templates/Projects/WindowsApplication/MainForm.n (from rev 7595, vs-plugin/trunk/Nemerle.VsIntegration/Templates/Projects/WindowsApplication/Form1.n)
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Templates/Projects/WindowsApplication/Form1.n	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Templates/Projects/WindowsApplication/MainForm.n	Sun Apr 15 11:02:09 2007
@@ -8,7 +8,10 @@
 
 namespace $safeprojectname$
 {
-    public partial class Form1 : System.Windows.Forms.Form
+  /// <summary>
+  /// Description of MainForm.
+  /// </summary>
+  public partial class MainForm : Form
     {
         public this()
         {

Modified: vs-plugin/trunk/Nemerle.VsIntegration/Templates/Projects/WindowsApplication/Program.n
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Templates/Projects/WindowsApplication/Program.n	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Templates/Projects/WindowsApplication/Program.n	Sun Apr 15 11:02:09 2007
@@ -14,7 +14,7 @@
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(Form1());
+      Application.Run(MainForm());
         }
     }
 }

Modified: vs-plugin/trunk/Nemerle.VsIntegration/Templates/Projects/WindowsApplication/WindowsApplication.nproj
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Templates/Projects/WindowsApplication/WindowsApplication.nproj	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Templates/Projects/WindowsApplication/WindowsApplication.nproj	Sun Apr 15 11:02:09 2007
@@ -41,11 +41,11 @@
     <Reference Include="$(Nemerle)\Nemerle.dll"/>
 	</ItemGroup>
   <ItemGroup>
-    <Compile Include="Form1.n">
+    <Compile Include="MainForm.n">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Form1.Designer.n">
-      <DependentUpon>Form1.n</DependentUpon>
+    <Compile Include="MainForm.Designer.n">
+      <DependentUpon>MainForm.n</DependentUpon>
     </Compile>
     <Compile Include="Program.n" />
     <Compile Include="Properties\AssemblyInfo.n" />



More information about the svn mailing list