[Orxonox-commit 2121] r6837 - in code/branches/chat2: data/gui/layouts src/orxonox
smerkli at orxonox.net
smerkli at orxonox.net
Mon May 3 14:10:46 CEST 2010
Author: smerkli
Date: 2010-05-03 14:10:46 +0200 (Mon, 03 May 2010)
New Revision: 6837
Modified:
code/branches/chat2/data/gui/layouts/ChatBox.layout
code/branches/chat2/src/orxonox/ChatInputHandler.cc
Log:
Changed EditBox to StaticText in ChatBox.layout
Modified: code/branches/chat2/data/gui/layouts/ChatBox.layout
===================================================================
--- code/branches/chat2/data/gui/layouts/ChatBox.layout 2010-05-03 11:47:54 UTC (rev 6836)
+++ code/branches/chat2/data/gui/layouts/ChatBox.layout 2010-05-03 12:10:46 UTC (rev 6837)
@@ -5,44 +5,56 @@
<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="TaharezLook/FrameWindow" Name="/ChatBox" >
+ <Window Type="MenuWidgets/FrameWindow" Name="/ChatBox" >
<Property Name="Text" Value="Chat" />
<Property Name="TitlebarFont" Value="Commonwealth-10" />
<Property Name="InheritsAlpha" Value="False" />
<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="TaharezLook/Listbox" Name="/ChatBox/List" >
+ <Window Type="MenuWidgets/Listbox" Name="/ChatBox/List" >
<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="TaharezLook/Editbox" Name="/ChatBox/Text" >
- <Property Name="Text" Value="Error: you did not register any font or none were valid" />
- <Property Name="MaxTextLength" Value="1073741823" />
+ <!--<Window Type="MenuWidgets/Editbox" Name="/ChatBox/Text" >-->
+ <!--<Property Name="Text" Value="Error: you did not register any font or none were valid" />-->
+ <!--<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>-->
+ <Window Type="MenuWidgets/StaticText" Name="/ChatBox/Text" >
+ <Property Name="Text" Value="History" />
+ <Property Name="HorzFormatting" Value="RightAligned" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="UnifiedAreaRect" Value="{{0.02,0},{1,-30},{0.98,0},{1,-5}}" />
</Window>
</Window>
- <Window Type="TaharezLook/Editbox" Name="/ChatBox/History" >
+ <!--<Window Type="MenuWidgets/Editbox" Name="/ChatBox/History" >-->
+ <!--<Property Name="Text" Value="5" />-->
+ <!--<Property Name="MaxTextLength" Value="1073741823" />-->
+ <!--<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />-->
+ <!--<Property Name="UnifiedAreaRect" Value="{{0.77,0},{0.03,0},{0.81,0},{0.1,0}}" />-->
+ <!--</Window>-->
+ <Window Type="MenuWidgets/StaticText" Name="/ChatBox/History" >
<Property Name="Text" Value="5" />
- <Property Name="MaxTextLength" Value="1073741823" />
+ <Property Name="HorzFormatting" Value="RightAligned" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="UnifiedAreaRect" Value="{{0.77,0},{0.03,0},{0.81,0},{0.1,0}}" />
</Window>
- <Window Type="TaharezLook/StaticText" Name="/ChatBox/HistoryLabel" >
+ <Window Type="MenuWidgets/StaticText" Name="/ChatBox/HistoryLabel" >
<Property Name="Text" Value="History size:" />
<Property Name="HorzFormatting" Value="RightAligned" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="UnifiedAreaRect" Value="{{0.65,0},{0.03,0},{0.77,0},{0.1,0}}" />
</Window>
- <Window Type="TaharezLook/StaticText" Name="/ChatBox/FonSizeLabel" >
+ <Window Type="MenuWidgets/StaticText" Name="/ChatBox/FonSizeLabel" >
<Property Name="Font" Value="Commonwealth-10" />
<Property Name="Text" Value="Font size:" />
<Property Name="HorzFormatting" Value="RightAligned" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="UnifiedAreaRect" Value="{{0.65,0},{0.1,0},{0.77,0},{0.17,0}}" />
</Window>
- <Window Type="TaharezLook/Spinner" Name="/ChatBox/FontSize" >
+ <Window Type="MenuWidgets/Spinner" Name="/ChatBox/FontSize" >
<Property Name="Text" Value="10" />
<Property Name="StepSize" Value="1" />
<Property Name="CurrentValue" Value="10" />
@@ -51,14 +63,14 @@
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="UnifiedAreaRect" Value="{{0.77,0},{0.1,0},{0.83,0},{0.17,0}}" />
</Window>
- <Window Type="TaharezLook/StaticText" Name="/ChatBox/FontNameLabel" >
+ <Window Type="MenuWidgets/StaticText" Name="/ChatBox/FontNameLabel" >
<Property Name="Font" Value="Commonwealth-10" />
<Property Name="Text" Value="Font name:" />
<Property Name="HorzFormatting" Value="RightAligned" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="UnifiedAreaRect" Value="{{0.65,0},{0.17,0},{0.77,0},{0.24,0}}" />
</Window>
- <Window Type="TaharezLook/Combobox" Name="/ChatBox/FontName" >
+ <Window Type="MenuWidgets/Combobox" Name="/ChatBox/FontName" >
<Property Name="Text" Value="ChatBoxFont" />
<Property Name="ReadOnly" Value="True" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
Modified: code/branches/chat2/src/orxonox/ChatInputHandler.cc
===================================================================
--- code/branches/chat2/src/orxonox/ChatInputHandler.cc 2010-05-03 11:47:54 UTC (rev 6836)
+++ code/branches/chat2/src/orxonox/ChatInputHandler.cc 2010-05-03 12:10:46 UTC (rev 6837)
@@ -108,8 +108,7 @@
/* callbacks for InputBuffer */
void ChatInputHandler::inputChanged()
{
- //this->updateListeners<&ShellListener::inputChanged>();
- //this->updateListeners<&ShellListener::cursorChanged>();
+
}
void ChatInputHandler::addline()
@@ -134,53 +133,36 @@
void ChatInputHandler::backspace()
{
this->inpbuf->removeBehindCursor();
- //this->updateListeners<&ShellListener::inputChanged>();
- //this->updateListeners<&ShellListener::cursorChanged>();
}
void ChatInputHandler::deleteChar()
{
this->inpbuf->removeAtCursor();
- //this->updateListeners<&ShellListener::inputChanged>();
}
void ChatInputHandler::cursorRight()
{
this->inpbuf->increaseCursor();
- //this->updateListeners<&ShellListener::cursorChanged>();
}
void ChatInputHandler::cursorLeft()
{
this->inpbuf->decreaseCursor();
- //this->updateListeners<&ShellListener::cursorChanged>();
}
void ChatInputHandler::cursorEnd()
{
this->inpbuf->setCursorToEnd();
- //this->updateListeners<&ShellListener::cursorChanged>();
}
void ChatInputHandler::cursorHome()
{
this->inpbuf->setCursorToBegin();
- //this->updateListeners<&ShellListener::cursorChanged>();
}
void ChatInputHandler::exit()
{
- //if (this->inpbuf->getSize() > 0)
- //{
- //this->clearInput();
- //return;
- //}
- //this->clearInput();
- //this->scrollPosition_ = 0;
- //this->scrollIterator_ = this->outputLines_.begin();
-
- //this->updateListeners<&ShellListener::exit>();
}
}
More information about the Orxonox-commit
mailing list