start reducing differences between cnc and ra mapchoosers

OpenRA.Game/Widgets/WidgetUtils.cs

@@ -221,6 +221,15 @@ namespace OpenRA.Widgets
 			var mod = Game.modData.Manifest.Mods[0];
 			return Mod.AllMods[mod].Title;
 		}
+
+		public static string ChooseInitialMap(string map)
+		{
+			var availableMaps = Game.modData.AvailableMaps;
+			if (string.IsNullOrEmpty(map) || !availableMaps.ContainsKey(map))
+				return availableMaps.First(m => m.Value.Selectable).Key;
+
+			return map;
+		}
 	}
 
 	[Flags]

OpenRA.Mods.Cnc/Widgets/CncWidgetUtils.cs

@@ -17,15 +17,6 @@ namespace OpenRA.Mods.Cnc.Widgets
 {
 	public static class CncWidgetUtils
 	{
-		public static string ChooseInitialMap(string map)
-		{
-			var availableMaps = Game.modData.AvailableMaps;
-			if (string.IsNullOrEmpty(map) || !availableMaps.ContainsKey(map))
-				return availableMaps.First(m => m.Value.Selectable).Key;
-
-			return map;
-		}
-
 		public static void PromptConfirmAction(string title, string text, Action onConfirm, Action onCancel)
 		{
 			var prompt = Widget.OpenWindow("CONFIRM_PROMPT");

OpenRA.Mods.Cnc/Widgets/Logic/CncMapChooserLogic.cs

@@ -26,7 +26,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
 		                            [ObjectCreator.Param] Action onExit,
 		                            [ObjectCreator.Param] Action<Map> onSelect)
 		{
-			map = Game.modData.AvailableMaps[ CncWidgetUtils.ChooseInitialMap(initialMap) ];
+			map = Game.modData.AvailableMaps[ WidgetUtils.ChooseInitialMap(initialMap) ];
 
 			var panel = widget.GetWidget("MAPCHOOSER_PANEL");
 

OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs

@@ -143,7 +143,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
 
 		void StartSkirmishGame()
 		{
-			var map = CncWidgetUtils.ChooseInitialMap(Game.Settings.Server.Map);
+			var map = WidgetUtils.ChooseInitialMap(Game.Settings.Server.Map);
 
 			CncConnectingLogic.Connect(IPAddress.Loopback.ToString(),
 			                           Game.CreateLocalServer(map),

OpenRA.Mods.Cnc/Widgets/Logic/CncServerCreationLogic.cs

@@ -47,7 +47,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
 				});
 			};
 
-			map = Game.modData.AvailableMaps[ CncWidgetUtils.ChooseInitialMap(Game.Settings.Server.Map) ];
+			map = Game.modData.AvailableMaps[ WidgetUtils.ChooseInitialMap(Game.Settings.Server.Map) ];
 
 			panel.GetWidget<MapPreviewWidget>("MAP_PREVIEW").Map = () => map;
 			panel.GetWidget<LabelWidget>("MAP_NAME").GetText = () => map.Title;

OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs

@@ -31,7 +31,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			else
 				Map = Game.modData.AvailableMaps.FirstOrDefault(m => m.Value.Selectable).Value;
 
-			bg.GetWidget<MapPreviewWidget>("MAPCHOOSER_MAP_PREVIEW").Map = () => Map;
+			bg.GetWidget<MapPreviewWidget>("MAP_PREVIEW").Map = () => Map;
 			bg.GetWidget<LabelWidget>("CURMAP_TITLE").GetText = () => Map.Title;
 			bg.GetWidget<LabelWidget>("CURMAP_AUTHOR").GetText = () => Map.Author;
 			bg.GetWidget<LabelWidget>("CURMAP_DESC").GetText = () => Map.Description;

mods/ra/chrome/map-chooser.yaml

@@ -78,8 +78,8 @@ Background@MAP_CHOOSER:
 			Height:252
 			Background:dialog3
 			Children:
-				MapPreview@MAPCHOOSER_MAP_PREVIEW:
+				MapPreview@MAP_PREVIEW:
-					Id:MAPCHOOSER_MAP_PREVIEW
+					Id:MAP_PREVIEW
 					X:4
 					Y:4
 					Width:244