From 3af1e4774495f19a8f9d3d2f2a1b47f15d5d51f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 5 Oct 2013 10:15:09 +0200 Subject: [PATCH] separate connection and direct connect dialog from serverbrowser --- mods/d2k/mod.yaml | 2 + mods/ra/chrome/connection.yaml | 90 +++++++++++++++++++++++ mods/ra/chrome/directconnect.yaml | 50 +++++++++++++ mods/ra/chrome/serverbrowser.yaml | 118 ------------------------------ mods/ra/mod.yaml | 2 + mods/ts/mod.yaml | 2 + 6 files changed, 146 insertions(+), 118 deletions(-) create mode 100644 mods/ra/chrome/connection.yaml create mode 100644 mods/ra/chrome/directconnect.yaml diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml index 631bdc5162..a076465708 100644 --- a/mods/d2k/mod.yaml +++ b/mods/d2k/mod.yaml @@ -64,6 +64,8 @@ ChromeLayout: mods/ra/chrome/map-chooser.yaml mods/ra/chrome/create-server.yaml mods/ra/chrome/serverbrowser.yaml + mods/ra/chrome/connection.yaml + mods/ra/chrome/directconnect.yaml mods/ra/chrome/replaybrowser.yaml mods/ra/chrome/dropdowns.yaml mods/ra/chrome/modchooser.yaml diff --git a/mods/ra/chrome/connection.yaml b/mods/ra/chrome/connection.yaml new file mode 100644 index 0000000000..b3eda89c72 --- /dev/null +++ b/mods/ra/chrome/connection.yaml @@ -0,0 +1,90 @@ +Background@CONNECTIONFAILED_PANEL: + Logic:ConnectionFailedLogic + X:(WINDOW_RIGHT - WIDTH)/2 + Y:(WINDOW_BOTTOM - HEIGHT)/2 + Width:450 + Height:160 + Children: + LogicTicker@CONNECTION_FAILED_TICKER: + Label@CONNECTION_FAILED_TITLE: + X:0 + Y:20 + Width:450 + Height:25 + Text:Connection Failed + Align:Center + Font:Bold + Label@CONNECTING_DESC: + X:0 + Y:45 + Width:PARENT_RIGHT + Height:25 + Text:Could not connect to AAA.BBB.CCC.DDD:EEEE + Align:Center + Label@CONNECTION_ERROR: + X:0 + Y:75 + Width:PARENT_RIGHT + Height:25 + Text:ServerError + Align:Center + Font:Bold + Label@PASSWORD_LABEL: + X:PARENT_RIGHT - 360 + Y:110 + Width:95 + Height:25 + Text:Password: + Font:Bold + PasswordField@PASSWORD: + X:PARENT_RIGHT - 285 + Y:111 + Width:190 + MaxLength:20 + Height:25 + Button@RETRY_BUTTON: + X:PARENT_RIGHT - 360 + Y:PARENT_BOTTOM - 45 + Width:160 + Height:25 + Text:Retry + Font:Bold + Key:return + Button@ABORT_BUTTON: + X:PARENT_RIGHT - 180 + Y:PARENT_BOTTOM - 45 + Width:160 + Height:25 + Text:Cancel + Font:Bold + Key:escape +Background@CONNECTING_PANEL: + Logic:ConnectionLogic + X:(WINDOW_RIGHT - WIDTH)/2 + Y:(WINDOW_BOTTOM - HEIGHT)/2 + Width:450 + Height:150 + Children: + Label@CONNECTING_TITLE: + X:0 + Y:20 + Width:450 + Height:25 + Text:Connecting + Align:Center + Font:Bold + Label@CONNECTING_DESC: + X:0 + Y:60 + Width:PARENT_RIGHT + Height:25 + Text:Connecting to AAA.BBB.CCC.DDD:EEEE... + Align:Center + Button@ABORT_BUTTON: + X:PARENT_RIGHT - 180 + Y:PARENT_BOTTOM - 45 + Width:160 + Height:25 + Text:Abort + Font:Bold + Key:escape diff --git a/mods/ra/chrome/directconnect.yaml b/mods/ra/chrome/directconnect.yaml new file mode 100644 index 0000000000..afaf2524d9 --- /dev/null +++ b/mods/ra/chrome/directconnect.yaml @@ -0,0 +1,50 @@ +Background@DIRECTCONNECT_BG: + Logic:DirectConnectLogic + X:(WINDOW_RIGHT - WIDTH)/2 + Y:(WINDOW_BOTTOM - HEIGHT)/2 + Width:400 + Height:150 + Children: + Label@DIRECTCONNECT_LABEL_TITLE: + X:0 + Y:20 + Width:400 + Height:25 + Text:Direct Connect + Align:Center + Font:Bold + Label@ADDRESS_LABEL: + X:50 + Y:59 + Width:95 + Height:25 + Align:Right + Text:Server Address: + TextField@IP: + X:150 + Y:60 + Width:160 + MaxLength:50 + Height:25 + TextField@PORT: + X:315 + Y:60 + Width:55 + MaxLength:5 + Height:25 + Button@JOIN_BUTTON: + X:130 + Y:PARENT_BOTTOM - 45 + Width:120 + Height:25 + Text:Join + Font:Bold + Key:return + Button@BACK_BUTTON: + X:260 + Y:PARENT_BOTTOM - 45 + Width:120 + Height:25 + Text:Cancel + Font:Bold + Key:escape diff --git a/mods/ra/chrome/serverbrowser.yaml b/mods/ra/chrome/serverbrowser.yaml index 9347e24afc..96253ed107 100644 --- a/mods/ra/chrome/serverbrowser.yaml +++ b/mods/ra/chrome/serverbrowser.yaml @@ -134,121 +134,3 @@ Background@JOINSERVER_BG: Container@IRC_ROOT: X:20 Y:430 -Background@DIRECTCONNECT_BG: - Logic:DirectConnectLogic - X:(WINDOW_RIGHT - WIDTH)/2 - Y:(WINDOW_BOTTOM - HEIGHT)/2 - Width:400 - Height:155 - Children: - Label@DIRECTCONNECT_LABEL_TITLE: - X:0 - Y:20 - Width:400 - Height:25 - Text:Direct Connect - Align:Center - Font:Bold - Label@ADDRESS_LABEL: - X:50 - Y:59 - Width:95 - Height:25 - Align:Right - Text:Server Address: - TextField@IP: - X:150 - Y:60 - Width:160 - MaxLength:50 - Height:25 - TextField@PORT: - X:315 - Y:60 - Width:55 - MaxLength:5 - Height:25 - Button@JOIN_BUTTON: - X:130 - Y:PARENT_BOTTOM - 45 - Width:120 - Height:25 - Text:Join - Font:Bold - Key:return - Button@BACK_BUTTON: - X:260 - Y:PARENT_BOTTOM - 45 - Width:120 - Height:25 - Text:Cancel - Font:Bold - Key:escape -Background@CONNECTIONFAILED_PANEL: - Logic:ConnectionFailedLogic - X:(WINDOW_RIGHT - WIDTH)/2 - Y:(WINDOW_BOTTOM - HEIGHT)/2 - Width:450 - Height:150 - Children: - Label@CONNECTION_FAILED_TITLE: - X:0 - Y:20 - Width:450 - Height:25 - Text:Connection Failed - Align:Center - Font:Bold - Label@CONNECTING_DESC: - X:0 - Y:60 - Width:PARENT_RIGHT - Height:25 - Text:Could not connect to AAA.BBB.CCC.DDD:EEEE - Align:Center - Button@RETRY_BUTTON: - X:PARENT_RIGHT - 360 - Y:PARENT_BOTTOM - 45 - Width:160 - Height:25 - Text:Retry - Font:Bold - Key:return - Button@ABORT_BUTTON: - X:PARENT_RIGHT - 180 - Y:PARENT_BOTTOM - 45 - Width:160 - Height:25 - Text:Cancel - Font:Bold - Key:escape -Background@CONNECTING_PANEL: - Logic:ConnectionLogic - X:(WINDOW_RIGHT - WIDTH)/2 - Y:(WINDOW_BOTTOM - HEIGHT)/2 - Width:450 - Height:150 - Children: - Label@CONNECTING_TITLE: - X:0 - Y:20 - Width:450 - Height:25 - Text:Connecting - Align:Center - Font:Bold - Label@CONNECTING_DESC: - X:0 - Y:60 - Width:PARENT_RIGHT - Height:25 - Text:Connecting to AAA.BBB.CCC.DDD:EEEE... - Align:Center - Button@ABORT_BUTTON: - X:PARENT_RIGHT - 180 - Y:PARENT_BOTTOM - 45 - Width:160 - Height:25 - Text:Abort - Font:Bold - Key:escape diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml index dfc6dda6e3..a55e36da2e 100644 --- a/mods/ra/mod.yaml +++ b/mods/ra/mod.yaml @@ -77,6 +77,8 @@ ChromeLayout: mods/ra/chrome/map-chooser.yaml mods/ra/chrome/create-server.yaml mods/ra/chrome/serverbrowser.yaml + mods/ra/chrome/connection.yaml + mods/ra/chrome/directconnect.yaml mods/ra/chrome/replaybrowser.yaml mods/ra/chrome/dropdowns.yaml mods/ra/chrome/modchooser.yaml diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml index 774f9af256..9f6146bc08 100644 --- a/mods/ts/mod.yaml +++ b/mods/ts/mod.yaml @@ -107,6 +107,8 @@ ChromeLayout: mods/ra/chrome/map-chooser.yaml mods/ra/chrome/create-server.yaml mods/ra/chrome/serverbrowser.yaml + mods/ra/chrome/connection.yaml + mods/ra/chrome/directconnect.yaml mods/ra/chrome/replaybrowser.yaml mods/ra/chrome/dropdowns.yaml mods/ra/chrome/modchooser.yaml