move widget code to commons

Mailaender · Mailaender · commit ff6dbde8d766 · 2015-02-28T20:32:19.000+01:00
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -475,6 +475,7 @@
     <Compile Include="Warheads\HealthPercentageDamageWarhead.cs" />
     <Compile Include="Warheads\LeaveSmudgeWarhead.cs" />
     <Compile Include="Warheads\SpreadDamageWarhead.cs" />
+    <Compile Include="Widgets\ActorPreviewWidget.cs" />
     <Compile Include="Widgets\ColorMixerWidget.cs" />
     <Compile Include="Widgets\ColorPreviewManagerWidget.cs" />
     <Compile Include="Widgets\ConfirmationDialogs.cs" />
@@ -487,29 +488,61 @@
     <Compile Include="Widgets\Logic\ColorPickerLogic.cs" />
     <Compile Include="Widgets\Logic\ConnectionLogic.cs" />
     <Compile Include="Widgets\Logic\CountryTooltipLogic.cs" />
+    <Compile Include="Widgets\Logic\CreditsLogic.cs" />
     <Compile Include="Widgets\Logic\DirectConnectLogic.cs" />
     <Compile Include="Widgets\Logic\DisconnectWatcherLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\AddRaceSuffixLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\ClassicProductionLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\ControlGroupLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\DebugMenuLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\DiplomacyLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\GameInfoBriefingLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\GameInfoLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\GameInfoObjectivesLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\GameInfoStatsLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\GameTimerLogic.cs" />
     <Compile Include="Widgets\Logic\Ingame\IngameChatLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\IngameCashCounterLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\IngameMenuLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\IngamePowerBarLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\IngamePowerCounterLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\IngameSiloBarLogic.cs" />
     <Compile Include="Widgets\Logic\Ingame\IngameRadarDisplayLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\LeaveMapLogic.cs" />
     <Compile Include="Widgets\Logic\Ingame\LoadIngamePlayerOrObserverUILogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\ObserverShroudSelectorLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\ObserverStatsLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\OrderButtonsChromeLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\ProductionTooltipLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\ReplayControlBarLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\SupportPowerBinLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\SupportPowerTooltipLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\WorldTooltipLogic.cs" />
+    <Compile Include="Widgets\Logic\Installation\InstallFromCDLogic.cs" />
+    <Compile Include="Widgets\Logic\Installation\DownloadPackagesLogic.cs" />
+    <Compile Include="Widgets\Logic\Installation\InstallLogic.cs" />
+    <Compile Include="Widgets\Logic\Installation\InstallMusicLogic.cs" />
     <Compile Include="Widgets\Logic\Lobby\ClientTooltipLogic.cs" />
     <Compile Include="Widgets\Logic\Lobby\KickClientLogic.cs" />
     <Compile Include="Widgets\Logic\Lobby\KickSpectatorsLogic.cs" />
     <Compile Include="Widgets\Logic\Lobby\LobbyLogic.cs" />
     <Compile Include="Widgets\Logic\Lobby\LobbyMapPreviewLogic.cs" />
     <Compile Include="Widgets\Logic\Lobby\LobbyUtils.cs" />
+    <Compile Include="Widgets\Logic\Lobby\SpawnSelectorTooltipLogic.cs" />
     <Compile Include="Widgets\Logic\MainMenuLogic.cs" />
     <Compile Include="Widgets\Logic\MapChooserLogic.cs" />
+    <Compile Include="Widgets\Logic\MissionBrowserLogic.cs" />
     <Compile Include="Widgets\Logic\ModBrowserLogic.cs" />
-    <Compile Include="Widgets\Logic\ProductionTooltipLogic.cs" />
-    <Compile Include="Widgets\Logic\SupportPowerTooltipLogic.cs" />
-    <Compile Include="Widgets\Logic\SupportPowerBinLogic.cs" />
+    <Compile Include="Widgets\Logic\MusicPlayerLogic.cs" />
+    <Compile Include="Widgets\Logic\PerfDebugLogic.cs" />
     <Compile Include="Widgets\Logic\ReplayBrowserLogic.cs" />
     <Compile Include="Widgets\Logic\ServerBrowserLogic.cs" />
     <Compile Include="Widgets\Logic\ServerCreationLogic.cs" />
     <Compile Include="Widgets\Logic\SettingsLogic.cs" />
+    <Compile Include="Widgets\Logic\SimpleTooltipLogic.cs" />
     <Compile Include="Widgets\Logic\TabCompletionLogic.cs" />
     <Compile Include="Widgets\MenuButtonWidget.cs" />
+    <Compile Include="Widgets\ObserverProductionIconsWidget.cs" />
     <Compile Include="Widgets\ObserverSupportPowerIconsWidget.cs" />
     <Compile Include="Widgets\ProductionPaletteWidget.cs" />
     <Compile Include="Widgets\ProductionTabsWidget.cs" />
@@ -519,13 +552,13 @@
     <Compile Include="Widgets\StrategicProgressWidget.cs" />
     <Compile Include="Widgets\SupportPowersWidget.cs" />
     <Compile Include="Widgets\SupportPowerTimerWidget.cs" />
+    <Compile Include="Widgets\TerrainTemplatePreviewWidget.cs" />
+    <Compile Include="Widgets\WorldCommandWidget.cs" />
     <Compile Include="SpriteLoaders\ShpTDLoader.cs" />
     <Compile Include="SpriteLoaders\ShpTSLoader.cs" />
     <Compile Include="SpriteLoaders\TmpRALoader.cs" />
     <Compile Include="SpriteLoaders\TmpTDLoader.cs" />
     <Compile Include="SpriteLoaders\ShpD2Loader.cs" />
-    <Compile Include="Widgets\ActorPreviewWidget.cs" />
-    <Compile Include="Widgets\TerrainTemplatePreviewWidget.cs" />
     <Compile Include="LoadScreens\LogoStripeLoadScreen.cs" />
     <Compile Include="LoadScreens\BlankLoadScreen.cs" />
     <Compile Include="UtilityCommands\CheckYaml.cs" />
diff --git a/OpenRA.Mods.Common/Widgets/Logic/CreditsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/CreditsLogic.cs
@@ -13,7 +13,7 @@
 using OpenRA.FileSystem;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class CreditsLogic
 	{
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/AddRaceSuffixLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/AddRaceSuffixLogic.cs
@@ -11,7 +11,7 @@
 using System;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class AddRaceSuffixLogic
 	{
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ClassicProductionLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ClassicProductionLogic.cs
@@ -12,11 +12,10 @@
 using System.Linq;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.Common.Widgets;
-using OpenRA.Mods.RA.Widgets;
 using OpenRA.Network;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class ClassicProductionLogic
 	{
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ControlGroupLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ControlGroupLogic.cs
@@ -12,7 +12,7 @@
 using OpenRA.Mods.Common.Widgets;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class ControlGroupLogic
 	{
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/DebugMenuLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/DebugMenuLogic.cs
@@ -10,12 +10,11 @@
 
 using System;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Support;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class DebugMenuLogic
 	{
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/DiplomacyLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/DiplomacyLogic.cs
@@ -10,12 +10,11 @@
 
 using System;
 using System.Linq;
-using OpenRA.Mods.Common.Widgets.Logic;
 using OpenRA.Network;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class DiplomacyLogic
 	{
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoBriefingLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoBriefingLogic.cs
@@ -8,13 +8,9 @@
  */
 #endregion
 
-using System;
-using System.Linq;
-using OpenRA.Mods.RA;
-using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	class GameInfoBriefingLogic
 	{
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoLogic.cs
@@ -10,11 +10,10 @@
 
 using System;
 using System.Linq;
-using OpenRA.Mods.RA;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public enum IngameInfoPanel { AutoSelect, Map, Objectives, Debug }
 
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoObjectivesLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoObjectivesLogic.cs
@@ -15,11 +15,11 @@
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	class GameInfoObjectivesLogic
 	{
-		ContainerWidget template;
+		readonly ContainerWidget template;
 
 		[ObjectCreator.UseCtor]
 		public GameInfoObjectivesLogic(Widget widget, World world)
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoStatsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoStatsLogic.cs
@@ -13,7 +13,7 @@
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	class GameInfoStatsLogic
 	{
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameTimerLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameTimerLogic.cs
@@ -12,7 +12,7 @@
 using OpenRA.Network;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class GameTimerLogic
 	{
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameCashCounterLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameCashCounterLogic.cs
@@ -8,11 +8,10 @@
  */
 #endregion
 
-using OpenRA.Mods.Common.Widgets;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class IngameCashCounterLogic
 	{
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameMenuLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameMenuLogic.cs
@@ -11,10 +11,9 @@
 using System;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.Common.Widgets;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class IngameMenuLogic
 	{
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngamePowerBarLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngamePowerBarLogic.cs
@@ -10,10 +10,9 @@
 
 using System.Drawing;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.Common.Widgets;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class IngamePowerBarLogic
 	{
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs
@@ -10,10 +10,9 @@
 
 using System.Drawing;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.Common.Widgets;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class IngamePowerCounterLogic
 	{
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameSiloBarLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameSiloBarLogic.cs
@@ -9,11 +9,10 @@
 #endregion
 
 using System.Drawing;
-using OpenRA.Mods.Common.Widgets;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class IngameSiloBarLogic
 	{
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/LeaveMapLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/LeaveMapLogic.cs
@@ -17,14 +17,15 @@
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets
+namespace OpenRA.Mods.Common.Widgets
 {
 	class LeaveMapLogic
 	{
+		readonly OrderManager orderManager;
+
 		enum Tab { Objectives, Chat }
 		Tab currentTab;
 
-		OrderManager orderManager;
 		bool newChatMessage;
 
 		[ObjectCreator.UseCtor]
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverShroudSelectorLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverShroudSelectorLogic.cs
@@ -12,11 +12,10 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using OpenRA.Mods.Common.Widgets;
 using OpenRA.Network;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class ObserverShroudSelectorLogic
 	{
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs
@@ -14,14 +14,11 @@
 using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.Common.Widgets;
-using OpenRA.Mods.Common.Widgets.Logic;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Network;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class ObserverStatsLogic
 	{
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/OrderButtonsChromeLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/OrderButtonsChromeLogic.cs
@@ -15,7 +15,7 @@
 using OpenRA.Mods.Common.Widgets;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class OrderButtonsChromeLogic
 	{
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ProductionTooltipLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ProductionTooltipLogic.cs
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ReplayControlBarLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ReplayControlBarLogic.cs
@@ -12,7 +12,7 @@
 using OpenRA.Network;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class ReplayControlBarLogic
 	{
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/SupportPowerBinLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/SupportPowerBinLogic.cs
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/SupportPowerTooltipLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/SupportPowerTooltipLogic.cs
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/WorldTooltipLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/WorldTooltipLogic.cs
@@ -13,7 +13,7 @@
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class WorldTooltipLogic
 	{
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Installation/DownloadPackagesLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Installation/DownloadPackagesLogic.cs
@@ -17,7 +17,7 @@
 using OpenRA.Support;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class DownloadPackagesLogic
 	{
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallFromCDLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallFromCDLogic.cs
@@ -14,16 +14,16 @@
 using System.Threading;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class InstallFromCDLogic
 	{
-		Widget panel;
-		ProgressBarWidget progressBar;
-		LabelWidget statusLabel;
-		Action continueLoading;
-		ButtonWidget retryButton, backButton;
-		Widget installingContainer, insertDiskContainer;
+		readonly Widget panel;
+		readonly ProgressBarWidget progressBar;
+		readonly LabelWidget statusLabel;
+		readonly Action continueLoading;
+		readonly ButtonWidget retryButton, backButton;
+		readonly Widget installingContainer, insertDiskContainer;
 
 		[ObjectCreator.UseCtor]
 		public InstallFromCDLogic(Widget widget, Action continueLoading)
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallLogic.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class InstallLogic : Widget
 	{
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallMusicLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallMusicLogic.cs
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Lobby/SpawnSelectorTooltipLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Lobby/SpawnSelectorTooltipLogic.cs
diff --git a/OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs
diff --git a/OpenRA.Mods.Common/Widgets/Logic/MusicPlayerLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/MusicPlayerLogic.cs
diff --git a/OpenRA.Mods.Common/Widgets/Logic/PerfDebugLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/PerfDebugLogic.cs
diff --git a/OpenRA.Mods.Common/Widgets/Logic/SimpleTooltipLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/SimpleTooltipLogic.cs
diff --git a/OpenRA.Mods.Common/Widgets/ObserverProductionIconsWidget.cs b/OpenRA.Mods.Common/Widgets/ObserverProductionIconsWidget.cs
diff --git a/OpenRA.Mods.Common/Widgets/WorldCommandWidget.cs b/OpenRA.Mods.Common/Widgets/WorldCommandWidget.cs
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`using OpenRA.FileSystem;`
`14`	`14`	`using OpenRA.Widgets;`
`15`	`15`
`16`		`-namespace OpenRA.Mods.RA.Widgets.Logic`
	`16`	`+namespace OpenRA.Mods.Common.Widgets.Logic`
`17`	`17`	`{`
`18`	`18`	`public class CreditsLogic`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`using System;`
`12`	`12`	`using OpenRA.Widgets;`
`13`	`13`
`14`		`-namespace OpenRA.Mods.RA.Widgets.Logic`
	`14`	`+namespace OpenRA.Mods.Common.Widgets.Logic`
`15`	`15`	`{`
`16`	`16`	`public class AddRaceSuffixLogic`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,10 @@`
`12`	`12`	`using System.Linq;`
`13`	`13`	`using OpenRA.Mods.Common.Traits;`
`14`	`14`	`using OpenRA.Mods.Common.Widgets;`
`15`		`-using OpenRA.Mods.RA.Widgets;`
`16`	`15`	`using OpenRA.Network;`
`17`	`16`	`using OpenRA.Widgets;`
`18`	`17`
`19`		`-namespace OpenRA.Mods.RA.Widgets.Logic`
	`18`	`+namespace OpenRA.Mods.Common.Widgets.Logic`
`20`	`19`	`{`
`21`	`20`	`public class ClassicProductionLogic`
`22`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`using OpenRA.Mods.Common.Widgets;`
`13`	`13`	`using OpenRA.Widgets;`
`14`	`14`
`15`		`-namespace OpenRA.Mods.RA.Widgets.Logic`
	`15`	`+namespace OpenRA.Mods.Common.Widgets.Logic`
`16`	`16`	`{`
`17`	`17`	`public class ControlGroupLogic`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,11 @@`
`10`	`10`
`11`	`11`	`using System;`
`12`	`12`	`using OpenRA.Mods.Common.Traits;`
`13`		`-using OpenRA.Mods.RA.Traits;`
`14`	`13`	`using OpenRA.Support;`
`15`	`14`	`using OpenRA.Traits;`
`16`	`15`	`using OpenRA.Widgets;`
`17`	`16`
`18`		`-namespace OpenRA.Mods.RA.Widgets.Logic`
	`17`	`+namespace OpenRA.Mods.Common.Widgets.Logic`
`19`	`18`	`{`
`20`	`19`	`public class DebugMenuLogic`
`21`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,13 +8,9 @@`
`8`	`8`	`*/`
`9`	`9`	`#endregion`
`10`	`10`
`11`		`-using System;`
`12`		`-using System.Linq;`
`13`		`-using OpenRA.Mods.RA;`
`14`		`-using OpenRA.Traits;`
`15`	`11`	`using OpenRA.Widgets;`
`16`	`12`
`17`		`-namespace OpenRA.Mods.RA.Widgets.Logic`
	`13`	`+namespace OpenRA.Mods.Common.Widgets.Logic`
`18`	`14`	`{`
`19`	`15`	`class GameInfoBriefingLogic`
`20`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,11 @@`
`15`	`15`	`using OpenRA.Traits;`
`16`	`16`	`using OpenRA.Widgets;`
`17`	`17`
`18`		`-namespace OpenRA.Mods.RA.Widgets.Logic`
	`18`	`+namespace OpenRA.Mods.Common.Widgets.Logic`
`19`	`19`	`{`
`20`	`20`	`class GameInfoObjectivesLogic`
`21`	`21`	`{`
`22`		`- ContainerWidget template;`
	`22`	`+ readonly ContainerWidget template;`
`23`	`23`
`24`	`24`	`[ObjectCreator.UseCtor]`
`25`	`25`	`public GameInfoObjectivesLogic(Widget widget, World world)`
Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,10 @@`
`8`	`8`	`*/`
`9`	`9`	`#endregion`
`10`	`10`
`11`		`-using OpenRA.Mods.Common.Widgets;`
`12`	`11`	`using OpenRA.Traits;`
`13`	`12`	`using OpenRA.Widgets;`
`14`	`13`
`15`		`-namespace OpenRA.Mods.RA.Widgets.Logic`
	`14`	`+namespace OpenRA.Mods.Common.Widgets.Logic`
`16`	`15`	`{`
`17`	`16`	`public class IngameCashCounterLogic`
`18`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,9 @@`
`11`	`11`	`using System;`
`12`	`12`	`using OpenRA.Graphics;`
`13`	`13`	`using OpenRA.Mods.Common.Traits;`
`14`		`-using OpenRA.Mods.Common.Widgets;`
`15`	`14`	`using OpenRA.Widgets;`
`16`	`15`
`17`		`-namespace OpenRA.Mods.RA.Widgets.Logic`
	`16`	`+namespace OpenRA.Mods.Common.Widgets.Logic`
`18`	`17`	`{`
`19`	`18`	`public class IngameMenuLogic`
`20`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,9 @@`
`10`	`10`
`11`	`11`	`using System.Drawing;`
`12`	`12`	`using OpenRA.Mods.Common.Traits;`
`13`		`-using OpenRA.Mods.Common.Widgets;`
`14`	`13`	`using OpenRA.Widgets;`
`15`	`14`
`16`		`-namespace OpenRA.Mods.RA.Widgets.Logic`
	`15`	`+namespace OpenRA.Mods.Common.Widgets.Logic`
`17`	`16`	`{`
`18`	`17`	`public class IngamePowerBarLogic`
`19`	`18`	`{`