Allow mission use LobbyOptions as options and remove unused translation

This commit is contained in:
dnqbob
2023-06-20 20:31:22 +08:00
committed by Matthias Mailänder
parent cd40d150c1
commit b1f5367822
21 changed files with 393 additions and 216 deletions

View File

@@ -67,42 +67,89 @@ Container@MISSIONBROWSER_PANEL:
IgnoreMouseOver: True
IgnoreMouseInput: True
ShowSpawnPoints: False
ScrollPanel@MISSION_DESCRIPTION_PANEL:
Container@MISSION_DETAIL:
Y: 213
Width: PARENT_RIGHT
Height: 157
TopBottomSpacing: 5
Height: 170
Children:
Label@MISSION_DESCRIPTION:
X: 4
Width: PARENT_RIGHT - 32
VAlign: Top
Font: Small
Label@DIFFICULTY_DESC:
Y: PARENT_BOTTOM - HEIGHT
Width: 56
Height: 25
Text: label-mission-info-difficulty-desc
Align: Right
DropDownButton@DIFFICULTY_DROPDOWNBUTTON:
X: 61
Y: PARENT_BOTTOM - HEIGHT
Width: 120
Height: 25
Font: Regular
Label@GAMESPEED_DESC:
X: PARENT_RIGHT - WIDTH - 125
Y: PARENT_BOTTOM - HEIGHT
Width: 120
Height: 25
Text: label-mission-info-gamespeed-desc
Align: Right
DropDownButton@GAMESPEED_DROPDOWNBUTTON:
X: PARENT_RIGHT - WIDTH
Y: PARENT_BOTTOM - HEIGHT
Width: 120
Height: 25
Font: Regular
ScrollPanel@MISSION_DESCRIPTION_PANEL:
Height: PARENT_BOTTOM
Width: PARENT_RIGHT
TopBottomSpacing: 5
Children:
Label@MISSION_DESCRIPTION:
X: 4
Width: PARENT_RIGHT - 32
VAlign: Top
Font: Small
ScrollPanel@MISSION_OPTIONS:
Height: PARENT_BOTTOM
Width: PARENT_RIGHT
TopBottomSpacing: 5
Children:
Container@CHECKBOX_ROW_TEMPLATE:
Width: PARENT_RIGHT
Height: 30
Children:
Checkbox@A:
X: 10
Width: PARENT_RIGHT / 2 - 25
Height: 20
Visible: False
TooltipContainer: TOOLTIP_CONTAINER
Checkbox@B:
X: PARENT_RIGHT / 2 + 5
Width: PARENT_RIGHT / 2 - 25
Height: 20
Visible: False
TooltipContainer: TOOLTIP_CONTAINER
Container@DROPDOWN_ROW_TEMPLATE:
Height: 60
Width: PARENT_RIGHT
Children:
LabelForInput@A_DESC:
X: 10
Width: PARENT_RIGHT / 2 - 35
Height: 20
Visible: False
For: A
DropDownButton@A:
X: 10
Width: PARENT_RIGHT / 2 - 35
Y: 25
Height: 25
Visible: False
TooltipContainer: TOOLTIP_CONTAINER
LabelForInput@B_DESC:
X: PARENT_RIGHT / 2 + 5
Width: PARENT_RIGHT / 2 - 35
Height: 20
Visible: False
For: B
DropDownButton@B:
X: PARENT_RIGHT / 2 + 5
Width: PARENT_RIGHT / 2 - 35
Y: 25
Height: 25
Visible: False
TooltipContainer: TOOLTIP_CONTAINER
Container@MISSION_TABS:
Width: PARENT_RIGHT
Y: PARENT_BOTTOM - 50
Children:
Button@MISSIONINFO_TAB:
Width: PARENT_RIGHT / 2
Y: 25
Height: 28
Font: Bold
Text: button-missionbrowser-panel-mission-info
Button@OPTIONS_TAB:
X: PARENT_RIGHT / 2
Width: PARENT_RIGHT / 2
Y: 25
Height: 28
Font: Bold
Text: button-missionbrowser-panel-mission-options
Button@BACK_BUTTON:
Y: PARENT_BOTTOM - 1
Width: 140

View File

@@ -513,9 +513,9 @@ button-bg-cancel = Back
## missionbrowser.yaml
label-missionbrowser-panel-title = Missions
label-mission-info-difficulty-desc = Difficulty:
label-mission-info-gamespeed-desc = Speed:
button-missionbrowser-panel-back = Back
button-missionbrowser-panel-mission-info = Mission Info
button-missionbrowser-panel-mission-options = Options
button-missionbrowser-panel-start-briefing-video = Watch Briefing
button-missionbrowser-panel-stop-briefing-video = Stop Briefing
button-missionbrowser-panel-start-info-video = Watch Info Video

View File

@@ -4,4 +4,5 @@ dropdown-difficulty =
options-difficulty =
.easy = Easy
.normal = Normal
.hard = Hard

View File

@@ -30,9 +30,6 @@ dropdown-map-creeps =
.label = Creep Actors
.description = Hostile forces spawn on the battlefield
options-difficulty =
.normal = Normal
## Structures
notification-construction-complete = Construction complete.
notification-unit-ready = Unit ready.

View File

@@ -4,5 +4,6 @@ dropdown-difficulty =
options-difficulty =
.easy = Easy
.normal = Normal
.hard = Hard
.tough = Real tough guy

View File

@@ -4,5 +4,6 @@ dropdown-difficulty =
options-difficulty =
.easy = Easy
.normal = Normal
.hard = Hard
.tough = Real tough guy

View File

@@ -61,42 +61,89 @@ Background@MISSIONBROWSER_PANEL:
IgnoreMouseOver: True
IgnoreMouseInput: True
ShowSpawnPoints: False
ScrollPanel@MISSION_DESCRIPTION_PANEL:
Container@MISSION_DETAIL:
Y: 212
Width: PARENT_RIGHT
Height: 143
TopBottomSpacing: 5
Height: 155
Children:
Label@MISSION_DESCRIPTION:
X: 4
Width: PARENT_RIGHT - 32
VAlign: Top
Font: Small
Label@DIFFICULTY_DESC:
Y: PARENT_BOTTOM - HEIGHT
Width: 56
Height: 25
Text: label-mission-info-difficulty-desc
Align: Right
DropDownButton@DIFFICULTY_DROPDOWNBUTTON:
X: 61
Y: PARENT_BOTTOM - HEIGHT
Width: 135
Height: 25
Font: Regular
Label@GAMESPEED_DESC:
X: PARENT_RIGHT - WIDTH - 115
Y: PARENT_BOTTOM - HEIGHT
Width: 120
Height: 25
Text: label-mission-info-gamespeed-desc
Align: Right
DropDownButton@GAMESPEED_DROPDOWNBUTTON:
X: PARENT_RIGHT - WIDTH
Y: PARENT_BOTTOM - HEIGHT
Width: 110
Height: 25
Font: Regular
ScrollPanel@MISSION_DESCRIPTION_PANEL:
Height: PARENT_BOTTOM
Width: PARENT_RIGHT
TopBottomSpacing: 5
Children:
Label@MISSION_DESCRIPTION:
X: 4
Width: PARENT_RIGHT - 32
VAlign: Top
Font: Small
ScrollPanel@MISSION_OPTIONS:
Height: PARENT_BOTTOM
Width: PARENT_RIGHT
TopBottomSpacing: 5
Children:
Container@CHECKBOX_ROW_TEMPLATE:
Width: PARENT_RIGHT
Height: 30
Children:
Checkbox@A:
X: 10
Width: PARENT_RIGHT / 2 - 25
Height: 20
Visible: False
TooltipContainer: TOOLTIP_CONTAINER
Checkbox@B:
X: PARENT_RIGHT / 2 + 5
Width: PARENT_RIGHT / 2 - 25
Height: 20
Visible: False
TooltipContainer: TOOLTIP_CONTAINER
Container@DROPDOWN_ROW_TEMPLATE:
Height: 60
Width: PARENT_RIGHT
Children:
LabelForInput@A_DESC:
X: 10
Width: PARENT_RIGHT / 2 - 35
Height: 20
Visible: False
For: A
DropDownButton@A:
X: 10
Width: PARENT_RIGHT / 2 - 35
Y: 25
Height: 25
Visible: False
TooltipContainer: TOOLTIP_CONTAINER
LabelForInput@B_DESC:
X: PARENT_RIGHT / 2 + 5
Width: PARENT_RIGHT / 2 - 35
Height: 20
Visible: False
For: B
DropDownButton@B:
X: PARENT_RIGHT / 2 + 5
Width: PARENT_RIGHT / 2 - 35
Y: 25
Height: 25
Visible: False
TooltipContainer: TOOLTIP_CONTAINER
Container@MISSION_TABS:
Width: PARENT_RIGHT
Y: PARENT_BOTTOM - 50
Children:
Button@MISSIONINFO_TAB:
Width: PARENT_RIGHT / 2
Y: 25
Height: 28
Font: Bold
Text: button-missionbrowser-panel-mission-info
Button@OPTIONS_TAB:
X: PARENT_RIGHT / 2
Width: PARENT_RIGHT / 2
Y: 25
Height: 28
Font: Bold
Text: button-missionbrowser-panel-mission-options
Button@START_BRIEFING_VIDEO_BUTTON:
X: 20
Y: PARENT_BOTTOM - 45

View File

@@ -368,6 +368,8 @@ button-missionbrowser-panel-start-info-video = Watch Info Video
button-missionbrowser-panel-stop-info-video = Stop Info Video
button-missionbrowser-panel-startgame = Play
button-missionbrowser-panel-back = Back
button-missionbrowser-panel-mission-info = Mission Info
button-missionbrowser-panel-mission-options = Options
## multiplayer-browser.yaml
label-multiplayer-panel-title = Multiplayer

View File

@@ -42,32 +42,34 @@ Background@MISSIONBROWSER_PANEL:
Height: 25
TooltipContainer: TOOLTIP_CONTAINER
TooltipTemplate: SIMPLE_TOOLTIP
Label@DIFFICULTY_DESC:
X: 210 - WIDTH - 125
Y: 468
Width: 56
Button@START_BRIEFING_VIDEO_BUTTON:
X: 20
Y: 455
Width: 190
Height: 25
Text: label-missionbrowser-panel-difficulty-desc
Align: Right
DropDownButton@DIFFICULTY_DROPDOWNBUTTON:
X: 210 - WIDTH
Y: 468
Width: 120
Text: button-missionbrowser-panel-start-briefing-video
Font: Bold
Button@STOP_BRIEFING_VIDEO_BUTTON:
X: 20
Y: 455 + HEIGHT
Width: 190
Height: 25
Font: Regular
Label@GAMESPEED_DESC:
X: 210 - WIDTH - 125
Y: 508
Width: 120
Text: button-missionbrowser-panel-stop-briefing-video
Font: Bold
Button@START_INFO_VIDEO_BUTTON:
X: 20
Y: 455 + 2 * HEIGHT
Width: 190
Height: 25
Text: label-missionbrowser-panel-gamespeed-desc
Align: Right
DropDownButton@GAMESPEED_DROPDOWNBUTTON:
X: 210 - WIDTH
Y: 508
Width: 120
Text: button-missionbrowser-panel-start-info-video
Font: Bold
Button@STOP_INFO_VIDEO_BUTTON:
X: 20
Y: 455 + 3 * HEIGHT
Width: 190
Height: 25
Font: Regular
Text: button-missionbrowser-panel-stop-info-video
Font: Bold
Container@MISSION_INFO:
X: 220
Y: 50
@@ -87,45 +89,90 @@ Background@MISSIONBROWSER_PANEL:
IgnoreMouseOver: True
IgnoreMouseInput: True
ShowSpawnPoints: False
ScrollPanel@MISSION_DESCRIPTION_PANEL:
Container@MISSION_DETAIL:
Y: 337
Width: PARENT_RIGHT
Height: 146
Children:
Label@MISSION_DESCRIPTION:
X: 4
Y: 1
Width: PARENT_RIGHT - 32
VAlign: Top
Font: Small
Button@START_BRIEFING_VIDEO_BUTTON:
ScrollPanel@MISSION_DESCRIPTION_PANEL:
Height: PARENT_BOTTOM
Width: PARENT_RIGHT
TopBottomSpacing: 5
Children:
Label@MISSION_DESCRIPTION:
X: 4
Width: PARENT_RIGHT - 32
VAlign: Top
Font: Small
ScrollPanel@MISSION_OPTIONS:
Height: PARENT_BOTTOM
Width: PARENT_RIGHT
TopBottomSpacing: 5
Children:
Container@CHECKBOX_ROW_TEMPLATE:
Width: PARENT_RIGHT
Height: 30
Children:
Checkbox@A:
X: 10
Width: PARENT_RIGHT / 2 - 25
Height: 20
Visible: False
TooltipContainer: TOOLTIP_CONTAINER
Checkbox@B:
X: PARENT_RIGHT / 2 + 5
Width: PARENT_RIGHT / 2 - 25
Height: 20
Visible: False
TooltipContainer: TOOLTIP_CONTAINER
Container@DROPDOWN_ROW_TEMPLATE:
Height: 60
Width: PARENT_RIGHT
Children:
LabelForInput@A_DESC:
X: 10
Width: PARENT_RIGHT / 2 - 35
Height: 20
Visible: False
For: A
DropDownButton@A:
X: 10
Width: PARENT_RIGHT / 2 - 35
Y: 25
Height: 25
Visible: False
TooltipContainer: TOOLTIP_CONTAINER
LabelForInput@B_DESC:
X: PARENT_RIGHT / 2 + 5
Width: PARENT_RIGHT / 2 - 35
Height: 20
Visible: False
For: B
DropDownButton@B:
X: PARENT_RIGHT / 2 + 5
Width: PARENT_RIGHT / 2 - 35
Y: 25
Height: 25
Visible: False
TooltipContainer: TOOLTIP_CONTAINER
Container@MISSION_TABS:
Width: 320
X: 220
Y: PARENT_BOTTOM - 45
Width: 130
Height: 25
Text: button-missionbrowser-panel-start-briefing-video
Font: Bold
Button@STOP_BRIEFING_VIDEO_BUTTON:
X: 220
Y: PARENT_BOTTOM - 45
Width: 130
Height: 25
Text: button-missionbrowser-panel-stop-briefing-video
Font: Bold
Button@START_INFO_VIDEO_BUTTON:
X: 360
Y: PARENT_BOTTOM - 45
Width: 130
Height: 25
Text: button-missionbrowser-panel-start-info-video
Font: Bold
Button@STOP_INFO_VIDEO_BUTTON:
X: 360
Y: PARENT_BOTTOM - 45
Width: 130
Height: 25
Text: button-missionbrowser-panel-stop-info-video
Font: Bold
Y: PARENT_BOTTOM - 84
Children:
Button@MISSIONINFO_TAB:
Width: PARENT_RIGHT / 2
Y: 25
Height: 28
Font: Bold
Text: button-missionbrowser-panel-mission-info
Button@OPTIONS_TAB:
X: PARENT_RIGHT / 2
Width: PARENT_RIGHT / 2
Y: 25
Height: 28
Font: Bold
Text: button-missionbrowser-panel-mission-options
Button@STARTGAME_BUTTON:
X: PARENT_RIGHT - 140 - 130
Y: PARENT_BOTTOM - 45

View File

@@ -245,8 +245,6 @@ label-update-notice-b = Download the latest version from www.openra.net
## missionbrowser.yaml
label-missionbrowser-panel-title = Missions
label-missionbrowser-panel-difficulty-desc = Difficulty:
label-missionbrowser-panel-gamespeed-desc = Speed:
button-missionbrowser-panel-start-briefing-video = Watch Briefing
button-missionbrowser-panel-stop-briefing-video = Stop Briefing
button-missionbrowser-panel-start-info-video = Watch Info Video

View File

@@ -4,4 +4,5 @@ dropdown-difficulty =
options-difficulty =
.easy = Easy
.normal = Normal
.hard = Hard

View File

@@ -31,9 +31,6 @@ options-starting-units =
.light-support = Light Support
.heavy-support = Heavy Support
options-difficulty =
.normal = Normal
## Arrakis
notification-worm-attack = Worm attack.
notification-worm-sign = Worm sign.

View File

@@ -2,10 +2,6 @@
label-gamesave-loading-screen-title = Loading Saved Game
label-gamesave-loading-screen-desc = Press Escape to cancel loading and return to the main menu
## missionbrowser.yaml
label-mission-info-difficulty-desc = Difficulty:
label-mission-info-gamespeed-desc = Speed:
## ingame-observer.yaml
button-observer-widgets-pause-tooltip = Pause
button-observer-widgets-play-tooltip = Play

View File

@@ -4,4 +4,5 @@ dropdown-difficulty =
options-difficulty =
.easy = Easy
.normal = Normal
.hard = Hard

View File

@@ -32,9 +32,6 @@ options-starting-units =
.light-support = Light Support
.heavy-support = Heavy Support
options-difficulty =
.normal = Normal
## Structures
notification-construction-complete = Construction complete.
notification-unit-ready = Unit ready.

View File

@@ -4,5 +4,6 @@ dropdown-difficulty =
options-difficulty =
.easy = Easy
.normal = Normal
.hard = Hard
.tough = Real tough guy

View File

@@ -4,5 +4,6 @@ dropdown-difficulty =
options-difficulty =
.easy = Easy
.normal = Normal
.hard = Hard
.tough = Real tough guy

View File

@@ -4,5 +4,6 @@ dropdown-difficulty =
options-difficulty =
.easy = Easy
.normal = Normal
.hard = Hard
.tough = Real tough guy

View File

@@ -13,10 +13,6 @@ label-voxel-selector-pitch = Pitch
label-voxel-selector-yaw = Yaw
button-assetbrowser-panel-close = Close
## missionbrowser.yaml
label-mission-info-difficulty-desc = Difficulty:
label-mission-info-gamespeed-desc = Speed:
## color-picker.yaml
button-color-chooser-random = Random
button-color-chooser-store = Store

View File

@@ -29,9 +29,6 @@ dropdown-map-creeps =
.label = Creep Actors
.description = Hostile forces spawn on the battlefield
options-difficulty =
.normal = Normal
## Structures
notification-construction-complete = Construction complete.
notification-unit-ready = Unit ready.