Merge pull request #9263 from penev92/assetInstallation

Move asset installation to the ModChooser
This commit is contained in:
Paul Chote
2015-09-26 10:40:04 +01:00
33 changed files with 507 additions and 857 deletions

View File

@@ -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 Red Alert 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 Red Alert 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 Red Alert 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

View File

@@ -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

View File

@@ -77,7 +77,6 @@ Assemblies:
./mods/cnc/OpenRA.Mods.Cnc.dll
ChromeLayout:
./mods/ra/chrome/install.yaml
./mods/ra/chrome/ingame.yaml
./mods/ra/chrome/ingame-chat.yaml
./mods/ra/chrome/ingame-diplomacy.yaml
@@ -141,9 +140,7 @@ LoadScreen: LogoStripeLoadScreen
Text: Filling Crates..., Charging Capacitors..., Reticulating Splines..., Planting Trees..., Building Bridges..., Aging Empires..., Compiling EVA..., Constructing Pylons..., Activating Skynet..., Splitting Atoms...
ContentInstaller:
MenuWidget: INSTALL_PANEL
MusicMenuWidget: INSTALL_MUSIC_PANEL
TestFiles: allies.mix, conquer.mix, interior.mix, redalert.mix, russian.mix, snow.mix, sounds.mix, temperat.mix
TestFiles: ^Content/ra/allies.mix, ^Content/ra/conquer.mix, ^Content/ra/interior.mix, ^Content/ra/redalert.mix, ^Content/ra/russian.mix, ^Content/ra/snow.mix, ^Content/ra/sounds.mix, ^Content/ra/temperat.mix
PackageMirrorList: http://www.openra.net/packages/ra-mirrors.txt
DiskTestFiles: MAIN.MIX, INSTALL/REDALERT.MIX
PackageToExtractFromCD: MAIN.MIX