complete password protected servers

closes #2290
This commit is contained in:
Matthias Mailänder
2013-10-05 13:02:47 +02:00
parent a6cdcea414
commit b618fc7cc2
17 changed files with 229 additions and 81 deletions

View File

@@ -37,8 +37,9 @@ Container@CONNECTIONFAILED_PANEL:
X:(WINDOW_RIGHT - WIDTH)/2
Y:(WINDOW_BOTTOM - 90)/2
Width:370
Height:125
Height:129
Children:
LogicTicker@CONNECTION_FAILED_TICKER:
Label@TITLE:
Width:PARENT_RIGHT
Y:0-25
@@ -46,28 +47,48 @@ Container@CONNECTIONFAILED_PANEL:
Contrast:true
Align:Center
Text:Connection Failed
Background@bg:
Background@CONNECTION_BACKGROUND:
Width:370
Height:90
Height:85
Background:panel-black
Children:
Label@CONNECTING_DESC:
Y:(PARENT_BOTTOM-HEIGHT)/2
Y:15
Width:PARENT_RIGHT
Height:25
Text:Failed to connect
Font:Bold
Align:Center
Label@CONNECTION_ERROR:
Y:40
Width:PARENT_RIGHT
Height:25
Align:Center
Font:Bold
Label@PASSWORD_LABEL:
X:40
Y:79
Width:95
Height:25
Align:Right
Text:Password:
Font:Bold
PasswordField@PASSWORD:
X:140
Y:80
Width:155
MaxLength:20
Height:25
Button@RETRY_BUTTON:
Key:return
Y:89
Y:84
Width:140
Height:35
Text:Retry
Button@ABORT_BUTTON:
Key:escape
X:230
Y:89
Y:84
Width:140
Height:35
Text:Abort

View File

@@ -2,37 +2,37 @@ Container@CREATESERVER_PANEL:
Logic:ServerCreationLogic
X:(WINDOW_RIGHT - WIDTH)/2
Y:(WINDOW_BOTTOM - 260)/2
Width:604
Height:295
Width:521
Height:250
Children:
Label@TITLE:
Text:Create Server
Width:604
Width:PARENT_RIGHT
Y:0-25
Font:BigBold
Contrast:true
Align:Center
Background@bg:
Width:604
Height:260
Width:PARENT_RIGHT
Height:215
Background:panel-black
Children:
Background@MAP_BG:
X:PARENT_RIGHT-WIDTH-15
Y:15
Width:194
Height:194
Width:162
Height:162
Background:panel-gray
Children:
MapPreview@MAP_PREVIEW:
X:1
Y:1
Width:192
Height:192
Width:160
Height:160
Label@MAP_NAME:
X:PARENT_RIGHT-WIDTH-15
Y:220
Width:194
Y:PARENT_BOTTOM - 33
Width:162
Height:25
Align:Center
Font:Bold
@@ -46,67 +46,87 @@ Container@CREATESERVER_PANEL:
TextField@SERVER_NAME:
X:110
Y:15
Width:275
Width:215
MaxLength:50
Height:25
Text:My OpenRA Server
Label@PASSWORD_LABEL:
X:10
Y:49
Width:95
Height:25
Align:Right
Text:Password:
PasswordField@PASSWORD:
X:110
Y:50
Width:145
MaxLength:20
Height:25
Label@AFTER_PASSWORD_LABEL:
X:265
Y:49
Width:95
Height:25
Align:Left
Text:(optional)
Label@LISTEN_PORT_LABEL:
X:15
Y:119
Y:84
Width:90
Height:25
Align: Right
Text:Port:
TextField@LISTEN_PORT:
X:110
Y:120
Y:85
Width:50
MaxLength:5
Height:25
Text:1234
Label@EXTERNAL_PORT_LABEL:
X:180
Y:84
Width:90
Height:25
Align:Right
Text:External Port:
TextField@EXTERNAL_PORT:
X:275
Y:85
Width:50
MaxLength:5
Height:25
Text:1234
Checkbox@ADVERTISE_CHECKBOX:
X:110
Y:155
Y:135
Width:150
Height:20
Text:Advertise Online
Checkbox@UPNP_CHECKBOX:
X:110
Y:180
Y:165
Width:300
Height:20
Text:Automatic port forwarding
Label@EXTERNAL_PORT_LABEL:
X:15
Y:219
Width:90
Height:25
Align:Right
Text:External Port:
TextField@EXTERNAL_PORT:
X:110
Y:220
Width:50
MaxLength:5
Height:25
Text:1234
Button@BACK_BUTTON:
Key:escape
X:0
Y:259
Y:214
Width:140
Height:35
Text:Back
Button@MAP_BUTTON:
X:314
Y:259
X:231
Y:214
Width:140
Height:35
Text:Choose Map
Button@CREATE_BUTTON:
Key:return
X:464
Y:259
X:381
Y:214
Width:140
Height:35
Text:Create

View File

@@ -3,7 +3,7 @@ Container@DIRECTCONNECT_PANEL:
X:(WINDOW_RIGHT - WIDTH)/2
Y:(WINDOW_BOTTOM - 90)/2
Width:370
Height:125
Height:130
Children:
Label@TITLE:
Width:PARENT_RIGHT
@@ -14,7 +14,7 @@ Container@DIRECTCONNECT_PANEL:
Text:Connect to Server
Background@bg:
Width:370
Height:90
Height:95
Background:panel-black
Children:
Label@ADDRESS_LABEL:
@@ -44,14 +44,14 @@ Container@DIRECTCONNECT_PANEL:
Button@BACK_BUTTON:
Key:escape
X:0
Y:89
Y:94
Width:140
Height:35
Text:Back
Button@JOIN_BUTTON:
Key:return
X:230
Y:89
Y:94
Width:140
Height:35
Text:Join

View File

@@ -3,7 +3,7 @@ Background@CREATESERVER_BG:
X:(WINDOW_RIGHT - WIDTH)/2
Y:(WINDOW_BOTTOM - HEIGHT)/2
Width:400
Height:240
Height:300
Children:
Label@LABEL_TITLE:
X:0
@@ -27,42 +27,62 @@ Background@CREATESERVER_BG:
MaxLength:50
Height:25
Text:OpenRA Game
Label@EXTERNAL_PORT_LABEL:
Label@PASSWORD_LABEL:
X:50
Y:94
Width:95
Height:25
Align:Right
Text:Password:
PasswordField@PASSWORD:
X:150
Y:95
Width:145
MaxLength:20
Height:25
Label@AFTER_PASSWORD_LABEL:
X:300
Y:94
Width:95
Height:25
Align:Left
Text:(optional)
Label@EXTERNAL_PORT_LABEL:
X:50
Y:129
Width:95
Height:25
Align: Right
Text:External Port:
TextField@EXTERNAL_PORT:
X:150
Y:95
Y:130
Width:50
MaxLength:5
Height:25
Text:OpenRA Game
Label@LISTEN_PORT_LABEL:
X:210
Y:94
Y:129
Width:95
Height:25
Align: Right
Text:Listen Port:
TextField@LISTEN_PORT:
X:310
Y:95
Y:130
Width:50
MaxLength:5
Height:25
Checkbox@UPNP_CHECKBOX:
X:150
Y:130
Y:165
Width:300
Height:20
Text:Automatic port forwarding
Checkbox@ADVERTISE_CHECKBOX:
X:150
Y:165
Y:200
Width:300
Height:20
Text:Advertise game Online