changeset 12:6284c091b132

Merge local with IBBoard
author Tsudico
date Fri, 17 Dec 2010 22:14:43 -0600
parents b42ba80ec613 38f0ed348ca8
children 372f921c20fc
files IBBoard.WarFoundry.Forge.WinForms.suo bin/Debug/IBBoard.WarFoundry.API.dll bin/Debug/IBBoard.dll bin/Debug/IBBoardWF.dll bin/Debug/ICSharpCode.SharpZipLib.dll bin/Debug/schemas/system.xsd obj/Debug/IBBoard.WarFoundry.Forge.WinForms.csproj.FileListAbsolute.txt obj/Debug/IBBoard.WarFoundry.Forge.WinForms.csproj.GenerateResource.Cache obj/Debug/ResolveAssemblyReference.cache
diffstat 12 files changed, 76 insertions(+), 107 deletions(-) [+]
line diff
     1.1 --- a/.hgignore	Fri Dec 17 20:14:43 2010 +0000
     1.2 +++ b/.hgignore	Fri Dec 17 22:14:43 2010 -0600
     1.3 @@ -1,8 +1,8 @@
     1.4  syntax:glob
     1.5 -bin/*
     1.6 -obj/*
     1.7 -bin/Debug/*
     1.8 +/bin/*
     1.9 +/obj/*
    1.10  *.orig
    1.11  *.user
    1.12  *.userprefs
    1.13 -*.suo
    1.14 \ No newline at end of file
    1.15 +*.suo
    1.16 +*.pdb
    1.17 \ No newline at end of file
     2.1 --- a/FrmSystem.Designer.cs	Fri Dec 17 20:14:43 2010 +0000
     2.2 +++ b/FrmSystem.Designer.cs	Fri Dec 17 22:14:43 2010 -0600
     2.3 @@ -520,6 +520,7 @@
     2.4  			this.btnCategoryUp.TabIndex = 17;
     2.5  			this.btnCategoryUp.Text = "Up";
     2.6  			this.btnCategoryUp.UseVisualStyleBackColor = true;
     2.7 +			this.btnCategoryUp.Click += new System.EventHandler(this.btnCategoryUp_Click);
     2.8  			// 
     2.9  			// listCategories
    2.10  			// 
    2.11 @@ -538,6 +539,7 @@
    2.12  			this.btnCategoryDown.TabIndex = 16;
    2.13  			this.btnCategoryDown.Text = "Down";
    2.14  			this.btnCategoryDown.UseVisualStyleBackColor = true;
    2.15 +			this.btnCategoryDown.Click += new System.EventHandler(this.btnCategoryDown_Click);
    2.16  			// 
    2.17  			// btnCategoryAdd
    2.18  			// 
     3.1 --- a/FrmSystem.cs	Fri Dec 17 20:14:43 2010 +0000
     3.2 +++ b/FrmSystem.cs	Fri Dec 17 22:14:43 2010 -0600
     3.3 @@ -211,6 +211,22 @@
     3.4  					break;
     3.5  				}
     3.6  			}
     3.7 +			if(this.listCategories.SelectedIndex == 0)
     3.8 +			{
     3.9 +				this.btnCategoryUp.Enabled = false;
    3.10 +			}
    3.11 +			else
    3.12 +			{
    3.13 +				this.btnCategoryUp.Enabled = true;
    3.14 +			}
    3.15 +			if (this.listCategories.SelectedIndex == this.listCategories.Items.Count - 1)
    3.16 +			{
    3.17 +				this.btnCategoryDown.Enabled = false;
    3.18 +			}
    3.19 +			else
    3.20 +			{
    3.21 +				this.btnCategoryDown.Enabled = true;
    3.22 +			}
    3.23  		}
    3.24  
    3.25  		private void btnCategoryAdd_Click(object sender, EventArgs e)
    3.26 @@ -254,6 +270,60 @@
    3.27  			updateCategoryList();
    3.28  		}
    3.29  
    3.30 +		private void btnCategoryUp_Click(object sender, EventArgs e)
    3.31 +		{
    3.32 +			int index = this.listCategories.SelectedIndex;
    3.33 +			IBBoard.WarFoundry.API.Objects.Category[] catList = new IBBoard.WarFoundry.API.Objects.Category[this.listCategories.Items.Count];
    3.34 +			
    3.35 +			for(int i = 0; i < system.Categories.Length; i++)
    3.36 +			{
    3.37 +				catList[i] = system.Categories[i];
    3.38 +			}
    3.39 +			foreach(IBBoard.WarFoundry.API.Objects.Category cat in system.Categories)
    3.40 +			{
    3.41 +				system.RemoveCategory(cat.ID);
    3.42 +			}
    3.43 +			
    3.44 +			IBBoard.WarFoundry.API.Objects.Category temp = catList[index];
    3.45 +			catList[index] = catList[index - 1];
    3.46 +			catList[index - 1] = temp;
    3.47 +			
    3.48 +			for(int i = catList.Length - 1; i >= 0; i--)
    3.49 +			{
    3.50 +				system.AddCategory(catList[i]);
    3.51 +			}
    3.52 +			
    3.53 +			updateCategoryList();
    3.54 +			this.listCategories.SelectedIndex = index - 1;
    3.55 +		}
    3.56 +
    3.57 +		private void btnCategoryDown_Click(object sender, EventArgs e)
    3.58 +		{
    3.59 +			int index = this.listCategories.SelectedIndex;
    3.60 +			IBBoard.WarFoundry.API.Objects.Category[] catList = new IBBoard.WarFoundry.API.Objects.Category[this.listCategories.Items.Count];
    3.61 +
    3.62 +			for (int i = 0; i < system.Categories.Length; i++)
    3.63 +			{
    3.64 +				catList[i] = system.Categories[i];
    3.65 +			}
    3.66 +			foreach (IBBoard.WarFoundry.API.Objects.Category cat in system.Categories)
    3.67 +			{
    3.68 +				system.RemoveCategory(cat.ID);
    3.69 +			}
    3.70 +
    3.71 +			IBBoard.WarFoundry.API.Objects.Category temp = catList[index];
    3.72 +			catList[index] = catList[index + 1];
    3.73 +			catList[index + 1] = temp;
    3.74 +
    3.75 +			for (int i = catList.Length - 1; i >= 0; i--)
    3.76 +			{
    3.77 +				system.AddCategory(catList[i]);
    3.78 +			}
    3.79 +
    3.80 +			updateCategoryList();
    3.81 +			this.listCategories.SelectedIndex = index + 1;
    3.82 +		}
    3.83 +
    3.84  		private void txtCategoryName_TextChanged(object sender, EventArgs e)
    3.85  		{
    3.86  			if (this.UpdateCategory)
     4.1 Binary file IBBoard.WarFoundry.Forge.WinForms.suo has changed
     5.1 Binary file bin/Debug/IBBoard.WarFoundry.API.dll has changed
     6.1 Binary file bin/Debug/IBBoard.dll has changed
     7.1 Binary file bin/Debug/IBBoardWF.dll has changed
     8.1 Binary file bin/Debug/ICSharpCode.SharpZipLib.dll has changed
     9.1 --- a/bin/Debug/schemas/system.xsd	Fri Dec 17 20:14:43 2010 +0000
     9.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.3 @@ -1,55 +0,0 @@
     9.4 -<?xml version="1.0"?>
     9.5 -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:core="http://ibboard.co.uk/warfoundry/core" xmlns:cats="http://ibboard.co.uk/warfoundry/cats"
     9.6 -targetNamespace="http://ibboard.co.uk/warfoundry/system" xmlns="http://ibboard.co.uk/warfoundry/system" xmlns:sys="http://ibboard.co.uk/warfoundry/system" elementFormDefault="qualified">
     9.7 -<xs:element name="system">
     9.8 -	<xs:complexType>
     9.9 -		<xs:sequence>
    9.10 -			<xs:element name="categories" type="cats:categoriestype">
    9.11 -				<xs:key name="catsKey">
    9.12 -					<xs:selector xpath="cats:cat"/>
    9.13 -					<xs:field xpath="@id"/>
    9.14 -				</xs:key>
    9.15 -			</xs:element>
    9.16 -			<xs:element name="sysStatsList">
    9.17 -				<xs:complexType>
    9.18 -					<xs:sequence>
    9.19 -						<xs:element name="sysStats" maxOccurs="unbounded">
    9.20 -							<xs:complexType>
    9.21 -								<xs:sequence>
    9.22 -									<xs:element name="sysStat" maxOccurs="unbounded">
    9.23 -										<xs:complexType>
    9.24 -											<xs:sequence>
    9.25 -												<xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
    9.26 -											</xs:sequence>
    9.27 -											<xs:attribute name="name" type="xs:string" use="required"/>
    9.28 -											<xs:anyAttribute processContents="lax"/>
    9.29 -										</xs:complexType>
    9.30 -									</xs:element>
    9.31 -								</xs:sequence>
    9.32 -								<xs:attribute name="id" type="xs:string" />
    9.33 -								<xs:anyAttribute processContents="lax"/>
    9.34 -							</xs:complexType>
    9.35 -						</xs:element>
    9.36 -					</xs:sequence>
    9.37 -					<xs:attribute name="defaultStats" type="xs:string" use="required" />
    9.38 -					<xs:anyAttribute processContents="lax"/>
    9.39 -				</xs:complexType>
    9.40 -			</xs:element>
    9.41 -			<xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
    9.42 -		</xs:sequence>
    9.43 -		<xs:attribute name="id" type="xs:string" />
    9.44 -		<xs:attribute name="name" type="xs:string" use="required"/>
    9.45 -		<xs:attribute name="warn" type="xs:boolean" default="false"/>
    9.46 -		<xs:attribute name="allowAllies" type="xs:boolean" default="true"/>
    9.47 -		<xs:anyAttribute processContents="lax"/>
    9.48 -	</xs:complexType>
    9.49 -	<xs:keyref name="defaultStatsRef" refer="statsKey">
    9.50 -		<xs:selector xpath="sys:sysStatsList"/>
    9.51 -		<xs:field xpath="@defaultStats"/>
    9.52 -	</xs:keyref>
    9.53 -	<xs:key name="statsKey">
    9.54 -		<xs:selector xpath="sys:sysStatsList/sys:sysStats"/>
    9.55 -		<xs:field xpath="@id"/>
    9.56 -	</xs:key>
    9.57 -</xs:element>
    9.58 -</xs:schema>
    9.59 \ No newline at end of file
    10.1 --- a/obj/Debug/IBBoard.WarFoundry.Forge.WinForms.csproj.FileListAbsolute.txt	Fri Dec 17 20:14:43 2010 +0000
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,48 +0,0 @@
    10.4 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\IBBoard.WarFoundry.Forge.WinForms\obj\Debug\ResolveAssemblyReference.cache
    10.5 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\IBBoard.WarFoundry.Forge.WinForms\obj\Debug\IBBoard.WarFoundry.Forge.WinForms.FrmMain.resources
    10.6 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\IBBoard.WarFoundry.Forge.WinForms\obj\Debug\IBBoard.WarFoundry.Forge.WinForms.FrmSystem.resources
    10.7 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\IBBoard.WarFoundry.Forge.WinForms\obj\Debug\IBBoard.WarFoundry.Forge.WinForms.Properties.Resources.resources
    10.8 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\IBBoard.WarFoundry.Forge.WinForms\obj\Debug\IBBoard.WarFoundry.Forge.WinForms.csproj.GenerateResource.Cache
    10.9 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\IBBoard.WarFoundry.Forge.WinForms\bin\Debug\IBBoard.WarFoundry.Forge.WinForms.exe
   10.10 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\IBBoard.WarFoundry.Forge.WinForms\bin\Debug\IBBoard.WarFoundry.Forge.WinForms.pdb
   10.11 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\IBBoard.WarFoundry.Forge.WinForms\obj\Debug\IBBoard.WarFoundry.Forge.WinForms.exe
   10.12 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\IBBoard.WarFoundry.Forge.WinForms\obj\Debug\IBBoard.WarFoundry.Forge.WinForms.pdb
   10.13 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\schemas\army.xsd
   10.14 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\schemas\race.xsd
   10.15 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\schemas\system.xsd
   10.16 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\schemas\warfoundry-cats.xsd
   10.17 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\schemas\warfoundry-core.xsd
   10.18 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\schemas\xhtml1-strict.dtd
   10.19 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\schemas\xhtml-lat1.ent
   10.20 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\schemas\xhtml-special.ent
   10.21 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\schemas\xhtml-symbol.ent
   10.22 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\schemas\translation.xsd
   10.23 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\WarFoundryForgePref.xml
   10.24 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\translations\de.translation
   10.25 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\translations\en.translation
   10.26 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\translations\fi.translation
   10.27 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\translations\fr.translation
   10.28 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\translations\it.translation
   10.29 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\translations\nl.translation
   10.30 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\translations\ru.translation
   10.31 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\translations\sv.translation
   10.32 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\WarFoundryForge.exe.log4net
   10.33 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\WarFoundryForge.exe
   10.34 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\WarFoundryForge.pdb
   10.35 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\IBBoard.dll
   10.36 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\IBBoard.WarFoundry.API.dll
   10.37 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\IBBoardWF.dll
   10.38 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\ICSharpCode.SharpZipLib.dll
   10.39 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\log4net.dll
   10.40 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\IBBoardWF.pdb
   10.41 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\IBBoard.WarFoundry.API.pdb
   10.42 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\bin\Debug\IBBoard.pdb
   10.43 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\obj\Debug\ResolveAssemblyReference.cache
   10.44 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\obj\Debug\IBBoard.WarFoundry.Forge.WinForms.FrmMain.resources
   10.45 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\obj\Debug\IBBoard.WarFoundry.Forge.WinForms.FrmSystem.resources
   10.46 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\obj\Debug\IBBoard.WarFoundry.Forge.WinForms.Properties.Resources.resources
   10.47 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\obj\Debug\IBBoard.WarFoundry.Forge.WinForms.csproj.GenerateResource.Cache
   10.48 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\obj\Debug\WarFoundryForge.exe
   10.49 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\ibboard.warfoundry.forge.winforms\obj\Debug\WarFoundryForge.pdb
   10.50 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\IBBoard.WarFoundry.Forge.WinForms\bin\Debug\ICSharpCode.SharpZipLib.pdb
   10.51 -C:\Users\Steven Westcot\Documents\WarFoundry\Repository\IBBoard.WarFoundry.Forge.WinForms\bin\Debug\ICSharpCode.SharpZipLib.xml
    11.1 Binary file obj/Debug/IBBoard.WarFoundry.Forge.WinForms.csproj.GenerateResource.Cache has changed
    12.1 Binary file obj/Debug/ResolveAssemblyReference.cache has changed