From 7b1aba1fa56cc1165f5e5d500e333f1b9fa00d79 Mon Sep 17 00:00:00 2001
From: Henrique Santiago <henrique_santiago93@hotmail.com>
Date: Mon, 6 Aug 2012 18:47:58 -0300
Subject: [PATCH] Flexible entergame window, changes to logout window

---
 modules/client_entergame/entergame.lua        |   4 +++-
 modules/client_entergame/entergame.otui       |   4 +++-
 .../skins/default/images/combobox_rounded.png | Bin 3114 -> 3089 bytes
 .../game_interface/styles/logoutwindow.otui   |  13 ++++++-------
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/modules/client_entergame/entergame.lua b/modules/client_entergame/entergame.lua
index 7887118e..2111b769 100644
--- a/modules/client_entergame/entergame.lua
+++ b/modules/client_entergame/entergame.lua
@@ -175,7 +175,7 @@ function EnterGame.displayMotd()
   displayInfoBox(tr('Message of the day'), G.motdMessage)
 end
 
-function EnterGame.setUniqueServer(host, port, protocol, windowHeight)
+function EnterGame.setUniqueServer(host, port, protocol, windowWidth, windowHeight)
   local hostTextEdit = enterGame:getChildById('serverHostTextEdit')
   hostTextEdit:setText(host)
   hostTextEdit:setVisible(false)
@@ -202,6 +202,8 @@ function EnterGame.setUniqueServer(host, port, protocol, windowHeight)
   local rememberPasswordBox = enterGame:getChildById('rememberPasswordBox')
   rememberPasswordBox:setMarginTop(-5)
 
+  if not windowWidth then windowWidth = 236 end
+  enterGame:setWidth(windowWidth)
   if not windowHeight then windowHeight = 200 end
   enterGame:setHeight(windowHeight)
 end
diff --git a/modules/client_entergame/entergame.otui b/modules/client_entergame/entergame.otui
index 4fd9232f..3d5b7487 100644
--- a/modules/client_entergame/entergame.otui
+++ b/modules/client_entergame/entergame.otui
@@ -1,4 +1,6 @@
-MainWindow
+EnterGameWindow < MainWindow
+
+EnterGameWindow
   id: enterGame
   !text: tr('Enter Game')
   margin-top: 100
diff --git a/modules/client_skins/skins/default/images/combobox_rounded.png b/modules/client_skins/skins/default/images/combobox_rounded.png
index 067b8669e3ed48c6ab0fae8c5c7d37cb2ff058e3..a3d9c62b6f074e54bdf4d1581a801c8920d1041c 100644
GIT binary patch
delta 396
zcmV;70dxMU7?Bu|Be6JK3J(TiOGiWi{{a60|De66laV18e*gz`Nliru+z19093qv;
zAIks$0YgbdK~#9!?cBXe13?sk(HV(R#KIR)K?N0md-dt{0TcsTn8G}Pg^0#tECj2}
z664%L_I%|oY;hQ77cR58l#;e~k4sWWlkq6$&7GsNJY1zw>2v!2=VvToj1Mwo$bt+R
zvf4I4@cW*hf9|XIw)ak~<QC0>?79xQ5p)e0awF(2V90@62V|dckOdiXZ_CC{u}#LK
zJV+^}we<}ekt=!s^r8$`%=l_eKg{^N_yid;WI=}9!_4>==;8LddhhW3%1Un0EXc0w
zkQ+hQfFU=6?gEA!xOG7G2?tq_A@{aiN=XN2mu7rHZav=Je9!paUSDWLu4L!<x^s@t
zi%*atLl$Jnz08bnft=&BUDz%(XY(8@vyyEWkOdhsWX0tiUvNLakwjs;fGo(6Aqz5O
qL52)jkRd}BWXOUH8L}Y%o4x?iVLtttOvS4J0000<MNUMnLSTaLeYdIr

delta 424
zcmV;Z0ayN!7^)bMBa@H{6|o~+3V$GDNK#Dz0D2_=0Dyx40Qvs_0D$QL0Cg|`0P0`>
z06Lfe02gnPU&TfM00C7=L_t(|+U(oCN&`U@fYBL=QN+R*h(Z)p;$N>my*_~Af);M!
zK7oaZ#$qgNGfRv!HhaEu11S!d*@er*lv3E;KS@DV>e?p8$#j<1$D1@VeSghA{`?<n
z80!ZaGGsx93|VCxA^3eS&kxz(_6|->a)}l}_C1GO2s#H0xe#<8Fyx9y2V|dckOdj?
zV2jpIb?e$DjzS1wYkP-A%}G8yyG-K^JHA}=Pdh#@K0$^IS&$(QFgv~#dc3>I{&swE
zZIVm02(s@v<U-InV914_`+tBTS3Ei(`-Fom$dCtHOeuw<^D8^PN<H1*{_ObP-(G3d
zoMiX-`g4!Zi%*atLl$JngUpU^h1}zFTsSVYWXoJDGs%t%$bt+Rvg+j?U*)>Ci6;3!
zCV4WQnPO)$WI=`uS&$(MGGxet3>mT@Ll$Jn13~WECSs^p*EaDR02u)P{{sMaheRb2
S7d__y0000<MNUMnLSTaEAhYoR

diff --git a/modules/game_interface/styles/logoutwindow.otui b/modules/game_interface/styles/logoutwindow.otui
index ee4a1793..6e3188f8 100644
--- a/modules/game_interface/styles/logoutwindow.otui
+++ b/modules/game_interface/styles/logoutwindow.otui
@@ -1,28 +1,27 @@
 LogoutWindow < MainWindow
   id: logoutWindow
   !text: tr('Logout')
-  size: 300 100
+  size: 230 100
 
   Label
     !text: tr('Are you sure you want to logout?')
-    width: 200
-    anchors.left: parent.left
+    text-auto-resize: true
+    anchors.horizontalCenter: parent.horizontalCenter
     anchors.top: parent.top
-    margin-left: 30
     margin-top: 2
 
   Button
     id: buttonYes
     !text: tr('Yes')
     width: 64
-    anchors.left: parent.left
+    anchors.right: parent.horizontalCenter
     anchors.bottom: parent.bottom
-    margin-left: 65
+    margin-right: 5
 
   Button
     id: buttonNo
     !text: tr('No')
     width: 64
-    anchors.left: prev.right
+    anchors.left: parent.horizontalCenter
     anchors.bottom: parent.bottom
     margin-left: 5