Merge pull request #9263 from penev92/assetInstallation

Move asset installation to the ModChooser

mods/ts/chrome/install.yaml

@@ -1,160 +0,0 @@
-Background@INSTALL_PANEL:
-	Logic: InstallLogic
-	X: (WINDOW_RIGHT - WIDTH)/2
-	Y: (WINDOW_BOTTOM - HEIGHT)/2
-	Width: 500
-	Height: 160
-	Children:
-		Label@TITLE:
-			X: 0
-			Y: 20
-			Width: PARENT_RIGHT
-			Height: 25
-			Text: Install Required
-			Align: Center
-			Font: Bold
-		Label@DESC1:
-			X: 0
-			Y: 50
-			Width: PARENT_RIGHT
-			Height: 25
-			Text: OpenRA requires the original Tiberian Sun game content.
-			Align: Center
-		Label@DESC2:
-			X: 0
-			Y: 70
-			Width: PARENT_RIGHT
-			Height: 25
-			Text: Content can be downloaded, or copied from the install CD.
-			Align: Center
-		Button@DOWNLOAD_BUTTON:
-			X: 20
-			Y: PARENT_BOTTOM - 45
-			Width: 110
-			Height: 25
-			Text: Download
-			Font: Bold
-		Button@INSTALL_BUTTON:
-			X: 140
-			Y: PARENT_BOTTOM - 45
-			Width: 110
-			Height: 25
-			Text: Use CD
-			Font: Bold
-		Button@BACK_BUTTON:
-			X: PARENT_RIGHT - 130
-			Y: PARENT_BOTTOM - 45
-			Width: 110
-			Height: 25
-			Text: Back
-			Font: Bold
-
-Background@INSTALL_DOWNLOAD_PANEL:
-	Logic: DownloadPackagesLogic
-	X: (WINDOW_RIGHT - WIDTH)/2
-	Y: (WINDOW_BOTTOM - HEIGHT)/2
-	Width: 500
-	Height: 160
-	Children:
-		Label@TITLE:
-			X: 0
-			Y: 20
-			Width: PARENT_RIGHT
-			Height: 25
-			Text: Downloading Tiberian Sun Content
-			Align: Center
-			Font: Bold
-		ProgressBar@PROGRESS_BAR:
-			X: 50
-			Y: 55
-			Width: PARENT_RIGHT - 100
-			Height: 25
-		Label@STATUS_LABEL:
-			X: 50
-			Y: 80
-			Width: PARENT_RIGHT - 100
-			Height: 25
-			Align: Left
-		Button@RETRY_BUTTON:
-			X: PARENT_RIGHT - 280
-			Y: PARENT_BOTTOM - 45
-			Width: 120
-			Height: 25
-			Visible: false
-			Text: Retry
-			Font: Bold
-			Key: return
-		Button@CANCEL_BUTTON:
-			X: PARENT_RIGHT - 140
-			Y: PARENT_BOTTOM - 45
-			Width: 120
-			Height: 25
-			Text: Cancel
-			Font: Bold
-			Key: escape
-
-Background@INSTALL_FROMCD_PANEL:
-	Logic: InstallFromCDLogic
-	X: (WINDOW_RIGHT - WIDTH)/2
-	Y: (WINDOW_BOTTOM - HEIGHT)/2
-	Width: 500
-	Height: 160
-	Children:
-		Label@TITLE:
-			X: 0
-			Y: 20
-			Width: PARENT_RIGHT
-			Height: 25
-			Text: Installing from CD
-			Align: Center
-			Font: Bold
-		Container@INSTALLING:
-			Width: PARENT_RIGHT
-			Height: PARENT_BOTTOM
-			Visible: false
-			Children:
-				ProgressBar@PROGRESS_BAR:
-					X: 50
-					Y: 55
-					Width: PARENT_RIGHT - 100
-					Height: 25
-				Label@STATUS_LABEL:
-					X: 50
-					Y: 80
-					Width: PARENT_RIGHT - 100
-					Height: 25
-					Align: Left
-		Container@INSERT_DISK:
-			Width: PARENT_RIGHT
-			Height: PARENT_BOTTOM
-			Visible: false
-			Children:
-				Label@INFO:
-					Y: 50
-					Width: PARENT_RIGHT
-					Height: 25
-					Text: Disk not found.
-					Align: Center
-				Label@INFO2:
-					Y: 70
-					Width: PARENT_RIGHT
-					Height: 25
-					Text: Please insert one of the Tiberian Sun install CDs then click Retry.
-					Align: Center
-		Button@RETRY_BUTTON:
-			X: PARENT_RIGHT - 280
-			Y: PARENT_BOTTOM - 45
-			Width: 120
-			Height: 25
-			Text: Retry
-			Font: Bold
-			Key: return
-		Button@BACK_BUTTON:
-			X: PARENT_RIGHT - 140
-			Y: PARENT_BOTTOM - 45
-			Width: 120
-			Height: 25
-			Text: Back
-			Font: Bold
-			Key: escape
-

mods/ts/metrics.yaml

@@ -7,6 +7,7 @@ Metrics:
 	ButtonTextColorDisabled: 128,128,128
 	ButtonTextContrast: false
 	ButtonTextContrastColor: 0,0,0
+	ButtonBaseLine: 0
 	CheckboxPressedState: false
 	HotkeyFont: Regular
 	HotkeyColor: 255,255,255

mods/ts/mod.yaml

@@ -131,7 +131,6 @@ Assemblies:
 	./mods/ts/OpenRA.Mods.TS.dll
 
 ChromeLayout:
-	./mods/ts/chrome/install.yaml
 	./mods/ra/chrome/ingame.yaml
 	./mods/ra/chrome/ingame-chat.yaml
 	./mods/ra/chrome/ingame-diplomacy.yaml
@@ -189,9 +188,7 @@ LoadScreen: LogoStripeLoadScreen
 	Text: Updating EVA installation..., Changing perspective...
 
 ContentInstaller:
-	MenuWidget: INSTALL_PANEL
-	MusicMenuWidget: INSTALL_MUSIC_PANEL
-	TestFiles: cache.mix, conquer.mix, isosnow.mix, isotemp.mix, local.mix, sidec01.mix, sidec02.mix, sno.mix, snow.mix, sounds.mix, speech01.mix, tem.mix, temperat.mix
+	TestFiles: ^Content/ts/cache.mix, ^Content/ts/conquer.mix, ^Content/ts/isosnow.mix, ^Content/ts/isotemp.mix, ^Content/ts/local.mix, ^Content/ts/sidec01.mix, ^Content/ts/sidec02.mix, ^Content/ts/sno.mix, ^Content/ts/snow.mix, ^Content/ts/sounds.mix, ^Content/ts/speech01.mix, ^Content/ts/tem.mix, ^Content/ts/temperat.mix
 	PackageMirrorList: http://www.openra.net/packages/ts-mirrors.txt
 	DiskTestFiles: MULTI.MIX, INSTALL/TIBSUN.MIX
 	CopyFilesFromCD: