Changeset 7009
- Timestamp:
- May 29, 2010, 9:56:07 PM (14 years ago)
- Location:
- code/branches/presentation3
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation3/data/gui/layouts/ChatBox.layout
r6928 r7009 6 6 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> 7 7 <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" /> 8 <Window Type="MenuWidgets/FrameWindow" Name=" /ChatBox" >8 <Window Type="MenuWidgets/FrameWindow" Name="orxonox/ChatBox" > 9 9 <Property Name="Text" Value="Chat" /> 10 10 <Property Name="InheritsAlpha" Value="False" /> … … 25 25 <Property Name="UnifiedAreaRect" Value="{{0.02,0},{1,-30},{0.98,0},{1,-5}}" /> 26 26 </Window> 27 <Event Name="CloseClicked" Function="ChatBox.ChatBoxCloseButton_clicked"/> 27 28 </Window> 28 29 </Window> -
code/branches/presentation3/data/gui/scripts/ChatBox.lua
r6928 r7009 2 2 3 3 local P = createMenuSheet("ChatBox") 4 5 function P.ChatBoxCloseButton_clicked(e) 6 orxonox.ChatInputHandler:getInstance():deactivate() 7 end 8 4 9 return P 5 10 -
code/branches/presentation3/src/orxonox/CMakeLists.txt
r6965 r7009 57 57 FIND_HEADER_FILES 58 58 TOLUA_FILES 59 ChatInputHandler.h 59 60 LevelManager.h 60 61 MoodManager.h -
code/branches/presentation3/src/orxonox/ChatInputHandler.h
r6928 r7009 54 54 #include <util/Singleton.h> 55 55 56 57 namespace orxonox 58 { 56 namespace orxonox // tolua_export 57 { // tolua_export 59 58 /* class to handle chat using an InputBuffer */ 60 class _OrxonoxExport ChatInputHandler : public Singleton<ChatInputHandler>,61 public ChatListener62 { 59 class _OrxonoxExport ChatInputHandler // tolua_export 60 : public Singleton<ChatInputHandler>, public ChatListener 61 { // tolua_export 63 62 private: 64 63 /** Input buffer, to be used to catch input from the … … 103 102 friend class Singleton<ChatInputHandler>; 104 103 104 static ChatInputHandler& getInstance(void) { return Singleton<ChatInputHandler>::getInstance(); } // tolua_export 105 105 106 /** start listening */ 106 107 static void activate_static(); … … 127 128 128 129 /** Deactivate the chat window, meaning: hide it. */ 129 void deactivate(); 130 void deactivate(); // tolua_export 130 131 131 }; 132 }; // tolua_export 132 133 133 134 134 } 135 } // tolua_export 135 136 136 137
Note: See TracChangeset
for help on using the changeset viewer.