Rename modchooser to modcontent.

Makefile

@@ -313,12 +313,11 @@ dependencies: $(os-dependencies)
 
 all-dependencies: cli-dependencies windows-dependencies osx-dependencies
 
-version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mod.yaml mods/modchooser/mod.yaml mods/all/mod.yaml
+version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mod.yaml mods/modcontent/mod.yaml mods/all/mod.yaml
 	@for i in $? ; do \
 		awk '{sub("Version:.*$$","Version: $(VERSION)"); print $0}' $${i} > $${i}.tmp && \
-		awk '{sub("\tmodchooser:.*$$","\tmodchooser: $(VERSION)"); print $0}' $${i}.tmp > $${i}.tmp2 && \
+		awk '{sub("/[^/]*: User$$", "/$(VERSION): User"); print $0}' $${i}.tmp > $${i} && \
-		awk '{sub("/[^/]*: User$$", "/$(VERSION): User"); print $0}' $${i}.tmp2 > $${i} && \
+		rm $${i}.tmp; \
-		rm $${i}.tmp $${i}.tmp2; \
 	done
 
 docs: utility mods version
@@ -344,7 +343,7 @@ install-core: default
 	@$(CP_R) mods/ra "$(DATA_INSTALL_DIR)/mods/"
 	@$(CP_R) mods/d2k "$(DATA_INSTALL_DIR)/mods/"
 	@$(INSTALL_PROGRAM) $(mod_d2k_TARGET) "$(DATA_INSTALL_DIR)/mods/d2k"
-	@$(CP_R) mods/modchooser "$(DATA_INSTALL_DIR)/mods/"
+	@$(CP_R) mods/modcontent "$(DATA_INSTALL_DIR)/mods/"
 
 	@$(INSTALL_DATA) "global mix database.dat" "$(DATA_INSTALL_DIR)/global mix database.dat"
 	@$(INSTALL_DATA) "GeoLite2-Country.mmdb.gz" "$(DATA_INSTALL_DIR)/GeoLite2-Country.mmdb.gz"

OpenRA.Mods.Common/LoadScreens/ModContentLoadScreen.cs

@@ -56,7 +56,7 @@ namespace OpenRA.Mods.Common.LoadScreens
 
 			var content = selectedMod.Get<ModContent>(Game.ModData.ObjectCreator);
 
-			Ui.LoadWidget("MODCHOOSER_BACKGROUND", Ui.Root, new WidgetArgs());
+			Ui.LoadWidget("MODCONTENT_BACKGROUND", Ui.Root, new WidgetArgs());
 
 			if (!IsModInstalled(content))
 			{

OpenRA.Mods.Common/ModContent.cs

@@ -85,7 +85,7 @@ namespace OpenRA
 		public readonly string InstallPromptMessage;
 		public readonly string QuickDownload;
 		public readonly string HeaderMessage;
-		public readonly string ContentInstallerMod = "modchooser";
+		public readonly string ContentInstallerMod = "modcontent";
 
 		[FieldLoader.LoadUsing("LoadPackages")]
 		public readonly Dictionary<string, ModPackage> Packages = new Dictionary<string, ModPackage>();

OpenRA.Mods.Common/Widgets/Logic/MainMenuLogic.cs

@@ -93,7 +93,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 				// so we can't do this inside the input handler.
 				Game.RunAfterTick(() =>
 				{
-					Game.InitializeMod("modchooser", new Arguments(new[] { "Content.Mod=" + modData.Manifest.Id }));
+					Game.InitializeMod("modcontent", new Arguments(new[] { "Content.Mod=" + modData.Manifest.Id }));
 				});
 			};
 
@@ -287,7 +287,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 					{
 						// Send the mod and engine version to support version-filtered news (update prompts)
 						newsURL += "?version={0}&mod={1}&modversion={2}".F(
-							Uri.EscapeUriString(Game.Mods["modchooser"].Metadata.Version),
+							Uri.EscapeUriString(Game.Mods["modcontent"].Metadata.Version),
 							Uri.EscapeUriString(Game.ModData.Manifest.Id),
 							Uri.EscapeUriString(Game.ModData.Manifest.Metadata.Version));
 

OpenRA.Mods.Common/Widgets/Logic/MultiplayerLogic.cs

@@ -326,7 +326,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			};
 
 			var queryURL = services.ServerList + "games?version={0}&mod={1}&modversion={2}".F(
-				Uri.EscapeUriString(Game.Mods["modchooser"].Metadata.Version),
+				Uri.EscapeUriString(Game.Mods["modcontent"].Metadata.Version),
 				Uri.EscapeUriString(Game.ModData.Manifest.Id),
 				Uri.EscapeUriString(Game.ModData.Manifest.Metadata.Version));
 

make.ps1

@@ -74,16 +74,12 @@ function Version-Command
 	
 	if ($version -ne $null)
 	{
-		$mods = @("mods/ra/mod.yaml", "mods/cnc/mod.yaml", "mods/d2k/mod.yaml", "mods/ts/mod.yaml", "mods/modchooser/mod.yaml", "mods/all/mod.yaml")
+		$mods = @("mods/ra/mod.yaml", "mods/cnc/mod.yaml", "mods/d2k/mod.yaml", "mods/ts/mod.yaml", "mods/modcontent/mod.yaml", "mods/all/mod.yaml")
 		foreach ($mod in $mods)
 		{
 			$replacement = (gc $mod) -Replace "Version:.*", ("Version: {0}" -f $version)
 			sc $mod $replacement
 
-			# The tab is a workaround for not replacing inside of "Packages:"
-			$replacement = (gc $mod) -Replace "	modchooser:.*", ("	modchooser: {0}" -f $version)
-			sc $mod $replacement
-
 			$prefix = $(gc $mod) | Where { $_.ToString().EndsWith(": User") }
 			if ($prefix -and $prefix.LastIndexOf("/") -ne -1)
 			{

mods/modcontent/chrome.yaml

@@ -155,7 +155,7 @@ panel-rule: chrome.png
 background: chrome.png
 	background:0,0,1024,480
 
-modchooser: chrome.png
+modcontent: chrome.png
 	logo: 0,576,280,128
 	leftarrow:384,512,20,64
 	rightarrow:404,512,20,64

mods/modcontent/content.yaml

@@ -56,7 +56,7 @@ Background@CONTENT_PANEL:
 							Y: 1
 							Width: 20
 							Height: 20
-							ImageCollection: modchooser
+							ImageCollection: modcontent
 							ImageName: cdicon
 							TooltipContainer: TOOLTIP_CONTAINER
 							TooltipTemplate: DISC_TOOLTIP
@@ -341,7 +341,7 @@ Background@CONTENT_PROMPT_PANEL:
 			Font: Bold
 			Key: escape
 
-Background@MODCHOOSER_BACKGROUND:
+Background@MODCONTENT_BACKGROUND:
 	Background: background
 	Width: WINDOW_RIGHT
 	Height: WINDOW_BOTTOM

mods/modcontent/mod.yaml

@@ -6,30 +6,30 @@ Metadata:
 
 Packages:
 	.
-	./mods/modchooser: modchooser
+	./mods/modcontent: modcontent
 	./mods/common: common
 
 Cursors:
-	modchooser|cursors.yaml
+	modcontent|cursors.yaml
 
 Chrome:
-	modchooser|chrome.yaml
+	modcontent|chrome.yaml
 
 Assemblies:
 	common|OpenRA.Mods.Common.dll
 
 ChromeLayout:
-	modchooser|content.yaml
+	modcontent|content.yaml
 
 Notifications:
-	modchooser|notifications.yaml
+	modcontent|notifications.yaml
 
 LoadScreen: ModContentLoadScreen
-	Image: ./mods/modchooser/chrome.png
+	Image: ./mods/modcontent/chrome.png
 
 ChromeMetrics:
 	common|metrics.yaml
-	modchooser|metrics.yaml
+	modcontent|metrics.yaml
 
 Fonts:
 	Regular:

packaging/linux/openra.appdata.xml

@@ -26,10 +26,6 @@
   </description>
   <screenshots>
     <screenshot type="default">
-      <image>http://www.openra.net/images/appdata/modchooser.png</image>
-      <caption>Mod selection screen</caption>
-    </screenshot>
-    <screenshot>
       <image>http://www.openra.net/images/appdata/ingame-ra.png</image>
       <caption>Red Alert mod</caption>
     </screenshot>

packaging/package-all.sh

@@ -33,7 +33,7 @@ markdown Lua-API.md > Lua-API.html
 # List of files that are packaged on all platforms
 FILES=('OpenRA.Game.exe' 'OpenRA.Game.exe.config' 'OpenRA.Utility.exe' 'OpenRA.Server.exe' 
 'OpenRA.Platforms.Default.dll' \
-'lua' 'glsl' 'mods/common' 'mods/ra' 'mods/cnc' 'mods/d2k' 'mods/modchooser' \
+'lua' 'glsl' 'mods/common' 'mods/ra' 'mods/cnc' 'mods/d2k' 'mods/modcontent' \
 'AUTHORS' 'COPYING' 'README.html' 'CONTRIBUTING.html' 'DOCUMENTATION.html' 'CHANGELOG.html' \
 'global mix database.dat' 'GeoLite2-Country.mmdb.gz')
 

packaging/windows/OpenRA.nsi

@@ -79,7 +79,7 @@ Section "Game" GAME
 	File /r "${SRCDIR}\mods\cnc"
 	File /r "${SRCDIR}\mods\d2k"
 	File /r "${SRCDIR}\mods\ra"
-	File /r "${SRCDIR}\mods\modchooser"
+	File /r "${SRCDIR}\mods\modcontent"
 
 	SetOutPath "$INSTDIR"
 	File "${SRCDIR}\OpenRA.exe"

utility.cmd

@@ -7,12 +7,6 @@ call OpenRA.Utility.exe
 echo Enter --exit to exit
 set /P mod=Please enter a modname: OpenRA.Utility.exe 
 if /I "%mod%" EQU "--exit" (exit)
-if /I "%mod%" EQU "modchooser" (
-echo.
-echo Sorry, this mod isn't available at the moment!
-echo.
-goto choosemod
-)
 if /I "%mod%" EQU "ra" (goto help)
 if /I "%mod%" EQU "cnc" (goto help)
 if /I "%mod%" EQU "ts" (goto help)