Changeset 6870 for code/branches/chat2

Timestamp:

May 10, 2010, 1:47:44 PM (15 years ago)

Author:

smerkli

Message:

Chatbox light added, trigger with n in game.

Location:

code/branches/chat2

Files:

• data/gui/layouts/ChatBox-inputonly.layout (copied) (copied from code/branches/chat2/data/gui/layouts/ChatBox.layout) (1 diff)
• data/gui/layouts/ChatBox.layout (modified) (1 diff)
• data/gui/scripts/ChatBox-inputonly.lua (copied) (copied from code/branches/chat2/data/gui/scripts/ChatBox.lua) (1 diff)
• src/orxonox/ChatInputHandler.cc (modified) (8 diffs)
• src/orxonox/ChatInputHandler.h (modified) (2 diffs)

code/branches/chat2/data/gui/layouts/ChatBox-inputonly.layout

@@ -2 +2 @@
 
 <GUILayout >
-    <Window Type="DefaultWindow" Name="Root" >
+    <Window Type="DefaultWindow" Name="orxonox/ChatBox-inputonly/Root" >
         <Property Name="InheritsAlpha" Value="False" />
         <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" >
-            <Property Name="Text" Value="Chat" />
-            <Property Name="InheritsAlpha" Value="False" />
+        <Window Type="MenuWidgets/Editbox" Name="orxonox/ChatBox-inputonly/input" >
+            <Property Name="Text" Value="" />
+            <Property Name="AlwaysOnTop" Value="True" />
+            <Property Name="MaxTextLength" Value="1073741823" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="TitlebarEnabled" Value="True" />
-            <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.03,0},{0.6,0},{0.69375,0}}" />
-            <Window Type="MenuWidgets/Listbox" Name="orxonox/ChatBox/history" >
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0.078,0},{0.98,0},{1,-30}}" />
-            </Window>
-            <Window Type="MenuWidgets/Editbox" Name="orxonox/ChatBox/input" >
-                <Property Name="Text" Value="" />
-                <Property Name="MaxTextLength" Value="1073741823" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.02,0},{1,-30},{0.98,0},{1,-5}}" />
-            </Window>
+            <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0,5},{0.98,0},{0,30}}" />
         </Window>
     </Window>

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

@@ -2 +2 @@
 
 <GUILayout >
-    <Window Type="DefaultWindow" Name="Root" >
+    <Window Type="DefaultWindow" Name="orxonox/ChatBox/Root" >
         <Property Name="InheritsAlpha" Value="False" />
         <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

code/branches/chat2/data/gui/scripts/ChatBox-inputonly.lua

@@ -1 @@
--- ChatBox.lua
+-- ChatBox-inputonly.lua
 
-local P = createMenuSheet("ChatBox")
+local P = createMenuSheet("ChatBox-inputonly")
 return P
 

code/branches/chat2/src/orxonox/ChatInputHandler.cc

@@ -46 +46 @@
   SetConsoleCommandAlias( ChatInputHandler, activate_static, "startchat",
     true );
+  SetConsoleCommandAlias( ChatInputHandler, activate_small_static, 
+    "startchat_small", true );
 
 
@@ -58 +60 @@
     assert( this->inpbuf != NULL );
 
-    /* MARK add generation of ChatBox thingy here */
+    /* generate chatbox ui and chatbox-inputonly ui */
     GUIManager::getInstance().loadGUI( "ChatBox" );
+    GUIManager::getInstance().loadGUI( "ChatBox-inputonly" );
 
     /* configure the input buffer */
@@ -66 +69 @@
     this->inputState = InputManager::getInstance().createInputState( "chatinput", false, false, InputStatePriority::Dynamic );
     this->inputState->setKeyHandler(this->inpbuf);
-
-    //[> set console shortcut <]
-    //this->getIdentifier()->addConsoleCommand(createConsoleCommand(createFunctor(
-      //&ChatInputHandler::activate, this), "startchat"), false);
   }
 
@@ -99 +98 @@
     /* get window pointers */
     input = CEGUI::WindowManager::getSingleton().getWindow( "orxonox/ChatBox/input" );
+    inputonly = CEGUI::WindowManager::getSingleton().getWindow( "orxonox/ChatBox-inputonly/input" );
+
     CEGUI::Window *history = CEGUI::WindowManager::getSingleton().getWindow( "orxonox/ChatBox/history" );
     lb_history = dynamic_cast<CEGUI::Listbox*>(history); 
@@ -109 +110 @@
   /* activate, deactivate */
   void ChatInputHandler::activate_static()
-  { ChatInputHandler::getInstance().activate(); }
-  
-  void ChatInputHandler::activate()
+  { ChatInputHandler::getInstance().activate( true ); }
+
+  void ChatInputHandler::activate_small_static()
+  { ChatInputHandler::getInstance().activate( false ); }
+
+  void ChatInputHandler::activate( bool full )
   {
     /* start listening */
@@ -118 +122 @@
 
     /* MARK add spawning of chat widget stuff here.*/
-    GUIManager::getInstance().showGUI( "ChatBox" );
+    if( full )
+      GUIManager::getInstance().showGUI( "ChatBox" );
+    else
+      GUIManager::getInstance().showGUI( "ChatBox-inputonly" );
   }
 
@@ -128 +135 @@
     /* MARK add un-spawning of chat widget stuff here. */
     GUIManager::getInstance().hideGUI( "ChatBox" );
+    GUIManager::getInstance().hideGUI( "ChatBox-inputonly" );
   }
 
@@ -146 +154 @@
     /* set the text */
     this->input->setProperty( "Text", left + "|" + right );
+    this->inputonly->setProperty( "Text", left + "|" + right );
   }
 

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

@@ -73 +73 @@
 
       /* cegui stuff */
-      CEGUI::Window *input;
+      CEGUI::Window *input, *inputonly;
       CEGUI::Listbox *lb_history;
 
@@ -83 +83 @@
       /* start listening, stop listening */
       static void activate_static();
-      void activate();
+      static void activate_small_static();
+      void activate( bool full );
       void deactivate();