[Orxonox-commit 1917] r6634 - code/branches/chat/src/orxonox/graphics

[smerkli at orxonox.net]

Author: smerkli
Date: 2010-03-29 13:44:13 +0200 (Mon, 29 Mar 2010)
New Revision: 6634

Modified:
   code/branches/chat/src/orxonox/graphics/CMakeLists.txt
   code/branches/chat/src/orxonox/graphics/ChatBox.cc
Log:
ChatBox Changes, DemoSample correctly named ChatBox now

Modified: code/branches/chat/src/orxonox/graphics/CMakeLists.txt
===================================================================
--- code/branches/chat/src/orxonox/graphics/CMakeLists.txt	2010-03-29 11:29:48 UTC (rev 6633)
+++ code/branches/chat/src/orxonox/graphics/CMakeLists.txt	2010-03-29 11:44:13 UTC (rev 6634)
@@ -5,6 +5,7 @@
   FadingBillboard.cc
   GlobalShader.cc
   Model.cc
+  ChatBox.cc
   ParticleEmitter.cc
   ParticleSpawner.cc
 COMPILATION_BEGIN GraphicsCompilation.cc

Modified: code/branches/chat/src/orxonox/graphics/ChatBox.cc
===================================================================
--- code/branches/chat/src/orxonox/graphics/ChatBox.cc	2010-03-29 11:29:48 UTC (rev 6633)
+++ code/branches/chat/src/orxonox/graphics/ChatBox.cc	2010-03-29 11:44:13 UTC (rev 6634)
@@ -46,19 +46,19 @@
 
     // Configure the history size
     // Pressing <ENTER> changes the maximal number of entries within the history Listbox
-    historySize->subscribeEvent(Editbox::EventTextAccepted,  Event::Subscriber(&DemoSample::Event_HistorySizeChange, this)); 
+    historySize->subscribeEvent(Editbox::EventTextAccepted,  Event::Subscriber(&ChatBox::Event_HistorySizeChange, this)); 
 
     // Configure the text Editbox
     // Pressing <ENTER> puts the text into the history Listbox
-    chatText->subscribeEvent(Editbox::EventTextAccepted,  Event::Subscriber(&DemoSample::Event_ChatTextAdded,  this)); 
+    chatText->subscribeEvent(Editbox::EventTextAccepted,  Event::Subscriber(&ChatBox::Event_ChatTextAdded,  this)); 
 
     // Configure the font name Combobox
     // Selecting a name changes the font used in the history Listbox and the text Editbox
-    fontName->subscribeEvent(Combobox::EventTextChanged,  Event::Subscriber(&DemoSample::Event_FontChange,  this)); 
+    fontName->subscribeEvent(Combobox::EventTextChanged,  Event::Subscriber(&ChatBox::Event_FontChange,  this)); 
 
     // Configure the font size Spinner
     // Selecting a size changes the font size used in the history Listbox and the text Editbox
-    fontSize->subscribeEvent(Spinner::EventValueChanged,  Event::Subscriber(&DemoSample::Event_FontChange,  this)); 
+    fontSize->subscribeEvent(Spinner::EventValueChanged,  Event::Subscriber(&ChatBox::Event_FontChange,  this)); 
     fontSize->setTextInputMode(Spinner::Integer);
     fontSize->setMinimumValue(4.0f);
     fontSize->setMaximumValue(72.0f);
@@ -280,7 +280,7 @@
   catch(Exception& e)
   {
     // Display the error message in the chat window
-    addChatText(e.getMessage());
+    //addChatText(e.getMessage());
     font = 0;
   }