Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Mar 29, 2010, 1:44:13 PM (15 years ago)
Author:
smerkli
Message:

ChatBox Changes, DemoSample correctly named ChatBox now

Location:
code/branches/chat/src/orxonox/graphics
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/chat/src/orxonox/graphics/CMakeLists.txt

    r6633 r6634  
    66  GlobalShader.cc
    77  Model.cc
     8  ChatBox.cc
    89  ParticleEmitter.cc
    910  ParticleSpawner.cc
  • code/branches/chat/src/orxonox/graphics/ChatBox.cc

    r6633 r6634  
    4747    // Configure the history size
    4848    // Pressing <ENTER> changes the maximal number of entries within the history Listbox
    49     historySize->subscribeEvent(Editbox::EventTextAccepted,  Event::Subscriber(&DemoSample::Event_HistorySizeChange, this));
     49    historySize->subscribeEvent(Editbox::EventTextAccepted,  Event::Subscriber(&ChatBox::Event_HistorySizeChange, this));
    5050
    5151    // Configure the text Editbox
    5252    // Pressing <ENTER> puts the text into the history Listbox
    53     chatText->subscribeEvent(Editbox::EventTextAccepted,  Event::Subscriber(&DemoSample::Event_ChatTextAdded,  this));
     53    chatText->subscribeEvent(Editbox::EventTextAccepted,  Event::Subscriber(&ChatBox::Event_ChatTextAdded,  this));
    5454
    5555    // Configure the font name Combobox
    5656    // Selecting a name changes the font used in the history Listbox and the text Editbox
    57     fontName->subscribeEvent(Combobox::EventTextChanged,  Event::Subscriber(&DemoSample::Event_FontChange,  this));
     57    fontName->subscribeEvent(Combobox::EventTextChanged,  Event::Subscriber(&ChatBox::Event_FontChange,  this));
    5858
    5959    // Configure the font size Spinner
    6060    // Selecting a size changes the font size used in the history Listbox and the text Editbox
    61     fontSize->subscribeEvent(Spinner::EventValueChanged,  Event::Subscriber(&DemoSample::Event_FontChange,  this));
     61    fontSize->subscribeEvent(Spinner::EventValueChanged,  Event::Subscriber(&ChatBox::Event_FontChange,  this));
    6262    fontSize->setTextInputMode(Spinner::Integer);
    6363    fontSize->setMinimumValue(4.0f);
     
    281281  {
    282282    // Display the error message in the chat window
    283     addChatText(e.getMessage());
     283    //addChatText(e.getMessage());
    284284    font = 0;
    285285  }
Note: See TracChangeset for help on using the changeset viewer.