Changeset 7009

Timestamp:

May 29, 2010, 9:56:07 PM (14 years ago)

Author:

dafrick

Message:

Enabled the ChatBox to be closed by pressing the close button in the upper right corner of the frame window.

Location:

code/branches/presentation3

Files:

• data/gui/layouts/ChatBox.layout (modified) (2 diffs)
• data/gui/scripts/ChatBox.lua (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/ChatInputHandler.h (modified) (3 diffs)

code/branches/presentation3/data/gui/layouts/ChatBox.layout

@@ -6 +6 @@
         <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-        <Window Type="MenuWidgets/FrameWindow" Name="/ChatBox" >
+        <Window Type="MenuWidgets/FrameWindow" Name="orxonox/ChatBox" >
             <Property Name="Text" Value="Chat" />
             <Property Name="InheritsAlpha" Value="False" />
@@ -25 +25 @@
                 <Property Name="UnifiedAreaRect" Value="{{0.02,0},{1,-30},{0.98,0},{1,-5}}" />
             </Window>
+            <Event Name="CloseClicked" Function="ChatBox.ChatBoxCloseButton_clicked"/>
         </Window>
     </Window>

code/branches/presentation3/data/gui/scripts/ChatBox.lua

@@ -2 +2 @@
 
 local P = createMenuSheet("ChatBox")
+
+function P.ChatBoxCloseButton_clicked(e)
+    orxonox.ChatInputHandler:getInstance():deactivate()
+end
+
 return P
 

code/branches/presentation3/src/orxonox/CMakeLists.txt

@@ -57 +57 @@
   FIND_HEADER_FILES
   TOLUA_FILES
+    ChatInputHandler.h
     LevelManager.h
     MoodManager.h

code/branches/presentation3/src/orxonox/ChatInputHandler.h

@@ -54 +54 @@
 #include <util/Singleton.h>
 
-
-namespace orxonox
-{
+namespace orxonox // tolua_export
+{ // tolua_export
   /* class to handle chat using an InputBuffer */
-  class _OrxonoxExport ChatInputHandler : public Singleton<ChatInputHandler>,
-    public ChatListener
-  {
+  class _OrxonoxExport ChatInputHandler  // tolua_export
+    : public Singleton<ChatInputHandler>, public ChatListener
+  { // tolua_export
     private:
       /** Input buffer, to be used to catch input from the
@@ -103 +102 @@
       friend class Singleton<ChatInputHandler>;
 
+      static ChatInputHandler& getInstance(void) { return Singleton<ChatInputHandler>::getInstance(); }  // tolua_export
+
       /** start listening */
       static void activate_static();
@@ -127 +128 @@
 
       /** Deactivate the chat window, meaning: hide it. */
-      void deactivate();
+      void deactivate();  // tolua_export
 
-  };
+  };  // tolua_export
 
 
-}
+}  // tolua_export