[Orxonox-commit 3050] r7746 - in code/branches/presentation/data/gui: layouts scripts
dafrick at orxonox.net
dafrick at orxonox.net
Wed Dec 8 17:36:22 CET 2010
Author: dafrick
Date: 2010-12-08 17:36:22 +0100 (Wed, 08 Dec 2010)
New Revision: 7746
Modified:
code/branches/presentation/data/gui/layouts/MultiplayerMenu.layout
code/branches/presentation/data/gui/scripts/ChatBox-inputonly.lua
code/branches/presentation/data/gui/scripts/ChatBox.lua
Log:
Fixing chatbox.
Modified: code/branches/presentation/data/gui/layouts/MultiplayerMenu.layout
===================================================================
--- code/branches/presentation/data/gui/layouts/MultiplayerMenu.layout 2010-12-08 16:35:36 UTC (rev 7745)
+++ code/branches/presentation/data/gui/layouts/MultiplayerMenu.layout 2010-12-08 16:36:22 UTC (rev 7746)
@@ -31,8 +31,6 @@
<Property Name="UnifiedAreaRect" Value="{{0.6,0},{0.87,0},{0.8,0},{0.97,0}}" />
<Event Name="SelectStateChanged" Function="MultiplayerMenu.InternetButton_clicked"/>
</Window>
-
-
</Window>
<Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerBackButton" >
<Property Name="Text" Value="Back" />
Modified: code/branches/presentation/data/gui/scripts/ChatBox-inputonly.lua
===================================================================
--- code/branches/presentation/data/gui/scripts/ChatBox-inputonly.lua 2010-12-08 16:35:36 UTC (rev 7745)
+++ code/branches/presentation/data/gui/scripts/ChatBox-inputonly.lua 2010-12-08 16:36:22 UTC (rev 7746)
@@ -1,5 +1,5 @@
-- ChatBox-inputonly.lua
-local P = createMenuSheet("ChatBox-inputonly")
+local P = createMenuSheet("ChatBox-inputonly", true, TriBool.True, TriBool.Dontcare, false)
return P
Modified: code/branches/presentation/data/gui/scripts/ChatBox.lua
===================================================================
--- code/branches/presentation/data/gui/scripts/ChatBox.lua 2010-12-08 16:35:36 UTC (rev 7745)
+++ code/branches/presentation/data/gui/scripts/ChatBox.lua 2010-12-08 16:36:22 UTC (rev 7746)
@@ -1,6 +1,6 @@
-- ChatBox.lua
-local P = createMenuSheet("ChatBox")
+local P = createMenuSheet("ChatBox", true, TriBool.True, TriBool.Dontcare, false)
function P.ChatBoxCloseButton_clicked(e)
orxonox.ChatInputHandler:getInstance():deactivate()
More information about the Orxonox-commit
mailing list