Mercurial > repos > IBDev-IBBoard.WarFoundry.GUI.WinForms

changeset 221:c47094612bac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Re #355: Add XML export format that can be transformed with an XSL * Merge Clutch's WinForms code into main branch * Fix targetting of project * Add .hgignore
author IBBoard <dev@ibboard.co.uk>
date Thu, 25 Aug 2011 20:43:51 +0100
parents 314d90a059d8 (diff) e10688b29092 (current diff)
children b3a47b712a8b
files .hgignore FrmMain.cs IBBoard.WarFoundry.GUI.WinForms.csproj
diffstat 6 files changed, 21 insertions(+), 39 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Thu Aug 25 20:43:51 2011 +0100
@@ -0,0 +1,4 @@
+bin/
+obj/
+IBBoard.WarFoundry.GUI.WinForms.csproj.user
+IBBoard.WarFoundry.GUI.WinForms.suo
--- a/FrmMain.cs	Thu Aug 25 12:59:26 2011 -0600
+++ b/FrmMain.cs	Thu Aug 25 20:43:51 2011 +0100
@@ -40,13 +40,7 @@
 	{
 		private static readonly string AppTitle = "WarFoundry";
 		internal static readonly string VERSION = "0.1";
-        const string DefaultDataDir = "data";
-       /* public static string pointsAbbrevSingle;
-        public static string pointsAbbrevPlural;
-        public static string pointsAbbreviation;
-        public static string pointsNameSingle;
-        public static string pointsNamePlural;
-        public static string pointsName;*/
+		const string DefaultDataDir = "data";
 
 		private Preferences preferences;
 		private readonly ILog log = LogManager.GetLogger(typeof(FrmMain));
@@ -56,7 +50,6 @@
 		public ObjectAddDelegate UnitAddedMethod;
 		public ObjectRemoveDelegate UnitRemovedMethod;
 		public DoubleValChangedDelegate PointsValueChangedMethod;
-		//public FailedUnitRequirementDelegate FailedUnitRequirementMethod;
 
 		private FrmArmyTree armyTree;
 		private string loadedFilePath;
@@ -71,7 +64,7 @@
 		private IBBoard.Windows.Forms.ColorableStatusBarPanel sbPointsPanel;
 		private System.Windows.Forms.ContextMenu undoMenu;
 		private System.Windows.Forms.ContextMenu redoMenu;
-        private IBBoard.Windows.Forms.ColorableStatusBar statusBar;
+		private IBBoard.Windows.Forms.ColorableStatusBar statusBar;
 		private MenuStrip menuStrip;
 		private IBBToolStripMenuItem menuFile;
 		private IBBToolStripMenuItem miNewArmy;
@@ -99,8 +92,8 @@
 		private ToolStrip catToolStrip;
 		private ToolStripPanel toolStripPanel;
 		private ToolStripSeparator toolStripSeparator4;
-        private IBBToolStripMenuItem miPreferences;
-        private IBBToolStripMenuItem miExportArmyAsBasicXml;
+		private IBBToolStripMenuItem miPreferences;
+		private IBBToolStripMenuItem miExportArmyAsBasicXml;
 		private IBBToolStripMenuItem miAbout;
 
 
@@ -154,9 +147,7 @@
 			UnitAddedMethod = new ObjectAddDelegate(FrmMain_UnitAddedMethod);
 			UnitRemovedMethod = new ObjectRemoveDelegate(FrmMain_UnitRemovedMethod);
 			PointsValueChangedMethod = new DoubleValChangedDelegate(FrmMain_PointsValueChangedMethod);
-			//FailedUnitRequirementMethod = new FailedUnitRequirementDelegate(FrmMain_FailedUnitRequirement);
 
-            
 			sbErrorPanel.Color = Color.Red;
 			SetPointsPanelToolTipText();
 
@@ -1432,23 +1423,10 @@
 			prefsForm.Show(this);
 		}
 
-        private void miExportArmyAsBasicXml_Click(object sender, EventArgs e)
-        {
-            Form xmlOutput = new FrmXmlExport(CurrentArmy);
-            xmlOutput.ShowDialog(this);
-            //SaveFileDialog dialog = new SaveFileDialog();
-            //dialog.Filter = Translation.GetTranslation("armyExportBasicXmlFilter", "XML pages") + "|*.xml";
-            //dialog.Title = Translation.GetTranslation("exportArmyDialog", "Export army");
-
-            //DialogResult dr = dialog.ShowDialog(this);
-
-            //if (dr == DialogResult.OK)
-            //{
-            //    Army army = CurrentArmy;
-            //    string filePath = dialog.FileName;
-            //    log.DebugFormat("Exporting {0} to {1} as basic XML", army.Name, filePath);
-            //    WarFoundryXmlWithXslExporter.GetDefault().ExportArmy(army, filePath);
-            //}
-        }
+		private void miExportArmyAsBasicXml_Click(object sender, EventArgs e)
+		{
+			Form xmlOutput = new FrmXmlExport(CurrentArmy);
+			xmlOutput.ShowDialog(this);
+		}
 	}
 }
--- a/IBBoard.WarFoundry.GUI.WinForms.csproj	Thu Aug 25 12:59:26 2011 -0600
+++ b/IBBoard.WarFoundry.GUI.WinForms.csproj	Thu Aug 25 20:43:51 2011 +0100
@@ -45,7 +45,7 @@
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\build\</OutputPath>
+    <OutputPath>bin\Debug\</OutputPath>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <BaseAddress>285212672</BaseAddress>
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
@@ -271,7 +271,7 @@
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
       <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <ProductName>.NET Framework Client Profile</ProductName>
       <Install>false</Install>
     </BootstrapperPackage>
     <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
--- a/IBBoard.WarFoundry.GUI.WinForms.sln	Thu Aug 25 12:59:26 2011 -0600
+++ b/IBBoard.WarFoundry.GUI.WinForms.sln	Thu Aug 25 20:43:51 2011 +0100
@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C# Express 2008
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual C# Express 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBBoard.WarFoundry.GUI.WinForms", "IBBoard.WarFoundry.GUI.WinForms.csproj", "{72C59D77-E2A4-401C-91F2-12728056D9A9}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBBoard", "..\IBBoard\IBBoard.csproj", "{5DFD64F6-FC2B-4B4F-B92E-483BAC468105}"
--- a/Properties/Resources.Designer.cs	Thu Aug 25 12:59:26 2011 -0600
+++ b/Properties/Resources.Designer.cs	Thu Aug 25 20:43:51 2011 +0100
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4200
+//     Runtime Version:4.0.30319.235
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -19,7 +19,7 @@
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
--- a/app.config	Thu Aug 25 12:59:26 2011 -0600
+++ b/app.config	Thu Aug 25 20:43:51 2011 +0100
@@ -1,3 +1,3 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
+	<startup/></configuration>