Backported:extras/MonoDevelop.IPhone/2.2.1

150325, 150348: Added iPad app template
150326: Fix project template option handling
150324: Pass SDK version to mtouch when running in sim
150322: Sdk version settable from templates 
150321: Fix persisting SDK version and I18n after editing 
150193: Fix new templates' xibs and headers

svn path=/branches/monodevelop/extras/MonoDevelop.IPhone/2.2/; revision=150354

18 files changed, 805 insertions, 64 deletions

diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.Debugger.Soft.IPhone/ChangeLog b/extras/MonoDevelop.IPhone/MonoDevelop.Debugger.Soft.IPhone/ChangeLog
index 6818e2b52c..8793c2d247 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.Debugger.Soft.IPhone/ChangeLog
+++ b/extras/MonoDevelop.IPhone/MonoDevelop.Debugger.Soft.IPhone/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-27  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* IPhoneDebuggerSession.cs: Use
+	  IPhoneExecutionHandler.CreateStartInfo to reduce code
+	  duplication.
+
+	* MonoDevelop.Debugger.Soft.IPhone.csproj: Fix build.
+
 2009-12-07  Michael Hutchinson  <mhutchinson@novell.com>
 
 	* IPhoneDebuggerSession.cs: Focus the simulator when
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.Debugger.Soft.IPhone/IPhoneDebuggerSession.cs b/extras/MonoDevelop.IPhone/MonoDevelop.Debugger.Soft.IPhone/IPhoneDebuggerSession.cs
index fd4cf989f6..a8a261c231 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.Debugger.Soft.IPhone/IPhoneDebuggerSession.cs
+++ b/extras/MonoDevelop.IPhone/MonoDevelop.Debugger.Soft.IPhone/IPhoneDebuggerSession.cs
@@ -35,6 +35,7 @@ using System.IO;
 using MonoDevelop.Core;
 using System.Net.Sockets;
 using System.Net;
+using System.Text;
 
 namespace MonoDevelop.Debugger.Soft.IPhone
 {
@@ -68,19 +69,11 @@ namespace MonoDevelop.Debugger.Soft.IPhone
 			EndSimProcess ();
 		}
 
-		//FIXME: hook up the app's stdin and stdout
+		//FIXME: hook up the app's stdin and stdout, and mtouch's stdin and stdout
 		void StartSimulatorProcess (IPhoneExecutionCommand cmd)
 		{
-			string mtouchPath = cmd.Runtime.GetToolPath (cmd.Framework, "mtouch");
-			if (string.IsNullOrEmpty (mtouchPath))
-				throw new InvalidOperationException ("Cannot execute iPhone application. mtouch tool is missing.");
-			
-			var psi = new ProcessStartInfo () {
-				FileName = mtouchPath,
-				UseShellExecute = false,
-				Arguments = string.Format ("-launchsim='{0}'", cmd.AppPath),
-				RedirectStandardInput = true,
-			};
+			var psi = IPhoneExecutionHandler.CreateMtouchSimStartInfo (cmd, false);
+			psi.RedirectStandardInput = true;
 			simProcess = System.Diagnostics.Process.Start (psi);
 			
 			simProcess.Exited += delegate {
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.Debugger.Soft.IPhone/MonoDevelop.Debugger.Soft.IPhone.csproj b/extras/MonoDevelop.IPhone/MonoDevelop.Debugger.Soft.IPhone/MonoDevelop.Debugger.Soft.IPhone.csproj
index cc7caa0f49..24733c060a 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.Debugger.Soft.IPhone/MonoDevelop.Debugger.Soft.IPhone.csproj
+++ b/extras/MonoDevelop.IPhone/MonoDevelop.Debugger.Soft.IPhone/MonoDevelop.Debugger.Soft.IPhone.csproj
@@ -78,6 +78,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\main\src\addins\MonoDevelop.Debugger.Soft\MonoDevelop.Debugger.Soft\Mono.Debugger.Soft.dll</HintPath>
     </Reference>
+    <Reference Include="MonoDevelop.AspNet, Version=2.2.0.0, Culture=neutral">
+      <Package>monodevelop-core-addins</Package>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Manifest.addin.xml">
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/ChangeLog b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/ChangeLog
index 5e749a2096..3c3fc8365f 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/ChangeLog
+++ b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/ChangeLog
@@ -1,3 +1,54 @@
+2010-01-27  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* IPhoneProject.cs:
+	* Templates/IPadWindowBasedProject.xpt.xml: Fix project option
+	  attributes.
+
+2010-01-27  Geoff Norton  <gnorton@novell.com>
+
+	* Templates/IPadApplicationXib.xft.xml: Fix template
+	to properly hook up the app delegate
+
+2010-01-27  Geoff Norton  <gnorton@novell.com>
+
+	* MonoDevelop.IPhone.addin.xml: 
+	* MonoDevelop.IPhone.csproj:
+	* Templates/IPadApplicationXib.xft.xml: 
+	* Templates/IPadInfoPlist.xft.xml:
+	* Templates/IPadWindowBasedProject.xpt.xml: Added
+	  iPad templates to the build.  Subject to change
+	* Gui/IPhoneBuildOptionsPanel.cs: Added 3.2 to the
+	  available SDK versions.
+
+2010-01-27  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* IPhoneExecutionHandler.cs: Move some code into
+	  CreateStartInfo method so it can be re-used by the debug
+	  handler.
+
+2010-01-27  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* IPhoneProject.cs: Allow setting SdkVersion from project
+	  template. Pass SdkVersion to IPhoneExecutionCommand.
+
+	* IPhoneExecutionCommand.cs: Add SdkVersion property on
+	  IPhoneExecutionCommand, and some utility properties for the
+	  log paths.
+
+2010-01-27  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* IPhoneProjectConfiguration.cs: Copy MtouchI18n and
+	  MtouchSdkVersion when cloning configs. Fixes persisting
+	  these values after editing them.
+
+2010-01-25  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* Templates/IPhoneOpenGLProject.xpt.xml:
+	* Templates/IPhoneUtilityProject.xpt.xml:
+	* Templates/IPhoneNavBasedProject.xpt.xml:
+	* Templates/IPhoneWindowBasedProject.xpt.xml: Fix xib file
+	  format, standard headers, and auto-opening.
+
 2010-01-25  Michael Hutchinson  <mhutchinson@novell.com>
 
 	* MonoDevelop.IPhone.csproj:
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Gui/IPhoneBuildOptionsPanel.cs b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Gui/IPhoneBuildOptionsPanel.cs
index cccc44d5ef..72511dedbc 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Gui/IPhoneBuildOptionsPanel.cs
+++ b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Gui/IPhoneBuildOptionsPanel.cs
@@ -90,6 +90,7 @@ namespace MonoDevelop.IPhone.Gui
 			
 			sdkComboEntry.AppendText ("3.0");
 			sdkComboEntry.AppendText ("3.1");
+			sdkComboEntry.AppendText ("3.2");
 			
 			store = new ListStore (typeof (string), typeof (bool));
 			i18nTreeView.Model = store;
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/IPhoneExecutionCommand.cs b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/IPhoneExecutionCommand.cs
index d57d20b9ad..6542d4baa2 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/IPhoneExecutionCommand.cs
+++ b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/IPhoneExecutionCommand.cs
@@ -35,7 +35,7 @@ namespace MonoDevelop.IPhone
 	public class IPhoneExecutionCommand: ExecutionCommand
 	{
 		public IPhoneExecutionCommand (TargetRuntime runtime, TargetFramework framework, FilePath appPath, 
-		                               FilePath logDirectory, bool simulator, bool debugMode)
+		                               FilePath logDirectory, bool simulator, bool debugMode, string sdkVersion)
 		{
 			this.AppPath = appPath;
 			this.LogDirectory = logDirectory;
@@ -43,6 +43,7 @@ namespace MonoDevelop.IPhone
 			this.Runtime = runtime;
 			this.DebugMode = debugMode;
 			this.Simulator = simulator;
+			this.SdkVersion = sdkVersion;
 		}
 		
 		public FilePath AppPath { get; private set; }
@@ -52,6 +53,14 @@ namespace MonoDevelop.IPhone
 		public TargetRuntime Runtime { get; private set; }
 		public TargetFramework Framework { get; private set; }
 		public IList<string> UserAssemblyPaths { get; set; }
+		public string SdkVersion { get; private set; }
+		
+		public FilePath OutputLogPath {
+			get { return LogDirectory.Combine ("out.log"); }
+		}
+		public FilePath ErrorLogPath {
+			get { return LogDirectory.Combine ("err.log"); }
+		}
 		
 		public override string CommandString {
 			get { return "[iphone]"; }
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/IPhoneExecutionHandler.cs b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/IPhoneExecutionHandler.cs
index b5b059431d..f6c16a0514 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/IPhoneExecutionHandler.cs
+++ b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/IPhoneExecutionHandler.cs
@@ -52,27 +52,14 @@ namespace MonoDevelop.IPhone
 			return cmd != null && cmd.Simulator;
 		}
 		
-		public IProcessAsyncOperation Execute (ExecutionCommand command, IConsole console)
+		public static ProcessStartInfo CreateMtouchSimStartInfo (IPhoneExecutionCommand cmd, bool logSimOutput)
 		{
-			IPhoneExecutionCommand cmd = (IPhoneExecutionCommand) command;
-			
 			string mtouchPath = cmd.Runtime.GetToolPath (cmd.Framework, "mtouch");
 			if (string.IsNullOrEmpty (mtouchPath))
 				throw new InvalidOperationException ("Cannot execute iPhone application. mtouch tool is missing.");
 			
-			string outLog = cmd.LogDirectory.Combine ("out.log");
-			string errLog = cmd.LogDirectory.Combine ("err.log");
-			
-			string mtouchArgs = String.Format ("-launchsim='{0}' -stderr='{1}' -stdout='{2}'", cmd.AppPath, errLog, outLog);
-			
-			var psi = new ProcessStartInfo (mtouchPath, mtouchArgs) {
-				RedirectStandardError = true,
-				RedirectStandardOutput = true,
-				RedirectStandardInput = true,
-				WorkingDirectory = cmd.LogDirectory,
-				UseShellExecute = false
-			};
-			
+			var outLog = cmd.OutputLogPath;
+			var errLog = cmd.ErrorLogPath;
 			try {
 				if (File.Exists (errLog))
 				    File.Delete (errLog);
@@ -80,10 +67,28 @@ namespace MonoDevelop.IPhone
 				    File.Delete (outLog);
 			} catch (IOException) {}
 			
-			var outTail = new Tail (outLog, console.Out);
-			var errTail = new Tail (errLog, console.Error);
-			outTail.Start ();
-			errTail.Start ();
+			var sb = new StringBuilder ();
+			sb.AppendFormat ("-launchsim='{0}'", cmd.AppPath);
+			if (logSimOutput) 
+				sb.AppendFormat (" -stderr='{0}' -stdout='{1}'", errLog, outLog);
+			if (!string.IsNullOrEmpty (cmd.SdkVersion))
+				sb.AppendFormat (" -sdk='{0}'", cmd.SdkVersion);
+			
+			var psi = new ProcessStartInfo (mtouchPath, sb.ToString ()) {
+				WorkingDirectory = cmd.LogDirectory,
+				UseShellExecute = false
+			};
+			
+			return psi;
+		}
+		
+		public IProcessAsyncOperation Execute (ExecutionCommand command, IConsole console)
+		{
+			IPhoneExecutionCommand cmd = (IPhoneExecutionCommand) command;
+			var psi = CreateMtouchSimStartInfo (cmd, true);
+			psi.RedirectStandardOutput = true;
+			psi.RedirectStandardError = true;
+			psi.RedirectStandardInput = true;
 			
 			LineInterceptingTextWriter intercepter = null;
 			intercepter = new LineInterceptingTextWriter (null, delegate {
@@ -95,20 +100,25 @@ namespace MonoDevelop.IPhone
 				}
 			});
 			
+			var outTail = new Tail (cmd.OutputLogPath, console.Out.Write);
+			var errTail = new Tail (cmd.ErrorLogPath, console.Error.Write);
+			outTail.Start ();
+			errTail.Start ();
+			
 			var mtouchProcess = Runtime.ProcessService.StartProcess (psi, intercepter, console.Log, null);
 			return new IPhoneProcess (mtouchProcess, outTail, errTail);
 		}
 	}
 	
-	class Tail : IDisposable
+	public class Tail : IDisposable
 	{
 		volatile bool finish;
 		string file;
-		TextWriter writer;
+		Action<string> writer;
 		Thread thread;
 		ManualResetEvent endHandle = new ManualResetEvent (false);
 		
-		public Tail (string file, TextWriter writer)
+		public Tail (string file, Action<string> writer)
 		{
 			this.file = file;
 			this.writer = writer;
@@ -140,7 +150,7 @@ namespace MonoDevelop.IPhone
 					Thread.Sleep (500);
 					int nr;
 					while ((nr = fs.Read (buffer, 0, buffer.Length)) > 0)
-						writer.Write (encoding.GetString (buffer, 0, nr));
+						writer (encoding.GetString (buffer, 0, nr));
 				}
 			} catch (ThreadAbortException) {
 				Thread.ResetAbort ();
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/IPhoneProject.cs b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/IPhoneProject.cs
index 95e71c2712..68fff1e2d2 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/IPhoneProject.cs
+++ b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/IPhoneProject.cs
@@ -156,11 +156,14 @@ namespace MonoDevelop.IPhone
 		{
 			Init ();
 			
-			XmlNode mainNibNode = projectOptions.SelectSingleNode ("MainNibFile");
-			if (mainNibFile != null) {
-				this.mainNibFile = mainNibNode.InnerText;	
+			var mainNibAtt = projectOptions.Attributes ["MainNibFile"];
+			if (mainNibAtt != null) {
+				this.mainNibFile = mainNibAtt.InnerText;	
 			}
 			
+			var sdkVersionAtt = projectOptions.Attributes ["SdkVersion"];
+			string sdkVersion = sdkVersionAtt != null? sdkVersionAtt.InnerText : null;
+			
 			FilePath binPath = (info != null)? info.BinPath : new FilePath ("bin");
 			
 			int confCount = Configurations.Count;
@@ -172,6 +175,9 @@ namespace MonoDevelop.IPhone
 				deviceConf.CodesignKey = Keychain.DEV_CERT_PREFIX;
 				Configurations.Add (deviceConf);
 				
+				if (sdkVersion != null)
+					deviceConf.MtouchSdkVersion = simConf.MtouchSdkVersion = sdkVersion;
+				
 				if (simConf.Name == "Debug")
 					simConf.MtouchDebug = deviceConf.MtouchDebug = true;
 				
@@ -228,7 +234,8 @@ namespace MonoDevelop.IPhone
 		{
 			var conf = (IPhoneProjectConfiguration) configuration;
 			return new IPhoneExecutionCommand (TargetRuntime, TargetFramework, conf.AppDirectory, conf.OutputDirectory,
-			                                   conf.Platform != PLAT_IPHONE, conf.DebugMode && conf.MtouchDebug) {
+			                                   conf.Platform != PLAT_IPHONE, conf.DebugMode && conf.MtouchDebug,
+			                                   conf.MtouchSdkVersion) {
 				UserAssemblyPaths = GetUserAssemblyPaths (configSel)
 			};
 		}
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/IPhoneProjectConfiguration.cs b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/IPhoneProjectConfiguration.cs
index 8a426c38af..2da0faec4a 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/IPhoneProjectConfiguration.cs
+++ b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/IPhoneProjectConfiguration.cs
@@ -134,9 +134,11 @@ namespace MonoDevelop.IPhone
 			CodesignResourceRules = cfg.CodesignResourceRules;
 			CodesignExtraArgs = cfg.CodesignExtraArgs;
 			
-			MtouchExtraArgs = cfg.MtouchExtraArgs;
 			MtouchDebug = cfg.MtouchDebug;
 			MtouchLink = cfg.MtouchLink;
+			MtouchSdkVersion = cfg.MtouchSdkVersion;
+			MtouchExtraArgs = cfg.MtouchExtraArgs;
+			MtouchI18n = cfg.MtouchI18n;
 		}
 		
 		//always set the MtouchDebug element
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/MonoDevelop.IPhone.addin.xml b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/MonoDevelop.IPhone.addin.xml
index 9a8f72328f..9fce50fecd 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/MonoDevelop.IPhone.addin.xml
+++ b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/MonoDevelop.IPhone.addin.xml
@@ -35,6 +35,10 @@
 			              resource = "IPhoneApplicationPList.xft.xml"/>
 			<FileTemplate id       = "IPhoneEntitlements"
 			              resource = "IPhoneEntitlements.xft.xml"/>
+			<FileTemplate id       = "IPadApplicationXib"
+			              resource = "IPadApplicationXib.xft.xml"/>
+			<FileTemplate id       = "IPadInfoPlist"
+			              resource = "IPadInfoPlist.xft.xml"/>
 		</Condition>
 	</Extension>
 
@@ -52,6 +56,8 @@
 			                 resource = "IPhoneLibraryProject.xpt.xml" />
 			<ProjectTemplate id       = "IPhoneProject-Empty"
 			                 resource = "IPhoneProjectEmpty.xpt.xml"/>
+			<ProjectTemplate id       = "IPadWindowBasedProject"
+			                 resource = "IPadWindowBasedProject.xpt.xml" />
 		</Condition>
 	</Extension>
 	
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/MonoDevelop.IPhone.csproj b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/MonoDevelop.IPhone.csproj
index 68ecf17726..4d3df8adea 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/MonoDevelop.IPhone.csproj
+++ b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/MonoDevelop.IPhone.csproj
@@ -131,6 +131,12 @@
     <EmbeddedResource Include="Templates\IPhoneApplicationXib.xft.xml">
       <LogicalName>IPhoneApplicationXib.xft.xml</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="Templates\IPadApplicationXib.xft.xml">
+      <LogicalName>IPadApplicationXib.xft.xml</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Templates\IPadInfoPlist.xft.xml">
+      <LogicalName>IPadInfoPlist.xft.xml</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="Templates\IPhoneViewXib.xft.xml">
       <LogicalName>IPhoneViewXib.xft.xml</LogicalName>
     </EmbeddedResource>
@@ -212,6 +218,9 @@
     <EmbeddedResource Include="Templates\IPhoneWindowBasedProject.xpt.xml">
       <LogicalName>IPhoneWindowBasedProject.xpt.xml</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="Templates\IPadWindowBasedProject.xpt.xml">
+      <LogicalName>IPadWindowBasedProject.xpt.xml</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="Templates\IPhoneOpenGLProject.xpt.xml">
       <LogicalName>IPhoneOpenGLProject.xpt.xml</LogicalName>
     </EmbeddedResource>
@@ -236,4 +245,4 @@
     <None Include="Icons\mono-develop.svg" />
     <None Include="Icons\phone-apple-iphone.svg" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Templates/IPadApplicationXib.xft.xml b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Templates/IPadApplicationXib.xft.xml
new file mode 100644
index 0000000000..a1c73be1fc
--- /dev/null
+++ b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Templates/IPadApplicationXib.xft.xml
@@ -0,0 +1,525 @@
+<?xml version="1.0"?>
+<Template Originator="Michael Hutchinson" Created="2009/06/08">
+
+	<!-- Template Header -->
+	<TemplateConfiguration>
+		<_Name>Main Window Definition</_Name>
+		<_Category>iPad</_Category>
+		<Icon>res:xib-template-application.png</Icon>
+		<LanguageName>C#</LanguageName>
+		<ProjectType>IPhone</ProjectType>
+		<DefaultFilename IsFixed="True">MainWindow</DefaultFilename>
+		<_Description>Creates an Interface Builder application document for MonoTouch.</_Description>
+	</TemplateConfiguration>
+	
+	<Conditions>
+		<ParentProject PermittedCreationPaths="" ExcludedFiles="MainWindow.xib" RequireProject="True"/>
+	</Conditions>
+
+	<!-- Template Content -->
+	<TemplateFiles>
+		<File name="MainWindow.xib.designer.cs" DependsOn="${Name}.xib" SuppressAutoOpen="True"
+			ShowAutogenerationNotice="True" AddStandardHeader="False" ><![CDATA[
+namespace ${Namespace}
+{
+	// Base type probably should be MonoTouch.Foundation.NSObject or subclass
+	[MonoTouch.Foundation.Register("AppDelegate")]
+	public partial class AppDelegate {
+
+		[MonoTouch.Foundation.Connect("window")]
+		private MonoTouch.UIKit.UIWindow window {
+			get {
+				return ((MonoTouch.UIKit.UIWindow)(this.GetNativeField("window")));
+			}
+			set {
+				this.SetNativeField("window", value);
+			}
+		}
+	}
+}
+]]></File>
+		<File name="MainWindow.xib" SuppressAutoOpen="True">
+<![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
+	<data>
+		<int key="IBDocument.SystemTarget">800</int>
+		<string key="IBDocument.SystemVersion">10C540</string>
+		<string key="IBDocument.InterfaceBuilderVersion">759</string>
+		<string key="IBDocument.AppKitVersion">1038.25</string>
+		<string key="IBDocument.HIToolboxVersion">458.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+			<string key="NS.object.0">79</string>
+		</object>
+		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<integer value="2"/>
+		</object>
+		<object class="NSArray" key="IBDocument.PluginDependencies">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSArray" key="dict.sortedKeys" id="0">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+			</object>
+			<object class="NSMutableArray" key="dict.values">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+			</object>
+		</object>
+		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="IBProxyObject" id="841351856">
+				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+			<object class="IBProxyObject" id="606714003">
+				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+			<object class="IBUICustomObject" id="250404236">
+				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+			</object>
+			<object class="IBUIWindow" id="62075450">
+				<reference key="NSNextResponder"/>
+				<int key="NSvFlags">292</int>
+				<string key="NSFrameSize">{768, 1024}</string>
+				<reference key="NSSuperview"/>
+				<object class="NSColor" key="IBUIBackgroundColor">
+					<int key="NSColorSpace">1</int>
+					<bytes key="NSRGB">MSAxIDEAA</bytes>
+				</object>
+				<bool key="IBUIOpaque">NO</bool>
+				<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics">
+					<int key="IBUIStatusBarStyle">2</int>
+				</object>
+				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+			</object>
+		</object>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<object class="NSMutableArray" key="connectionRecords">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="250404236"/>
+					</object>
+					<int key="connectionID">5</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="250404236"/>
+						<reference key="destination" ref="62075450"/>
+					</object>
+					<int key="connectionID">6</int>
+				</object>
+			</object>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<object class="NSArray" key="orderedObjects">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<reference key="object" ref="0"/>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="841351856"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="606714003"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2</int>
+						<reference key="object" ref="62075450"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">4</int>
+						<reference key="object" ref="250404236"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">App Delegate</string>
+					</object>
+				</object>
+			</object>
+			<object class="NSMutableDictionary" key="flattenedProperties">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="NSArray" key="dict.sortedKeys">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>-1.CustomClassName</string>
+					<string>-2.CustomClassName</string>
+					<string>2.IBEditorWindowLastContentRect</string>
+					<string>2.IBPluginDependency</string>
+					<string>4.CustomClassName</string>
+					<string>4.IBPluginDependency</string>
+				</object>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>UIApplication</string>
+					<string>UIResponder</string>
+					<string>{{526, 33}, {783, 823}}</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>AppDelegate</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				</object>
+			</object>
+			<object class="NSMutableDictionary" key="unlocalizedProperties">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<reference key="dict.sortedKeys" ref="0"/>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+				</object>
+			</object>
+			<nil key="activeLocalization"/>
+			<object class="NSMutableDictionary" key="localizations">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<reference key="dict.sortedKeys" ref="0"/>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+				</object>
+			</object>
+			<nil key="sourceID"/>
+			<int key="maxID">6</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">AppDelegate</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">window</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBUserSource</string>
+						<string key="minorKey"/>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">IBCocoaTouchTool/IBCocoaTouchToolIntegration.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">IBInternalHeaders/IBAppKitAdditions.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">IBInternalHeaders/IBConnection.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">IBInternalHeaders/IBFieldEditor.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">IBInternalHeaders/IBFoundationAdditions.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">IBInternalHeaders/IBObjectContainer.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">IBInternalHeaders/IBObjectIntegrationInternal.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">IBInternalHeaders/IBWindowController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">IBPlugin/CustomViews/IBWindowRotationAnimation.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">IBPlugin/Utilities/IBObjectMarshalling.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">IBPlugin/Utilities/IBValueMarshallers.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">IBPlugin/WidgetIntegration/Accessibility/IBUIAccessibilityIntegration.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">IBPlugin/WidgetIntegration/IBUIObjectIntegration.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">IBPlugin/WidgetIntegration/IBUIViewController/IBUIViewControllerEditorPlaceholderView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">IBPlugin/WidgetIntegration/IBUIViewController/IBUIViewControllerEditorView.h</string>
+					</object>
+				</object>
+			</object>
+			<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSAccessibility.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSApplication.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSApplicationScripting.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSColorPanel.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSControl.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSDictionaryController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSDragging.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSFontManager.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSFontPanel.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSKeyValueBinding.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSMenu.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSNibLoading.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSOutlineView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSPasteboard.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSSavePanel.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSTableView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSToolbarItem.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">DevToolsKit.framework/Headers/DTAssetLibrary.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">DevToolsKit.framework/Headers/DTDragManager.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">DevToolsKit.framework/Headers/DTTemplateChooserViewController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">DevToolsKit.framework/Headers/DTTypeCompletionHandler.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">InterfaceBuilderKit.framework/Headers/IBObjectIntegration.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">PrintCore.framework/Headers/PDEPluginInterface.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="786211723">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIResponder</string>
+					<string key="superclassName">NSObject</string>
+					<reference key="sourceIdentifier" ref="786211723"/>
+				</object>
+			</object>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+			<integer value="3100" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<string key="IBDocument.LastKnownRelativeProjectPath">../../../IBCocoaTouchPlugin.xcodeproj</string>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<string key="IBCocoaTouchPluginVersion">79</string>
+		<nil key="IBCocoaTouchSimulationTargetRuntimeIdentifier"/>
+	</data>
+</archive>]]></File>
+	</TemplateFiles>
+</Template>
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Templates/IPadInfoPlist.xft.xml b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Templates/IPadInfoPlist.xft.xml
new file mode 100644
index 0000000000..e91d7c5dc6
--- /dev/null
+++ b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Templates/IPadInfoPlist.xft.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<Template Originator="Michael Hutchinson" Created="2009/06/08">
+
+	<!-- Template Header -->
+	<TemplateConfiguration>
+		<_Name>iPad Info PList</_Name>
+		<_Category>iPad</_Category>
+		<Icon>res:xib-template-application.png</Icon>
+		<LanguageName>C#</LanguageName>
+		<ProjectType>IPhone</ProjectType>
+		<DefaultFilename IsFixed="True">Info.plist</DefaultFilename>
+		<_Description></_Description>
+	</TemplateConfiguration>
+	
+	<Conditions>
+		<ParentProject PermittedCreationPaths="" ExcludedFiles="MainWindow.xib" RequireProject="True"/>
+	</Conditions>
+
+	<!-- Template Content -->
+	<TemplateFiles>
+		<File name="Info.plist" AddStandardHeader="False">
+<![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>UIDeviceFamily</key>
+        <array>
+                <string>2</string>
+        </array>
+</dict>
+</plist>
+]]></File>
+	</TemplateFiles>
+</Template>
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Templates/IPadWindowBasedProject.xpt.xml b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Templates/IPadWindowBasedProject.xpt.xml
new file mode 100644
index 0000000000..478a45cd88
--- /dev/null
+++ b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Templates/IPadWindowBasedProject.xpt.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<Template originator="Michael Hutchinson"
+          created="2009/06/08">
+	
+	<!-- Template Header -->
+	<TemplateConfiguration>
+		<_Name>iPad Window-based Project</_Name>
+		<_Category>C#/iPad</_Category>
+		<Icon>md-project-ipad</Icon>
+		<LanguageName>C#</LanguageName>
+		<_Description>Window-based project for iPad.</_Description>
+	</TemplateConfiguration>
+	
+	<!-- Actions -->
+	<Actions>
+		<Open filename = "Main.cs"/>
+	</Actions>
+	
+	<!-- Template Content -->
+	<Combine name = "${ProjectName}" directory = ".">
+		<Options>
+			<StartupProject>${ProjectName}</StartupProject>
+		</Options>
+		
+		<Project name = "${ProjectName}" directory = "." type = "IPhone">
+			<Options MainNibFile="MainWindow.nib" SdkVersion="3.2" />
+			<References>
+				<Reference type="Gac" refto="System, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" />
+				<Reference type="Gac" refto="System.Xml, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" />
+				<Reference type="Gac" refto="System.Core, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" />
+				<Reference type="Gac" refto="monotouch" />
+			</References>
+			<Files>
+				<FileTemplateReference TemplateID="IPadApplicationXib" />
+				<FileTemplateReference TemplateID="IPadInfoPlist" />
+				<File name="Main.cs"
+				      AddStandardHeader="True">
+<![CDATA[
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MonoTouch.Foundation;
+using MonoTouch.UIKit;
+
+namespace ${Namespace}
+{
+	public class Application
+	{
+		static void Main (string[] args)
+		{
+			UIApplication.Main (args);
+		}
+	}
+	
+	// The name AppDelegate is referenced in the MainWindow.xib file.
+	public partial class AppDelegate : UIApplicationDelegate
+	{
+		// This method is invoked when the application has loaded its UI and its ready to run
+		public override bool FinishedLaunching (UIApplication app, NSDictionary options)
+		{
+			// If you have defined a view, add it here:
+			// window.AddSubview (navigationController.View);
+
+			window.MakeKeyAndVisible ();
+	
+			return true;
+		}
+	}
+}
+]]>
+				</File>
+			</Files>
+		</Project>
+	</Combine>
+</Template>
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Templates/IPhoneNavBasedProject.xpt.xml b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Templates/IPhoneNavBasedProject.xpt.xml
index 70d313b185..565b258e7c 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Templates/IPhoneNavBasedProject.xpt.xml
+++ b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Templates/IPhoneNavBasedProject.xpt.xml
@@ -13,6 +13,7 @@
 	
 	<!-- Actions -->
 	<Actions>
+		<Open filename = "Main.cs"/>
 	</Actions>
 	
 	<!-- Template Content -->
@@ -30,7 +31,8 @@
 				<Reference type="Gac" refto="monotouch" />
 			</References>
 			<Files>
-				<File name="Main.cs">
+				<File name="Main.cs"
+				      AddStandardHeader="True">
 <![CDATA[
 using System;
 using System.Collections.Generic;
@@ -115,8 +117,7 @@ namespace ${Namespace} {
 				</File>
 				<File name="MainWindow.xib"
 				      SuppressAutoOpen="True">
-<![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
+<![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">784</int>
@@ -388,8 +389,7 @@ namespace ${Namespace} {
 				</File>
 				<File name="RootViewController.xib"
 				      SuppressAutoOpen="True">
-<![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
+<![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">784</int>
@@ -569,7 +569,8 @@ namespace ${Namespace} {
 				</File>
 				<File name="RootViewController.xib.cs"
 				      SuppressAutoOpen="True"
-				      DependsOn="RootViewController.xib">
+				      DependsOn="RootViewController.xib"
+				      AddStandardHeader="True">
 <![CDATA[
 using MonoTouch.UIKit;
 using System;
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Templates/IPhoneOpenGLProject.xpt.xml b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Templates/IPhoneOpenGLProject.xpt.xml
index e5e38d1eb7..d200618272 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Templates/IPhoneOpenGLProject.xpt.xml
+++ b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Templates/IPhoneOpenGLProject.xpt.xml
@@ -13,6 +13,7 @@
 	
 	<!-- Actions -->
 	<Actions>
+		<Open filename = "Main.cs"/>
 	</Actions>
 	
 	<!-- Template Content -->
@@ -31,7 +32,8 @@
 				<Reference type="Gac" refto="OpenTK" />
 			</References>
 			<Files>
-				<File name="Main.cs">
+				<File name="Main.cs"
+				      AddStandardHeader="True">
 <![CDATA[
 using System;
 using System.Collections.Generic;
@@ -74,7 +76,8 @@ namespace ${Namespace}
 }
 ]]>
 				</File>
-				<File name="EAGLView.cs">
+				<File name="EAGLView.cs"
+				      AddStandardHeader="True">
 <![CDATA[
 using System;
 using OpenTK.Platform.iPhoneOS;
@@ -193,8 +196,7 @@ namespace ${Namespace} {
 				</File>
 				<File name="MainWindow.xib"
 				      SuppressAutoOpen="True">
-<![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
+<![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">768</int>
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Templates/IPhoneUtilityProject.xpt.xml b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Templates/IPhoneUtilityProject.xpt.xml
index d688b5c4be..31cf9fed7c 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Templates/IPhoneUtilityProject.xpt.xml
+++ b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Templates/IPhoneUtilityProject.xpt.xml
@@ -13,6 +13,7 @@
 	
 	<!-- Actions -->
 	<Actions>
+		<Open filename = "Main.cs"/>
 	</Actions>
 	
 	<!-- Template Content -->
@@ -30,7 +31,8 @@
 				<Reference type="Gac" refto="monotouch" />
 			</References>
 			<Files>
-				<File name="Main.cs">
+				<File name="Main.cs"
+				      AddStandardHeader="True">
 <![CDATA[
 using System;
 using System.Collections.Generic;
@@ -100,8 +102,7 @@ namespace ${Namespace} {
 				</File>
 				<File name="MainWindow.xib"
 				      SuppressAutoOpen="True">
-<![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
+<![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">784</int>
@@ -288,8 +289,7 @@ namespace ${Namespace} {
 				</File>
 				<File name="MainView.xib"
 				      SuppressAutoOpen="True">
-<![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
+<![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">784</int>
@@ -510,7 +510,8 @@ namespace ${Namespace} {
 				</File>
 				<File name="MainViewController.cs"
 				      SuppressAutoOpen="True"
-				      DependsOn="MainView.xib">
+				      DependsOn="MainView.xib"
+				      AddStandardHeader="True">
 <![CDATA[
 using MonoTouch.UIKit;
 using System.Drawing;
@@ -574,7 +575,8 @@ namespace ${Namespace}
 				</File>
 				<File name="MainView.cs"
 				      SuppressAutoOpen="True"
-				      DependsOn="MainView.xib">
+				      DependsOn="MainView.xib"
+				      AddStandardHeader="True">
 <![CDATA[
 using MonoTouch.UIKit;
 using System.Drawing;
@@ -633,8 +635,7 @@ namespace ${Namespace} {
 				</File>
 				<File name="FlipsideView.xib"
 				      SuppressAutoOpen="True">
-<![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
+<![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">784</int>
@@ -881,7 +882,8 @@ namespace ${Namespace} {
 				</File>
 				<File name="FlipsideViewController.cs"
 				      SuppressAutoOpen="True"
-				      DependsOn="FlipsideView.xib">
+				      DependsOn="FlipsideView.xib"
+				      AddStandardHeader="True">
 <![CDATA[
 using MonoTouch.UIKit;
 using System.Drawing;
@@ -940,7 +942,8 @@ namespace ${Namespace}
 				</File>
 				<File name="FlipsideView.cs"
 				      SuppressAutoOpen="True"
-				      DependsOn="FlipsideView.xib">
+				      DependsOn="FlipsideView.xib"
+				      AddStandardHeader="True">
 <![CDATA[
 using MonoTouch.UIKit;
 using System.Drawing;
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Templates/IPhoneWindowBasedProject.xpt.xml b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Templates/IPhoneWindowBasedProject.xpt.xml
index 84da246be2..b4b94280b2 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Templates/IPhoneWindowBasedProject.xpt.xml
+++ b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Templates/IPhoneWindowBasedProject.xpt.xml
@@ -13,6 +13,7 @@
 	
 	<!-- Actions -->
 	<Actions>
+		<Open filename = "Main.cs"/>
 	</Actions>
 	
 	<!-- Template Content -->
@@ -31,7 +32,8 @@
 			</References>
 			<Files>
 				<FileTemplateReference TemplateID="IPhoneApplicationXib" />
-				<File name="Main.cs">
+				<File name="Main.cs"
+				      AddStandardHeader="True">
 <![CDATA[
 using System;
 using System.Collections.Generic;