From de59ce1091db0039402e4cf9747a5838ec9fe913 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Mon, 10 May 2010 20:57:22 +1200
Subject: [PATCH] add map metadata dialog, and make it work

---
 OpenRA.Editor/Form1.cs                     |  23 ++-
 OpenRA.Editor/OpenRA.Editor.csproj         |   9 ++
 OpenRA.Editor/PropertiesDialog.Designer.cs | 159 +++++++++++++++++++++
 OpenRA.Editor/PropertiesDialog.cs          |  12 ++
 OpenRA.Editor/PropertiesDialog.resx        | 120 ++++++++++++++++
 OpenRA.FileFormats/Map/Map.cs              |   2 +-
 6 files changed, 322 insertions(+), 3 deletions(-)
 create mode 100644 OpenRA.Editor/PropertiesDialog.Designer.cs
 create mode 100644 OpenRA.Editor/PropertiesDialog.cs
 create mode 100644 OpenRA.Editor/PropertiesDialog.resx

diff --git a/OpenRA.Editor/Form1.cs b/OpenRA.Editor/Form1.cs
index bc97276330..56f0d46628 100644
--- a/OpenRA.Editor/Form1.cs
+++ b/OpenRA.Editor/Form1.cs
@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
-using System.Windows.Forms;
 using System.Linq;
+using System.Windows.Forms;
 using OpenRA.FileFormats;
 using OpenRA.GameRules;
 using OpenRA.Traits;
@@ -376,6 +376,7 @@ namespace OpenRA.Editor
 				nmd.theater.Items.Clear();
 				nmd.theater.Items.AddRange(Rules.Info["world"].Traits.WithInterface<TheaterInfo>()
 					.Select(a => a.Theater).ToArray());
+				nmd.theater.SelectedIndex = 0;
 
 				if (DialogResult.OK == nmd.ShowDialog())
 				{
@@ -398,6 +399,10 @@ namespace OpenRA.Editor
 
 					map.Tileset = nmd.theater.SelectedItem as string;
 
+					map.Title = "Name your map here";
+					map.Description = "Describe your map here";
+					map.Author = "Your name here";
+
 					NewMap(map);
 				}
 			}
@@ -405,7 +410,21 @@ namespace OpenRA.Editor
 
 		void PropertiesClicked(object sender, EventArgs e)
 		{
-			//
+			using (var pd = new PropertiesDialog())
+			{
+				pd.title.Text = surface1.Map.Title;
+				pd.desc.Text = surface1.Map.Description;
+				pd.author.Text = surface1.Map.Author;
+				pd.selectable.Checked = surface1.Map.Selectable;
+
+				if (DialogResult.OK != pd.ShowDialog())
+					return;
+
+				surface1.Map.Title = pd.title.Text;
+				surface1.Map.Description = pd.desc.Text;
+				surface1.Map.Author = pd.author.Text;
+				surface1.Map.Selectable = pd.selectable.Checked;
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/OpenRA.Editor/OpenRA.Editor.csproj b/OpenRA.Editor/OpenRA.Editor.csproj
index bad0919313..d73e720712 100644
--- a/OpenRA.Editor/OpenRA.Editor.csproj
+++ b/OpenRA.Editor/OpenRA.Editor.csproj
@@ -64,6 +64,12 @@
       <DependentUpon>NewMapDialog.cs</DependentUpon>
     </Compile>
     <Compile Include="Program.cs" />
+    <Compile Include="PropertiesDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="PropertiesDialog.Designer.cs">
+      <DependentUpon>PropertiesDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
@@ -71,6 +77,9 @@
     <EmbeddedResource Include="NewMapDialog.resx">
       <DependentUpon>NewMapDialog.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="PropertiesDialog.resx">
+      <DependentUpon>PropertiesDialog.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
diff --git a/OpenRA.Editor/PropertiesDialog.Designer.cs b/OpenRA.Editor/PropertiesDialog.Designer.cs
new file mode 100644
index 0000000000..b4a7758396
--- /dev/null
+++ b/OpenRA.Editor/PropertiesDialog.Designer.cs
@@ -0,0 +1,159 @@
+namespace OpenRA.Editor
+{
+	partial class PropertiesDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.button2 = new System.Windows.Forms.Button();
+			this.button1 = new System.Windows.Forms.Button();
+			this.label1 = new System.Windows.Forms.Label();
+			this.title = new System.Windows.Forms.TextBox();
+			this.label2 = new System.Windows.Forms.Label();
+			this.desc = new System.Windows.Forms.TextBox();
+			this.selectable = new System.Windows.Forms.CheckBox();
+			this.label3 = new System.Windows.Forms.Label();
+			this.author = new System.Windows.Forms.TextBox();
+			this.SuspendLayout();
+			// 
+			// button2
+			// 
+			this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.button2.Location = new System.Drawing.Point(196, 193);
+			this.button2.Name = "button2";
+			this.button2.Size = new System.Drawing.Size(75, 23);
+			this.button2.TabIndex = 14;
+			this.button2.Text = "OK";
+			this.button2.UseVisualStyleBackColor = true;
+			// 
+			// button1
+			// 
+			this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.button1.Location = new System.Drawing.Point(277, 193);
+			this.button1.Name = "button1";
+			this.button1.Size = new System.Drawing.Size(75, 23);
+			this.button1.TabIndex = 15;
+			this.button1.Text = "Cancel";
+			this.button1.UseVisualStyleBackColor = true;
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(12, 50);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(27, 13);
+			this.label1.TabIndex = 16;
+			this.label1.Text = "Title";
+			// 
+			// title
+			// 
+			this.title.Location = new System.Drawing.Point(66, 47);
+			this.title.Name = "title";
+			this.title.Size = new System.Drawing.Size(286, 20);
+			this.title.TabIndex = 17;
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(12, 76);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(32, 13);
+			this.label2.TabIndex = 16;
+			this.label2.Text = "Desc";
+			// 
+			// desc
+			// 
+			this.desc.Location = new System.Drawing.Point(66, 73);
+			this.desc.Name = "desc";
+			this.desc.Size = new System.Drawing.Size(286, 20);
+			this.desc.TabIndex = 17;
+			// 
+			// selectable
+			// 
+			this.selectable.AutoSize = true;
+			this.selectable.Location = new System.Drawing.Point(118, 138);
+			this.selectable.Name = "selectable";
+			this.selectable.Size = new System.Drawing.Size(130, 17);
+			this.selectable.TabIndex = 18;
+			this.selectable.Text = "Show in Map Chooser";
+			this.selectable.UseVisualStyleBackColor = true;
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(12, 102);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(38, 13);
+			this.label3.TabIndex = 16;
+			this.label3.Text = "Author";
+			// 
+			// author
+			// 
+			this.author.Location = new System.Drawing.Point(66, 99);
+			this.author.Name = "author";
+			this.author.Size = new System.Drawing.Size(286, 20);
+			this.author.TabIndex = 17;
+			// 
+			// PropertiesDialog
+			// 
+			this.AcceptButton = this.button2;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.CancelButton = this.button1;
+			this.ClientSize = new System.Drawing.Size(370, 228);
+			this.Controls.Add(this.selectable);
+			this.Controls.Add(this.author);
+			this.Controls.Add(this.label3);
+			this.Controls.Add(this.desc);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.title);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.button2);
+			this.Controls.Add(this.button1);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Name = "PropertiesDialog";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "PropertiesDialog";
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button button2;
+		private System.Windows.Forms.Button button1;
+		private System.Windows.Forms.Label label1;
+		public System.Windows.Forms.TextBox title;
+		private System.Windows.Forms.Label label2;
+		public System.Windows.Forms.TextBox desc;
+		public System.Windows.Forms.CheckBox selectable;
+		private System.Windows.Forms.Label label3;
+		public System.Windows.Forms.TextBox author;
+	}
+}
\ No newline at end of file
diff --git a/OpenRA.Editor/PropertiesDialog.cs b/OpenRA.Editor/PropertiesDialog.cs
new file mode 100644
index 0000000000..2d3faf0a6e
--- /dev/null
+++ b/OpenRA.Editor/PropertiesDialog.cs
@@ -0,0 +1,12 @@
+using System.Windows.Forms;
+
+namespace OpenRA.Editor
+{
+	public partial class PropertiesDialog : Form
+	{
+		public PropertiesDialog()
+		{
+			InitializeComponent();
+		}
+	}
+}
diff --git a/OpenRA.Editor/PropertiesDialog.resx b/OpenRA.Editor/PropertiesDialog.resx
new file mode 100644
index 0000000000..ff31a6db56
--- /dev/null
+++ b/OpenRA.Editor/PropertiesDialog.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/OpenRA.FileFormats/Map/Map.cs b/OpenRA.FileFormats/Map/Map.cs
index 50a99810da..2c6c1c3778 100644
--- a/OpenRA.FileFormats/Map/Map.cs
+++ b/OpenRA.FileFormats/Map/Map.cs
@@ -34,7 +34,7 @@ namespace OpenRA.FileFormats
 		public string Uid;
 
 		// Yaml map data
-		public bool Selectable;
+		public bool Selectable = true;
 		public int MapFormat = 1;
 		public string Title;
 		public string Description;