separate ra chrome for better reusability in d2k

This commit is contained in:
Matthias Mailänder
2013-04-15 12:49:06 +02:00
parent 194f8b0dfc
commit 59afc46ab5
12 changed files with 811 additions and 953 deletions

View File

@@ -0,0 +1,66 @@
Background@COLOR_CHOOSER:
Logic:ColorPickerLogic
Background:dialog2
Width:310
Height:120
Children:
Button@SAVE_BUTTON:
X:210
Y:85
Width:90
Height:25
Text:Save
Font:Bold
Button@RANDOM_BUTTON:
X:115
Y:85
Width:90
Height:25
Text:Random
Font:Bold
ShpImage@CARRYALL:
X:220
Y:10
Image:carryall
Palette:colorpicker
Label@HUE_LABEL:
X:0
Y:5
Width:40
Height:20
Align: Right
Text: Hue:
Slider@HUE:
X:43
Y:10
Width:160
Height:20
Ticks:5
Label@SAT_LABEL:
X:0
Y:30
Width:40
Height:20
Align: Right
Text: Sat:
Slider@SAT:
X:43
Y:35
Width:160
Height:20
Ticks:5
Label@LUM_LABEL:
X:0
Y:55
Width:40
Height:20
Align: Right
Text: Lum:
Slider@LUM:
X:43
Y:60
Width:160
Height:20
Ticks:5
MinimumValue: 0.2
MaximumValue: 1

View File

@@ -70,7 +70,7 @@ Container@INGAME_ROOT:
Y:0
Width:160
Height:25
Text:Options
Text:Options (ESC)
Font:Bold
Key: escape
Button@INGAME_DIPLOMACY_BUTTON:
@@ -78,24 +78,27 @@ Container@INGAME_ROOT:
Y:0
Width:160
Height:25
Text:Diplomacy
Text:Diplomacy (F1)
Font:Bold
Key: f1
Button@CHEATS_BUTTON:
X:324
Y:0
Width:160
Height:25
Text:Cheats
Text:Cheats (F2)
Visible:false
Font:Bold
Key: f2
Button@OBJECTIVES_BUTTON:
X:486
Y:0
Width:160
Height:25
Text:Objectives
Text:Objectives (F3)
Visible:false
Font:Bold
Key: f3
RadarBin@INGAME_RADAR_BIN:
WorldInteractionController:INTERACTION_CONTROLLER
PowerBin@INGAME_POWER_BIN:
@@ -200,161 +203,14 @@ Container@INGAME_ROOT:
Text:Diplomacy
Align:Center
Font:Bold
ChatDisplay@CHAT_DISPLAY:
X:250
Y:WINDOW_BOTTOM - HEIGHT - 30
Width: 760
Height: 200
DrawBackground: False
RemoveTime:250
UseContrast: yes
ChatEntry@CHAT_ENTRY:
X:250
Y:WINDOW_BOTTOM - HEIGHT
Width: 760
Height: 30
UseContrast: yes
Background@PERF_BG:
ClickThrough:true
Background:dialog4
Logic:PerfDebugLogic
X:10
Y:WINDOW_BOTTOM - 250
Width: 210
Height: 250
Children:
PerfGraph@GRAPH:
X:5
Y:5
Width:200
Height:200
Label@TEXT:
X:20
Y:205
Width:170
Height:40
Container@OBSERVER_ROOT:
Visible:true
Logic:IngameObserverChromeLogic
Children:
WorldInteractionController@INTERACTION_CONTROLLER:
X:0
Y:0
Width:WINDOW_RIGHT
Height:WINDOW_BOTTOM
ViewportScrollController:
X:0
Y:0
Width:WINDOW_RIGHT
Height:WINDOW_BOTTOM
Timer@GAME_TIMER:
X: WINDOW_RIGHT/2
Y: 0-10
Background@POSTGAME_BG:
X:(WINDOW_RIGHT - WIDTH)/2
Y:(WINDOW_BOTTOM - HEIGHT)/2
Width:400
Height:100
Background:dialog4
Visible:false
Children:
Label@TEXT:
Button@CLOSE_DIPLOMACY:
X:(PARENT_RIGHT - WIDTH)/2
Y:0
Width:200
Height:80
Align:Center
Button@POSTGAME_OBSERVE:
X:10
Y:(PARENT_BOTTOM - HEIGHT - 10)
Width:150
Height:25
Font:Bold
Text:Observe
Button@POSTGAME_QUIT:
X:(PARENT_RIGHT - WIDTH - 10)
Y:(PARENT_BOTTOM - HEIGHT - 10)
Width:150
Height:25
Font:Bold
Text:Leave
SupportPowerBin@INGAME_POWERS_BIN:
X:0
Y:25
Button@INGAME_OPTIONS_BUTTON:
X:0
Y:0
Width:160
Height:25
Text:Options
Font:Bold
Key:escape
WorldTooltip:
Background@INGAME_OPTIONS_BG:
X:(WINDOW_RIGHT - WIDTH)/2
Y:(WINDOW_BOTTOM - HEIGHT)/2
Width:300
Height:295
Visible:false
Children:
Label@LABEL_TITLE:
X:(PARENT_RIGHT - WIDTH)/2
Y:20
Width:250
Height:25
Text:Options
Align:Center
Font:Bold
Button@RESUME:
X:(PARENT_RIGHT - WIDTH)/2
Y:60
Y:350
Width:160
Height:25
Text:Resume
Text:Close
Font:Bold
Key:escape
Button@SETTINGS:
X:(PARENT_RIGHT - WIDTH)/2
Y:100
Width:160
Height:25
Text:Settings
Font:Bold
Button@MUSIC:
X:(PARENT_RIGHT - WIDTH)/2
Y:140
Width:160
Height:25
Text:Music
Font:Bold
Button@SURRENDER:
X:(PARENT_RIGHT - WIDTH)/2
Y:180
Width:160
Height:25
Text:Surrender
Font:Bold
Button@DISCONNECT:
X:(PARENT_RIGHT - WIDTH)/2
Y:220
Width:160
Height:25
Text:Abort Mission
Font:Bold
ChatDisplay@CHAT_DISPLAY:
X:250
Y:WINDOW_BOTTOM - HEIGHT - 30
Width: 760
Height: 200
DrawBackground: False
RemoveTime:250
UseContrast: yes
ChatEntry@CHAT_ENTRY:
X:250
Y:WINDOW_BOTTOM - HEIGHT
Width: 760
Height: 30
UseContrast: yes
Background@PERF_BG:
ClickThrough:true
Background:dialog4
@@ -373,14 +229,4 @@ Container@OBSERVER_ROOT:
X:20
Y:205
Width:170
Height:40
Background@FMVPLAYER:
Width:WINDOW_RIGHT
Height:WINDOW_BOTTOM
Background:dialog4
Children:
VqaPlayer@PLAYER:
X:0
Y:0
Width:WINDOW_RIGHT
Height:WINDOW_BOTTOM
Height:40

View File

@@ -433,70 +433,4 @@ Background@SERVER_LOBBY:
Width:120
Height:25
Text:Start Game
Font:Bold
Background@COLOR_CHOOSER:
Logic:ColorPickerLogic
Background:dialog2
Width:310
Height:120
Children:
Button@SAVE_BUTTON:
X:210
Y:85
Width:90
Height:25
Text:Save
Font:Bold
Button@RANDOM_BUTTON:
X:115
Y:85
Width:90
Height:25
Text:Random
Font:Bold
ShpImage@CARRYALL:
X:220
Y:10
Image:carryall
Palette:colorpicker
Label@HUE_LABEL:
X:0
Y:5
Width:40
Height:20
Align: Right
Text: Hue:
Slider@HUE:
X:43
Y:10
Width:160
Height:20
Ticks:5
Label@SAT_LABEL:
X:0
Y:30
Width:40
Height:20
Align: Right
Text: Sat:
Slider@SAT:
X:43
Y:35
Width:160
Height:20
Ticks:5
Label@LUM_LABEL:
X:0
Y:55
Width:40
Height:20
Align: Right
Text: Lum:
Slider@LUM:
X:43
Y:60
Width:160
Height:20
Ticks:5
MinimumValue: 0.2
MaximumValue: 1
Font:Bold

View File

@@ -47,9 +47,12 @@ ChromeLayout:
mods/d2k/chrome/gameinit.yaml
mods/d2k/chrome/ingame.yaml
mods/ra/chrome/ingame-chat.yaml
mods/ra/chrome/ingame-observer.yaml
mods/ra/chrome/ingame-fmvplayer.yaml
mods/d2k/chrome/mainmenu.yaml
mods/ra/chrome/settings.yaml
mods/d2k/chrome/lobby.yaml
mods/d2k/chrome/color-picker.yaml
mods/ra/chrome/map-chooser.yaml
mods/ra/chrome/create-server.yaml
mods/ra/chrome/serverbrowser.yaml