epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5419 from pchote/news

Browse Source 
Ingame news tweaks
This commit is contained in:
Matthias Mailänder
2014-05-24 10:19:20 +02:00
parent cb1a222fd5 59993653aa
commit aed5c0d4ce
12 changed files with 165 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
mods/cnc/chrome/dialogs.yaml
View File

@@ -66,6 +66,7 @@ ScrollPanel@TEAM_DROPDOWN_TEMPLATE:
ScrollPanel@SPAWN_DROPDOWN_TEMPLATE:
Width: DROPDOWN_WIDTH
Background: panel-black
Children:
ScrollItem@TEMPLATE:
Width: PARENT_RIGHT-27
@@ -200,3 +201,38 @@ Container@TEXT_INPUT_PROMPT:
Text: Cancel
Font: Bold
Key: escape
ScrollPanel@NEWS_PANEL:
Width: 400
Height: 265
Background: panel-black
ItemSpacing: 5
Children:
Container@NEWS_ITEM_TEMPLATE:
X: 10
Y: 5
Width: PARENT_RIGHT - 40
Height: 45
Children:
Label@TITLE:
Width: PARENT_RIGHT
Height: 25
Align: Center
Font: Bold
Label@AUTHOR_DATETIME:
Y: 25
Width: PARENT_RIGHT
Height: 15
Align: Center
Text: by {0} at {1}
Font: TinyBold
Label@CONTENT:
Y: 45
Width: PARENT_RIGHT
Label@NEWS_STATUS:
X: 80
Y: 0
Width: PARENT_RIGHT - 80 - 80 - 24
Height: PARENT_BOTTOM
Align: Center
VAlign: Middle

78
mods/cnc/chrome/mainmenu.yaml
View File

@@ -184,81 +184,15 @@ Container@MENU_BACKGROUND:
Width: 140
Height: 35
Text: Back
Container@COLLAPSED_NEWS_BG:
X: WINDOW_RIGHT - WIDTH - 55
Y: 136
Width: 140
Height: 45
Container@NEWS_BG:
Children:
DropDownButton@SHOW_NEWS_BUTTON:
X: PARENT_RIGHT - WIDTH
Y: 10
Width: 120
DropDownButton@NEWS_BUTTON:
X: (WINDOW_RIGHT - WIDTH)/2
Y: 50
Width: 400
Height: 25
Text: Show News
Text: Battlefield News
Font: Bold
Background@NEWS_BG:
X: WINDOW_RIGHT - WIDTH - 55
Y: 170
Width: 500
Height: 265
Background: panel-black
Children:
Label@NEWS_TITLE:
X: 0
Y: 0 - 40
Width: PARENT_RIGHT
Height: 30
Text: News
Align: Center
Font: BigBold
Contrast: True
DropDownButton@HIDE_NEWS_BUTTON:
X: PARENT_RIGHT - WIDTH
Y: 0 - 24
Width: 120
Height: 25
Text: Hide News
Font: Bold
ScrollPanel@NEWS_PANEL:
X: 15
Y: 15
Width: PARENT_RIGHT - 30
Height: 235
ItemSpacing: 5
Children:
Container@NEWS_ITEM_TEMPLATE:
X: 5
Y: 5
Width: PARENT_RIGHT - 30
Height: 45
Children:
Label@TITLE:
X: 0
Y: 0
Width: PARENT_RIGHT
Height: 25
Align: Center
Font: Bold
Label@AUTHOR_DATETIME:
X: 0
Y: 25
Width: PARENT_RIGHT
Height: 15
Align: Center
Text: by {0} at {1}
Font: TinyBold
Label@CONTENT:
X: 0
Y: 45
Width: PARENT_RIGHT
Label@NEWS_STATUS:
X: 80
Y: 0
Width: PARENT_RIGHT - 80 - 80 - 24
Height: PARENT_BOTTOM
Align: Center
VAlign: Middle
Container@PERFORMANCE_INFO:
Logic: PerfDebugLogic
Children:

2
mods/cnc/mod.yaml
View File

@@ -191,4 +191,4 @@ Missions:
SupportsMapsFrom: cnc
NewsUrl: https://raw.githubusercontent.com/OpenRA/OpenRAWeb/master/content/news/ingame-news.yaml
NewsUrl: http://open-ra.org/gamenews

33
mods/d2k/chrome/dropdowns.yaml
View File

@@ -95,3 +95,36 @@ ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE:
Width: PARENT_RIGHT
Height: 25
ScrollPanel@NEWS_PANEL:
Width: 370
Height: 265
ItemSpacing: 5
Children:
Container@NEWS_ITEM_TEMPLATE:
X: 10
Y: 5
Width: PARENT_RIGHT - 40
Height: 45
Children:
Label@TITLE:
Width: PARENT_RIGHT
Height: 25
Align: Center
Font: Bold
Label@AUTHOR_DATETIME:
Y: 25
Width: PARENT_RIGHT
Height: 15
Align: Center
Text: by {0} at {1}
Font: TinyBold
Label@CONTENT:
Y: 45
Width: PARENT_RIGHT
Label@NEWS_STATUS:
X: 80
Y: 0
Width: PARENT_RIGHT - 80 - 80 - 24
Height: PARENT_BOTTOM
Align: Center
VAlign: Middle

73
mods/d2k/chrome/mainmenu.yaml
View File

@@ -149,72 +149,19 @@ Container@MAINMENU:
Height: 30
Text: Back
Font: Bold
Background@COLLAPSED_NEWS_BG:
X: WINDOW_RIGHT - WIDTH - 20
Y: 20
Width: 140
Height: 45
Children:
DropDownButton@SHOW_NEWS_BUTTON:
X: PARENT_RIGHT - WIDTH - 10
Y: 10
Width: 120
Height: 25
Text: Show News
Font: Bold
Background@NEWS_BG:
X: WINDOW_RIGHT - WIDTH - 20
Y: 20
Width: 500
Height: 300
X: (WINDOW_RIGHT - WIDTH)/2
Y: 35
Width: 400
Height: 55
Children:
Label@NEWS_TITLE:
X: 0
Y: 20
Width: PARENT_RIGHT
Height: 30
Text: News
Align: Center
Font: Bold
DropDownButton@HIDE_NEWS_BUTTON:
X: PARENT_RIGHT - WIDTH - 10
Y: 10
Width: 120
Height: 25
Text: Hide News
Font: Bold
ScrollPanel@NEWS_PANEL:
DropDownButton@NEWS_BUTTON:
X: 15
Y: 50
Width: PARENT_RIGHT - 30
Height: 235
ItemSpacing: 5
Children:
Container@NEWS_ITEM_TEMPLATE:
X: 5
Y: 5
Width: PARENT_RIGHT - 30
Height: 45
Children:
Label@TITLE:
X: 0
Y: 0
Width: PARENT_RIGHT
Height: 25
Align: Center
Font: Bold
Label@AUTHOR_DATETIME:
X: 0
Y: 25
Width: PARENT_RIGHT
Height: 15
Align: Center
Text: by {0} at {1}
Font: TinyBold
Label@CONTENT:
X: 0
Y: 45
Width: PARENT_RIGHT
Y: 15
Width: 370
Height: 25
Text: Battlefield News
Font: Bold
Label@NEWS_STATUS:
X: 80
Y: 0

2
mods/d2k/mod.yaml
View File

@@ -170,4 +170,4 @@ LuaScripts:
SupportsMapsFrom: d2k
NewsUrl: https://raw.githubusercontent.com/OpenRA/OpenRAWeb/master/content/news/ingame-news.yaml
NewsUrl: http://open-ra.org/gamenews

33
mods/ra/chrome/dropdowns.yaml
View File

@@ -95,3 +95,36 @@ ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE:
Width: PARENT_RIGHT
Height: 25
ScrollPanel@NEWS_PANEL:
Width: 370
Height: 265
ItemSpacing: 5
Children:
Container@NEWS_ITEM_TEMPLATE:
X: 10
Y: 5
Width: PARENT_RIGHT - 40
Height: 45
Children:
Label@TITLE:
Width: PARENT_RIGHT
Height: 25
Align: Center
Font: Bold
Label@AUTHOR_DATETIME:
Y: 25
Width: PARENT_RIGHT
Height: 15
Align: Center
Text: by {0} at {1}
Font: TinyBold
Label@CONTENT:
Y: 45
Width: PARENT_RIGHT
Label@NEWS_STATUS:
X: 80
Y: 0
Width: PARENT_RIGHT - 80 - 80 - 24
Height: PARENT_BOTTOM
Align: Center
VAlign: Middle

80
mods/ra/chrome/mainmenu.yaml
View File

@@ -184,76 +184,16 @@ Container@MAINMENU:
Y: 5
Width: 200
Height: 200
Background@COLLAPSED_NEWS_BG:
X: WINDOW_RIGHT - WIDTH - 100
Y: 320
Width: 140
Height: 45
Children:
DropDownButton@SHOW_NEWS_BUTTON:
X: PARENT_RIGHT - WIDTH - 10
Y: 10
Width: 120
Height: 25
Text: Show News
Font: Bold
Background@NEWS_BG:
X: WINDOW_RIGHT - WIDTH - 100
Y: 320
Width: 500
Height: 300
X: (WINDOW_RIGHT - WIDTH)/2
Y: 35
Width: 400
Height: 55
Children:
Label@NEWS_TITLE:
X: 0
Y: 20
Width: PARENT_RIGHT
Height: 30
Text: News
Align: Center
Font: Bold
DropDownButton@HIDE_NEWS_BUTTON:
X: PARENT_RIGHT - WIDTH - 10
Y: 10
Width: 120
Height: 25
Text: Hide News
Font: Bold
ScrollPanel@NEWS_PANEL:
DropDownButton@NEWS_BUTTON:
X: 15
Y: 50
Width: PARENT_RIGHT - 30
Height: 235
ItemSpacing: 5
Children:
Container@NEWS_ITEM_TEMPLATE:
X: 5
Y: 5
Width: PARENT_RIGHT - 30
Height: 45
Children:
Label@TITLE:
X: 0
Y: 0
Width: PARENT_RIGHT
Height: 25
Align: Center
Font: Bold
Label@AUTHOR_DATETIME:
X: 0
Y: 25
Width: PARENT_RIGHT
Height: 15
Align: Center
Text: by {0} at {1}
Font: TinyBold
Label@CONTENT:
X: 0
Y: 45
Width: PARENT_RIGHT
Label@NEWS_STATUS:
X: 80
Y: 0
Width: PARENT_RIGHT - 80 - 80 - 24
Height: PARENT_BOTTOM
Align: Center
VAlign: Middle
Y: 15
Width: 370
Height: 25
Text: Battlefield News
Font: Bold

2
mods/ra/mod.yaml
View File

@@ -189,4 +189,4 @@ Missions:
SupportsMapsFrom: ra
NewsUrl: https://raw.githubusercontent.com/OpenRA/OpenRAWeb/master/content/news/ingame-news.yaml
NewsUrl: http://open-ra.org/gamenews

2
mods/ts/mod.yaml
View File

@@ -210,4 +210,4 @@ LuaScripts:
SupportsMapsFrom: ts
NewsUrl: https://raw.githubusercontent.com/OpenRA/OpenRAWeb/master/content/news/ingame-news.yaml
NewsUrl: http://open-ra.org/gamenews