Normalize ButtonWidgets

This commit is contained in:
Paul Chote
2011-05-16 21:57:41 +12:00
parent 3eb3ae76f0
commit eb8aafced0
33 changed files with 224 additions and 198 deletions

View File

@@ -67,21 +67,21 @@ Container@CHEATS_PANEL:
Width:200
Height:20
Text:Show Unit Paths
CncMenuButton@CLOSE_BUTTON:
Button@CLOSE_BUTTON:
Id:CLOSE_BUTTON
X:0
Y:109
Width:140
Height:35
Text:Close
CncMenuButton@GIVE_CASH:
Button@GIVE_CASH:
Id:GIVE_CASH_BUTTON
X:300
Y:109
Width:140
Height:35
Text:Give Cash
CncMenuButton@GIVE_EXPLORATION:
Button@GIVE_EXPLORATION:
Id:GIVE_EXPLORATION_BUTTON
X:450
Y:109

View File

@@ -26,7 +26,7 @@ Container@CONNECTING_PANEL:
Text:Connecting...
Font:Bold
Align:Center
CncMenuButton@ABORT_BUTTON:
Button@ABORT_BUTTON:
Id:ABORT_BUTTON
X:230
Y:89
@@ -62,13 +62,13 @@ Container@CONNECTIONFAILED_PANEL:
Text:Failed to connect
Font:Bold
Align:Center
CncMenuButton@RETRY_BUTTON:
Button@RETRY_BUTTON:
Id:RETRY_BUTTON
Y:89
Width:140
Height:35
Text:Retry
CncMenuButton@ABORT_BUTTON:
Button@ABORT_BUTTON:
Id:ABORT_BUTTON
X:230
Y:89

View File

@@ -129,21 +129,21 @@ Container@CREATESERVER_PANEL:
MaxLength:5
Height:25
Text:1234
CncMenuButton@BACK_BUTTON:
Button@BACK_BUTTON:
Id:BACK_BUTTON
X:0
Y:259
Width:140
Height:35
Text:Back
CncMenuButton@MAP_BUTTON:
Button@MAP_BUTTON:
Id:MAP_BUTTON
X:314
Y:259
Width:140
Height:35
Text:Choose Map
CncMenuButton@CREATE_BUTTON:
Button@CREATE_BUTTON:
Id:CREATE_BUTTON
X:464
Y:259

View File

@@ -44,14 +44,14 @@ Container@DIRECTCONNECT_PANEL:
Y:50
Width:200
Height:25
CncMenuButton@BACK_BUTTON:
Button@BACK_BUTTON:
Id:BACK_BUTTON
X:0
Y:89
Width:140
Height:35
Text:Back
CncMenuButton@JOIN_BUTTON:
Button@JOIN_BUTTON:
Id:JOIN_BUTTON
X:230
Y:89

View File

@@ -17,21 +17,21 @@ Container@INGAME_ROOT:
Id:STRATEGIC_PROGRESS
X: WINDOW_RIGHT/2
Y: 40
CncMenuButton@OPTIONS_BUTTON:
Button@OPTIONS_BUTTON:
Id:OPTIONS_BUTTON
X:5
Y:5
Width:140
Height:35
Text:Options
CncMenuButton@DIPLOMACY_BUTTON:
Button@DIPLOMACY_BUTTON:
Id:DIPLOMACY_BUTTON
X:150
Y:5
Width:140
Height:35
Text:Diplomacy
CncMenuButton@CHEATS_BUTTON:
Button@CHEATS_BUTTON:
Id:CHEATS_BUTTON
X:295
Y:5

View File

@@ -26,35 +26,35 @@ Container@INGAME_MENU:
Width:740
Height:35
Children:
CncMenuButton@QUIT_BUTTON:
Button@QUIT_BUTTON:
Id:QUIT_BUTTON
X:0
Y:0
Width:140
Height:35
Text:Quit
CncMenuButton@SURRENDER_BUTTON:
Button@SURRENDER_BUTTON:
Id:SURRENDER_BUTTON
X:150
Y:0
Width:140
Height:35
Text:Surrender
CncMenuButton@MUSIC_BUTTON:
Button@MUSIC_BUTTON:
Id:MUSIC_BUTTON
X:300
Y:0
Width:140
Height:35
Text:Music
CncMenuButton@PREFERENCES_BUTTON:
Button@PREFERENCES_BUTTON:
Id:PREFERENCES_BUTTON
X:450
Y:0
Width:140
Height:35
Text:Settings
CncMenuButton@RESUME_BUTTON:
Button@RESUME_BUTTON:
Id:RESUME_BUTTON
X:600
Y:0
@@ -89,13 +89,13 @@ Container@INGAME_MENU:
Font:Bold
WordWrap:true
Align:Center
CncMenuButton@CANCEL_BUTTON:
Button@CANCEL_BUTTON:
Id:CANCEL_BUTTON
Y:89
Width:140
Height:35
Text:Cancel
CncMenuButton@CONFIRM_BUTTON:
Button@CONFIRM_BUTTON:
Id:CONFIRM_BUTTON
X:230
Y:89

View File

@@ -44,27 +44,27 @@ Container@INSTALL_PANEL:
WordWrap:true
Text:OpenRA can download these files (excluding music and videos) from the internet, or you can install from the original C&C CD.
Font:Bold
CncMenuButton@QUIT_BUTTON:
Button@QUIT_BUTTON:
Id:QUIT_BUTTON
Y:149
Width:140
Height:35
Text:Quit
CncMenuButton@MODS_BUTTON:
Button@MODS_BUTTON:
Id:MODS_BUTTON
X:150
Y:149
Width:140
Height:35
Text:Change Mod
CncMenuButton@DOWNLOAD_BUTTON:
Button@DOWNLOAD_BUTTON:
Id:DOWNLOAD_BUTTON
X:350
Y:149
Width:140
Height:35
Text:Download
CncMenuButton@INSTALL_BUTTON:
Button@INSTALL_BUTTON:
Id:INSTALL_BUTTON
X:500
Y:149
@@ -111,13 +111,13 @@ Container@INSTALL_FROMCD_PANEL:
Height:25
Align:Left
Text:Waiting for CD
CncMenuButton@BACK_BUTTON:
Button@BACK_BUTTON:
Id:BACK_BUTTON
Y:149
Width:140
Height:35
Text:Back
CncMenuButton@RETRY_BUTTON:
Button@RETRY_BUTTON:
Id:RETRY_BUTTON
X:500
Y:149
@@ -164,13 +164,13 @@ Container@INSTALL_DOWNLOAD_PANEL:
Height:25
Align:Left
Text:Initialising...
CncMenuButton@CANCEL_BUTTON:
Button@CANCEL_BUTTON:
Id:CANCEL_BUTTON
Y:149
Width:140
Height:35
Text:Cancel
CncMenuButton@RETRY_BUTTON:
Button@RETRY_BUTTON:
Id:RETRY_BUTTON
X:500
Y:149

View File

@@ -137,7 +137,7 @@ Container@SERVER_LOBBY:
Height:25
X:5
Y:0-1
CncMenuButton@KICK:
Button@KICK:
Id:KICK
Text:X
Width:25
@@ -209,7 +209,7 @@ Container@SERVER_LOBBY:
Height:25
X:5
Y:0-1
CncMenuButton@JOIN:
Button@JOIN:
Id:JOIN
Text:Play in this slot
Font:Regular
@@ -240,7 +240,7 @@ Container@SERVER_LOBBY:
Width:150
Height:25
Font:Regular
CncMenuButton@JOIN:
Button@JOIN:
Id:JOIN
Text:Play in this slot
Font:Regular
@@ -354,28 +354,28 @@ Container@SERVER_LOBBY:
Height:25
Align:Right
Text:Chat:
CncMenuButton@DISCONNECT_BUTTON:
Button@DISCONNECT_BUTTON:
Id:DISCONNECT_BUTTON
X:0
Y:499
Width:140
Height:35
Text:Leave Game
CncMenuButton@MUSIC_BUTTON:
Button@MUSIC_BUTTON:
Id:MUSIC_BUTTON
X:300
Y:499
Width:140
Height:35
Text:Music
CncMenuButton@CHANGEMAP_BUTTON:
Button@CHANGEMAP_BUTTON:
Id:CHANGEMAP_BUTTON
X:450
Y:499
Width:140
Height:35
Text:Change Map
CncMenuButton@START_GAME_BUTTON:
Button@START_GAME_BUTTON:
Id:START_GAME_BUTTON
X:600
Y:499
@@ -389,14 +389,14 @@ Background@COLOR_CHOOSER:
Width:315
Height:130
Children:
CncMenuButton@SAVE_BUTTON:
Button@SAVE_BUTTON:
Id:SAVE_BUTTON
X:210
Y:90
Width:90
Height:25
Text:Save
CncMenuButton@RANDOM_BUTTON:
Button@RANDOM_BUTTON:
Id:RANDOM_BUTTON
X:15
Y:90

View File

@@ -38,35 +38,35 @@ Container@MENU_BACKGROUND:
Align:Center
Font:Bold
Contrast:True
CncMenuButton@SOLO_BUTTON:
Button@SOLO_BUTTON:
Id:SOLO_BUTTON
X:0
Y:0
Width:140
Height:35
Text:Singleplayer
CncMenuButton@MULTIPLAYER_BUTTON:
Button@MULTIPLAYER_BUTTON:
Id:MULTIPLAYER_BUTTON
X:150
Y:0
Width:140
Height:35
Text:Multiplayer
CncMenuButton@SETTINGS_BUTTON:
Button@SETTINGS_BUTTON:
Id:SETTINGS_BUTTON
X:300
Y:0
Width:140
Height:35
Text:Settings
CncMenuButton@REPLAYS_BUTTON:
Button@REPLAYS_BUTTON:
Id:REPLAYS_BUTTON
X:450
Y:0
Width:140
Height:35
Text: Replays
CncMenuButton@QUIT_BUTTON:
Button@QUIT_BUTTON:
Id:QUIT_BUTTON
X:600
Y:0
@@ -87,28 +87,28 @@ Container@MENU_BACKGROUND:
Align:Center
Font:Bold
Contrast:True
CncMenuButton@CREATE_BUTTON:
Button@CREATE_BUTTON:
Id:CREATE_BUTTON
X:0
Y:0
Width:140
Height:35
Text:Create Server
CncMenuButton@JOIN_BUTTON:
Button@JOIN_BUTTON:
Id:JOIN_BUTTON
X:150
Y:0
Width:140
Height:35
Text:Find Server
CncMenuButton@DIRECTCONNECT_BUTTON:
Button@DIRECTCONNECT_BUTTON:
Id:DIRECTCONNECT_BUTTON
X:300
Y:0
Width:140
Height:35
Text:Direct Connect
CncMenuButton@BACK_BUTTON:
Button@BACK_BUTTON:
Id:BACK_BUTTON
X:600
Y:0
@@ -129,28 +129,28 @@ Container@MENU_BACKGROUND:
Align:Center
Font:Bold
Contrast:True
CncMenuButton@MODS_BUTTON:
Button@MODS_BUTTON:
Id:MODS_BUTTON
X:0
Y:0
Width:140
Height:35
Text:Mods
CncMenuButton@MUSIC_BUTTON:
Button@MUSIC_BUTTON:
Id:MUSIC_BUTTON
X:150
Y:0
Width:140
Height:35
Text:Music
CncMenuButton@PREFERENCES_BUTTON:
Button@PREFERENCES_BUTTON:
Id:PREFERENCES_BUTTON
X:300
Y:0
Width:140
Height:35
Text:Preferences
CncMenuButton@BACK_BUTTON:
Button@BACK_BUTTON:
Id:BACK_BUTTON
X:600
Y:0

View File

@@ -189,21 +189,21 @@ Container@MAPCHOOSER_PANEL:
Width:117
Height:20
WordWrap:True
CncMenuButton@BUTTON_CANCEL:
Button@BUTTON_CANCEL:
Id:BUTTON_CANCEL
X:0
Y:499
Width:140
Height:35
Text:Cancel
CncMenuButton@BUTTON_INSTALL:
Button@BUTTON_INSTALL:
Id:BUTTON_INSTALL
X:450
Y:499
Width:140
Height:35
Text:Install Map
CncMenuButton@BUTTON_OK:
Button@BUTTON_OK:
Id:BUTTON_OK
X:600
Y:499

View File

@@ -78,14 +78,14 @@ Container@MODS_PANEL:
Height:25
Text:Version
Font:Bold
CncMenuButton@BACK_BUTTON:
Button@BACK_BUTTON:
Id:BACK_BUTTON
X:0
Y:499
Width:140
Height:35
Text:Back
CncMenuButton@LOAD_BUTTON:
Button@LOAD_BUTTON:
Id:LOAD_BUTTON
X:600
Y:499

View File

@@ -77,7 +77,7 @@ Container@MUSIC_PANEL:
Y:320
Width:170
Children:
CncMenuButton@BUTTON_PREV:
Button@BUTTON_PREV:
Id:BUTTON_PREV
Width:35
Height:35
@@ -90,7 +90,7 @@ Container@MUSIC_PANEL:
Height:25
ImageCollection:music
ImageName:prev
CncMenuButton@BUTTON_PLAY:
Button@BUTTON_PLAY:
Id:BUTTON_PLAY
X:45
Width:35
@@ -104,7 +104,7 @@ Container@MUSIC_PANEL:
Height:25
ImageCollection:music
ImageName:play
CncMenuButton@BUTTON_PAUSE:
Button@BUTTON_PAUSE:
Id:BUTTON_PAUSE
Visible:false
X:45
@@ -119,7 +119,7 @@ Container@MUSIC_PANEL:
Height:25
ImageCollection:music
ImageName:pause
CncMenuButton@BUTTON_STOP:
Button@BUTTON_STOP:
Id:BUTTON_STOP
X:90
Width:35
@@ -133,7 +133,7 @@ Container@MUSIC_PANEL:
Height:25
ImageCollection:music
ImageName:stop
CncMenuButton@BUTTON_NEXT:
Button@BUTTON_NEXT:
Id:BUTTON_NEXT
X:135
Width:35
@@ -169,14 +169,14 @@ Container@MUSIC_PANEL:
Width:70
Height:20
Text:Loop
CncMenuButton@BACK_BUTTON:
Button@BACK_BUTTON:
Id:BACK_BUTTON
X:0
Y:399
Width:140
Height:35
Text:Back
CncMenuButton@INSTALL_BUTTON:
Button@INSTALL_BUTTON:
Id:INSTALL_BUTTON
X:220
Y:399
@@ -223,13 +223,13 @@ Container@INSTALL_MUSIC_PANEL:
Height:25
Align:Left
Text:Waiting for file
CncMenuButton@BACK_BUTTON:
Button@BACK_BUTTON:
Id:BACK_BUTTON
Y:149
Width:140
Height:35
Text:Back
CncMenuButton@RETRY_BUTTON:
Button@RETRY_BUTTON:
Id:RETRY_BUTTON
X:500
Y:149

View File

@@ -333,27 +333,27 @@ Container@SETTINGS_PANEL:
# Y:85
# Width:350
# Height:150
CncMenuButton@GENERAL_BUTTON:
Button@GENERAL_BUTTON:
Id:GENERAL_BUTTON
Y:249
Width:140
Height:35
Text:General
CncMenuButton@INPUT_BUTTON:
Button@INPUT_BUTTON:
Id:INPUT_BUTTON
X:150
Y:249
Width:140
Height:35
Text:Input
CncMenuButton@CANCEL_BUTTON:
Button@CANCEL_BUTTON:
Id:CANCEL_BUTTON
X:450
Y:249
Width:140
Height:35
Text:Cancel
CncMenuButton@SAVE_BUTTON:
Button@SAVE_BUTTON:
Id:SAVE_BUTTON
X:600
Y:249

View File

@@ -96,14 +96,14 @@ Container@REPLAYBROWSER_PANEL:
Y:40
Width:70
Height:20
CncMenuButton@CANCEL_BUTTON:
Button@CANCEL_BUTTON:
Id:CANCEL_BUTTON
X:0
Y:299
Width:140
Height:35
Text:Back
CncMenuButton@WATCH_BUTTON:
Button@WATCH_BUTTON:
Id:WATCH_BUTTON
X:380
Y:299

View File

@@ -191,21 +191,21 @@ Container@SERVERBROWSER_PANEL:
VAlign:Top
Width:70
Height:20
CncMenuButton@BACK_BUTTON:
Button@BACK_BUTTON:
Id:BACK_BUTTON
X:0
Y:499
Width:140
Height:35
Text:Back
CncMenuButton@REFRESH_BUTTON:
Button@REFRESH_BUTTON:
Id:REFRESH_BUTTON
X:450
Y:499
Width:140
Height:35
Text:Refresh
CncMenuButton@JOIN_BUTTON:
Button@JOIN_BUTTON:
Id:JOIN_BUTTON
X:600
Y:499

View File

@@ -1,4 +1,5 @@
# General dumping-ground for UI element sizes, etc.
Metrics:
ButtonDepth: 1
ButtonDepth: 0
ButtonFont: Bold

View File

@@ -237,3 +237,51 @@ progressbar-thumb: dialog.png
corner-tr: 594,0,1,1
corner-bl: 512,82,1,1
corner-br: 594,82,1,1
# A copy of dialog2
button: dialog.png
background: 513,1,126,126
border-r: 639,1,1,126
border-l: 512,1,1,126
border-b: 513,127,126,1
border-t: 513,0,126,1
corner-tl: 512,0,1,1
corner-tr: 594,0,1,1
corner-bl: 512,82,1,1
corner-br: 594,82,1,1
# A copy of dialog2
button-hover: dialog.png
background: 513,1,126,126
border-r: 639,1,1,126
border-l: 512,1,1,126
border-b: 513,127,126,1
border-t: 513,0,126,1
corner-tl: 512,0,1,1
corner-tr: 594,0,1,1
corner-bl: 512,82,1,1
corner-br: 594,82,1,1
# A copy of dialog2
button-disabled: dialog.png
background: 513,1,126,126
border-r: 639,1,1,126
border-l: 512,1,1,126
border-b: 513,127,126,1
border-t: 513,0,126,1
corner-tl: 512,0,1,1
corner-tr: 594,0,1,1
corner-bl: 512,82,1,1
corner-br: 594,82,1,1
# A copy of dialog3
button-pressed: dialog.png
background: 641,1,126,126
border-r: 767,1,1,126
border-l: 640,1,1,126
border-b: 641,127,126,1
border-t: 641,0,126,1
corner-tl: 640,0,1,1
corner-tr: 722,0,1,1
corner-bl: 640,82,1,1
corner-br: 722,82,1,1

View File

@@ -1,4 +1,5 @@
# General dumping-ground for UI element sizes, etc.
Metrics:
ButtonDepth: 1
ButtonDepth: 1
ButtonFont: Regular