[Orxonox-commit 2909] r7612 - in code/trunk/data/gui: layouts scripts

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-11-04 10:57:19 +0100 (Thu, 04 Nov 2010)
New Revision: 7612

Modified:
   code/trunk/data/gui/layouts/ChatBox.layout
   code/trunk/data/gui/scripts/ChatBox.lua
Log:

Reverting a change that I made some time ago.
It turns out, that CEGUI doesn't like it (on some machines, expecially on tardis) if Events for a window are defined after the child windows are defined in the .layout file.
So putting it above the child windows should be fine.


Modified: code/trunk/data/gui/layouts/ChatBox.layout
===================================================================
--- code/trunk/data/gui/layouts/ChatBox.layout	2010-11-03 15:20:02 UTC (rev 7611)
+++ code/trunk/data/gui/layouts/ChatBox.layout	2010-11-04 09:57:19 UTC (rev 7612)
@@ -12,6 +12,7 @@
             <Property Name="TitlebarEnabled" Value="True" />
             <!--<Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.03,0},{0.6,0},{0.69375,0}}" />-->
             <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.10,0},{0.98,0},{0.65,0}}" />
+            <Event Name="CloseClicked" Function="ChatBox.ChatBoxCloseButton_clicked"/>
             <Window Type="MenuWidgets/Listbox" Name="orxonox/ChatBox/history" >
                 <Property Name="Font" Value="Monofur-10" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

Modified: code/trunk/data/gui/scripts/ChatBox.lua
===================================================================
--- code/trunk/data/gui/scripts/ChatBox.lua	2010-11-03 15:20:02 UTC (rev 7611)
+++ code/trunk/data/gui/scripts/ChatBox.lua	2010-11-04 09:57:19 UTC (rev 7612)
@@ -2,11 +2,6 @@
 
 local P = createMenuSheet("ChatBox")
 
-function P.onLoad()
-    local window = winMgr:getWindow("orxonox/ChatBox")
-    orxonox.GUIManager:subscribeEventHelper(window, "CloseClicked", P.name .. ".ChatBoxCloseButton_clicked")
-end
-
 function P.ChatBoxCloseButton_clicked(e)
     orxonox.ChatInputHandler:getInstance():deactivate()
 end