From 7199b6fd9688fb1e75b6a4c4e13d410373116668 Mon Sep 17 00:00:00 2001
From: steelphase <ebajumpaa@gmail.com>
Date: Sat, 20 Sep 2014 13:43:31 -0400
Subject: [PATCH] Mod Chooser move.

Moved code for mod chooser to mod.common.
---
 {OpenRA.Mods.RA => OpenRA.Mods.Common}/ModChooserLoadScreen.cs | 2 +-
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj                   | 3 +++
 .../Widgets/Logic/ButtonTooltipLogic.cs                        | 2 +-
 .../Widgets/Logic/ModBrowserLogic.cs                           | 2 +-
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                           | 3 ---
 mods/modchooser/mod.yaml                                       | 1 -
 6 files changed, 6 insertions(+), 7 deletions(-)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/ModChooserLoadScreen.cs (97%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Widgets/Logic/ButtonTooltipLogic.cs (96%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Widgets/Logic/ModBrowserLogic.cs (99%)

diff --git a/OpenRA.Mods.RA/ModChooserLoadScreen.cs b/OpenRA.Mods.Common/ModChooserLoadScreen.cs
similarity index 97%
rename from OpenRA.Mods.RA/ModChooserLoadScreen.cs
rename to OpenRA.Mods.Common/ModChooserLoadScreen.cs
index e6c8b86068..b8f18f5be5 100644
--- a/OpenRA.Mods.RA/ModChooserLoadScreen.cs
+++ b/OpenRA.Mods.Common/ModChooserLoadScreen.cs
@@ -13,7 +13,7 @@ using System.Drawing;
 using OpenRA.Graphics;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.Cnc
+namespace OpenRA.Mods.Common
 {
 	public class ModChooserLoadScreen : ILoadScreen
 	{
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index dada596aa4..055640da0b 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -45,6 +45,7 @@
     <Compile Include="Graphics\BeamRenderable.cs" />
     <Compile Include="Graphics\ContrailRenderable.cs" />
     <Compile Include="Graphics\RangeCircleRenderable.cs" />
+    <Compile Include="ModChooserLoadScreen.cs" />
     <Compile Include="ServerTraits\ColorValidator.cs" />
     <Compile Include="ServerTraits\MasterServerPinger.cs" />
     <Compile Include="ServerTraits\PlayerPinger.cs" />
@@ -68,6 +69,8 @@
     <Compile Include="Graphics\TextRenderable.cs" />
     <Compile Include="Graphics\VoxelActorPreview.cs" />
     <Compile Include="Graphics\VoxelRenderable.cs" />
+    <Compile Include="Widgets\Logic\ButtonTooltipLogic.cs" />
+    <Compile Include="Widgets\Logic\ModBrowserLogic.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
diff --git a/OpenRA.Mods.RA/Widgets/Logic/ButtonTooltipLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ButtonTooltipLogic.cs
similarity index 96%
rename from OpenRA.Mods.RA/Widgets/Logic/ButtonTooltipLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/ButtonTooltipLogic.cs
index 6c4aadf049..df1be7331c 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/ButtonTooltipLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/ButtonTooltipLogic.cs
@@ -10,7 +10,7 @@
 
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class ButtonTooltipLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/ModBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ModBrowserLogic.cs
similarity index 99%
rename from OpenRA.Mods.RA/Widgets/Logic/ModBrowserLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/ModBrowserLogic.cs
index 7a2a518185..a1cdfaa7b0 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/ModBrowserLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/ModBrowserLogic.cs
@@ -16,7 +16,7 @@ using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class ModBrowserLogic
 	{
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 612fe776bb..7ac2c43d87 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -388,7 +388,6 @@
     <Compile Include="Widgets\Logic\Ingame\LeaveMapLogic.cs" />
     <Compile Include="Widgets\Logic\IrcLogic.cs" />
     <Compile Include="Widgets\Logic\KickClientLogic.cs" />
-    <Compile Include="Widgets\Logic\ModBrowserLogic.cs" />
     <Compile Include="Widgets\Logic\ColorPickerLogic.cs" />
     <Compile Include="Widgets\Logic\ConnectionLogic.cs" />
     <Compile Include="Widgets\Logic\DiplomacyLogic.cs" />
@@ -482,12 +481,10 @@
     <Compile Include="Attack\AttackFollow.cs" />
     <Compile Include="Attack\AttackGarrisoned.cs" />
     <Compile Include="Widgets\Logic\LobbyMapPreviewLogic.cs" />
-    <Compile Include="Widgets\Logic\ButtonTooltipLogic.cs" />
     <Compile Include="Orders\BeaconOrderGenerator.cs" />
     <Compile Include="Widgets\LogicKeyListenerWidget.cs" />
     <Compile Include="Widgets\Logic\ControlGroupLogic.cs" />
     <Compile Include="Buildings\LineBuildNode.cs" />
-    <Compile Include="ModChooserLoadScreen.cs" />
     <Compile Include="Render\WithBuildingPlacedAnimation.cs" />
     <Compile Include="StartGameNotification.cs" />
     <Compile Include="Widgets\ConfirmationDialogs.cs" />
diff --git a/mods/modchooser/mod.yaml b/mods/modchooser/mod.yaml
index c5315a5c20..8afb9547eb 100644
--- a/mods/modchooser/mod.yaml
+++ b/mods/modchooser/mod.yaml
@@ -16,7 +16,6 @@ Chrome:
 
 Assemblies:
 	mods/common/OpenRA.Mods.Common.dll
-	mods/ra/OpenRA.Mods.RA.dll
 
 ChromeLayout:
 	mods/modchooser/modchooser.yaml