Mercurial > repos > IBBoard.WarFoundry.GUI.GTK

changeset 115:5e8de1507cfb WarFoundry_v0.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Remove dependency on Rollcall plugin * Update to VS2008 project * Make sure SharpZipLib is included no-open-ticket
author IBBoard <dev@ibboard.co.uk>
date Sat, 30 Apr 2011 14:08:45 +0000
parents 8b99d6aa623f
children 9f3f27dca5fd
files FrmMainWindow.cs IBBoard.WarFoundry.GUI.GTK.csproj IBBoard.WarFoundry.GUI.GTK.sln
diffstat 3 files changed, 11 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/FrmMainWindow.cs	Sat Apr 30 14:06:05 2011 +0000
+++ b/FrmMainWindow.cs	Sat Apr 30 14:08:45 2011 +0000
@@ -25,7 +25,6 @@
 using IBBoard.WarFoundry.API.Requirements;
 using IBBoard.WarFoundry.API.Savers;
 using IBBoard.WarFoundry.GUI.GTK.Widgets;
-using IBBoard.WarFoundry.Plugin.Rollcall;
 using IBBoard.Xml;
 using log4net;
 using WFObjects = IBBoard.WarFoundry.API.Objects;
@@ -158,7 +157,6 @@
 			//FIXME: Temporary hack to add paths and factories before we get preferences and plugins
 			WarFoundryLoader.GetDefault().AddLoadDirectory(new DirectoryInfo(Constants.ExecutablePath + Constants.DirectoryString + "data"));
 			WarFoundryLoader.GetDefault().RegisterFactory(WarFoundryXmlFactory.GetFactory());
-			WarFoundryLoader.GetDefault().RegisterNonNativeFactory(RollcallFactory.GetFactory());
 			WarFoundryLoader.GetDefault().FileLoadingFinished += FileLoadingFinished;
 			WarFoundrySaver.SetFileSaver(new WarFoundryXmlSaver());
 
@@ -1171,11 +1169,11 @@
 			form.Hide();
 		}
 
-		public override ICollection<Action> Actions
+		public override ICollection<Gtk.Action> Actions
 		{
 			get
 			{
-				List<Action> actions = new List<Action>();
+				List<Gtk.Action> actions = new List<Gtk.Action>();
 
 				foreach (ActionGroup actionGroup in this.UIManager.ActionGroups)
 				{
--- a/IBBoard.WarFoundry.GUI.GTK.csproj	Sat Apr 30 14:06:05 2011 +0000
+++ b/IBBoard.WarFoundry.GUI.GTK.csproj	Sat Apr 30 14:08:45 2011 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<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>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,6 +12,7 @@
     <StartupObject>IBBoard.WarFoundry.GUI.GTK.FrmMainWindow</StartupObject>
     <ApplicationIcon>App.ico</ApplicationIcon>
     <AssemblyName>WarFoundry-GTK</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -103,16 +104,13 @@
     <Reference Include="Mono.Posix" />
     <Reference Include="System" />
     <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
   </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.WarFoundry.Plugin.Rollcall\IBBoard.WarFoundry.Plugin.Rollcall.csproj">
-      <Project>{182E4A7C-7CFB-4337-A9AD-AB2DCA054A53}</Project>
-      <Name>IBBoard.WarFoundry.Plugin.Rollcall</Name>
-    </ProjectReference>
     <ProjectReference Include="..\IBBoard\IBBoard.csproj">
       <Project>{5DFD64F6-FC2B-4B4F-B92E-483BAC468105}</Project>
       <Name>IBBoard</Name>
@@ -121,6 +119,10 @@
       <Project>{06605A63-E433-42FE-93CF-0DA6630A7DF5}</Project>
       <Name>IBBoard.GtkSharp</Name>
     </ProjectReference>
+    <ProjectReference Include="..\SharpZipLib\ICSharpCode.SharpZLib.csproj">
+      <Project>{0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}</Project>
+      <Name>ICSharpCode.SharpZLib</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="App.ico">
--- a/IBBoard.WarFoundry.GUI.GTK.sln	Sat Apr 30 14:06:05 2011 +0000
+++ b/IBBoard.WarFoundry.GUI.GTK.sln	Sat Apr 30 14:08:45 2011 +0000
@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBBoard.WarFoundry.GUI.GTK", "IBBoard.WarFoundry.GUI.GTK.csproj", "{4B435E40-7FA2-41C5-96F6-5735396D2D5F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBBoard", "..\IBBoard\IBBoard.csproj", "{5DFD64F6-FC2B-4B4F-B92E-483BAC468105}"
@@ -9,12 +9,6 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBBoard.GtkSharp", "..\IBBoard.GtkSharp\IBBoard.GtkSharp.csproj", "{06605A63-E433-42FE-93CF-0DA6630A7DF5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBBoard.WarFoundry.Plugin.Rollcall", "..\IBBoard.WarFoundry.Plugin.Rollcall\IBBoard.WarFoundry.Plugin.Rollcall.csproj", "{182E4A7C-7CFB-4337-A9AD-AB2DCA054A53}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBBoard.Ini", "..\IBBoard.Ini\IBBoard.Ini.csproj", "{3BBDF326-7128-406C-85DF-EF049633E602}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBBoard.Ini.Tests", "..\IBBoard.Ini.Tests\IBBoard.Ini.Tests.csproj", "{47FA6D87-4A97-4019-880B-CD713B8D4C15}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBBoard.WarFoundry.API.Tests", "..\IBBoard.WarFoundry.API.Tests\IBBoard.WarFoundry.API.Tests.csproj", "{B20E808D-878E-4F6D-B1E3-84A9A49905CB}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBBoard.Tests", "..\IBBoard.Tests\IBBoard.Tests.csproj", "{4160F7B6-4CFA-41FC-B5D7-5C9AE06FEBA7}"
@@ -39,26 +33,14 @@
 		{0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}.Debug|x86.Build.0 = Debug|Any CPU
 		{0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}.Release|x86.ActiveCfg = Release|Any CPU
 		{0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}.Release|x86.Build.0 = Release|Any CPU
-		{182E4A7C-7CFB-4337-A9AD-AB2DCA054A53}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{182E4A7C-7CFB-4337-A9AD-AB2DCA054A53}.Debug|x86.Build.0 = Debug|Any CPU
-		{182E4A7C-7CFB-4337-A9AD-AB2DCA054A53}.Release|x86.ActiveCfg = Release|Any CPU
-		{182E4A7C-7CFB-4337-A9AD-AB2DCA054A53}.Release|x86.Build.0 = Release|Any CPU
 		{2025A316-8377-4454-807C-3C4ED02DF4D5}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{2025A316-8377-4454-807C-3C4ED02DF4D5}.Debug|x86.Build.0 = Debug|Any CPU
 		{2025A316-8377-4454-807C-3C4ED02DF4D5}.Release|x86.ActiveCfg = Release|Any CPU
 		{2025A316-8377-4454-807C-3C4ED02DF4D5}.Release|x86.Build.0 = Release|Any CPU
-		{3BBDF326-7128-406C-85DF-EF049633E602}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3BBDF326-7128-406C-85DF-EF049633E602}.Debug|x86.Build.0 = Debug|Any CPU
-		{3BBDF326-7128-406C-85DF-EF049633E602}.Release|x86.ActiveCfg = Release|Any CPU
-		{3BBDF326-7128-406C-85DF-EF049633E602}.Release|x86.Build.0 = Release|Any CPU
 		{4160F7B6-4CFA-41FC-B5D7-5C9AE06FEBA7}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{4160F7B6-4CFA-41FC-B5D7-5C9AE06FEBA7}.Debug|x86.Build.0 = Debug|Any CPU
 		{4160F7B6-4CFA-41FC-B5D7-5C9AE06FEBA7}.Release|x86.ActiveCfg = Release|Any CPU
 		{4160F7B6-4CFA-41FC-B5D7-5C9AE06FEBA7}.Release|x86.Build.0 = Release|Any CPU
-		{47FA6D87-4A97-4019-880B-CD713B8D4C15}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{47FA6D87-4A97-4019-880B-CD713B8D4C15}.Debug|x86.Build.0 = Debug|Any CPU
-		{47FA6D87-4A97-4019-880B-CD713B8D4C15}.Release|x86.ActiveCfg = Release|Any CPU
-		{47FA6D87-4A97-4019-880B-CD713B8D4C15}.Release|x86.Build.0 = Release|Any CPU
 		{4B435E40-7FA2-41C5-96F6-5735396D2D5F}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{4B435E40-7FA2-41C5-96F6-5735396D2D5F}.Debug|x86.Build.0 = Debug|Any CPU
 		{4B435E40-7FA2-41C5-96F6-5735396D2D5F}.Release|x86.ActiveCfg = Release|Any CPU