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

Expose port settings to server dialog

Browse Source
This commit is contained in:
Paul Chote
2010-07-11 01:08:36 +12:00
parent 900335b08c
commit 8c141c7b5e
3 changed files with 56 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenRA.Game/Widgets/Delegates/CreateServerMenuDelegate.cs
View File

@@ -30,17 +30,18 @@ namespace OpenRA.Widgets.Delegates
public CreateServerMenuDelegate() public CreateServerMenuDelegate()
{ {
var r = Chrome.rootWidget; var r = Chrome.rootWidget;
var cs = Chrome.rootWidget.GetWidget("CREATESERVER_BG");
r.GetWidget("MAINMENU_BUTTON_CREATE").OnMouseUp = mi => { r.GetWidget("MAINMENU_BUTTON_CREATE").OnMouseUp = mi => {
r.OpenWindow("CREATESERVER_BG"); r.OpenWindow("CREATESERVER_BG");
return true; return true;
}; };
r.GetWidget("CREATESERVER_BUTTON_CANCEL").OnMouseUp = mi => { cs.GetWidget("BUTTON_CANCEL").OnMouseUp = mi => {
r.CloseWindow(); r.CloseWindow();
return true; return true;
}; };
r.GetWidget("CREATESERVER_BUTTON_START").OnMouseUp = mi => { cs.GetWidget("BUTTON_START").OnMouseUp = mi => {
r.OpenWindow("SERVER_LOBBY"); r.OpenWindow("SERVER_LOBBY");
Log.Write("debug", "Creating server"); Log.Write("debug", "Creating server");
@@ -50,19 +51,23 @@ namespace OpenRA.Widgets.Delegates
// TODO: Get this from a mod chooser // TODO: Get this from a mod chooser
var mods = Game.Settings.InitialMods; var mods = Game.Settings.InitialMods;
var gameName = r.GetWidget<TextFieldWidget>("GAME_TITLE").Text; var gameName = cs.GetWidget<TextFieldWidget>("GAME_TITLE").Text;
int listenPort = int.Parse(cs.GetWidget<TextFieldWidget>("LISTEN_PORT").Text);
int extPort = int.Parse(cs.GetWidget<TextFieldWidget>("EXTERNAL_PORT").Text);
Server.Server.ServerMain(AdvertiseServerOnline, Game.Settings.MasterServer, Server.Server.ServerMain(AdvertiseServerOnline, Game.Settings.MasterServer,
gameName, Game.Settings.ListenPort, gameName, listenPort, extPort, mods, map);
Game.Settings.ExternalPort, mods, map);
Log.Write("debug", "Joining server"); Log.Write("debug", "Joining server");
Game.JoinServer(IPAddress.Loopback.ToString(), Game.Settings.ListenPort); Game.JoinServer(IPAddress.Loopback.ToString(), Game.Settings.ListenPort);
return true; return true;
}; };
r.GetWidget<CheckboxWidget>("CREATESERVER_CHECKBOX_ONLINE").Checked = () => {return AdvertiseServerOnline;}; cs.GetWidget<TextFieldWidget>("LISTEN_PORT").Text = Game.Settings.ListenPort.ToString();
r.GetWidget("CREATESERVER_CHECKBOX_ONLINE").OnMouseDown = mi => { cs.GetWidget<TextFieldWidget>("EXTERNAL_PORT").Text = Game.Settings.ExternalPort.ToString();
r.GetWidget<CheckboxWidget>("CHECKBOX_ONLINE").Checked = () => {return AdvertiseServerOnline;};
r.GetWidget("CHECKBOX_ONLINE").OnMouseDown = mi => {
AdvertiseServerOnline = !AdvertiseServerOnline; AdvertiseServerOnline = !AdvertiseServerOnline;
return true; return true;
}; };

2
OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs
View File

@@ -151,7 +151,7 @@ namespace OpenRA.Widgets.Delegates
return true; return true;
}; };
r.GetWidget("BUTTON_CANCEL").OnMouseUp = mi => { dc.GetWidget("BUTTON_CANCEL").OnMouseUp = mi => {
r.CloseWindow(); r.CloseWindow();
return r.GetWidget("MAINMENU_BUTTON_JOIN").OnMouseUp(mi); return r.GetWidget("MAINMENU_BUTTON_JOIN").OnMouseUp(mi);
}; };

55
mods/cnc/menus.yaml
View File

@@ -73,11 +73,11 @@ Container:
X:(WINDOW_RIGHT - WIDTH)/2 X:(WINDOW_RIGHT - WIDTH)/2
Y:(WINDOW_BOTTOM - HEIGHT)/2 Y:(WINDOW_BOTTOM - HEIGHT)/2
Width:400 Width:400
Height:180 Height:210
Visible:false Visible:false
Children: Children:
Label@CREATESERVER_LABEL_TITLE: Label@LABEL_TITLE:
Id:CREATESERVER_LABEL_TITLE Id:LABEL_TITLE
X:0 X:0
Y:20 Y:20
Width:400 Width:400
@@ -85,7 +85,7 @@ Container:
Text:Create Server Text:Create Server
Align:Center Align:Center
Bold:True Bold:True
Label@GAME_TITLE: Label@GAME_TITLE_LABEL:
Id:GAME_TITLE_LABEL Id:GAME_TITLE_LABEL
X:50 X:50
Y:59 Y:59
@@ -97,27 +97,58 @@ Container:
Id:GAME_TITLE Id:GAME_TITLE
X:150 X:150
Y:60 Y:60
Width:200 Width:210
MaxLength:50 MaxLength:50
Height:25 Height:25
Text:OpenRA Game Text:OpenRA Game
Checkbox@CREATESERVER_CHECKBOX_ONLINE: Label@EXTERNAL_PORT_LABEL:
Id:CREATESERVER_CHECKBOX_ONLINE Id:EXTERNAL_PORT_LABEL
X:50
Y:94
Width:95
Height:25
Align: Right
Text:External Port:
TextField@EXTERNAL_PORT:
Id:EXTERNAL_PORT
X:150 X:150
Y:100 Y:95
Width:50
MaxLength:5
Height:25
Text:OpenRA Game
Label@LISTEN_PORT_LABEL:
Id:LISTEN_PORT_LABEL
X:210
Y:94
Width:95
Height:25
Align: Right
Text:Listen Port:
TextField@LISTEN_PORT:
Id:LISTEN_PORT
X:310
Y:95
Width:50
MaxLength:5
Height:25
Checkbox@CHECKBOX_ONLINE:
Id:CHECKBOX_ONLINE
X:165
Y:130
Width:300 Width:300
Height:20 Height:20
Text:Advertise game Online Text:Advertise game Online
Button@CREATESERVER_BUTTON_START: Button@BUTTON_START:
Id:CREATESERVER_BUTTON_START Id:BUTTON_START
X:130 X:130
Y:PARENT_BOTTOM - 45 Y:PARENT_BOTTOM - 45
Width:120 Width:120
Height:25 Height:25
Text:Create Text:Create
Bold:True Bold:True
Button@CREATESERVER_BUTTON_CANCEL: Button@BUTTON_CANCEL:
Id:CREATESERVER_BUTTON_CANCEL Id:BUTTON_CANCEL
X:260 X:260
Y:PARENT_BOTTOM - 45 Y:PARENT_BOTTOM - 45
Width:120 Width:120