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

changeset 176:0e39412353c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes #153: Default name for armies * Merge back in to Trunk
author IBBoard <dev@ibboard.co.uk>
date Wed, 08 Sep 2010 20:17:48 +0000
parents 3d08fe8e65d5
children 845fdbe8cd50
files FrmNewArmy.cs IBBoard.WarFoundry.GUI.WinForms.csproj Properties/Resources.Designer.cs translations/fi.translation
diffstat 4 files changed, 83 insertions(+), 142 deletions(-) [+]
line wrap: on
line diff
--- a/FrmNewArmy.cs	Mon Sep 06 18:17:19 2010 +0000
+++ b/FrmNewArmy.cs	Wed Sep 08 20:17:48 2010 +0000
@@ -115,9 +115,9 @@
 			this.gameSystemToolTip = new System.Windows.Forms.ToolTip(this.components);
 			((System.ComponentModel.ISupportInitialize)(this.armySize)).BeginInit();
 			this.SuspendLayout();
-			// 
+			//
 			// lstRaces
-			// 
+			//
 			this.lstRaces.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
 						| System.Windows.Forms.AnchorStyles.Right)));
 			this.lstRaces.DisplayMember = "Name";
@@ -127,9 +127,9 @@
 			this.lstRaces.Size = new System.Drawing.Size(265, 121);
 			this.lstRaces.TabIndex = 7;
 			this.lstRaces.SelectedIndexChanged += new System.EventHandler(this.lstRaces_SelectedIndexChanged);
-			// 
+			//
 			// bttnCancel
-			// 
+			//
 			this.bttnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
 			this.bttnCancel.FlatStyle = System.Windows.Forms.FlatStyle.System;
 			this.bttnCancel.Location = new System.Drawing.Point(12, 231);
@@ -138,18 +138,18 @@
 			this.bttnCancel.TabIndex = 6;
 			this.bttnCancel.Text = "cancel";
 			this.bttnCancel.Click += new System.EventHandler(this.bttnCancel_Click);
-			// 
+			//
 			// lblRaceList
-			// 
+			//
 			this.lblRaceList.Location = new System.Drawing.Point(12, 33);
 			this.lblRaceList.Name = "lblRaceList";
 			this.lblRaceList.Size = new System.Drawing.Size(123, 80);
 			this.lblRaceList.TabIndex = 5;
 			this.lblRaceList.Text = "race list";
 			this.lblRaceList.TextAlign = System.Drawing.ContentAlignment.TopRight;
-			// 
+			//
 			// bttnSelectRace
-			// 
+			//
 			this.bttnSelectRace.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
 						| System.Windows.Forms.AnchorStyles.Right)));
 			this.bttnSelectRace.Enabled = false;
@@ -160,18 +160,18 @@
 			this.bttnSelectRace.TabIndex = 4;
 			this.bttnSelectRace.Text = "create army";
 			this.bttnSelectRace.Click += new System.EventHandler(this.bttnSelectRace_Click);
-			// 
+			//
 			// lblArmyName
-			// 
+			//
 			this.lblArmyName.Location = new System.Drawing.Point(12, 163);
 			this.lblArmyName.Name = "lblArmyName";
 			this.lblArmyName.Size = new System.Drawing.Size(123, 17);
 			this.lblArmyName.TabIndex = 8;
 			this.lblArmyName.Text = "army name";
 			this.lblArmyName.TextAlign = System.Drawing.ContentAlignment.TopRight;
-			// 
+			//
 			// txtArmyName
-			// 
+			//
 			this.txtArmyName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
 						| System.Windows.Forms.AnchorStyles.Right)));
 			this.txtArmyName.Enabled = false;
@@ -180,18 +180,18 @@
 			this.txtArmyName.Size = new System.Drawing.Size(265, 20);
 			this.txtArmyName.TabIndex = 9;
 			this.txtArmyName.TextChanged += new System.EventHandler(this.txtArmyName_TextChanged);
-			// 
+			//
 			// lblArmySize
-			// 
+			//
 			this.lblArmySize.Location = new System.Drawing.Point(12, 188);
 			this.lblArmySize.Name = "lblArmySize";
 			this.lblArmySize.Size = new System.Drawing.Size(123, 18);
 			this.lblArmySize.TabIndex = 10;
 			this.lblArmySize.Text = "army size";
 			this.lblArmySize.TextAlign = System.Drawing.ContentAlignment.TopRight;
-			// 
+			//
 			// armySize
-			// 
+			//
 			this.armySize.Enabled = false;
 			this.armySize.Increment = new decimal(new int[] {
             50,
@@ -213,9 +213,9 @@
             0,
             0,
             0});
-			// 
+			//
 			// gameSystems
-			// 
+			//
 			this.gameSystems.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
 						| System.Windows.Forms.AnchorStyles.Right)));
 			this.gameSystems.DisplayMember = "Name";
@@ -225,9 +225,9 @@
 			this.gameSystems.Size = new System.Drawing.Size(265, 21);
 			this.gameSystems.TabIndex = 13;
 			this.gameSystems.SelectedValueChanged += new System.EventHandler(this.gameSystems_SelectedValueChanged);
-			// 
+			//
 			// lblGameSystem
-			// 
+			//
 			this.lblGameSystem.Image = global::IBBoard.WarFoundry.GUI.WinForms.Properties.Resources.warning_sml;
 			this.lblGameSystem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
 			this.lblGameSystem.Location = new System.Drawing.Point(12, 9);
@@ -236,9 +236,9 @@
 			this.lblGameSystem.TabIndex = 12;
 			this.lblGameSystem.Text = "game system";
 			this.lblGameSystem.TextAlign = System.Drawing.ContentAlignment.TopRight;
-			// 
+			//
 			// FrmNewArmy
-			// 
+			//
 			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
 			this.ClientSize = new System.Drawing.Size(418, 267);
 			this.Controls.Add(this.gameSystems);
@@ -328,6 +328,8 @@
 			bool raceSelected = lstRaces.SelectedItem != null;
 			txtArmyName.Enabled = raceSelected;
 			armySize.Enabled = raceSelected;
+			race = (Race)lstRaces.SelectedItem;
+			txtArmyName.Text = String.Format(race.ArmyDefaultName, Translation.GetTranslation("armySizePts", "{0}pt", armySize.Value));
 		}
 
 		private void gameSystems_SelectedValueChanged(object sender, EventArgs e)
--- a/IBBoard.WarFoundry.GUI.WinForms.csproj	Mon Sep 06 18:17:19 2010 +0000
+++ b/IBBoard.WarFoundry.GUI.WinForms.csproj	Wed Sep 08 20:17:48 2010 +0000
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
@@ -24,6 +24,23 @@
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -74,6 +91,10 @@
     <UseVSHostingProcess>true</UseVSHostingProcess>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="IBBoardWF, Version=1.0.0.27120, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\IBBoard.Windows.Forms\obj\Release\IBBoardWF.dll</HintPath>
+    </Reference>
     <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821" />
     <Reference Include="System">
       <Name>System</Name>
@@ -90,16 +111,6 @@
     <Reference Include="System.Xml">
       <Name>System.XML</Name>
     </Reference>
-    <ProjectReference Include="..\IBBoard.Windows.Forms\IBBoard.Windows.Forms.csproj">
-      <Name>IBBoard.Windows.Forms</Name>
-      <Project>{E3790268-2082-4975-B1A3-C70B37842CE8}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-    </ProjectReference>
-    <ProjectReference Include="..\IBBoard\IBBoard.csproj">
-      <Name>IBBoard</Name>
-      <Project>{5DFD64F6-FC2B-4B4F-B92E-483BAC468105}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="App.ico" />
@@ -247,10 +258,46 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include="..\IBBoard.WarFoundry.API\IBBoard.WarFoundry.API.csproj">
       <Project>{951E6C7A-7FBA-4F68-9D9E-F48618BB9626}</Project>
       <Name>IBBoard.WarFoundry.API</Name>
     </ProjectReference>
+    <ProjectReference Include="..\IBBoard\IBBoard.csproj">
+      <Project>{5DFD64F6-FC2B-4B4F-B92E-483BAC468105}</Project>
+      <Name>IBBoard</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
--- a/Properties/Resources.Designer.cs	Mon Sep 06 18:17:19 2010 +0000
+++ b/Properties/Resources.Designer.cs	Wed Sep 08 20:17:48 2010 +0000
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3053
+//     Runtime Version:2.0.50727.4200
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
--- a/translations/fi.translation	Mon Sep 06 18:17:19 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-on id="bttnCancel">Peruuta</translation>
-	<translation id="bttnNewArmy">Luo armeija</translation>
-	<translation id="bttnOpenArmy">Avaa armeija</translation>
-	<translation id="bttnSaveArmy">Tallenna armeija</translation>
-	<translation id="bttnUndo">Kumoa</translation>
-	<translation id="bttnRedo">Toista</translation>
-	<translation id="ArmyTree">Armeijakatsaus</translation>
-	<translation id="miDeleteUnit">&amp;Poista yksikkö</translation>
-	<translation id="miEditUnit">&amp;Muokka yksikkö</translation>
-	<translation id="openArmyDialog">Avaa armeija</translation>
-	<translation id="saveArmyDialog">Tallenna armeija</translation>
-	<translation id="armyFileFilter">WarFoundry armeija tiedostot (*.army)</translation>
-	<translation id="statusPanelPoints">{0} pistettä / {1} pisteestä</translation>
-	<translation id="statusPanelPointsToolTip">Armeijan pistemäärä</translation>
-	<translation id="defaultUnitName">Yksikkö {0} {1}</translation>
-	<translation id="FrmNewArmy">Luo uusi armeija</translation>
-	<translation id="lblGameSystem">Pelisysteemejä:</translation>
-	<translation id="lblRaceList">Rodut:</translation>
-	<translation id="lblArmyName">Armeijan nimi:</translation>
-	<translation id="lblArmySize">Armeijan koko:</translation>
-	<translation id="bttnSelectRace">Luo armeija</translation>
-	<translation id="newArmyNoGameSystems">WarFoundry ei löytänyt pelisysteemi datatiedostoja.
-Tarkista virheilmoituksia lokista ja varmista että sinulla on pelisysteemi datatiedostoja "data" mapissa.</translation>
-	<translation id="FrmNewUnit">Lisää uusi {0} valinta</translation>
-	<translation id="lblUnitList">Yksikköitä:</translation>
-	<translation id="bttnSelectUnit">Lisää yksikkö</translation>
-	<translation id="FrmNewUnitEquipment">Uusi varustus {0}ille</translation>
-	<translation id="FrmReplaceUnitEquipment">Korvaa {0} uudella varusteella</translation>	
-	<translation id="lblAmount">Määrä:</translation>
-	<translation id="lblItem">Varustus:</translation>
-	<translation id="rbEquipAll">Varustele kaikki</translation>	
-	<translation id="equipPercentageTooLarge"> ({0}%) on suurempi kuin varusteen enimmäisprosenttimäärä ({1}%). Enimmäisprosenttimäärä käytetään.</translation>
-	<translation id="equipPercentageTooLargeTitle">Varusteen prosenttimäärä liian suuri</translation>
-	<translation id="equipPercentageTooSmall"> ({0}%) on pienempi kuin varusteen vähimmmäisprosenttimäärä ({1}%). Vähimmäisprosenttimäärä käytetään.</translation>
-	<translation id="equipPercentageTooSmallTitle">Varusteen prosenttimäärä liian pieni</translation>
-	<translation id="equipNumberTooLarge"> ({0}) on suurempi kuin varusteen enimmäismäärä ({1}). Enimmäismäärä käytetään.</translation>
-	<translation id="equipNumberTooLargeTitle">Varusteen määrä liian suuri</translation>	
-	<translation id="equipNumberTooSmall"> ({0}) on pienempi kuin varusteen vähimmäismäärä ({1}). Vähimmäismäärä käytetään.</translation>
-	<translation id="equipNumberTooSmallTitle">Varusteen määrä liian pieni</translation>
-	<translation id="FrmEditUnitEquipment">Muokkaa {0}  {1}ille</translation>
-	<translation id="removeRequiredEquipmentText">Tämä on pakollinen varustus jota ei voi poistaa. Sen määrä on oltava ainakin yksi tai sen on vaihdettava toiseen vaihtoehtoon.</translation>
-	<translation id="removeRequiredEquipmentTitle">Pakollinen varustus ei voi poistaa</translation>
-	<translation id="removeEquipmentText">Tämä poistaa varusteen yksiköltä. Jatkaa?</translation>
-	<translation id="removeEquipmentTitle">Vahvista varusteen poisto</translation>
-	<translation id="FrmAbout">Tietoja WarFoundry:stä</translation>
-	<translation id="lblVersion">Versio: {0}</translation>
-	<translation id="lblDevelopers">Kehittäjiä:</translation>
-	<translation id="lblThanks">Kiitoksia:</translation>
-	<translation id="FrmUnit">{0}</translation>
-	<translation id="lblUnitSize">Yksikön koko:</translation>
-	<translation id="StatLineName">Nimike</translation>
-	<translation id="lblEquip">Varustelu:</translation>
-	<translation id="bttnAddWeapon">Lisää</translation>
-	<translation id="lblAbilities">Kykyjä:</translation>
-	<translation id="lblNotes">Muistiinpanoja:</translation>
-	<translation id="bttnRemoveWeapon">Poista</translation>
-	<translation id="bttnReplaceWeapon">Korvaa</translation>
-	<translation id="bttnEditWeapon">Muokkaa</translation>
-	<translation id="equipmentAmountWithCost">{0} ({1} {2} piste(ttä) jokaiselle)</translation>
-	<translation id="equipmentAmountWithZeroCost">{0} ({1} ilmaiseksi)</translation>
-	<translation id="equipmentChoiceAmountAll">kaikille ({1})</translation>
-	<translation id="equipmentChoiceAmountPercentage">{0}%:ille ({1})</translation>
-	<translation id="equipmentChoiceAmountNumber">{0}</translation>
-	<translation id="InvalidRaceFileBoxTitle">Rotutiedosto on epäkelpo</translation>
-	<translation id="InvalidArmyFileBoxTitle">Armeijatiedosto on epäkelpo</translation>
-	<translation id="SaveChangesQuestion">Armeija nimeltä "{0}" on muokattu.
-Tallenna muokkaukset ennen sulkemista?</translation>
-	<translation id="SaveChangesTitle">Tallentamattomia muokkauksia </translation>
-	<translation id="SaveFailed">WarFoundry ei voinut tallentaa tiedostoa. Lue tarkemmin tiedot logista.</translation>
-	<translation id="SaveFailedTitle">Tiedoston tallentaminen epäonnistui</translation>
-	<translation id="armyHtmlOutputBodyHeader">{0} – {1} pistettä</translation>
-	<translation id="armyHtmlOutputTableHeaderUnitName">Nimi</translation>
-	<translation id="armyHtmlOutputTableHeaderUnitNotes">Muistiinpanot</translation>
-	<translation id="armyHtmlOutputTableHeaderUnitPoints">Pisteitä</translation>
-	<translation id="armyHtmlExportEquipAmountAll">kaikki ({1}) </translation>
-	<translation id="armyHtmlExportEquipAmountPercentage">{0}% ({1}) </translation>
-	<translation id="armyHtmlExportEquipAmountNumber">{0}</translation>
-	<translation id="armyHtmlExportEquipAmountRatio">{0}  {1}:lle </translation>
-	<translation id="equipmentAmountAll">kaikki ({1})</translation>
-	<translation id="equipmentAmountPercentage">{0}% ({1})</translation>
-	<translation id="equipmentAmountNumber">{0}</translation>
-	<translation id="setEquipmentAmountCommandDescription">Muuta {0}in määrä {1}:issä {2}:een</translation>
-	<translation id="setEquipmentAmountCommandUndoDescription">Muuta {0}in määrä {1}:issä {2}:een</translation>
-	<translation id="replaceUnitEquipmentCommandDescription">Korvaa {0} {1}llä {2}ille</translation>
-	<translation id="replaceUnitEquipmentCommandUndoDescription">Korvaa {0} {1}llä {2}ille</translation>
-	<translation id="createAndAddUnitCommandDescription">Lisää yksikkö {0}</translation>
-	<translation id="createAndAddUnitCommandUndoDescription">Poista yksikkö {0}</translation>
-	<translation id="removeUnitCommandDescription">Poista {0}</translation>
-	<translation id="removeUnitCommandUndoDescription">Lisää {0}</translation>
-	<translation id="setUnitNameCommandDescription">Muuta nimi "{0}"sta "{1}"ksi</translation>
-	<translation id="setUnitNameCommandUndoDescription">Muuta nimi "{0}"sta "{1}"ksi</translation>
-	<translation id="setUnitSizeCommandDescription">Muokkaa {0}in kokoa {1}:een</translation>
-	<translation id="setUnitSizeCommandUndoDescription">Muokkaa {0}in kokoa {1}:een</translation>
-	<translation id="requirementAND">{0}; ja {1}</translation>
-	<translation id="requirementOR">{0}; tai {1}</translation>
-	<translation id="requirementUnitExcludes">{0} voidaan valita vain jos ei mikään näistä on valittu: {1}</translation>
-	<translation id="requirementUnitMaxNumber">{1} voidaan vain ottaa {0} kertaa</translation>
-	<translation id="requirementUnitMinNumber">{1} täytyy ottaa {0} kertaa</translation>
-	<translation id="requirementUnitTypeAtLeastSingle">{1} {0}</translation>
-	<translation id="requirementUnitTypeAtLeastJoiner">{0}, {1}</translation>
-	<translation id="requirementUnitTypeAtLeast">{0} voidaan valita vain jos joku näistä on valittu: {1}</translation>
-	<translation id="FrmPreferences">Asetukset</translation>
-	<translation id="languagePrefSection">Kieli</translation>
-	<translation id="lblLanguage">Kieli:</translation>
-	<translation id="languagesGroup">Kieli</translation>
-</translations>
-
-