Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6837


Ignore:
Timestamp:
May 3, 2010, 2:10:46 PM (14 years ago)
Author:
smerkli
Message:

Changed EditBox to StaticText in ChatBox.layout

Location:
code/branches/chat2
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r6836 r6837  
    66        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    77        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    8         <Window Type="TaharezLook/FrameWindow" Name="/ChatBox" >
     8        <Window Type="MenuWidgets/FrameWindow" Name="/ChatBox" >
    99            <Property Name="Text" Value="Chat" />
    1010            <Property Name="TitlebarFont" Value="Commonwealth-10" />
    … …  
    1313            <Property Name="TitlebarEnabled" Value="True" />
    1414            <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.03,0},{0.6,0},{0.69375,0}}" />
    15             <Window Type="TaharezLook/Listbox" Name="/ChatBox/List" >
     15            <Window Type="MenuWidgets/Listbox" Name="/ChatBox/List" >
    1616                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    1717                <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0.078,0},{0.98,0},{1,-30}}" />
    1818            </Window>
    19             <Window Type="TaharezLook/Editbox" Name="/ChatBox/Text" >
    20                 <Property Name="Text" Value="Error: you did not register any font or none were valid" />
    21                 <Property Name="MaxTextLength" Value="1073741823" />
     19            <!--<Window Type="MenuWidgets/Editbox" Name="/ChatBox/Text" >-->
     20                <!--<Property Name="Text" Value="Error: you did not register any font or none were valid" />-->
     21                <!--<Property Name="MaxTextLength" Value="1073741823" />-->
     22                <!--<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />-->
     23                <!--<Property Name="UnifiedAreaRect" Value="{{0.02,0},{1,-30},{0.98,0},{1,-5}}" />-->
     24            <!--</Window>-->
     25            <Window Type="MenuWidgets/StaticText" Name="/ChatBox/Text" >
     26                <Property Name="Text" Value="History" />
     27                <Property Name="HorzFormatting" Value="RightAligned" />
    2228                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    2329                <Property Name="UnifiedAreaRect" Value="{{0.02,0},{1,-30},{0.98,0},{1,-5}}" />
    2430            </Window>
    2531        </Window>
    26         <Window Type="TaharezLook/Editbox" Name="/ChatBox/History" >
     32        <!--<Window Type="MenuWidgets/Editbox" Name="/ChatBox/History" >-->
     33            <!--<Property Name="Text" Value="5" />-->
     34            <!--<Property Name="MaxTextLength" Value="1073741823" />-->
     35            <!--<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />-->
     36            <!--<Property Name="UnifiedAreaRect" Value="{{0.77,0},{0.03,0},{0.81,0},{0.1,0}}" />-->
     37        <!--</Window>-->
     38        <Window Type="MenuWidgets/StaticText" Name="/ChatBox/History" >
    2739            <Property Name="Text" Value="5" />
    28             <Property Name="MaxTextLength" Value="1073741823" />
     40            <Property Name="HorzFormatting" Value="RightAligned" />
    2941            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    3042            <Property Name="UnifiedAreaRect" Value="{{0.77,0},{0.03,0},{0.81,0},{0.1,0}}" />
    3143        </Window>
    32         <Window Type="TaharezLook/StaticText" Name="/ChatBox/HistoryLabel" >
     44        <Window Type="MenuWidgets/StaticText" Name="/ChatBox/HistoryLabel" >
    3345            <Property Name="Text" Value="History size:" />
    3446            <Property Name="HorzFormatting" Value="RightAligned" />
    … …  
    3648            <Property Name="UnifiedAreaRect" Value="{{0.65,0},{0.03,0},{0.77,0},{0.1,0}}" />
    3749        </Window>
    38         <Window Type="TaharezLook/StaticText" Name="/ChatBox/FonSizeLabel" >
     50        <Window Type="MenuWidgets/StaticText" Name="/ChatBox/FonSizeLabel" >
    3951            <Property Name="Font" Value="Commonwealth-10" />
    4052            <Property Name="Text" Value="Font size:" />
    … …  
    4355            <Property Name="UnifiedAreaRect" Value="{{0.65,0},{0.1,0},{0.77,0},{0.17,0}}" />
    4456        </Window>
    45         <Window Type="TaharezLook/Spinner" Name="/ChatBox/FontSize" >
     57        <Window Type="MenuWidgets/Spinner" Name="/ChatBox/FontSize" >
    4658            <Property Name="Text" Value="10" />
    4759            <Property Name="StepSize" Value="1" />
    … …  
    5264            <Property Name="UnifiedAreaRect" Value="{{0.77,0},{0.1,0},{0.83,0},{0.17,0}}" />
    5365        </Window>
    54         <Window Type="TaharezLook/StaticText" Name="/ChatBox/FontNameLabel" >
     66        <Window Type="MenuWidgets/StaticText" Name="/ChatBox/FontNameLabel" >
    5567            <Property Name="Font" Value="Commonwealth-10" />
    5668            <Property Name="Text" Value="Font name:" />
    … …  
    5971            <Property Name="UnifiedAreaRect" Value="{{0.65,0},{0.17,0},{0.77,0},{0.24,0}}" />
    6072        </Window>
    61         <Window Type="TaharezLook/Combobox" Name="/ChatBox/FontName" >
     73        <Window Type="MenuWidgets/Combobox" Name="/ChatBox/FontName" >
    6274            <Property Name="Text" Value="ChatBoxFont" />
    6375            <Property Name="ReadOnly" Value="True" />

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

    r6836 r6837  
    109109  void ChatInputHandler::inputChanged()
    110110  {
    111     //this->updateListeners<&ShellListener::inputChanged>();
    112     //this->updateListeners<&ShellListener::cursorChanged>();
     111
    113112  }
    114113
    … …  
    135134  {
    136135    this->inpbuf->removeBehindCursor();
    137     //this->updateListeners<&ShellListener::inputChanged>();
    138     //this->updateListeners<&ShellListener::cursorChanged>();
    139136  }
    140137
    … …  
    142139  {
    143140    this->inpbuf->removeAtCursor();
    144     //this->updateListeners<&ShellListener::inputChanged>();
    145141  }
    146142
    … …  
    148144  {
    149145    this->inpbuf->increaseCursor();
    150     //this->updateListeners<&ShellListener::cursorChanged>();
    151146  }
    152147 
    … …  
    154149  {
    155150    this->inpbuf->decreaseCursor();
    156     //this->updateListeners<&ShellListener::cursorChanged>();
    157151  }
    158152 
    … …  
    160154  {
    161155    this->inpbuf->setCursorToEnd();
    162     //this->updateListeners<&ShellListener::cursorChanged>();
    163156  }
    164157
    … …  
    166159  {
    167160    this->inpbuf->setCursorToBegin();
    168     //this->updateListeners<&ShellListener::cursorChanged>();
    169161  }
    170162
    171163  void ChatInputHandler::exit()
    172164  {
    173     //if (this->inpbuf->getSize() > 0)
    174     //{
    175       //this->clearInput();
    176       //return;
    177     //}
    178165
    179     //this->clearInput();
    180     //this->scrollPosition_ = 0;
    181     //this->scrollIterator_ = this->outputLines_.begin();
    182 
    183     //this->updateListeners<&ShellListener::exit>();
    184166  }
    185167
Note: See TracChangeset for help on using the changeset viewer.